Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant

2017-06-03 15:05:25 +06:30
parent eab356233c 622ca05c9e
commit 9dddd2fc78
112 changed files with 2468 additions and 259 deletions
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -190,7 +190,8 @@ class Sale < ApplicationRecord
      sale_tax.tax_name = tax.name
      sale_tax.tax_rate = tax.rate
      #include or execulive
-      sale_tax.tax_payable_amount = total_taxable  * tax.rate
+      # sale_tax.tax_payable_amount = total_taxable  * tax.rate
+      sale_tax.tax_payable_amount = total_taxable  * tax.rate / 100
      #new taxable amount
      total_taxable = total_taxable + sale_tax.tax_payable_amount