From b7f886b51e13af8a21e718fa78f4a8f491318df6 Mon Sep 17 00:00:00 2001
From: Adnan Zahir <adnanzaidanz@gmail.com>
Date: Wed, 22 Apr 2026 11:41:09 +0700
Subject: [PATCH 1/2] fix: mismatch dto marketings

---
 .../delivery-order/DeliverOrderProduct.tsx    | 24 +++++++++++++------
 .../table-view/DeliveryOrderProductTable.tsx  |  8 +++++--
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/components/pages/marketing/form/repeater/delivery-order/DeliverOrderProduct.tsx b/src/components/pages/marketing/form/repeater/delivery-order/DeliverOrderProduct.tsx
index 6793018b..71716a70 100644
--- a/src/components/pages/marketing/form/repeater/delivery-order/DeliverOrderProduct.tsx
+++ b/src/components/pages/marketing/form/repeater/delivery-order/DeliverOrderProduct.tsx
@@ -190,12 +190,19 @@ const DeliveryOrderProductForm = ({
   const deliveryOrder = useMemo(() => {
     if (!hasDeliveryOrder || !deliveryOrders) return null;
 
+    const marketingProductId =
+      initialValues?.marketing_product_id ?? initialValues?.id;
+
     for (const doItem of deliveryOrders) {
-      const found = doItem.deliveries.find(
-        (d) =>
-          d.product_warehouse.id ===
-          initialValues?.marketing_product?.product_warehouse_id
-      );
+      const found =
+        doItem.deliveries.find(
+          (d) => d.marketing_product_id === marketingProductId
+        ) ??
+        doItem.deliveries.find(
+          (d) =>
+            d.product_warehouse.id ===
+            initialValues?.marketing_product?.product_warehouse_id
+        );
       if (found) {
         return {
           ...found,
@@ -403,7 +410,10 @@ const DeliveryOrderProductForm = ({
 
   useEffect(() => {
     if (initialValues) {
-      if (!Boolean(initialValues.qty)) {
+      if (
+        !Boolean(initialValues.qty) &&
+        !Boolean(initialValues.marketing_product_id)
+      ) {
         handleResetForm();
       } else {
         setFormikValues({
@@ -413,7 +423,7 @@ const DeliveryOrderProductForm = ({
         });
         if (initialValues?.marketing_product_id) {
           setSelectedProduct({
-            value: initialValues?.id,
+            value: initialValues?.marketing_product_id,
             label: `${initialValues?.marketing_product?.product_warehouse?.label} - ${initialValues?.marketing_product?.warehouse?.label ?? initialValues?.marketing_product?.kandang?.label}`,
           } as OptionType);
         }
diff --git a/src/components/pages/marketing/form/table-view/DeliveryOrderProductTable.tsx b/src/components/pages/marketing/form/table-view/DeliveryOrderProductTable.tsx
index 9c7337ec..b32686ba 100644
--- a/src/components/pages/marketing/form/table-view/DeliveryOrderProductTable.tsx
+++ b/src/components/pages/marketing/form/table-view/DeliveryOrderProductTable.tsx
@@ -124,7 +124,9 @@ const DeliveryOrderProductTable = ({
           <tr>
             <td className='text-sm px-4 py-3'>Qty</td>
             <td className='text-sm px-4 py-3'>
-              {item.qty
+              {item.qty !== undefined &&
+              item.qty !== null &&
+              item.qty !== ''
                 ? `${formatNumber(parseFloat(item.qty as string))} ${item.marketing_product?.uom ?? ''}`
                 : '-'}
             </td>
@@ -273,7 +275,9 @@ const DeliveryOrderProductTable = ({
           <tr>
             <td className='text-sm px-4 py-3'>Qty</td>
             <td className='text-sm px-4 py-3'>
-              {item.qty
+              {item.qty !== undefined &&
+              item.qty !== null &&
+              item.qty !== ''
                 ? `${formatNumber(Number(item.qty))} ${item.marketing_product?.product_warehouse_data?.product.uom.name ?? ''}`
                 : '-'}
             </td>

From 5c5b49d0a93f1acadf46b8eb994b9c16b87f5d92 Mon Sep 17 00:00:00 2001
From: Adnan Zahir <adnanzaidanz@gmail.com>
Date: Wed, 22 Apr 2026 11:41:41 +0700
Subject: [PATCH 2/2] fix: styling

---
 .../form/table-view/DeliveryOrderProductTable.tsx         | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/components/pages/marketing/form/table-view/DeliveryOrderProductTable.tsx b/src/components/pages/marketing/form/table-view/DeliveryOrderProductTable.tsx
index b32686ba..c86d9458 100644
--- a/src/components/pages/marketing/form/table-view/DeliveryOrderProductTable.tsx
+++ b/src/components/pages/marketing/form/table-view/DeliveryOrderProductTable.tsx
@@ -124,9 +124,7 @@ const DeliveryOrderProductTable = ({
           <tr>
             <td className='text-sm px-4 py-3'>Qty</td>
             <td className='text-sm px-4 py-3'>
-              {item.qty !== undefined &&
-              item.qty !== null &&
-              item.qty !== ''
+              {item.qty !== undefined && item.qty !== null && item.qty !== ''
                 ? `${formatNumber(parseFloat(item.qty as string))} ${item.marketing_product?.uom ?? ''}`
                 : '-'}
             </td>
@@ -275,9 +273,7 @@ const DeliveryOrderProductTable = ({
           <tr>
             <td className='text-sm px-4 py-3'>Qty</td>
             <td className='text-sm px-4 py-3'>
-              {item.qty !== undefined &&
-              item.qty !== null &&
-              item.qty !== ''
+              {item.qty !== undefined && item.qty !== null && item.qty !== ''
                 ? `${formatNumber(Number(item.qty))} ${item.marketing_product?.product_warehouse_data?.product.uom.name ?? ''}`
                 : '-'}
             </td>