2 files changed, 23 insertions, 12 deletions

diff --git a/src/lib/transaction/components/Transaction.jsx b/src/lib/transaction/components/Transaction.jsx
index 9b11f5bb..30f1d902 100644
--- a/src/lib/transaction/components/Transaction.jsx
+++ b/src/lib/transaction/components/Transaction.jsx
@@ -37,7 +37,7 @@ import rejectApi from '../api/rejectApi';
 const Transaction = ({ id }) => {
   const auth = useAuth();
   const { transaction } = useTransaction({ id });
-  
+
   const statusApprovalWeb = transaction.data?.approvalStep
 
   const { queryAirwayBill } = useAirwayBill({ orderId: id });
@@ -78,7 +78,7 @@ const Transaction = ({ id }) => {
   const closeCancelTransaction = () => setCancelTransaction(false);
 
   const [rejectTransaction, setRejectTransaction] = useState(false);
-  
+
   const openRejectTransaction = () => setRejectTransaction(true);
   const closeRejectTransaction = () => setRejectTransaction(false);
   const submitCancelTransaction = async () => {
@@ -109,9 +109,9 @@ const Transaction = ({ id }) => {
   }
 
   const handleReject = async () => {
-   await rejectApi({ id });
-   closeRejectTransaction()
-   transaction.refetch();
+    await rejectApi({ id });
+    closeRejectTransaction()
+    transaction.refetch();
   }
 
   const memoizeVariantGroupCard = useMemo(
@@ -365,7 +365,7 @@ const Transaction = ({ id }) => {
                   className='btn-yellow w-full'
                   onClick={checkout}
                   disabled={
-                    transaction.data?.status === 'cancel' ? true : false  || auth?.webRole === statusApprovalWeb ? true : false
+                    transaction.data?.status === 'cancel' ? true : false || auth?.webRole === statusApprovalWeb ? true : false
                   }
                 >
                   Approve
@@ -374,7 +374,7 @@ const Transaction = ({ id }) => {
                   className='btn-solid-red px-7 w-full'
                   onClick={checkout}
                   disabled={
-                    transaction.data?.status === 'cancel' ? true : false  || auth?.webRole === statusApprovalWeb ? true : false
+                    transaction.data?.status === 'cancel' ? true : false || auth?.webRole === statusApprovalWeb ? true : false
                   }
                 >
                   Reject
@@ -454,7 +454,7 @@ const Transaction = ({ id }) => {
                         className='btn-solid-red px-7'
                         onClick={openRejectTransaction}
                         disabled={
-                          transaction.data?.status === 'cancel' ? true : false || auth?.webRole === statusApprovalWeb ? true : false  || statusApprovalWeb < 1 ? true : false
+                          transaction.data?.status === 'cancel' ? true : false || auth?.webRole === statusApprovalWeb ? true : false || statusApprovalWeb < 1 ? true : false
                         }
                       >
                         Reject
@@ -467,7 +467,7 @@ const Transaction = ({ id }) => {
                       Lanjutkan Transaksi
                     </button>
                   )}
-                {transaction.data?.status != 'draft' &&  !auth?.feature.soApproval &&  (
+                {transaction.data?.status != 'draft' && !auth?.feature.soApproval && (
                   <button
                     className='btn-light'
                     disabled={transaction.data?.status != 'waiting'}
@@ -490,7 +490,7 @@ const Transaction = ({ id }) => {
                   <div>Ketentuan Pembayaran</div>
                   <div>: {transaction?.data?.paymentTerm}</div>
 
-                  {!auth?.feature?.soApproval && (
+                  {!auth?.feature?.soApproval ? (
                     <>
                       <div>Purchase Order</div>
                       <div>
@@ -510,6 +510,11 @@ const Transaction = ({ id }) => {
                         </button>
                       </div>
                     </>
+                  ) : (
+                    <>
+                      <div>Site</div>
+                      <div>: {transaction?.data?.sitePartner}</div>
+                    </>
                   )}
                 </div>
               </div>
diff --git a/src/lib/transaction/components/Transactions.jsx b/src/lib/transaction/components/Transactions.jsx
index 5a6dfb01..92bdd276 100644
--- a/src/lib/transaction/components/Transactions.jsx
+++ b/src/lib/transaction/components/Transactions.jsx
@@ -145,7 +145,7 @@ const Transactions = ({ context = '' }) => {
         siteFilter || (auth?.webRole === null && auth?.site ? auth.site : null),
     };
     const queryString = toQuery(query)
-    const data = await transactionsApi({ query : queryString });
+    const data = await transactionsApi({ query: queryString });
     return data;
   };
 
@@ -349,7 +349,7 @@ const Transactions = ({ context = '' }) => {
                       </option>
                     ))}
                   </select>
-                ):( <div></div>) }
+                ) : (<div></div>)}
 
                 <form className='flex gap-x-1' onSubmit={handleSubmit}>
                   <input
@@ -382,6 +382,9 @@ const Transactions = ({ context = '' }) => {
                   <th>No. PO</th>
                   <th>Tanggal</th>
                   <th>Created By</th>
+                  {auth?.feature?.soApproval && (
+                    <th>Site</th>
+                  )}
                   <th className='!text-left'>Salesperson</th>
                   <th className='!text-left'>Total</th>
                   <th>Status</th>
@@ -417,6 +420,9 @@ const Transactions = ({ context = '' }) => {
                     <td>{saleOrder.purchaseOrderName || '-'}</td>
                     <td>{saleOrder.dateOrder || '-'}</td>
                     <td>{saleOrder.address.customer?.name || '-'}</td>
+                    {auth?.feature?.soApproval && (
+                      <td>{saleOrder.sitePartner || '-'}</td>
+                    )}
                     <td className='!text-left'>{saleOrder.sales}</td>
                     <td className='!text-left'>
                       {currencyFormat(saleOrder.amountTotal)}