<hafid> validation Address fix conflict

2 files changed, 17 insertions, 8 deletions

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index b36c09bf..a6d9cf94 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -1019,10 +1019,10 @@ const Checkout = () => {
           </div>
         )}
 
-        {selectedCarrierId == SELF_PICKUP_ID && (
+        {selectedCourierId == SELF_PICKUP_ID && (
           <PickupAddress label='Alamat Pickup' />
         )}
-        {selectedCarrierId != SELF_PICKUP_ID && (
+        {selectedCourierId != SELF_PICKUP_ID && (
           <Skeleton
             isLoaded={!!selectedAddress.invoicing && !!selectedAddress.shipping}
             minHeight={320}
@@ -1317,7 +1317,7 @@ const Checkout = () => {
           <div className='flex'>
             {' '}
             <div className='w-3/4 border border-gray_r-6 rounded bg-white'>
-              {selectedCarrierId == SELF_PICKUP_ID && (
+              {selectedCourierId == SELF_PICKUP_ID && (
                 <PickupAddress label='Alamat Pickup' />
               )}
               {selectedCarrierId != SELF_PICKUP_ID && (
diff --git a/src/lib/checkout/components/FinishCheckout.jsx b/src/lib/checkout/components/FinishCheckout.jsx
index d533325e..51837a59 100644
--- a/src/lib/checkout/components/FinishCheckout.jsx
+++ b/src/lib/checkout/components/FinishCheckout.jsx
@@ -55,12 +55,21 @@ const FinishCheckout = ({ query }) => {
       <div className='text-title-sm md:text-title-lg text-center font-semibold'>
         Terima Kasih atas Pembelian di Indoteknik.com
       </div>
-       <p className='text-title-sm md:text-title-lg font-semibold my-2'>No. Transaksi: <span className='text-red-500'>{query?.order_id?.replaceAll('-', '/')}</span></p>
+      <p className='text-title-sm md:text-title-lg font-semibold my-2'>
+        No. Transaksi:{' '}
+        <span className='text-red-500'>
+          {query?.order_id?.replaceAll('-', '/')}
+        </span>
+      </p>
       <div className='flex flex-col justify-center items-center text-body-2 md:text-body-1 text-center mt-3 px-24 md:px-36 py-4 border-2 gap-y-2 rounded'>
-        <p className="text-title-sm md:text-title-xl text-gray-500 mt-1">Estimasi Barang Siap pada Tanggal</p>
-        <p className="text-title-sm md:text-title-xl text-red-500 font-semibold my-2">{data?.expectedReadyToShip}</p> 
+        <p className='text-title-sm md:text-title-xl text-gray-500 mt-1'>
+          Estimasi Barang Siap pada Tanggal
+        </p>
+        <p className='text-title-sm md:text-title-xl text-red-500 font-semibold my-2'>
+          {data?.expectedReadyToShip}
+        </p>
         <Link
-          href={`/my/quotations/${data?.id}`}
+          href={`/my/transactions/${data?.id}`}
           className='btn-solid-red rounded-md text-base'
         >
           Cek Detail Transaksi
@@ -74,7 +83,7 @@ const FinishCheckout = ({ query }) => {
         </a>{' '}
         atau{' '}
         <span onClick={sendEmail} className='text-red-500 cursor-pointer'>
-          kirim rincian pesanan ulang
+          Kirim ulang rincian pesanan ke Email anda.
         </span>
         .
       </div>