diff --git a/app/controllers/foodcourt/payments_controller.rb b/app/controllers/foodcourt/payments_controller.rb
index c3b0d904..6e7e2859 100755
--- a/app/controllers/foodcourt/payments_controller.rb
+++ b/app/controllers/foodcourt/payments_controller.rb
@@ -223,7 +223,7 @@ class Foodcourt::PaymentsController < BaseFoodcourtController
         @pdf_view = @lookup_pdf.value
       end
 
-      amount = SalePayment.get_kbz_pay_amount(sale_id, current_user,current_shop)
+      amount = SalePayment.get_kbz_pay_amount(sale_id, current_user)
       @kbz_pay_amount += amount.to_f
 
       #for changable on/off
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 9e9b4866..dcf31a36 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -124,7 +124,7 @@ class HomeController < ApplicationController
       end
     end
 
-    @inventories    = StockJournal.inventory_balances(@from,@to, current_shop).sum(:balance)
+    @inventories    = StockJournal.inventory_balances(@from,@to).sum(:balance)
 
     @total_trans    = Sale.total_trans(current_user,@from,@to)
     @total_card     = Sale.total_card_sale(current_user,@from,@to)
diff --git a/app/controllers/inventory/inventory_definitions_controller.rb b/app/controllers/inventory/inventory_definitions_controller.rb
index d1bb0753..96243b8a 100755
--- a/app/controllers/inventory/inventory_definitions_controller.rb
+++ b/app/controllers/inventory/inventory_definitions_controller.rb
@@ -90,8 +90,8 @@ class Inventory::InventoryDefinitionsController < BaseInventoryController
       format.json { head :no_content }
     end
 
-    StockJournal.delete_stock_journal(inventory.item_code,current_shop)
-    StockCheckItem.delete_stock_check_item(inventory.item_code,current_shop)
+    StockJournal.delete_stock_journal(inventory.item_code)
+    StockCheckItem.delete_stock_check_item(inventory.item_code)
     if !inventory.nil?
       inventory.destroy
       flash[:message] = 'Inventory was successfully destroyed.'
diff --git a/app/controllers/inventory/stock_checks_controller.rb b/app/controllers/inventory/stock_checks_controller.rb
index 9493b16d..6c501def 100755
--- a/app/controllers/inventory/stock_checks_controller.rb
+++ b/app/controllers/inventory/stock_checks_controller.rb
@@ -19,7 +19,7 @@ class Inventory::StockChecksController < BaseInventoryController
     item_list = JSON.parse(params[:stock_item])
     reason = params[:reason]
     check = StockCheck.new
-    @check = check.create(current_user, reason, item_list,current_shop)
+    @check = check.create(current_user, reason, item_list)
   end
 
   def show
@@ -33,7 +33,7 @@ class Inventory::StockChecksController < BaseInventoryController
     check = params[:data]
     stockCheck = StockCheck.find_by_id(check)
     stockCheck.stock_check_items.each do |item|
-      StockJournal.from_stock_check(item,current_shop)
+      StockJournal.from_stock_check(item)
     end
   end
 
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 24bbd3bb..f7416704 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -11,7 +11,7 @@ class Origami::HomeController < BaseOrigamiController
 
 
     @customers = Customer.pluck("customer_id, name")
-    @occupied_table = DiningFacility.where("status='occupied'").shop.count
+    @occupied_table = DiningFacility.where("status='occupied'").count
     @shift = ShiftSale.current_open_shift(current_user)
   end
 
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 7caac687..7951c348 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -275,7 +275,7 @@ class Origami::PaymentsController < BaseOrigamiController
         @pdf_view = @lookup_pdf.value
       end
 
-      amount = SalePayment.get_kbz_pay_amount(sale_id, current_user, current_shop)
+      amount = SalePayment.get_kbz_pay_amount(sale_id, current_user)
       @kbz_pay_amount += amount.to_f
 
       #for changable on/off
diff --git a/app/controllers/settings/menus_controller.rb b/app/controllers/settings/menus_controller.rb
index 186391c8..5961a8f4 100755
--- a/app/controllers/settings/menus_controller.rb
+++ b/app/controllers/settings/menus_controller.rb
@@ -157,7 +157,7 @@ class Settings::MenusController < ApplicationController
 
   def import
     if params[:file]
-      status = Menu.import(params[:file], current_user.name,current_shop)
+      status = Menu.import(params[:file], current_user.name)
       redirect_to settings_menus_path, notice: status
     end
   end
diff --git a/app/controllers/transactions/credit_notes_controller.rb b/app/controllers/transactions/credit_notes_controller.rb
index 9622e5e4..c20c8364 100755
--- a/app/controllers/transactions/credit_notes_controller.rb
+++ b/app/controllers/transactions/credit_notes_controller.rb
@@ -23,10 +23,10 @@ class Transactions::CreditNotesController < ApplicationController
                       .joins("JOIN sale_payments sp on sp.sale_id = sales.sale_id")
                       .where("(CASE WHEN (sales.grand_total + sales.amount_changed)=(select SUM(sale_payments.payment_amount)
                                         FROM sale_payments WHERE sale_payments.sale_id=sales.sale_id AND sale_payments.payment_method!='creditnote')
