add menu in Transaction

2017-06-12 18:33:09 +06:30
parent 1d667c6174
commit e1e7064e47
2 changed files with 2 additions and 3 deletions
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -244,7 +244,6 @@ class Order < ApplicationRecord
                    .joins("left join orders on orders.order_id = booking_orders.order_id")
                    .joins("left join sales on sales.sale_id = bookings.sale_id")
                    .where("sales.sale_status='completed'")
-<<<<<<< HEAD
                    .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status")
  end