From 66c375cc3831fa8e5546ad7bfd452f1c14f8132d Mon Sep 17 00:00:00 2001
From: Zin Moe <zin.moe@code2lab.com>
Date: Mon, 13 Jan 2020 16:23:33 +0630
Subject: [PATCH] clean shop code

---
 app/controllers/crm/dining_queues_controller.rb      |  1 -
 app/controllers/foodcourt/addorders_controller.rb    |  1 -
 app/controllers/foodcourt/surveys_controller.rb      |  1 -
 .../inventory/inventory_definitions_controller.rb    |  1 -
 .../inventory/stock_journals_controller.rb           |  1 -
 app/controllers/origami/surveys_controller.rb        |  1 -
 app/controllers/print_settings_controller.rb         |  1 -
 app/controllers/reports/credit_payment_controller.rb |  2 +-
 app/controllers/reports/payment_method_controller.rb |  2 +-
 app/controllers/reports/saleitem_controller.rb       |  4 ++--
 app/controllers/reports/shiftsale_controller.rb      |  2 +-
 app/controllers/reports/staff_meal_controller.rb     |  2 +-
 app/controllers/reports/void_sale_controller.rb      |  2 +-
 app/controllers/settings/accounts_controller.rb      |  1 -
 .../settings/cashier_terminals_controller.rb         |  1 -
 app/controllers/settings/commissioners_controller.rb |  1 -
 app/controllers/settings/commissions_controller.rb   |  1 -
 app/controllers/settings/employees_controller.rb     |  1 -
 app/controllers/settings/lookups_controller.rb       |  1 -
 .../settings/membership_actions_controller.rb        |  1 -
 .../settings/membership_settings_controller.rb       |  1 -
 app/controllers/settings/menus_controller.rb         |  1 -
 .../settings/order_queue_stations_controller.rb      |  1 -
 .../settings/payment_method_settings_controller.rb   |  1 -
 app/controllers/settings/products_controller.rb      |  1 -
 app/controllers/settings/promotions_controller.rb    |  1 -
 app/controllers/settings/rooms_controller.rb         |  1 -
 app/controllers/settings/tables_controller.rb        |  1 -
 app/controllers/settings/tax_profiles_controller.rb  |  1 -
 app/controllers/settings/zones_controller.rb         |  1 -
 app/models/assigned_order_item.rb                    |  1 -
 app/models/inventory_definition.rb                   |  2 +-
 app/models/menu.rb                                   | 12 ++++++------
 app/models/payment_journal.rb                        |  2 --
 app/models/sale.rb                                   |  8 ++++----
 app/models/shift_sale.rb                             |  1 -
 app/models/stock_journal.rb                          |  6 ++----
 37 files changed, 20 insertions(+), 50 deletions(-)

diff --git a/app/controllers/crm/dining_queues_controller.rb b/app/controllers/crm/dining_queues_controller.rb
index da0fe6fa..68f8e8d2 100755
--- a/app/controllers/crm/dining_queues_controller.rb
+++ b/app/controllers/crm/dining_queues_controller.rb
@@ -40,7 +40,6 @@ class Crm::DiningQueuesController < BaseCrmController
   # POST /crm/dining_queues.json
   def create
     @dining_queue = DiningQueue.new(dining_queue_params)
-    @dining_queue.shop_code = @shop.shop_code
     respond_to do |format|
       if @dining_queue.save
 
diff --git a/app/controllers/foodcourt/addorders_controller.rb b/app/controllers/foodcourt/addorders_controller.rb
index 79ffdb37..0141c9ae 100755
--- a/app/controllers/foodcourt/addorders_controller.rb
+++ b/app/controllers/foodcourt/addorders_controller.rb
@@ -135,7 +135,6 @@ class Foodcourt::AddordersController < BaseFoodcourtController
     @order.new_booking = true
     @order.waiters = current_login_employee.name
     @order.employee_name = current_login_employee.name
-    @order.shop_code = @shop.shop_code
     @order.is_extra_time = is_extra_time
     @order.extra_time    = extra_time
 
