replace @shop and shop_details with current_shop

app/controllers/origami/alipay_controller.rb

@@ -23,7 +23,7 @@ class Origami::AlipayController < BaseOrigamiController
 
       others    = 0
 
-      if @shop.is_rounding_adj
+      if current_shop.is_rounding_adj
            new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
       else
           new_total    = sale_data.grand_total

app/controllers/origami/credit_payments_controller.rb

@@ -8,7 +8,7 @@ class Origami::CreditPaymentsController < BaseOrigamiController
     total     = sale_data.grand_total
     @creditcount = 0
     others = 0
-    if @shop.is_rounding_adj
+    if current_shop.is_rounding_adj
          new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
     else
         new_total    = sale_data.grand_total

app/controllers/origami/dinga_controller.rb

@@ -6,7 +6,7 @@ class Origami::DingaController < BaseOrigamiController
      @membership_rebate_balance=0
      @sale_data = Sale.find_by_sale_id(@sale_id)
      @receipt_no = @sale_data.receipt_no
-          if @shop.is_rounding_adj
+          if current_shop.is_rounding_adj
                new_total    = Sale.get_rounding_adjustment(@sale_data.grand_total)
           else
               new_total    = @sale_data.grand_total

app/controllers/origami/gift_voucher_controller.rb

@@ -17,7 +17,7 @@ class Origami::GiftVoucherController < BaseOrigamiController
 
       others    = 0
 
-      if @shop.is_rounding_adj
+      if current_shop.is_rounding_adj
            new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
       else
           new_total    = sale_data.grand_total

app/controllers/origami/home_controller.rb

@@ -33,7 +33,7 @@ class Origami::HomeController < BaseOrigamiController
     @status_sale = ""
     @sale_array = Array.new
 
-    @shop =  shop_detail
+    @shop =  current_shop
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
     @dining_booking = @dining.current_bookings

app/controllers/origami/jcb_controller.rb

@@ -24,7 +24,7 @@ class Origami::JcbController < BaseOrigamiController
 
       others = 0
 
-      if @shop.is_rounding_adj
+      if current_shop.is_rounding_adj
            new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
       else
           new_total    = sale_data.grand_total

app/controllers/origami/junction_pay_controller.rb

@@ -11,7 +11,7 @@ class Origami::JunctionPayController < BaseOrigamiController
     @cashier_id = current_user.emp_id
 
     @payment_method_setting_nav = PaymentMethodSetting.all
-    if @shop.is_rounding_adj
+    if current_shop.is_rounding_adj
          new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
     else
         new_total    = sale_data.grand_total

app/controllers/origami/master_controller.rb

@@ -23,7 +23,7 @@ class Origami::MasterController < BaseOrigamiController
 
       others = 0
 
-      if @shop.is_rounding_adj
+      if current_shop.is_rounding_adj
            new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
       else
           new_total    = sale_data.grand_total

app/controllers/origami/mpu_controller.rb

@@ -22,7 +22,7 @@ class Origami::MpuController < BaseOrigamiController
 
       others    = 0
 
-      if @shop.is_rounding_adj && (!path.include? ("credit_payment"))
+      if current_shop.is_rounding_adj && (!path.include? ("credit_payment"))
            new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
       else
           new_total    = sale_data.grand_total

app/controllers/origami/paymal_controller.rb

@@ -6,7 +6,7 @@ class Origami::PaymalController < BaseOrigamiController
   @membership_rebate_balance=0
   sale_data = Sale.find_by_sale_id(@sale_id)
   @receipt_no = sale_data.receipt_no
-  if @shop.is_rounding_adj
+  if current_shop.is_rounding_adj
        new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
   else
       new_total    = sale_data.grand_total

app/controllers/origami/payments_controller.rb

@@ -65,7 +65,7 @@ class Origami::PaymentsController < BaseOrigamiController
       end
     end
 
