diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb
index 8d8af8b2..f52fe9d4 100755
--- a/app/controllers/api/bill_controller.rb
+++ b/app/controllers/api/bill_controller.rb
@@ -14,26 +14,21 @@ 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
 
       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)