diff --git a/app/controllers/foodcourt/surveys_controller.rb b/app/controllers/foodcourt/surveys_controller.rb
index e664aca2..8d94a0e1 100644
--- a/app/controllers/foodcourt/surveys_controller.rb
+++ b/app/controllers/foodcourt/surveys_controller.rb
@@ -76,7 +76,6 @@ class Foodcourt::SurveysController < BaseFoodcourtController
 			@survey = Survey.new(survey_params)
 			@survey.shift_id = shift_by_terminal.id
 			@survey.foreigner = params["survey"]["foreigner"].to_json
-			@survey.shop_code = @shop.shop_code
 			# respond_to do |format|
 			  if @survey.save
 			     redirect_to @url
diff --git a/app/controllers/inventory/inventory_definitions_controller.rb b/app/controllers/inventory/inventory_definitions_controller.rb
index 6b339958..bd1b9bbc 100755
--- a/app/controllers/inventory/inventory_definitions_controller.rb
+++ b/app/controllers/inventory/inventory_definitions_controller.rb
@@ -39,7 +39,6 @@ class Inventory::InventoryDefinitionsController < BaseInventoryController
       @inventory_definition.min_order_level = params[:min_order_level]
       @inventory_definition.max_stock_level = inventory.max_stock_level.to_i + params[:max_stock_level].to_i
     end
-    @inventory_definition.shop_code = @shop.shop_code
     @inventory_definition.created_by = current_user.id
     if @inventory_definition.save
       result = {:status=> true, :message => "Inventory definition was created successfully",:data=> @inventory_definition}
diff --git a/app/controllers/inventory/stock_journals_controller.rb b/app/controllers/inventory/stock_journals_controller.rb
index cdba207e..49439456 100755
--- a/app/controllers/inventory/stock_journals_controller.rb
+++ b/app/controllers/inventory/stock_journals_controller.rb
@@ -25,7 +25,6 @@ class StockJournalsController < ApplicationController
   # POST /stock_journals.json
   def create
     @stock_journal = StockJournal.new(stock_journal_params)
-    @stock_journal.shop_code = @shop.shop_code
     respond_to do |format|
       if @stock_journal.save
         format.html { redirect_to @stock_journal, notice: 'Stock journal was successfully created.' }
diff --git a/app/controllers/origami/surveys_controller.rb b/app/controllers/origami/surveys_controller.rb
index 126f7d11..45af74fd 100644
--- a/app/controllers/origami/surveys_controller.rb
+++ b/app/controllers/origami/surveys_controller.rb
@@ -76,7 +76,6 @@ class Origami::SurveysController < BaseOrigamiController
 			@survey = Survey.new(survey_params)
 			@survey.shift_id = shift_by_terminal.id
 			@survey.foreigner = params["survey"]["foreigner"].to_json
-			@survey.shop_code = @shop.shop_code
 			# respond_to do |format|
 			  if @survey.save
 			     redirect_to @url
diff --git a/app/controllers/print_settings_controller.rb b/app/controllers/print_settings_controller.rb
index 0ca6a65a..8931bc07 100755
--- a/app/controllers/print_settings_controller.rb
+++ b/app/controllers/print_settings_controller.rb
@@ -30,7 +30,6 @@ class PrintSettingsController < ApplicationController
   # POST /print_settings.json
   def create
     @print_setting = PrintSetting.new(print_setting_params)
-    @print_setting.shop_code = @shop.shop_code
     respond_to do |format|
       if @print_setting.save
         format.html { redirect_to @print_setting, notice: 'Print setting was successfully created.' }
diff --git a/app/controllers/reports/credit_payment_controller.rb b/app/controllers/reports/credit_payment_controller.rb
index 76465bd8..7b9fd55b 100755
--- a/app/controllers/reports/credit_payment_controller.rb
+++ b/app/controllers/reports/credit_payment_controller.rb
@@ -20,7 +20,7 @@ authorize_resource :class => false
 
 	    @filter 	= params[:filter_check]
 	    @order_source  = params[:order_source]
-        @sale_data = Sale.get_by_shift_sale_credit_payment(@shift_sale_range,@shift,from,to,@filter,@order_source,@shop.shop_code)
+        @sale_data = Sale.get_by_shift_sale_credit_payment(@shift_sale_range,@shift,from,to,@filter,@order_source)
 
         @from       = from
         @to         = to
diff --git a/app/controllers/reports/payment_method_controller.rb b/app/controllers/reports/payment_method_controller.rb
index c0f475d2..c9983b9f 100644
--- a/app/controllers/reports/payment_method_controller.rb
+++ b/app/controllers/reports/payment_method_controller.rb
@@ -21,7 +21,7 @@ class Reports::PaymentMethodController < BaseReportController
 	      end
 	    end
 	    @payment_type = params[:payment_type]
