From 50425ea134852897bf125aae0f68a1642eb3b3b8 Mon Sep 17 00:00:00 2001
From: Rafi Zadanly <zadanlyr@gmail.com>
Date: Wed, 3 Apr 2024 10:31:14 +0700
Subject: Add voucher shipping feature

---
 src/lib/checkout/api/checkoutApi.js      |  34 ++---
 src/lib/checkout/api/getVoucher.js       |  37 ++---
 src/lib/checkout/components/Checkout.jsx | 224 ++++++++++++++++++++++++++-----
 3 files changed, 224 insertions(+), 71 deletions(-)

(limited to 'src/lib/checkout')

diff --git a/src/lib/checkout/api/checkoutApi.js b/src/lib/checkout/api/checkoutApi.js
index 24f1868a..fd982fff 100644
--- a/src/lib/checkout/api/checkoutApi.js
+++ b/src/lib/checkout/api/checkoutApi.js
@@ -1,28 +1,20 @@
-import odooApi from '@/core/api/odooApi'
-import { getAuth } from '@/core/utils/auth'
+import odooApi from '@/core/api/odooApi';
+import { getAuth } from '@/core/utils/auth';
 
 export const checkoutApi = async ({ data }) => {
-  const auth = getAuth()
+  const auth = getAuth();
   const dataCheckout = await odooApi(
     'POST',
     `/api/v1/partner/${auth.partnerId}/sale_order/checkout`,
     data
-  )
-  return dataCheckout
-}
+  );
+  return dataCheckout;
+};
 
-export const getProductsCheckout = async (voucher, query) => {
-  const id = getAuth()?.id
-  let products 
-  if(voucher && query){
-    products = await odooApi('GET',`/api/v1/user/${id}/sale_order/checkout?voucher=${voucher}&source=buy`)
-  }else if (voucher){
-    products = await odooApi('GET',`/api/v1/user/${id}/sale_order/checkout?voucher=${voucher}`)
-  }else if (query) {
-    products = await odooApi('GET',`/api/v1/user/${id}/sale_order/checkout?source=buy`)
-  }else{
-    products = await odooApi('GET',`/api/v1/user/${id}/sale_order/checkout`)
-  }
-
-  return products
-}
+export const getProductsCheckout = async (query) => {
+  const queryParam = new URLSearchParams(query);
+  const userId = getAuth()?.id;
+  const url = `/api/v1/user/${userId}/sale_order/checkout?${queryParam.toString()}`;
+  const result = await odooApi('GET', url);
+  return result;
+};
diff --git a/src/lib/checkout/api/getVoucher.js b/src/lib/checkout/api/getVoucher.js
index 07cf376e..54c8cce5 100644
--- a/src/lib/checkout/api/getVoucher.js
+++ b/src/lib/checkout/api/getVoucher.js
@@ -1,21 +1,24 @@
-import odooApi from '@/core/api/odooApi'
+import odooApi from '@/core/api/odooApi';
 
