Merge pull request #5732 from icmaa/bugfix/multi-tab-cart-sync-in-multistore

Bugfix for cart-tab-sync in multistore environment

Author: Fifciu

CHANGELOG.md

@@ -39,6 +39,7 @@ 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)
 
 ### Changed / Improved
 

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)
   }
 }