-        @sale_data,@pyament_method = Sale.get_payment_method_by_shift(@shift_sale_range,@shift,from,to,@payment_type,@shop.shop_code)
+        @sale_data,@pyament_method = Sale.get_payment_method_by_shift(@shift_sale_range,@shift,from,to,@payment_type)
         @from       = from
         @to         = to
         # get printer info
diff --git a/app/controllers/reports/saleitem_controller.rb b/app/controllers/reports/saleitem_controller.rb
index 68271c60..eb526b22 100755
--- a/app/controllers/reports/saleitem_controller.rb
+++ b/app/controllers/reports/saleitem_controller.rb
@@ -25,7 +25,7 @@ class Reports::SaleitemController < BaseReportController
 
     account_type = params[:account_type]
     @type = params[:sale_type]
-    @sale_data, @other_charges,@product, @discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_by_shift_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED,@type,account_type,@shop.shop_code)
+    @sale_data, @other_charges,@product, @discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_by_shift_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED,@type,account_type)
 
     @sale_taxes = Sale.get_separate_tax(shift_sale_range,shift,from,to,nil)
     @account_cate_count = Hash.new {|hash, key| hash[key] = 0}
@@ -114,7 +114,7 @@ class Reports::SaleitemController < BaseReportController
     @type = params[:period_type]
     period_name = get_period_name(params[:period])
 
-    @sale_data, @other_charges,@product, @discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_by_shift_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED,@type,account_type,@shop.shop_code)
+    @sale_data, @other_charges,@product, @discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_by_shift_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED,@type,account_type)
     other_charges = Sale.get_other_charges()
     if shift.present?
       @total_other_charges = other_charges.where("sales.shift_sale_id IN (?) and sale_status='completed'",shift.to_a)
diff --git a/app/controllers/reports/shiftsale_controller.rb b/app/controllers/reports/shiftsale_controller.rb
index 89a83014..a5231f4d 100755
--- a/app/controllers/reports/shiftsale_controller.rb
+++ b/app/controllers/reports/shiftsale_controller.rb
@@ -8,7 +8,7 @@ class Reports::ShiftsaleController < BaseReportController
     if params[:shift_name].to_i != 0
             @shift = ShiftSale.find(params[:shift_name])
     end
-    @sale_data = Sale.get_by_shiftsales(from,to,@shift,@shop.shop_code)
+    @sale_data = Sale.get_by_shiftsales(from,to,@shift)
     @from       = from
     @to         = to
     if @shift.present?
diff --git a/app/controllers/reports/staff_meal_controller.rb b/app/controllers/reports/staff_meal_controller.rb
index ccd7415c..71d363ba 100644
--- a/app/controllers/reports/staff_meal_controller.rb
+++ b/app/controllers/reports/staff_meal_controller.rb
@@ -32,7 +32,7 @@ class Reports::StaffMealController < BaseReportController
 
     account_type = params[:account_type]
 
-    @sale_data, @other_charges,@product, @discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_staff_meal_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED,account_type,customer_id,@shop.shop_code)
+    @sale_data, @other_charges,@product, @discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_staff_meal_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED,account_type,customer_id)
 
     @sale_taxes = Sale.get_separate_tax(shift_sale_range,shift,from,to,nil)
 
diff --git a/app/controllers/reports/void_sale_controller.rb b/app/controllers/reports/void_sale_controller.rb
index 82d44f5a..0dc6032a 100755
--- a/app/controllers/reports/void_sale_controller.rb
+++ b/app/controllers/reports/void_sale_controller.rb
@@ -16,7 +16,7 @@ authorize_resource :class => false
 	      end
 	    end
 
-        @sale_data = Sale.get_void_sale(@shift,from,to,@shop.shop_code)
+        @sale_data = Sale.get_void_sale(@shift,from,to)
 
         @from       = from
         @to         = to
diff --git a/app/controllers/settings/accounts_controller.rb b/app/controllers/settings/accounts_controller.rb
index 0f5b0ba7..fe45d957 100755
--- a/app/controllers/settings/accounts_controller.rb
+++ b/app/controllers/settings/accounts_controller.rb
@@ -28,7 +28,6 @@ class Settings::AccountsController < ApplicationController
   def create
      
     @settings_account = Account.new(account_params)
