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

modified in order model

Browse Source
This commit is contained in:
Yan
2017-06-05 10:22:12 +06:30
parent 9b90e3bd7e
commit c4e6f917f4
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/order.rb
View File

@@ -215,7 +215,6 @@ class Order < ApplicationRecord
left join dining_facilities on dining_facilities.id = bookings.dining_facility_id left join dining_facilities on dining_facilities.id = bookings.dining_facility_id
left join order_items on order_items.order_id = orders.id") left join order_items on order_items.order_id = orders.id")
.where("dining_facilities.type=? and orders.order_type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,"dine_in",true) .where("dining_facilities.type=? and orders.order_type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,"dine_in",true)
.group("orders.id") .group("orders.id")
end end
@@ -240,7 +239,6 @@ class Order < ApplicationRecord
left join bookings on bookings.id = booking_orders.id left join bookings on bookings.id = booking_orders.id
left join dining_facilities on dining_facilities.id = bookings.dining_facility_id left join dining_facilities on dining_facilities.id = bookings.dining_facility_id
left join order_items on order_items.order_id = orders.id") left join order_items on order_items.order_id = orders.id")
.where("dining_facilities.is_active=? and orders.date between ? and ?",true,from,to) .where("dining_facilities.is_active=? and orders.date between ? and ?",true,from,to)
.group("orders.id") .group("orders.id")
end end