Merge pull request #604 from mirumee/fix/weight-rate-update

Fix weight based rate update

CHANGELOG.md

@@ -5,6 +5,7 @@ All notable, unreleased changes to this project will be documented in this file.
 ## [Unreleased]
 
 - Add weight field and fix warehouse country selection - #597 by @dominik-zeglen
+- Fix weight based rate update - #604 by @dominik-zeglen
 
 ## 2.10.0
 

src/shipping/views/ShippingZoneDetails/data.ts

@@ -2,8 +2,13 @@ import { ShippingZoneUrlQueryParams } from "@saleor/shipping/urls";
 import { ShippingMethodTypeEnum } from "@saleor/types/globalTypes";
 import { UpdateShippingRateVariables } from "@saleor/shipping/types/UpdateShippingRate";
 import { CreateShippingRateVariables } from "@saleor/shipping/types/CreateShippingRate";
+import { ShippingZone_shippingZone_shippingMethods } from "@saleor/shipping/types/ShippingZone";
 import { FormData as ShippingZoneRateDialogFormData } from "../../components/ShippingZoneRateDialog";
 
+function getValue(value: string, hasLimits: boolean): number | null {
+  return hasLimits ? null : parseFloat(value);
+}
+
 export function getCreateShippingRateVariables(
   data: ShippingZoneRateDialogFormData,
   params: ShippingZoneUrlQueryParams,
@@ -13,28 +18,20 @@ export function getCreateShippingRateVariables(
     input: {
       maximumOrderPrice:
         params.type === ShippingMethodTypeEnum.PRICE
-          ? data.noLimits
+          ? getValue(data.maxValue, data.noLimits)
-            ? null
-            : parseFloat(data.maxValue)
           : null,
       maximumOrderWeight:
         params.type === ShippingMethodTypeEnum.WEIGHT
-          ? data.noLimits
+          ? getValue(data.maxValue, data.noLimits)
-            ? null
-            : parseFloat(data.maxValue)
           : null,
 
       minimumOrderPrice:
         params.type === ShippingMethodTypeEnum.PRICE
-          ? data.noLimits
+          ? getValue(data.maxValue, data.noLimits)
-            ? null
-            : parseFloat(data.minValue)
           : null,
       minimumOrderWeight:
         params.type === ShippingMethodTypeEnum.WEIGHT
-          ? data.noLimits
+          ? getValue(data.minValue, data.noLimits)
-            ? null
-            : parseFloat(data.minValue)
           : null,
       name: data.name,
       price: data.isFree ? 0 : parseFloat(data.price),
@@ -46,17 +43,36 @@ export function getCreateShippingRateVariables(
 
 export function getUpdateShippingRateVariables(
   data: ShippingZoneRateDialogFormData,
-  params: ShippingZoneUrlQueryParams,
+  shippingRate: ShippingZone_shippingZone_shippingMethods,
-  id: string
+  shippingZoneId: string
 ): UpdateShippingRateVariables {
-  return {
+  const base: UpdateShippingRateVariables = {
-    id: params.id,
+    id: shippingRate.id,
     input: {
-      maximumOrderPrice: data.noLimits ? null : parseFloat(data.maxValue),
-      minimumOrderPrice: data.noLimits ? null : parseFloat(data.minValue),
       name: data.name,
       price: data.isFree ? 0 : parseFloat(data.price),
-      shippingZone: id
+      shippingZone: shippingZoneId,
+      type: shippingRate.type
+    }
+  };
+
+  if (shippingRate.type === ShippingMethodTypeEnum.PRICE) {
+    return {
+      ...base,
+      input: {
+        ...base.input,
+        maximumOrderPrice: getValue(data.maxValue, data.noLimits),
+        minimumOrderPrice: getValue(data.minValue, data.noLimits)
+      }
+    };
+  }
+
+  return {
+    ...base,
+    input: {
+      ...base.input,
+      maximumOrderWeight: getValue(data.maxValue, data.noLimits),
+      minimumOrderWeight: getValue(data.minValue, data.noLimits)
     }
   };
 }

src/shipping/views/ShippingZoneDetails/index.tsx

@@ -221,9 +221,15 @@ const ShippingZoneDetails: React.FC<ShippingZoneDetailsProps> = ({
         disabled={updateShippingRateOpts.loading}
         errors={updateShippingRateOpts.data?.shippingPriceUpdate.errors || []}
         onClose={closeModal}
-        onSubmit={data =>
+        onSubmit={submitData =>
           updateShippingRate({
-            variables: getUpdateShippingRateVariables(data, params, id)
+            variables: getUpdateShippingRateVariables(
+              submitData,
+              data?.shippingZone?.shippingMethods.find(
+                shippingMethod => shippingMethod.id === params.id
+              ),
+              id
+            )
           })
         }
         open={params.action === "edit-rate"}