-    @settings_account.shop_code = @shop.shop_code
     respond_to do |format|
       if @settings_account.save
         format.html { redirect_to settings_accounts_url, notice: 'Account was successfully created.' }
diff --git a/app/controllers/settings/cashier_terminals_controller.rb b/app/controllers/settings/cashier_terminals_controller.rb
index 2e1d63c1..eeea0f9f 100755
--- a/app/controllers/settings/cashier_terminals_controller.rb
+++ b/app/controllers/settings/cashier_terminals_controller.rb
@@ -29,7 +29,6 @@ class Settings::CashierTerminalsController < ApplicationController
   def create
      
     @settings_cashier_terminal = CashierTerminal.new(settings_cashier_terminal_params)
-    @settings_cashier_terminal.shop_code = @shop.shop_code
     respond_to do |format|
       if @settings_cashier_terminal.save
         format.html { redirect_to settings_cashier_terminals_path, notice: 'Cashier terminal was successfully created.' }
diff --git a/app/controllers/settings/commissioners_controller.rb b/app/controllers/settings/commissioners_controller.rb
index 24cc484b..752b0397 100755
--- a/app/controllers/settings/commissioners_controller.rb
+++ b/app/controllers/settings/commissioners_controller.rb
@@ -31,7 +31,6 @@ class Settings::CommissionersController < ApplicationController
      
     @commissioner = Commissioner.new(commissioner_params)
     @commissioner.created_by = current_user.id
-    @commissioner.shop_code = @shop.shop_code
     unless @commissioner.joined_date.nil?
       @commissioner.joined_date = @commissioner.joined_date.utc.getlocal.strftime('%Y-%b-%d')
     end
diff --git a/app/controllers/settings/commissions_controller.rb b/app/controllers/settings/commissions_controller.rb
index 60778dab..20cc432c 100755
--- a/app/controllers/settings/commissions_controller.rb
+++ b/app/controllers/settings/commissions_controller.rb
@@ -32,7 +32,6 @@ class Settings::CommissionsController < ApplicationController
     @commission = Commission.new(commission_params)
     @commission.product_type = 'menu_item'
     @commission.product_code = "[]"
-    @commission.shop_code = @shop.shop_code
 
     respond_to do |format|
       if @commission.save
diff --git a/app/controllers/settings/employees_controller.rb b/app/controllers/settings/employees_controller.rb
index 74c8b410..448816f5 100755
--- a/app/controllers/settings/employees_controller.rb
+++ b/app/controllers/settings/employees_controller.rb
@@ -31,7 +31,6 @@ class Settings::EmployeesController < ApplicationController
   # POST /employees.json
   def create
     @employee = Employee.new(employee_params)
-    @employee.shop_code =@shop.shop_code
     respond_to do |format|
       if @employee.save
         format.html { redirect_to settings_employees_path, notice: 'Employee was successfully created.' }
diff --git a/app/controllers/settings/lookups_controller.rb b/app/controllers/settings/lookups_controller.rb
index 87c81842..6f7a2bb0 100755
--- a/app/controllers/settings/lookups_controller.rb
+++ b/app/controllers/settings/lookups_controller.rb
@@ -25,7 +25,6 @@ class Settings::LookupsController < ApplicationController
   # POST /settings/lookups.json
   def create
     @settings_lookup = Lookup.new(settings_lookup_params)
-    @settings_lookup.shop_code = @shop.shop_code
     respond_to do |format|
       if @settings_lookup.save
         format.html { redirect_to settings_lookups_path, notice: 'Lookup was successfully created.' }
diff --git a/app/controllers/settings/membership_actions_controller.rb b/app/controllers/settings/membership_actions_controller.rb
index f6eb77bf..cca64594 100755
--- a/app/controllers/settings/membership_actions_controller.rb
+++ b/app/controllers/settings/membership_actions_controller.rb
@@ -27,7 +27,6 @@ class Settings::MembershipActionsController < ApplicationController
   def create
      
     @settings_membership_action = MembershipAction.new(settings_membership_action_params)
-    @settings_membership_action.shop_code = @shop.shop_code
     respond_to do |format|
       if @settings_membership_action.save
         format.html { redirect_to settings_membership_actions_path, notice: 'Membership action was successfully created.' }