-export  const getVoucher = async (id, source) => {
-  let dataVoucher = null
-  if(source){
-    dataVoucher = await odooApi('GET', `/api/v1/user/${id}/voucher?source=${source}`)
-  }else {
-    dataVoucher = await odooApi('GET', `/api/v1/user/${id}/voucher`)
-  }
-  return dataVoucher
-}
+export const getVoucher = async (id, query) => {
+  const queryParam = new URLSearchParams(query);
+  const url = `/api/v1/user/${id}/voucher?${queryParam.toString()}`;
+  const dataVoucher = await odooApi('GET', url);
+  return dataVoucher;
+};
 
 export const findVoucher = async (code, id, source) => {
-  let dataVoucher = null
-  if(source){
-    dataVoucher = await odooApi('GET', `/api/v1/user/${id}/voucher?code=${code}&source=${source}`)
-  }else{
-    dataVoucher = await odooApi('GET', `/api/v1/user/${id}/voucher?code=${code}`)
+  let dataVoucher = null;
+  if (source) {
+    dataVoucher = await odooApi(
+      'GET',
+      `/api/v1/user/${id}/voucher?code=${code}&source=${source}`
+    );
+  } else {
+    dataVoucher = await odooApi(
+      'GET',
+      `/api/v1/user/${id}/voucher?code=${code}`
+    );
   }
-  return dataVoucher
-}
+  return dataVoucher;
+};
diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index 52edbd05..042fc258 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -43,9 +43,16 @@ const Checkout = () => {
   const auth = useAuth();
 
   const [activeVoucher, SetActiveVoucher] = useState(null);
-
-  const { data: cartCheckout } = useQuery('cartCheckout-' + activeVoucher, () =>
-    getProductsCheckout(activeVoucher, query)
+  const [activeVoucherShipping, setActiveVoucherShipping] = useState(null);
+
+  const { data: cartCheckout } = useQuery(
+    ['cartCheckout', activeVoucher, activeVoucherShipping],
+    () =>
+      getProductsCheckout({
+        source: query,
+        voucher: activeVoucher,
+        voucher_shipping: activeVoucherShipping,
+      })
   );
 
   const [selectedAddress, setSelectedAddress] = useState({
@@ -103,6 +110,7 @@ const Checkout = () => {
   const [bottomPopupTnC, SetBottomPopupTnC] = useState(null);
   const [itemTnC, setItemTnC] = useState(null);
   const [listVouchers, SetListVoucher] = useState(null);
+  const [listVoucherShippings, SetListVoucherShipping] = useState(null);
   const [discountVoucher, SetDiscountVoucher] = useState(0);
   const [codeVoucher, SetCodeVoucher] = useState(null);
   const [findCodeVoucher, SetFindVoucher] = useState(null);
@@ -117,13 +125,23 @@ const Checkout = () => {
   const voucher = async () => {
     if (!listVouchers) {
       try {
-        let dataVoucher = await getVoucher(auth?.id, query);
+        setLoadingVoucher(true);
+        let dataVoucher = await getVoucher(auth?.id, {
+          source: query,
+        });
         SetListVoucher(dataVoucher);
+
+        let dataVoucherShipping = await getVoucher(auth?.id, {
+          source: query,
+          type: 'shipping',
+        });
+        SetListVoucherShipping(dataVoucherShipping);
       } finally {
         setLoadingVoucher(false);
       }
     }
   };
+
   const VoucherCode = async (code) => {
     let dataVoucher = await findVoucher(code, auth.id, query);
     if (dataVoucher.length <= 0) {
@@ -333,6 +351,7 @@ const Checkout = () => {
       estimated_arrival_days: splitDuration(etd),
       delivery_service_type: selectedExpedisiService,
       voucher: activeVoucher,
+      voucher_shipping: activeVoucherShipping,
       type: 'sale_order',
     };
 
@@ -419,6 +438,11 @@ const Checkout = () => {
     return false;
   }, [products]);
 
+  const voucherShippingAmt = cartCheckout?.discountVoucherShipping || 0;
+  const discShippingAmt = Math.min(biayaKirim, voucherShippingAmt);
+
+  const finalShippingAmt = biayaKirim - discShippingAmt;
+
   return (
     <>
       <BottomPopup
@@ -528,8 +552,145 @@ const Checkout = () => {
             </div>
           )}
 
-          <hr className='mt-10 my-4 border-gray_r-10' />
-          <div className=''>
+          <hr className='mt-8 mb-4 border-gray_r-8' />
+
+          {listVoucherShippings && listVoucherShippings?.length > 0 && (
+            <div>
+              <h3 className='font-semibold mb-4'>Promo Gratis Ongkir</h3>
+              {listVoucherShippings?.map((item) => (
+                <div key={item.id} className='relative'>
+                  <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'
+                        role='alert'
+                      >
+                        <p>
+                          Potensi potongan sebesar{' '}
+                          <span className='text-green font-bold'>
+                            {currencyFormat(item.discountVoucher)}
+                          </span>
+                        </p>
+                      </div>
+                    )}
+                    {!item.canApply && (
+                      <div
+                        class='p-2 mb-4 text-sm text-red-800 rounded-lg bg-red-50'
+                        role='alert'
+                        onClick={() => handlingTnC(item)}
+                      >
+                        <p>
+                          Voucher tidak bisa di gunakan,{' '}
+                          <span className='text-red font-bold'>
+                            Baca Selengkapnya !
+                          </span>
+                        </p>
+                      </div>
+                    )}
+
+                    <div className={`flex gap-x-3 relative`}>
+                      {item.canApply === false && (
+                        <div className='absolute w-full h-full bg-gray_r-3/40 top-0 left-0 z-50' />
+                      )}
+                      <div className='hidden md:w-[250px] md:block'>
+                        <Image
+                          src={item.image}
+                          alt={item.name}
+                          className={`object-cover`}
+                        />
+                      </div>
+                      <div className='w-full'>
+                        <div className='flex justify-between gap-x-2 mb-1 items-center'>
+                          <div className=''>
+                            <h3 className='font-semibold'>{item.name}</h3>
+                            <div className='mt-1'>
+                              <span className='text-sm line-clamp-3'>
+                                {item.description}{' '}
+                              </span>
+                            </div>
+                          </div>
+                          <div className='flex justify-end'>
+                            <label class='relative inline-flex items-center cursor-pointer'>
+                              <input
+                                type='checkbox'
+                                value=''
+                                class='sr-only peer'
+                                checked={activeVoucherShipping === item.code}
+                                onChange={() =>
+                                  setActiveVoucherShipping(
+                                    activeVoucherShipping === item.code
+                                      ? null
+                                      : item.code
+                                  )
+                                }
+                              />
+                              <div class="w-11 h-6 bg-gray-200 rounded-full peer dark:bg-gray-700 peer-focus:ring-4 peer-focus:ring-green-300 dark:peer-focus:ring-green-800 peer-checked:after:translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-0.5 after:left-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all dark:border-gray-600 peer-checked:bg-green-600"></div>
+                            </label>
+                          </div>
+                        </div>
+                        <hr className='mt-2 my-2 border-gray_r-8' />
+                        <div className='flex justify-between items-center'>
+                          <p className='text-justify text-sm md:text-xs'>
+                            Kode Voucher :{' '}
+                            <span className='text-red-500 font-semibold'>
+                              {item.code}
+                            </span>
+                          </p>
+                          <p className='text-sm md:text-xs'>
+                            {activeVoucher === item.code && (
+                              <span className=' text-green-600'>
+                                Voucher digunakan{' '}
+                              </span>
+                            )}
+                          </p>
+                        </div>
+                        <div className='flex items-center mt-3'>
+                          <svg
+                            aria-hidden='true'
+                            fill='none'
+                            stroke='currentColor'
+                            stroke-width='1.5'
+                            viewBox='0 0 24 24'
+                            className='w-5 text-black'
+                          >
+                            <path
+                              d='M12 6v6h4.5m4.5 0a9 9 0 11-18 0 9 9 0 0118 0z'
+                              stroke-linecap='round'
+                              stroke-linejoin='round'
+                            ></path>
+                          </svg>
+                          <div className='flex justify-between items-center'>
+                            <div className='text-left ml-3 text-sm '>
+                              Berakhir dalam{' '}
+                              <span className='text-red-600'>
+                                {item.remainingTime}
+                              </span>{' '}
+                              lagi,{' '}
+                            </div>
+                            <div
+                              className='text-sm ml-2 text-red-600'
+                              onClick={() => handlingTnC(item)}
+                            >
+                              Baca S&K
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                    <div className='mt-3'>
+                      <p className='text-justify text-sm '></p>
+                    </div>
+                  </div>
+                </div>
+              ))}
+            </div>
+          )}
+
+          <hr className='mt-8 mb-4 border-gray_r-8' />
+
+          <div>
             {!loadingVoucher && listVouchers?.length === 0 ? (
               <div className='flex items-center justify-center mt-4 mb-4'>
                 <div className='text-center'>
@@ -714,14 +875,7 @@ const Checkout = () => {
                       </div>
                     </div>
                     <div className='mt-3'>
-                      <p className='text-justify text-sm '>
-                        {/* {item.canApply === false
-                          ? 'Tambah ' +
-                            currencyFormat(item.differenceToApply) +
-                            ' untuk pakai promo ini'
-                          : 'Potensi potongan sebesar ' +
-                            currencyFormat(hitungDiscountVoucher(item.code))} */}
-                      </p>
+                      <p className='text-justify text-sm '></p>
                     </div>
                   </div>
                 </div>
@@ -887,14 +1041,18 @@ const Checkout = () => {
               </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
-                  )}
+                  Biaya Kirim <p className='text-xs mt-1'>{etdFix}</p>
                 </div>
+                <div>{currencyFormat(biayaKirim)}</div>
               </div>
+              {activeVoucherShipping && voucherShippingAmt && (
+                <div className='flex gap-x-2 justify-between'>
+                  <div className='text-gray_r-11'>Diskon Kirim</div>
+                  <div className='text-danger-500'>
+                    - {currencyFormat(discShippingAmt)}
+                  </div>
+                </div>
+              )}
             </div>
           )}
 
@@ -913,10 +1071,7 @@ const Checkout = () => {
             <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
-                )}
+                {currencyFormat(cartCheckout?.grandTotal + finalShippingAmt)}
               </div>
             </div>
           )}
@@ -926,7 +1081,7 @@ const Checkout = () => {
           <div className='mt-4 mb-4'>
             <button
               type='button'
-              onClick={() => {
+              onClick={async () => {
                 SetBottomPopup(true);
                 voucher();
               }}
@@ -1182,14 +1337,18 @@ const Checkout = () => {
                     <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
-                        )}
+                        <p className='text-xs mt-1'>{etdFix}</p>
                       </div>
+                      <div>{currencyFormat(biayaKirim)}</div>
                     </div>
+                    {activeVoucherShipping && voucherShippingAmt && (
+                      <div className='flex gap-x-2 justify-between'>
+                        <div className='text-gray_r-11'>Diskon Kirim</div>
+                        <div className='text-danger-500'>
+                          - {currencyFormat(discShippingAmt)}
+                        </div>
+                      </div>
+                    )}
                   </div>
                 )}
 
@@ -1209,8 +1368,7 @@ const Checkout = () => {
                     <div>Grand Total</div>
                     <div className='font-semibold text-gray_r-12'>
                       {currencyFormat(
-                        cartCheckout?.grandTotal +
-                          Math.round(parseInt(biayaKirim * 1.1) / 1000) * 1000
+                        cartCheckout?.grandTotal + finalShippingAmt
                       )}
                     </div>
                   </div>
-- 
cgit v1.2.3


From 1bb3f91f27db4db6a16a1ed3fe59016268ba3d44 Mon Sep 17 00:00:00 2001
From: "HATEC\\SPVDEV001" <tri.susilo@altama.co.id>
Date: Wed, 8 May 2024 13:23:10 +0700
Subject: change wa number

---
 src/lib/checkout/components/Checkout.jsx        | 2 +-
 src/lib/checkout/components/CheckoutOld.jsx     | 2 +-
 src/lib/checkout/components/CheckoutSection.jsx | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/lib/checkout')

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index 7a456d70..0090acee 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -1454,7 +1454,7 @@ const SectionExpedisi = ({
           dengan menghubungi admin melalui{' '}
           <a
             className='text-danger-500 inline'
-            href='https://api.whatsapp.com/send?phone=628128080622'
+            href='https://api.whatsapp.com/send?phone=6281717181922'
           >
             tautan ini
           </a>
diff --git a/src/lib/checkout/components/CheckoutOld.jsx b/src/lib/checkout/components/CheckoutOld.jsx
index d57fbd66..e2c45ce6 100644
--- a/src/lib/checkout/components/CheckoutOld.jsx
+++ b/src/lib/checkout/components/CheckoutOld.jsx
@@ -696,7 +696,7 @@ const SectionExpedisi = ({ address, listExpedisi, setSelectedExpedisi, checkWeig
           diatur beratnya. Mohon atur berat barang dengan menghubungi admin melalui{' '}
           <a
             className='text-danger-500 inline'
-            href='https://api.whatsapp.com/send?phone=628128080622'
+            href='https://api.whatsapp.com/send?phone=6281717181922'
           >
             tautan ini
           </a>
diff --git a/src/lib/checkout/components/CheckoutSection.jsx b/src/lib/checkout/components/CheckoutSection.jsx
index 7f9ea08a..affe6138 100644
--- a/src/lib/checkout/components/CheckoutSection.jsx
+++ b/src/lib/checkout/components/CheckoutSection.jsx
@@ -120,7 +120,7 @@ export const SectionExpedisi = ({
           dengan menghubungi admin melalui{' '}
           <a
             className='text-danger-500 inline'
-            href='https://api.whatsapp.com/send?phone=628128080622'
+            href='https://api.whatsapp.com/send?phone=6281717181922'
           >
             tautan ini
           </a>
-- 
cgit v1.2.3


From da80b7e00e2ee6aaa3a81902cd51ff556d4d7ef0 Mon Sep 17 00:00:00 2001
From: "HATEC\\SPVDEV001" <tri.susilo@altama.co.id>
Date: Wed, 5 Jun 2024 15:01:12 +0700
Subject: fixing shipping address and invoice address

---
 src/lib/checkout/components/Checkout.jsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/lib/checkout')

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index 0090acee..5ca3611f 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -333,8 +333,10 @@ const Checkout = () => {
       quantity: product.quantity,
     }));
     let data = {
-      partner_shipping_id: auth.partnerId,
-      partner_invoice_id: auth.partnerId,
+      // partner_shipping_id: auth.partnerId,
+      // partner_invoice_id: auth.partnerId,
+      partner_shipping_id: selectedAddress?.shipping?.id || auth.partnerId,
+      partner_invoice_id: selectedAddress?.invoicing?.id || auth.partnerId,
       user_id: auth.id,
       order_line: JSON.stringify(productOrder),
       delivery_amount: biayaKirim,
-- 
cgit v1.2.3


From b992edcc7f1b7395dea0c8562ddf272df9fc6b7f Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Sat, 29 Jun 2024 10:08:16 +0700
Subject: <iman> add parameter flag flash sale

---
 src/lib/checkout/components/Checkout.jsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/lib/checkout')

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index 5ca3611f..df1768fb 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -112,6 +112,7 @@ const Checkout = () => {
   const [loadingVoucher, setLoadingVoucher] = useState(true);
   const [loadingRajaOngkir, setLoadingRajaOngkir] = useState(false);
   const [grandTotal, setGrandTotal] = useState(0);
+  const [hasFlashSale, setHasFlashSale] = useState(false);
 
   const expedisiValidation = useRef(null);
 
@@ -224,6 +225,7 @@ const Checkout = () => {
     setProducts(cartCheckout?.products);
     setCheckWeight(cartCheckout?.hasProductWithoutWeight);
     setTotalWeight(cartCheckout?.totalWeight.g);
+    setHasFlashSale(cartCheckout?.products[0]?.hasFlashsale ? cartCheckout.products[0].hasFlashsale : false);
   }, [cartCheckout]);
 
   useEffect(() => {
@@ -343,6 +345,7 @@ const Checkout = () => {
       carrier_id: selectedCarrierId,
       estimated_arrival_days: splitDuration(etd),
       delivery_service_type: selectedExpedisiService,
+      flash_sale : !hasFlashSale, // dibuat negasi untuk ngetest kebalikan nilai false
       voucher: activeVoucher,
       type: 'sale_order',
     };
@@ -358,7 +361,7 @@ const Checkout = () => {
       toast.error('Gagal melakukan transaksi, terjadi kesalahan internal');
       return;
     }
-
+    console.log("isCheckouted",isCheckouted)
     gtagPurchase(products, biayaKirim, isCheckouted.name);
 
     const midtrans = async () => {
-- 
cgit v1.2.3


From 703136862dc3d41d0a276c17fa7f4ecebd471527 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 1 Jul 2024 09:07:59 +0700
Subject: <iman> add flash sales to sales order

---
 src/lib/checkout/components/Checkout.jsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/lib/checkout')

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index df1768fb..4aafdece 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -227,6 +227,7 @@ const Checkout = () => {
     setTotalWeight(cartCheckout?.totalWeight.g);
     setHasFlashSale(cartCheckout?.products[0]?.hasFlashsale ? cartCheckout.products[0].hasFlashsale : false);
   }, [cartCheckout]);
+  
 
   useEffect(() => {
     setCheckoutValidation(false);
@@ -345,7 +346,7 @@ const Checkout = () => {
       carrier_id: selectedCarrierId,
       estimated_arrival_days: splitDuration(etd),
       delivery_service_type: selectedExpedisiService,
-      flash_sale : !hasFlashSale, // dibuat negasi untuk ngetest kebalikan nilai false
+      flash_sale : hasFlashSale, // dibuat negasi untuk ngetest kebalikan nilai false
       voucher: activeVoucher,
       type: 'sale_order',
     };
@@ -361,7 +362,7 @@ const Checkout = () => {
       toast.error('Gagal melakukan transaksi, terjadi kesalahan internal');
       return;
     }
-    console.log("isCheckouted",isCheckouted)
+    
     gtagPurchase(products, biayaKirim, isCheckouted.name);
 
     const midtrans = async () => {
-- 
cgit v1.2.3


From 44895db5a27a87e6f6f91d4d3fda33ff444f82f0 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 11 Jul 2024 15:21:10 +0700
Subject: <iman> marge conflik

---
 src/lib/checkout/components/Checkout.jsx | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src/lib/checkout')

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index 4355c7bd..3c2b8a09 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -1391,13 +1391,10 @@ const Checkout = () => {
                   <div className='flex gap-x-2 justify-between mb-4'>
                     <div>Grand Total</div>
                     <div className='font-semibold text-gray_r-12'>
-<<<<<<< HEAD
                       {currencyFormat(grandTotal)}
-=======
                       {currencyFormat(
                         cartCheckout?.grandTotal + finalShippingAmt
                       )}
->>>>>>> dev/voucher-shipment
                     </div>
                   </div>
                 )}
-- 
cgit v1.2.3


From 8625a9ddf959c131c293254015b59d5cb3b00f55 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 12 Jul 2024 13:28:15 +0700
Subject: <iman? update flash sale

---
 src/lib/checkout/components/Checkout.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/lib/checkout')

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index 3c2b8a09..f640299a 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -243,7 +243,8 @@ const Checkout = () => {
     setProducts(cartCheckout?.products);
     setCheckWeight(cartCheckout?.hasProductWithoutWeight);
     setTotalWeight(cartCheckout?.totalWeight.g);
-    setHasFlashSale(cartCheckout?.products[0]?.hasFlashsale ? cartCheckout.products[0].hasFlashsale : false);
+    const hasFlashSale = cartCheckout?.products.some(product => product.hasFlashsale);
+    setHasFlashSale(hasFlashSale);
   }, [cartCheckout]);
   
 
-- 
cgit v1.2.3


From ccb5ea650de36e537802893d0abb351739b480b8 Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Fri, 12 Jul 2024 13:31:24 +0700
Subject: bug

---
 src/lib/checkout/components/Checkout.jsx | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/lib/checkout')

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index 3c2b8a09..73040425 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -245,7 +245,6 @@ const Checkout = () => {
     setTotalWeight(cartCheckout?.totalWeight.g);
     setHasFlashSale(cartCheckout?.products[0]?.hasFlashsale ? cartCheckout.products[0].hasFlashsale : false);
   }, [cartCheckout]);
-  
 
   useEffect(() => {
     setCheckoutValidation(false);
@@ -1392,9 +1391,6 @@ const Checkout = () => {
                     <div>Grand Total</div>
                     <div className='font-semibold text-gray_r-12'>
                       {currencyFormat(grandTotal)}
-                      {currencyFormat(
-                        cartCheckout?.grandTotal + finalShippingAmt
-                      )}
                     </div>
                   </div>
                 )}
-- 
cgit v1.2.3


From 19f6ce87e9f6e0a5c2cfbae2cf8eabee777f011a Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 12 Jul 2024 13:34:56 +0700
Subject: <iman> update flash sale

---
 src/lib/checkout/components/Checkout.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/lib/checkout')

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index 4aafdece..77c3590b 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -225,7 +225,8 @@ const Checkout = () => {
     setProducts(cartCheckout?.products);
     setCheckWeight(cartCheckout?.hasProductWithoutWeight);
     setTotalWeight(cartCheckout?.totalWeight.g);
-    setHasFlashSale(cartCheckout?.products[0]?.hasFlashsale ? cartCheckout.products[0].hasFlashsale : false);
+    const hasFlashSale = cartCheckout?.products.some(product => product.hasFlashsale);
+    setHasFlashSale(hasFlashSale);
   }, [cartCheckout]);
   
 
-- 
cgit v1.2.3


From f4eba44dbacf13be894744e48d4248714daee223 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 17 Jul 2024 15:22:34 +0700
Subject: <iman> update nomor wa di keranjang

---
 src/lib/checkout/components/Checkout.jsx        | 4 +++-
 src/lib/checkout/components/CheckoutOld.jsx     | 4 +++-
 src/lib/checkout/components/CheckoutSection.jsx | 5 ++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'src/lib/checkout')

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index 77c3590b..3d7d47b1 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -1589,7 +1589,9 @@ const PickupAddress = ({ label }) => (
         Kodepos : 14440
       </p>
       <p className='mt-1 text-gray_r-11'>Telp : 021-2933 8828/29</p>
-      <p className='mt-1 text-gray_r-11'>Mobile : 0813 9000 7430</p>
+      <p className='mt-1 text-gray_r-11'><a href={whatsappUrl()} target='_blank' rel='noreferrer'>
+          Mobile : 0817-1718-1922
+        </a></p>
     </div>
   </div>
 );
diff --git a/src/lib/checkout/components/CheckoutOld.jsx b/src/lib/checkout/components/CheckoutOld.jsx
index e2c45ce6..3c4229aa 100644
--- a/src/lib/checkout/components/CheckoutOld.jsx
+++ b/src/lib/checkout/components/CheckoutOld.jsx
@@ -802,7 +802,9 @@ const PickupAddress = ({ label }) => (
         Daerah Khusus Ibukota Jakarta, Indonesia Kodepos : 14440
       </p>
       <p className='mt-1 text-gray_r-11'>Telp : 021-2933 8828/29</p>
-      <p className='mt-1 text-gray_r-11'>Mobile : 0813 9000 7430</p>
+      <p className='mt-1 text-gray_r-11'><a href={whatsappUrl()} target='_blank' rel='noreferrer'>
+      Mobile : 0817-1718-1922
+        </a></p>
     </div>
   </div>
 )
diff --git a/src/lib/checkout/components/CheckoutSection.jsx b/src/lib/checkout/components/CheckoutSection.jsx
index affe6138..3ed4b115 100644
--- a/src/lib/checkout/components/CheckoutSection.jsx
+++ b/src/lib/checkout/components/CheckoutSection.jsx
@@ -2,6 +2,7 @@ import Link from 'next/link';
 import BottomPopup from '@/core/components/elements/Popup/BottomPopup';
 import { AnimatePresence, motion } from 'framer-motion';
 import { Divider, Spinner } from '@chakra-ui/react';
+import whatsappUrl from '@/core/utils/whatsappUrl';
 
 export const SectionAddress = ({ address, label, url }) => {
   return (
@@ -185,7 +186,9 @@ export const PickupAddress = ({ label }) => (
         Kodepos : 14440
       </p>
       <p className='mt-1 text-gray_r-11'>Telp : 021-2933 8828/29</p>
-      <p className='mt-1 text-gray_r-11'>Mobile : 0813 9000 7430</p>
+      <p className='mt-1 text-gray_r-11'><a href={whatsappUrl()} target='_blank' rel='noreferrer'>
+      Mobile : 0817-1718-1922
+        </a></p>
     </div>
   </div>
 );
-- 
cgit v1.2.3


From d0f97021c611d07944f3cbc7e2610b1d495d897f Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 17 Jul 2024 15:41:02 +0700
Subject: <iman> update hover wa link

---
 src/lib/checkout/components/Checkout.jsx        | 2 +-
 src/lib/checkout/components/CheckoutOld.jsx     | 2 +-
 src/lib/checkout/components/CheckoutSection.jsx | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/lib/checkout')

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index 3d7d47b1..92e14db6 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -1589,7 +1589,7 @@ const PickupAddress = ({ label }) => (
         Kodepos : 14440
       </p>
       <p className='mt-1 text-gray_r-11'>Telp : 021-2933 8828/29</p>
-      <p className='mt-1 text-gray_r-11'><a href={whatsappUrl()} target='_blank' rel='noreferrer'>
+      <p className='mt-1 text-gray_r-11 hover:text-red-500'><a href={whatsappUrl()} target='_blank' rel='noreferrer'>
           Mobile : 0817-1718-1922
         </a></p>
     </div>
diff --git a/src/lib/checkout/components/CheckoutOld.jsx b/src/lib/checkout/components/CheckoutOld.jsx
index 3c4229aa..5b479a73 100644
--- a/src/lib/checkout/components/CheckoutOld.jsx
+++ b/src/lib/checkout/components/CheckoutOld.jsx
@@ -802,7 +802,7 @@ const PickupAddress = ({ label }) => (
         Daerah Khusus Ibukota Jakarta, Indonesia Kodepos : 14440
       </p>
       <p className='mt-1 text-gray_r-11'>Telp : 021-2933 8828/29</p>
-      <p className='mt-1 text-gray_r-11'><a href={whatsappUrl()} target='_blank' rel='noreferrer'>
+      <p className='mt-1 text-gray_r-11 hover:text-red-500'><a href={whatsappUrl()} target='_blank' rel='noreferrer'>
       Mobile : 0817-1718-1922
         </a></p>
     </div>
diff --git a/src/lib/checkout/components/CheckoutSection.jsx b/src/lib/checkout/components/CheckoutSection.jsx
index 3ed4b115..623152c6 100644
--- a/src/lib/checkout/components/CheckoutSection.jsx
+++ b/src/lib/checkout/components/CheckoutSection.jsx
@@ -186,7 +186,7 @@ export const PickupAddress = ({ label }) => (
         Kodepos : 14440
       </p>
       <p className='mt-1 text-gray_r-11'>Telp : 021-2933 8828/29</p>
-      <p className='mt-1 text-gray_r-11'><a href={whatsappUrl()} target='_blank' rel='noreferrer'>
+      <p className='mt-1 text-gray_r-11 hover:text-red-500'><a href={whatsappUrl()} target='_blank' rel='noreferrer'>
       Mobile : 0817-1718-1922
         </a></p>
     </div>
-- 
cgit v1.2.3


From 0433d92034937c76135ceb83ef88402464006866 Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Mon, 22 Jul 2024 15:08:07 +0700
Subject: get new voucher

---
 src/lib/checkout/api/getVoucher.js       | 10 ++++++++++
 src/lib/checkout/components/Checkout.jsx | 24 +++++++++++++++++-------
 2 files changed, 27 insertions(+), 7 deletions(-)

(limited to 'src/lib/checkout')

diff --git a/src/lib/checkout/api/getVoucher.js b/src/lib/checkout/api/getVoucher.js
index 07cf376e..15c6abbb 100644
--- a/src/lib/checkout/api/getVoucher.js
+++ b/src/lib/checkout/api/getVoucher.js
@@ -1,4 +1,5 @@
 import odooApi from '@/core/api/odooApi'
+import { getAuth } from '@/core/utils/auth'
 
 export  const getVoucher = async (id, source) => {
   let dataVoucher = null
@@ -19,3 +20,12 @@ export const findVoucher = async (code, id, source) => {
   }
   return dataVoucher
 }
+
+
+export const getVoucherNew = async (source) => {
+  const id = getAuth()?.id;
+  const dataVoucher = await odooApi('GET', `/api/v1/user/${id}/voucher?${source}`)
+
+  return dataVoucher
+
+}
\ No newline at end of file
diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index 92e14db6..61410bdf 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -30,7 +30,7 @@ import whatsappUrl from '@/core/utils/whatsappUrl';
 import addressesApi from '@/lib/address/api/addressesApi';
 import CartItem from '~/modules/cart/components/Item.tsx';
 import ExpedisiList from '../api/ExpedisiList';
-import { findVoucher, getVoucher } from '../api/getVoucher';
+import { findVoucher, getVoucher, getVoucherNew } from '../api/getVoucher';
 
 const SELF_PICKUP_ID = 32;
 
@@ -40,6 +40,7 @@ const { getProductsCheckout } = require('../api/checkoutApi');
 const Checkout = () => {
   const router = useRouter();
   const query = router.query.source ?? null;
+  const qVoucher = router.query.voucher ?? null;
   const auth = useAuth();
 
   const [activeVoucher, SetActiveVoucher] = useState(null);
@@ -119,7 +120,8 @@ const Checkout = () => {
   const voucher = async () => {
     if (!listVouchers) {
       try {
-        let dataVoucher = await getVoucher(auth?.id, query);
+        let source = 'source=' + query;
+        let dataVoucher = await getVoucherNew(source);
         SetListVoucher(dataVoucher);
       } finally {
         setLoadingVoucher(false);
@@ -127,14 +129,16 @@ const Checkout = () => {
     }
   };
   const VoucherCode = async (code) => {
-    let dataVoucher = await findVoucher(code, auth.id, query);
+    const source = 'code=' + code+'&source='+query;
+    // let dataVoucher = await findVoucher(code, auth.id, query);
+    let dataVoucher = await getVoucherNew(source);
     if (dataVoucher.length <= 0) {
       SetFindVoucher(1);
       return;
     }
 
     let addNewLine = dataVoucher[0];
-    let checkList = listVouchers.findIndex(
+    let checkList = listVouchers?.findIndex(
       (voucher) => voucher.code == addNewLine.code
     );
     if (checkList >= 0) {
@@ -166,6 +170,8 @@ const Checkout = () => {
   }, [bottomPopup]);
 
   useEffect(() => {
+    
+    // voucher()
     const loadExpedisi = async () => {
       let dataExpedisi = await ExpedisiList();
       dataExpedisi = dataExpedisi.map((expedisi) => ({
@@ -176,6 +182,10 @@ const Checkout = () => {
       setExpedisi(dataExpedisi);
     };
     loadExpedisi();
+    if(qVoucher === 'PASTIHEMAT'){
+      let code = qVoucher;
+      handleUseVoucher(code, !isChecked);
+    }
 
     const handlePopState = () => {
       router.push('/shop/cart');
@@ -186,7 +196,7 @@ const Checkout = () => {
     return () => {
       window.onpopstate = null;
     };
-    // voucher()
+   
   }, []);
 
   const hitungDiscountVoucher = (code) => {
@@ -407,13 +417,13 @@ const Checkout = () => {
       } else {
         SetActiveVoucher(code);
         SetFindVoucher(null);
-        document.getElementById('uniqCode').value = '';
+        document.getElementById('uniqCode') ? document.getElementById('uniqCode').value = '' : '';
         SetButtonTerapkan(false);
       }
     } else {
       SetActiveVoucher(code);
       SetFindVoucher(null);
-      document.getElementById('uniqCode').value = '';
+      document.getElementById('uniqCode') ? document.getElementById('uniqCode').value = '' : '';
       SetButtonTerapkan(false);
     }
   };
-- 
cgit v1.2.3


From 95081416190d09bbbe4f3d745e69ff81258bde7a Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Mon, 22 Jul 2024 15:38:48 +0700
Subject: add params voucher

---
 src/lib/checkout/components/Checkout.jsx | 40 +++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 16 deletions(-)

(limited to 'src/lib/checkout')

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index 61410bdf..9bc0257e 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -129,7 +129,7 @@ const Checkout = () => {
     }
   };
   const VoucherCode = async (code) => {
-    const source = 'code=' + code+'&source='+query;
+    const source = 'code=' + code + '&source=' + query;
     // let dataVoucher = await findVoucher(code, auth.id, query);
     let dataVoucher = await getVoucherNew(source);
     if (dataVoucher.length <= 0) {
@@ -170,8 +170,7 @@ const Checkout = () => {
   }, [bottomPopup]);
 
   useEffect(() => {
-    
-    // voucher()
+    voucher();
     const loadExpedisi = async () => {
       let dataExpedisi = await ExpedisiList();
       dataExpedisi = dataExpedisi.map((expedisi) => ({
@@ -182,10 +181,6 @@ const Checkout = () => {
       setExpedisi(dataExpedisi);
     };
     loadExpedisi();
-    if(qVoucher === 'PASTIHEMAT'){
-      let code = qVoucher;
-      handleUseVoucher(code, !isChecked);
-    }
 
     const handlePopState = () => {
       router.push('/shop/cart');
@@ -196,7 +191,6 @@ const Checkout = () => {
     return () => {
       window.onpopstate = null;
     };
-   
   }, []);
 
   const hitungDiscountVoucher = (code) => {
@@ -231,14 +225,22 @@ const Checkout = () => {
     SetDiscountVoucher(countDiscount);
   }, [activeVoucher, listVouchers]);
 
+  useEffect(() => {
+    if (qVoucher === 'PASTIHEMAT' && listVouchers) {
+      let code = qVoucher;
+      VoucherCode(code);
+    }
+  }, [listVouchers]);
+
   useEffect(() => {
     setProducts(cartCheckout?.products);
     setCheckWeight(cartCheckout?.hasProductWithoutWeight);
     setTotalWeight(cartCheckout?.totalWeight.g);
-    const hasFlashSale = cartCheckout?.products.some(product => product.hasFlashsale);
+    const hasFlashSale = cartCheckout?.products.some(
+      (product) => product.hasFlashsale
+    );
     setHasFlashSale(hasFlashSale);
   }, [cartCheckout]);
-  
 
   useEffect(() => {
     setCheckoutValidation(false);
@@ -357,7 +359,7 @@ const Checkout = () => {
       carrier_id: selectedCarrierId,
       estimated_arrival_days: splitDuration(etd),
       delivery_service_type: selectedExpedisiService,
-      flash_sale : hasFlashSale, // dibuat negasi untuk ngetest kebalikan nilai false
+      flash_sale: hasFlashSale, // dibuat negasi untuk ngetest kebalikan nilai false
       voucher: activeVoucher,
       type: 'sale_order',
     };
@@ -373,7 +375,7 @@ const Checkout = () => {
       toast.error('Gagal melakukan transaksi, terjadi kesalahan internal');
       return;
     }
-    
+
     gtagPurchase(products, biayaKirim, isCheckouted.name);
 
     const midtrans = async () => {
@@ -417,13 +419,17 @@ const Checkout = () => {
       } else {
         SetActiveVoucher(code);
         SetFindVoucher(null);
-        document.getElementById('uniqCode') ? document.getElementById('uniqCode').value = '' : '';
+        document.getElementById('uniqCode')
+          ? (document.getElementById('uniqCode').value = '')
+          : '';
         SetButtonTerapkan(false);
       }
     } else {
       SetActiveVoucher(code);
       SetFindVoucher(null);
-      document.getElementById('uniqCode') ? document.getElementById('uniqCode').value = '' : '';
+      document.getElementById('uniqCode')
+        ? (document.getElementById('uniqCode').value = '')
+        : '';
       SetButtonTerapkan(false);
     }
   };
@@ -1599,9 +1605,11 @@ const PickupAddress = ({ label }) => (
         Kodepos : 14440
       </p>
       <p className='mt-1 text-gray_r-11'>Telp : 021-2933 8828/29</p>
-      <p className='mt-1 text-gray_r-11 hover:text-red-500'><a href={whatsappUrl()} target='_blank' rel='noreferrer'>
+      <p className='mt-1 text-gray_r-11 hover:text-red-500'>
+        <a href={whatsappUrl()} target='_blank' rel='noreferrer'>
           Mobile : 0817-1718-1922
-        </a></p>
+        </a>
+      </p>
     </div>
   </div>
 );
-- 
cgit v1.2.3