Merge branch 'r-1902001-01-dev' of gitlab.com:code2lab/SXRestaurant into r-1902001-01-dev

2019-11-13 13:35:34 +06:30
parent 92dd2aeb5a 8046b7210b
commit 891995f531
13 changed files with 116 additions and 126 deletions
--- a/app/models/sale_item.rb
+++ b/app/models/sale_item.rb
@@ -89,7 +89,7 @@ class SaleItem < ApplicationRecord
      # sale_item.save
      if type != "foc"
        sale =  Sale.find(sale_id)
-        sale.compute_by_sale_items(sale.id, sale.sale_items, sale.total_discount)
+        sale.compute_by_sale_items(sale.total_discount)
      end
  end