refactor(FE): Update approval logic and conditional rendering in

delivery forms
This commit is contained in:
rstubryan
2026-02-06 14:20:52 +07:00
parent c9a5a91970
commit 4d23929924
2 changed files with 18 additions and 11 deletions
@@ -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]);
@@ -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>