diff --git a/app/controllers/settings/membership_settings_controller.rb b/app/controllers/settings/membership_settings_controller.rb
index 2e128ce0..3cf97628 100755
--- a/app/controllers/settings/membership_settings_controller.rb
+++ b/app/controllers/settings/membership_settings_controller.rb
@@ -27,7 +27,6 @@ class Settings::MembershipSettingsController < ApplicationController
   def create
      
     @settings_membership_setting = MembershipSetting.new(settings_membership_setting_params)
-    @settings_membership_setting.shop_code = @shop.shop_code
     respond_to do |format|
       if @settings_membership_setting.save
         format.html { redirect_to settings_membership_settings_path, notice: 'Membership setting was successfully created.' }
diff --git a/app/controllers/settings/menus_controller.rb b/app/controllers/settings/menus_controller.rb
index f448b959..89cb4dec 100755
--- a/app/controllers/settings/menus_controller.rb
+++ b/app/controllers/settings/menus_controller.rb
@@ -34,7 +34,6 @@ class Settings::MenusController < ApplicationController
      
     @settings_menu = Menu.new(settings_menu_params)
     @settings_menu.created_by = current_login_employee.name
-    @settings_menu.shop_code = @shop.shop_code
     respond_to do |format|
       if @settings_menu.save
         format.html { redirect_to settings_menus_path, notice: 'Menu was successfully created.' }
diff --git a/app/controllers/settings/order_queue_stations_controller.rb b/app/controllers/settings/order_queue_stations_controller.rb
index e3a30d1f..762168e2 100755
--- a/app/controllers/settings/order_queue_stations_controller.rb
+++ b/app/controllers/settings/order_queue_stations_controller.rb
@@ -33,7 +33,6 @@ class Settings::OrderQueueStationsController < ApplicationController
     @settings_order_queue_station = OrderQueueStation.new(settings_order_queue_station_params)
     @settings_order_queue_station.created_by = current_login_employee.name
     @settings_order_queue_station.processing_items = "[]"
-    @settings_order_queue_station.shop_code = @shop.shop_code
     respond_to do |format|
       if @settings_order_queue_station.save
         format.html { redirect_to settings_order_queue_stations_path, notice: 'Order queue station was successfully created.' }
diff --git a/app/controllers/settings/payment_method_settings_controller.rb b/app/controllers/settings/payment_method_settings_controller.rb
index e85e7a99..8850c2c6 100755
--- a/app/controllers/settings/payment_method_settings_controller.rb
+++ b/app/controllers/settings/payment_method_settings_controller.rb
@@ -26,7 +26,6 @@ class Settings::PaymentMethodSettingsController < ApplicationController
   # POST /settings/payment_method_settings.json
   def create
     @settings_payment_method_setting = PaymentMethodSetting.new(settings_payment_method_setting_params)
-    @settings_payment_method_setting.shop_code = @shop.shop_code
     respond_to do |format|
       if @settings_payment_method_setting.save
         format.html { redirect_to settings_payment_method_settings_path, notice: 'Payment method setting was successfully created.' }
diff --git a/app/controllers/settings/products_controller.rb b/app/controllers/settings/products_controller.rb
index 4562d132..a8f64c25 100755
--- a/app/controllers/settings/products_controller.rb
+++ b/app/controllers/settings/products_controller.rb
@@ -29,7 +29,6 @@ load_and_authorize_resource except: [:create]
      
     @settings_product = Product.new(settings_product_params)
     @settings_product.created_by = current_user.name
-    @settings_product.shop_code = @shop.shop_code
     respond_to do |format|
       if @settings_product.save
         format.html { redirect_to settings_products_path, notice: 'Product was successfully created.' }
diff --git a/app/controllers/settings/promotions_controller.rb b/app/controllers/settings/promotions_controller.rb
index 442a2063..42ede2d4 100755
--- a/app/controllers/settings/promotions_controller.rb
+++ b/app/controllers/settings/promotions_controller.rb
@@ -31,7 +31,6 @@ class Settings::PromotionsController < ApplicationController
      
     @promotion = Promotion.new(promotion_params)
     @promotion.created_by = current_login_employee.id
