From 31a4dec8a3c6aa8a4689ecc92149812d726aa13d Mon Sep 17 00:00:00 2001
From: ValdiANS <rvdans002@gmail.com>
Date: Fri, 10 Apr 2026 16:12:47 +0700
Subject: [PATCH] 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;
   });