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

add zone with oqs and tax calculte method update

Browse Source
This commit is contained in:
Yan
2017-07-01 19:11:04 +06:30
parent 6e8b3afc6c
commit 51a779cbee
4 changed files with 58 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/controllers/origami/discounts_controller.rb
View File

@@ -74,8 +74,10 @@ class Origami::DiscountsController < BaseOrigamiController
end
end
sale.grand_total = (sale.total_amount - sale.total_discount) + sale.total_tax;
sale.save
# sale.grand_total = (sale.total_amount - sale.total_discount) + sale.total_tax;
# sale.save
# Re-calc All Amount in Sale
sale.compute_by_sale_items(sale_id, sale.sale_items, sale.total_discount)
end
dining = {:table_id => table_id, :table_type => table_type }
@@ -100,8 +102,12 @@ class Origami::DiscountsController < BaseOrigamiController
end
end
sale.grand_total = (sale.total_amount - sale.total_discount) + sale.total_tax;
sale.save
# sale.total_discount = 0
# sale.grand_total = (sale.total_amount - sale.total_discount) + sale.total_tax;
# sale.save
# Re-calc All Amount in Sale
sale.compute_by_sale_items(sale_id, sale.sale_items, 0)
end
dining = {:table_id => table_id, :table_type => table_type }