From ba0753428d397483b4ea186d9674c06d83143edc Mon Sep 17 00:00:00 2001
From: rstubryan <restubumirr@gmail.com>
Date: Mon, 9 Feb 2026 11:49:08 +0700
Subject: [PATCH] refactor(FE): Fix form reset and selection handling in
 SalesOrderFormModal

---
 .../pages/marketing/SalesOrderFormModal.tsx           | 11 ++++++++++-
 .../form/table-view/DeliveryOrderProductTable.tsx     |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/components/pages/marketing/SalesOrderFormModal.tsx b/src/components/pages/marketing/SalesOrderFormModal.tsx
index 7a15ea59..3d62c516 100644
--- a/src/components/pages/marketing/SalesOrderFormModal.tsx
+++ b/src/components/pages/marketing/SalesOrderFormModal.tsx
@@ -394,7 +394,7 @@ const SalesOrderFormModal = ({
       }
 
       formik.setFieldValue('sales_order', updatedProducts);
-      console.log(formik.values);
+      setSelectedMarketingProduct(null);
       nextButtonHandler();
     },
     [memoSalesOrder, nextButtonHandler]
@@ -418,6 +418,15 @@ const SalesOrderFormModal = ({
     if (modalAction === 'add' || modalAction === 'edit') {
       setCurrentModalAction(modalAction);
       formModal.openModal();
+
+      if (modalAction === 'add') {
+        formik.resetForm();
+        setStep(1);
+        setSelectedMarketingProduct(null);
+        setSelectedDeliveryProduct(null);
+        setFormErrorMessage('');
+        setFormErrorList([]);
+      }
     }
   }, [modalAction]);
 
diff --git a/src/components/pages/marketing/form/table-view/DeliveryOrderProductTable.tsx b/src/components/pages/marketing/form/table-view/DeliveryOrderProductTable.tsx
index 7d64da83..12d97b9a 100644
--- a/src/components/pages/marketing/form/table-view/DeliveryOrderProductTable.tsx
+++ b/src/components/pages/marketing/form/table-view/DeliveryOrderProductTable.tsx
@@ -49,7 +49,7 @@ const DeliveryOrderProductTable = ({
 
     return (
       <>
-        <tr className='border-b border-t border-tools-table-outline border-base-content/5'>
+        <tr className='border-b border-tools-table-outline border-base-content/5'>
           <th className='w-1/3 text-start not-first:font-medium text-base-content/50 text-sm px-4 py-3'>
             Label
           </th>