-    filename, receipt_no, cashier_printer = printer.print_receipt_bill(print_settings, status, qr, cashier_terminal, sale_items, sale_data, customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, nil, @shop, "Frt", current_balance, nil, other_amount, nil, nil, nil)
+    filename, receipt_no, cashier_printer = printer.print_receipt_bill(print_settings, status, qr, cashier_terminal, sale_items, sale_data, customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, nil, current_shop, "Frt", current_balance, nil, other_amount, nil, nil, nil)
 
     result = {
       :filepath => filename,
@@ -202,7 +202,7 @@ class Origami::PaymentsController < BaseOrigamiController
         other_amount = SaleItem.calculate_other_charges(sale_items)
 
         printer = Printer::ReceiptPrinter.new(print_settings)
-        filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings, false, nil, cashier_terminal, sale_items, saleObj, customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, rebate_amount, @shop, "Paid", current_balance, card_data, other_amount, latest_order_no, card_balance_amount, nil)
+        filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings, false, nil, cashier_terminal, sale_items, saleObj, customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, rebate_amount, current_shop, "Paid", current_balance, card_data, other_amount, latest_order_no, card_balance_amount, nil)
 
         #end
       end
@@ -275,7 +275,7 @@ class Origami::PaymentsController < BaseOrigamiController
         @pdf_view = @lookup_pdf.value
       end
 
-      amount = SalePayment.get_kbz_pay_amount(sale_id, current_user,@shop)
+      amount = SalePayment.get_kbz_pay_amount(sale_id, current_user, current_shop)
       @kbz_pay_amount += amount.to_f
 
       #for changable on/off
@@ -322,7 +322,7 @@ class Origami::PaymentsController < BaseOrigamiController
       #end rounding adjustment
 
       # rounding adjustment
-      if @shop.is_rounding_adj
+      if current_shop.is_rounding_adj
         a = saleObj.grand_total % 25 # Modulus
         b = saleObj.grand_total / 25 # Division
         #not calculate rounding if modulus is 0 and division is even
@@ -524,7 +524,7 @@ class Origami::PaymentsController < BaseOrigamiController
 
       printer = Printer::ReceiptPrinter.new(print_settings)
 
-      filename, receipt_no, cashier_printer = printer.print_receipt_bill(print_settings, false, nil, cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,@shop, "Re-print",current_balance,card_data,other_amount,latest_order_no,card_balance_amount,nil,transaction_ref)
+      filename, receipt_no, cashier_printer = printer.print_receipt_bill(print_settings, false, nil, cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount, current_shop, "Re-print",current_balance,card_data,other_amount,latest_order_no,card_balance_amount,nil,transaction_ref)
 
       result = {
         :status => true,
@@ -622,7 +622,7 @@ class Origami::PaymentsController < BaseOrigamiController
 
         printer = Printer::ReceiptPrinter.new(print_settings)
 
-        filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings, false, nil, cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,@shop, "FOC",nil,nil,other_amount,nil,nil,nil,nil)
+        filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings, false, nil, cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,current_shop, "FOC",nil,nil,other_amount,nil,nil,nil,nil)
         result = {
               :status => true,
               :filepath => filename,
@@ -657,7 +657,7 @@ class Origami::PaymentsController < BaseOrigamiController
 
       saleObj      = Sale.find(params[:sale_id])
 
-      if @shop.is_rounding_adj
+      if current_shop.is_rounding_adj
         a = saleObj.grand_total % 25 # Modulus
         b = saleObj.grand_total / 25 # Division
         #not calculate rounding if modulus is 0 and division is even

app/controllers/origami/paypar_payments_controller.rb

@@ -8,7 +8,7 @@ class Origami::PayparPaymentsController < BaseOrigamiController
 		if(Sale.exists?(sale_id))
 			saleObj = Sale.find(sale_id)
 			# rounding adjustment
-				if @shop.is_rounding_adj
+				if current_shop.is_rounding_adj
 				new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
 				rounding_adj = new_total-saleObj.grand_total
 				saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)

