clean shop code

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
 

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
 

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

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}

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.' }

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

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.' }

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

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

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)

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?

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)
 

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

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.' }

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.' }

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

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

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.' }

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.' }

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.' }

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.' }

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.' }

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.' }

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.' }

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.' }

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

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.' }

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

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.' }

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