change all sale item

This commit is contained in:
Yan
2017-11-22 12:12:27 +06:30
parent 77ce2f32ff
commit 1fd4108ac0
6 changed files with 60 additions and 29 deletions

View File

@@ -166,7 +166,7 @@ class Sale < ApplicationRecord
sale_item.qty = item.qty
sale_item.unit_price = item.price
sale_item.taxable_price = item.price
sale_item.taxable_price = sale_item.qty * sale_item.unit_price
sale_item.is_taxable = item.taxable
sale_item.price = sale_item.qty * sale_item.unit_price
@@ -182,7 +182,7 @@ class Sale < ApplicationRecord
sale_item.product_alt_name = "-"
sale_item.qty = block_count
sale_item.unit_price = chargeObj.unit_price
sale_item.taxable_price = chargeObj.unit_price
sale_item.taxable_price = sale_item.qty * sale_item.unit_price
sale_item.is_taxable = chargeObj.taxable
sale_item.sale_id = self.id
sale_item.price = diningprice
@@ -225,7 +225,8 @@ class Sale < ApplicationRecord
puts "item.sales_item_id ddd"
puts item.sale_item_id
subtotal_price = subtotal_price + item.price
total_taxable = total_taxable + (item.taxable_price * item.qty)
total_taxable = total_taxable + item.taxable_price
# total_taxable = total_taxable + (item.taxable_price * item.qty)
end
apply_tax (total_taxable)
@@ -253,7 +254,11 @@ class Sale < ApplicationRecord
sales_items.each do |item|
#compute each item and added to total
subtotal_price = subtotal_price + item.price
total_taxable = total_taxable + (item.taxable_price * item.qty)
# check for item is taxable and calculate
if item.is_taxable
total_taxable = total_taxable + item.taxable_price
end
end
compute_tax(sale, total_taxable, total_discount)
@@ -269,6 +274,7 @@ class Sale < ApplicationRecord
end
# No Use too many wrong
def compute_without_void
sales_items = self.sale_items
@@ -467,9 +473,7 @@ class Sale < ApplicationRecord
else
sale = Sale.all.joins("JOIN sale_payments sp on sp.sale_id = sales.sale_id")
.where("sp.payment_method ='creditnote' #{keyword} #{custo}")
end
end
def self.get_rounding_adjustment(num)