Pull from master

app/controllers/origami/shifts_controller.rb

@@ -81,6 +81,8 @@ class Origami::ShiftsController < BaseOrigamiController
         #get tax
         shift_obj      = ShiftSale.where('id =?',@shift.id)
         @sale_taxes    = Sale.get_separate_tax(shift_obj,from=nil,to=nil,type='')
+        byebug
+        @total_waste   = Sale.get_total_waste(@shift)
         #other payment details for mpu or visa like card
         @other_payment = ShiftSale.get_by_shift_other_payment(@shift)
 

app/models/shift_sale.rb

@@ -94,6 +94,11 @@ class ShiftSale < ApplicationRecord
     end
   end
 
+  def self.get_total_waste(shift)   
+    total_waste = Sale.select(" SUM(grand_total) as total_waste")
+                .where("sales.payment_status ='waste' and sale_status = 'waste'", shift.id)
+  end
+
   def get_closing_balance(shift)
      shiftobj = ShiftSale.find(shift)
      closing_balance = shiftobj.grand_total + shiftobj.cash_in - shiftobj.cash_out + shiftobj.total_cash