diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index fa7e0a4b..06174935 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -10,12 +10,12 @@ class Origami::PaymentsController < BaseOrigamiController
     member_info = nil
 
     # For Cashier by Zone
-    bookings = Booking.find_by_sale_id(sale_id)
+    bookings = Booking.where("sale_id='#{sale_id}'")
     if bookings.count > 1 
-      # for Multiple Cashier by Zone
+      # for Multiple Booking
       table = DiningFacility.find(bookings[0].dining_facility_id)
     else
-      table = DiningFacility.find(bookings.dining_facility_id)        
+      table = DiningFacility.find(bookings[0].dining_facility_id)        
     end
 
     cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
@@ -61,12 +61,12 @@ class Origami::PaymentsController < BaseOrigamiController
       rebate_amount = nil
 
       # For Cashier by Zone
-      bookings = Booking.find_by_sale_id(sale_id)
+      bookings = Booking.where("sale_id='#{sale_id}'")
       if bookings.count > 1 
-        # for Multiple Cashier by Zone
+        # for Multiple Booking
         table = DiningFacility.find(bookings[0].dining_facility_id)
       else
-        table = DiningFacility.find(bookings.dining_facility_id)        
+        table = DiningFacility.find(bookings[0].dining_facility_id)        
       end
 
       cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb
index 34614424..851be7e5 100755
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -37,12 +37,13 @@ class Origami::ShiftsController < BaseOrigamiController
     @shift = ShiftSale.find_by_id(shift_id)
     if @shift
       @shift.shift_closed_at = DateTime.now.utc
-      @shift.closing_balance = closing_balance.to_f
-      @shift.cashier_terminal.is_currently_login = 0
+      @shift.closing_balance = closing_balance.to_f     
       @shift.save
 
       # Multiple Cashier
-      #cashier_terminal = @shift.cashier_terminal
+      cashier_terminal = @shift.cashier_terminal      
+      cashier_terminal.is_currently_login = 0
+      cashier_terminal.save
 
 
       unique_code = "CloseCashierPdf"
@@ -62,7 +63,7 @@ class Origami::ShiftsController < BaseOrigamiController
 
       printer = Printer::CashierStationPrinter.new(print_settings)
 
-      printer.print_close_cashier(print_settings,@shift,shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount)
+      printer.print_close_cashier(print_settings,cashier_terminal,@shift,shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount)
 
       
     end
diff --git a/app/models/printer/cashier_station_printer.rb b/app/models/printer/cashier_station_printer.rb
index 91100145..e62ab4d1 100755
--- a/app/models/printer/cashier_station_printer.rb
+++ b/app/models/printer/cashier_station_printer.rb
@@ -22,7 +22,7 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker
   # end
 
   #Bill Receipt Print
-  def print_close_cashier(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount)
+  def print_close_cashier(printer_settings,cashier_terminal,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount)
     #Use CUPS service
     #Generate PDF
     #Print
@@ -32,7 +32,7 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker
     pdf = CloseCashierPdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount)
     filename = "tmp/close_cashier_#{cashier}_#{shift_name}.pdf" 
     pdf.render_file filename
-    self.print(filename)
+    self.print(filename, cashier_terminal.printer_name)
   end