git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull from master

Browse Source
This commit is contained in:
San Wai Lwin
2018-05-14 11:38:39 +06:30
parent bcf66d6c30
commit 49319d80cc
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/origami/shifts_controller.rb
View File

@@ -81,6 +81,8 @@ class Origami::ShiftsController < BaseOrigamiController
#get tax #get tax
shift_obj = ShiftSale.where('id =?',@shift.id) shift_obj = ShiftSale.where('id =?',@shift.id)
@sale_taxes = Sale.get_separate_tax(shift_obj,from=nil,to=nil,type='') @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 details for mpu or visa like card
@other_payment = ShiftSale.get_by_shift_other_payment(@shift) @other_payment = ShiftSale.get_by_shift_other_payment(@shift)

5
app/models/shift_sale.rb
View File

@@ -94,6 +94,11 @@ class ShiftSale < ApplicationRecord
end end
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) def get_closing_balance(shift)
shiftobj = ShiftSale.find(shift) shiftobj = ShiftSale.find(shift)
closing_balance = shiftobj.grand_total + shiftobj.cash_in - shiftobj.cash_out + shiftobj.total_cash closing_balance = shiftobj.grand_total + shiftobj.cash_in - shiftobj.cash_out + shiftobj.total_cash