-    @promotion.shop_code = @shop.shop_code
     if !@promotion.promo_start_hour.nil?
       @promotion.promo_start_hour = @promotion.promo_start_hour.to_datetime.advance(hours: +6, minutes: +30)
     end
diff --git a/app/controllers/settings/rooms_controller.rb b/app/controllers/settings/rooms_controller.rb
index 6617720c..a9410248 100755
--- a/app/controllers/settings/rooms_controller.rb
+++ b/app/controllers/settings/rooms_controller.rb
@@ -30,7 +30,6 @@ class Settings::RoomsController < ApplicationController
     @settings_room.type = DiningFacility::ROOM_TYPE
     @settings_room.zone_id = params[:zone_id]
     @settings_room.created_by = current_login_employee.name
-    @settings_room.shop_code = @shop.shop_code
     respond_to do |format|
       if @settings_room.save
         format.html { redirect_to settings_zone_path(@zone), notice: 'Room was successfully created.' }
diff --git a/app/controllers/settings/tables_controller.rb b/app/controllers/settings/tables_controller.rb
index ed4afe37..b261a445 100755
--- a/app/controllers/settings/tables_controller.rb
+++ b/app/controllers/settings/tables_controller.rb
@@ -29,7 +29,6 @@ class Settings::TablesController < ApplicationController
     @settings_table = Table.new(settings_table_params)
     @settings_table.type = DiningFacility::TABLE_TYPE
     @settings_table.zone_id = params[:zone_id]
-    @settings_table.shop_code = @shop.shop_code
     @settings_table.created_by = current_login_employee.name
     respond_to do |format|
       if @settings_table.save
diff --git a/app/controllers/settings/tax_profiles_controller.rb b/app/controllers/settings/tax_profiles_controller.rb
index 51a8880f..ddf4781a 100755
--- a/app/controllers/settings/tax_profiles_controller.rb
+++ b/app/controllers/settings/tax_profiles_controller.rb
@@ -48,7 +48,6 @@ class Settings::TaxProfilesController < ApplicationController
      
     @settings_tax_profile = TaxProfile.new(settings_tax_profile_params)
     @settings_tax_profile.created_by = current_login_employee.name
-    @settings_tax_profile.shop_code = @shop.shop_code
     respond_to do |format|
       if @settings_tax_profile.save
         format.html { redirect_to settings_tax_profiles_path, notice: 'Tax profile was successfully created.' }
diff --git a/app/controllers/settings/zones_controller.rb b/app/controllers/settings/zones_controller.rb
index 1c1524ae..27193c2b 100755
--- a/app/controllers/settings/zones_controller.rb
+++ b/app/controllers/settings/zones_controller.rb
@@ -30,7 +30,6 @@ class Settings::ZonesController < ApplicationController
   def create
      
     @settings_zone = Zone.new(settings_zone_params)
-    @settings_zone.shop_code =@shop.shop_code
     @settings_zone.created_by = current_login_employee.name
     respond_to do |format|
       if @settings_zone.save
diff --git a/app/models/assigned_order_item.rb b/app/models/assigned_order_item.rb
index bd20e447..d77248d8 100755
--- a/app/models/assigned_order_item.rb
+++ b/app/models/assigned_order_item.rb
@@ -36,7 +36,6 @@ class AssignedOrderItem < ApplicationRecord
       assigned_order_item.order_queue_station = order_queue_station
       assigned_order_item.print_status = false
       assigned_order_item.delivery_status = false
-      assigned_order_item.shop_code =order.shop_code
       assigned_order_item.save!
   end
 
diff --git a/app/models/inventory_definition.rb b/app/models/inventory_definition.rb
index 6be91da4..a1393556 100755
--- a/app/models/inventory_definition.rb
+++ b/app/models/inventory_definition.rb
@@ -8,7 +8,7 @@ class InventoryDefinition < ApplicationRecord
     logger.debug saleObj.sale_items.to_json
     if !saleObj.nil?
       saleObj.sale_items.each do |item|
-        found, inventory_definition = find_product_in_inventory(item,saleObj.shop_code)
+        found, inventory_definition = find_product_in_inventory(item)
         if found
           check_balance(item,inventory_definition)
         end
diff --git a/app/models/menu.rb b/app/models/menu.rb
index d9c98e01..6c3d210e 100755
--- a/app/models/menu.rb
+++ b/app/models/menu.rb
@@ -62,9 +62,9 @@ class Menu < ApplicationRecord
              # Account.create(id:row["id"], title: row["title"],account_type: row["account_type"],discount: row["discount"],point: row["point"],bonus: row["bonus"],rebate: row["rebate"])
              account = Account.find_by_id(row["id"])
             if account
