Pull from master

2018-05-14 11:38:39 +06:30
parent bcf66d6c30
commit 49319d80cc
2 changed files with 7 additions and 0 deletions
--- a/app/models/shift_sale.rb
+++ b/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