From ddb4d9992d95c723de565857646885e213361306 Mon Sep 17 00:00:00 2001
From: andrzejewsky <vox3r69@gmail.com>
Date: Mon, 30 Sep 2019 19:50:17 +0200
Subject: [PATCH 1/4] fix wrong links

---
 CHANGELOG.md                                              | 1 +
 core/lib/multistore.ts                                    | 8 ++++++++
 .../default/components/core/blocks/Footer/Footer.vue      | 8 ++------
 src/themes/default/pages/Static.vue                       | 7 ++++---
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a399d6048..3b80c1dc21 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -127,6 +127,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add missing parameters (`size`,`start`) to `quickSearchByQuery()` in `attribute/list` action - @cewald (#3627)
 - Fix breadcrumb homepage link in cms static pages - @andrzejewsky (#3631)
 - Fixed special price that can break when you change pages (browser navigation for/back) or just go from category to product page - @resubaka (#3638)
+- Fixed wrong links on the static pages - @andrzejewsky (#3659)
 
 ### Changed / Improved
 
diff --git a/core/lib/multistore.ts b/core/lib/multistore.ts
index de1245a7b3..7dfbf8a82d 100644
--- a/core/lib/multistore.ts
+++ b/core/lib/multistore.ts
@@ -217,3 +217,11 @@ export function localizedRoutePath (path: string, storeCode: string): string {
 
   return `/${storeCode}/${_path}`
 }
+
+export function localizedRouteOnlyForDefault (path: string) {
+  const { storeCode } = currentStoreView()
+  const isStoreCodeEquals = storeCode === config.defaultStoreCode
+  const route = isStoreCodeEquals ? `/i${path}` : path
+
+  return localizedRoute(route, storeCode)
+}
diff --git a/src/themes/default/components/core/blocks/Footer/Footer.vue b/src/themes/default/components/core/blocks/Footer/Footer.vue
index bd021c5d4f..3b0b585783 100644
--- a/src/themes/default/components/core/blocks/Footer/Footer.vue
+++ b/src/themes/default/components/core/blocks/Footer/Footer.vue
@@ -158,7 +158,7 @@
 </template>
 
 <script>
-import { currentStoreView, localizedRoute } from '@vue-storefront/core/lib/multistore'
+import { currentStoreView, localizedRouteOnlyForDefault } from '@vue-storefront/core/lib/multistore'
 import CurrentPage from 'theme/mixins/currentPage'
 import LanguageSwitcher from '../../LanguageSwitcher.vue'
 import Newsletter from 'theme/components/core/blocks/Footer/Newsletter'
@@ -169,9 +169,6 @@ export default {
   mixins: [CurrentPage],
   name: 'MainFooter',
   computed: {
-    isStoreCodeEquals () {
-      return currentStoreView().storeCode === config.defaultStoreCode
-    },
     multistoreEnabled () {
       return config.storeViews.multistore
     },
@@ -181,8 +178,7 @@ export default {
   },
   methods: {
     getLinkFor (path) {
-      const route = this.isStoreCodeEquals ? `/i${path}` : path
-      return localizedRoute(route)
+      return localizedRouteOnlyForDefault(path)
     }
   },
   components: {
diff --git a/src/themes/default/pages/Static.vue b/src/themes/default/pages/Static.vue
index 51813d4611..b6be2b049d 100644
--- a/src/themes/default/pages/Static.vue
+++ b/src/themes/default/pages/Static.vue
@@ -35,6 +35,7 @@ import i18n from '@vue-storefront/i18n'
 import Breadcrumbs from 'theme/components/core/Breadcrumbs'
 import StaticExample from 'theme/components/theme/blocks/Static/Example'
 import StaticShortExample from 'theme/components/theme/blocks/Static/Short'
+import { localizedRouteOnlyForDefault } from '@vue-storefront/core/lib/multistore'
 
 export default {
   components: {
@@ -65,9 +66,9 @@ export default {
   data () {
     return {
       navigation: [
-        { title: i18n.t('About us'), link: '/about-us', component: StaticExample },
-        { title: i18n.t('Customer service'), link: '/customer-service', component: StaticShortExample },
-        { title: i18n.t('Store locator'), link: '/store-locator', component: StaticExample },
+        { title: i18n.t('About us'), link: localizedRouteOnlyForDefault('/about-us'), component: StaticExample },
+        { title: i18n.t('Customer service'), link: localizedRouteOnlyForDefault('/customer-service'), component: StaticShortExample },
+        { title: i18n.t('Store locator'), link: localizedRouteOnlyForDefault('/store-locator'), component: StaticExample },
         { title: i18n.t('Delivery'), link: '/delivery', component: StaticShortExample },
         { title: i18n.t('Return policy'), link: '/returns', component: StaticExample },
         { title: i18n.t('Privacy policy'), link: '/privacy', component: StaticShortExample },

From ae33992b2fc9cc04502b7116b1e800434dc72dea Mon Sep 17 00:00:00 2001
From: andrzejewsky <vox3r69@gmail.com>
Date: Tue, 1 Oct 2019 19:48:32 +0200
Subject: [PATCH 2/4] move to helper

---
 core/lib/multistore.ts                                   | 8 --------
 .../default/components/core/blocks/Footer/Footer.vue     | 5 +++--
 src/themes/default/helpers/index.ts                      | 9 +++++++++
 src/themes/default/pages/Static.vue                      | 8 ++++----
 4 files changed, 16 insertions(+), 14 deletions(-)
 create mode 100644 src/themes/default/helpers/index.ts

diff --git a/core/lib/multistore.ts b/core/lib/multistore.ts
index 4417d6f1c8..e0b1244245 100644
--- a/core/lib/multistore.ts
+++ b/core/lib/multistore.ts
@@ -215,11 +215,3 @@ export function localizedRoutePath (path: string, storeCode: string): string {
 
   return `/${storeCode}/${_path}`
 }
-
-export function localizedRouteOnlyForDefault (path: string) {
-  const { storeCode } = currentStoreView()
-  const isStoreCodeEquals = storeCode === config.defaultStoreCode
-  const route = isStoreCodeEquals ? `/i${path}` : path
-
-  return localizedRoute(route, storeCode)
-}
diff --git a/src/themes/default/components/core/blocks/Footer/Footer.vue b/src/themes/default/components/core/blocks/Footer/Footer.vue
index 3b0b585783..3fb7f1bce1 100644
--- a/src/themes/default/components/core/blocks/Footer/Footer.vue
+++ b/src/themes/default/components/core/blocks/Footer/Footer.vue
@@ -158,11 +158,12 @@
 </template>
 
 <script>
-import { currentStoreView, localizedRouteOnlyForDefault } from '@vue-storefront/core/lib/multistore'
+import { currentStoreView, localizedRoute } from '@vue-storefront/core/lib/multistore'
 import CurrentPage from 'theme/mixins/currentPage'
 import LanguageSwitcher from '../../LanguageSwitcher.vue'
 import Newsletter from 'theme/components/core/blocks/Footer/Newsletter'
 import BackToTop from 'theme/components/core/BackToTop'
+import { getPathForStaticPage } from 'theme/helpers'
 import config from 'config'
 
 export default {
@@ -178,7 +179,7 @@ export default {
   },
   methods: {
     getLinkFor (path) {
-      return localizedRouteOnlyForDefault(path)
+      return localizedRoute(getPathForStaticPage(path))
     }
   },
   components: {
diff --git a/src/themes/default/helpers/index.ts b/src/themes/default/helpers/index.ts
new file mode 100644
index 0000000000..a270012598
--- /dev/null
+++ b/src/themes/default/helpers/index.ts
@@ -0,0 +1,9 @@
+import config from 'config'
+import { currentStoreView } from '@vue-storefront/core/lib/multistore'
+
+export function getPathForStaticPage (path: string) {
+  const { storeCode } = currentStoreView()
+  const isStoreCodeEquals = storeCode === config.defaultStoreCode
+
+  return isStoreCodeEquals ? `/i${path}` : path
+}
diff --git a/src/themes/default/pages/Static.vue b/src/themes/default/pages/Static.vue
index b6be2b049d..af56af741a 100644
--- a/src/themes/default/pages/Static.vue
+++ b/src/themes/default/pages/Static.vue
@@ -35,7 +35,7 @@ import i18n from '@vue-storefront/i18n'
 import Breadcrumbs from 'theme/components/core/Breadcrumbs'
 import StaticExample from 'theme/components/theme/blocks/Static/Example'
 import StaticShortExample from 'theme/components/theme/blocks/Static/Short'
-import { localizedRouteOnlyForDefault } from '@vue-storefront/core/lib/multistore'
+import { getPathForStaticPage } from 'theme/helpers'
 
 export default {
   components: {
@@ -66,9 +66,9 @@ export default {
   data () {
     return {
       navigation: [
-        { title: i18n.t('About us'), link: localizedRouteOnlyForDefault('/about-us'), component: StaticExample },
-        { title: i18n.t('Customer service'), link: localizedRouteOnlyForDefault('/customer-service'), component: StaticShortExample },
-        { title: i18n.t('Store locator'), link: localizedRouteOnlyForDefault('/store-locator'), component: StaticExample },
+        { title: i18n.t('About us'), link: getPathForStaticPage('/about-us'), component: StaticExample },
+        { title: i18n.t('Customer service'), link: getPathForStaticPage('/customer-service'), component: StaticShortExample },
+        { title: i18n.t('Store locator'), link: getPathForStaticPage('/store-locator'), component: StaticExample },
         { title: i18n.t('Delivery'), link: '/delivery', component: StaticShortExample },
         { title: i18n.t('Return policy'), link: '/returns', component: StaticExample },
         { title: i18n.t('Privacy policy'), link: '/privacy', component: StaticShortExample },

From 5bb888e587d78147cd14155a883a21ad7056698a Mon Sep 17 00:00:00 2001
From: ResuBaka <ResuBaka@users.noreply.github.com>
Date: Wed, 2 Oct 2019 12:42:53 +0200
Subject: [PATCH 3/4] Revert "Fixed bundle products with no options"

---
 CHANGELOG.md                                       |  1 -
 core/modules/cart/helpers/productChecksum.ts       | 14 +++++++++++---
 .../cart/test/unit/helpers/productChecksum.spec.ts |  4 ++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3f10a507b..732b857548 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,7 +56,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Route Manager Queue for adding routes efficiently and with an optional priority - @grimasod (#3540)
 - Added tests for cart module actions - @andrzejewsky (#3023)
 - Fixed a problem with type changes in the state when extending a store - @resubaka (#3618)
-- Fixed problem with bundle product where they have the same hash as other products - @resubaka (#3657)
 
 ### Fixed
 
diff --git a/core/modules/cart/helpers/productChecksum.ts b/core/modules/cart/helpers/productChecksum.ts
index 70153c3740..ea13e0137b 100644
--- a/core/modules/cart/helpers/productChecksum.ts
+++ b/core/modules/cart/helpers/productChecksum.ts
@@ -2,10 +2,18 @@ import CartItem from '@vue-storefront/core/modules/cart/types/CartItem'
 import { sha3_224 } from 'js-sha3'
 
 const getDataToHash = (product: CartItem): any => {
-  return {
-    product_option: product.product_option,
-    sku: product.sku
+  if (!product.product_option) {
+    return null
   }
+
+  const { extension_attributes } = product.product_option
+
+  if (extension_attributes.bundle_options) {
+    const { bundle_options } = extension_attributes
+    return Array.isArray(bundle_options) ? bundle_options : Object.values(bundle_options)
+  }
+
+  return product.product_option
 }
 
 const productChecksum = (product: CartItem): string =>
diff --git a/core/modules/cart/test/unit/helpers/productChecksum.spec.ts b/core/modules/cart/test/unit/helpers/productChecksum.spec.ts
index fa0208b934..f3a5c9a9df 100644
--- a/core/modules/cart/test/unit/helpers/productChecksum.spec.ts
+++ b/core/modules/cart/test/unit/helpers/productChecksum.spec.ts
@@ -49,10 +49,10 @@ const bundleProduct: CartItem = {
 
 describe('Cart productChecksum', () => {
   it('returns checksum for bundle product', async () => {
-    expect(productChecksum(bundleProduct)).toBe('3a3c1864b9ecd7cd66ab52d7ed2aab4fd2c8e232dffc2a59902d7b90');
+    expect(productChecksum(bundleProduct)).toBe('d8ba5d5baf59fe28647d6a08fdaeb683a7b39ccdebc77eecabc6457c');
   });
 
   it('returns checksum for configurable product', async () => {
-    expect(productChecksum(configurableProduct)).toBe('c0781e146b8b799836585d19ad3b7a6fb465dfdd2b7d9dcad0793b6b');
+    expect(productChecksum(configurableProduct)).toBe('0bbb27ec7a3cb5dfd1d3f6c4ee54c8b522c4063fe6ea0571794d446f');
   });
 });

From e8d2161054a26f9b931cc20c1fb6f5faa2c8e1a3 Mon Sep 17 00:00:00 2001
From: andrzejewsky <vox3r69@gmail.com>
Date: Wed, 2 Oct 2019 19:01:52 +0200
Subject: [PATCH 4/4] remove popup

---
 CHANGELOG.md                                                    | 1 +
 .../default/components/core/blocks/SidebarMenu/SubCategory.vue  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 732b857548..c67b2b69d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -132,6 +132,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Removed infinite loop when changing checkbox in shipping details - @gibkigonzo (#3656)
 - Fixed displaying single order in the profile - @andrzejewsky (#3663)
 - Make microcart ui consistent for all types of products - @gibkigonzo (#3673)
+- Removed showing popup when you have just logged out - @andrzejewsky (#3680)
 
 ### Changed / Improved
 
diff --git a/src/themes/default/components/core/blocks/SidebarMenu/SubCategory.vue b/src/themes/default/components/core/blocks/SidebarMenu/SubCategory.vue
index abd55e8b3f..cddee21c82 100644
--- a/src/themes/default/components/core/blocks/SidebarMenu/SubCategory.vue
+++ b/src/themes/default/components/core/blocks/SidebarMenu/SubCategory.vue
@@ -144,7 +144,7 @@ export default {
   },
   methods: {
     logout () {
-      this.$bus.$emit('user-before-logout')
+      this.$store.dispatch('user/logout', {})
       this.$router.push(this.localizedRoute('/'))
     },
     notify (title) {