git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update request sale for another role

Browse Source
This commit is contained in:
Aung Myo
2018-02-21 13:12:41 +06:30
parent 098ea8e931
commit ebdf838b52
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/models/sale.rb
View File

@@ -82,16 +82,17 @@ class Sale < ApplicationRecord
current_shift = ShiftSale.current_shift current_shift = ShiftSale.current_shift
shift = ShiftSale.current_open_shift(cashier.id) shift = ShiftSale.current_open_shift(cashier.id)
# set cashier # set cashier
if shift != nil if shift != nil
self.cashier_id = cashier.id self.cashier_id = cashier.id
self.cashier_name = cashier.name self.cashier_name = cashier.name
self.shift_sale_id = shift.id self.shift_sale_id = shift.id
else else
if open_cashier.nil? if open_cashier.count>0
self.cashier_id = requested_by.id self.cashier_id = open_cashier[0].id
self.cashier_name = requested_by.name self.cashier_name = open_cashier[0].name
self.shift_sale_id = current_shift.id shift_id = ShiftSale.current_open_shift(open_cashier[0].id)
self.shift_sale_id = shift_id.id
else else
self.cashier_id = current_shift.employee_id self.cashier_id = current_shift.employee_id
self.cashier_name = Employee.find(current_shift.employee_id).name self.cashier_name = Employee.find(current_shift.employee_id).name
@@ -99,6 +100,7 @@ class Sale < ApplicationRecord
end end
end end
# set waiter # set waiter
self.requested_by = requested_by.name self.requested_by = requested_by.name