From 8280b3960865aaf7b1454d53db6f61e39b1aac93 Mon Sep 17 00:00:00 2001
From: Petrisor Frincu <petrisor.frincu@plentysystems.com>
Date: Mon, 4 Nov 2024 10:39:09 +0200
Subject: [PATCH 1/9] Reload page after login

---
 apps/web/components/LoginComponent/LoginComponent.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/web/components/LoginComponent/LoginComponent.vue b/apps/web/components/LoginComponent/LoginComponent.vue
index 6e8a7ffec..3d77bbd6d 100644
--- a/apps/web/components/LoginComponent/LoginComponent.vue
+++ b/apps/web/components/LoginComponent/LoginComponent.vue
@@ -65,6 +65,7 @@ const loginUser = async () => {
         await getSession();
       }
     }
+    window.location.reload();
   }
 };
 </script>

From f2b2a95471a012e8304bd843e38fb27725638ad3 Mon Sep 17 00:00:00 2001
From: Petrisor Frincu <petrisor.frincu@plentysystems.com>
Date: Mon, 4 Nov 2024 10:40:33 +0200
Subject: [PATCH 2/9] Reload page after login

---
 docs/changelog/changelog_en.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog/changelog_en.md b/docs/changelog/changelog_en.md
index 37de61d1b..6853feb0b 100644
--- a/docs/changelog/changelog_en.md
+++ b/docs/changelog/changelog_en.md
@@ -9,6 +9,7 @@
 - Fluid logo container + max-width and max-height addaptation
 - Fix cls mobile
 - Edit mode toolbar + Json editor Front End
+- Reload page after login so the customer class affects prices and categories
 
 ### New
 

From 7976fd144222eae2fa8f2eade4703f641fa1bbdd Mon Sep 17 00:00:00 2001
From: Petrisor Frincu <petrisor.frincu@plentysystems.com>
Date: Wed, 6 Nov 2024 16:59:24 +0200
Subject: [PATCH 3/9] Update accordingly to PR

---
 apps/web/components/LoginComponent/LoginComponent.vue | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/apps/web/components/LoginComponent/LoginComponent.vue b/apps/web/components/LoginComponent/LoginComponent.vue
index 3d77bbd6d..26eae9c59 100644
--- a/apps/web/components/LoginComponent/LoginComponent.vue
+++ b/apps/web/components/LoginComponent/LoginComponent.vue
@@ -58,13 +58,6 @@ const loginUser = async () => {
   if (success) {
     send({ message: t('auth.login.success'), type: 'positive' });
     emits('loggedIn');
-    if (!isSoftLogin) {
-      const currentURL = window.location.href;
-      if (currentURL.includes(paths.checkout)) {
-        await loadAddresses();
-        await getSession();
-      }
-    }
     window.location.reload();
   }
 };

From 08953c8ed83780191ad2f38d9ecf7de6cf10717d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20R=C3=B6ll?=
 <30629157+maxiroellplenty@users.noreply.github.com>
Date: Wed, 6 Nov 2024 16:03:17 +0100
Subject: [PATCH 4/9] Update changelog_en.md

---
 docs/changelog/changelog_en.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/changelog/changelog_en.md b/docs/changelog/changelog_en.md
index 10fb9075a..57d76c706 100644
--- a/docs/changelog/changelog_en.md
+++ b/docs/changelog/changelog_en.md
@@ -6,6 +6,9 @@
 
 - Newsletter email confirmation
 
+### 🩹 Fixed
+- Reload page after login so the customer class affects prices and categories
+
 ## v1.7.0 (2024-11-06) <a href="https://github.com/plentymarkets/plentyshop-pwa/compare/v1.6.0...v1.7.0" target="_blank" rel="noopener"><b>Overview of all changes</b></a>
 
 ### New
