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

check and no discount item when bill foc

Browse Source
This commit is contained in:
Yan
2017-11-30 18:40:29 +06:30
parent 72b8047754
commit 769a4b7b4b
1 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/sale_item.rb
View File

@@ -27,6 +27,7 @@ class SaleItem < ApplicationRecord
end end
def self.update_existing_item(qty, item, sale_id, type, item_price, price) def self.update_existing_item(qty, item, sale_id, type, item_price, price)
if item.remark != 'Discount'
sale_item = SaleItem.new sale_item = SaleItem.new
sale_item.product_code = item.product_code sale_item.product_code = item.product_code
sale_item.item_instance_code = item.item_instance_code sale_item.item_instance_code = item.item_instance_code
@@ -50,6 +51,7 @@ class SaleItem < ApplicationRecord
sale = Sale.find(sale_id) sale = Sale.find(sale_id)
sale.compute_by_sale_items(sale.id, sale.sale_items, sale.total_discount) sale.compute_by_sale_items(sale.id, sale.sale_items, sale.total_discount)
end end
end
def self.get_order_items_details(sale_id) def self.get_order_items_details(sale_id)
order_details = SaleItem.select("sales.total_tax as tax_amount, sales.grand_total as grand_total_amount , sales.total_discount as discount_amount,sales.receipt_date as receipt_date, order_details = SaleItem.select("sales.total_tax as tax_amount, sales.grand_total as grand_total_amount , sales.total_discount as discount_amount,sales.receipt_date as receipt_date,