Skip to content
This repository was archived by the owner on Jan 26, 2024. It is now read-only.

Commit 6564e41

Browse files
authored
Merge pull request #1390 from pkarw/develop
minor fixes
2 parents c9cf6c6 + bbaad62 commit 6564e41

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

core/store/lib/taxcalc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export function updateProductPrices (product, rate, sourcePriceInclTax = false)
6363
configurableChild.specialPriceTax = (specialPriceExclTax * (parseFloat(rate.rate) / 100))
6464

6565
if (configurableChild.special_price && (configurableChild.special_price < configurableChild.price)) {
66-
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())) {
66+
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())) {
6767
configurableChild.special_price = 0 // out of the dates period
6868
} else {
6969
configurableChild.originalPrice = priceExclTax

core/store/modules/product/helpers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ export function configureProductAsync (context, { product, configuration, select
433433
console.debug('Image offline fallback to ', context.state.offlineImage)
434434
}
435435
}
436-
if (selectedVariant !== null) {
436+
if (selectedVariant) {
437437
if (!desiredProductFound) { // update the configuration
438438
populateProductConfigurationAsync(context, { product: product, selectedVariant: selectedVariant })
439439
configuration = context.state.current_configuration

core/store/modules/user/actions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ export default {
244244
headers: { 'Content-Type': 'application/json' },
245245
body: JSON.stringify(passwordData)
246246
}
247-
}).then((resp) => {
247+
}, { root: true }).then((resp) => {
248248
if (resp.code === 200) {
249249
EventBus.$emit('notification', {
250250
type: 'success',

0 commit comments

Comments
 (0)