From fbb6f8736842c45a9485d145f8fcb081a8c6b961 Mon Sep 17 00:00:00 2001 From: ValdiANS Date: Fri, 10 Apr 2026 16:12:35 +0700 Subject: [PATCH 1/3] fix: add weight_per_convertion to payload when creating/updating delivery order --- src/components/pages/marketing/DeliveryOrderFormModal.tsx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/components/pages/marketing/DeliveryOrderFormModal.tsx b/src/components/pages/marketing/DeliveryOrderFormModal.tsx index eb488285..d6ace126 100644 --- a/src/components/pages/marketing/DeliveryOrderFormModal.tsx +++ b/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) + ), }; } }) From 31a4dec8a3c6aa8a4689ecc92149812d726aa13d Mon Sep 17 00:00:00 2001 From: ValdiANS Date: Fri, 10 Apr 2026 16:12:47 +0700 Subject: [PATCH 2/3] fix: get weight_per_convertion from delivery order first --- src/components/pages/marketing/form/MarketingForm.schema.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/pages/marketing/form/MarketingForm.schema.ts b/src/components/pages/marketing/form/MarketingForm.schema.ts index 0bc40627..f9a3c476 100644 --- a/src/components/pages/marketing/form/MarketingForm.schema.ts +++ b/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; }); From f6f3290743d356ac57b4cb9fa1958cd55576f027 Mon Sep 17 00:00:00 2001 From: ValdiANS Date: Fri, 10 Apr 2026 16:13:02 +0700 Subject: [PATCH 3/3] fix: add weight_per_convertion to BaseDelivery --- src/types/api/marketing/marketing.d.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/types/api/marketing/marketing.d.ts b/src/types/api/marketing/marketing.d.ts index 743493f7..15d34345 100644 --- a/src/types/api/marketing/marketing.d.ts +++ b/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 = {