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

Merge branch 'r-1902001-01' into foodcourt

Browse Source
This commit is contained in:
Thein Lin Kyaw
2020-07-11 04:00:55 +06:30
parent 4b0d7294ae 13fcb69dee
commit 2ee1fc2423
99 changed files with 2085 additions and 1781 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/origami/waste_spoile_controller.rb
View File

@@ -9,10 +9,7 @@ class Origami::WasteSpoileController < BaseOrigamiController
SaleTax.where("sale_id='#{sale_id}'").find_each do |existing_tax|
existing_tax.delete
end
sale.update_attributes(total_discount: 0,total_tax: 0,grand_total: sale.total_amount,rounding_adjustment:0)
sale.payment_status = remark
sale.sale_status = remark
sale.save
sale.update_attributes(total_discount: 0, total_tax: 0, grand_total: sale.total_amount, rounding_adjustment:0, payment_status: remark, sale_status: remark)
# add to sale item with foc
# sale_items = SaleItem.where("sale_id='#{ sale_id }' and status is null")