Merge branch 'sqa-1804-001' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01

app/models/sale.rb

@@ -1091,6 +1091,14 @@ end
      return sale_arr
 end
 
+def self.get_total_waste(shift_id)
+  query = Sale.where("sale_status = 'waste' and shift_sale_id = ?", shift_id)
+end
+
+def self.get_total_spoile(shift_id)
+  query = Sale.where("sale_status = 'spoile' and shift_sale_id = ?", shift_id)
+end
+
 def self.get_separate_tax(shift_sale_range=nil,shift,from,to,payment_type)
 
 # wrong amount tax for service and commercial tax