diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb
index aa5f6dac..08847f6f 100644
--- a/app/controllers/api/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -39,7 +39,7 @@ class Api::OrdersController <  Api::ApiController
         # check booking id is already completed.
         booking = Booking.find(params[:booking_id])
         if !booking.sale_id.nil?
-          if booking.sale.sale_status == "completed"
+          if booking.sale.sale_status == "completed" || booking.sale.sale_status == "billed"
             @order.new_booking = true
           else
             @order.new_booking = false
@@ -49,7 +49,7 @@ class Api::OrdersController <  Api::ApiController
           @order.new_booking = false
           @order.booking_id = params[:booking_id]
           puts "booking sale is  null"
-        end      
+        end
       end
 
     @status, @booking = @order.generate
diff --git a/app/models/order.rb b/app/models/order.rb
index cd1f9233..4c09e768 100644
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -32,7 +32,7 @@ class Order < ApplicationRecord
       table =  DiningFacility.find(self.table_id)
       table.status = "occupied"
       table.save
-    else      
+    else
       booking = Booking.find(self.booking_id)
     end
 
@@ -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")
+                    .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_id")
                     # 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,bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_id")
                     # 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,sales.sale_id,dining_facilities.name,orders.customer_id,orders.order_id")
                     # 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