Merge branch 'new-release' into CR/website-improvement

5 files changed, 292 insertions, 159 deletions

diff --git a/src/lib/flashSale/components/FlashSale.jsx b/src/lib/flashSale/components/FlashSale.jsx
index 8be1d7a6..6d90cad7 100644
--- a/src/lib/flashSale/components/FlashSale.jsx
+++ b/src/lib/flashSale/components/FlashSale.jsx
@@ -2,10 +2,8 @@ import Image from 'next/image';
 import { useEffect, useState } from 'react';
 
 import CountDown from '@/core/components/elements/CountDown/CountDown';
-import productSearchApi from '@/lib/product/api/productSearchApi';
 import ProductSlider from '@/lib/product/components/ProductSlider';
 
-import flashSaleApi from '../api/flashSaleApi';
 import { FlashSaleSkeleton } from '../skeleton/FlashSaleSkeleton';
 
 const FlashSale = () => {
@@ -14,10 +12,14 @@ const FlashSale = () => {
 
   useEffect(() => {
     const loadFlashSales = async () => {
-      const dataFlashSales = await flashSaleApi();
-      setFlashSales(dataFlashSales);
+      const res = await fetch('/api/flashsale-header');
+      const { data } = await res.json();
+      if (data) {
+        setFlashSales(data);
+      }
       setIsLoading(false);
     };
+
     loadFlashSales();
   }, []);
 
@@ -53,7 +55,10 @@ const FlashSale = () => {
                   height={48}
                   className='w-full rounded mb-4 block sm:hidden'
                 />
-                <FlashSaleProduct flashSaleId={flashSale.pricelistId} />
+                <FlashSaleProduct
+                  flashSaleId={flashSale.pricelistId}
+                  duration={flashSale.duration}
+                />
               </div>
             </div>
           ))}
@@ -63,19 +68,24 @@ const FlashSale = () => {
   );
 };
 
-const FlashSaleProduct = ({ flashSaleId }) => {
+const FlashSaleProduct = ({ flashSaleId, duration }) => {
   const [products, setProducts] = useState(null);
-
   useEffect(() => {
+    const data_search = new URLSearchParams({
+      query: `fq=flashsale_id_i:${flashSaleId}&fq=flashsale_price_f:[1 TO *]&limit=500&orderBy=flashsale-price-asc&source=similar`,
+      operation: 'AND',
+      duration: `${duration}`,
+    });
     const loadProducts = async () => {
-      const dataProducts = await productSearchApi({
-        query: `fq=flashsale_id_i:${flashSaleId}&fq=flashsale_price_f:[1 TO *]&limit=500&orderBy=flashsale-price-asc&source=similar`,
-        operation: 'AND',
-      });
-      setProducts(dataProducts.response);
+      const res = await fetch(
+        `/api/search-flashsale?${data_search.toString()}`
+      );
+      const { data } = await res.json();
+      setProducts(data.response);
     };
+
     loadProducts();
-  }, [flashSaleId]);
+  }, []);
 
   return <ProductSlider products={products} />;
 };
