Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

app/models/sale.rb

@@ -2592,6 +2592,7 @@ end
     query = query.joins("join sale_orders as sale_orders on sale_orders.sale_id = sales.sale_id")
                  .joins("join orders as orders on orders.order_id = sale_orders.order_id")
     query = query.where("sales.sale_status = 'new' AND orders.status = 'billed' AND orders.source =? ","quick_service")
+                  .group("sales.sale_id")
   end
   def self.pending_order
     query = Booking.all