From 900372920d521ee940b141646381d363d487e4d0 Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Mon, 14 Apr 2025 16:47:04 +0700
Subject: transaction

---
 src/lib/transaction/components/Transaction.jsx | 89 +++++++++++++++-----------
 1 file changed, 51 insertions(+), 38 deletions(-)

(limited to 'src/lib/transaction')

diff --git a/src/lib/transaction/components/Transaction.jsx b/src/lib/transaction/components/Transaction.jsx
index 2ca7d386..62743df3 100644
--- a/src/lib/transaction/components/Transaction.jsx
+++ b/src/lib/transaction/components/Transaction.jsx
@@ -41,6 +41,7 @@ import { useRouter } from 'next/router';
 import { gtagPurchase } from '@/core/utils/googleTag';
 import { deleteItemCart } from '@/core/utils/cart';
 import axios from 'axios';
+import InformationSection from '../../treckingAwb/component/InformationSection';
 const Transaction = ({ id }) => {
   const PPN = process.env.NEXT_PUBLIC_PPN;
   const router = useRouter();
@@ -208,7 +209,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'>
@@ -279,6 +282,8 @@ const Transaction = ({ id }) => {
     }
   };
 
+  console.log('ini transaction', transaction.data);
+
   return (
     transaction.data?.name && (
       <>
@@ -731,52 +736,58 @@ const Transaction = ({ id }) => {
                 </div>
               </div>
 
-              <div className='text-h-sm font-semibold mt-10 mb-4'>
-                Informasi Pelanggan
-              </div>
-              <div className='grid grid-cols-2 gap-x-4'>
-                <div className='border border-gray_r-6 rounded p-3'>
-                  <div className='font-medium mb-4'>Detail Pelanggan</div>
-                  <SectionContent
-                    address={transaction?.data?.address?.customer}
-                  />
+              <div className='flex gap-x-3'>
+                <div className='w-1/2'>
+                  <div className='text-h-sm font-semibold mt-10 mb-4'>
+                    Informasi Pelanggan
+                  </div>
+                  <div className='border border-gray_r-6 rounded p-3'>
+                    <div className='font-medium mb-4'>Detail Pelanggan</div>
+                    <SectionContent
+                      address={transaction?.data?.address?.customer}
+                    />
+                  </div>
                 </div>
-              </div>
-              <div className='flex '>
                 <div className='w-1/2'>
                   <div className='text-h-sm font-semibold mt-10 mb-4'>
-                    Pengiriman
+                    Informasi Pengiriman
                   </div>
                   {transaction?.data?.pickings.length == 0 && (
                     <div className='badge-red text-sm'>
                       Belum ada pengiriman
                     </div>
                   )}
-                  <div className='grid grid-cols-1 gap-1 w-2/3'>
-                    {transaction?.data?.pickings?.map((airway) => (
-                      <button
-                        className='shadow rounded-md p-3 text-gray_r-12 font-normal flex justify-between items-center text-left h-20'
-                        key={airway?.id}
-                        onClick={() => setIdAWB(airway?.id)}
-                      >
-                        <div>
-                          <span className='text-sm text-gray_r-11'>
-                            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'>
-                            {airway?.delivered
-                              ? 'Pesanan Tiba'
-                              : 'Sedang Dikirim'}
-                          </div>
-                          <ChevronRightIcon className='w-5 stroke-2' />
-                        </div>
-                      </button>
-                    ))}
-                  </div>
+                  {/* <div className='grid grid-cols-1 gap-1 w-1/2'> */}
+                  {transaction?.data?.pickings?.map((airway) => (
+                    <div key={airway?.id} className='border border-gray_r-6 rounded p-3'>
+                      <InformationSection  manifests={airway} />
+                    </div>
+                    // <button
+                    //   className='shadow rounded-md p-3 text-gray_r-12 font-normal flex justify-between items-center text-left h-20'
+                    //   key={airway?.id}
+                    //   onClick={() => setIdAWB(airway?.id)}
+                    // >
+                    //   <div>
+                    //     <span className='text-sm text-gray_r-11'>
+                    //       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'>
+                    //       {airway?.delivered
+                    //         ? 'Pesanan Tiba'
+                    //         : 'Sedang Dikirim'}
+                    //     </div>
+                    //     <ChevronRightIcon className='w-5 stroke-2' />
+                    //   </div>
+                    // </button>
+                  ))}
+                  {/* </div> */}
                 </div>
+              </div>
+
+              <div className='flex '>
                 <div className='invoice w-1/2 '>
                   <div className='text-h-sm font-semibold mt-10 mb-4 '>
                     Invoice
@@ -976,7 +987,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


From 0aa0d458e668520ef96ccf7ecb35bf84a585b279 Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Mon, 21 Apr 2025 13:05:57 +0700
Subject: fedback renca

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

(limited to 'src/lib/transaction')

diff --git a/src/lib/transaction/components/Transaction.jsx b/src/lib/transaction/components/Transaction.jsx
index 62743df3..3853ea79 100644
--- a/src/lib/transaction/components/Transaction.jsx
+++ b/src/lib/transaction/components/Transaction.jsx
@@ -42,6 +42,7 @@ import { gtagPurchase } from '@/core/utils/googleTag';
 import { deleteItemCart } from '@/core/utils/cart';
 import axios from 'axios';
 import InformationSection from '../../treckingAwb/component/InformationSection';
+import { Button } from '@chakra-ui/react';
 const Transaction = ({ id }) => {
   const PPN = process.env.NEXT_PUBLIC_PPN;
   const router = useRouter();
@@ -759,8 +760,19 @@ const Transaction = ({ id }) => {
                   )}
                   {/* <div className='grid grid-cols-1 gap-1 w-1/2'> */}
                   {transaction?.data?.pickings?.map((airway) => (
-                    <div key={airway?.id} className='border border-gray_r-6 rounded p-3'>
-                      <InformationSection  manifests={airway} />
+                    <div
+                      key={airway?.id}
+                      className='border border-gray_r-6 rounded p-3'
+                    >
+                      <InformationSection
+                        manifests={airway}
+                        source='transaction'
+                      />
+                      <div className='p-4'>
+                        <button className='bg-transparent text-red-600 hover:underline p-0 font-semibold' onClick={() => setIdAWB(airway?.id)}>
+                          Lacak Pegiriman
+                        </button>
+                      </div>
                     </div>
                     // <button
                     //   className='shadow rounded-md p-3 text-gray_r-12 font-normal flex justify-between items-center text-left h-20'
-- 
cgit v1.2.3


From 71ca9d6c85871b6bcb2976ed4911032aab4d32e7 Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Thu, 24 Apr 2025 13:53:32 +0700
Subject: fixing revisi renca

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

(limited to 'src/lib/transaction')

diff --git a/src/lib/transaction/components/Transaction.jsx b/src/lib/transaction/components/Transaction.jsx
index 3853ea79..867de577 100644
--- a/src/lib/transaction/components/Transaction.jsx
+++ b/src/lib/transaction/components/Transaction.jsx
@@ -283,8 +283,6 @@ const Transaction = ({ id }) => {
     }
   };
 
-  console.log('ini transaction', transaction.data);
-
   return (
     transaction.data?.name && (
       <>
@@ -764,13 +762,19 @@ const Transaction = ({ id }) => {
                       key={airway?.id}
                       className='border border-gray_r-6 rounded p-3'
                     >
-                      <InformationSection
-                        manifests={airway}
-                        source='transaction'
-                      />
+                      <InformationSection manifests={airway} />
                       <div className='p-4'>
-                        <button className='bg-transparent text-red-600 hover:underline p-0 font-semibold' onClick={() => setIdAWB(airway?.id)}>
-                          Lacak Pegiriman
+                        <button
+                          className='bg-transparent text-red-600 hover:underline p-0 font-semibold'
+                          onClick={() => {
+                            if (airway?.waybillNumber == '-') {
+                              toast.error('Nomor Resi belum tersedia');
+                              return;
+                            }
+                            setIdAWB(airway.id);
+                          }}
+                        >
+                          Lacak Pengiriman
                         </button>
                       </div>
                     </div>
-- 
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')

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