Skip to content

Fix misplaced parenthesis for taxClasses.find #4056

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 4 commits into from
Feb 12, 2020
Merged

Fix misplaced parenthesis for taxClasses.find #4056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0aeb85f
fix misplaced parenthesis for `taxClasses.find`
DylannCordel Feb 5, 2020
2bc3057
Merge branch 'hotfix/v1.11.2' into patch-1
andrzejewsky Feb 9, 2020
c1275ad
add fix description to changelog
DylannCordel Feb 10, 2020
fc1f47e
Merge branch 'hotfix/v1.11.2' into patch-1
andrzejewsky Feb 12, 2020
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- add disconnect and sync options for cart/clear - @gibkigonzo (#4062)
- add '1' as searched value for 'is_user_defined' and 'is_visible' (createAttributesListQuery) - @gibkigonzo (#4075)
- Fix possibility to add same SKU with different custom options to the cart - @Michal-Dziedzinski (#3595)
- Fix `calculateProductTax` to find matching tax rules from ES for current product - @DylannCordel (#4056)

## [1.11.1] - 2020.02.05

Expand Down
7 changes: 4 additions & 3 deletions core/modules/catalog/helpers/taxCalc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,15 +167,16 @@ export function updateProductPrices ({ product, rate, sourcePriceInclTax = false

export function calculateProductTax ({ product, taxClasses, taxCountry = 'PL', taxRegion = '', sourcePriceInclTax = false, deprecatedPriceFieldsSupport = false, finalPriceInclTax = true, userGroupId = null, isTaxWithUserGroupIsActive }) {
let rateFound = false
if (product.tax_class_id > 0) {
let product_tax_class_id = parseInt(product.tax_class_id)
if (product_tax_class_id > 0) {
let taxClass
if (isTaxWithUserGroupIsActive) {
taxClass = taxClasses.find((el) =>
el.product_tax_class_ids.indexOf(parseInt(product.tax_class_id)) >= 0 &&
el.product_tax_class_ids.indexOf(product_tax_class_id) >= 0 &&
el.customer_tax_class_ids.indexOf(userGroupId) >= 0
)
} else {
taxClass = taxClasses.find((el) => el.product_tax_class_ids.indexOf(parseInt(product.tax_class_id) >= 0))
taxClass = taxClasses.find((el) => el.product_tax_class_ids.indexOf(product_tax_class_id) >= 0)
}

if (taxClass) {
Expand Down