-              Account.create(title: row["title"],account_type: row["account_type"],discount: row["discount"],point: row["point"],bonus: row["bonus"],rebate: row["rebate"],shop_code: shop.shop_code)
+              Account.create(title: row["title"],account_type: row["account_type"],discount: row["discount"],point: row["point"],bonus: row["bonus"],rebate: row["rebate"])
             else
-              Account.create(id:row["id"], title: row["title"],account_type: row["account_type"],discount: row["discount"],point: row["point"],bonus: row["bonus"],rebate: row["rebate"],shop_code: shop.shop_code)
+              Account.create(id:row["id"], title: row["title"],account_type: row["account_type"],discount: row["discount"],point: row["point"],bonus: row["bonus"],rebate: row["rebate"])
             end
           elsif sheet_name == "Item Set"
              # ItemSet.create(id:row["id"], name: row[name], alt_name: row[alt_name], min_selectable_qty: row[min_selectable_qty], max_selectable_qty: row[max_selectable_qty])
@@ -93,9 +93,9 @@ class Menu < ApplicationRecord
           elsif sheet_name == "Menu"
             menu = Menu.find_by_id(row["id"])
             if menu
-              Menu.create(name: row["name"], is_active: row["is_active"], is_ordering: row["is_ordering"], valid_days: row["valid_days"],valid_time_from: row["valid_time_from"], valid_time_to: row["valid_time_to"], created_by: row["created_by"],shop_code: shop.shop_code)
+              Menu.create(name: row["name"], is_active: row["is_active"], is_ordering: row["is_ordering"], valid_days: row["valid_days"],valid_time_from: row["valid_time_from"], valid_time_to: row["valid_time_to"], created_by: row["created_by"])
             else
-              Menu.create(id:row["id"], name: row["name"], is_active: row["is_active"], is_ordering: row["is_ordering"], valid_days: row["valid_days"],valid_time_from: row["valid_time_from"], valid_time_to: row["valid_time_to"], created_by: row["created_by"],shop_code: shop.shop_code)
+              Menu.create(id:row["id"], name: row["name"], is_active: row["is_active"], is_ordering: row["is_ordering"], valid_days: row["valid_days"],valid_time_from: row["valid_time_from"], valid_time_to: row["valid_time_to"], created_by: row["created_by"])
             end
           elsif sheet_name == "Menu Category"
              # MenuCategory.create(id:row["id"], menu_id: row["menu_id"], code: row["code"], name: row["name"], alt_name: row["alt_name"], order_by: row["order_by"], created_by: row["created_by"], menu_category_id: row["menu_category_id"], is_available: row["is_available"])
@@ -155,7 +155,7 @@ class Menu < ApplicationRecord
       menu = sheet.row(1)[1]
       is_ordering = sheet.row(1)[3]?sheet.row(1)[3]:0
 
-      imported_menu = Menu.create({name: menu, is_active: true, is_ordering: is_ordering, valid_days: "1,2,3,4,5,6,7",valid_time_from: "00:00:00", valid_time_to: "23:59:59", created_by: created_by,shop_code: shop.shop_code})
+      imported_menu = Menu.create({name: menu, is_active: true, is_ordering: is_ordering, valid_days: "1,2,3,4,5,6,7",valid_time_from: "00:00:00", valid_time_to: "23:59:59", created_by: created_by})
 
       (4..sheet.last_row).each do |ii|
           row = Hash[[sheet.row(3),sheet.row(ii)].transpose]
@@ -194,7 +194,7 @@ class Menu < ApplicationRecord
           if !menu_itm
             account = Account.find_by_title(row["Account"])
             if account.nil?
-              account = Account.create({title: row["Account"], account_type: "0",shop_code: shop.shop_code})
+              account = Account.create({title: row["Account"], account_type: "0"})
             end
 
             image_path = ""
diff --git a/app/models/payment_journal.rb b/app/models/payment_journal.rb
index 51b7fdf3..1b195329 100755
--- a/app/models/payment_journal.rb
+++ b/app/models/payment_journal.rb
@@ -8,7 +8,6 @@ class PaymentJournal < ApplicationRecord
     self.payment_status = 'paid'
     self.payment_method_references = payment_method_reference
     self.created_by = current_user.id
