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

fixed conflict order

Browse Source
This commit is contained in:
Aung Myo
2017-06-07 22:31:49 +06:30
parent 44382d284f
commit 7f8d3381b2
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/order.rb
View File

@@ -273,10 +273,7 @@ class Order < ApplicationRecord
left join sales on sales.sale_id = sale_orders.sale_id") left join sales on sales.sale_id = sale_orders.sale_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.order_id,order_items.order_items_id,dining_facilities.name,sales.receipt_no,bookings.booking_id,sales.sale_id") .group("orders.order_id,order_items.order_items_id,dining_facilities.name,sales.receipt_no,bookings.booking_id,sales.sale_id")
<<<<<<< HEAD
=======
>>>>>>> f9c8dbc03eee1b539ce04480b411b1d761e570f4
end end
private private