diff --git a/app/models/shift_sale.rb b/app/models/shift_sale.rb index 18e20322..3ea6b5b0 100755 --- a/app/models/shift_sale.rb +++ b/app/models/shift_sale.rb @@ -73,6 +73,7 @@ class ShiftSale < ApplicationRecord credit = saleobj.get_credit_amount other_sales = saleobj.get_other_amount tax = saleobj.get_commerical_tax + if type == "void" self.total_revenue = self.total_revenue.to_f - saleobj.total_amount.to_f 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.credit_sales = self.credit_sales.to_f - credit.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.total_rounding = self.total_rounding - saleobj.rounding_adjustment self.total_void = self.total_void + saleobj.grand_total @@ -90,6 +91,8 @@ class ShiftSale < ApplicationRecord else self.takeaway_count = self.takeaway_count - 1 end + + self.save end end