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

added new image upload file

Browse Source
This commit is contained in:
Nweni
2017-06-05 17:14:07 +06:30
parent db904739ac
commit faca7295f7
14 changed files with 325 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/order.rb
View File

@@ -223,8 +223,7 @@ class Order < ApplicationRecord
left join dining_facilities on dining_facilities.id = bookings.dining_facility_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)
.group("orders.id")
.group("orders.id, order_items.id,dining_facilities.name")
end
#Origami: Cashier : to view order type Room
@@ -248,8 +247,7 @@ class Order < ApplicationRecord
left join bookings on bookings.id = booking_orders.id
left join dining_facilities on dining_facilities.id = bookings.dining_facility_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)
.group("orders.id")
.group("orders.id,order_items.id,dining_facilities.name")
end
end