From e07a57651649cb2493e5b00a361797cf1392a186 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 1 Aug 2024 11:59:26 +0700
Subject: <iman> update template switch

---
 .../components/Product/ProductDesktopVariant.jsx   | 66 ++++++++++++++++++--
 .../components/Product/ProductMobileVariant.jsx    | 71 +++++++++++++++++++---
 2 files changed, 123 insertions(+), 14 deletions(-)

(limited to 'src/lib/product/components')

diff --git a/src/lib/product/components/Product/ProductDesktopVariant.jsx b/src/lib/product/components/Product/ProductDesktopVariant.jsx
index 09b30a44..882673f4 100644
--- a/src/lib/product/components/Product/ProductDesktopVariant.jsx
+++ b/src/lib/product/components/Product/ProductDesktopVariant.jsx
@@ -6,6 +6,11 @@ import { useRouter } from 'next/router';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { toast } from 'react-hot-toast';
 import LazyLoad from 'react-lazy-load';
+import { Button } from '@chakra-ui/react'
+import { MessageCircleIcon, Share2Icon } from 'lucide-react'
+import AddToWishlist from '../../../../../src-migrate/modules/product-detail/components/AddToWishlist'
+import { RWebShare } from 'react-web-share'
+// import Link from 'next/link'
 
 import { useProductCartContext } from '@/contexts/ProductCartContext';
 import odooApi from '@/core/api/odooApi';
@@ -18,11 +23,14 @@ import { updateItemCart } from '@/core/utils/cart';
 import currencyFormat from '@/core/utils/currencyFormat';
 import { createSlug } from '@/core/utils/slug';
 import whatsappUrl from '@/core/utils/whatsappUrl';
+import Breadcrumb from '../../../../../src-migrate/modules/product-detail/components/Breadcrumb';
 
 import productSimilarApi from '../../api/productSimilarApi';
 import ProductCard from '../ProductCard';
 import ProductSimilar from '../ProductSimilar';
 
