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/controllers/origami/shifts_controller.rb
+++ b/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)