-                                THEN NULL ELSE payment_method='creditnote' END)").shop
+                                THEN NULL ELSE payment_method='creditnote' END)")
       @credit_notes = Kaminari.paginate_array(@credit_notes).page(params[:page]).per(20)
     else
-        sale = Sale.search_credit_sales(customer,filter,from,to,order_source).shop
+        sale = Sale.search_credit_sales(customer,filter,from,to,order_source)
         if !sale.nil?
            @credit_notes = sale
            @credit_notes = Kaminari.paginate_array(@credit_notes).page(params[:page]).per(20)
diff --git a/app/controllers/transactions/sales_controller.rb b/app/controllers/transactions/sales_controller.rb
index c76a6828..98b420ff 100755
--- a/app/controllers/transactions/sales_controller.rb
+++ b/app/controllers/transactions/sales_controller.rb
@@ -18,13 +18,13 @@ class Transactions::SalesController < ApplicationController
 
     if receipt_no.nil? && from.nil? && to.nil?
       if @shift.blank?
-        @sales = Sale.where("NOT sale_status='new'").shop.order("sale_id desc")
+        @sales = Sale.where("NOT sale_status='new'").order("sale_id desc")
       else
-        @sales = Sale.where("NOT sale_status='new' and shift_sale_id ='#{@shift.id}'").shop.order("sale_id desc")
+        @sales = Sale.where("NOT sale_status='new' and shift_sale_id ='#{@shift.id}'").order("sale_id desc")
       end
         @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(20)
     else
-        sale = Sale.search(receipt_no,from,to,@shift).shop
+        sale = Sale.search(receipt_no,from,to,@shift)
         if sale.count > 0
            @sales = sale
            @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(20)
diff --git a/app/models/booking.rb b/app/models/booking.rb
index 3cd13296..e3a8f6e3 100755
--- a/app/models/booking.rb
+++ b/app/models/booking.rb
@@ -135,7 +135,7 @@ class Booking < ApplicationRecord
         joins(" LEFT JOIN dining_facilities df ON df.id=bookings.dining_facility_id")
         .where("booking_id LIKE ? OR checkin_by LIKE ? OR booking_status LIKE? OR checkout_by LIKE? OR sale_id ='#{filter}' OR df.name LIKE ?","%#{filter}%","%#{filter}%","%#{filter}%","%#{filter}%","%#{filter}%")
     end
-    .shop.order("sale_id DESC")
+    .order("sale_id DESC")
   end
 
   def self.get_sync_data(sale_id)
diff --git a/app/models/dining_facility.rb b/app/models/dining_facility.rb
index 8717222e..a93f4742 100755
--- a/app/models/dining_facility.rb
+++ b/app/models/dining_facility.rb
@@ -20,7 +20,6 @@ class DiningFacility < ApplicationRecord
   ROOM_TYPE = "Room"
 
   default_scope { order('order_by asc') }
-  scope :shop, -> { where("shop_code=?",Shop.current_shop.shop_code) }
 
   scope :active, -> {where(is_active: true)}
 
diff --git a/app/models/menu.rb b/app/models/menu.rb
index 6c3d210e..a59480a6 100755
--- a/app/models/menu.rb
+++ b/app/models/menu.rb
@@ -8,7 +8,6 @@ class Menu < ApplicationRecord
   #Default Scope to pull the active version only
   default_scope { order("created_at asc") }
   scope :active, -> {where("is_active = true")}
-  scope :shop, -> { where("menus.shop_code=?",Shop.current_shop.shop_code) }
 
   def self.current_menu
     today = DateTime.now
@@ -47,7 +46,7 @@ class Menu < ApplicationRecord
     end
   end
 
-  def self.import(file, created_by,shop)
+  def self.import(file, created_by)
     status = ""
     spreadsheet = open_spreadsheet(file)
     if spreadsheet.sheets.count > 1
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 88cf2fdc..74460cdf 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -791,7 +791,7 @@ def self.daily_sales_list(from,to)
     SUM(case when (sale_payments.payment_method='giftvoucher') then sale_payments.payment_amount else 0 end) as giftvoucher_amount,
     SUM(case when (sale_payments.payment_method='foc') then sale_payments.payment_amount else 0 end) as foc_amount")
     .along_with_sale_payments_except_void_between(from, to)
