diff --git a/app/controllers/api/verifications_controller.rb b/app/controllers/api/verifications_controller.rb
index ba055b88..22ecf523 100644
--- a/app/controllers/api/verifications_controller.rb
+++ b/app/controllers/api/verifications_controller.rb
@@ -1,4 +1,4 @@
-class Api::VerificationsController < ActionController::API
+class Api::VerificationsController < Api::ApiController
 
 	def new
 		phone_number = params[:phone_number]
diff --git a/app/controllers/foodcourt/food_court_controller.rb b/app/controllers/foodcourt/food_court_controller.rb
index df04116f..3010fafe 100644
--- a/app/controllers/foodcourt/food_court_controller.rb
+++ b/app/controllers/foodcourt/food_court_controller.rb
@@ -39,7 +39,7 @@ class Foodcourt::FoodCourtController < ApplicationController
               .joins("JOIN orders ON orders.order_id=booking_orders.order_id")
               .joins("JOIN order_items ON orders.order_id=order_items.order_id")
               .joins("JOIN customers ON orders.customer_id=customers.customer_id")
-              .where("orders.source='app' and bookings.shop_code='#{@shop.shop_code}' and bookings.booking_status='assign'").uniq.length
+              .where("orders.source='app' and bookings.shop_code='#{Shop.current_shop.shop_code}' and bookings.booking_status='assign'").uniq.length
     puts @app_order_new_count
     render "foodcourt/addorders/detail"
   end
diff --git a/app/controllers/origami/quick_service_controller.rb b/app/controllers/origami/quick_service_controller.rb
index 3d7ef13b..cb2cfb92 100644
--- a/app/controllers/origami/quick_service_controller.rb
+++ b/app/controllers/origami/quick_service_controller.rb
@@ -13,12 +13,12 @@ class Origami::QuickServiceController < ApplicationController
     # if params[:menu] == "true"
     @menus    = []
     @menu     = []
-    @zone     = Zone.all.where("shop_code='#{@shop.shop_code}'")
+    @zone     = Zone.all
     @customer = Customer.all
-    @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')
+    @tables   = Table.all.active.order('status desc')
+    @rooms    = Room.all.active.order('status desc')
     @cashier_type = "quick_service"
-    display_type = Lookup.find_by_lookup_type_and_shop_code("display_type",@shop.shop_code)
+    display_type = Lookup.find_by_lookup_type("display_type")
     if !display_type.nil? && display_type.value.to_i ==2
       @display_type = display_type.value
     else
@@ -27,7 +27,7 @@ class Origami::QuickServiceController < ApplicationController
 
     #checked quick_service only
     @quick_service_only = false
-    lookup_dine_in = Lookup.where("shop_code='#{@shop.shop_code}'").collection_of('quickservice_add_order')
+    lookup_dine_in = Lookup.where("shop_code='#{Shop.current_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"
diff --git a/config/puma.rb b/config/puma.rb
index f0013d25..d24425ae 100755
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -1,11 +1,11 @@
-# application_path="#{File.expand_path("../..", __FILE__)}"
-# directory application_path
-# #environment ENV.fetch("RAILS_ENV") { "production" }
-# environment "production"
-# pidfile "#{application_path}/tmp/puma/pid"
-# state_path "#{application_path}/tmp/puma/state"
-# stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
-# port        ENV.fetch("PORT") { 62158 }
-# workers 2
-# preload_app!
-# threads 1,1
+application_path="#{File.expand_path("../..", __FILE__)}"
+directory application_path
+#environment ENV.fetch("RAILS_ENV") { "production" }
+environment "production"
+pidfile "#{application_path}/tmp/puma/pid"
+state_path "#{application_path}/tmp/puma/state"
+stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
+port        ENV.fetch("PORT") { 62158 }
+workers 2
+preload_app!
+threads 1,1