-    self.shop_code = current_user.shop_code
     self.save
   end
 
@@ -18,7 +17,6 @@ class PaymentJournal < ApplicationRecord
     self.debit_amount = amount
     self.payment_status = 'paid'
     self.created_by = current_user.id
-    self.shop_code = current_user.shop_code
     self.save
   end
 
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 2788f449..88cf2fdc 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -847,7 +847,7 @@ def self.get_by_range_by_saleitems(from,to,status,report_type)
   query = query.where("(receipt_date between ? and ? and sale_status=?) AND i.unit_price <> 0",from,to,status)
 end
 
-def self.get_by_shiftsales(from,to,shift,shop_code)
+def self.get_by_shiftsales(from,to,shift)
   if !shift.blank?
     query = ShiftSale.where("shift_sales.id =?",shift.id)
   else
@@ -972,7 +972,7 @@ def self.get_other_charges()
   query = query.group("i.sale_item_id")
 end
 
-def self.get_by_shift_items(shift_sale_range, shift, from, to, status,type,account_type,shop_code)
+def self.get_by_shift_items(shift_sale_range, shift, from, to, status,type,account_type)
   # date_type_selection = get_sql_function_for_report_type(report_type)
   if account_type.blank?
     account_type = ''
@@ -1254,7 +1254,7 @@ def self.get_shift_sales_by_receipt_no_detail(shift_sale_range,shift,from,to,pay
     return query
 end
 
-def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to,filter,order_source,shop_code)
+def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to,filter,order_source)
   payments_for_credits = SalePayment.select("
     sales.sale_id,
     DATE_FORMAT(CONVERT_TZ(sale_payments.created_at,'+00:00','+06:30'),'%d %b %y %h:%i%p') as credit_payment_receipt_date,
@@ -1310,7 +1310,7 @@ def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to,filter,
   credits   = credits.group("sale_payments.sale_payment_id, sales_sale_payments.sale_id")
 end
 
- def self.get_void_sale(shift,from,to,shop_code)
+ def self.get_void_sale(shift,from,to)
      sale_arr = Array.new
 
      query = Sale.select("sales.receipt_no,sales.receipt_date, sales.payment_status, sales.sale_status,sales.total_amount,sales.grand_total, sales.rounding_adjustment")
diff --git a/app/models/shift_sale.rb b/app/models/shift_sale.rb
index 9717f9e5..59432f0b 100755
--- a/app/models/shift_sale.rb
+++ b/app/models/shift_sale.rb
@@ -83,7 +83,6 @@ class ShiftSale < ApplicationRecord
     self.shift_started_at = DateTime.now
     self.employee_id = current_user.id
     self.opening_balance = opening_balance
-    self.shop_code = current_user.shop_code
     self.other_sales = 0
     self.save
   end
diff --git a/app/models/stock_journal.rb b/app/models/stock_journal.rb
index f84c6204..f68b61bf 100755
--- a/app/models/stock_journal.rb
+++ b/app/models/stock_journal.rb
@@ -26,8 +26,7 @@ class StockJournal < ApplicationRecord
       inventory_definition_id: inventory_definition.id,
       remark: stock_message,
       trans_ref: trans_ref,
-      trans_type: trans_type,
-      shop_code: inventory_definition.shop_code
+      trans_type: trans_type
     )
   end
 
@@ -39,7 +38,7 @@ class StockJournal < ApplicationRecord
     stock_journal = StockJournal.where("item_code=?", item.item_code).order("id DESC").first
     if stock_journal.nil?
       old_blance = 0
-      inventory_definition_id = InventoryDefinition.find_by_item_code_and_shop_code(item.item_code,shop.shop_code).id
+      inventory_definition_id = InventoryDefinition.find_by_item_code(item.item_code).id
     else
       old_blance = stock_journal.balance
       inventory_definition_id = stock_journal.inventory_definition_id
@@ -54,7 +53,6 @@ class StockJournal < ApplicationRecord
     journal.remark = StockJournal::STOCK_CHECK_TRANS
     journal.trans_ref = item.id
     journal.trans_type = StockJournal::STOCK_CHECK_TRANS
-    journal.shop_code = shop.shop_code
     journal.save
   end