Merge branch 'hotfix/v1.12.3' of https://github.com/vuestorefront/vue-storefront into hotfix/v1.12.3

Author: PawFV

CHANGELOG.md

@@ -39,12 +39,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - servercart-after-diff event payload - Fifciu (#5365)
 - Fix Original Price Calculation typo - @akucharczyk / @lukaszjedrasik (#5472)
 - Purge loader works properly with dynamic config reload - @Fifciu
+- Multi-tab cart-sync in multi-store environment - @cewald (#5711, #5732)
+- Incorrect load of default address in checkout - @lukaszjedrasik ([#4682](https://github.com/vuestorefront/vue-storefront/issues/4682))
+
 ### Changed / Improved
 
 - Moved hardcoded fields from omitSelectedVariantFields.ts to config (#4679)
 - Bump dependencies versions (#4715, #4696, #4951)
 - Using dayjs for dates in taxCalc.ts to make it work properly in Safari (#5364)
 - Awaiting addItem action call inside mergeServerItem action (#5165)
+- Moved `phoneNum` to proper branch - @lukaszjedrasik ([#5730](https://github.com/vuestorefront/vue-storefront/issues/5730))
+
 ## [1.12.2] - 2020.07.28
 
 ### Added

core/helpers/validators/index.ts

@@ -3,6 +3,3 @@ export const unicodeAlpha = (value: string): boolean => /[A-Za-z\xAA\xB5\xBA\xC0
 
 /** check if string contains some any unicode alphabet characters or digits */
 export const unicodeAlphaNum = (value: string): boolean => unicodeAlpha(value) || /[0-9]+/.test(value)
-
-/** check if string contains between 6 and 14 digits and can consist of plus sign with national code and spaces between groups of digits  */
-export const phoneNum = (value: string): boolean => /^\+?(?:[0-9] ?){6,14}[0-9]$/.test(value)

core/modules/cart/helpers/syncCartWhenLocalStorageChange.ts

@@ -1,10 +1,19 @@
-import rootStore from '@vue-storefront/core/store';
+import rootStore from '@vue-storefront/core/store'
+import { storeViews } from 'config'
+import { currentStoreView } from '@vue-storefront/core/lib/multistore'
+
+function checkMultistoreKey (key: string, path: string): boolean {
+  const { multistore, commonCache } = storeViews
+  if (!multistore || (multistore && commonCache)) return key === path
+  return key === `${currentStoreView().storeCode}-${path}`
+}
 
 function getItemsFromStorage ({ key }) {
-  const value = JSON.parse(localStorage[key])
-  if (key === 'shop/cart/current-cart') {
+  if (checkMultistoreKey(key, 'shop/cart/current-cart')) {
+    const value = JSON.parse(localStorage[key])
     rootStore.dispatch('cart/updateCart', { items: value })
-  } else if (key === 'shop/cart/current-totals') {
+  } else if (checkMultistoreKey(key, 'shop/cart/current-totals')) {
+    const value = JSON.parse(localStorage[key])
     rootStore.dispatch('cart/updateTotals', value)
   }
 }

core/modules/checkout/components/Shipping.ts

@@ -62,9 +62,9 @@ export const Shipping = {
     shipToMyAddress: {
       handler () {
         this.useMyAddress()
-      },
-      immediate: true
-    }
+      }
+    },
+    '$route.hash': 'useMyAddress'
   },
   mounted () {
     this.checkDefaultShippingAddress()