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

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

Browse Source
This commit is contained in:
NyanLinHtut
2019-11-13 13:35:34 +06:30
parent 92dd2aeb5a 8046b7210b
commit 891995f531
13 changed files with 116 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/origami/payments_controller.rb
View File

@@ -643,7 +643,7 @@ class Origami::PaymentsController < BaseOrigamiController
if saleObj.discount_type == "member_discount"
saleObj.update_attributes(grand_total: 0, rounding_adjustment: 0, amount_received: 0, amount_changed: 0)
saleObj.compute_by_sale_items(sale_id, saleObj.sale_items,0,order_source)
saleObj.compute_by_sale_items(0, nil, order_source)
end
saleObj.update_attributes(grand_total: 0, rounding_adjustment: 0, amount_received: 0, amount_changed: 0)
@@ -818,7 +818,7 @@ class Origami::PaymentsController < BaseOrigamiController
order_source = params[:cashier_type]
tax_type = params[:tax_type]
sale = Sale.find(sale_id)
sale.compute_by_sale_items(sale.sale_id, sale.sale_items, sale.total_discount,nil,order_source,tax_type)
sale.compute_by_sale_items(sale.total_discount, nil, order_source, tax_type)
render json: JSON.generate({:status => true})
end