fix: currency sent to api (#1827)

* fix: currency sent to api * fix: unit test * fix: currency sent to api * fix: unit test of currency shop
PrestaShopCorp · Oct 4, 2024 · 3b6e5cc · 3b6e5cc
1 parent b13412b
commit 3b6e5cc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/_dev/apps/ui/src/providers/shipping-rate-provider.spec.ts b/_dev/apps/ui/src/providers/shipping-rate-provider.spec.ts
@@ -160,7 +160,8 @@ describe('Product Feed / Step 2 Option 1 / Estimate Shipping', () => {
         },
       },
     ];
-    const transform = toApi(validCarrierFromView);
+    const currencyShop = 'EUR';
+    const transform = toApi(validCarrierFromView, currencyShop);
 
     expect(transform).toEqual([
       {
@@ -169,7 +170,7 @@ describe('Product Feed / Step 2 Option 1 / Estimate Shipping', () => {
         minDeliveryTime: 5,
         maxDeliveryTime: 7,
         countries: [],
-        currency: '',
+        currency: 'EUR',
         freeShippingOverAmount: {
           shippingCost: 0,
           orderPrice: 0,
@@ -199,7 +200,8 @@ describe('Product Feed / Step 2 Option 1 / Estimate Shipping', () => {
         },
       },
     ];
-    const transform = toApi(validCarrierFromView);
+    const currencyShop = 'EUR';
+    const transform = toApi(validCarrierFromView, currencyShop);
 
     expect(transform).toEqual([
       {
@@ -208,7 +210,7 @@ describe('Product Feed / Step 2 Option 1 / Estimate Shipping', () => {
         minDeliveryTime: 5,
         maxDeliveryTime: 7,
         countries: [],
-        currency: '',
+        currency: 'EUR',
         freeShippingOverAmount: {
           shippingCost: 2.99,
           orderPrice: 42.99,
@@ -221,7 +223,7 @@ describe('Product Feed / Step 2 Option 1 / Estimate Shipping', () => {
   });
 
   it('should return an empty array if estimateCarriers is empty', () => {
-    const transform = toApi([]);
+    const transform = toApi([], '');
 
     expect(transform).toEqual([]);
   });

diff --git a/_dev/apps/ui/src/providers/shipping-rate-provider.ts b/_dev/apps/ui/src/providers/shipping-rate-provider.ts
@@ -1,5 +1,6 @@
 import {OfferType} from '@/enums/product-feed/offer';
 import {RateType} from '@/enums/product-feed/rate';
+import store from '@/store';
 
 export type freeShippingOverAmount = {
   shippingCost: number|null;
@@ -134,7 +135,7 @@ export function generateEmptyCarrier(
   };
 }
 
-export function toApi(customerCarrier: CustomCarrier[]): CustomCarrier[] {
+export function toApi(customerCarrier: CustomCarrier[], currencyShop): CustomCarrier[] {
   if (customerCarrier === null || customerCarrier.length === 0) {
     return [];
   }
@@ -150,6 +151,9 @@ export function toApi(customerCarrier: CustomCarrier[]): CustomCarrier[] {
     if (carrier.freeShippingOverAmount.shippingCost === null) {
       carrier.freeShippingOverAmount.shippingCost = 0;
     }
+    if (carrier.currency !== currencyShop) {
+      carrier.currency = currencyShop;
+    }
   });
 
   return toApiFormat;

diff --git a/_dev/apps/ui/src/store/modules/product-feed/actions.ts b/_dev/apps/ui/src/store/modules/product-feed/actions.ts
@@ -212,7 +212,7 @@ export default {
     // Delivery times & rates - Estimate method
     const rate = getDataFromLocalStorage('productFeed-rateChosen') || productFeedSettings.rate || undefined;
     const estimateCarriers = toApi(
-      getDataFromLocalStorage('productFeed-estimateCarriers') || productFeedSettings.estimateCarriers,
+      getDataFromLocalStorage('productFeed-estimateCarriers') || productFeedSettings.estimateCarriers, rootState.app.psxMktgWithGoogleShopCurrency.isoCode,
     );
     // Attributes mapping
     const attributeMapping = (getDataFromLocalStorage('productFeed-attributeMapping')