diff --git a/app/models/order.rb b/app/models/order.rb
index b250c073..83eb9418 100644
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -231,7 +231,7 @@ 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("(orders.status = 'new' or orders.status = 'billed') and (dining_facilities.type=? and dining_facilities.is_active=?)",DiningFacility::TABLE_TYPE,true)
-                    .group("bookings.booking_id,orders.status")
+                    .group("bookings.booking_id,orders.status,sales.receipt_no,sales.sale_status,orders.order_id,sales.customer_id,sales.sale_id,dining_facilities.name")
                     # For PG
                     # booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,true
                     # sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_id
@@ -246,7 +246,7 @@ 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'")
-                    .group("sales.sale_id")
+                    .group("sales.sale_id,orders.status,orders.order_id,bookings.booking_id,dining_facilities.name")
                     # For PG
                     #bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_id
   end
@@ -262,7 +262,7 @@ 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("(orders.status = 'new' or orders.status = 'billed') and (dining_facilities.type=? and dining_facilities.is_active=?)",DiningFacility::ROOM_TYPE,true)
-                    .group("bookings.booking_id")
+                    .group("bookings.booking_id,sales.receipt_no,orders.status,orders.order_id,sales.customer_id,sales.sale_status,orders.customer_id,sales.sale_id,dining_facilities.name")
                     # For PG
                     # booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::ROOM_TYPE,true
                     # sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.customer_id,orders.order_id
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index fc085259..731fa321 100644
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -212,7 +212,7 @@ class SalePayment < ApplicationRecord
   def sale_update_payment_status(paid_amount)
     #update amount_outstanding
     self.sale.amount_received =   self.sale.amount_received.to_f + paid_amount.to_f
-
+    self.sale.save!
     self.sale.amount_changed = self.sale.amount_received.to_f - self.sale.grand_total.to_f
     all_received_amount = 0.0
     sObj = Sale.find(self.sale_id)