remove comment data

app/models/sale.rb

@@ -1139,10 +1139,6 @@ def self.get_wastes_and_spoilages(from,to,status)
   else
     type = "and sales.sale_status = 'waste'"
   end
-  # query = Sale.all.where("sales.receipt_date between ? and ? #{type}",from,to)
-  #                 .group("sales.receipt_no")
-  # sales.receipt_no,menu_categories.id,sale_items.item_instance_code
-
   query = Sale.select("sales.sale_id,sales.receipt_no,sales.created_at,sales.total_amount,sales.grand_total,sales.rounding_adjustment,sales.shift_sale_id,sale_items.product_name,sale_items.product_code,sale_items.item_instance_code,sale_items.qty,sale_items.price,sale_items.unit_price,menu_categories.name")
               .joins("JOIN sale_items ON sales.sale_id = sale_items.sale_id" +
                     " JOIN menu_item_instances ON sale_items.item_instance_code = menu_item_instances.item_instance_code" +
@@ -2614,6 +2610,13 @@ end
     query = query.where("bookings.booking_status = 'assign' AND orders.status = 'new' AND orders.source =? ","quick_service")
                   .group("bookings.booking_id")
   end
+  def self.completed_sale
+    query = Sale.all
+    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.all_receipts
     query = Sale.select("sale_payments.created_at as receipt_close_time,