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

fix dining charge calc

Browse Source
This commit is contained in:
Yan
2017-09-11 15:47:32 +06:30
parent ea02f6b8fc
commit c131a4eff2
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/sale.rb
View File

@@ -187,7 +187,10 @@ class Sale < ApplicationRecord
sale_item.sale_id = self.id sale_item.sale_id = self.id
sale_item.price = diningprice sale_item.price = diningprice
sale_item.save sale_item.save
self.compute_by_sale_items(self.id, self.sale_items, self.total_discount)
# Re-calc
sale = Sale.find(self.id)
self.compute_by_sale_items(self.id, sale.sale_items, self.total_discount)
end end
def update_item (item) def update_item (item)
@@ -224,7 +227,9 @@ class Sale < ApplicationRecord
subtotal_price = subtotal_price + item.price subtotal_price = subtotal_price + item.price
total_taxable = total_taxable + (item.taxable_price * item.qty) total_taxable = total_taxable + (item.taxable_price * item.qty)
end end
apply_tax (total_taxable) apply_tax (total_taxable)
self.total_amount = subtotal_price self.total_amount = subtotal_price
self.total_discount = total_discount self.total_discount = total_discount
self.grand_total = (self.total_amount - self.total_discount) + self.total_tax self.grand_total = (self.total_amount - self.total_discount) + self.total_tax
@@ -339,6 +344,8 @@ class Sale < ApplicationRecord
# Tax Calculate # Tax Calculate
def apply_tax(total_taxable) def apply_tax(total_taxable)
shop = Shop.first();
#if tax is not apply create new record #if tax is not apply create new record
SaleTax.where("sale_id='#{self.sale_id}'").find_each do |existing_tax| SaleTax.where("sale_id='#{self.sale_id}'").find_each do |existing_tax|
#delete existing and create new #delete existing and create new