From 60cbad2ae4b551d8f1e6959a3c90134c16b10e26 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 22 May 2025 15:33:04 +0700
Subject: form-merchant & quotation tampilan

---
 src/lib/transaction/components/Transaction.jsx | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'src/lib/transaction/components')

diff --git a/src/lib/transaction/components/Transaction.jsx b/src/lib/transaction/components/Transaction.jsx
index 2ca7d386..b63796fb 100644
--- a/src/lib/transaction/components/Transaction.jsx
+++ b/src/lib/transaction/components/Transaction.jsx
@@ -406,6 +406,9 @@ const Transaction = ({ id }) => {
                 <TransactionStatusBadge status={transaction.data?.status} />
               </div>
             </DescriptionRow>
+            <DescriptionRow label='Estimasi Barang Siap'>
+                {transaction.data?.expectedReadyToShip}
+            </DescriptionRow>
             <DescriptionRow label='No Transaksi'>
               {transaction.data?.name}
             </DescriptionRow>
@@ -615,11 +618,17 @@ const Transaction = ({ id }) => {
                 )}
               </div>
 
-              <div className='flex items-center gap-x-2 mb-3'>
-                <span className='text-h-sm font-medium'>
-                  {transaction?.data?.name}
-                </span>
-                <TransactionStatusBadge status={transaction?.data?.status} />
+              <div className="flex items-center justify-between mb-3">
+                <div className="flex items-center gap-x-2">
+                  <span className="text-h-sm font-medium">
+                    {transaction?.data?.name}
+                  </span>
+                  <TransactionStatusBadge status={transaction?.data?.status} />
+                </div>
+
+                <div className="text-h-sm">
+                  Estimasi Barang Siap: <span className="text-red-500 font-semibold">{transaction?.data?.expectedReadyToShip}</span>
+                </div>
               </div>
               <div className='flex gap-x-4'>
                 <button
-- 
cgit v1.2.3


From 8f36292c816773e5bcd0bf70f795f869aee69215 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 23 May 2025 10:41:53 +0700
Subject: Revert "form-merchant & quotation tampilan"

This reverts commit 60cbad2ae4b551d8f1e6959a3c90134c16b10e26.
---
 src/lib/transaction/components/Transaction.jsx | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

(limited to 'src/lib/transaction/components')

diff --git a/src/lib/transaction/components/Transaction.jsx b/src/lib/transaction/components/Transaction.jsx
index b63796fb..2ca7d386 100644
--- a/src/lib/transaction/components/Transaction.jsx
+++ b/src/lib/transaction/components/Transaction.jsx
@@ -406,9 +406,6 @@ const Transaction = ({ id }) => {
                 <TransactionStatusBadge status={transaction.data?.status} />
               </div>
             </DescriptionRow>
-            <DescriptionRow label='Estimasi Barang Siap'>
-                {transaction.data?.expectedReadyToShip}
-            </DescriptionRow>
             <DescriptionRow label='No Transaksi'>
               {transaction.data?.name}
             </DescriptionRow>
@@ -618,17 +615,11 @@ const Transaction = ({ id }) => {
                 )}
               </div>
 
-              <div className="flex items-center justify-between mb-3">
-                <div className="flex items-center gap-x-2">
-                  <span className="text-h-sm font-medium">
-                    {transaction?.data?.name}
-                  </span>
-                  <TransactionStatusBadge status={transaction?.data?.status} />
-                </div>
-
-                <div className="text-h-sm">
-                  Estimasi Barang Siap: <span className="text-red-500 font-semibold">{transaction?.data?.expectedReadyToShip}</span>
-                </div>
+              <div className='flex items-center gap-x-2 mb-3'>
+                <span className='text-h-sm font-medium'>
+                  {transaction?.data?.name}
+                </span>
+                <TransactionStatusBadge status={transaction?.data?.status} />
               </div>
               <div className='flex gap-x-4'>
                 <button
-- 
cgit v1.2.3


From 4ef92b4d9fea4fdd636d62194514b33ed3b3c387 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 23 May 2025 11:26:04 +0700
Subject: expected ready to ship di quotation

---
 src/lib/transaction/components/Transaction.jsx | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'src/lib/transaction/components')

diff --git a/src/lib/transaction/components/Transaction.jsx b/src/lib/transaction/components/Transaction.jsx
index 2ca7d386..48bea2bf 100644
--- a/src/lib/transaction/components/Transaction.jsx
+++ b/src/lib/transaction/components/Transaction.jsx
@@ -405,6 +405,11 @@ const Transaction = ({ id }) => {
               <div className='flex justify-end'>
                 <TransactionStatusBadge status={transaction.data?.status} />
               </div>
+            </DescriptionRow>
+             <DescriptionRow label='Status Transaksi'>
+              <div className='flex justify-end font-semibold text-red-500'>
+               {transaction.data?.expectedReadyToShip}
+              </div>
             </DescriptionRow>
             <DescriptionRow label='No Transaksi'>
               {transaction.data?.name}
@@ -615,11 +620,16 @@ const Transaction = ({ id }) => {
                 )}
               </div>
 
-              <div className='flex items-center gap-x-2 mb-3'>
-                <span className='text-h-sm font-medium'>
-                  {transaction?.data?.name}
-                </span>
-                <TransactionStatusBadge status={transaction?.data?.status} />
+              <div className="flex items-center justify-between mb-3">
+                <div className="flex items-center gap-x-2">
+                  <span className="text-h-sm font-medium">
+                    {transaction?.data?.name}
+                  </span>
+                  <TransactionStatusBadge status={transaction?.data?.status} />
+                </div>
+                <div className="text-h-sm">
+                  Estimasi Barang Siap: <span className="text-red-500 font-semibold">{transaction?.data?.expectedReadyToShip}</span>
+                </div>
               </div>
               <div className='flex gap-x-4'>
                 <button
