Skip to content

Commit 73de9f2

Browse files
author
Tomasz Kostuch
authored
Merge pull request #4465 from DivanteLtd/hotfix/v1.11.4
Hotfix/v1.11.4
2 parents 6cd57ab + daa61c0 commit 73de9f2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+230
-130
lines changed

.github/workflows/deploy-storefrontcloud.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ jobs:
1515
uses: actions/setup-node@v1
1616
with:
1717
node-version: "10.x"
18+
- name: Create config file
19+
run: |
20+
echo '{"server":{"useOutputCacheTagging":true,"useOutputCache":true,"dynamicConfigReload":true},"api":{"url":"https://demo.storefrontcloud.io"}}' > config/local-cloud-demo.json
21+
echo '{"server":{"useOutputCacheTagging":true,"useOutputCache":true,"dynamicConfigReload":true},"api":{"url":"https://demo.storefrontcloud.io"}}' > config/local-cloud-next.json
22+
echo '{"server":{"useOutputCacheTagging":true,"useOutputCache":true,"dynamicConfigReload":true},"api":{"url":"https://test.storefrontcloud.io"}}' > config/local-cloud-test.json
1823
- name: Build and publish docker image
1924
uses: elgohr/Publish-Docker-Github-Action@master
2025
with:

CHANGELOG.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,30 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [1.11.4] - 2020.05.26
9+
10+
### Added
11+
12+
13+
### Changed / Improved
14+
15+
- use yarn in cli installer - @gibkigonzo (#4292)
16+
- disable out of stock notification when config.stock.allowOutOfStockInCart is true - @gibigonzo (#4340)
17+
18+
19+
### Fixed
20+
21+
- Use LRU as object contructor based on newest changes in module - @gibkigonzo (#4242)
22+
- Fixed ESC button action (minicart, wishlist) - @mdanilowicz (#4393)
23+
- Fixes problems related to tax calculation and price filter in multistore setup - @juho-jaakkola (#4376)
24+
- Blank order details page - @mdanilowicz (#4382)
25+
- upadate cart hash after sync with backend - @gibkigonzo (#4387)
26+
- exit from errorHandler after redirection - @gibkigonzo (#4246)
27+
- add redirection in component for simple product related to configurable product - @gibkigonzo (#4359)
28+
- disable sending carrier_code or method_code for virtual products,
29+
adjust vue-carousel and vuelidate to newest versions api,
30+
add aplha validators for register fields - @gibkigonzo (#4455, #4461)
31+
832
## [1.11.3] - 2020.04.27
933

1034
### Changed / Improved

core/compatibility/components/blocks/Wishlist/Wishlist.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export default {
1313
methods: {
1414
// theme-specific
1515
onEscapePress () {
16-
this.closeWishlist()
16+
this.$store.dispatch('ui/closeWishlist')
1717
}
1818
},
1919
mixins: [ Wishlist, onEscapePress ]

core/i18n/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue-storefront/i18n",
3-
"version": "1.11.3",
3+
"version": "1.11.4",
44
"description": "Vue Storefront i18n",
55
"license": "MIT",
66
"main": "index.ts",

core/lib/sync/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import Task from '@vue-storefront/core/lib/sync/types/Task'
99
import EventBus from '@vue-storefront/core/compatibility/plugins/event-bus'
1010
import { StorageManager } from '@vue-storefront/core/lib/storage-manager'
1111

12-
/** Syncs given task. If user is offline requiest will be sent to the server after restored connection */
12+
/** Syncs given task. If user is offline request will be sent to the server after restored connection */
1313
async function queue (task) {
1414
const tasksCollection = StorageManager.get('syncTasks')
1515
task = _prepareTask(task)

core/lib/types.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ export interface StoreView {
2020
index: string
2121
},
2222
tax: {
23-
sourcePriceIncludesTax: boolean,
23+
sourcePriceIncludesTax?: boolean,
24+
finalPriceIncludesTax?: boolean,
25+
deprecatedPriceFieldsSupport?: boolean,
2426
defaultCountry: string,
2527
defaultRegion: null | string,
2628
calculateServerSide: boolean,

core/modules/cart/helpers/createShippingInfoData.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ const createShippingInfoData = (methodsData) => ({
66
billingAddress: {
77
...(methodsData.billingAddress ? methodsData.billingAddress : {})
88
},
9-
shippingCarrierCode: methodsData.carrier_code,
10-
shippingMethodCode: methodsData.method_code
9+
...(methodsData.carrier_code ? { shippingCarrierCode: methodsData.carrier_code } : {}),
10+
...(methodsData.method_code ? { shippingMethodCode: methodsData.method_code } : {})
1111
});
1212

1313
export default createShippingInfoData

core/modules/cart/helpers/getProductConfiguration.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ const ATTRIBUTES = ['color', 'size']
66

77
const getProductConfiguration = (product: CartItem): ProductConfiguration => {
88
const options = getProductOptions(product)
9-
const getAttributesFields = (attributeCode) =>
10-
options[attributeCode].find(c => c.id === parseInt(product[attributeCode]))
9+
const getAttributesFields = (attributeCode) =>
10+
(options[attributeCode] || []).find(c => c.id === parseInt(product[attributeCode]))
1111

1212
if (!options) {
1313
return null

core/modules/cart/store/actions/itemActions.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
notifications
1010
} from '@vue-storefront/core/modules/cart/helpers'
1111
import { cartHooksExecutors } from './../../hooks'
12+
import config from 'config'
1213

1314
const itemActions = {
1415
async configureItem (context, { product, configuration }) {
@@ -62,7 +63,7 @@ const itemActions = {
6263
if (errors.length === 0) {
6364
const { status, onlineCheckTaskId } = await dispatch('checkProductStatus', { product })
6465

65-
if (status === 'volatile') {
66+
if (status === 'volatile' && !config.stock.allowOutOfStockInCart) {
6667
diffLog.pushNotification(notifications.unsafeQuantity())
6768
}
6869
if (status === 'out_of_stock') {

core/modules/cart/store/actions/synchronizeActions.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,10 @@ const synchronizeActions = {
7575

7676
Logger.error(result, 'cart')
7777
cartHooksExecutors.afterSync(result)
78+
commit(types.CART_SET_ITEMS_HASH, getters.getCurrentCartHash)
7879
return createDiffLog()
7980
},
80-
async stockSync ({ dispatch, commit }, stockTask) {
81+
async stockSync ({ dispatch, commit, getters }, stockTask) {
8182
const product = { sku: stockTask.product_sku }
8283

8384
const cartItem = await dispatch('getItem', { product })
@@ -102,6 +103,7 @@ const synchronizeActions = {
102103
product: { info: { stock: i18n.t('In stock!') }, sku: stockTask.product_sku, is_in_stock: true }
103104
})
104105
EventBus.$emit('cart-after-itemchanged', { item: cartItem })
106+
commit(types.CART_SET_ITEMS_HASH, getters.getCurrentCartHash)
105107
}
106108
}
107109

0 commit comments

Comments
 (0)