+const SELF_HOST = process.env.NEXT_PUBLIC_SELF_HOST
+
 const ProductDesktopVariant = ({
   product,
   wishlist,
@@ -32,7 +40,7 @@ const ProductDesktopVariant = ({
   const router = useRouter();
   const auth = useAuth();
   const { slug } = router.query;
-
+  const [ askAdminUrl, setAskAdminUrl ] = useState()
   const [lowestPrice, setLowestPrice] = useState(null);
 
   const [addCartAlert, setAddCartAlert] = useState(false);
@@ -53,6 +61,20 @@ const ProductDesktopVariant = ({
     setLowestPrice(lowest);
   }, [getLowestPrice]);
 
+  useEffect(() => {
+    const createdAskUrl = whatsappUrl({
+      template: 'product',
+      payload: {
+        manufacture: product.manufacture.name,
+        productName: product.name,
+        url: process.env.NEXT_PUBLIC_SELF_HOST + router.asPath
+      },
+      fallbackUrl: router.asPath
+    })
+
+    setAskAdminUrl(createdAskUrl)
+  }, [router.asPath, product.manufacture.name, product.name, setAskAdminUrl])
+
   const [informationTab, setInformationTab] = useState(
     informationTabOptions[0].value
   );
@@ -154,6 +176,7 @@ const ProductDesktopVariant = ({
   return (
     <DesktopView>
       <div className='container mx-auto pt-10'>
+        <Breadcrumb productId={product.id} productName={product.name} />
         <div className='flex'>
           <div className='w-full flex flex-wrap'>
             <div className='w-5/12'>
@@ -263,9 +286,42 @@ const ProductDesktopVariant = ({
                   </div>
                 </div>
               </div>
+              <div className='h-6' />
+              <div className="flex gap-x-5">
+                  <Button
+                    as={Link}
+                    href={askAdminUrl}
+                    variant='link'
+                    target='_blank'
+                    colorScheme='gray'
+                    leftIcon={<MessageCircleIcon size={18} />}
+                  >
+                    Ask Admin
+                  </Button>
+
+                  <AddToWishlist productId={product.id} />
+
+                  <RWebShare
+                    data={{
+                      text: 'Check out this product',
+                      title: `${product.name} - Indoteknik.com`,
+                      url: SELF_HOST + router.asPath
+                    }}
+                  >
+                    <Button
+                      variant='link'
+                      colorScheme='gray'
+                      leftIcon={<Share2Icon size={18} />}
+                    >
+                      Share
+                    </Button>
+                  </RWebShare>
+                </div>
             </div>
+            
 
-            <div className='p-4 md:p-6 md:bg-gray-50 rounded-xl'>
+
+            <div className='p-4 md:p-6 md:bg-gray-50 rounded-xl w-[99%]'>
               <h2 className='text-h-md md:text-h-lg font-medium'>Informasi Produk</h2>
               <div className='h-4' />
               <div
@@ -279,7 +335,7 @@ const ProductDesktopVariant = ({
               />
             </div>
           </div>
-          <div className='w-[25%]'>
+          <div className='w-[35%]'>
             {product?.isFlashsale > 0 &&
             product?.price?.discountPercentage > 0 ? (
               <>
@@ -359,7 +415,7 @@ const ProductDesktopVariant = ({
                 Beli
               </button>
             </div>
-            <div className='flex mt-4'>
+            {/* <div className='flex mt-4'>
               <button
                 className='flex items-center gap-x-1'
                 onClick={toggleWishlist}
@@ -371,7 +427,7 @@ const ProductDesktopVariant = ({
                 )}
                 Wishlist
               </button>
-            </div>
+            </div> */}
             <div className='border border-gray_r-6 overflow-auto mt-4'>
               <div className='font-medium text-center p-4 bg-gray_r-1 border-b border-gray_r-6 sticky top-0 z-10'>
                 Produk Serupa
diff --git a/src/lib/product/components/Product/ProductMobileVariant.jsx b/src/lib/product/components/Product/ProductMobileVariant.jsx
index af9e52bb..ce836d5b 100644
--- a/src/lib/product/components/Product/ProductMobileVariant.jsx
+++ b/src/lib/product/components/Product/ProductMobileVariant.jsx
@@ -16,9 +16,15 @@ import currencyFormat from '@/core/utils/currencyFormat';
 import { gtagAddToCart } from '@/core/utils/googleTag';
 import { createSlug } from '@/core/utils/slug';
 import whatsappUrl from '@/core/utils/whatsappUrl';
-
+import Breadcrumb from '../../../../../src-migrate/modules/product-detail/components/Breadcrumb';
+import { Button } from '@chakra-ui/react'
+import { MessageCircleIcon, Share2Icon } from 'lucide-react'
+import AddToWishlist from '../../../../../src-migrate/modules/product-detail/components/AddToWishlist'
+import { RWebShare } from 'react-web-share'
 import ProductSimilar from '../ProductSimilar';
 
+const SELF_HOST = process.env.NEXT_PUBLIC_SELF_HOST
+
 const ProductMobileVariant = ({ product, wishlist, toggleWishlist }) => {
   const router = useRouter();
 
@@ -28,7 +34,7 @@ const ProductMobileVariant = ({ product, wishlist, toggleWishlist }) => {
     informationTabOptions[0].value
   );
   const [addCartAlert, setAddCartAlert] = useState(false);
-
+  const [ askAdminUrl, setAskAdminUrl ] = useState()
   const [isLoadingSLA, setIsLoadingSLA] = useState(true);
 
   const getLowestPrice = () => {
@@ -60,6 +66,20 @@ const ProductMobileVariant = ({ product, wishlist, toggleWishlist }) => {
     }
   }, [selectedVariant, product]);
 
+  useEffect(() => {
+    const createdAskUrl = whatsappUrl({
+      template: 'product',
+      payload: {
+        manufacture: product.manufacture.name,
+        productName: product.name,
+        url: process.env.NEXT_PUBLIC_SELF_HOST + router.asPath
+      },
+      fallbackUrl: router.asPath
+    })
+
+    setAskAdminUrl(createdAskUrl)
+  }, [router.asPath, product.manufacture.name, product.name, setAskAdminUrl])
+
   const validAction = () => {
     let isValid = true;
     if (!selectedVariant) {
@@ -120,14 +140,17 @@ const ProductMobileVariant = ({ product, wishlist, toggleWishlist }) => {
 
   return (
     <MobileView>
+      <div className='p-4'>
+        <Breadcrumb id={product.id} name={product.name} />
+      </div>
       <Image
         src={product.image + '?variant=True'}
         alt={product.name}
-        className='h-72 object-contain object-center w-full border-b border-gray_r-4'
+        className='h-72 object-contain mt-4 object-center w-full border-b border-gray_r-4'
       />
 
       <div className='p-4'>
-        <div className='flex items-end mb-2'>
+        <div className='flex items-center mb-2'>
           {product.manufacture?.name ? (
             <Link
               href={createSlug(
@@ -141,15 +164,45 @@ const ProductMobileVariant = ({ product, wishlist, toggleWishlist }) => {
           ) : (
             <div>-</div>
           )}
-          <button type='button' className='ml-auto' onClick={toggleWishlist}>
+          <div className="ml-2 flex gap-x-5">
+                  <Button
+                    as={Link}
+                    href={askAdminUrl}
+                    variant='link'
+                    target='_blank'
+                    colorScheme='gray'
+                    leftIcon={<MessageCircleIcon size={18} />}
+                  >
+                    Ask Admin
+                  </Button>
+
+                  <AddToWishlist productId={product.id} />
+
+                  <RWebShare
+                    data={{
+                      text: 'Check out this product',
+                      title: `${product.name} - Indoteknik.com`,
+                      url: SELF_HOST + router.asPath
+                    }}
+                  >
+                    <Button
+                      variant='link'
+                      colorScheme='gray'
+                      leftIcon={<Share2Icon size={18} />}
+                    >
+                      Share
+                    </Button>
+                  </RWebShare>
+                </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>
+          </button> */}
         </div>
-        <h1 className='leading-6 font-medium mb-3'>{activeVariant?.name}</h1>
+        <h1 className='font-medium text-h-lg leading-8 md:text-title-md md:leading-10 mb-3'>{activeVariant?.name}</h1>
 
         {activeVariant.isFlashSale &&
         activeVariant?.price?.discountPercentage > 0 ? (
@@ -173,11 +226,11 @@ const ProductMobileVariant = ({ product, wishlist, toggleWishlist }) => {
             </div>
           </>
         ) : (
-          <h3 className='text-danger-500 font-semibold mt-1'>
+          <h3 className='font-medium text-danger-500 text-title-md mt-1'>
             {activeVariant?.price?.price > 0 ? (
               <>
                 {currencyFormat(activeVariant?.price?.price)}
-                <div className='text-gray_r-9 text-base font-normal mt-1'>
+                <div className='text-gray_r-9 text-base font-medium mt-1'>
                   Termasuk PPN:{' '}
                   {currencyFormat(
                     activeVariant?.price.price * process.env.NEXT_PUBLIC_PPN
-- 
cgit v1.2.3


From 085dcb058ef4b92cea8b4044e65dd940580f3f42 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 7 Aug 2024 15:26:32 +0700
Subject: <iman> merge all promotion

---
 src/lib/product/components/ProductCard.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/lib/product/components')

diff --git a/src/lib/product/components/ProductCard.jsx b/src/lib/product/components/ProductCard.jsx
index 94db144d..35e2a665 100644
--- a/src/lib/product/components/ProductCard.jsx
+++ b/src/lib/product/components/ProductCard.jsx
@@ -17,8 +17,8 @@ const ProductCard = ({ product, simpleTitle, variant = 'vertical' }) => {
   const [discount, setDiscount] = useState(0);
 
   let voucherPastiHemat = 0;
-
-  if (product?.voucherPastiHemat?.length > 0) {
+  
+  if (product?.voucherPastiHemat ? product?.voucherPastiHemat.length : voucherPastiHemat > 0) {
     const stringVoucher = product?.voucherPastiHemat[0];
     const validJsonString = stringVoucher.replace(/'/g, '"');
     voucherPastiHemat = JSON.parse(validJsonString);
-- 
cgit v1.2.3


From e33a7e612a3c2c871f6a0a84d0d04d6f6ddc357a Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 9 Aug 2024 10:51:10 +0700
Subject: <iman> update template switch & delete console log

---
 .../components/Product/ProductDesktopVariant.jsx        | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

(limited to 'src/lib/product/components')

diff --git a/src/lib/product/components/Product/ProductDesktopVariant.jsx b/src/lib/product/components/Product/ProductDesktopVariant.jsx
index 882673f4..b8ec0580 100644
--- a/src/lib/product/components/Product/ProductDesktopVariant.jsx
+++ b/src/lib/product/components/Product/ProductDesktopVariant.jsx
@@ -176,7 +176,7 @@ const ProductDesktopVariant = ({
   return (
     <DesktopView>
       <div className='container mx-auto pt-10'>
-        <Breadcrumb productId={product.id} productName={product.name} />
+        <Breadcrumb id={product.id} name={product.parent.name} />
         <div className='flex'>
           <div className='w-full flex flex-wrap'>
             <div className='w-5/12'>
@@ -415,24 +415,11 @@ const ProductDesktopVariant = ({
                 Beli
               </button>
             </div>
-            {/* <div className='flex mt-4'>
-              <button
-                className='flex items-center gap-x-1'
-                onClick={toggleWishlist}
-              >
-                {wishlist.data?.productTotal > 0 ? (
-                  <HeartIcon className='w-6 fill-danger-500 text-danger-500' />
-                ) : (
-                  <HeartIcon className='w-6' />
-                )}
-                Wishlist
-              </button>
-            </div> */}
             <div className='border border-gray_r-6 overflow-auto mt-4'>
               <div className='font-medium text-center p-4 bg-gray_r-1 border-b border-gray_r-6 sticky top-0 z-10'>
                 Produk Serupa
               </div>
-              <div className='h-full divide-y divide-gray_r-6 max-h-96'>
+              <div className='h-full divide-y divide-gray_r-6 max-h-[500px]'>
                 {productSimilarInBrand &&
                   productSimilarInBrand?.map((product) => (
                     <div className='py-2' key={product.id}>
-- 
cgit v1.2.3


From 4fb570559e293d506819059ce42836562a2fb4d2 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 15 Aug 2024 14:20:30 +0700
Subject: <iman> update search product using name

---
 src/lib/product/components/Product/ProductDesktopVariant.jsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/lib/product/components')

diff --git a/src/lib/product/components/Product/ProductDesktopVariant.jsx b/src/lib/product/components/Product/ProductDesktopVariant.jsx
index b8ec0580..c8a5a205 100644
--- a/src/lib/product/components/Product/ProductDesktopVariant.jsx
+++ b/src/lib/product/components/Product/ProductDesktopVariant.jsx
@@ -137,20 +137,25 @@ const ProductDesktopVariant = ({
       });
     }
   };
+  const regex = /\b(?![A-Z\s]+\b)[A-Za-z\s]+\b/g;
+  const matches = product?.parent?.name?.match(regex);
 
+  const extractedName = matches ? matches.join(' ').trim() : '';
+  console.log("extractedName",extractedName)
   const productSimilarQuery = [
     product?.name,
     `fq=-product_id_i:${product.id}`,
     `fq=-manufacture_id_i:${product.manufacture?.id || 0}`,
   ].join('&');
-
+  
   const [productSimilarInBrand, setProductSimilarInBrand] = useState(null);
-
+  
   useEffect(() => {
     const loadProductSimilarInBrand = async () => {
       const productSimilarQuery = [
         product?.name,
         `fq=-product_id_i:${product.id}`,
+        `fq=display_name_s:${extractedName}`,
       ].join('&');
       const dataProductSimilar = await productSimilarApi({
         query: productSimilarQuery,
-- 
cgit v1.2.3


From a20fd43f0cafe86444605c3bb8f2a998e1b9dbe6 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 19 Aug 2024 11:03:58 +0700
Subject: <iman> update link lihat semua non display voucher

---
 src/lib/product/components/ProductFilter.jsx        |  1 +
 src/lib/product/components/ProductFilterDesktop.jsx |  1 +
 src/lib/product/components/ProductSearch.jsx        | 18 ++++++++++++++++++
 3 files changed, 20 insertions(+)

(limited to 'src/lib/product/components')

diff --git a/src/lib/product/components/ProductFilter.jsx b/src/lib/product/components/ProductFilter.jsx
index d52fcb90..dd9ec8f4 100644
--- a/src/lib/product/components/ProductFilter.jsx
+++ b/src/lib/product/components/ProductFilter.jsx
@@ -62,6 +62,7 @@ const ProductFilter = ({ active, close, brands, categories, prefixUrl, defaultBr
 
   const handleSubmit = () => {
     let params = {
+      penawaran: router.query.penawaran,
       q: router.query.q,
       orderBy: order,
       brand,
diff --git a/src/lib/product/components/ProductFilterDesktop.jsx b/src/lib/product/components/ProductFilterDesktop.jsx
index a8073036..2bdf962a 100644
--- a/src/lib/product/components/ProductFilterDesktop.jsx
+++ b/src/lib/product/components/ProductFilterDesktop.jsx
@@ -93,6 +93,7 @@ const ProductFilterDesktop = ({ brands, categories, prefixUrl, defaultBrand = nu
 
   const handleSubmit = () => {
     let params = {
+      penawaran: router.query.penawaran,
       q: router.query.q,
       orderBy: order,
       brand: brandValues.join(','),
diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index fb9017f4..09727e81 100644
--- a/src/lib/product/components/ProductSearch.jsx
+++ b/src/lib/product/components/ProductSearch.jsx
@@ -40,6 +40,24 @@ const ProductSearch = ({
   const [limit, setLimit] = useState(query?.limit || 30);
   const [orderBy, setOrderBy] = useState(router.query?.orderBy);
   if (defaultBrand) query.brand = defaultBrand.toLowerCase();
+
+  useEffect(() => {
+    const checkIfPenawaran = async () => {
+      if (router.asPath.includes('penawaran')) {
+        query = {
+          ...query,
+          fq: [
+            `-flashsale_id_i:${router.query.penawaran}`,
+            `flashsale_price_f:[1 TO *]`
+          ],
+          orderBy: 'flashsale-discount-desc'
+        };
+        setOrderBy('flashsale-discount-desc')
+      }
+    };
+    checkIfPenawaran();
+  }, [router]);
+  
   const { productSearch } = useProductSearch({
     query: { ...query, q, limit, orderBy },
     operation: 'AND',
-- 
cgit v1.2.3


From b4101696955b2573a5b259d6166c9e950f33d992 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 19 Aug 2024 11:09:50 +0700
Subject: <iman> update flash sale non display

---
 src/lib/product/components/ProductSearch.jsx | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/lib/product/components')

diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index 09727e81..994efce0 100644
--- a/src/lib/product/components/ProductSearch.jsx
+++ b/src/lib/product/components/ProductSearch.jsx
@@ -239,6 +239,7 @@ const ProductSearch = ({
 
   const handleDeleteFilter = async (source, value) => {
     let params = {
+      penawaran: router.query.penawaran,
       q: router.query.q,
       orderBy: orderBy,
       brand: brandValues.join(','),
@@ -266,6 +267,7 @@ const ProductSearch = ({
         break;
       case 'delete':
         params = {
+          penawaran: router.query.penawaran,
           q: router.query.q,
           orderBy: orderBy,
         };
-- 
cgit v1.2.3


From dcfd0995a4fe85d947a96f3fffd54914a1e2e171 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 19 Aug 2024 11:14:59 +0700
Subject: <iman> merge product search development into all promo

---
 src/lib/product/components/ProductSearch.jsx | 145 +++++++++++++++++++++++++--
 1 file changed, 135 insertions(+), 10 deletions(-)

(limited to 'src/lib/product/components')

diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index 994efce0..42ea94d5 100644
--- a/src/lib/product/components/ProductSearch.jsx
+++ b/src/lib/product/components/ProductSearch.jsx
@@ -26,6 +26,10 @@ import ProductSearchSkeleton from './Skeleton/ProductSearchSkeleton';
 
 import SideBanner from '~/modules/side-banner';
 import FooterBanner from '~/modules/footer-banner';
+import CategorySection from './CategorySection';
+import LobSectionCategory from './LobSectionCategory';
+import { getIdFromSlug } from '@/core/utils/slug'
+import { data } from 'autoprefixer';
 
 const ProductSearch = ({
   query,
@@ -37,9 +41,107 @@ const ProductSearch = ({
   const { page = 1 } = query;
   const [q, setQ] = useState(query?.q || '*');
   const [search, setSearch] = useState(query?.q || '*');
+  const [finalQuery, setFinalQuery] = useState({});
+  const [queryFinal, setQueryFinal] = useState({});
+  const [dataCategoriesProduct, setDataCategoriesProduct] = useState([])
+  const [dataCategoriesLob, setDataCategoriesLob] = useState([])
+  const categoryId = getIdFromSlug(prefixUrl)
+  const [data, setData] = useState([])
+  const [dataLob, setDataLob] = useState([]);
   const [limit, setLimit] = useState(query?.limit || 30);
   const [orderBy, setOrderBy] = useState(router.query?.orderBy);
   if (defaultBrand) query.brand = defaultBrand.toLowerCase();
+  const dataIdCategories = []
+  useEffect(() => {
+    if(prefixUrl.includes('category')){
+      const loadProduct = async () => {
+        const getCategoriesId = await odooApi('GET', `/api/v1/category/numFound?parent_id=${categoryId}`);
+        if (getCategoriesId) {
+          setDataCategoriesProduct(getCategoriesId);
+        }
+      };
+      loadProduct();
+    }else if(prefixUrl.includes('lob')){
+      const loadProduct = async () => {
+        const lobData = await odooApi('GET', `/api/v1/lob_homepage/${categoryId}/category_id`);
+         
+        if (lobData) {
+          setDataLob(lobData);
+        }
+      };
+      loadProduct();
+      
+    }
+  }, [categoryId]);
+  
+  const collectIds = (category) => {
+    const ids = [];
+    function recurse(cat) {
+      if (cat && cat.id) {
+        ids.push(cat.id);
+      }
+      if (Array.isArray(cat.children)) {
+        cat.children.forEach(recurse);
+      }
+    }
+    recurse(category);
+    return ids;
+  };
+  
+  useEffect(() => {
+    if(prefixUrl.includes('category')){
+      const ids = collectIds(dataCategoriesProduct);
+      const newQuery = {
+        fq: `category_id_ids:(${ids.join(' OR ')})`,
+        page : router.query.page? router.query.page : 1,
+        brand : router.query.brand? router.query.brand : '',
+        category : router.query.category? router.query.category : '',
+        priceFrom : router.query.priceFrom? router.query.priceFrom : '',
+        priceTo : router.query.priceTo? router.query.priceTo : '',
+        limit : router.query.limit? router.query.limit : '',
+        orderBy : router.query.orderBy? router.query.orderBy : ''
+      };
+      setFinalQuery(newQuery);
+    } else if (prefixUrl.includes('lob')){
+      
+      const fetchCategoryData = async () => {
+        if (dataLob[0]?.categoryIds) {
+          
+          for (const cate of dataLob[0].categoryIds) {
+           
+            dataIdCategories.push(cate.childId)
+          }
+          
+        
+          const mergedArray = dataIdCategories.flat();
+         
+          const newQuery = {
+            fq: `category_id_ids:(${mergedArray.join(' OR ')})`,
+            category : router.query.category? router.query.category : '',
+            page : router.query.page? router.query.page : 1,
+            brand : router.query.brand? router.query.brand : '',
+            priceFrom : router.query.priceFrom? router.query.priceFrom : '',
+            priceTo : router.query.priceTo? router.query.priceTo : '',
+            limit : router.query.limit? router.query.limit : '',
+            orderBy : router.query.orderBy? router.query.orderBy : ''
+          };
+       
+          setFinalQuery(newQuery);
+         
+        }
+      };
+      fetchCategoryData();
+    }
+  }, [dataCategoriesProduct, dataLob]);
+
+  useEffect(() => {
+    if (prefixUrl.includes('category') || prefixUrl.includes('lob')) {
+      setQueryFinal({ ...finalQuery, q, limit, orderBy });
+    } else {
+      setQueryFinal({ ...query, q, limit, orderBy });
+    }
+  }, [prefixUrl,dataCategoriesProduct, query, finalQuery]);
+
 
   useEffect(() => {
     const checkIfPenawaran = async () => {
@@ -59,7 +161,7 @@ const ProductSearch = ({
   }, [router]);
   
   const { productSearch } = useProductSearch({
-    query: { ...query, q, limit, orderBy },
+    query: queryFinal,
     operation: 'AND',
   });
   const [products, setProducts] = useState(null);
@@ -71,22 +173,24 @@ const ProductSearch = ({
   const numRows = [30, 50, 80, 100];
   const [brandValues, setBrand] = useState(
     !router.pathname.includes('brands')
-      ? query.brand
-        ? query.brand.split(',')
+      ? router.query.brand
+        ? router.query.brand.split(',')
         : []
       : []
   );
   const [categoryValues, setCategory] = useState(
-    query?.category?.split(',') || []
+    router.query?.category?.split(',') || router.query?.category?.split(',')
   );
-  const [priceFrom, setPriceFrom] = useState(query?.priceFrom || null);
-  const [priceTo, setPriceTo] = useState(query?.priceTo || null);
+  
+  const [priceFrom, setPriceFrom] = useState(router.query?.priceFrom || null);
+  const [priceTo, setPriceTo] = useState(router.query?.priceTo || null);
 
   const pageCount = Math.ceil(productSearch.data?.response.numFound / limit);
   const productStart = productSearch.data?.responseHeader.params.start;
   const productRows = limit;
   const productFound = productSearch.data?.response.numFound;
-
+  const [dataCategories, setDataCategories] = useState([])
+  
   useEffect(() => {
     if (productFound == 0 && query.q && !spellings) {
       searchSpellApi({ query: query.q }).then((response) => {
@@ -116,7 +220,7 @@ const ProductSearch = ({
       });
     }
   }, [productFound, query, spellings]);
-
+  let id = []
   useEffect(() => {
     const checkIfBrand = async () => {
       const brand = await axios(
@@ -133,6 +237,21 @@ const ProductSearch = ({
       checkIfBrand();
     }
   }, [q]);
+ 
+  useEffect(() => {
+    if(prefixUrl.includes('category')){
+      const loadCategories = async () => {
+        const getCategories = await odooApi('GET', `/api/v1/category/child?parent_id=${categoryId}`)
+       if(getCategories){
+        setDataCategories(getCategories)
+       }
+      }
+      loadCategories()
+    }
+  }, [])
+
+
+
 
   const brands = [];
   for (
@@ -243,7 +362,7 @@ const ProductSearch = ({
       q: router.query.q,
       orderBy: orderBy,
       brand: brandValues.join(','),
-      category: categoryValues.join(','),
+      category: categoryValues?.join(','),
       priceFrom,
       priceTo,
     };
@@ -283,7 +402,6 @@ const ProductSearch = ({
   };
 
   const isNotReadyStockPage = router.asPath !== '/shop/search?orderBy=stock';
-
   return (
     <>
       <MobileView>
@@ -344,6 +462,8 @@ const ProductSearch = ({
               SpellingComponent
             )}
           </div>
+          <LobSectionCategory categories={dataLob}/>
+          <CategorySection categories={dataCategories}/>
 
           {productFound > 0 && (
             <div className='flex items-center gap-x-2 mb-5 justify-between'>
@@ -384,6 +504,7 @@ const ProductSearch = ({
             pageCount={pageCount}
             currentPage={parseInt(page)}
             url={`${prefixUrl}?${toQuery(_.omit(query, ['page']))}`}
+            // url={prefixUrl.includes('category') || prefixUrl.includes('lob')? `${prefixUrl}?${toQuery(_.omit(finalQuery, ['page']))}` : `${prefixUrl}?${toQuery(_.omit(query, ['page']))}`}
             className='mt-6 mb-2'
           />
 
@@ -432,7 +553,10 @@ const ProductSearch = ({
 
             <SideBanner />
           </div>
+
           <div className='w-9/12 pl-6'>
+            <LobSectionCategory categories={dataLob}/>
+            <CategorySection categories={dataCategories}/>
             {bannerPromotionHeader && bannerPromotionHeader?.image && (
               <div className='mb-3'>
                 <Image
@@ -570,6 +694,7 @@ const ProductSearch = ({
                 pageCount={pageCount}
                 currentPage={parseInt(page)}
                 url={`${prefixUrl}?${toQuery(_.omit(query, ['page']))}`}
+                // url={prefixUrl.includes('category') || prefixUrl.includes('lob')? `${prefixUrl}?${toQuery(_.omit(finalQuery, ['page']))}` : `${prefixUrl}?${toQuery(_.omit(query, ['page']))}`}
                 className='!justify-end'
               />
             </div>
-- 
cgit v1.2.3


From 5fb7f3fe3488e9d1b4885d9c5ad9720032babb54 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 19 Aug 2024 11:26:23 +0700
Subject: <iman> update

---
 src/lib/product/components/ProductSearch.jsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/lib/product/components')

diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index a427e134..07398795 100644
--- a/src/lib/product/components/ProductSearch.jsx
+++ b/src/lib/product/components/ProductSearch.jsx
@@ -26,8 +26,8 @@ import ProductSearchSkeleton from './Skeleton/ProductSearchSkeleton';
 
 import SideBanner from '~/modules/side-banner';
 import FooterBanner from '~/modules/footer-banner';
-import CategorySection from './CategorySection';
-import LobSectionCategory from './LobSectionCategory';
+// import CategorySection from './CategorySection';
+// import LobSectionCategory from './LobSectionCategory';
 import { getIdFromSlug } from '@/core/utils/slug'
 import { data } from 'autoprefixer';
 
@@ -461,8 +461,8 @@ const ProductSearch = ({
               SpellingComponent
             )}
           </div>
-          <LobSectionCategory categories={dataLob}/>
-          <CategorySection categories={dataCategories}/>
+          {/* <LobSectionCategory categories={dataLob}/>
+          <CategorySection categories={dataCategories}/> */}
 
           {productFound > 0 && (
             <div className='flex items-center gap-x-2 mb-5 justify-between'>
@@ -554,8 +554,8 @@ const ProductSearch = ({
           </div>
 
           <div className='w-9/12 pl-6'>
-            <LobSectionCategory categories={dataLob}/>
-            <CategorySection categories={dataCategories}/>
+            {/* <LobSectionCategory categories={dataLob}/>
+            <CategorySection categories={dataCategories}/> */}
             {bannerPromotionHeader && bannerPromotionHeader?.image && (
               <div className='mb-3'>
                 <Image
-- 
cgit v1.2.3


From 76e798e1266c1d888a97c6f866ae782dd6f0045f Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 19 Aug 2024 14:02:10 +0700
Subject: <iman> update position code

---
 src/lib/product/components/ProductSearch.jsx | 34 +++++++++++++++-------------
 1 file changed, 18 insertions(+), 16 deletions(-)

(limited to 'src/lib/product/components')

diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index 07398795..b799d533 100644
--- a/src/lib/product/components/ProductSearch.jsx
+++ b/src/lib/product/components/ProductSearch.jsx
@@ -52,6 +52,24 @@ const ProductSearch = ({
   const [orderBy, setOrderBy] = useState(router.query?.orderBy);
   if (defaultBrand) query.brand = defaultBrand.toLowerCase();
   const dataIdCategories = []
+
+  useEffect(() => {
+    const checkIfPenawaran = async () => {
+      if (router.asPath.includes('penawaran')) {
+        query = {
+          ...query,
+          fq: [
+            `-flashsale_id_i:${router.query.penawaran}`,
+            `flashsale_price_f:[1 TO *]`
+          ],
+          orderBy: 'flashsale-discount-desc'
+        };
+        setOrderBy('flashsale-discount-desc')
+      }
+    };
+    checkIfPenawaran();
+  }, [router]);
+  
   useEffect(() => {
     if(prefixUrl.includes('category')){
       const loadProduct = async () => {
@@ -142,22 +160,6 @@ const ProductSearch = ({
     }
   }, [prefixUrl,dataCategoriesProduct, query, finalQuery]);
 
-  useEffect(() => {
-    const checkIfPenawaran = async () => {
-      if (router.asPath.includes('penawaran')) {
-        query = {
-          ...query,
-          fq: [
-            `-flashsale_id_i:${router.query.penawaran}`,
-            `flashsale_price_f:[1 TO *]`
-          ],
-          orderBy: 'flashsale-discount-desc'
-        };
-        setOrderBy('flashsale-discount-desc')
-      }
-    };
-    checkIfPenawaran();
-  }, [router]);
 
   const { productSearch } = useProductSearch({
     query: queryFinal,
-- 
cgit v1.2.3


From 3c6c2a888e3ab27b4d5eead34104fd142f82b1ff Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 19 Aug 2024 14:53:22 +0700
Subject: <iman> update order by non flash display

---
 src/lib/product/components/ProductSearch.jsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/lib/product/components')

diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index b799d533..f8b44529 100644
--- a/src/lib/product/components/ProductSearch.jsx
+++ b/src/lib/product/components/ProductSearch.jsx
@@ -53,6 +53,8 @@ const ProductSearch = ({
   if (defaultBrand) query.brand = defaultBrand.toLowerCase();
   const dataIdCategories = []
 
+  console.log('data',router)
+
   useEffect(() => {
     const checkIfPenawaran = async () => {
       if (router.asPath.includes('penawaran')) {
@@ -64,11 +66,13 @@ const ProductSearch = ({
           ],
           orderBy: 'flashsale-discount-desc'
         };
+        console.log('setOrder')
         setOrderBy('flashsale-discount-desc')
+        console.log('orderBy',orderBy)
       }
     };
     checkIfPenawaran();
-  }, [router]);
+  }, [router.query, prefixUrl, q, finalQuery, queryFinal]);
   
   useEffect(() => {
     if(prefixUrl.includes('category')){
@@ -156,9 +160,10 @@ const ProductSearch = ({
     if (prefixUrl.includes('category') || prefixUrl.includes('lob')) {
       setQueryFinal({ ...finalQuery, q, limit, orderBy });
     } else {
+      console.log("data query",orderBy)
       setQueryFinal({ ...query, q, limit, orderBy });
     }
-  }, [prefixUrl,dataCategoriesProduct, query, finalQuery]);
+  }, [prefixUrl,dataCategoriesProduct, query, finalQuery, orderBy]);
 
 
   const { productSearch } = useProductSearch({
-- 
cgit v1.2.3


From 3722093f3a84c7b6700da06b3e176cdca4a22b26 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 19 Aug 2024 14:59:03 +0700
Subject: <iman> delete console log

---
 src/lib/product/components/ProductSearch.jsx | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/lib/product/components')

diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index f8b44529..7c1b0a40 100644
--- a/src/lib/product/components/ProductSearch.jsx
+++ b/src/lib/product/components/ProductSearch.jsx
@@ -53,8 +53,6 @@ const ProductSearch = ({
   if (defaultBrand) query.brand = defaultBrand.toLowerCase();
   const dataIdCategories = []
 
-  console.log('data',router)
-
   useEffect(() => {
     const checkIfPenawaran = async () => {
       if (router.asPath.includes('penawaran')) {
-- 
cgit v1.2.3


From e3ac82b208312c52835ecd73e03beecd9137b55e Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 28 Aug 2024 09:07:51 +0700
Subject: <iman> update font style

---
 src/lib/product/components/ProductCard.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/lib/product/components')

diff --git a/src/lib/product/components/ProductCard.jsx b/src/lib/product/components/ProductCard.jsx
index 35e2a665..c5e82c82 100644
--- a/src/lib/product/components/ProductCard.jsx
+++ b/src/lib/product/components/ProductCard.jsx
@@ -128,7 +128,7 @@ const ProductCard = ({ product, simpleTitle, variant = 'vertical' }) => {
                       width={13}
                       height={5}
                     />
-                    <span className='text-white text-[9px] md:text-[10px] font-semibold'>
+                    <span className='text-white text-[9px] md:text-[10px] text-nowrap font-semibold'>
                       {product?.flashSale?.tag != 'false' ||
                       product?.flashSale?.tag
                         ? product?.flashSale?.tag
@@ -218,11 +218,11 @@ const ProductCard = ({ product, simpleTitle, variant = 'vertical' }) => {
 
           <div className='flex w-full items-center gap-x-1 '>
             {product?.stockTotal > 0 && (
-              <div className='badge-solid-red'>Ready Stock</div>
+              <div className='badge-solid-red text-nowrap'>Ready Stock</div>
             )}
             {/* <div className='badge-gray'>{product?.stockTotal > 5 ? '> 5' : '< 5'}</div> */}
             {product?.qtySold > 0 && (
-              <div className='text-gray_r-9 text-[11px]'>
+              <div className='text-gray_r-9 text-[11px] text-nowrap truncate'>
                 {sellingProductFormat(product?.qtySold) + ' Terjual'}
               </div>
             )}
-- 
cgit v1.2.3