Merge branch 'adminbsb_material_ui'

app/models/sale.rb

@@ -2874,10 +2874,15 @@ end
                   .group("bookings.booking_id")
   end
   def self.completed_sale(type)
+    if type == "cashier"
+      type = "and orders.source = 'emenu' or orders.source = 'cashier'"
+    else
+      type = "and orders.source = '#{type}'"
+    end
     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 =? ","#{type}")
+    query = query.where("sales.sale_status != 'new' AND orders.status = 'billed' #{type}")
     query = query.where("DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ? ",DateTime.now.strftime('%Y-%m-%d'))
                   .group("sales.sale_id")
   end