@@ -21,7 +24,6 @@
 - Enabled font color customization for the hero banner via a template property.
 - Added a new carousel compoment.
 - Added an edit mode toolbar and JSON editor for the front end. Note that this is a preparatory step. Further functionality will be added in an upcoming version.
-- Reload page after login so the customer class affects prices and categories
 
 ### 🩹 Fixed
 

From 3681c01383f727a153b74aafd0eb2c5aec018050 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20R=C3=B6ll?=
 <30629157+maxiroellplenty@users.noreply.github.com>
Date: Wed, 6 Nov 2024 16:10:41 +0100
Subject: [PATCH 5/9] chore: remove unused code

---
 apps/web/components/LoginComponent/LoginComponent.vue | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/apps/web/components/LoginComponent/LoginComponent.vue b/apps/web/components/LoginComponent/LoginComponent.vue
index 26eae9c59..2999180a1 100644
--- a/apps/web/components/LoginComponent/LoginComponent.vue
+++ b/apps/web/components/LoginComponent/LoginComponent.vue
@@ -29,14 +29,9 @@
 </template>
 
 <script lang="ts" setup>
-import { AddressType } from '@plentymarkets/shop-api';
 import { SfLink, SfInput, SfLoaderCircular } from '@storefront-ui/vue';
 import type { LoginProps } from './types';
 
-const { getAddresses: getBillingAddresses } = useAddress(AddressType.Billing);
-const { getAddresses: getShippingAddresses } = useAddress(AddressType.Shipping);
-const { getShippingMethods } = useCartShippingMethods();
-
 const { login, loading, getSession } = useCustomer();
 const { send } = useNotification();
 const { t } = useI18n();
@@ -44,12 +39,6 @@ const { t } = useI18n();
 const { isSoftLogin = false, isModal = false } = defineProps<LoginProps>();
 const emits = defineEmits(['loggedIn', 'change-view']);
 
-const loadAddresses = async () => {
-  await getBillingAddresses();
-  await getShippingAddresses();
-  await getShippingMethods();
-};
-
 const email = ref('');
 const password = ref('');
 

From d116e2e09ab304dbbb50a0025bcb395f48f05eb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20R=C3=B6ll?=
 <30629157+maxiroellplenty@users.noreply.github.com>
Date: Wed, 6 Nov 2024 16:13:54 +0100
Subject: [PATCH 6/9] chore: format

---
 docs/changelog/changelog_en.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog/changelog_en.md b/docs/changelog/changelog_en.md
index 57d76c706..1a5945edd 100644
--- a/docs/changelog/changelog_en.md
+++ b/docs/changelog/changelog_en.md
@@ -7,6 +7,7 @@
 - Newsletter email confirmation
 
 ### 🩹 Fixed
+
 - Reload page after login so the customer class affects prices and categories
 
 ## v1.7.0 (2024-11-06) <a href="https://github.com/plentymarkets/plentyshop-pwa/compare/v1.6.0...v1.7.0" target="_blank" rel="noopener"><b>Overview of all changes</b></a>

From 05c67e1428798b6d1422bc6c7cea792a5791934a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20R=C3=B6ll?=
 <30629157+maxiroellplenty@users.noreply.github.com>
Date: Wed, 6 Nov 2024 16:22:03 +0100
Subject: [PATCH 7/9] chore: lint

---
 apps/web/components/LoginComponent/LoginComponent.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/components/LoginComponent/LoginComponent.vue b/apps/web/components/LoginComponent/LoginComponent.vue
index 2999180a1..df60dbb26 100644
--- a/apps/web/components/LoginComponent/LoginComponent.vue
+++ b/apps/web/components/LoginComponent/LoginComponent.vue
@@ -32,7 +32,7 @@
 import { SfLink, SfInput, SfLoaderCircular } from '@storefront-ui/vue';
 import type { LoginProps } from './types';
 
-const { login, loading, getSession } = useCustomer();
+const { login, loading } = useCustomer();
 const { send } = useNotification();
 const { t } = useI18n();
 

