From 4d23929924bd22beb6b64667073694f2f4f8f813 Mon Sep 17 00:00:00 2001
From: rstubryan <restubumirr@gmail.com>
Date: Fri, 6 Feb 2026 14:20:52 +0700
Subject: [PATCH] refactor(FE): Update approval logic and conditional rendering
 in delivery forms

---
 .../marketing/DeliveryOrderFormModal.tsx      |  3 ++-
 .../table-view/DeliveryOrderProductTable.tsx  | 26 ++++++++++++-------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/components/pages/marketing/DeliveryOrderFormModal.tsx b/src/components/pages/marketing/DeliveryOrderFormModal.tsx
index 75f1bf1e..a2feceac 100644
--- a/src/components/pages/marketing/DeliveryOrderFormModal.tsx
+++ b/src/components/pages/marketing/DeliveryOrderFormModal.tsx
@@ -430,7 +430,8 @@ const DeliveryOrderFormModal = ({
   const isPending = useMemo(() => {
     return (
       isResponseSuccess(marketing) &&
-      marketing.data.latest_approval.step_number === 1
+      marketing.data.latest_approval.step_number === 1 &&
+      marketing.data.latest_approval.action === 'PENDING'
     );
   }, [marketing]);
 
diff --git a/src/components/pages/marketing/form/table-view/DeliveryOrderProductTable.tsx b/src/components/pages/marketing/form/table-view/DeliveryOrderProductTable.tsx
index 885cd8fc..93d4f658 100644
--- a/src/components/pages/marketing/form/table-view/DeliveryOrderProductTable.tsx
+++ b/src/components/pages/marketing/form/table-view/DeliveryOrderProductTable.tsx
@@ -39,6 +39,8 @@ const DeliveryOrderProductTable = ({
   const onDeleteRef = useRef(onDelete);
   onDeleteRef.current = onDelete;
 
+  const approvalStepNumber = marketing?.latest_approval?.step_number;
+
   return (
     <>
       <div className='size-full flex flex-col relative overflow-x-hidden gap-3'>
@@ -105,16 +107,20 @@ const DeliveryOrderProductTable = ({
                     </th>
                   </tr>
                   <>
-                    <tr>
-                      <td className='text-sm px-4 py-3'>Tanggal Pengiriman</td>
-                      <td className='text-sm px-4 py-3'>
-                        {item.delivery_date ? (
-                          formatDate(item.delivery_date, 'DD MMM YYYY')
-                        ) : (
-                          <span className='text-error'>Belum diisi</span>
-                        )}
-                      </td>
-                    </tr>
+                    {approvalStepNumber !== 1 && (
+                      <tr>
+                        <td className='text-sm px-4 py-3'>
+                          Tanggal Pengiriman
+                        </td>
+                        <td className='text-sm px-4 py-3'>
+                          {item.delivery_date ? (
+                            formatDate(item.delivery_date, 'DD MMM YYYY')
+                          ) : (
+                            <span className='text-error'>Belum diisi</span>
+                          )}
+                        </td>
+                      </tr>
+                    )}
                     {item.do_number && (
                       <tr>
                         <td className='text-sm px-4 py-3'>No. Pengiriman</td>