feat: add default return url setting (#1165)

## References ### Jira-link: https://virtocommerce.atlassian.net/browse/VCST-1417 ### Artifact URL: https://vc3prerelease.blob.core.windows.net/packages/vc-theme-b2b-vue-1.62.0-pr-1165-a231-a231ff3a.zip
VirtoCommerce · Jul 5, 2024 · 53777e1 · 53777e1
1 parent b2dad89
commit 53777e1
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/client-app/broadcast.ts b/client-app/broadcast.ts
@@ -2,6 +2,7 @@ import { useApolloClient } from "@vue/apollo-composable";
 import { useRouter } from "vue-router";
 import { filterActiveQueryNames } from "@/core/api/graphql";
 import { OperationNames } from "@/core/api/graphql/types";
+import { useThemeContext } from "@/core/composables";
 import { DEFAULT_NOTIFICATION_DURATION } from "@/core/constants";
 import { globals } from "@/core/globals";
 import { getReturnUrlValue } from "@/core/utilities";
@@ -36,6 +37,7 @@ export function setupBroadcastGlobalListeners() {
   const notifications = useNotifications();
   const { fetchUser, user } = useUser();
   const { signMeOut } = useSignMeOut({ reloadPage: false });
+  const { themeContext } = useThemeContext();
 
   on(pageReloadEvent, () => location.reload());
   on(reloadAndOpenMainPage, () => {
@@ -86,7 +88,7 @@ export function setupBroadcastGlobalListeners() {
     });
   });
   on(openReturnUrl, () => {
-    location.href = getReturnUrlValue() ?? "/";
+    location.href = getReturnUrlValue() ?? themeContext.value.settings.default_return_url ?? "/";
   });
 
   on(forbiddenEvent, () => {

diff --git a/client-app/core/types/theme-config.ts b/client-app/core/types/theme-config.ts
@@ -157,6 +157,7 @@ export interface IThemeConfigPreset {
   color_footer_bottom_link?: string;
   color_footer_bottom_link_hover?: string;
   isCVVinSkyflowRequired?: boolean;
+  default_return_url?: string;
 }
 
 export interface IThemeConfig {

diff --git a/client-app/shared/layout/components/header/_internal/bottom-header.vue b/client-app/shared/layout/components/header/_internal/bottom-header.vue
@@ -4,7 +4,7 @@
       ref="bottomHeader"
       class="relative z-[2] flex min-h-[5.5rem] items-center gap-x-5 bg-inherit px-5 py-3 xl:px-12"
     >
-      <router-link to="/">
+      <router-link :to="$context.settings.default_return_url ?? '/'">
         <VcImage :src="logoUrl" :alt="$context.storeName" class="h-8 xl:h-[2.8rem]" lazy />
       </router-link>
 

diff --git a/client-app/shared/layout/components/header/_internal/mobile-header.vue b/client-app/shared/layout/components/header/_internal/mobile-header.vue
@@ -15,7 +15,7 @@
             <VcIcon class="text-[--color-primary-500]" name="menu" :size="32" />
           </button>
 
-          <router-link to="/">
+          <router-link :to="$context.settings.default_return_url ?? '/'">
             <VcImage :src="logoUrl" :alt="$context.storeName" class="h-8" lazy />
           </router-link>
         </div>

diff --git a/config/settings_data.json b/config/settings_data.json
@@ -42,6 +42,10 @@
       "checkout_coupon_enabled": true,
       "checkout_gifts_enabled": true,
 
+      "isCVVinSkyflowRequired": false,
+
+      "default_return_url": "/",
+
       "logo_image": "/static/images/common/logo.svg",
       "logo_inverted_image": "/static/images/common/logo-white.svg",
       "favicon_image": "/static/icons/favicon-32x32.png",
@@ -248,8 +252,7 @@
       "color_info_950": "#0E212A",
 
       "color_additional_50": "#FFFFFF",
-      "color_additional_950": "#000000",
-      "isCVVinSkyflowRequired": false
+      "color_additional_950": "#000000"
     },
 
     "Watermelon": {
@@ -293,6 +296,10 @@
       "checkout_coupon_enabled": true,
       "checkout_gifts_enabled": true,
 
+      "isCVVinSkyflowRequired": false,
+
+      "default_return_url": "/",
+
       "logo_image": "/static/images/common/logo.svg",
       "logo_inverted_image": "/static/images/common/logo-white.svg",
       "favicon_image": "/static/icons/favicon-32x32.png",
@@ -515,9 +522,7 @@
       "color_footer_top_bg": "#332829",
 
       "color_footer_bottom_bg": "#141010",
-      "color_footer_bottom_link": "#d4c9c9",
-
-      "isCVVinSkyflowRequired": false
+      "color_footer_bottom_link": "#d4c9c9"
     }
   }
 }