shop code

app/controllers/origami/quick_service_controller.rb

@@ -13,16 +13,12 @@ class Origami::QuickServiceController < ApplicationController
     # if params[:menu] == "true"
     @menus    = []
     @menu     = []
-    # else
-    #    @menus    = Menu.all
-    #    @menu     = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
-    # end
-    @zone     = Zone.all
+    @zone     = Zone.all.where("shop_code='#{@shop.shop_code}'")
     @customer = Customer.all
-    @tables   = Table.all.active.order('status desc')
-    @rooms    = Room.all.active.order('status desc')
+    @tables   = Table.all.active.where("shop_code='#{@shop.shop_code}'").order('status desc')
+    @rooms    = Room.all.active.where("shop_code='#{@shop.shop_code}'").order('status desc')
     @cashier_type = "quick_service"
-    display_type = Lookup.find_by_lookup_type("display_type")
+    display_type = Lookup.find_by_lookup_type_and_shop_code("display_type",@shop.shop_code)
     if !display_type.nil? && display_type.value.to_i ==2
       @display_type = display_type.value
     else
@@ -31,9 +27,7 @@ class Origami::QuickServiceController < ApplicationController
 
     #checked quick_service only
     @quick_service_only = false
-    lookup_dine_in = Lookup.collection_of('quickservice_add_order')
-    puts 'lookup_dine_in!!!!'
-    puts lookup_dine_in
+    lookup_dine_in = Lookup.where("shop_code='#{@shop.shop_code}'").collection_of('quickservice_add_order')
     if !lookup_dine_in.empty?
       lookup_dine_in.each do |dine_in|
         if dine_in[0].downcase == "quickserviceaddorder"
@@ -121,7 +115,7 @@ class Origami::QuickServiceController < ApplicationController
     order.table_id = params[:table_id]  # this is dining facilities's id
     order.waiters = current_login_employee.name
     order.employee_name = current_login_employee.name
-    
+
     order.is_extra_time = is_extra_time
     order.extra_time    = extra_time