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

update request bill

Browse Source
This commit is contained in:
Aung Myo
2018-02-20 11:59:57 +06:30
parent 31adc0e993
commit a5640877a3
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/sale.rb
View File

@@ -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