From 13c2c0026324a918c472dfb6a757d9deb751adbb Mon Sep 17 00:00:00 2001 From: phyusin Date: Mon, 11 Jun 2018 13:49:21 +0630 Subject: [PATCH] add tax cal for Edit --- app/controllers/origami/sale_edit_controller.rb | 12 ++++++++---- app/views/origami/sale_edit/edit.html.erb | 6 +++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb index b9b2c5d4..b59aeb78 100755 --- a/app/controllers/origami/sale_edit_controller.rb +++ b/app/controllers/origami/sale_edit_controller.rb @@ -20,6 +20,7 @@ class Origami::SaleEditController < BaseOrigamiController saleitemId = params[:sale_item_id] remark = params[:remark] access_code = params[:access_code] + order_source = params[:type] saleitemObj = SaleItem.find(saleitemId) saleitemObj.status = 'void' saleitemObj.remark = remark @@ -58,7 +59,7 @@ class Origami::SaleEditController < BaseOrigamiController remark = "Void Sale Item ID #{saleitemObj.sale_item_id} | Receipt No #{saleObj.receipt_no} | Item Name ->#{saleitemObj.product_name}-Product Code ->#{saleitemObj.product_code}-Instance Code ->#{saleitemObj.item_instance_code}" sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,saleObj.cashier_id, action_by,remark,"SALEITEMVOID" ) - saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount) + saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount,order_source) ProductCommission.create_product_commission(@newsaleitem, saleitemObj) end @@ -66,6 +67,7 @@ class Origami::SaleEditController < BaseOrigamiController saleitemId = params[:sale_item_id] remark = params[:remark] access_code = params[:access_code] + order_source = params[:type] saleitemObj = SaleItem.find(saleitemId) saleitemObj.status = 'foc' saleitemObj.remark = remark @@ -94,7 +96,7 @@ class Origami::SaleEditController < BaseOrigamiController remark = "FOC Sale Item ID #{saleitemObj.sale_item_id} | Receipt No #{saleObj.receipt_no} | 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,saleObj.cashier_id, action_by,remark,"SALEITEMFOC" ) - saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount,order.source) + saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount,order_source) ProductCommission.create_product_commission(@newsaleitem, saleitemObj) end @@ -123,6 +125,7 @@ class Origami::SaleEditController < BaseOrigamiController update_qty = params[:update_qty] update_price = params[:update_price] access_code = params[:access_code] + order_source = params[:type] saleitemObj = SaleItem.find(saleitemId) sale = Sale.find(saleitemObj.sale_id) @@ -159,7 +162,7 @@ class Origami::SaleEditController < BaseOrigamiController end end - saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount,order.source) + saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount,order_source) ProductCommission.edit_product_commission(saleitemObj) end @@ -168,6 +171,7 @@ class Origami::SaleEditController < BaseOrigamiController def item_void_cancel saleitemId = params[:sale_item_id] access_code = params[:access_code] + order_source = params[:type] saleitemObj = SaleItem.find(saleitemId) both = SaleItem.where('product_code=?', saleitemObj.product_code) both.each do |item| @@ -191,7 +195,7 @@ class Origami::SaleEditController < BaseOrigamiController 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,saleObj.cashier_id, action_by,remark,"ITEMCANCELVOID" ) - saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount, order.source) + saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount, order_source) ProductCommission.remove_product_commission(saleitemObj) end diff --git a/app/views/origami/sale_edit/edit.html.erb b/app/views/origami/sale_edit/edit.html.erb index 293e928a..08613715 100755 --- a/app/views/origami/sale_edit/edit.html.erb +++ b/app/views/origami/sale_edit/edit.html.erb @@ -240,7 +240,7 @@ var access_code = localStorage.getItem("access_code"); $.ajax({ type: "POST", url: ajax_url, - data: 'sale_item_id=' + sale_item_id + "&update_qty=" + qty + "&update_price=" + price+ "&access_code=" + access_code, + data: 'sale_item_id=' + sale_item_id + "&update_qty=" + qty + "&update_price=" + price+ "&access_code=" + access_code + "&type=" + cashier_type, success: function (result) { swal({ title: "Information!", @@ -294,7 +294,7 @@ var access_code = localStorage.getItem("access_code"); $.ajax({ type: "POST", url: ajax_url, - data: 'sale_item_id=' + sale_item_id + "&remark=" + remark+ "&access_code=" + access_code, + data: 'sale_item_id=' + sale_item_id + "&remark=" + remark+ "&access_code=" + access_code + "&type=" + cashier_type, success: function (result) { location.reload(); } @@ -307,7 +307,7 @@ var access_code = localStorage.getItem("access_code"); $.ajax({ type: "POST", url: ajax_url, - data: 'sale_item_id=' + sale_item_id + '&access_code=' + access_code, + data: 'sale_item_id=' + sale_item_id + '&access_code=' + access_code + "&type=" + cashier_type, success: function (result) { location.reload(); }