-- 
cgit v1.2.3


From ce6b3f5fa848403b46c0ffa41a354213c5bd0d84 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Tue, 27 May 2025 11:57:54 +0700
Subject: <miqdad> highlight nomor resi and center delivered status

---
 src/lib/transaction/components/Transaction.jsx | 39 ++++++++++++++++----------
 1 file changed, 24 insertions(+), 15 deletions(-)

(limited to 'src/lib/transaction/components')

diff --git a/src/lib/transaction/components/Transaction.jsx b/src/lib/transaction/components/Transaction.jsx
index 48bea2bf..709fa5d4 100644
--- a/src/lib/transaction/components/Transaction.jsx
+++ b/src/lib/transaction/components/Transaction.jsx
@@ -208,7 +208,9 @@ const Transaction = ({ id }) => {
           <p>{currencyFormat(transaction.data?.amountUntaxed)}</p>
         </div>
         <div className='flex justify-between mt-1'>
-          <p className='text-gray_r-12/70'>PPN {((PPN - 1) * 100).toFixed(0)}%</p>
+          <p className='text-gray_r-12/70'>
+            PPN {((PPN - 1) * 100).toFixed(0)}%
+          </p>
           <p>{currencyFormat(transaction.data?.amountTax)}</p>
         </div>
         <div className='flex justify-between mt-1'>
@@ -406,9 +408,9 @@ const Transaction = ({ id }) => {
                 <TransactionStatusBadge status={transaction.data?.status} />
               </div>
             </DescriptionRow>
-             <DescriptionRow label='Status Transaksi'>
+            <DescriptionRow label='Status Transaksi'>
               <div className='flex justify-end font-semibold text-red-500'>
-               {transaction.data?.expectedReadyToShip}
+                {transaction.data?.expectedReadyToShip}
               </div>
             </DescriptionRow>
             <DescriptionRow label='No Transaksi'>
@@ -437,13 +439,13 @@ const Transaction = ({ id }) => {
                   onClick={() => setIdAWB(airway?.id)}
                 >
                   <div>
-                    <span className='text-sm text-gray_r-11'>
+                    <p className='text-sm text-gray_r-11'>{airway?.name}</p>
+                    <span className='mt-2 font-medium'>
                       No Resi : {airway?.trackingNumber || '-'}{' '}
                     </span>
-                    <p className='mt-1 font-medium'>{airway?.name}</p>
                   </div>
                   <div className='flex gap-x-2'>
-                    <div className='text-sm text-gray-600 badge-green leading-[1.5] mt-1'>
+                    <div className='text-sm text-gray-600 badge-green leading-[1.5] mt-1 text-center'>
                       {airway?.delivered ? 'Pesanan Tiba' : 'Sedang Dikirim'}
                     </div>
                     <ChevronRightIcon className='w-5 stroke-2' />
@@ -620,15 +622,18 @@ const Transaction = ({ id }) => {
                 )}
               </div>
 
-              <div className="flex items-center justify-between mb-3">
-                <div className="flex items-center gap-x-2">
-                  <span className="text-h-sm font-medium">
+              <div className='flex items-center justify-between mb-3'>
+                <div className='flex items-center gap-x-2'>
+                  <span className='text-h-sm font-medium'>
                     {transaction?.data?.name}
                   </span>
                   <TransactionStatusBadge status={transaction?.data?.status} />
                 </div>
-                <div className="text-h-sm">
-                  Estimasi Barang Siap: <span className="text-red-500 font-semibold">{transaction?.data?.expectedReadyToShip}</span>
+                <div className='text-h-sm'>
+                  Estimasi Barang Siap:{' '}
+                  <span className='text-red-500 font-semibold'>
+                    {transaction?.data?.expectedReadyToShip}
+                  </span>
                 </div>
               </div>
               <div className='flex gap-x-4'>
@@ -770,13 +775,15 @@ const Transaction = ({ id }) => {
                         onClick={() => setIdAWB(airway?.id)}
                       >
                         <div>
-                          <span className='text-sm text-gray_r-11'>
+                          <p className='text-sm text-gray_r-11'>
+                            {airway?.name}
+                          </p>
+                          <span className='text-md text-bold mt-1'>
                             No Resi : {airway?.trackingNumber || '-'}{' '}
                           </span>
-                          <p className='mt-1 font-medium'>{airway?.name}</p>
                         </div>
                         <div className='flex gap-x-2'>
-                          <div className='text-sm text-gray-600 badge-green leading-[1.5] mt-1'>
+                          <div className='text-sm text-gray-600 badge-green leading-[1.5] mt-1 text-center'>
                             {airway?.delivered
                               ? 'Pesanan Tiba'
                               : 'Sedang Dikirim'}
@@ -986,7 +993,9 @@ const Transaction = ({ id }) => {
                       {currencyFormat(transaction.data?.amountUntaxed)}
                     </div>
 
-                    <div className='text-right'>PPN {((PPN - 1) * 100).toFixed(0)}%</div>
+                    <div className='text-right'>
+                      PPN {((PPN - 1) * 100).toFixed(0)}%
+                    </div>
                     <div className='text-right font-medium'>
                       {currencyFormat(transaction.data?.amountTax)}
                     </div>
-- 
cgit v1.2.3