change ui open newtab, g maps, top banner, profil

1 files changed, 401 insertions, 351 deletions

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index afb94c10..27a00aa8 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -490,7 +490,9 @@ const Checkout = () => {
                     <div className='absolute w-full h-full bg-gray_r-3/40 top-0 left-0 z-50' />
                   )}
 
-                  <div className={`border border-solid mb-5 w-full hover:cursor-pointer  p-2 pl-4 pr-4 `}>
+                  <div
+                    className={`border border-solid mb-5 w-full hover:cursor-pointer  p-2 pl-4 pr-4 `}
+                  >
                     {item.canApply && (
                       <div
                         class='p-2 mb-4 text-sm text-green-800 rounded-lg bg-green-50 dark:text-green-400'
@@ -519,7 +521,8 @@ const Checkout = () => {
                       >
                         <p className='text-sm'>
                           Tambah produk{' '}
-                          <span className='text-red-500 font-bold '>{item.manufactureNames}</span> senilai{' '}
+                          <span className='text-red-500 font-bold '>{item.manufactureNames}</span>{' '}
+                          senilai{' '}
                           <span className='text-red-500 font-bold'>
                             {currencyFormat(item.minPurchaseAmount)}
                           </span>{' '}
@@ -537,7 +540,8 @@ const Checkout = () => {
                         >
                           <p className='text-sm'>
                             Tambah produk{' '}
-                            <span className='text-red-500 font-bold'>{item.manufactureNames}</span> senilai{' '}
+                            <span className='text-red-500 font-bold'>{item.manufactureNames}</span>{' '}
+                            senilai{' '}
                             <span className='text-red-500 font-bold'>
                               {currencyFormat(item.differenceToApply)}
                             </span>{' '}
@@ -652,6 +656,29 @@ const Checkout = () => {
 
         <Divider />
 
+        {selectedCarrierId == SELF_PICKUP_ID && (
+          <div className='p-4'>
+            <div
+              class='flex items-center p-4 mb-4 text-sm border border-yellow-500 text-yellow-800 rounded-lg bg-yellow-50'
+              role='alert'
+            >
+              <svg
+                class='flex-shrink-0 inline w-4 h-4 mr-3'
+                aria-hidden='true'
+                fill='currentColor'
+                viewBox='0 0 20 20'
+              >
+                <path d='M10 .5a9.5 9.5 0 1 0 9.5 9.5A9.51 9.51 0 0 0 10 .5ZM9.5 4a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3ZM12 15H8a1 1 0 0 1 0-2h1v-3H8a1 1 0 0 1 0-2h2a1 1 0 0 1 1 1v4h1a1 1 0 0 1 0 2Z' />
+              </svg>
+              <span class='sr-only'>Info</span>
+              <div className='text-justify'>
+                Fitur Self Pickup, hanya berlaku untuk customer di area jakarta. Apa bila memilih
+                fitur ini, anda akan dihubungi setelah barang siap diambil.
+              </div>
+            </div>
+          </div>
+        )}
+
         {selectedCarrierId == SELF_PICKUP_ID && <PickupAddress label='Alamat Pickup' />}
         {selectedCarrierId != SELF_PICKUP_ID && (
           <>
@@ -884,393 +911,416 @@ const Checkout = () => {
       </MobileView>
 
       <DesktopView>
-        <div className='container mx-auto py-10 flex'>
-          <div className='w-3/4 border border-gray_r-6 rounded bg-white'>
-            {selectedCarrierId == SELF_PICKUP_ID && <PickupAddress label='Alamat Pickup' />}
-            {selectedCarrierId != SELF_PICKUP_ID && (
-              <>
-                <SectionAddress
-                  address={selectedAddress.shipping}
-                  label='Alamat Pengiriman'
-                  url='/my/address?select=shipping'
-                />
-                <Divider />
-                <SectionAddress
-                  address={selectedAddress.invoicing}
-                  label='Alamat Penagihan'
-                  url='/my/address?select=invoice'
-                />
-              </>
-            )}
-            <Divider />
-            <SectionValidation address={selectedAddress.invoicing} />
-            <SectionExpedisi
-              address={selectedAddress.shipping}
-              listExpedisi={listExpedisi}
-              setSelectedExpedisi={setSelectedExpedisi}
-              checkWeigth={checkWeigth}
-              checkoutValidation={checkoutValidation}
-              expedisiValidation={expedisiValidation}
-            />
-            <Divider />
-            <SectionListService
-              listserviceExpedisi={listserviceExpedisi}
-              setSelectedServiceType={setSelectedServiceType}
-            />
+        <div className='container mx-auto py-10'>
+          {selectedCarrierId == SELF_PICKUP_ID && (
+            <div
+              class='flex items-center p-4 mb-4 text-sm text-yellow-800 rounded-lg bg-yellow-50 dark:bg-gray-800 dark:text-yellow-300'
+              role='alert'
+            >
+              <svg
+                class='flex-shrink-0 inline w-4 h-4 mr-3'
+                aria-hidden='true'
+                fill='currentColor'
+                viewBox='0 0 20 20'
+              >
+                <path d='M10 .5a9.5 9.5 0 1 0 9.5 9.5A9.51 9.51 0 0 0 10 .5ZM9.5 4a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3ZM12 15H8a1 1 0 0 1 0-2h1v-3H8a1 1 0 0 1 0-2h2a1 1 0 0 1 1 1v4h1a1 1 0 0 1 0 2Z' />
+              </svg>
+              <span class='sr-only'>Info</span>
+              <div>
+                Fitur Self Pickup, hanya berlaku untuk customer di area jakarta. Apa bila memilih
+                fitur ini, anda akan dihubungi setelah barang siap diambil.
+              </div>
+            </div>
+          )}
+
+          <div className='flex'>
+            {' '}
+            <div className='w-3/4 border border-gray_r-6 rounded bg-white'>
+              {selectedCarrierId == SELF_PICKUP_ID && <PickupAddress label='Alamat Pickup' />}
+              {selectedCarrierId != SELF_PICKUP_ID && (
+                <>
+                  <SectionAddress
+                    address={selectedAddress.shipping}
+                    label='Alamat Pengiriman'
+                    url='/my/address?select=shipping'
+                  />
+                  <Divider />
+                  <SectionAddress
+                    address={selectedAddress.invoicing}
+                    label='Alamat Penagihan'
+                    url='/my/address?select=invoice'
+                  />
+                </>
+              )}
+              <Divider />
+              <SectionValidation address={selectedAddress.invoicing} />
+              <SectionExpedisi
+                address={selectedAddress.shipping}
+                listExpedisi={listExpedisi}
+                setSelectedExpedisi={setSelectedExpedisi}
+                checkWeigth={checkWeigth}
+                checkoutValidation={checkoutValidation}
+                expedisiValidation={expedisiValidation}
+              />
+              <Divider />
+              <SectionListService
+                listserviceExpedisi={listserviceExpedisi}
+                setSelectedServiceType={setSelectedServiceType}
+              />
 
-            <div className='p-4'>
-              <div className='font-medium'>Detail Pesanan</div>
-              <table className='table-checkout'>
-                <thead>
-                  <tr>
-                    <th>Nama Produk</th>
-                    <th>Jumlah</th>
-                    <th>Harga</th>
-                    <th>Subtotal</th>
-                  </tr>
-                </thead>
-                <tbody>
-                  {!products ? (
+              <div className='p-4'>
+                <div className='font-medium'>Detail Pesanan</div>
+                <table className='table-checkout'>
+                  <thead>
                     <tr>
-                      <td colSpan={4}>
-                        <div className='container my-4'>
-                          <div class='h-2.5 bg-gray-200 rounded-full dark:bg-gray-700 w-48 mb-4'></div>
-                          <div class='h-2 bg-gray-200 rounded-full dark:bg-gray-700 mb-2.5'></div>
-                          <div class='h-2 bg-gray-200 rounded-full dark:bg-gray-700 mb-2.5'></div>
-                          <div class='h-2 bg-gray-200 rounded-full dark:bg-gray-700'></div>
-                        </div>
-                      </td>
+                      <th>Nama Produk</th>
+                      <th>Jumlah</th>
+                      <th>Harga</th>
+                      <th>Subtotal</th>
                     </tr>
-                  ) : (
-                    products?.map((product) => (
-                      <>
-                        <tr
-                          key={product.id}
-                          className={`${product.program ? '!border-t-0 !border-b-0' : ''}`}
-                        >
-                          <td className='flex'>
-                            <div className='w-[20%] flex-shrink-0'>
-                              <Image
-                                src={product?.parent?.image}
-                                alt={product?.name}
-                                className='object-contain object-center border border-gray_r-6 h-40 w-full rounded-md'
-                              />
-                            </div>
-                            <div className='px-2 text-left'>
-                              <div className='line-clamp-2 leading-6 !text-gray_r-12 font-normal'>
-                                {product?.parent?.name}
-                              </div>
-                              <div className='text-gray_r-11 mt-2'>
-                                {product?.code}{' '}
-                                {product?.attributes.length > 0
-                                  ? `| ${product?.attributes.join(', ')}`
-                                  : ''}
-                              </div>
-                              <div className='text-gray_r-11 mt-2'>
-                                Berat item : {product?.weight} Kg
+                  </thead>
+                  <tbody>
+                    {!products ? (
+                      <tr>
+                        <td colSpan={4}>
+                          <div className='container my-4'>
+                            <div class='h-2.5 bg-gray-200 rounded-full dark:bg-gray-700 w-48 mb-4'></div>
+                            <div class='h-2 bg-gray-200 rounded-full dark:bg-gray-700 mb-2.5'></div>
+                            <div class='h-2 bg-gray-200 rounded-full dark:bg-gray-700 mb-2.5'></div>
+                            <div class='h-2 bg-gray-200 rounded-full dark:bg-gray-700'></div>
+                          </div>
+                        </td>
+                      </tr>
+                    ) : (
+                      products?.map((product) => (
+                        <>
+                          <tr
+                            key={product.id}
+                            className={`${product.program ? '!border-t-0 !border-b-0' : ''}`}
+                          >
+                            <td className='flex'>
+                              <div className='w-[20%] flex-shrink-0'>
+                                <Image
+                                  src={product?.parent?.image}
+                                  alt={product?.name}
+                                  className='object-contain object-center border border-gray_r-6 h-40 w-full rounded-md'
+                                />
                               </div>
-                            </div>
-                          </td>
-                          <td>
-                            <input
-                              className='form-input w-16 py-2 text-center bg-gray_r-1'
-                              type='number'
-                              value={product?.quantity}
-                              disabled
-                            />
-                          </td>
-                          <td>
-                            {product?.price?.discountPercentage > 0 && (
-                              <div className='flex gap-x-1 items-center justify-center mt-3'>
-                                <div className='text-gray_r-11 line-through text-caption-1'>
-                                  {currencyFormat(product?.price?.price)}
+                              <div className='px-2 text-left'>
+                                <div className='line-clamp-2 leading-6 !text-gray_r-12 font-normal'>
+                                  {product?.parent?.name}
                                 </div>
-                                <div className='badge-solid-red'>
-                                  {product?.price?.discountPercentage}%
+                                <div className='text-gray_r-11 mt-2'>
+                                  {product?.code}{' '}
+                                  {product?.attributes.length > 0
+                                    ? `| ${product?.attributes.join(', ')}`
+                                    : ''}
+                                </div>
+                                <div className='text-gray_r-11 mt-2'>
+                                  Berat item : {product?.weight} Kg
                                 </div>
                               </div>
-                            )}
-                            <div className='font-normal mt-1'>
-                              {product.price.priceDiscount > 0
-                                ? currencyFormat(product?.price?.priceDiscount)
-                                : 'Call For Price'}
-                            </div>
-                          </td>
-                          <td>
-                            <div className='text-danger-500 font-medium'>
-                              {product.price.priceDiscount > 0 ? (
-                                currencyFormat(product?.price?.priceDiscount * product?.quantity)
-                              ) : (
-                                <a
-                                  href={whatsappUrl('product', {
-                                    name: product.name,
-                                    url: createSlug(
-                                      '/shop/product/',
-                                      product.name,
-                                      product.id,
-                                      true
-                                    )
-                                  })}
-                                  className='underline'
-                                >
-                                  Call For Price{' '}
-                                </a>
-                              )}
-                            </div>
-                          </td>
-                        </tr>
-                        {product.program &&
-                          product.program.items &&
-                          product.program.items.map((item) => (
-                            <>
-                              <tr key={product?.program?.id} className='!border-t-0'>
-                                <td className='flex'>
-                                  <div className='w-[20%] flex-shrink-0'>
-                                    <Image
-                                      src={item.parent.image}
-                                      alt={item.name}
-                                      className='object-contain object-center border border-gray_r-6 h-40 w-full rounded-md'
-                                    />
+                            </td>
+                            <td>
+                              <input
+                                className='form-input w-16 py-2 text-center bg-gray_r-1'
+                                type='number'
+                                value={product?.quantity}
+                                disabled
+                              />
+                            </td>
+                            <td>
+                              {product?.price?.discountPercentage > 0 && (
+                                <div className='flex gap-x-1 items-center justify-center mt-3'>
+                                  <div className='text-gray_r-11 line-through text-caption-1'>
+                                    {currencyFormat(product?.price?.price)}
                                   </div>
-                                  <div className='px-2 text-left'>
-                                    <div className=''>
-                                      <span className='border border-solid border-red-600 rounded-md p-1 text-red-600'>
-                                        {product.program.type.label}
-                                      </span>
-                                    </div>
-                                    <div className='mt-2 line-clamp-2 leading-6'>{item.name}</div>
+                                  <div className='badge-solid-red'>
+                                    {product?.price?.discountPercentage}%
                                   </div>
-                                </td>
-                                <td>
-                                  <input
-                                    className='form-input w-16 py-2 text-center bg-gray_r-1'
-                                    type='number'
-                                    value={1}
-                                    disabled
-                                  />
-                                </td>
-                                <td>
-                                  {item?.price?.discountPercentage > 0 && (
-                                    <div className='flex gap-x-1 items-center justify-center mt-3'>
-                                      <div className='text-gray_r-11 line-through text-caption-1'>
-                                        {currencyFormat(product?.price?.price)}
+                                </div>
+                              )}
+                              <div className='font-normal mt-1'>
+                                {product.price.priceDiscount > 0
+                                  ? currencyFormat(product?.price?.priceDiscount)
+                                  : 'Call For Price'}
+                              </div>
+                            </td>
+                            <td>
+                              <div className='text-danger-500 font-medium'>
+                                {product.price.priceDiscount > 0 ? (
+                                  currencyFormat(product?.price?.priceDiscount * product?.quantity)
+                                ) : (
+                                  <a
+                                    href={whatsappUrl('product', {
+                                      name: product.name,
+                                      url: createSlug(
+                                        '/shop/product/',
+                                        product.name,
+                                        product.id,
+                                        true
+                                      )
+                                    })}
+                                    className='underline'
+                                  >
+                                    Call For Price{' '}
+                                  </a>
+                                )}
+                              </div>
+                            </td>
+                          </tr>
+                          {product.program &&
+                            product.program.items &&
+                            product.program.items.map((item) => (
+                              <>
+                                <tr key={product?.program?.id} className='!border-t-0'>
+                                  <td className='flex'>
+                                    <div className='w-[20%] flex-shrink-0'>
+                                      <Image
+                                        src={item.parent.image}
+                                        alt={item.name}
+                                        className='object-contain object-center border border-gray_r-6 h-40 w-full rounded-md'
+                                      />
+                                    </div>
+                                    <div className='px-2 text-left'>
+                                      <div className=''>
+                                        <span className='border border-solid border-red-600 rounded-md p-1 text-red-600'>
+                                          {product.program.type.label}
+                                        </span>
                                       </div>
+                                      <div className='mt-2 line-clamp-2 leading-6'>{item.name}</div>
                                     </div>
-                                  )}
-                                  <div className='font-normal mt-1'>
-                                    {item?.price.priceDiscount > 0 ? 'Gratis' : ''}
-                                  </div>
-                                </td>
-                                <td>
-                                  <div className='text-danger-500 font-medium'>
-                                    {item.price.priceDiscount > 0 ? 'Gratis' : ''}
-                                  </div>
-                                </td>
-                                <td></td>
-                              </tr>
-                            </>
-                          ))}
-                      </>
-                    ))
-                  )}
-                </tbody>
-              </table>
-            </div>
-          </div>
-
-          <div className='w-1/4 pl-4'>
-            <div className='sticky top-48 border border-gray_r-6 bg-white rounded p-4'>
-              <div className='flex justify-between items-center'>
-                <div className='font-medium'>Ringkasan Pesanan</div>
-                <div className='text-gray_r-11 text-caption-1'>{products?.length} Barang</div>
+                                  </td>
+                                  <td>
+                                    <input
+                                      className='form-input w-16 py-2 text-center bg-gray_r-1'
+                                      type='number'
+                                      value={1}
+                                      disabled
+                                    />
+                                  </td>
+                                  <td>
+                                    {item?.price?.discountPercentage > 0 && (
+                                      <div className='flex gap-x-1 items-center justify-center mt-3'>
+                                        <div className='text-gray_r-11 line-through text-caption-1'>
+                                          {currencyFormat(product?.price?.price)}
+                                        </div>
+                                      </div>
+                                    )}
+                                    <div className='font-normal mt-1'>
+                                      {item?.price.priceDiscount > 0 ? 'Gratis' : ''}
+                                    </div>
+                                  </td>
+                                  <td>
+                                    <div className='text-danger-500 font-medium'>
+                                      {item.price.priceDiscount > 0 ? 'Gratis' : ''}
+                                    </div>
+                                  </td>
+                                  <td></td>
+                                </tr>
+                              </>
+                            ))}
+                        </>
+                      ))
+                    )}
+                  </tbody>
+                </table>
               </div>
+            </div>
+            <div className='w-1/4 pl-4'>
+              <div className='sticky top-48 border border-gray_r-6 bg-white rounded p-4'>
+                <div className='flex justify-between items-center'>
+                  <div className='font-medium'>Ringkasan Pesanan</div>
+                  <div className='text-gray_r-11 text-caption-1'>{products?.length} Barang</div>
+                </div>
 
-              <hr className='my-4 border-gray_r-6' />
-              {!cartCheckout ? (
-                <div
-                  role='status'
-                  class='max-w-md  space-y-3 divide-y divide-gray-200 animate-pulse dark:divide-gray-700 dark:border-gray-700'
-                >
-                  <div class='flex items-center justify-between'>
-                    <div>
-                      <div class='w-32 h-2 bg-gray-200 rounded-full dark:bg-gray-700'></div>
+                <hr className='my-4 border-gray_r-6' />
+                {!cartCheckout ? (
+                  <div
+                    role='status'
+                    class='max-w-md  space-y-3 divide-y divide-gray-200 animate-pulse dark:divide-gray-700 dark:border-gray-700'
+                  >
+                    <div class='flex items-center justify-between'>
+                      <div>
+                        <div class='w-32 h-2 bg-gray-200 rounded-full dark:bg-gray-700'></div>
+                      </div>
+                      <div class='h-2.5 bg-gray-300 rounded-full dark:bg-gray-700 w-12'></div>
                     </div>
-                    <div class='h-2.5 bg-gray-300 rounded-full dark:bg-gray-700 w-12'></div>
-                  </div>
-                  <div class='flex items-center justify-between pt-4'>
-                    <div>
-                      <div class='w-32 h-2 bg-gray-200 rounded-full dark:bg-gray-700'></div>
+                    <div class='flex items-center justify-between pt-4'>
+                      <div>
+                        <div class='w-32 h-2 bg-gray-200 rounded-full dark:bg-gray-700'></div>
+                      </div>
+                      <div class='h-2.5 bg-gray-300 rounded-full dark:bg-gray-700 w-12'></div>
                     </div>
-                    <div class='h-2.5 bg-gray-300 rounded-full dark:bg-gray-700 w-12'></div>
-                  </div>
-                  <div class='flex items-center justify-between pt-4'>
-                    <div>
-                      <div class='w-32 h-2 bg-gray-200 rounded-full dark:bg-gray-700'></div>
+                    <div class='flex items-center justify-between pt-4'>
+                      <div>
+                        <div class='w-32 h-2 bg-gray-200 rounded-full dark:bg-gray-700'></div>
+                      </div>
+                      <div class='h-2.5 bg-gray-300 rounded-full dark:bg-gray-700 w-12'></div>
+                    </div>
+                    <div class='flex items-center justify-between pt-4'>
+                      <div>
+                        <div class='w-32 h-2 bg-gray-200 rounded-full dark:bg-gray-700'></div>
+                      </div>
+                      <div class='h-2.5 bg-gray-300 rounded-full dark:bg-gray-700 w-12'></div>
+                    </div>
+                    <div class='flex items-center justify-between pt-4'>
+                      <div>
+                        <div class='w-32 h-2 bg-gray-200 rounded-full dark:bg-gray-700'></div>
+                      </div>
+                      <div class='h-2.5 bg-gray-300 rounded-full dark:bg-gray-700 w-12'></div>
                     </div>
-                    <div class='h-2.5 bg-gray-300 rounded-full dark:bg-gray-700 w-12'></div>
                   </div>
-                  <div class='flex items-center justify-between pt-4'>
-                    <div>
-                      <div class='w-32 h-2 bg-gray-200 rounded-full dark:bg-gray-700'></div>
+                ) : (
+                  <div className='flex flex-col gap-y-4'>
+                    <div className='flex gap-x-2 justify-between'>
+                      <div className='text-gray_r-11'>Total Belanja</div>
+                      <div>{currencyFormat(cartCheckout?.totalPurchase)}</div>
+                    </div>
+                    <div className='flex gap-x-2 justify-between'>
+                      <div className='text-gray_r-11'>Diskon Produk</div>
+                      <div className='text-danger-500'>
+                        - {currencyFormat(cartCheckout?.totalDiscount)}
+                      </div>
+                    </div>
+                    {activeVoucher && (
+                      <div className='flex gap-x-2 justify-between'>
+                        <div className='text-gray_r-11'>Diskon Voucher</div>
+                        <div className='text-danger-500'>- {currencyFormat(discountVoucher)}</div>
+                      </div>
+                    )}
+                    <div className='flex gap-x-2 justify-between'>
+                      <div className='text-gray_r-11'>Subtotal</div>
+                      <div>{currencyFormat(cartCheckout?.subtotal)}</div>
+                    </div>
+                    <div className='flex gap-x-2 justify-between'>
+                      <div className='text-gray_r-11'>PPN 11%</div>
+                      <div>{currencyFormat(cartCheckout?.tax)}</div>
+                    </div>
+                    <div className='flex gap-x-2 justify-between'>
+                      <div className='text-gray_r-11'>
+                        Biaya Kirim
+                        <p className='text-xs mt-3'>{etdFix}</p>
+                      </div>
+                      <div>
+                        {currencyFormat(Math.round(parseInt(biayaKirim * 1.1) / 1000) * 1000)}
+                      </div>
                     </div>
-                    <div class='h-2.5 bg-gray-300 rounded-full dark:bg-gray-700 w-12'></div>
                   </div>
-                  <div class='flex items-center justify-between pt-4'>
+                )}
+
+                <hr className='my-4 border-gray_r-6' />
+                {!cartCheckout ? (
+                  <div className='flex gap-x-2 justify-between mb-4'>
                     <div>
+                      {' '}
                       <div class='w-32 h-2 bg-gray-200 rounded-full dark:bg-gray-700'></div>
                     </div>
-                    <div class='h-2.5 bg-gray-300 rounded-full dark:bg-gray-700 w-12'></div>
-                  </div>
-                </div>
-              ) : (
-                <div className='flex flex-col gap-y-4'>
-                  <div className='flex gap-x-2 justify-between'>
-                    <div className='text-gray_r-11'>Total Belanja</div>
-                    <div>{currencyFormat(cartCheckout?.totalPurchase)}</div>
-                  </div>
-                  <div className='flex gap-x-2 justify-between'>
-                    <div className='text-gray_r-11'>Diskon Produk</div>
-                    <div className='text-danger-500'>
-                      - {currencyFormat(cartCheckout?.totalDiscount)}
+                    <div className='font-semibold text-gray_r-12'>
+                      <div class='h-2.5 bg-gray-300 rounded-full dark:bg-gray-700 w-12'></div>
                     </div>
                   </div>
-                  {activeVoucher && (
-                    <div className='flex gap-x-2 justify-between'>
-                      <div className='text-gray_r-11'>Diskon Voucher</div>
-                      <div className='text-danger-500'>- {currencyFormat(discountVoucher)}</div>
+                ) : (
+                  <div className='flex gap-x-2 justify-between mb-4'>
+                    <div>Grand Total</div>
+                    <div className='font-semibold text-gray_r-12'>
+                      {currencyFormat(
+                        cartCheckout?.grandTotal +
+                          Math.round(parseInt(biayaKirim * 1.1) / 1000) * 1000
+                      )}
                     </div>
-                  )}
-                  <div className='flex gap-x-2 justify-between'>
-                    <div className='text-gray_r-11'>Subtotal</div>
-                    <div>{currencyFormat(cartCheckout?.subtotal)}</div>
-                  </div>
-                  <div className='flex gap-x-2 justify-between'>
-                    <div className='text-gray_r-11'>PPN 11%</div>
-                    <div>{currencyFormat(cartCheckout?.tax)}</div>
                   </div>
-                  <div className='flex gap-x-2 justify-between'>
-                    <div className='text-gray_r-11'>
-                      Biaya Kirim
-                      <p className='text-xs mt-3'>{etdFix}</p>
-                    </div>
-                    <div>
-                      {currencyFormat(Math.round(parseInt(biayaKirim * 1.1) / 1000) * 1000)}
+                )}
+
+                <hr className='my-4 border-gray_r-6' />
+
+                <div className='mt-4 mb-4'>
+                  <button
+                    type='button'
+                    onClick={() => {
+                      SetBottomPopup(true)
+                      voucher()
+                    }}
+                    className='text-gray-900 p-3 flex items-center justify-between  rounded-lg bg-white border font-medium border-gray-300  hover:bg-gray-100 py-2.5 h-[50px] w-[100%]'
+                  >
+                    <div className='flex items-center justify-between gap-x-3'>
+                      <span className='text-left text-gray_r-9'>
+                        <Image
+                          src={'/images/DISKONICON.svg'}
+                          alt={''}
+                          className='object-contain object-center h-6 w-full rounded-md'
+                        />
+                      </span>
+                      {activeVoucher ? (
+                        <div className=''>
+                          <div className='text-left text-sm text-black font-semibold'>
+                            Hemat {currencyFormat(discountVoucher)}
+                          </div>
+                          <div className='text-left mt-1 text-green-600 text-xs'>
+                            Voucher berhasil digunakan
+                          </div>
+                        </div>
+                      ) : (
+                        <span className='text-left text-sm text-gray_r-9'>
+                          Hemat belanja dengan promo
+                        </span>
+                      )}
                     </div>
-                  </div>
+                    <span className='text-left ml-1 text-gray_r-9'>{'>'}</span>
+                  </button>
                 </div>
-              )}
 
-              <hr className='my-4 border-gray_r-6' />
-              {!cartCheckout ? (
-                <div className='flex gap-x-2 justify-between mb-4'>
-                  <div>
-                    {' '}
-                    <div class='w-32 h-2 bg-gray-200 rounded-full dark:bg-gray-700'></div>
-                  </div>
-                  <div className='font-semibold text-gray_r-12'>
-                    <div class='h-2.5 bg-gray-300 rounded-full dark:bg-gray-700 w-12'></div>
-                  </div>
+                <p className='text-caption-2 text-gray_r-11 leading-5'>
+                  Dengan melakukan pembelian melalui website Indoteknik, saya menyetujui{' '}
+                  <Link href='/syarat-ketentuan' className='inline font-normal'>
+                    Syarat & Ketentuan
+                  </Link>{' '}
+                  yang berlaku
+                </p>
+
+                <hr className='my-4 border-gray_r-6' />
+
+                <div className='font-medium mt-4'>
+                  Purchase Order <span className='font-normal text-gray_r-11'>(Opsional)</span>
                 </div>
-              ) : (
-                <div className='flex gap-x-2 justify-between mb-4'>
-                  <div>Grand Total</div>
-                  <div className='font-semibold text-gray_r-12'>
-                    {currencyFormat(
-                      cartCheckout?.grandTotal +
-                        Math.round(parseInt(biayaKirim * 1.1) / 1000) * 1000
-                    )}
+
+                <div className='mt-4 flex gap-x-3'>
+                  <div className='w-6/12'>
+                    <label className='form-label font-normal'>Dokumen PO</label>
+                    <input
+                      type='file'
+                      className='form-input mt-2 h-12'
+                      accept='image/*,application/pdf'
+                      ref={poFile}
+                    />
+                  </div>
+                  <div className='w-6/12'>
+                    <label className='form-label font-normal'>Nomor PO</label>
+                    <input type='text' className='form-input mt-2 h-12' ref={poNumber} />
                   </div>
                 </div>
-              )}
+                <p className='text-caption-2 text-gray_r-11 mt-2'>Ukuran dokumen PO Maksimal 5MB</p>
 
-              <hr className='my-4 border-gray_r-6' />
+                <hr className='my-4 border-gray_r-6' />
 
-              <div className='mt-4 mb-4'>
                 <button
-                  type='button'
-                  onClick={() => {
-                    SetBottomPopup(true)
-                    voucher()
-                  }}
-                  className='text-gray-900 p-3 flex items-center justify-between  rounded-lg bg-white border font-medium border-gray-300  hover:bg-gray-100 py-2.5 h-[50px] w-[100%]'
+                  className='w-full btn-yellow mt-4'
+                  onClick={checkout}
+                  disabled={isLoading || !products || products?.length == 0 || priceCheck}
                 >
-                  <div className='flex items-center justify-between gap-x-3'>
-                    <span className='text-left text-gray_r-9'>
-                      <Image
-                        src={'/images/DISKONICON.svg'}
-                        alt={''}
-                        className='object-contain object-center h-6 w-full rounded-md'
-                      />
+                  {isLoading ? 'Loading...' : 'Lanjut Pembayaran'}
+                </button>
+                {priceCheck && (
+                  <div className='mt-4'>
+                    <span className='text-danger-500'>
+                      *) Terdapat produk yang belum memiliki harga,{' '}
+                      <a href={whatsappUrl()} className='underline'>
+                        Hubungi Kami untuk meminta harga.
+                      </a>
                     </span>
-                    {activeVoucher ? (
-                      <div className=''>
-                        <div className='text-left text-sm text-black font-semibold'>
-                          Hemat {currencyFormat(discountVoucher)}
-                        </div>
-                        <div className='text-left mt-1 text-green-600 text-xs'>
-                          Voucher berhasil digunakan
-                        </div>
-                      </div>
-                    ) : (
-                      <span className='text-left text-sm text-gray_r-9'>
-                        Hemat belanja dengan promo
-                      </span>
-                    )}
                   </div>
-                  <span className='text-left ml-1 text-gray_r-9'>{'>'}</span>
-                </button>
-              </div>
-
-              <p className='text-caption-2 text-gray_r-11 leading-5'>
-                Dengan melakukan pembelian melalui website Indoteknik, saya menyetujui{' '}
-                <Link href='/syarat-ketentuan' className='inline font-normal'>
-                  Syarat & Ketentuan
-                </Link>{' '}
-                yang berlaku
-              </p>
-
-              <hr className='my-4 border-gray_r-6' />
-
-              <div className='font-medium mt-4'>
-                Purchase Order <span className='font-normal text-gray_r-11'>(Opsional)</span>
-              </div>
-
-              <div className='mt-4 flex gap-x-3'>
-                <div className='w-6/12'>
-                  <label className='form-label font-normal'>Dokumen PO</label>
-                  <input
-                    type='file'
-                    className='form-input mt-2 h-12'
-                    accept='image/*,application/pdf'
-                    ref={poFile}
-                  />
-                </div>
-                <div className='w-6/12'>
-                  <label className='form-label font-normal'>Nomor PO</label>
-                  <input type='text' className='form-input mt-2 h-12' ref={poNumber} />
-                </div>
+                )}
               </div>
-              <p className='text-caption-2 text-gray_r-11 mt-2'>Ukuran dokumen PO Maksimal 5MB</p>
-
-              <hr className='my-4 border-gray_r-6' />
-
-              <button
-                className='w-full btn-yellow mt-4'
-                onClick={checkout}
-                disabled={isLoading || !products || products?.length == 0 || priceCheck}
-              >
-                {isLoading ? 'Loading...' : 'Lanjut Pembayaran'}
-              </button>
-              {priceCheck && (
-                <div className='mt-4'>
-                  <span className='text-danger-500'>
-                    *) Terdapat produk yang belum memiliki harga,{' '}
-                    <a href={whatsappUrl()} className='underline'>
-                      Hubungi Kami untuk meminta harga.
-                    </a>
-                  </span>
-                </div>
-              )}
             </div>
           </div>
         </div>