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

fix dis and payment foc and sale item report

Browse Source
This commit is contained in:
Yan
2017-11-22 20:47:53 +06:30
parent 06582d755e
commit 3261fef3cf
5 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/models/sale_item.rb
View File

@@ -17,20 +17,20 @@ class SaleItem < ApplicationRecord
@newsaleitem = SaleItem.new
@newsaleitem = saleitemObj.dup
@newsaleitem.save
@newsaleitem.qty = saleitemObj.qty * -1
@newsaleitem.unit_price = saleitemObj.unit_price * -1
@newsaleitem.taxable_price = (saleitemObj.unit_price * saleitemObj.qty) * -1
@newsaleitem.price = (saleitemObj.unit_price * saleitemObj.qty) * -1
@newsaleitem.qty = saleitemObj.qty * (-1)
@newsaleitem.unit_price = saleitemObj.unit_price * (-1)
@newsaleitem.taxable_price = (saleitemObj.unit_price * saleitemObj.qty) * (-1)
@newsaleitem.price = (saleitemObj.unit_price * saleitemObj.qty) * (-1)
@newsaleitem.product_name = saleitemObj.product_name + ' (FOC)'
@newsaleitem.save
end
end
def self.update_existing_item(qty, item, sale_id, type, item_price)
def self.update_existing_item(qty, item, sale_id, type, item_price, price)
sale_item = SaleItem.new
sale_item.product_code = item.item_code
sale_item.product_name = item.item_name + "(#{type})"
sale_item.product_alt_name = item.alt_name
sale_item.product_code = item.product_code
sale_item.product_name = item.product_name + "(#{type})"
sale_item.product_alt_name = item.product_alt_name
sale_item.account_id = item.account_id
sale_item.remark = type
if type == "foc" || type == "promotion" || type == "void"
@@ -40,8 +40,8 @@ class SaleItem < ApplicationRecord
end
sale_item.unit_price = item_price # * (-1)
sale_item.taxable_price = (qty * item_price) * (-1)
sale_item.price = (qty * item_price) * (-1)
sale_item.taxable_price = (price) * (-1)
sale_item.price = (price) * (-1)
sale_item.is_taxable = 1
sale_item.sale_id = sale_id
@@ -96,7 +96,7 @@ class SaleItem < ApplicationRecord
# Check for actual sale items
sale_items.where("is_taxable = false AND remark = 'Discount'").find_each do |si|
if si.account_id == a.id
discount_account[:price] = (discount_account[:price].abs + si.price.abs) * -1
discount_account[:price] = (discount_account[:price].abs + si.price.abs) * (-1)
end
end
discount_accounts.push(discount_account)