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

check sale_status for split bill

Browse Source
This commit is contained in:
phyusin
2018-05-04 16:52:18 +06:30
parent 6eecd2bdb7
commit ddc759926b
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/origami/split_bill_controller.rb
View File

@@ -19,9 +19,11 @@ class Origami::SplitBillController < BaseOrigamiController
table_bookings = Booking.where("dining_facility_id = #{dining_id} and sale_id IS NOT NULL") table_bookings = Booking.where("dining_facility_id = #{dining_id} and sale_id IS NOT NULL")
if !table_bookings.nil? if !table_bookings.nil?
table_bookings.each do |table_booking| table_bookings.each do |table_booking|
if table_booking.sale.sale_status != 'waste' && table_booking.sale.sale_status != 'spoile'
@sale_data.push(table_booking.sale) @sale_data.push(table_booking.sale)
end end
end end
end
if @booking if @booking
@booking.booking_orders.each do |booking_order| @booking.booking_orders.each do |booking_order|