diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index a01e30df..ac2cb796 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -17,8 +17,11 @@ class Origami::PaymentsController < BaseOrigamiController
     # else
     #   table = DiningFacility.find(bookings[0].dining_facility_id)        
     # end
-
-    if bookings[0].dining_facility_id.to_i > 0
+    shift = ShiftSale.current_open_shift(current_user.id)
+    if !shift.nil?
+      cashier_terminal = CashierTerminal.find(shift.cashier_terminal_id)
+    else
+      if bookings[0].dining_facility_id.to_i > 0
         table = DiningFacility.find(bookings[0].dining_facility_id)
         cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
         cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
@@ -26,6 +29,7 @@ class Origami::PaymentsController < BaseOrigamiController
         shift = ShiftSale.find(saleObj.shift_sale_id)
         cashier_terminal = CashierTerminal.find(shift.cashier_terminal_id)
       end
+    end
 
     # if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
       receipt_bill_a5_pdf = Lookup.collection_of("print_settings") #print_settings with name:ReceiptBillA5Pdf