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

update shift

Browse Source
This commit is contained in:
Nweni
2017-06-30 13:10:28 +06:30
parent 063d561f3e
commit 5e3935f176
7 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/shift_sale.rb
View File

@@ -40,6 +40,7 @@ class ShiftSale < ApplicationRecord
cash = saleobj.get_cash_amount
credit = saleobj.get_credit_amount
other_sales = saleobj.get_other_amount
tax = saleobj.get_commerical_tax
self.total_revenue = self.total_revenue.to_f + saleobj.total_amount.to_f
self.total_discounts = self.total_discounts + saleobj.total_discount
self.total_taxes = self.total_taxes + saleobj.total_tax
@@ -47,8 +48,8 @@ class ShiftSale < ApplicationRecord
self.cash_sales = self.cash_sales.to_f + cash.to_f
self.credit_sales = self.credit_sales.to_i + credit.to_f
self.other_sales = self.other_sales.to_i + other_sales.to_f
# self.nett_sales =
# self.commercial_taxes =
self.nett_sales = self.grand_total.to_i - self.commercial_taxes
self.commercial_taxes = self.commercial_taxes.to_i + tax.to_f
self.save
end