Merge branch 'fix/marketing-delivery-order' into 'development'

[FIX/FE] Marketing Delivery Order

See merge request mbugroup/lti-web-client!386

src/components/pages/marketing/DeliveryOrderFormModal.tsx

@@ -199,6 +199,9 @@ const DeliveryOrderFormModal = ({}: { initialValues?: Marketing }) => {
                   'yyyy-MM-DD'
                 ),
                 vehicle_number: product.vehicle_number,
+                weight_per_convertion: parseFloat(
+                  String(product.weight_per_convertion ?? 0)
+                ),
               };
             }
           })
@@ -432,6 +435,9 @@ const DeliveryOrderFormModal = ({}: { initialValues?: Marketing }) => {
                   'yyyy-MM-DD'
                 ),
                 vehicle_number: product.vehicle_number,
+                weight_per_convertion: parseFloat(
+                  String(product.weight_per_convertion ?? 0)
+                ),
               };
             }
           })

src/components/pages/marketing/form/MarketingForm.schema.ts

@@ -213,7 +213,8 @@ export const DeliveryProductToFieldValues = (
         total_price: item.total_price,
       },
       total_peti: salesOrder?.total_peti,
-      weight_per_convertion: salesOrder?.weight_per_convertion,
+      weight_per_convertion:
+        item?.weight_per_convertion ?? salesOrder?.weight_per_convertion ?? 0,
       price_per_convertion: initialPricePerConvertion,
     } as DeliveryOrderProductFormValues;
   });

src/types/api/marketing/marketing.d.ts

@@ -61,6 +61,7 @@ export type BaseDelivery = {
   avg_weight: number;
   total_price: number;
   vehicle_number: string;
+  weight_per_convertion: number;
 };
 
 export type MarketingProduct = {