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

Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

Browse Source
This commit is contained in:
phyusin
2018-10-16 09:45:50 +06:30
parent 23015ca0a4 61b54191f8
commit ed2398a495
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/shift_sale.rb
View File

@@ -73,6 +73,7 @@ class ShiftSale < ApplicationRecord
credit = saleobj.get_credit_amount credit = saleobj.get_credit_amount
other_sales = saleobj.get_other_amount other_sales = saleobj.get_other_amount
tax = saleobj.get_commerical_tax tax = saleobj.get_commerical_tax
if type == "void" if type == "void"
self.total_revenue = self.total_revenue.to_f - saleobj.total_amount.to_f self.total_revenue = self.total_revenue.to_f - saleobj.total_amount.to_f
self.total_discounts = self.total_discounts - saleobj.total_discount self.total_discounts = self.total_discounts - saleobj.total_discount
@@ -81,7 +82,7 @@ class ShiftSale < ApplicationRecord
self.cash_sales = self.cash_sales.to_f - cash.to_f self.cash_sales = self.cash_sales.to_f - cash.to_f
self.credit_sales = self.credit_sales.to_f - credit.to_f self.credit_sales = self.credit_sales.to_f - credit.to_f
self.other_sales = self.other_sales.to_f - other_sales.to_f self.other_sales = self.other_sales.to_f - other_sales.to_f
self.nett_sales = self.nett_sales - (saleobj.total_amount.to_f - self.total_discounts) #self.grand_total.to_i - self.commercial_taxes self.nett_sales = self.nett_sales - (saleobj.total_amount.to_f - saleobj.total_discount) #self.grand_total.to_i - self.commercial_taxes
self.commercial_taxes = self.commercial_taxes.to_f - tax.to_f self.commercial_taxes = self.commercial_taxes.to_f - tax.to_f
self.total_rounding = self.total_rounding - saleobj.rounding_adjustment self.total_rounding = self.total_rounding - saleobj.rounding_adjustment
self.total_void = self.total_void + saleobj.grand_total self.total_void = self.total_void + saleobj.grand_total
@@ -90,6 +91,8 @@ class ShiftSale < ApplicationRecord
else else
self.takeaway_count = self.takeaway_count - 1 self.takeaway_count = self.takeaway_count - 1
end end
self.save self.save
end end
end end