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

update order in quick service without dinign

Browse Source
This commit is contained in:
Aung Myo
2018-08-08 17:46:01 +06:30
parent 1c73ee0ed7
commit de20436e8b
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/models/sale.rb
View File

@@ -85,11 +85,11 @@ class Sale < ApplicationRecord
open_cashier = Employee.where("role = 'cashier' AND token_session <> ''") open_cashier = Employee.where("role = 'cashier' AND token_session <> ''")
current_shift = ShiftSale.current_shift current_shift = ShiftSale.current_shift
# shift with terminal zone # shift with terminal zone
table = DiningFacility.find(booking.dining_facility_id)
cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
# set cashier # set cashier
if order_source.downcase == "emenu" if order_source.downcase == "emenu"
table = DiningFacility.find(booking.dining_facility_id)
cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
shift = ShiftSale.where("shift_started_at is not null and shift_closed_at is null and cashier_terminal_id = #{cashier_zone.cashier_terminal_id}").first shift = ShiftSale.where("shift_started_at is not null and shift_closed_at is null and cashier_terminal_id = #{cashier_zone.cashier_terminal_id}").first
#for multiple zone with terminal #for multiple zone with terminal
if shift.nil? if shift.nil?
@@ -112,8 +112,6 @@ class Sale < ApplicationRecord
else else
if open_cashier.count>0 # if we have two open cashier if open_cashier.count>0 # if we have two open cashier
# table and terminal in multiple shift # table and terminal in multiple shift
shift = ShiftSale.where("shift_started_at is not null and shift_closed_at is null and cashier_terminal_id = #{cashier_zone.cashier_terminal_id}").first
if shift.nil?
self.cashier_id = open_cashier[0].id self.cashier_id = open_cashier[0].id
self.cashier_name = open_cashier[0].name self.cashier_name = open_cashier[0].name
shift_id = ShiftSale.current_open_shift(open_cashier[0].id) shift_id = ShiftSale.current_open_shift(open_cashier[0].id)
@@ -122,11 +120,6 @@ class Sale < ApplicationRecord
else else
self.shift_sale_id = current_shift.id self.shift_sale_id = current_shift.id
end end
else
self.cashier_id = shift.employee_id
self.cashier_name = Employee.find(shift.employee_id).name
self.shift_sale_id = shift.id
end
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