Skip to content

Bugfix - Reorganize taxcalc.js; cleanup float conversion #1467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 31, 2018
Merged

Bugfix - Reorganize taxcalc.js; cleanup float conversion #1467

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 22 additions & 18 deletions core/store/lib/taxcalc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
export function updateProductPrices (product, rate, sourcePriceInclTax = false) {
const rateFactor = parseFloat(rate.rate) / 100
product.price = parseFloat(product.price)
product.special_price = parseFloat(product.special_price)

let priceExclTax = product.price
if (sourcePriceInclTax) {
priceExclTax = product.price / (1 + (rate.rate / 100))
priceExclTax = product.price / (1 + rateFactor)
product.price = priceExclTax
}
product.priceInclTax = (priceExclTax + priceExclTax * (parseFloat(rate.rate) / 100))
product.priceTax = (priceExclTax * (parseFloat(rate.rate) / 100))

product.special_price = parseFloat(product.special_price)
product.priceTax = priceExclTax * rateFactor
product.priceInclTax = priceExclTax + product.priceTax

let specialPriceExclTax = product.special_price
if (sourcePriceInclTax) {
specialPriceExclTax = product.special_price / (1 + (rate.rate / 100))
specialPriceExclTax = product.special_price / (1 + rateFactor)
product.special_price = specialPriceExclTax
}

product.specialPriceInclTax = (specialPriceExclTax + specialPriceExclTax * (parseFloat(rate.rate) / 100))
product.specialPriceTax = (specialPriceExclTax * (parseFloat(rate.rate) / 100))
product.specialPriceTax = specialPriceExclTax * rateFactor
product.specialPriceInclTax = specialPriceExclTax + product.specialPriceTax

if (product.special_price && (product.special_price < product.price)) {
if ((product.special_to_date && new Date(product.special_to_date) < new Date()) || (product.special_from_date && new Date(product.special_from_date) > new Date())) {
Expand All @@ -44,23 +45,25 @@ export function updateProductPrices (product, rate, sourcePriceInclTax = false)
}
}
configurableChild.price = parseFloat(configurableChild.price)
configurableChild.special_price = parseFloat(configurableChild.special_price)

let priceExclTax = configurableChild.price
if (sourcePriceInclTax) {
priceExclTax = configurableChild.price / (1 + (rate.rate / 100))
priceExclTax = configurableChild.price / (1 + rateFactor)
configurableChild.price = priceExclTax
}

configurableChild.priceInclTax = (priceExclTax + priceExclTax * (parseFloat(rate.rate) / 100))
configurableChild.priceTax = (priceExclTax * (parseFloat(rate.rate) / 100))
configurableChild.priceTax = priceExclTax * rateFactor
configurableChild.priceInclTax = priceExclTax + configurableChild.priceTax

let specialPriceExclTax = configurableChild.special_price
if (sourcePriceInclTax) {
specialPriceExclTax = configurableChild.special_price / (1 + (rate.rate / 100))
specialPriceExclTax = configurableChild.special_price / (1 + rateFactor)
configurableChild.special_price = specialPriceExclTax
}

configurableChild.specialPriceInclTax = (specialPriceExclTax + specialPriceExclTax * (parseFloat(rate.rate) / 100))
configurableChild.specialPriceTax = (specialPriceExclTax * (parseFloat(rate.rate) / 100))
configurableChild.specialPriceTax = specialPriceExclTax * rateFactor
configurableChild.specialPriceInclTax = specialPriceExclTax + configurableChild.specialPriceTax

if (configurableChild.special_price && (configurableChild.special_price < configurableChild.price)) {
if ((configurableChild.special_to_date && new Date(configurableChild.special_to_date) < new Date()) || (configurableChild.special_from_date && new Date(configurableChild.special_from_date) > new Date())) {
Expand All @@ -79,10 +82,10 @@ export function updateProductPrices (product, rate, sourcePriceInclTax = false)
}

if (configurableChild.priceInclTax < product.priceInclTax || product.price === 0) { // always show the lowest price
product.priceInclTax = parseFloat(configurableChild.priceInclTax)
product.priceTax = parseFloat(configurableChild.priceTax)
product.price = parseFloat(configurableChild.price)
product.special_price = parseFloat(configurableChild.special_price)
product.priceInclTax = configurableChild.priceInclTax
product.priceTax = configurableChild.priceTax
product.price = configurableChild.price
product.special_price = configurableChild.special_price
product.specialPriceInclTax = configurableChild.specialPriceInclTax
product.specialPriceTax = configurableChild.specialPriceTax
product.originalPrice = configurableChild.originalPrice
Expand All @@ -92,6 +95,7 @@ export function updateProductPrices (product, rate, sourcePriceInclTax = false)
}
}
}

export function calculateProductTax (product, taxClasses, taxCountry = 'PL', taxRegion = '', sourcePriceInclTax = false) {
let rateFound = false
let taxClass = taxClasses.find((el) => el.product_tax_class_ids.indexOf(parseInt(product.tax_class_id) >= 0))
Expand All @@ -107,7 +111,7 @@ export function calculateProductTax (product, taxClasses, taxCountry = 'PL', tax
}
if (!rateFound) {
console.log('No such tax class id: ' + product.tax_class_id + ' or rate not found for ' + taxCountry + ' / ' + taxRegion)
updateProductPrices(product, { rate: 0 })
updateProductPrices(product, {rate: 0})

product.priceInclTax = product.price
product.priceTax = 0
Expand Down