#4083 & #3838 Bugfix for cart-tab-sync in multistore environment

icmaa · Apr 6, 2021 · 7696efc · 7696efc
1 parent a8fdea4
commit 7696efc
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/core/modules/cart/helpers/syncCartWhenLocalStorageChange.ts b/core/modules/cart/helpers/syncCartWhenLocalStorageChange.ts
@@ -1,14 +1,22 @@
-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 getItemsFromStorage ({ key }) {
   const value = JSON.parse(localStorage[key])
-  if (key === 'shop/cart/current-cart') {
+  if (checkMultistoreKey(key, 'shop/cart/current-cart')) {
     rootStore.dispatch('cart/updateCart', { items: value })
-  } else if (key === 'shop/cart/current-totals') {
+  } else if (checkMultistoreKey(key, 'shop/cart/current-totals')) {
     rootStore.dispatch('cart/updateTotals', value)
   }
 }
 
+function checkMultistoreKey (key: string, path: string): boolean {
+  const { multistore, commonCache } = storeViews
+  if (!multistore || (multistore && commonCache)) return key === path
+  return key === `${currentStoreView().storeCode}-${path}`
+}
+
 function addEventListener () {
   window.addEventListener('storage', getItemsFromStorage)
 }