Fix/SC-25 currency send to api (#1831)

* fix: currency sent to api * fix: unit test * fix: currency sent to api * fix: unit test of currency shop * fix: currency sent to api * fix: currency sent to api
PrestaShopCorp · Oct 10, 2024 · f8f3b9e · f8f3b9e
1 parent 399286f
commit f8f3b9e
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 3 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
@@ -170,7 +170,7 @@ describe('Product Feed / Step 2 Option 1 / Estimate Shipping', () => {
         minDeliveryTime: 5,
         maxDeliveryTime: 7,
         countries: [],
-        currency: 'EUR',
+        currency: '',
         freeShippingOverAmount: {
           shippingCost: 0,
           orderPrice: 0,
@@ -210,7 +210,7 @@ describe('Product Feed / Step 2 Option 1 / Estimate Shipping', () => {
         minDeliveryTime: 5,
         maxDeliveryTime: 7,
         countries: [],
-        currency: 'EUR',
+        currency: '',
         freeShippingOverAmount: {
           shippingCost: 2.99,
           orderPrice: 42.99,
@@ -222,6 +222,46 @@ describe('Product Feed / Step 2 Option 1 / Estimate Shipping', () => {
     ]);
   });
 
+  it('should be the shop currency if offer is freeShipping', () => {
+    const validCarrierFromView: CustomCarrier[] = [
+      {
+        carrierName: 'DLH',
+        offer: OfferType.FREE_SHIPPING,
+        minDeliveryTime: 5,
+        maxDeliveryTime: 7,
+        countries: [],
+        currency: '',
+        freeShippingOverAmount: {
+          shippingCost: 0,
+          orderPrice: 0,
+        },
+        flatShippingRate: {
+          shippingCost: 0,
+        },
+      },
+    ];
+    const currencyShop = 'EUR';
+    const transform = toApi(validCarrierFromView, currencyShop);
+
+    expect(transform).toEqual([
+      {
+        carrierName: 'DLH',
+        offer: OfferType.FREE_SHIPPING,
+        minDeliveryTime: 5,
+        maxDeliveryTime: 7,
+        countries: [],
+        currency: 'EUR',
+        freeShippingOverAmount: {
+          shippingCost: 0,
+          orderPrice: 0,
+        },
+        flatShippingRate: {
+          shippingCost: 0,
+        },
+      },
+    ]);
+  });
+
   it('should return an empty array if estimateCarriers is empty', () => {
     const transform = toApi([], '');
 

diff --git a/_dev/apps/ui/src/providers/shipping-rate-provider.ts b/_dev/apps/ui/src/providers/shipping-rate-provider.ts
@@ -151,7 +151,7 @@ export function toApi(customerCarrier: CustomCarrier[], currencyShop): CustomCar
     if (carrier.freeShippingOverAmount.shippingCost === null) {
       carrier.freeShippingOverAmount.shippingCost = 0;
     }
-    if (carrier.currency !== currencyShop) {
+    if (carrier.offer === OfferType.FREE_SHIPPING) {
       carrier.currency = currencyShop;
     }
   });