diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb
index a2982b83..d5eb77b1 100755
--- a/app/controllers/api/bill_controller.rb
+++ b/app/controllers/api/bill_controller.rb
@@ -14,22 +14,17 @@ class Api::BillController < Api::ApiController
         # for Multiple Cashier by Zone
         table = DiningFacility.find(booking.dining_facility_id)
 
-        cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
-
-        shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_zone.cashier_terminal_id,nil)
-        get_cashier_by_terminal = Employee.find(shift_by_terminal.employee_id)
-
-          if booking
-            if booking.sale_id.nil?
-              @sale = Sale.new
-              @status, @sale_id = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee, get_cashier_by_terminal)
-              @sale_data = Sale.find_by_sale_id(@sale_id)
-            else
-              @status = true
-              @sale_id = booking.sale_id
-              @sale_data = Sale.find_by_sale_id(@sale_id)
-            end
+        if booking
+          if booking.sale_id.nil?
+            @sale = Sale.new
+            @status, @sale_id = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee, current_login_employee, "cashier")
+            @sale_data = Sale.find_by_sale_id(@sale_id)
+          else
+            @status = true
+            @sale_id = booking.sale_id
+            @sale_data = Sale.find_by_sale_id(@sale_id)
           end
+        end
 
         if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
         
@@ -47,7 +42,7 @@ class Api::BillController < Api::ApiController
 
       elsif (params[:order_id])
         @sale = Sale.new
-        @status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee, get_cashier)
+        @status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee, get_cashier, "cashier")
 
         # for Job
         booking  = Booking.find_by_sale_id(@sale_id)
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index a45f5638..220cce6c 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -261,7 +261,6 @@ class Origami::AddordersController < BaseOrigamiController
       #Send to background job for processing
       order        = Order.find(order_id) 
       sidekiq      = Lookup.find_by_lookup_type("sidekiq")
-      
       if ENV["SERVER_MODE"] != 'cloud'
         cup_status   = `#{"sudo service cups status"}`
         print_status = check_cup_status(cup_status)
diff --git a/config/secrets.yml b/config/secrets.yml
index aef81223..0282c5fc 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -12,7 +12,7 @@
 
 development:
   secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
-  sx_provision_url: connect.pos-myanmar.com/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
+  sx_provision_url: connect.smartsales.asia/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
   server_mode: application
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L