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/discounts_controller.rb
+++ b/app/controllers/foodcourt/discounts_controller.rb
@@ -21,8 +21,8 @@ class Foodcourt::DiscountsController < BaseFoodcourtController
      end
    end

-    @member_discount = MembershipSetting.find_by_discount_and_shop_code(1,@shop.shop_code)
-    @accounts = Account.where("shop_code='#{@shop.shop_code}'")
+    @member_discount = MembershipSetting.find_by_discount(1)
+    @accounts = Account.where("shop_code='#{Shop.current_shop.shop_code}'")
  end

  #discount page show from origami index with selected order