From ebdf838b520ac37346b061ab24beae69375e0786 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 21 Feb 2018 13:12:41 +0630
Subject: [PATCH] update request sale for another role

---
 app/models/sale.rb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index f07a8a2f..f0166491 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -82,16 +82,17 @@ class Sale < ApplicationRecord
       current_shift = ShiftSale.current_shift
       shift = ShiftSale.current_open_shift(cashier.id)
 
-      # set cashier
+       # set cashier
       if shift != nil
         self.cashier_id = cashier.id
         self.cashier_name = cashier.name
         self.shift_sale_id = shift.id
       else
-        if open_cashier.nil?
-          self.cashier_id   = requested_by.id
-          self.cashier_name = requested_by.name
-          self.shift_sale_id = current_shift.id
+        if open_cashier.count>0
+          self.cashier_id   = open_cashier[0].id
+          self.cashier_name = open_cashier[0].name
+          shift_id = ShiftSale.current_open_shift(open_cashier[0].id)
+          self.shift_sale_id = shift_id.id
         else
           self.cashier_id   = current_shift.employee_id
           self.cashier_name = Employee.find(current_shift.employee_id).name
@@ -99,6 +100,7 @@ class Sale < ApplicationRecord
         end
       end
 
+
       # set waiter
       self.requested_by = requested_by.name