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(() => { const isPending = useMemo(() => {
return ( return (
isResponseSuccess(marketing) && isResponseSuccess(marketing) &&
marketing.data.latest_approval.step_number === 1 marketing.data.latest_approval.step_number === 1 &&
marketing.data.latest_approval.action === 'PENDING'
); );
}, [marketing]); }, [marketing]);
@@ -39,6 +39,8 @@ const DeliveryOrderProductTable = ({
const onDeleteRef = useRef(onDelete); const onDeleteRef = useRef(onDelete);
onDeleteRef.current = onDelete; onDeleteRef.current = onDelete;
const approvalStepNumber = marketing?.latest_approval?.step_number;
return ( return (
<> <>
<div className='size-full flex flex-col relative overflow-x-hidden gap-3'> <div className='size-full flex flex-col relative overflow-x-hidden gap-3'>
@@ -105,8 +107,11 @@ const DeliveryOrderProductTable = ({
</th> </th>
</tr> </tr>
<> <>
{approvalStepNumber !== 1 && (
<tr> <tr>
<td className='text-sm px-4 py-3'>Tanggal Pengiriman</td> <td className='text-sm px-4 py-3'>
Tanggal Pengiriman
</td>
<td className='text-sm px-4 py-3'> <td className='text-sm px-4 py-3'>
{item.delivery_date ? ( {item.delivery_date ? (
formatDate(item.delivery_date, 'DD MMM YYYY') formatDate(item.delivery_date, 'DD MMM YYYY')
@@ -115,6 +120,7 @@ const DeliveryOrderProductTable = ({
)} )}
</td> </td>
</tr> </tr>
)}
{item.do_number && ( {item.do_number && (
<tr> <tr>
<td className='text-sm px-4 py-3'>No. Pengiriman</td> <td className='text-sm px-4 py-3'>No. Pengiriman</td>