shop_code

2019-12-05 14:56:47 +06:30
parent ccbd3c6966
commit b0f6368248
58 changed files with 95 additions and 26 deletions
--- a/app/controllers/reports/order_reservation_controller.rb
+++ b/app/controllers/reports/order_reservation_controller.rb
@@ -1,6 +1,7 @@
 class Reports::OrderReservationController < BaseReportController
 # authorize_resource :class => false
 	def index
+		@shop = Shop.current_shop
 		@providers = [["All",''], ["Direct Delivery","direct_delivery"],["Pick-Up","pick_up"],["TURBO","turbo"],["food2u","food2u"], ["ygndoor2door","ygndoor2door"]]
 		@payment_types = [["All",''], ["COD","cash_on_delivery"],["DINGA","dinga"]]

@@ -47,6 +48,7 @@ class Reports::OrderReservationController < BaseReportController
 	end

 	def show
+		@shop = Shop.current_shop
 		from, to  = get_date_range_from_params

 	    @sale_data = Sale.get_by_shift_sale_by_item(from,to,Sale::SALE_STATUS_COMPLETED).where("shift_sales.shop_code='#{@shop.shop_code}'")