app/controllers/origami/redeem_payments_controller.rb

@@ -5,7 +5,7 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
     @cashier_type   = params[:type]
  		@membership_rebate_balance=0
  		sale_data = Sale.find_by_sale_id(@sale_id)
-        if @shop.is_rounding_adj
+        if current_shop.is_rounding_adj
              new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
         else
             new_total    = sale_data.grand_total

app/controllers/origami/shifts_controller.rb

@@ -126,7 +126,7 @@ class Origami::ShiftsController < BaseOrigamiController
           if find_close_cashier_print[0][1].to_i > 0
 
 
-            printer.print_close_cashier(print_settings,cashier_terminal,@shift, @sale_items, @total_other_charges_info, @shop,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount,@total_dinein,@total_takeway,@total_other_charges,@total_waste,@total_spoile,@total_credit_payments)
+            printer.print_close_cashier(print_settings,cashier_terminal,current_shop, @sale_items, @total_other_charges_info, current_shop,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount,@total_dinein,@total_takeway,@total_other_charges,@total_waste,@total_spoile,@total_credit_payments)
           end
       end
     end

app/controllers/origami/table_invoices_controller.rb

@@ -9,7 +9,7 @@ class Origami::TableInvoicesController < BaseOrigamiController
          else
            sale = Sale.find(booking.sale_id)
             # rounding adjustment
-            if @shop.is_rounding_adj
+            if current_shop.is_rounding_adj
               a = sale.grand_total % 25 # Modulus
               b = sale.grand_total / 25 # Division
               #not calculate rounding if modulus is 0 and division is even

app/controllers/origami/unionpay_controller.rb

@@ -21,7 +21,7 @@ class Origami::UnionpayController < BaseOrigamiController
       total = sale_data.grand_total
       others = 0
 
-      if @shop.is_rounding_adj
+      if current_shop.is_rounding_adj
            new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
       else
           new_total    = sale_data.grand_total

app/controllers/origami/visa_controller.rb

@@ -21,7 +21,7 @@ class Origami::VisaController < BaseOrigamiController
       total = sale_data.grand_total
       others = 0
 
-      if @shop.is_rounding_adj
+      if current_shop.is_rounding_adj
            new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
       else
           new_total    = sale_data.grand_total

app/controllers/origami/void_controller.rb

@@ -143,7 +143,7 @@ class Origami::VoidController < BaseOrigamiController
         discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(sale.sale_items)
         other_amount = SaleItem.calculate_other_charges(sale.sale_items)
         printer = Printer::ReceiptPrinter.new(print_settings)
-        filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings, false, nil,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,@shop, "VOID",current_balance,nil,other_amount,nil,nil,nil,nil)
+        filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings, false, nil,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,current_shop, "VOID",current_balance,nil,other_amount,nil,nil,nil,nil)
         result = {
               :filepath => filename,
               :printer_model => print_settings.brand_name,

app/controllers/origami/voucher_controller.rb

@@ -7,7 +7,7 @@ class Origami::VoucherController < BaseOrigamiController
     total = sale_data.grand_total
     @vouchercount = 0
     others = 0
-    if @shop.is_rounding_adj
+    if current_shop.is_rounding_adj
          new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
     else
         new_total    = sale_data.grand_total

app/controllers/origami/waste_spoile_controller.rb

@@ -117,7 +117,7 @@ class Origami::WasteSpoileController < BaseOrigamiController
         discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(sale.sale_items)
         other_amount = SaleItem.calculate_other_charges(sale.sale_items)
         printer = Printer::ReceiptPrinter.new(print_settings)
-        filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings, false, nil,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,@shop, remark,current_balance,nil,other_amount,nil,nil,nil,nil)
+        filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings, false, nil,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,current_shop, remark,current_balance,nil,other_amount,nil,nil,nil,nil)
         result = {
               :filepath => filename,
               :printer_model => print_settings.brand_name,