1 files changed, 12 insertions, 7 deletions

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index 54acdf7c..913bd273 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -174,7 +174,6 @@ const Checkout = () => {
           }
           return; // Hentikan eksekusi lebih lanjut pada iterasi ini
         }
-
         // Memeriksa apakah subtotal memenuhi syarat minimal pembelian
         if (cartCheckout?.subtotal < addNewLine.minPurchaseAmount) {
           SetSelisihHargaCode(
@@ -191,7 +190,9 @@ const Checkout = () => {
 
         // Tambahkan voucher ke list dan set voucher aktif
         SetListVoucher((prevList) => [addNewLine, ...prevList]);
-        SetActiveVoucher(addNewLine.code);
+        if (addNewLine.canApply) {
+          SetActiveVoucher(addNewLine.code);
+        }
       } else {
         // Mencari voucher dalam listVoucherShippings
         let checkList = listVoucherShippings?.findIndex(
@@ -227,7 +228,9 @@ const Checkout = () => {
 
         // Tambahkan voucher ke list pengiriman dan set voucher aktif pengiriman
         SetListVoucherShipping((prevList) => [addNewLine, ...prevList]);
-        setActiveVoucherShipping(addNewLine.code);
+        if (addNewLine.canApply) {
+          setActiveVoucherShipping(addNewLine.code);
+        }
       }
     });
 
@@ -701,7 +704,9 @@ const Checkout = () => {
 
           {listVoucherShippings && listVoucherShippings?.length > 0 && (
             <div>
-              <h3 className='font-semibold mb-4'>Promo Extra Potongan Ongkir</h3>
+              <h3 className='font-semibold mb-4'>
+                Promo Extra Potongan Ongkir
+              </h3>
               {listVoucherShippings?.map((item) => (
                 <div key={item.id} className='relative'>
                   <div
@@ -1028,7 +1033,7 @@ const Checkout = () => {
             </div>
             <span className='leading-5'>
               Jika mengalami kesulitan dalam melakukan pembelian di website
-              Indoteknik. Hubungi kami disini
+              Indoteknik. <a href={whatsappUrl()}>Hubungi kami disini</a>
             </span>
           </Alert>
         </div>
@@ -1236,10 +1241,10 @@ const Checkout = () => {
                     className='object-contain object-center h-6 rounded-md'
                   />
                 </span>
-                {activeVoucher ? (
+                {activeVoucher || activeVoucherShipping ? (
                   <div className=''>
                     <div className='text-left text-sm text-black font-semibold'>
-                      Potongan Senilai {currencyFormat(discountVoucher)}
+                      Potongan Senilai {currencyFormat(totalDiscountVoucher)}
                     </div>
                     <div className='text-left mt-1 text-green-600 text-xs'>
                       Voucher berhasil digunakan