current shop

2019-12-03 14:54:53 +06:30
parent 23b5d0d344
commit 78838a7718
17 changed files with 44 additions and 43 deletions
--- a/app/controllers/foodcourt/dashboard_controller.rb
+++ b/app/controllers/foodcourt/dashboard_controller.rb
@@ -3,9 +3,10 @@ class Foodcourt::DashboardController < BaseFoodcourtController
  def index
    today = DateTime.now.strftime('%Y-%m-%d')

-    @display_type = Lookup.where("shop_code='#{@shop.shop_code}'").find_by_lookup_type("display_type")
+    @display_type = Lookup.find_by_lookup_type("display_type")

    @sale_data = Array.new
+    @shop = Shop.current_shop
    @total_payment_methods = Sale.total_payment_methods(@shop,today,current_user)
    if !@total_payment_methods.nil?
        @total_payment_methods.each do |payment|