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

nfc done

Browse Source
This commit is contained in:
Yan
2017-07-18 16:06:36 +06:30
parent c068d702b3
commit a5546920b6
9 changed files with 54 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/oqs/home_controller.rb
View File

@@ -112,7 +112,7 @@ class Oqs::HomeController < BaseOqsController
left join booking_orders as bo on bo.order_id = assigned_order_items.order_id
left join bookings as bk on bk.booking_id = bo.booking_id
left join dining_facilities as df on df.id = bk.dining_facility_id")
.where("assigned_order_items.delivery_status = true AND odt.price <> 0 AND assigned_order_items.created_at <= ?", Time.now.end_of_day.utc)
.where("assigned_order_items.delivery_status = true AND odt.price <> 0 AND assigned_order_items.created_at between #{Time.now.beginning_of_day.utc} and #{Time.now.end_of_day.utc}")
.group("assigned_order_items.order_id")