1 files changed, 38 insertions, 71 deletions

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index 6fb5cdb4..33cfaa87 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -28,9 +28,12 @@ import getFileBase64 from '@/core/utils/getFileBase64';
 import { gtagPurchase } from '@/core/utils/googleTag';
 import whatsappUrl from '@/core/utils/whatsappUrl';
 import addressesApi from '@/lib/address/api/addressesApi';
+import { MapPinIcon } from 'lucide-react';
 import CartItem from '~/modules/cart/components/Item.tsx';
 import ExpedisiList from '../api/ExpedisiList';
-import { findVoucher, getVoucher, getVoucherNew } from '../api/getVoucher';
+import { getVoucher } from '../api/getVoucher';
+import { useAddress } from '../stores/useAdress';
+import SectionExpedition from './SectionExpedition';
 
 const SELF_PICKUP_ID = 32;
 
@@ -68,11 +71,15 @@ const Checkout = () => {
       })
   );
 
-  const [selectedAddress, setSelectedAddress] = useState({
-    shipping: null,
-    invoicing: null,
-  });
-  const [addresses, setAddresses] = useState(null);
+  const {
+    selectedAddress,
+    setSelectedAddress,
+    addresses,
+    setAddresses,
+    setAddressMaps,
+    setCoordinate,
+    setPostalCode,
+  } = useAddress();
 
   useEffect(() => {
     if (!auth) return;
@@ -102,10 +109,20 @@ const Checkout = () => {
       return addresses[0];
     };
 
+    let ship = matchAddress('shipping');
+
     setSelectedAddress({
       shipping: matchAddress('shipping'),
       invoicing: matchAddress('invoicing'),
     });
+    setPostalCode(ship?.zip);
+    if (ship?.addressMap) {
+      setAddressMaps(ship?.addressMap);
+      setCoordinate({
+        destination_latitude: ship?.latitude,
+        destination_longitude: ship?.longtitude,
+      });
+    }
   }, [addresses]);
 
   const [products, setProducts] = useState(null);
@@ -280,58 +297,6 @@ const Checkout = () => {
     };
   }, []);
 
-  const hitungDiscountVoucher = (code, source) => {
-    let countDiscount = 0;
-    if (source === 'voucher') {
-      let dataVoucherIndex = listVouchers.findIndex(
-        (voucher) => voucher.code == code
-      );
-      let dataActiveVoucher = listVouchers[dataVoucherIndex];
-
-      countDiscount = dataActiveVoucher.discountVoucher;
-    } else {
-      let dataVoucherIndex = listVoucherShippings.findIndex(
-        (voucher) => voucher.code == code
-      );
-      let dataActiveVoucher = listVoucherShippings[dataVoucherIndex];
-
-      countDiscount = dataActiveVoucher.discountVoucher;
-    }
-
-    /*if (dataActiveVoucher.discountType === 'percentage') {
-      countDiscount = cartCheckout?.subtotal * (dataActiveVoucher.discountAmount / 100)
-      if (
-        dataActiveVoucher.maxDiscountAmount > 0 &&
-        countDiscount > dataActiveVoucher.maxDiscountAmount
-      ) {
-        countDiscount = dataActiveVoucher.maxDiscountAmount
-      }
-    } else {
-      countDiscount = dataActiveVoucher.discountAmount
-    }*/
-
-    return countDiscount;
-  };
-
-  // useEffect(() => {
-  //   if (!listVouchers) return;
-  //   if (!activeVoucher) return;
-
-  //   console.log('voucher')
-  //   const countDiscount = hitungDiscountVoucher(activeVoucher, 'voucher');
-
-  //   SetDiscountVoucher(countDiscount);
-  // }, [activeVoucher, listVouchers]);
-
-  // useEffect(() => {
-  //   if (!listVoucherShippings) return;
-  //   if (!activeVoucherShipping) return;
-
-  //   const countDiscount = hitungDiscountVoucher(activeVoucherShipping, 'voucher_shipping');
-
-  //   SetDiscountVoucherOngkir(countDiscount);
-  // }, [activeVoucherShipping, listVoucherShippings]);
-
   useEffect(() => {
     if (qVoucher === 'PASTIHEMAT' && listVouchers) {
       let code = qVoucher;
@@ -716,19 +681,6 @@ const Checkout = () => {
           )}
 
           <hr className='mt-8 mb-4 border-gray_r-8' />
-          {/* {!loadingVoucher &&
-            listVouchers?.length === 1 &&
-            listVoucherShippings?.length === 1}
-          {
-            <div className='flex items-center justify-center mt-4 mb-4'>
-              <div className='text-center'>
-                <h1 className='font-bold mb-4'>Tidak ada voucher tersedia</h1>
-                <p className='text-gray-500'>
-                  Maaf, saat ini tidak ada voucher yang tersedia.
-                </p>
-              </div>
-            </div>
-          } */}
 
           {listVoucherShippings && listVoucherShippings?.length > 0 && (
             <div>
@@ -1411,6 +1363,7 @@ const Checkout = () => {
                   />
                 </Skeleton>
               )}
+              {products && <SectionExpedition products={products} />}
               <Divider />
               <SectionValidation address={selectedAddress.invoicing} />
               <SectionExpedisi
@@ -1691,6 +1644,20 @@ const SectionAddress = ({ address, label, url }) => (
         <p className='mt-1 text-gray_r-11'>
           {address.street}, {address?.city?.name}
         </p>
+        <div className='flex gap-x-2 items-center mt-4'>
+          <MapPinIcon
+            className={
+              address.addressMap
+                ? `h-6 w-6 text-gray-500`
+                : `h-6 w-6 text-red-500`
+            }
+          />
+          {address.addressMap ? (
+            <label>Sudah Pinpoint</label>
+          ) : (
+            <label className='text-red-500 '>Belum Pinpoint</label>
+          )}
+        </div>
       </div>
     )}
   </div>