diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb
index 4b58e52d..c12eb596 100755
--- a/app/controllers/api/bill_controller.rb
+++ b/app/controllers/api/bill_controller.rb
@@ -6,7 +6,8 @@ class Api::BillController < Api::ApiController
     @status = false
     @error_message = "Order ID or Booking ID is require to request for a bill."
 
-    if shift_by_terminal = ShiftSale.current_open_shift(get_cashier[0].id)
+    # if shift_by_terminal = ShiftSale.current_open_shift(get_cashier[0].id)
+    if !ShiftSale.current_shift.nil?
     #create Bill by Booking ID
       table = 0
       if (params[:booking_id])
@@ -41,8 +42,8 @@ class Api::BillController < Api::ApiController
       end
     
       # Bind shift sale id to sale
-      @sale_data.shift_sale_id = shift_by_terminal.id
-      @sale_data.save
+      # @sale_data.shift_sale_id = shift_by_terminal.id
+      # @sale_data.save
 
       Promotion.promo_activate(@sale)