-    .where("(sale_status = ? OR sale_status = ?) AND sales.receipt_date between ? AND ? ", 'completed', 'void', from, to).shop
+    .where("(sale_status = ? OR sale_status = ?) AND sales.receipt_date between ? AND ? ", 'completed', 'void', from, to)
     .group("sale_id").to_sql
 
   daily_total = connection.select_all("SELECT
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index b51aa83f..3a605f96 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -34,7 +34,7 @@ class SalePayment < ApplicationRecord
     end
   end
 
-  def self.get_kbz_pay_amount(sale_id, current_user,shop)
+  def self.get_kbz_pay_amount(sale_id, current_user)
     amount = 0
     kbz_pay_method = PaymentMethodSetting.where(:payment_method => KbzPay::KBZ_PAY).last
     sale_payment = SalePayment.where('sale_id=? and payment_method=? and payment_status!=?', sale_id, KbzPay::KBZ_PAY, 'dead').last
diff --git a/app/models/stock_check.rb b/app/models/stock_check.rb
index 541a7ea5..c2499c29 100755
--- a/app/models/stock_check.rb
+++ b/app/models/stock_check.rb
@@ -1,12 +1,11 @@
 class StockCheck < ApplicationRecord
   has_many :stock_check_items
 
-  def create(user, reason, item_list,shop)
+  def create(user, reason, item_list)
     self.reason = reason
     self.check_by = user.id
     self.check_start = Time.now
     self.check_end = Time.now
-    self.shop_code = shop.shop_code
     save
     item_list.each do |item|
       stockItem = StockCheckItem.new
diff --git a/app/models/stock_check_item.rb b/app/models/stock_check_item.rb
index 9cab250e..16699803 100755
--- a/app/models/stock_check_item.rb
+++ b/app/models/stock_check_item.rb
@@ -67,7 +67,7 @@ class StockCheckItem < ApplicationRecord
   return query
   end
 
-  def self.delete_stock_check_item(item_code,shop)
+  def self.delete_stock_check_item(item_code)
     self.where("item_code=?", item_code).delete_all
   end
 end
diff --git a/app/models/stock_journal.rb b/app/models/stock_journal.rb
index f68b61bf..3f952953 100755
--- a/app/models/stock_journal.rb
+++ b/app/models/stock_journal.rb
@@ -34,7 +34,7 @@ class StockJournal < ApplicationRecord
     return balance.to_i - qty.to_i
   end
 
-  def self.from_stock_check(item,shop)
+  def self.from_stock_check(item)
     stock_journal = StockJournal.where("item_code=?", item.item_code).order("id DESC").first
     if stock_journal.nil?
       old_blance = 0
@@ -57,7 +57,7 @@ class StockJournal < ApplicationRecord
   end
 
 
-  def self.inventory_balances(from,to, current_shop)
+  def self.inventory_balances(from,to)
     query = StockJournal.select("mii.item_instance_name as item_instance_name,balance")
           .joins("join menu_item_instances mii on mii.item_instance_code=stock_journals.item_code")
           .group("mii.item_instance_name")
@@ -76,7 +76,7 @@ class StockJournal < ApplicationRecord
     end
   end
 
-  def self.delete_stock_journal(item_code,shop)
+  def self.delete_stock_journal(item_code)
     self.where("item_code=?", item_code).delete_all
   end
 
diff --git a/app/models/zone.rb b/app/models/zone.rb
index 5d1c9309..e9ca27cb 100755
--- a/app/models/zone.rb
+++ b/app/models/zone.rb
@@ -5,7 +5,6 @@ class Zone < ApplicationRecord
  has_many :order_queue_stations
  has_many :cashier_terminals
  
- scope :shop, -> { where("shop_code=?",Shop.current_shop.shop_code) }
 
  # validations
  validates_presence_of :name, :created_by
diff --git a/app/views/settings/cashier_terminals/_form.html.erb b/app/views/settings/cashier_terminals/_form.html.erb
index c1f1d2ee..7a47bd3a 100755
--- a/app/views/settings/cashier_terminals/_form.html.erb
+++ b/app/views/settings/cashier_terminals/_form.html.erb
@@ -11,7 +11,7 @@
           <%= f.input :is_currently_login %>
           <%= f.input :auto_print_receipt %>
           <%= f.label "Select Zones", :class => 'control-label' %>
-          <%= f.collection_check_boxes :zone_ids , Zone.shop, :id, :name , :class => 'checkbox form-group'%>
+          <%= f.collection_check_boxes :zone_ids , Zone.all, :id, :name , :class => 'checkbox form-group'%>
           <% if(@server_mode != 'cloud') %>
             <%= f.input :printer_name, :as => :select, :collection => Printer::PrinterWorker.printers, include_blank: false %>
           <% else %>
diff --git a/app/views/settings/order_queue_stations/_form.html.erb b/app/views/settings/order_queue_stations/_form.html.erb
index 41185fca..3b8d120f 100755
--- a/app/views/settings/order_queue_stations/_form.html.erb
+++ b/app/views/settings/order_queue_stations/_form.html.erb
@@ -31,7 +31,7 @@ div.form-inputs span{
           <%= f.input :print_copy %>
           <%= f.hidden_field :processing_items %>
           <%= f.label "Select Zones", :class => 'control-label' %>
-          <%= f.collection_check_boxes :zone_ids , Zone.shop, :id, :name , :class => 'checkbox'%>
+          <%= f.collection_check_boxes :zone_ids , Zone.all, :id, :name , :class => 'checkbox'%>
           <%= f.input :cut_per_item %>
           <%= f.input :use_alternate_name %>
           <%= f.input :processing_items, as: :hidden %>