diff --git a/app/models/sale.rb b/app/models/sale.rb
index 417e4204..5cdd7dd1 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -157,7 +157,7 @@ class Sale < ApplicationRecord
     @sale = Sale.new
         sale_order=SaleOrder.new
 
-        if shift = ShiftSale.current_open_shift(current_user.id)
+        if !ShiftSale.current_shift.nil?
           order_id = order.order_id # order_id
           bk_order = BookingOrder.find_by_order_id(order_id)
           check_booking = Booking.find_by_booking_id(bk_order.booking_id)
@@ -166,7 +166,7 @@ class Sale < ApplicationRecord
             # Create Sale if it doesn't exist
             # puts "current_login_employee"
             # puts current_login_employee.name
-            @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, cashier = nil)
+            @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee,current_user)
             @sale_data = Sale.find_by_sale_id(@sale_id)
             @sale_items = SaleItem.where("sale_id=?",@sale_id)
           else
@@ -175,8 +175,8 @@ class Sale < ApplicationRecord
           end
 
           # Bind shift sale id to sale
-          @sale_data.shift_sale_id = shift.id
-          @sale_data.save
+          # @sale_data.shift_sale_id = shift.id
+          # @sale_data.save
 
           # Promotion Activation
           Promotion.promo_activate(@sale)