Read NFC

2020-01-12 20:07:28 +06:30
parent 314cc507a3
commit dff2c69627
89 changed files with 492 additions and 469 deletions
--- a/app/controllers/transactions/orders_controller.rb
+++ b/app/controllers/transactions/orders_controller.rb
@@ -9,9 +9,9 @@ class Transactions::OrdersController < ApplicationController
 		to     = params[:to]

 		if filter.nil? && from.nil? && to.nil?
-		    orders = Order.where("shop_code='#{@shop.shop_code}'").order("order_id desc")
+		    orders = Order.order("order_id desc")
 		else
-		    orders = Order.search(filter,from,to).where("orders.shop_code='#{@shop.shop_code}'")
+		    orders = Order.search(filter,from,to)
 		end

 		if !orders.nil?