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

updated commission for sale edit

Browse Source
This commit is contained in:
Yan
2017-09-04 13:13:08 +06:30
parent e9e7aec028 2330a1a33e
commit 82120e2ba1
9 changed files with 359 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
class Origami::SaleEditController < BaseOrigamiController
authorize_resource :class => false
authorize_resource class: false
# Index for sale item void OR edit
def edit
sale_id = params[:sale_id]
@@ -19,12 +19,13 @@ class Origami::SaleEditController < BaseOrigamiController
@newsaleitem.qty = saleitemObj.qty * -1
@newsaleitem.price = saleitemObj.price * -1
@newsaleitem.is_taxable = 1
@newsaleitem.product_name = saleitemObj.product_name + " - void"
@newsaleitem.product_name = saleitemObj.product_name + ' - void'
@newsaleitem.save
# re-calc tax
saleObj = Sale.find(saleitemObj.sale_id)
saleObj.compute_without_void
ProductCommission.create_product_commission(@newsaleitem, saleitemObj)
end
def item_foc
@@ -44,6 +45,7 @@ class Origami::SaleEditController < BaseOrigamiController
# re-calc tax
saleObj = Sale.find(saleitemObj.sale_id)
saleObj.compute_without_void
ProductCommission.create_product_commission(@newsaleitem, saleitemObj)
end
# def item_edit
@@ -77,16 +79,19 @@ class Origami::SaleEditController < BaseOrigamiController
saleitemObj.unit_price = update_price
saleitemObj.taxable_price = update_qty.to_f * update_price.to_f
# saleitemObj.remark = 'edit'
if !saleitemObj.product_name.include? "updated"
saleitemObj.product_name = saleitemObj.product_name + " - updated"
unless saleitemObj.product_name.include? 'updated'
saleitemObj.product_name = saleitemObj.product_name + ' - updated'
end
saleitemObj.save
# re-calc tax
saleObj = Sale.find(saleitemObj.sale_id)
saleObj.compute_without_void
end
ProductCommission.edit_product_commission(saleitemObj)
end
# make cancel void item
def item_void_cancel
@@ -104,6 +109,7 @@ class Origami::SaleEditController < BaseOrigamiController
# re-calc tax
saleObj = Sale.find(saleitemObj.sale_id)
saleObj.compute_without_void
ProductCommission.remove_product_commission(saleitemObj)
end
# remove all void items
@@ -117,6 +123,7 @@ class Origami::SaleEditController < BaseOrigamiController
item.remark = nil
end
item.save
ProductCommission.remove_product_commission(item)
end
# re-calc tax
@@ -127,5 +134,8 @@ class Origami::SaleEditController < BaseOrigamiController
sale_id = params[:sale_id]
saleObj = Sale.find(sale_id)
saleObj.compute_without_void
saleObj.sale_items.each do |item|
ProductCommission.remove_product_commission(item)
end
end
end