feat: keep cart items on currency change

client-app/core/api/graphql/cart/index.ts

@@ -7,6 +7,7 @@ export * from "./mutations/addOrUpdateCartPayment";
 export * from "./mutations/addOrUpdateCartShipment";
 export * from "./mutations/changeCartComment";
 export * from "./mutations/changeCartConfiguredItem";
+export * from "./mutations/changeCartCurrency";
 export * from "./mutations/changeCartItemQuantity";
 export * from "./mutations/changeFullCartItemQuantity";
 export * from "./mutations/changeFullCartItemsQuantity";

client-app/core/api/graphql/cart/mutations/changeCartCurrency/changeCartCurrencyMutation.graphql

@@ -0,0 +1,7 @@
+#import "../../fragments/fullCart.graphql"
+
+mutation ChangeCartCurrency($command: InputChangeCartCurrencyType!) {
+  changeCartCurrency(command: $command) {
+    ...fullCart
+  }
+}

client-app/core/api/graphql/cart/mutations/changeCartCurrency/index.ts

@@ -0,0 +1,16 @@
+import { useMutation } from "@/core/api/graphql/composables";
+import { ChangeCartCurrencyDocument } from "@/core/api/graphql/types";
+import { globals } from "@/core/globals";
+
+export function useChangeCartCurrencyMutation() {
+  const { storeId, currencyCode, cultureName } = globals;
+  return useMutation(ChangeCartCurrencyDocument, {
+    variables: {
+      command: {
+        storeId,
+        currencyCode,
+        cultureName,
+      },
+    },
+  });
+}

client-app/shared/account/composables/useSignMeIn.ts

@@ -1,10 +1,11 @@
 import { syncRefs, useAsyncState } from "@vueuse/core";
 import { ref } from "vue";
-import { useGetMeQuery, useMergeCartMutation } from "@/core/api/graphql";
+import { useChangeCartCurrencyMutation, useGetMeQuery, useMergeCartMutation } from "@/core/api/graphql";
 import { useAuth } from "@/core/composables/useAuth";
 import { useCurrency } from "@/core/composables/useCurrency";
 import { useLanguages } from "@/core/composables/useLanguages";
 import { USER_ID_LOCAL_STORAGE } from "@/core/constants";
+import { globals } from "@/core/globals";
 import { TabsType, openReturnUrl, useBroadcast } from "@/shared/broadcast";
 import { useShortCart } from "@/shared/cart/composables";
 import type { IdentityErrorType } from "@/core/api/graphql/types";
@@ -17,6 +18,8 @@ export function useSignMeIn() {
   const { mutate: mergeCart } = useMergeCartMutation();
   const { unpinLocale, removeLocaleFromUrl } = useLanguages();
   const { supportedCurrencies, saveCurrencyCode } = useCurrency();
+  const { mutate: changeCartCurrency } = useChangeCartCurrencyMutation();
+  const { currencyCode: currentCurencyCode } = globals;
 
   const { isLoading: loading, execute: signIn } = useAsyncState(
     async () => {
@@ -28,19 +31,26 @@ export function useSignMeIn() {
       // get user that will be applied after reload.
       await getMe();
 
-      if (me.value?.me) {
+      const currencyCode = me.value?.me?.contact?.currencyCode;
+
+      if (me.value?.me && currencyCode) {
         if (cart.value?.id) {
           await mergeCart({ command: { userId: me.value.me.id, secondCartId: cart.value.id } });
-        }
-
-        const currencyCode = me.value.me.contact?.currencyCode;
 
-        if (currencyCode) {
-          const contactCurrency = supportedCurrencies.value.find((item) => item.code === currencyCode);
-          if (contactCurrency) {
-            saveCurrencyCode(contactCurrency.code, false);
+          if (currencyCode !== currentCurencyCode) {
+            await changeCartCurrency({
+              command: {
+                userId: me.value.me.id,
+                newCurrencyCode: currencyCode,
+              },
+            });
           }
         }
+
+        const contactCurrency = supportedCurrencies.value.find((item) => item.code === currencyCode);
+        if (contactCurrency) {
+          saveCurrencyCode(contactCurrency.code, false);
+        }
       }
 
       void broadcast.emit(openReturnUrl, undefined, TabsType.ALL);

client-app/shared/layout/components/currency-selector/currency-selector.vue

@@ -38,12 +38,30 @@
 </template>
 
 <script setup lang="ts">
+import { useChangeCartCurrencyMutation } from "@/core/api/graphql";
 import { useCurrency } from "@/core/composables";
+import { globals } from "@/core/globals";
+import { useFullCart } from "@/shared/cart";
 
 const { currentCurrency, supportedCurrencies, saveCurrencyCode } = useCurrency();
+const { cart } = useFullCart();
+const { mutate: changeCartCurrency } = useChangeCartCurrencyMutation();
+const { userId } = globals;
 
-function select(code: string) {
+async function select(code: string): Promise<void> {
   if (currentCurrency.value?.code !== code) {
+    if (cart.value) {
+      await changeCartCurrency({
+        command: {
+          userId,
+          cartId: cart.value.id,
+          cartName: cart.value.name,
+          cartType: cart.value.type,
+          newCurrencyCode: code,
+        },
+      });
+    }
+
     saveCurrencyCode(code);
   }
 }

yarn.lock

@@ -5273,7 +5273,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@virto-commerce/front-modules-google-ecommerce-analytics@npm:^1.0.10":
+"@virto-commerce/front-modules-google-ecommerce-analytics@npm:1.0.10":
   version: 1.0.10
   resolution: "@virto-commerce/front-modules-google-ecommerce-analytics@npm:1.0.10"
   dependencies:
@@ -14892,7 +14892,7 @@ __metadata:
     "@unhead/vue": "npm:^1.9.14"
     "@vee-validate/rules": "npm:~4.13.2"
     "@vee-validate/yup": "npm:~4.13.2"
-    "@virto-commerce/front-modules-google-ecommerce-analytics": "npm:^1.0.10"
+    "@virto-commerce/front-modules-google-ecommerce-analytics": "npm:1.0.10"
     "@virto-commerce/front-modules-hotjar": "npm:^1.0.4"
     "@vitejs/plugin-vue": "npm:^5.0.5"
     "@vue/apollo-composable": "npm:^4.0.2"