From a98dcad00d75f9e7d994f4f1629648499c0f8324 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20R=C3=B6ll?=
 <30629157+maxiroellplenty@users.noreply.github.com>
Date: Thu, 7 Nov 2024 11:08:47 +0100
Subject: [PATCH 8/9] fix: review  skip reload after login to create a review

---
 apps/web/components/LoginComponent/LoginComponent.vue | 6 ++++--
 apps/web/components/LoginComponent/types.ts           | 1 +
 apps/web/components/ui/ReviewModal/ReviewModal.vue    | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/web/components/LoginComponent/LoginComponent.vue b/apps/web/components/LoginComponent/LoginComponent.vue
index df60dbb26..34c74bff7 100644
--- a/apps/web/components/LoginComponent/LoginComponent.vue
+++ b/apps/web/components/LoginComponent/LoginComponent.vue
@@ -36,7 +36,7 @@ const { login, loading } = useCustomer();
 const { send } = useNotification();
 const { t } = useI18n();
 
-const { isSoftLogin = false, isModal = false } = defineProps<LoginProps>();
+const { isSoftLogin = false, isModal = false, skipReload = false } = defineProps<LoginProps>();
 const emits = defineEmits(['loggedIn', 'change-view']);
 
 const email = ref('');
@@ -47,7 +47,9 @@ const loginUser = async () => {
   if (success) {
     send({ message: t('auth.login.success'), type: 'positive' });
     emits('loggedIn');
-    window.location.reload();
+    if (!skipReload) {
+      window.location.reload();
+    }
   }
 };
 </script>
diff --git a/apps/web/components/LoginComponent/types.ts b/apps/web/components/LoginComponent/types.ts
index 7124912c2..4a6a5fdc7 100644
--- a/apps/web/components/LoginComponent/types.ts
+++ b/apps/web/components/LoginComponent/types.ts
@@ -1,4 +1,5 @@
 export type LoginProps = {
   isSoftLogin?: boolean;
   isModal?: boolean;
+  skipReload?: boolean;
 };
diff --git a/apps/web/components/ui/ReviewModal/ReviewModal.vue b/apps/web/components/ui/ReviewModal/ReviewModal.vue
index 6c9b5f0ac..d4cad40d2 100644
--- a/apps/web/components/ui/ReviewModal/ReviewModal.vue
+++ b/apps/web/components/ui/ReviewModal/ReviewModal.vue
@@ -13,7 +13,7 @@
       <ReviewForm v-else :review-item="review" />
     </template>
     <template v-else>
-      <LoginComponent v-if="isLogin" @change-view="isLogin = false" />
+      <LoginComponent v-if="isLogin" @change-view="isLogin = false" skipReload />
       <Register v-else @change-view="isLogin = true" />
     </template>
   </UiModal>

From af1ec60719b31e4b49ff9adcb43f78d99ba6fa36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20R=C3=B6ll?=
 <30629157+maxiroellplenty@users.noreply.github.com>
Date: Thu, 7 Nov 2024 11:12:18 +0100
Subject: [PATCH 9/9] fix: lint

---
 apps/web/components/ui/ReviewModal/ReviewModal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/components/ui/ReviewModal/ReviewModal.vue b/apps/web/components/ui/ReviewModal/ReviewModal.vue
index d4cad40d2..e3d3f8b6e 100644
--- a/apps/web/components/ui/ReviewModal/ReviewModal.vue
+++ b/apps/web/components/ui/ReviewModal/ReviewModal.vue
@@ -13,7 +13,7 @@
       <ReviewForm v-else :review-item="review" />
     </template>
     <template v-else>
-      <LoginComponent v-if="isLogin" @change-view="isLogin = false" skipReload />
+      <LoginComponent v-if="isLogin" @change-view="isLogin = false" skip-reload />
       <Register v-else @change-view="isLogin = true" />
     </template>
   </UiModal>