diff options
| author | Miqdad <ahmadmiqdad27@gmail.com> | 2025-09-04 09:49:42 +0700 |
|---|---|---|
| committer | Miqdad <ahmadmiqdad27@gmail.com> | 2025-09-04 09:49:42 +0700 |
| commit | 3b95ff211646ed22934c3f7cac7017464519e1c6 (patch) | |
| tree | 7fc87c22648aa550522df0fe2c1f5bbecc460b17 | |
| parent | 31ce275bf6013bf6ee2e3a2d7f22d2547cab0b70 (diff) | |
| parent | 9200bc2c96970ceea88850e325bc70a65db564e0 (diff) | |
Merge branch 'new-release' of https://bitbucket.org/altafixco/next-indoteknik into regenerate-midtrans
| -rw-r--r-- | src/lib/checkout/components/Checkout.jsx | 8 | ||||
| -rw-r--r-- | src/lib/checkout/components/FinishCheckout.jsx | 18 |
2 files changed, 11 insertions, 15 deletions
diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx index d8ede118..c789edc1 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,10 +1317,10 @@ 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 && ( + {selectedCourierId != SELF_PICKUP_ID && ( <Skeleton isLoaded={ !!selectedAddress.invoicing && !!selectedAddress.shipping diff --git a/src/lib/checkout/components/FinishCheckout.jsx b/src/lib/checkout/components/FinishCheckout.jsx index 3b006cf7..51837a59 100644 --- a/src/lib/checkout/components/FinishCheckout.jsx +++ b/src/lib/checkout/components/FinishCheckout.jsx @@ -62,16 +62,12 @@ const FinishCheckout = ({ query }) => { </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'> - {(data?.expectedReadyToShip ?? '').toString().trim() && ( - <> - <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/transactions/${data?.id}`} className='btn-solid-red rounded-md text-base' @@ -87,7 +83,7 @@ const FinishCheckout = ({ query }) => { </a>{' '} atau{' '} <span onClick={sendEmail} className='text-red-500 cursor-pointer'> - Kirim rincian pesanan ulang ke Email anda. + Kirim ulang rincian pesanan ke Email anda. </span> . </div> |