diff --git a/src/lib/product/components/Product/ProductMobileVariant.jsx b/src/lib/product/components/Product/ProductMobileVariant.jsx
index b87bcbc8..de5c3f10 100644
--- a/src/lib/product/components/Product/ProductMobileVariant.jsx
+++ b/src/lib/product/components/Product/ProductMobileVariant.jsx
@@ -168,44 +168,14 @@ const ProductMobileVariant = ({ product, wishlist, toggleWishlist }) => {
 
   return (
     <MobileView>
-      <Image
-        src={product.image + '?variant=True'}
-        alt={product.name}
-        className='h-72 object-contain object-center w-full border-b border-gray_r-4'
-      />
-
-      <div className='p-4'>
-        <div className='flex items-end mb-2'>
-          {product.manufacture?.name ? (
-            <Link
-              href={createSlug(
-                '/shop/brands/',
-                product.manufacture?.name,
-                product.manufacture?.id
-              )}
-            >
-              {product.manufacture?.name}
-            </Link>
-          ) : (
-            <div>-</div>
-          )}
-          <button type='button' className='ml-auto' onClick={toggleWishlist}>
-            {wishlist.data?.productTotal > 0 ? (
-              <HeartIcon className='w-6 fill-danger-500 text-danger-500' />
-            ) : (
-              <HeartIcon className='w-6' />
-            )}
-          </button>
-        </div>
-        <h1 className='font-medium text-h-lg leading-8 md:text-title-md md:leading-10 mb-3'>
-          {activeVariant?.name}
-        </h1>
-
+      <div
+        className={`px-4 block md:sticky md:top-[150px] md:py-6 fixed  bottom-0 left-0 right-0 bg-white p-2 z-10 pb-6 pt-6  rounded-lg  shadow-[rgba(0,0,4,0.1)_0px_-4px_4px_0px] `}
+      >
         {activeVariant.isFlashSale &&
         activeVariant?.price?.discountPercentage > 0 ? (
           <>
             <div className='flex gap-x-1 items-center'>
-              <div className='badge-solid-red'>
+              <div className='bg-danger-500 px-2 py-1.5 rounded text-white text-caption-2'>
                 {activeVariant?.price?.discountPercentage}%
               </div>
               <div className='text-gray_r-11 line-through text-caption-1'>
@@ -223,7 +193,7 @@ const ProductMobileVariant = ({ product, wishlist, toggleWishlist }) => {
             </div>
           </>
         ) : (
-          <h3 className='text-danger-500 font-semibold mt-1'>
+          <div className='text-danger-500 font-semibold mt-1 text-3xl'>
             {activeVariant?.price?.price > 0 ? (
               <>
                 {currencyFormat(activeVariant?.price?.price)}
@@ -253,54 +223,84 @@ const ProductMobileVariant = ({ product, wishlist, toggleWishlist }) => {
                 </a>
               </span>
             )}
-          </h3>
+          </div>
         )}
+        <div className=''>
+          <div className='mt-4 mb-2'>Jumlah</div>
+          <div className='flex gap-x-3'>
+            <div className='w-2/12'>
+              <input
+                name='quantity'
+                type='number'
+                className='form-input'
+                value={quantity}
+                onChange={(e) => setQuantity(e.target.value)}
+              />
+            </div>
+            <button
+              type='button'
+              className='btn-yellow flex-1'
+              onClick={handleClickCart}
+            >
+              Keranjang
+            </button>
+            <button
+              type='button'
+              className='btn-solid-red flex-1'
+              onClick={handleClickBuy}
+            >
+              Beli
+            </button>
+          </div>
+          <Button
+            onClick={() => handleButton(product.id)}
+            color={'red'}
+            colorScheme='white'
+            className='w-full border-2 p-2 gap-1 mt-2 hover:bg-slate-100 flex items-center'
+          >
+            <ImageNext
+              src='/images/writing.png'
+              alt='penawaran instan'
+              className=''
+              width={25}
+              height={25}
+            />
+            Penawaran Harga Instan
+          </Button>
+        </div>
       </div>
-
-      <Divider />
+      <Image
+        src={product.image + '?variant=True'}
+        alt={product.name}
+        className='h-72 object-contain object-center w-full border-b border-gray_r-4'
+      />
 
       <div className='p-4'>
-        <div className='mt-4 mb-2'>Jumlah</div>
-        <div className='flex gap-x-3'>
-          <div className='w-2/12'>
-            <input
-              name='quantity'
-              type='number'
-              className='form-input'
-              value={quantity}
-              onChange={(e) => setQuantity(e.target.value)}
-            />
-          </div>
-          <button
-            type='button'
-            className='btn-yellow flex-1'
-            onClick={handleClickCart}
-          >
-            Keranjang
-          </button>
-          <button
-            type='button'
-            className='btn-solid-red flex-1'
-            onClick={handleClickBuy}
-          >
-            Beli
+        <div className='flex items-end mb-2'>
+          {product.manufacture?.name ? (
+            <Link
+              href={createSlug(
+                '/shop/brands/',
+                product.manufacture?.name,
+                product.manufacture?.id
+              )}
+            >
+              {product.manufacture?.name}
+            </Link>
+          ) : (
+            <div>-</div>
+          )}
+          <button type='button' className='ml-auto' onClick={toggleWishlist}>
+            {wishlist.data?.productTotal > 0 ? (
+              <HeartIcon className='w-6 fill-danger-500 text-danger-500' />
+            ) : (
+              <HeartIcon className='w-6' />
+            )}
           </button>
         </div>
-        <Button
-          onClick={() => handleButton(product.id)}
-          color={'red'}
-          colorScheme='white'
-          className='w-full border-2 p-2 gap-1 mt-2 hover:bg-slate-100 flex items-center'
-        >
-          <ImageNext
-            src='/images/writing.png'
-            alt='penawaran instan'
-            className=''
-            width={25}
-            height={25}
-          />
-          Penawaran Harga Instan
-        </Button>
+        <h1 className='font-medium text-h-lg leading-8 md:text-title-md md:leading-10 mb-3'>
+          {activeVariant?.name}
+        </h1>
       </div>
 
       <Divider />
diff --git a/src/lib/transaction/api/checkoutPoApi.js b/src/lib/transaction/api/checkoutPoApi.js
index 04421368..3376e773 100644
--- a/src/lib/transaction/api/checkoutPoApi.js
+++ b/src/lib/transaction/api/checkoutPoApi.js
@@ -1,13 +1,14 @@
-import odooApi from '@/core/api/odooApi'
-import { getAuth } from '@/core/utils/auth'
+import odooApi from '@/core/api/odooApi';
+import { getAuth } from '@/core/utils/auth';
 
-const checkoutPoApi = async ({ id }) => {
-  const auth = getAuth()
+const checkoutPoApi = async ({ id, status }) => {
+  const auth = getAuth();
   const dataCheckout = await odooApi(
     'POST',
-    `/api/v1/partner/${auth?.partnerId}/sale_order/${id}/checkout`
-  )
-  return dataCheckout
-}
+    `/api/v1/partner/${auth?.partnerId}/sale_order/${id}/checkout`,
+    { status }
+  );
+  return dataCheckout;
+};
 
-export default checkoutPoApi
+export default checkoutPoApi;
diff --git a/src/lib/transaction/components/Transaction.jsx b/src/lib/transaction/components/Transaction.jsx
index 93887f4d..f5dc507a 100644
--- a/src/lib/transaction/components/Transaction.jsx
+++ b/src/lib/transaction/components/Transaction.jsx
@@ -38,7 +38,9 @@ import aprpoveApi from '../api/approveApi';
 import rejectApi from '../api/rejectApi';
 import rejectProductApi from '../api/rejectProductApi';
 import { useRouter } from 'next/router';
-
+import { gtagPurchase } from '@/core/utils/googleTag';
+import { deleteItemCart } from '@/core/utils/cart';
+import axios from 'axios';
 const Transaction = ({ id }) => {
   const router = useRouter();
   const [isModalOpen, setIsModalOpen] = useState(false);
@@ -47,7 +49,7 @@ const Transaction = ({ id }) => {
   const auth = useAuth();
   const { transaction } = useTransaction({ id });
   const statusApprovalWeb = transaction.data?.approvalStep;
-
+  const [isLoading, setIsLoading] = useState(false);
   const { queryAirwayBill } = useAirwayBill({ orderId: id });
   const [airwayBillPopup, setAirwayBillPopup] = useState(null);
 
@@ -83,8 +85,26 @@ const Transaction = ({ id }) => {
   };
 
   const [cancelTransaction, setCancelTransaction] = useState(false);
+  const [continueNoPo, setContinueNoPo] = useState(false);
+  const [continueTransaction, setContinueTransaction] = useState(false);
   const openCancelTransaction = () => setCancelTransaction(true);
+  const openContinueTransaction = () => {
+    if (auth.partnerTempo) {
+      checkout();
+    } else {
+      if (!transaction.data?.purchaseOrderFile) {
+        setContinueTransaction(true);
+      } else {
+        checkoutNoPO();
+      }
+    }
+  };
+  // const ContinueTransaction = () => {
+  //   setContinueNoPo(true);
+  //   checkoutNoPO();
+  // };
   const closeCancelTransaction = () => setCancelTransaction(false);
+  const closeContinueTransaction = () => setContinueTransaction(false);
 
   const [rejectTransaction, setRejectTransaction] = useState(false);
 
@@ -100,15 +120,70 @@ const Transaction = ({ id }) => {
     }
     closeCancelTransaction();
   };
-
   const checkout = async () => {
     if (!transaction.data?.purchaseOrderFile) {
       toast.error('Mohon upload dokumen PO anda sebelum melanjutkan pesanan');
       return;
     }
-    await checkoutPoApi({ id });
+    await checkoutPoApi({ id, status: true });
+    toast.success('Berhasil melanjutkan pesanan');
+    transaction.refetch();
+  };
+
+  const checkoutNoPO = async () => {
+    setIsLoading(true);
+    gtagPurchase(
+      transaction.data.products,
+      transaction.data.deliveryAmount,
+      transaction.data.name
+    );
+
+    gtag('event', 'conversion', {
+      send_to: 'AW-954540379/nDymCL3BhaQYENvClMcD',
+      value:
+        transaction.data?.amountTotal +
+        Math.round(parseInt(transaction.data.deliveryAmount * 1.1) / 1000) *
+          1000,
+      currency: 'IDR',
+      transaction_id: transaction.data.id,
+    });
+
+    for (const product of transaction.data.products)
+      deleteItemCart({ productId: product.id });
+    if (transaction.data?.amountTotal > 0) {
+      const payment = await axios.post(
+        `${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/midtrans-payment?transactionId=${transaction.data.id}`
+      );
+      setIsLoading(false);
+      window.location.href = payment.data.redirectUrl;
+    } else {
+      window.location.href = `${
+        process.env.NEXT_PUBLIC_SELF_HOST
+      }/shop/checkout/success?order_id=${transaction.data.name.replace(
+        /\//g,
+        '-'
+      )}`;
+    }
     toast.success('Berhasil melanjutkan pesanan');
     transaction.refetch();
+
+    /* const midtrans = async () => {
+        for (const product of products) deleteItemCart({ productId: product.id });
+        if (grandTotal > 0) {
+          const payment = await axios.post(
+            `${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/midtrans-payment?transactionId=${isCheckouted.id}`
+          );
+          setIsLoading(false);
+          window.location.href = payment.data.redirectUrl;
+        } else {
+          window.location.href = `${
+            process.env.NEXT_PUBLIC_SELF_HOST
+          }/shop/checkout/success?order_id=${isCheckouted.name.replace(
+            /\//g,
+            '-'
+          )}`;
+        }
+      };*/
   };
 
   const handleApproval = async () => {
@@ -207,6 +282,32 @@ const Transaction = ({ id }) => {
     transaction.data?.name && (
       <>
         <BottomPopup
+          active={continueTransaction}
+          close={closeContinueTransaction}
+          title='Lanjutkan Transaksi'
+        >
+          <div className='leading-7 text-gray_r-12/80'>
+            Apakah anda yakin melanjutkan tanpa upload PO?{' '}
+            <span className='underline'>{transaction.data?.name}</span>?
+          </div>
+          <div className='flex justify-end mt-6 gap-x-4'>
+            <button
+              className='btn-solid-red w-full md:w-fit'
+              type='button'
+              onClick={checkoutNoPO}
+            >
+              Ya, Lanjutkan
+            </button>
+            <button
+              className='btn-light w-full md:w-fit'
+              type='button'
+              onClick={closeContinueTransaction}
+            >
+              Batal
+            </button>
+          </div>
+        </BottomPopup>
+        <BottomPopup
           active={cancelTransaction}
           close={closeCancelTransaction}
           title='Batalkan Transaksi'
@@ -468,7 +569,10 @@ const Transaction = ({ id }) => {
               )}
             {transaction.data?.status == 'draft' &&
               !auth?.feature?.soApproval && (
-                <button className='btn-yellow w-full mt-4' onClick={checkout}>
+                <button
+                  className='btn-yellow w-full mt-4'
+                  onClick={openContinueTransaction}
+                >
                   Lanjutkan Transaksi
                 </button>
               )}
@@ -562,7 +666,10 @@ const Transaction = ({ id }) => {
                   )}
                 {transaction.data?.status == 'draft' &&
                   !auth?.feature.soApproval && (
-                    <button className='btn-yellow' onClick={checkout}>
+                    <button
+                      className='btn-yellow'
+                      onClick={openContinueTransaction}
+                    >
                       Lanjutkan Transaksi
                     </button>
                   )}
diff --git a/src/lib/treckingAwb/component/Manifest.jsx b/src/lib/treckingAwb/component/Manifest.jsx
index fbc95702..87e01e38 100644
--- a/src/lib/treckingAwb/component/Manifest.jsx
+++ b/src/lib/treckingAwb/component/Manifest.jsx
@@ -1,16 +1,15 @@
-import odooApi from '@/core/api/odooApi'
-import BottomPopup from '@/core/components/elements/Popup/BottomPopup'
-import LogoSpinner from '@/core/components/elements/Spinner/LogoSpinner'
-import { getAuth } from '@/core/utils/auth'
-import { useEffect, useState } from 'react'
-import { toast } from 'react-hot-toast'
-import ImageNext from 'next/image'
-import { list } from 'postcss'
+import odooApi from '@/core/api/odooApi';
+import BottomPopup from '@/core/components/elements/Popup/BottomPopup';
+import LogoSpinner from '@/core/components/elements/Spinner/LogoSpinner';
+import { getAuth } from '@/core/utils/auth';
+import { useEffect, useState } from 'react';
+import { toast } from 'react-hot-toast';
+import ImageNext from 'next/image';
+import { list } from 'postcss';
 
 const Manifest = ({ idAWB, closePopup }) => {
-  const [manifests, setManifests] = useState(null)
-  const [isLoading, setIsLoading] = useState(false)
-
+  const [manifests, setManifests] = useState(null);
+  const [isLoading, setIsLoading] = useState(false);
   const formatCustomDate = (date) => {
     const months = [
       'Jan',
@@ -24,61 +23,60 @@ const Manifest = ({ idAWB, closePopup }) => {
       'Sep',
       'Oct',
       'Nov',
-      'Dec'
-    ]
+      'Dec',
+    ];
 
-    const parts = date.split(' ') // Pisahkan tanggal dan waktu
-    const [datePart, timePart] = parts
-    const [yyyy, mm, dd] = datePart.split('-')
-    const [hh, min] = timePart.split(':')
+    const parts = date.split(' '); // Pisahkan tanggal dan waktu
+    const [datePart, timePart] = parts;
+    const [yyyy, mm, dd] = datePart.split('-');
+    const [hh, min] = timePart.split(':');
 
-    const monthAbbreviation = months[parseInt(mm, 10) - 1]
+    const monthAbbreviation = months[parseInt(mm, 10) - 1];
 
-    return `${dd} ${monthAbbreviation} ${hh}:${min}`
-  }
+    return `${dd} ${monthAbbreviation} ${hh}:${min}`;
+  };
 
   const getManifest = async () => {
-    setIsLoading(true)
-    const auth = getAuth()
-    let list
-    if(auth){
+    setIsLoading(true);
+    const auth = getAuth();
+    let list;
+    if (auth) {
       list = await odooApi(
         'GET',
         `/api/v1/partner/${auth.partnerId}/stock-picking/${idAWB}/tracking`
-      )
-    }else{
-      list = await odooApi(
-        'GET',
-        `/api/v1/stock-picking/${idAWB}/tracking`
-      )
+      );
+    } else {
+      list = await odooApi('GET', `/api/v1/stock-picking/${idAWB}/tracking`);
     }
-    setManifests(list)
-    setIsLoading(false)
-  }
+    setManifests(list);
+    setIsLoading(false);
+  };
 
   useEffect(() => {
     if (idAWB) {
-      getManifest()
+      getManifest();
     } else {
-      setManifests(null)
+      setManifests(null);
     }
-  }, [idAWB])
+  }, [idAWB]);
 
-  const [copied, setCopied] = useState(false)
+  const [copied, setCopied] = useState(false);
 
   const handleCopyClick = () => {
-    const textToCopy = manifests?.waybillNumber
-    navigator.clipboard.writeText(textToCopy)
-    setCopied(true)
-    toast.success('No Resi Berhasil di Copy')
-    setTimeout(() => setCopied(false), 2000) // Reset copied state after 2 seconds
-  }
+    const textToCopy = manifests?.waybillNumber;
+    navigator.clipboard.writeText(textToCopy);
+    setCopied(true);
+    toast.success('No Resi Berhasil di Copy');
+    setTimeout(() => setCopied(false), 2000); // Reset copied state after 2 seconds
+  };
 
   return (
     <>
       {isLoading && (
         <BottomPopup active={true} close=''>
-          <div className='leading-7 text-gray_r-12/80 flex justify-center'>Mohon Tunggu</div>
+          <div className='leading-7 text-gray_r-12/80 flex justify-center'>
+            Mohon Tunggu
+          </div>
           <div className='container flex justify-center my-4'>
             <LogoSpinner width={48} height={48} />
           </div>
@@ -111,11 +109,14 @@ const Manifest = ({ idAWB, closePopup }) => {
           </div>
           <div className=''>
             <h1 className='text-body-1'>
-              Estimasi tiba pada <span className='text-gray_r-11 text-sm'>({manifests?.eta})</span>
+              Estimasi tiba pada{' '}
+              <span className='text-gray_r-11 text-sm'>({manifests?.eta})</span>
             </h1>
             <h1 className='text-sm mt-2 mb-3'>
               Dikirim Menggunakan{' '}
-              <span className='text-red-500 font-semibold'>{manifests?.deliveryOrder.carrier}</span>
+              <span className='text-red-500 font-semibold'>
+                {manifests?.deliveryOrder.carrier}
+              </span>
             </h1>
             {manifests?.waybillNumber && (
               <div className='flex justify-between items-center'>
@@ -154,10 +155,16 @@ const Manifest = ({ idAWB, closePopup }) => {
                     {manifests.delivered == true && index == 0 ? (
                       <div
                         class={`absolute w-6 h-6 rounded-full mt-1.5 -left-3 border ${
-                          index == 0 ? 'bg-green-100 border-green-100' : 'bg-gray_r-7 border-white'
+                          index == 0
+                            ? 'bg-green-100 border-green-100'
+                            : 'bg-gray_r-7 border-white'
                         }`}
                       >
-                        <ImageNext src='/images/open-box(1).svg' width={30} height={20} />
+                        <ImageNext
+                          src='/images/open-box(1).svg'
+                          width={30}
+                          height={20}
+                        />
                       </div>
                     ) : (
                       <div
@@ -167,7 +174,9 @@ const Manifest = ({ idAWB, closePopup }) => {
                     {manifests.delivered != true && (
                       <div
                         class={`absolute w-3 h-3 rounded-full mt-1.5 -left-1.5 border ${
-                          index == 0 ? 'bg-green-600 border-green-600' : 'bg-gray_r-7 border-white'
+                          index == 0
+                            ? 'bg-green-600 border-green-600'
+                            : 'bg-gray_r-7 border-white'
                         } `}
                       />
                     )}
@@ -176,9 +185,15 @@ const Manifest = ({ idAWB, closePopup }) => {
                       {formatCustomDate(manifest.datetime)}
                     </time>
                     {manifests.delivered == true && index == 0 && (
-                      <p class={`leading-6 font-semibold text-sm text-green-600 `}>Sudah Sampai</p>
+                      <p
+                        class={`leading-6 font-semibold text-sm text-green-600 `}
+                      >
+                        Sudah Sampai
+                      </p>
                     )}
-                    <p class={`leading-6 text-[12px] text-gray_r-11`}>{manifest.description}</p>
+                    <p class={`leading-6 text-[12px] text-gray_r-11`}>
+                      {manifest.description}
+                    </p>
                   </li>
                 </>
               ))}
@@ -187,7 +202,7 @@ const Manifest = ({ idAWB, closePopup }) => {
         </BottomPopup>
       )}
     </>
-  )
-}
+  );
+};
 
-export default Manifest
+export default Manifest;