diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e66d7700..9d947cc1 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -92,6 +92,11 @@ class ApplicationController < ActionController::Base
     @current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
   end
 
+  #  Get current Cashier
+  def get_cashier
+    @cashier = Employee.where("role = 'cashier' AND token_session <> ''")
+  end
+
   def current_company
     begin
      return Company.first
diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb
index c4c50420..39296119 100755
--- a/app/controllers/origami/request_bills_controller.rb
+++ b/app/controllers/origami/request_bills_controller.rb
@@ -6,7 +6,9 @@ class Origami::RequestBillsController < ApplicationController
     sale_order=SaleOrder.new
 
     # if shift = ShiftSale.current_open_shift(current_user.id)
-    if get_cashier.count>0
+    puts ShiftSale.current_shift
+    puts "sssssssssss"
+    if !ShiftSale.current_shift.nil?
       order_id = params[:id] # order_id
       bk_order = BookingOrder.find_by_order_id(order_id)
       check_booking = Booking.find_by_booking_id(bk_order.booking_id)
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 976b2e3c..4646f469 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -79,6 +79,7 @@ class Sale < ApplicationRecord
 
       # set cashier
       open_cashier = Employee.where("role = 'cashier' AND token_session <> ''")
+      current_shift = ShiftSale.current_shift
       shift = ShiftSale.current_open_shift(cashier.id)
 
       # set cashier
@@ -90,11 +91,11 @@ class Sale < ApplicationRecord
         if open_cashier.nil?
           self.cashier_id   = requested_by.id
           self.cashier_name = requested_by.name
-          self.shift_sale_id = open_cashier[0].id
+          self.shift_sale_id = current_shift.id
         else
-          self.cashier_id   = open_cashier[0].id
-          self.cashier_name = open_cashier[0].name
-          self.shift_sale_id = open_cashier[0].id
+          self.cashier_id   = current_shift.employee_id
+          self.cashier_name = Employee.find(current_shift.employee_id).name
+          self.shift_sale_id = current_shift.id
         end
       end