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

shop code

Browse Source
This commit is contained in:
Myat Zin Wai Maw
2019-11-22 18:24:02 +06:30
parent 5a3f328789
commit d1ab2c194d
106 changed files with 834 additions and 895 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/origami/sale_edit_controller.rb
View File

@@ -163,9 +163,9 @@ class Origami::SaleEditController < BaseOrigamiController
# end
# end
sale.compute_by_sale_items(saleObj.total_discount, nil, order_source)
sale.compute_by_sale_items(sale.total_discount, nil, order_source)
ProductCommission.edit_product_commission(saleitemObj)
ProductCommission.edit_product_commission(saleitemObj,sale.shop_code)
end
# make cancel void item
@@ -195,7 +195,7 @@ class Origami::SaleEditController < BaseOrigamiController
end
remark = "Cancle Void Sale Item ID #{saleitemObj.sale_item_id} | Item Name ->#{saleitemObj.product_name}-Product Code ->#{saleitemObj.product_code}-Instance Code ->#{saleitemObj.item_instance_code}|Receipt No #{saleObj.receipt_no}"
sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,current_user.name, action_by,remark,"ITEMCANCELVOID" )
saleObj.compute_by_sale_items(saleObj.total_discount, nil, order_source)
ProductCommission.remove_product_commission(saleitemObj)
end