From 6b173eaf8a95432316822b1d41b084875adfbd83 Mon Sep 17 00:00:00 2001
From: "tri.susilo" <tri.susilo@altama.co.id>
Date: Wed, 8 May 2024 14:47:11 +0700
Subject: [agnes] - Feature category management

---
 src/lib/product/components/CategorySection.jsx | 22 ++++++++++++++++++++++
 src/lib/product/components/ProductSearch.jsx   | 20 ++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 src/lib/product/components/CategorySection.jsx

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/CategorySection.jsx b/src/lib/product/components/CategorySection.jsx
new file mode 100644
index 00000000..7c347fe8
--- /dev/null
+++ b/src/lib/product/components/CategorySection.jsx
@@ -0,0 +1,22 @@
+import Image from "next/image"
+
+const CategorySection = ({ categories }) => {
+    return (
+        <section className="items-center bg-danger-100">
+            <div className="grid grid-cols-4 gap-2 w-full h-full col-span-2">
+                {categories.map((category) => (
+                    <div class="max-w-sm w-fit gap-4 lg:max-w-full lg:flex bg-white px-4 py-2 border-2 border-gray_r-8 rounded-lg">
+                        <div className="flex items-center justify-center">
+                            <Image src='https://erp.indoteknik.com/api/image/product.template/image_256/544371?ratio=square' width={80} height={80} alt={category?.name} />
+                        </div>
+                        <div class="flex flex-col justify-center leading-normal">
+                            <h2 class="text-gray-900 font-bold text-sm">{category?.name}</h2>
+                        </div>
+                    </div>
+                ))}
+            </div>
+        </section>
+    )
+}
+
+export default CategorySection
\ No newline at end of file
diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index 08b64c13..253c3703 100644
--- a/src/lib/product/components/ProductSearch.jsx
+++ b/src/lib/product/components/ProductSearch.jsx
@@ -26,6 +26,8 @@ import ProductSearchSkeleton from './Skeleton/ProductSearchSkeleton';
 
 import SideBanner from '~/modules/side-banner';
 import FooterBanner from '~/modules/footer-banner';
+import CategorySection from './CategorySection';
+import { getIdFromSlug } from '@/core/utils/slug'
 
 const ProductSearch = ({
   query,
@@ -68,6 +70,10 @@ const ProductSearch = ({
   const productStart = productSearch.data?.responseHeader.params.start;
   const productRows = limit;
   const productFound = productSearch.data?.response.numFound;
+  const [dataCategories, setDataCategories] = useState([])
+
+  const categoryId = getIdFromSlug(prefixUrl)
+
 
   useEffect(() => {
     if (productFound == 0 && query.q && !spellings) {
@@ -116,6 +122,18 @@ const ProductSearch = ({
     }
   }, [q]);
 
+  useEffect(() => {
+    const loadCategories = async () => {
+     const getCategories = await odooApi('GET', '/api/v1/category/child?partner_id='+{categoryId})
+     if(getCategories){
+      setDataCategories(getCategories)
+     }
+    }
+    loadCategories()
+  }, [])
+  
+  console.log('Data Category : ', dataCategories)
+
   const brands = [];
   for (
     let i = 0;
@@ -409,7 +427,9 @@ const ProductSearch = ({
 
             <SideBanner />
           </div>
+
           <div className='w-9/12 pl-6'>
+            <CategorySection categories={dataCategories}/>
             {bannerPromotionHeader && bannerPromotionHeader?.image && (
               <div className='mb-3'>
                 <Image
-- 
cgit v1.2.3


From 6c79d14a11c8dba20778c0559230a406cd147cc7 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 3 Jul 2024 08:34:16 +0700
Subject: <iman> update category management

---
 src/lib/product/components/CategorySection.jsx | 22 +++++++++++++---------
 src/lib/product/components/ProductSearch.jsx   |  7 ++-----
 2 files changed, 15 insertions(+), 14 deletions(-)

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/CategorySection.jsx b/src/lib/product/components/CategorySection.jsx
index 7c347fe8..c250efeb 100644
--- a/src/lib/product/components/CategorySection.jsx
+++ b/src/lib/product/components/CategorySection.jsx
@@ -1,20 +1,24 @@
 import Image from "next/image"
+import Link from '@/core/components/elements/Link/Link'
+import { createSlug } from '@/core/utils/slug'
 
 const CategorySection = ({ categories }) => {
     return (
-        <section className="items-center bg-danger-100">
-            <div className="grid grid-cols-4 gap-2 w-full h-full col-span-2">
+        <section>
+            <div className="group/item grid grid-cols-5 gap-y-2 w-full h-full col-span-2 ">
                 {categories.map((category) => (
-                    <div class="max-w-sm w-fit gap-4 lg:max-w-full lg:flex bg-white px-4 py-2 border-2 border-gray_r-8 rounded-lg">
-                        <div className="flex items-center justify-center">
-                            <Image src='https://erp.indoteknik.com/api/image/product.template/image_256/544371?ratio=square' width={80} height={80} alt={category?.name} />
-                        </div>
-                        <div class="flex flex-col justify-center leading-normal">
-                            <h2 class="text-gray-900 font-bold text-sm">{category?.name}</h2>
+                    <div className="KartuInti h-24 w-26 max-w-sm   lg:max-w-full flex flex-col   border-[1px] border-gray-200  relative group">
+                        <div className='KartuB absolute h-48 w-60 inset-0 flex items-center justify-center '>
+                            <div className="group/edit flex items-center justify-center h-48 w-60  flex-row group-hover/item:visible">
+                                <div className=' h-36'>
+                                    <Image className="group-hover:scale-110 duration-300"  src='https://erp.indoteknik.com/api/image/product.template/image_256/544371?ratio=square' width={36} height={26} alt={category?.name} />
+                                </div>
+                                <h2 className="text-gray-700 content-center text-wrap h-12 border-t-[1px] w-60 px-1 border-gray-200 font-normal text-sm text-center">{category?.name}</h2>
+                            </div>
                         </div>
                     </div>
                 ))}
-            </div>
+        </div>
         </section>
     )
 }
diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index 253c3703..29cf94da 100644
--- a/src/lib/product/components/ProductSearch.jsx
+++ b/src/lib/product/components/ProductSearch.jsx
@@ -74,7 +74,6 @@ const ProductSearch = ({
 
   const categoryId = getIdFromSlug(prefixUrl)
 
-
   useEffect(() => {
     if (productFound == 0 && query.q && !spellings) {
       searchSpellApi({ query: query.q }).then((response) => {
@@ -121,18 +120,16 @@ const ProductSearch = ({
       checkIfBrand();
     }
   }, [q]);
-
+ 
   useEffect(() => {
     const loadCategories = async () => {
-     const getCategories = await odooApi('GET', '/api/v1/category/child?partner_id='+{categoryId})
+      const getCategories = await odooApi('GET', `/api/v1/category/child?parent_id=${categoryId}`) 
      if(getCategories){
       setDataCategories(getCategories)
      }
     }
     loadCategories()
   }, [])
-  
-  console.log('Data Category : ', dataCategories)
 
   const brands = [];
   for (
-- 
cgit v1.2.3


From 1a70984f3497652b8d8b64d16053c1f2be452bd7 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 5 Jul 2024 10:06:49 +0700
Subject: <iman> update category management

---
 src/lib/product/components/CategorySection.jsx | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/CategorySection.jsx b/src/lib/product/components/CategorySection.jsx
index c250efeb..4c66e861 100644
--- a/src/lib/product/components/CategorySection.jsx
+++ b/src/lib/product/components/CategorySection.jsx
@@ -1,26 +1,26 @@
 import Image from "next/image"
-import Link from '@/core/components/elements/Link/Link'
+import Link from 'next/link'
 import { createSlug } from '@/core/utils/slug'
 
 const CategorySection = ({ categories }) => {
     return (
         <section>
-            <div className="group/item grid grid-cols-5 gap-y-2 w-full h-full col-span-2 ">
+            <div className="group/item grid grid-cols-5 gap-y-2 gap-x-2 w-full h-full col-span-2 ">
                 {categories.map((category) => (
-                    <div className="KartuInti h-24 w-26 max-w-sm   lg:max-w-full flex flex-col   border-[1px] border-gray-200  relative group">
-                        <div className='KartuB absolute h-48 w-60 inset-0 flex items-center justify-center '>
-                            <div className="group/edit flex items-center justify-center h-48 w-60  flex-row group-hover/item:visible">
-                                <div className=' h-36'>
-                                    <Image className="group-hover:scale-110 duration-300"  src='https://erp.indoteknik.com/api/image/product.template/image_256/544371?ratio=square' width={36} height={26} alt={category?.name} />
+                    <Link href={createSlug('/shop/category/', category?.name, category?.id)} key={category?.id} passHref>
+                        <div className="group transition-colors duration-300">
+                            <div className="KartuInti h-18 w-26 max-w-sm lg:max-w-full flex flex-col border-[2px] border-gray-200 group-hover:border-red-400 rounded relative ">
+                                <div className="flex items-center justify-center h-full px-1 flex-row">
+                                    <Image className="" src='https://erp.indoteknik.com/api/image/product.template/image_256/544371?ratio=square' width={56} height={48} alt={category?.name} />
+                                    <h2 className="text-gray-700 group-hover:text-[#E20613] line-clamp-2 content-center  h-fit w-60 px-1 font-semibold text-sm text-start">{category?.name}</h2>
                                 </div>
-                                <h2 className="text-gray-700 content-center text-wrap h-12 border-t-[1px] w-60 px-1 border-gray-200 font-normal text-sm text-center">{category?.name}</h2>
                             </div>
                         </div>
-                    </div>
+                    </Link>
                 ))}
-        </div>
+            </div>
         </section>
     )
 }
 
-export default CategorySection
\ No newline at end of file
+export default CategorySection
-- 
cgit v1.2.3


From d6b459b3ea396775fae25b44d34c8dc724379224 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Sat, 20 Jul 2024 11:45:41 +0700
Subject: <iman> update mobile view

---
 src/lib/product/components/CategorySection.jsx | 51 +++++++++++++++++++-------
 src/lib/product/components/ProductSearch.jsx   |  1 +
 2 files changed, 39 insertions(+), 13 deletions(-)

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/CategorySection.jsx b/src/lib/product/components/CategorySection.jsx
index 4c66e861..278bda94 100644
--- a/src/lib/product/components/CategorySection.jsx
+++ b/src/lib/product/components/CategorySection.jsx
@@ -1,24 +1,49 @@
 import Image from "next/image"
 import Link from 'next/link'
 import { createSlug } from '@/core/utils/slug'
-
+import useDevice from '@/core/hooks/useDevice';
+import { Swiper, SwiperSlide } from 'swiper/react';
+import 'swiper/css';
 const CategorySection = ({ categories }) => {
+    const { isDesktop, isMobile } = useDevice();
     return (
         <section>
-            <div className="group/item grid grid-cols-5 gap-y-2 gap-x-2 w-full h-full col-span-2 ">
-                {categories.map((category) => (
-                    <Link href={createSlug('/shop/category/', category?.name, category?.id)} key={category?.id} passHref>
-                        <div className="group transition-colors duration-300">
-                            <div className="KartuInti h-18 w-26 max-w-sm lg:max-w-full flex flex-col border-[2px] border-gray-200 group-hover:border-red-400 rounded relative ">
-                                <div className="flex items-center justify-center h-full px-1 flex-row">
-                                    <Image className="" src='https://erp.indoteknik.com/api/image/product.template/image_256/544371?ratio=square' width={56} height={48} alt={category?.name} />
-                                    <h2 className="text-gray-700 group-hover:text-[#E20613] line-clamp-2 content-center  h-fit w-60 px-1 font-semibold text-sm text-start">{category?.name}</h2>
+            {isDesktop && 
+                <div className="group/item grid grid-cols-5 gap-y-2 gap-x-2 w-full h-full col-span-2 ">
+                    {categories.map((category) => (
+                        <Link href={createSlug('/shop/category/', category?.name, category?.id)} key={category?.id} passHref>
+                            <div className="group transition-colors duration-300">
+                                <div className="KartuInti h-18 w-26 max-w-sm lg:max-w-full flex flex-col border-[2px] border-gray-200 group-hover:border-red-400 rounded relative ">
+                                    <div className="flex items-center justify-center h-full px-1 flex-row">
+                                        <Image className="" src={category?.image_1920? category?.image_1920 : '/images/noimage.jpeg'} width={56} height={48} alt={category?.name} />
+                                        <h2 className="text-gray-700 group-hover:text-[#E20613] line-clamp-2 content-center  h-fit w-60 px-1 font-semibold text-sm text-start">{category?.name}</h2>
+                                    </div>
                                 </div>
                             </div>
-                        </div>
-                    </Link>
-                ))}
-            </div>
+                        </Link>
+                    ))}
+                </div>
+            }
+            {isMobile && 
+                <div className="py-4">
+                    <Swiper slidesPerView={2.3} spaceBetween={10}>
+                        {categories.map((category) => (
+                        <SwiperSlide>
+                             <Link href={createSlug('/shop/category/', category?.name, category?.id)} key={category?.id} passHref>
+                                <div className="group transition-colors duration-300">
+                                    <div className="KartuInti h-18 w-26 max-w-sm lg:max-w-full flex flex-col border-[2px] border-gray-200 group-hover:bg-red-200 group-hover:border-red-400 rounded relative ">
+                                        <div className="flex items-center justify-center h-full px-1 flex-row">
+                                            <Image className="" src={category?.image_1920? category?.image_1920 : '/images/noimage.jpeg'} width={56} height={48} alt={category?.name} />
+                                            <h2 className="text-gray-700 group-hover:text-[#E20613] line-clamp-2 content-center  h-fit w-60 px-1 font-semibold text-sm text-start">{category?.name}</h2>
+                                        </div>
+                                    </div>
+                                </div>
+                            </Link>
+                        </SwiperSlide>
+                        ))}
+                    </Swiper>
+                </div>
+            }
         </section>
     )
 }
diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index 29cf94da..c4970b21 100644
--- a/src/lib/product/components/ProductSearch.jsx
+++ b/src/lib/product/components/ProductSearch.jsx
@@ -336,6 +336,7 @@ const ProductSearch = ({
               SpellingComponent
             )}
           </div>
+          <CategorySection categories={dataCategories}/>
 
           {productFound > 0 && (
             <div className='flex items-center gap-x-2 mb-5 justify-between'>
-- 
cgit v1.2.3


From a78251dc5cdfdd5438aad3ce7b7e342fceb7275e Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 22 Jul 2024 16:57:47 +0700
Subject: <iman> update category management

---
 src/lib/product/components/CategorySection.jsx | 67 +++++++++++++++++++-------
 1 file changed, 50 insertions(+), 17 deletions(-)

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/CategorySection.jsx b/src/lib/product/components/CategorySection.jsx
index 278bda94..e80429f4 100644
--- a/src/lib/product/components/CategorySection.jsx
+++ b/src/lib/product/components/CategorySection.jsx
@@ -4,44 +4,77 @@ import { createSlug } from '@/core/utils/slug'
 import useDevice from '@/core/hooks/useDevice';
 import { Swiper, SwiperSlide } from 'swiper/react';
 import 'swiper/css';
+import { useQuery } from 'react-query'
+import { useRouter } from 'next/router'
+
 const CategorySection = ({ categories }) => {
     const { isDesktop, isMobile } = useDevice();
+    const router = useRouter()
+
+    let teks = router.query.slug;
+    let hasil = teks?.match(/(\d+)$/)[0];
+
+    const breadcrumbs = useQuery(
+        `category-breadcrumbs/${hasil}`,
+        async () => await odooApi('GET', `/api/v1/category/${hasil}/category-breadcrumb`)
+    )
+    
     return (
         <section>
-            {isDesktop && 
+            {isDesktop && (
                 <div className="group/item grid grid-cols-5 gap-y-2 gap-x-2 w-full h-full col-span-2 ">
-                    {categories.map((category) => (
+                    {categories.slice(0, 10).map((category) => (
                         <Link href={createSlug('/shop/category/', category?.name, category?.id)} key={category?.id} passHref>
                             <div className="group transition-colors duration-300">
                                 <div className="KartuInti h-18 w-26 max-w-sm lg:max-w-full flex flex-col border-[2px] border-gray-200 group-hover:border-red-400 rounded relative ">
                                     <div className="flex items-center justify-center h-full px-1 flex-row">
-                                        <Image className="" src={category?.image_1920? category?.image_1920 : '/images/noimage.jpeg'} width={56} height={48} alt={category?.name} />
-                                        <h2 className="text-gray-700 group-hover:text-[#E20613] line-clamp-2 content-center  h-fit w-60 px-1 font-semibold text-sm text-start">{category?.name}</h2>
+                                        <Image className="" src={category?.image_1920 ? category?.image_1920 : '/images/noimage.jpeg'} width={56} height={48} alt={category?.name} />
+                                        <h2 className="text-gray-700 group-hover:text-[#E20613] line-clamp-2 content-center h-fit w-60 px-1 font-semibold text-sm text-start">{category?.name}</h2>
                                     </div>
                                 </div>
                             </div>
                         </Link>
                     ))}
                 </div>
-            }
+            )}
+            {isDesktop && categories.length > 10 && (
+                    <div className="w-full flex justify-end mt-4">
+                        <Link className=" flex justify-end mt-4 bg-red-500 text-white px-4 py-2 rounded" href={createSlug('/shop/category/', breadcrumbs.data[0]?.name, breadcrumbs.data[0]?.id)}>Lihat Semua
+                        </Link>
+                    </div>
+            )}
+
             {isMobile && 
                 <div className="py-4">
                     <Swiper slidesPerView={2.3} spaceBetween={10}>
-                        {categories.map((category) => (
-                        <SwiperSlide>
-                             <Link href={createSlug('/shop/category/', category?.name, category?.id)} key={category?.id} passHref>
-                                <div className="group transition-colors duration-300">
-                                    <div className="KartuInti h-18 w-26 max-w-sm lg:max-w-full flex flex-col border-[2px] border-gray-200 group-hover:bg-red-200 group-hover:border-red-400 rounded relative ">
-                                        <div className="flex items-center justify-center h-full px-1 flex-row">
-                                            <Image className="" src={category?.image_1920? category?.image_1920 : '/images/noimage.jpeg'} width={56} height={48} alt={category?.name} />
-                                            <h2 className="text-gray-700 group-hover:text-[#E20613] line-clamp-2 content-center  h-fit w-60 px-1 font-semibold text-sm text-start">{category?.name}</h2>
-                                        </div>
-                                    </div>
+                    {categories.slice(0, 10).map((category) => (
+                        <SwiperSlide key={category?.id}>
+                        <Link href={createSlug('/shop/category/', category?.name, category?.id)} passHref>
+                            <div className="group transition-colors duration-300">
+                            <div className="KartuInti h-18 w-26 max-w-sm lg:max-w-full flex flex-col border-[2px] border-gray-200 group-hover:bg-red-200 group-hover:border-red-400 rounded relative">
+                                <div className="flex items-center justify-center h-full px-1 flex-row">
+                                <Image
+                                    src={category?.image_1920 ? category?.image_1920 : '/images/noimage.jpeg'}
+                                    width={56}
+                                    height={48}
+                                    alt={category?.name}
+                                />
+                                <h2 className="text-gray-700 group-hover:text-[#E20613] line-clamp-2 content-center h-fit w-60 px-1 font-semibold text-sm text-start">
+                                    {category?.name}
+                                </h2>
                                 </div>
-                            </Link>
+                            </div>
+                            </div>
+                        </Link>
                         </SwiperSlide>
-                        ))}
+                    ))}
                     </Swiper>
+                    {categories.length > 10  && (
+                        <div className="w-full flex justify-end mt-4">
+                            <Link className=" flex justify-end mt-4 bg-red-500 text-white text-sm px-4 py-2 rounded" href={createSlug('/shop/category/', breadcrumbs.data[0]?.name, breadcrumbs.data[0]?.id)}>Lihat Semua
+                            </Link>
+                        </div>
+                    )}
                 </div>
             }
         </section>
-- 
cgit v1.2.3


From bf5c3b1d48da54e0e44689412ad9de9c10cf9edb Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 23 Jul 2024 09:28:21 +0700
Subject: <iman> update category management

---
 src/lib/product/components/CategorySection.jsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/CategorySection.jsx b/src/lib/product/components/CategorySection.jsx
index e80429f4..749a56eb 100644
--- a/src/lib/product/components/CategorySection.jsx
+++ b/src/lib/product/components/CategorySection.jsx
@@ -25,10 +25,10 @@ const CategorySection = ({ categories }) => {
                 <div className="group/item grid grid-cols-5 gap-y-2 gap-x-2 w-full h-full col-span-2 ">
                     {categories.slice(0, 10).map((category) => (
                         <Link href={createSlug('/shop/category/', category?.name, category?.id)} key={category?.id} passHref>
-                            <div className="group transition-colors duration-300">
-                                <div className="KartuInti h-18 w-26 max-w-sm lg:max-w-full flex flex-col border-[2px] border-gray-200 group-hover:border-red-400 rounded relative ">
-                                    <div className="flex items-center justify-center h-full px-1 flex-row">
-                                        <Image className="" src={category?.image_1920 ? category?.image_1920 : '/images/noimage.jpeg'} width={56} height={48} alt={category?.name} />
+                            <div className="group transition-colors duration-300 ">
+                                <div className="KartuInti h-12 w-26 max-w-sm lg:max-w-full flex flex-col border-[2px] border-gray-200 group-hover:border-red-400 rounded relative ">
+                                    <div className="flex items-center justify-start h-full px-1 flex-row">
+                                        <Image className="" src={category?.image1920? category?.image1920 : '/images/noimage.jpeg'} width={56} height={48} alt={category?.name} />
                                         <h2 className="text-gray-700 group-hover:text-[#E20613] line-clamp-2 content-center h-fit w-60 px-1 font-semibold text-sm text-start">{category?.name}</h2>
                                     </div>
                                 </div>
@@ -54,7 +54,7 @@ const CategorySection = ({ categories }) => {
                             <div className="KartuInti h-18 w-26 max-w-sm lg:max-w-full flex flex-col border-[2px] border-gray-200 group-hover:bg-red-200 group-hover:border-red-400 rounded relative">
                                 <div className="flex items-center justify-center h-full px-1 flex-row">
                                 <Image
-                                    src={category?.image_1920 ? category?.image_1920 : '/images/noimage.jpeg'}
+                                    src={category?.image1920 ? category?.image1920 : '/images/noimage.jpeg'}
                                     width={56}
                                     height={48}
                                     alt={category?.name}
-- 
cgit v1.2.3


From b1341b76e94da9e64549768646bb54d2836976d0 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 23 Jul 2024 14:29:08 +0700
Subject: <iman> update categories management

---
 src/lib/product/components/CategorySection.jsx | 109 +++++++++++++++----------
 1 file changed, 68 insertions(+), 41 deletions(-)

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/CategorySection.jsx b/src/lib/product/components/CategorySection.jsx
index 749a56eb..14a39e7e 100644
--- a/src/lib/product/components/CategorySection.jsx
+++ b/src/lib/product/components/CategorySection.jsx
@@ -1,15 +1,23 @@
-import Image from "next/image"
-import Link from 'next/link'
-import { createSlug } from '@/core/utils/slug'
+import Image from "next/image";
+import Link from 'next/link';
+import { createSlug } from '@/core/utils/slug';
 import useDevice from '@/core/hooks/useDevice';
 import { Swiper, SwiperSlide } from 'swiper/react';
 import 'swiper/css';
-import { useQuery } from 'react-query'
-import { useRouter } from 'next/router'
+import { useQuery } from 'react-query';
+import { useRouter } from 'next/router';
+import {
+    ChevronDownIcon,
+    ChevronUpIcon, // Import ChevronUpIcon for toggling
+    DocumentCheckIcon,
+    HeartIcon,
+} from '@heroicons/react/24/outline';
+import { useState } from 'react'; // Import useState
 
 const CategorySection = ({ categories }) => {
     const { isDesktop, isMobile } = useDevice();
-    const router = useRouter()
+    const router = useRouter();
+    const [isOpenCategory, setIsOpenCategory] = useState(false); // State to manage category visibility
 
     let teks = router.query.slug;
     let hasil = teks?.match(/(\d+)$/)[0];
@@ -17,18 +25,24 @@ const CategorySection = ({ categories }) => {
     const breadcrumbs = useQuery(
         `category-breadcrumbs/${hasil}`,
         async () => await odooApi('GET', `/api/v1/category/${hasil}/category-breadcrumb`)
-    )
-    
+    );
+
+    const handleToggleCategories = () => {
+        setIsOpenCategory(!isOpenCategory);
+    };
+
+    const displayedCategories = isOpenCategory ? categories : categories.slice(0, 10);
+
     return (
         <section>
             {isDesktop && (
                 <div className="group/item grid grid-cols-5 gap-y-2 gap-x-2 w-full h-full col-span-2 ">
-                    {categories.slice(0, 10).map((category) => (
+                    {displayedCategories.map((category) => (
                         <Link href={createSlug('/shop/category/', category?.name, category?.id)} key={category?.id} passHref>
                             <div className="group transition-colors duration-300 ">
                                 <div className="KartuInti h-12 w-26 max-w-sm lg:max-w-full flex flex-col border-[2px] border-gray-200 group-hover:border-red-400 rounded relative ">
-                                    <div className="flex items-center justify-start h-full px-1 flex-row">
-                                        <Image className="" src={category?.image1920? category?.image1920 : '/images/noimage.jpeg'} width={56} height={48} alt={category?.name} />
+                                    <div className="flex items-center justify-start h-full px-1 flex-row ">
+                                        <Image className="h-full" src={category?.image1920 ? category?.image1920 : '/images/noimage.jpeg'} width={56} height={48} alt={category?.name} />
                                         <h2 className="text-gray-700 group-hover:text-[#E20613] line-clamp-2 content-center h-fit w-60 px-1 font-semibold text-sm text-start">{category?.name}</h2>
                                     </div>
                                 </div>
@@ -38,45 +52,58 @@ const CategorySection = ({ categories }) => {
                 </div>
             )}
             {isDesktop && categories.length > 10 && (
-                    <div className="w-full flex justify-end mt-4">
-                        <Link className=" flex justify-end mt-4 bg-red-500 text-white px-4 py-2 rounded" href={createSlug('/shop/category/', breadcrumbs.data[0]?.name, breadcrumbs.data[0]?.id)}>Lihat Semua
-                        </Link>
-                    </div>
+                <div className="w-full flex justify-center mt-4">
+                    <button
+                        onClick={handleToggleCategories}
+                        className="flex justify-end mt-4 text-red-500 font-bold px-4 py-2 rounded"
+                    >
+                        {isOpenCategory ? 'Sembunyikan' : 'Lihat semua'}
+                        {isOpenCategory ? (
+                            <ChevronUpIcon className="ml-auto w-5 font-bold" />
+                        ) : (
+                            <ChevronDownIcon className="ml-auto w-5 font-bold" />
+                        )}
+                    </button>
+                </div>
             )}
 
-            {isMobile && 
+            {isMobile && (
                 <div className="py-4">
                     <Swiper slidesPerView={2.3} spaceBetween={10}>
-                    {categories.slice(0, 10).map((category) => (
-                        <SwiperSlide key={category?.id}>
-                        <Link href={createSlug('/shop/category/', category?.name, category?.id)} passHref>
-                            <div className="group transition-colors duration-300">
-                            <div className="KartuInti h-18 w-26 max-w-sm lg:max-w-full flex flex-col border-[2px] border-gray-200 group-hover:bg-red-200 group-hover:border-red-400 rounded relative">
-                                <div className="flex items-center justify-center h-full px-1 flex-row">
-                                <Image
-                                    src={category?.image1920 ? category?.image1920 : '/images/noimage.jpeg'}
-                                    width={56}
-                                    height={48}
-                                    alt={category?.name}
-                                />
-                                <h2 className="text-gray-700 group-hover:text-[#E20613] line-clamp-2 content-center h-fit w-60 px-1 font-semibold text-sm text-start">
-                                    {category?.name}
-                                </h2>
-                                </div>
-                            </div>
-                            </div>
-                        </Link>
-                        </SwiperSlide>
-                    ))}
+                        {displayedCategories.map((category) => (
+                            <SwiperSlide key={category?.id}>
+                                <Link href={createSlug('/shop/category/', category?.name, category?.id)} passHref>
+                                    <div className="group transition-colors duration-300">
+                                        <div className="KartuInti min-h-16 max-h-16 w-26 max-w-sm lg:max-w-full flex flex-col border-[2px] border-gray-200 group-hover:bg-red-200 group-hover:border-red-400 rounded relative">
+                                            <div className="flex items-center justify-center h-full px-1 flex-row">
+                                                <Image
+                                                    src={category?.image1920 ? category?.image1920 : '/images/noimage.jpeg'}
+                                                    width={56}
+                                                    height={48}
+                                                    alt={category?.name}
+                                                />
+                                                <h2 className="text-gray-700 group-hover:text-[#E20613] line-clamp-2 content-center h-fit w-60 px-1 font-semibold text-sm text-start">
+                                                    {category?.name}
+                                                </h2>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </Link>
+                            </SwiperSlide>
+                        ))}
                     </Swiper>
-                    {categories.length > 10  && (
+                    {categories.length > 10 && (
                         <div className="w-full flex justify-end mt-4">
-                            <Link className=" flex justify-end mt-4 bg-red-500 text-white text-sm px-4 py-2 rounded" href={createSlug('/shop/category/', breadcrumbs.data[0]?.name, breadcrumbs.data[0]?.id)}>Lihat Semua
-                            </Link>
+                            <button
+                                onClick={handleToggleCategories}
+                                className="flex justify-end mt-4 bg-red-500 text-white text-sm px-4 py-2 rounded"
+                            >
+                                {isOpenCategory ? 'Sembunyikan Semua' : 'Lihat Semua'}
+                            </button>
                         </div>
                     )}
                 </div>
-            }
+            )}
         </section>
     )
 }
-- 
cgit v1.2.3


From 2e71abba4ca5b83cc1fec229d4d85961c4b56d71 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 25 Jul 2024 08:27:05 +0700
Subject: <iman> update category management

---
 src/lib/product/components/CategorySection.jsx | 11 ++------
 src/lib/product/components/ProductSearch.jsx   | 35 +++++++++++++++++++++++---
 2 files changed, 34 insertions(+), 12 deletions(-)

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/CategorySection.jsx b/src/lib/product/components/CategorySection.jsx
index 14a39e7e..2af3db10 100644
--- a/src/lib/product/components/CategorySection.jsx
+++ b/src/lib/product/components/CategorySection.jsx
@@ -13,23 +13,16 @@ import {
     HeartIcon,
 } from '@heroicons/react/24/outline';
 import { useState } from 'react'; // Import useState
+import { getIdFromSlug } from '@/core/utils/slug'
 
 const CategorySection = ({ categories }) => {
     const { isDesktop, isMobile } = useDevice();
-    const router = useRouter();
     const [isOpenCategory, setIsOpenCategory] = useState(false); // State to manage category visibility
 
-    let teks = router.query.slug;
-    let hasil = teks?.match(/(\d+)$/)[0];
-
-    const breadcrumbs = useQuery(
-        `category-breadcrumbs/${hasil}`,
-        async () => await odooApi('GET', `/api/v1/category/${hasil}/category-breadcrumb`)
-    );
-
     const handleToggleCategories = () => {
         setIsOpenCategory(!isOpenCategory);
     };
+    
 
     const displayedCategories = isOpenCategory ? categories : categories.slice(0, 10);
 
diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index c4970b21..b5c1e87d 100644
--- a/src/lib/product/components/ProductSearch.jsx
+++ b/src/lib/product/components/ProductSearch.jsx
@@ -28,6 +28,7 @@ import SideBanner from '~/modules/side-banner';
 import FooterBanner from '~/modules/footer-banner';
 import CategorySection from './CategorySection';
 import { getIdFromSlug } from '@/core/utils/slug'
+import { data } from 'autoprefixer';
 
 const ProductSearch = ({
   query,
@@ -63,6 +64,7 @@ const ProductSearch = ({
   const [categoryValues, setCategory] = useState(
     query?.category?.split(',') || []
   );
+  
   const [priceFrom, setPriceFrom] = useState(query?.priceFrom || null);
   const [priceTo, setPriceTo] = useState(query?.priceTo || null);
 
@@ -71,6 +73,9 @@ const ProductSearch = ({
   const productRows = limit;
   const productFound = productSearch.data?.response.numFound;
   const [dataCategories, setDataCategories] = useState([])
+  const [dataCategoriesProduct, setDataCategoriesProduct] = useState([])
+  const dataId = []
+  // console.log("dataCategories",dataCategories)
 
   const categoryId = getIdFromSlug(prefixUrl)
 
@@ -103,7 +108,7 @@ const ProductSearch = ({
       });
     }
   }, [productFound, query, spellings]);
-
+  let id = []
   useEffect(() => {
     const checkIfBrand = async () => {
       const brand = await axios(
@@ -123,13 +128,37 @@ const ProductSearch = ({
  
   useEffect(() => {
     const loadCategories = async () => {
-      const getCategories = await odooApi('GET', `/api/v1/category/child?parent_id=${categoryId}`) 
+      const getCategories = await odooApi('GET', `/api/v1/category/child?parent_id=${categoryId}`)
      if(getCategories){
       setDataCategories(getCategories)
      }
     }
     loadCategories()
+
+    const loadProduct = async () => {
+      const getCategoriesId = await odooApi('GET', `/api/v1/category/numFound?parent_id=${categoryId}`)
+      console.log("getCategoriesId",getCategoriesId)
+     if(getCategoriesId){
+      setDataCategoriesProduct(getCategoriesId)
+     }
+    }
+    loadProduct()
   }, [])
+  collectIds(dataCategoriesProduct);
+
+// Fungsi rekursif untuk menambahkan ID dari kategori dan subkategori ke array dataId
+function collectIds(category) {
+  if (category && category.id) {
+    dataId.push(category.id);
+  }
+  if (Array.isArray(category.children)) {
+    for (const child of category.children) {
+      collectIds(child);
+    }
+  }
+}
+
+console.log("dataID",dataId)
 
   const brands = [];
   for (
@@ -275,7 +304,7 @@ const ProductSearch = ({
   };
 
   const isNotReadyStockPage = router.asPath !== '/shop/search?orderBy=stock';
-
+  console.log("query?.category?.split(',')",query.fq)
   return (
     <>
       <MobileView>
-- 
cgit v1.2.3


From 2c2885f57e9eb15e8c7d00c3a543a71c1d6ba83e Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 25 Jul 2024 14:04:43 +0700
Subject: <iman> update search handle for category

---
 src/lib/product/components/ProductSearch.jsx | 83 ++++++++++++++++++----------
 1 file changed, 53 insertions(+), 30 deletions(-)

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index b5c1e87d..413f4fb2 100644
--- a/src/lib/product/components/ProductSearch.jsx
+++ b/src/lib/product/components/ProductSearch.jsx
@@ -42,9 +42,56 @@ const ProductSearch = ({
   const [search, setSearch] = useState(query?.q || '*');
   const [limit, setLimit] = useState(query?.limit || 30);
   const [orderBy, setOrderBy] = useState(router.query?.orderBy || 'popular');
+  const [finalQuery, setFinalQuery] = useState({});
+  const [queryFinal, setQueryFinal] = useState({});
+  const [dataCategoriesProduct, setDataCategoriesProduct] = useState([])
+  const categoryId = getIdFromSlug(prefixUrl)
   if (defaultBrand) query.brand = defaultBrand.toLowerCase();
+  useEffect(() => {
+    const loadProduct = async () => {
+      const getCategoriesId = await odooApi('GET', `/api/v1/category/numFound?parent_id=${categoryId}`);
+      if (getCategoriesId) {
+        setDataCategoriesProduct(getCategoriesId);
+      }
+    };
+    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(() => {
+    const ids = collectIds(dataCategoriesProduct);
+    const newQuery = {
+      fq: `category_id_i:(${ids.join(' OR ')})`,
+      page: 1,
+      brand : router.query.brand? router.query.brand : '',
+    };
+    setFinalQuery(newQuery);
+  }, [dataCategoriesProduct]);
+
+  useEffect(() => {
+    if (prefixUrl.includes('category')) {
+      setQueryFinal({ ...finalQuery, q, limit, orderBy });
+      // setQueryFinal({ ...query, q, limit, orderBy });
+    } else {
+      setQueryFinal({ ...query, q, limit, orderBy });
+    }
+  }, [prefixUrl, finalQuery, q, limit, orderBy]);
+
   const { productSearch } = useProductSearch({
-    query: { ...query, q, limit, orderBy },
+    query: queryFinal,
     operation: 'AND',
   });
   const [products, setProducts] = useState(null);
@@ -73,12 +120,7 @@ const ProductSearch = ({
   const productRows = limit;
   const productFound = productSearch.data?.response.numFound;
   const [dataCategories, setDataCategories] = useState([])
-  const [dataCategoriesProduct, setDataCategoriesProduct] = useState([])
-  const dataId = []
-  // console.log("dataCategories",dataCategories)
-
-  const categoryId = getIdFromSlug(prefixUrl)
-
+  
   useEffect(() => {
     if (productFound == 0 && query.q && !spellings) {
       searchSpellApi({ query: query.q }).then((response) => {
@@ -134,31 +176,10 @@ const ProductSearch = ({
      }
     }
     loadCategories()
-
-    const loadProduct = async () => {
-      const getCategoriesId = await odooApi('GET', `/api/v1/category/numFound?parent_id=${categoryId}`)
-      console.log("getCategoriesId",getCategoriesId)
-     if(getCategoriesId){
-      setDataCategoriesProduct(getCategoriesId)
-     }
-    }
-    loadProduct()
   }, [])
-  collectIds(dataCategoriesProduct);
 
-// Fungsi rekursif untuk menambahkan ID dari kategori dan subkategori ke array dataId
-function collectIds(category) {
-  if (category && category.id) {
-    dataId.push(category.id);
-  }
-  if (Array.isArray(category.children)) {
-    for (const child of category.children) {
-      collectIds(child);
-    }
-  }
-}
+  
 
-console.log("dataID",dataId)
 
   const brands = [];
   for (
@@ -304,7 +325,9 @@ console.log("dataID",dataId)
   };
 
   const isNotReadyStockPage = router.asPath !== '/shop/search?orderBy=stock';
-  console.log("query?.category?.split(',')",query.fq)
+  
+  
+
   return (
     <>
       <MobileView>
-- 
cgit v1.2.3


From 4758a0989f2ec0d79e1c5e3a3d42c249f28a9e72 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 26 Jul 2024 14:13:20 +0700
Subject: <iman> update code category management

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

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index 413f4fb2..cd7cda9f 100644
--- a/src/lib/product/components/ProductSearch.jsx
+++ b/src/lib/product/components/ProductSearch.jsx
@@ -74,7 +74,7 @@ const ProductSearch = ({
   useEffect(() => {
     const ids = collectIds(dataCategoriesProduct);
     const newQuery = {
-      fq: `category_id_i:(${ids.join(' OR ')})`,
+      fq: `category_id_ids:(${ids.join(' OR ')})`,
       page: 1,
       brand : router.query.brand? router.query.brand : '',
     };
-- 
cgit v1.2.3


From e5a01976cb665b824b2ad6426a2c52a5bd0964e6 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Sat, 27 Jul 2024 08:27:54 +0700
Subject: <iman> add feature category lob

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

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index cd7cda9f..735ef58e 100644
--- a/src/lib/product/components/ProductSearch.jsx
+++ b/src/lib/product/components/ProductSearch.jsx
@@ -78,8 +78,9 @@ const ProductSearch = ({
       page: 1,
       brand : router.query.brand? router.query.brand : '',
     };
+    console.log("newQuery",newQuery)
     setFinalQuery(newQuery);
-  }, [dataCategoriesProduct]);
+  }, [dataCategoriesProduct, prefixUrl, prefixUrl, finalQuery, q, limit, orderBy]);
 
   useEffect(() => {
     if (prefixUrl.includes('category')) {
@@ -178,7 +179,7 @@ const ProductSearch = ({
     loadCategories()
   }, [])
 
-  
+  console.log("queryFinal", queryFinal)
 
 
   const brands = [];
-- 
cgit v1.2.3


From f1910544cf6df50bcb175b66b604f5903f6ae3fa Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Sat, 27 Jul 2024 13:34:00 +0700
Subject: <iman> update category management for lob

---
 src/lib/product/components/ProductSearch.jsx | 98 +++++++++++++++++++++-------
 1 file changed, 76 insertions(+), 22 deletions(-)

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index 735ef58e..2da84d63 100644
--- a/src/lib/product/components/ProductSearch.jsx
+++ b/src/lib/product/components/ProductSearch.jsx
@@ -37,6 +37,7 @@ const ProductSearch = ({
   brand = null,
 }) => {
   const router = useRouter();
+   
   const { page = 1 } = query;
   const [q, setQ] = useState(query?.q || '*');
   const [search, setSearch] = useState(query?.q || '*');
@@ -45,18 +46,35 @@ const ProductSearch = ({
   const [finalQuery, setFinalQuery] = useState({});
   const [queryFinal, setQueryFinal] = useState({});
   const [dataCategoriesProduct, setDataCategoriesProduct] = useState([])
+  const [dataCategoriesLob, setDataCategoriesLob] = useState([])
   const categoryId = getIdFromSlug(prefixUrl)
+  console.log("categoryId",categoryId ) 
+  const [data, setData] = useState([])
+  const [dataLob, setDataLob] = useState([]);
   if (defaultBrand) query.brand = defaultBrand.toLowerCase();
+  const dataIdCategories = []
   useEffect(() => {
-    const loadProduct = async () => {
-      const getCategoriesId = await odooApi('GET', `/api/v1/category/numFound?parent_id=${categoryId}`);
-      if (getCategoriesId) {
-        setDataCategoriesProduct(getCategoriesId);
-      }
-    };
-    loadProduct();
+    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?lob_id=${categoryId}`);
+        console.log("lobData",lobData ) 
+        if (lobData) {
+          setDataLob(lobData);
+        }
+      };
+      loadProduct();
+      console.log("dataLob",dataLob ) 
+    }
   }, [categoryId]);
-
+  
   const collectIds = (category) => {
     const ids = [];
     function recurse(cat) {
@@ -70,26 +88,61 @@ const ProductSearch = ({
     recurse(category);
     return ids;
   };
-
+  
   useEffect(() => {
-    const ids = collectIds(dataCategoriesProduct);
-    const newQuery = {
-      fq: `category_id_ids:(${ids.join(' OR ')})`,
-      page: 1,
-      brand : router.query.brand? router.query.brand : '',
-    };
-    console.log("newQuery",newQuery)
-    setFinalQuery(newQuery);
-  }, [dataCategoriesProduct, prefixUrl, prefixUrl, finalQuery, q, limit, orderBy]);
+    if(prefixUrl.includes('category')){
+      const ids = collectIds(dataCategoriesProduct);
+      const newQuery = {
+        fq: `category_id_ids:(${ids.join(' OR ')})`,
+        page,
+        brand : router.query.brand? router.query.brand : '',
+        category : router.query.category? router.query.category : '',
+      };
+      setFinalQuery(newQuery);
+    } else if (prefixUrl.includes('lob')){
+      console.log("prefixUrl",prefixUrl) 
+      const fetchCategoryData = async () => {
+        if (dataLob[0]?.categoryIds) {
+          console.log("dataLob[0]?.categoryIds",dataLob[0]?.categoryIds) 
+          for (const cate of dataLob[0].categoryIds) {
+            console.log("cate",cate) 
+            const getCategoriesId = await odooApi('GET', `/api/v1/category/numFound?parent_id=${cate.id}`);
+            console.log("getCategoriesId",getCategoriesId) 
+            if (getCategoriesId) {
+              const ids = collectIds(getCategoriesId);
+              console.log("ids",ids) 
+              dataIdCategories.push(ids)
+              console.log("dataIdCategories",dataIdCategories) 
+            }
+          }
+          
+          console.log("dataIdCategories2",dataIdCategories) 
+          // setData(dataIdCategories)
+          // console.log("data",data) 
+          const mergedArray = dataIdCategories.flat();
+          console.log("mergedArray",mergedArray) 
+          const newQuery = {
+            fq: `category_id_ids:(${mergedArray.join(' OR ')})`,
+            page,
+            brand : router.query.brand? router.query.brand : '',
+            category : router.query.category? router.query.category : '',
+          };
+          console.log("newQuery",newQuery) 
+          setFinalQuery(newQuery);
+          console.log("final query",finalQuery)
+        }
+      };
+      fetchCategoryData();
+    }
+  }, [dataCategoriesProduct, dataLob]);
 
   useEffect(() => {
-    if (prefixUrl.includes('category')) {
+    if (prefixUrl.includes('category') || prefixUrl.includes('lob')) {
       setQueryFinal({ ...finalQuery, q, limit, orderBy });
-      // setQueryFinal({ ...query, q, limit, orderBy });
     } else {
       setQueryFinal({ ...query, q, limit, orderBy });
     }
-  }, [prefixUrl, finalQuery, q, limit, orderBy]);
+  }, [prefixUrl,dataCategoriesProduct, query, finalQuery]);
 
   const { productSearch } = useProductSearch({
     query: queryFinal,
@@ -179,7 +232,8 @@ const ProductSearch = ({
     loadCategories()
   }, [])
 
-  console.log("queryFinal", queryFinal)
+  // console.log("query asal ", query)
+  // console.log("queryFinal", queryFinal)
 
 
   const brands = [];
-- 
cgit v1.2.3


From 556e7e226a2043d43bc55bf0ff2118294bb9f330 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 29 Jul 2024 13:32:39 +0700
Subject: <iman> update lob category

---
 src/lib/product/components/LobSectionCategory.jsx | 89 +++++++++++++++++++++++
 src/lib/product/components/ProductSearch.jsx      | 54 ++++++--------
 2 files changed, 113 insertions(+), 30 deletions(-)
 create mode 100644 src/lib/product/components/LobSectionCategory.jsx

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/LobSectionCategory.jsx b/src/lib/product/components/LobSectionCategory.jsx
new file mode 100644
index 00000000..5e9934c3
--- /dev/null
+++ b/src/lib/product/components/LobSectionCategory.jsx
@@ -0,0 +1,89 @@
+import Image from "next/image";
+import Link from 'next/link';
+import { createSlug } from '@/core/utils/slug';
+import useDevice from '@/core/hooks/useDevice';
+import { Swiper, SwiperSlide } from 'swiper/react';
+import 'swiper/css';
+import { useQuery } from 'react-query';
+import { useRouter } from 'next/router';
+import {
+    ChevronDownIcon,
+    ChevronUpIcon, // Import ChevronUpIcon for toggling
+    DocumentCheckIcon,
+    HeartIcon,
+} from '@heroicons/react/24/outline';
+import { useState } from 'react'; // Import useState
+import { getIdFromSlug } from '@/core/utils/slug'
+
+const LobSectionCategory = ({ categories }) => {
+    const { isDesktop, isMobile } = useDevice();
+    const [isOpenCategory, setIsOpenCategory] = useState(false); // State to manage category visibility
+
+    const handleToggleCategories = () => {
+        setIsOpenCategory(!isOpenCategory);
+    };
+    console.log("categories",categories[0]?.categoryIds)
+
+    const displayedCategories = categories[0]?.categoryIds;
+
+    return (
+        <section>
+            {isDesktop && (
+                <div className="group/item grid grid-flow-col gap-y-2 gap-x-2 w-full h-full">
+                    {displayedCategories?.map((category) => (
+                        <Link href={createSlug('/shop/category/', category?.name, category?.id)} key={category?.id} passHref>
+                            <div className="group transition-colors duration-300 ">
+                                <div className="KartuInti h-36 w-26 max-w-sm lg:max-w-full flex flex-col border-[2px] border-gray-200 group-hover:border-red-400 rounded relative ">
+                                    <div className="flex items-center justify-start h-full px-1 flex-row ">
+                                        <Image className="h-full w-full" src={category?.image ? category?.image : 'https://erp.indoteknik.com/web/image?model=x_banner.banner&id=5&field=x_banner_image&unique=09202023100557'} width={56} height={48} quality={100} alt={category?.name} />
+                                        {/* <h2 className="text-gray-700 group-hover:text-[#E20613] line-clamp-2 content-center h-fit w-60 px-1 font-semibold text-sm text-start">{category?.name}</h2> */}
+                                    </div>
+                                </div>
+                            </div>
+                        </Link>
+                    ))}
+                </div>
+            )}
+
+            {isMobile && (
+                <div className="py-4">
+                    <Swiper slidesPerView={2.3} spaceBetween={10}>
+                        {displayedCategories.map((category) => (
+                            <SwiperSlide key={category?.id}>
+                                <Link href={createSlug('/shop/category/', category?.name, category?.id)} passHref>
+                                    <div className="group transition-colors duration-300">
+                                        <div className="KartuInti min-h-16 max-h-16 w-26 max-w-sm lg:max-w-full flex flex-col border-[2px] border-gray-200 group-hover:bg-red-200 group-hover:border-red-400 rounded relative">
+                                            <div className="flex items-center justify-center h-full px-1 flex-row">
+                                                <Image
+                                                    src={category?.image1920 ? category?.image1920 : '/images/noimage.jpeg'}
+                                                    width={56}
+                                                    height={48}
+                                                    alt={category?.name}
+                                                />
+                                                <h2 className="text-gray-700 group-hover:text-[#E20613] line-clamp-2 content-center h-fit w-60 px-1 font-semibold text-sm text-start">
+                                                    {category?.name}
+                                                </h2>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </Link>
+                            </SwiperSlide>
+                        ))}
+                    </Swiper>
+                    {categories.length > 10 && (
+                        <div className="w-full flex justify-end mt-4">
+                            <button
+                                onClick={handleToggleCategories}
+                                className="flex justify-end mt-4 bg-red-500 text-white text-sm px-4 py-2 rounded"
+                            >
+                                {isOpenCategory ? 'Sembunyikan Semua' : 'Lihat Semua'}
+                            </button>
+                        </div>
+                    )}
+                </div>
+            )}
+        </section>
+    )
+}
+
+export default LobSectionCategory
diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index 2da84d63..12e3b358 100644
--- a/src/lib/product/components/ProductSearch.jsx
+++ b/src/lib/product/components/ProductSearch.jsx
@@ -27,6 +27,7 @@ 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';
 
@@ -48,7 +49,6 @@ const ProductSearch = ({
   const [dataCategoriesProduct, setDataCategoriesProduct] = useState([])
   const [dataCategoriesLob, setDataCategoriesLob] = useState([])
   const categoryId = getIdFromSlug(prefixUrl)
-  console.log("categoryId",categoryId ) 
   const [data, setData] = useState([])
   const [dataLob, setDataLob] = useState([]);
   if (defaultBrand) query.brand = defaultBrand.toLowerCase();
@@ -64,14 +64,14 @@ const ProductSearch = ({
       loadProduct();
     }else if(prefixUrl.includes('lob')){
       const loadProduct = async () => {
-        const lobData = await odooApi('GET', `/api/v1/lob_homepage?lob_id=${categoryId}`);
-        console.log("lobData",lobData ) 
+        const lobData = await odooApi('GET', `/api/v1/lob_homepage/${categoryId}/category_id`);
+         
         if (lobData) {
           setDataLob(lobData);
         }
       };
       loadProduct();
-      console.log("dataLob",dataLob ) 
+      
     }
   }, [categoryId]);
   
@@ -100,36 +100,27 @@ const ProductSearch = ({
       };
       setFinalQuery(newQuery);
     } else if (prefixUrl.includes('lob')){
-      console.log("prefixUrl",prefixUrl) 
+      
       const fetchCategoryData = async () => {
         if (dataLob[0]?.categoryIds) {
-          console.log("dataLob[0]?.categoryIds",dataLob[0]?.categoryIds) 
+          
           for (const cate of dataLob[0].categoryIds) {
-            console.log("cate",cate) 
-            const getCategoriesId = await odooApi('GET', `/api/v1/category/numFound?parent_id=${cate.id}`);
-            console.log("getCategoriesId",getCategoriesId) 
-            if (getCategoriesId) {
-              const ids = collectIds(getCategoriesId);
-              console.log("ids",ids) 
-              dataIdCategories.push(ids)
-              console.log("dataIdCategories",dataIdCategories) 
-            }
+           
+            dataIdCategories.push(cate.childId)
           }
           
-          console.log("dataIdCategories2",dataIdCategories) 
-          // setData(dataIdCategories)
-          // console.log("data",data) 
+        
           const mergedArray = dataIdCategories.flat();
-          console.log("mergedArray",mergedArray) 
+         
           const newQuery = {
             fq: `category_id_ids:(${mergedArray.join(' OR ')})`,
             page,
             brand : router.query.brand? router.query.brand : '',
             category : router.query.category? router.query.category : '',
           };
-          console.log("newQuery",newQuery) 
+       
           setFinalQuery(newQuery);
-          console.log("final query",finalQuery)
+         
         }
       };
       fetchCategoryData();
@@ -223,17 +214,18 @@ const ProductSearch = ({
   }, [q]);
  
   useEffect(() => {
-    const loadCategories = async () => {
-      const getCategories = await odooApi('GET', `/api/v1/category/child?parent_id=${categoryId}`)
-     if(getCategories){
-      setDataCategories(getCategories)
-     }
+    if(prefixUrl.includes('category')){
+      const loadCategories = async () => {
+        const getCategories = await odooApi('GET', `/api/v1/category/child?parent_id=${categoryId}`)
+       if(getCategories){
+        setDataCategories(getCategories)
+       }
+      }
+      loadCategories()
     }
-    loadCategories()
   }, [])
 
-  // console.log("query asal ", query)
-  // console.log("queryFinal", queryFinal)
+
 
 
   const brands = [];
@@ -381,7 +373,7 @@ const ProductSearch = ({
 
   const isNotReadyStockPage = router.asPath !== '/shop/search?orderBy=stock';
   
-  
+  console.log("finalQuery",finalQuery)
 
   return (
     <>
@@ -443,6 +435,7 @@ const ProductSearch = ({
               SpellingComponent
             )}
           </div>
+          <LobSectionCategory categories={dataLob}/>
           <CategorySection categories={dataCategories}/>
 
           {productFound > 0 && (
@@ -534,6 +527,7 @@ const ProductSearch = ({
           </div>
 
           <div className='w-9/12 pl-6'>
+            <LobSectionCategory categories={dataLob}/>
             <CategorySection categories={dataCategories}/>
             {bannerPromotionHeader && bannerPromotionHeader?.image && (
               <div className='mb-3'>
-- 
cgit v1.2.3


From 1a58c55e6415d78f5d155055071a649d1f56492a Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 29 Jul 2024 14:52:57 +0700
Subject: <iman> update mobile view

---
 src/lib/product/components/LobSectionCategory.jsx | 51 ++++++++++-------------
 1 file changed, 22 insertions(+), 29 deletions(-)

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/LobSectionCategory.jsx b/src/lib/product/components/LobSectionCategory.jsx
index 5e9934c3..34a09e46 100644
--- a/src/lib/product/components/LobSectionCategory.jsx
+++ b/src/lib/product/components/LobSectionCategory.jsx
@@ -29,43 +29,36 @@ const LobSectionCategory = ({ categories }) => {
     return (
         <section>
             {isDesktop && (
-                <div className="group/item grid grid-flow-col gap-y-2 gap-x-2 w-full h-full">
+                <div className="group/item grid grid-flow-col gap-y-2 gap-x-4 w-full h-full">
                     {displayedCategories?.map((category) => (
-                        <Link href={createSlug('/shop/category/', category?.name, category?.id)} key={category?.id} passHref>
-                            <div className="group transition-colors duration-300 ">
-                                <div className="KartuInti h-36 w-26 max-w-sm lg:max-w-full flex flex-col border-[2px] border-gray-200 group-hover:border-red-400 rounded relative ">
-                                    <div className="flex items-center justify-start h-full px-1 flex-row ">
-                                        <Image className="h-full w-full" src={category?.image ? category?.image : 'https://erp.indoteknik.com/web/image?model=x_banner.banner&id=5&field=x_banner_image&unique=09202023100557'} width={56} height={48} quality={100} alt={category?.name} />
-                                        {/* <h2 className="text-gray-700 group-hover:text-[#E20613] line-clamp-2 content-center h-fit w-60 px-1 font-semibold text-sm text-start">{category?.name}</h2> */}
-                                    </div>
-                                </div>
-                            </div>
-                        </Link>
+                        <Link
+                        href={createSlug('/shop/category/', category?.name, category?.id)}
+                        key={category?.id}
+                        passHref
+                        className="block hover:scale-105 transition-transform duration-300 bg-cover bg-center h-[144px]"
+                        style={{
+                          backgroundImage: `url('${category?.image ? category?.image : 'https://erp.indoteknik.com/web/image?model=x_banner.banner&id=5&field=x_banner_image&unique=09202023100557'}')`,
+                        }}
+                      >
+                      </Link>
                     ))}
                 </div>
             )}
 
             {isMobile && (
                 <div className="py-4">
-                    <Swiper slidesPerView={2.3} spaceBetween={10}>
-                        {displayedCategories.map((category) => (
+                    <Swiper slidesPerView={1.2} spaceBetween={10}>
+                        {displayedCategories?.map((category) => (
                             <SwiperSlide key={category?.id}>
-                                <Link href={createSlug('/shop/category/', category?.name, category?.id)} passHref>
-                                    <div className="group transition-colors duration-300">
-                                        <div className="KartuInti min-h-16 max-h-16 w-26 max-w-sm lg:max-w-full flex flex-col border-[2px] border-gray-200 group-hover:bg-red-200 group-hover:border-red-400 rounded relative">
-                                            <div className="flex items-center justify-center h-full px-1 flex-row">
-                                                <Image
-                                                    src={category?.image1920 ? category?.image1920 : '/images/noimage.jpeg'}
-                                                    width={56}
-                                                    height={48}
-                                                    alt={category?.name}
-                                                />
-                                                <h2 className="text-gray-700 group-hover:text-[#E20613] line-clamp-2 content-center h-fit w-60 px-1 font-semibold text-sm text-start">
-                                                    {category?.name}
-                                                </h2>
-                                            </div>
-                                        </div>
-                                    </div>
+                                <Link
+                                    href={createSlug('/shop/category/', category?.name, category?.id)}
+                                    key={category?.id}
+                                    passHref
+                                    className="block  bg-cover bg-center h-[144px]"
+                                    style={{
+                                    backgroundImage: `url('${category?.image ? category?.image : 'https://erp.indoteknik.com/web/image?model=x_banner.banner&id=5&field=x_banner_image&unique=09202023100557'}')`,
+                                    }}
+                                >
                                 </Link>
                             </SwiperSlide>
                         ))}
-- 
cgit v1.2.3


From 7c2a69c9b48c1930dc3f7cbef20d6479b3047ca2 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 29 Jul 2024 17:13:30 +0700
Subject: <iman> update category lob

---
 src/lib/product/components/ProductSearch.jsx | 35 +++++++++++++++++-----------
 1 file changed, 21 insertions(+), 14 deletions(-)

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index 12e3b358..7ab6b8af 100644
--- a/src/lib/product/components/ProductSearch.jsx
+++ b/src/lib/product/components/ProductSearch.jsx
@@ -38,11 +38,10 @@ const ProductSearch = ({
   brand = null,
 }) => {
   const router = useRouter();
-   
   const { page = 1 } = query;
   const [q, setQ] = useState(query?.q || '*');
   const [search, setSearch] = useState(query?.q || '*');
-  const [limit, setLimit] = useState(query?.limit || 30);
+  const [limit, setLimit] = useState(router.query?.limit || 30);
   const [orderBy, setOrderBy] = useState(router.query?.orderBy || 'popular');
   const [finalQuery, setFinalQuery] = useState({});
   const [queryFinal, setQueryFinal] = useState({});
@@ -94,9 +93,13 @@ const ProductSearch = ({
       const ids = collectIds(dataCategoriesProduct);
       const newQuery = {
         fq: `category_id_ids:(${ids.join(' OR ')})`,
-        page,
+        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')){
@@ -114,9 +117,13 @@ const ProductSearch = ({
          
           const newQuery = {
             fq: `category_id_ids:(${mergedArray.join(' OR ')})`,
-            page,
-            brand : router.query.brand? router.query.brand : '',
             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);
@@ -148,17 +155,17 @@ 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;
@@ -373,8 +380,6 @@ const ProductSearch = ({
 
   const isNotReadyStockPage = router.asPath !== '/shop/search?orderBy=stock';
   
-  console.log("finalQuery",finalQuery)
-
   return (
     <>
       <MobileView>
@@ -476,7 +481,8 @@ const ProductSearch = ({
           <Pagination
             pageCount={pageCount}
             currentPage={parseInt(page)}
-            url={`${prefixUrl}?${toQuery(_.omit(query, ['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'
           />
 
@@ -665,7 +671,8 @@ const ProductSearch = ({
               <Pagination
                 pageCount={pageCount}
                 currentPage={parseInt(page)}
-                url={`${prefixUrl}?${toQuery(_.omit(query, ['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 593c508bb87451a985a5aec7e9d7bde45b18074b Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 30 Jul 2024 09:53:35 +0700
Subject: <iman> update category lob

---
 src/lib/product/components/LobSectionCategory.jsx | 1 -
 src/lib/product/components/ProductSearch.jsx      | 9 ++++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/LobSectionCategory.jsx b/src/lib/product/components/LobSectionCategory.jsx
index 34a09e46..03d6e8c0 100644
--- a/src/lib/product/components/LobSectionCategory.jsx
+++ b/src/lib/product/components/LobSectionCategory.jsx
@@ -22,7 +22,6 @@ const LobSectionCategory = ({ categories }) => {
     const handleToggleCategories = () => {
         setIsOpenCategory(!isOpenCategory);
     };
-    console.log("categories",categories[0]?.categoryIds)
 
     const displayedCategories = categories[0]?.categoryIds;
 
diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index 7ab6b8af..d4c5a308 100644
--- a/src/lib/product/components/ProductSearch.jsx
+++ b/src/lib/product/components/ProductSearch.jsx
@@ -379,7 +379,6 @@ const ProductSearch = ({
   };
 
   const isNotReadyStockPage = router.asPath !== '/shop/search?orderBy=stock';
-  
   return (
     <>
       <MobileView>
@@ -481,8 +480,8 @@ const ProductSearch = ({
           <Pagination
             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']))}`}
+            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'
           />
 
@@ -671,8 +670,8 @@ const ProductSearch = ({
               <Pagination
                 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']))}`}
+                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 c92b47f81b4ea90f799810555395af7afcfa5a4d Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 30 Jul 2024 14:47:28 +0700
Subject: <iman> update category management

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

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index d4c5a308..09534a5d 100644
--- a/src/lib/product/components/ProductSearch.jsx
+++ b/src/lib/product/components/ProductSearch.jsx
@@ -249,6 +249,7 @@ const ProductSearch = ({
       brands.push({ brand, qty });
     }
   }
+  
 
   const categories = [];
   for (
@@ -263,6 +264,7 @@ const ProductSearch = ({
       categories.push({ name, qty });
     }
   }
+  
 
   const orderOptions = [
     { value: 'price-asc', label: 'Harga Terendah' },
@@ -340,7 +342,7 @@ const ProductSearch = ({
       q: router.query.q,
       orderBy: orderBy,
       brand: brandValues.join(','),
-      category: categoryValues.join(','),
+      category: categoryValues?.join(','),
       priceFrom,
       priceTo,
     };
-- 
cgit v1.2.3


From 5296ce7dba6cf674b4942113a7716a89f05b64e0 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 30 Jul 2024 15:06:02 +0700
Subject: <iman> update category management search product

---
 src/lib/product/components/ProductFilterDesktop.jsx | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/ProductFilterDesktop.jsx b/src/lib/product/components/ProductFilterDesktop.jsx
index e4a62abb..384f2daa 100644
--- a/src/lib/product/components/ProductFilterDesktop.jsx
+++ b/src/lib/product/components/ProductFilterDesktop.jsx
@@ -102,7 +102,19 @@ const ProductFilterDesktop = ({ brands, categories, prefixUrl, defaultBrand = nu
     }
     params = _.pickBy(params, _.identity)
     params = toQuery(params)
-    router.push(`${prefixUrl}?${params}`)
+    
+    const slug = Array.isArray(router.query.slug) ? router.query.slug[0] : router.query.slug;
+
+    if (slug) {
+      if(prefixUrl.includes('category') || prefixUrl.includes('lob')){
+        router.push(`${prefixUrl}?${params}`)
+      }else{
+        router.push(`${prefixUrl}/${slug}?${params}`)
+      }
+    } else {
+      router.push(`${prefixUrl}?${params}`)
+    }
+  
   }
 
  
-- 
cgit v1.2.3


From 09e2fd0ec1e2a1d8438ec1c630a08bc349400ecb Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 30 Jul 2024 15:08:00 +0700
Subject: <iman> update error code

---
 src/lib/product/components/ProductFilterDesktop.jsx | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/ProductFilterDesktop.jsx b/src/lib/product/components/ProductFilterDesktop.jsx
index 384f2daa..a8073036 100644
--- a/src/lib/product/components/ProductFilterDesktop.jsx
+++ b/src/lib/product/components/ProductFilterDesktop.jsx
@@ -21,6 +21,7 @@ import Image from '@/core/components/elements/Image/Image'
 import { formatCurrency } from '@/core/utils/formatValue'
 
 const ProductFilterDesktop = ({ brands, categories, prefixUrl, defaultBrand = null }) => {
+  
   const router = useRouter()
   const { query } = router
   const [order, setOrder] = useState(query?.orderBy)
@@ -102,19 +103,14 @@ const ProductFilterDesktop = ({ brands, categories, prefixUrl, defaultBrand = nu
     }
     params = _.pickBy(params, _.identity)
     params = toQuery(params)
-    
+
     const slug = Array.isArray(router.query.slug) ? router.query.slug[0] : router.query.slug;
 
     if (slug) {
-      if(prefixUrl.includes('category') || prefixUrl.includes('lob')){
-        router.push(`${prefixUrl}?${params}`)
-      }else{
-        router.push(`${prefixUrl}/${slug}?${params}`)
-      }
+      router.push(`${prefixUrl}/${slug}?${params}`)
     } else {
       router.push(`${prefixUrl}?${params}`)
     }
-  
   }
 
  
-- 
cgit v1.2.3


From 7dc18df04a6cf75e696f53ca578e4c36cfce9748 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 30 Jul 2024 15:12:00 +0700
Subject: <iman> update category management filter search

---
 src/lib/product/components/ProductFilterDesktop.jsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/ProductFilterDesktop.jsx b/src/lib/product/components/ProductFilterDesktop.jsx
index a8073036..1933c5f0 100644
--- a/src/lib/product/components/ProductFilterDesktop.jsx
+++ b/src/lib/product/components/ProductFilterDesktop.jsx
@@ -107,7 +107,11 @@ const ProductFilterDesktop = ({ brands, categories, prefixUrl, defaultBrand = nu
     const slug = Array.isArray(router.query.slug) ? router.query.slug[0] : router.query.slug;
 
     if (slug) {
-      router.push(`${prefixUrl}/${slug}?${params}`)
+      if(prefixUrl.includes('category') || prefixUrl.includes('lob')){
+        router.push(`${prefixUrl}?${params}`)
+      }else{
+        router.push(`${prefixUrl}/${slug}?${params}`)
+      }
     } else {
       router.push(`${prefixUrl}?${params}`)
     }
-- 
cgit v1.2.3


From cb04d90c8887993f532d582e7cdb1780b86bd4be Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 7 Aug 2024 08:33:38 +0700
Subject: <iman> update error code voucher tidak terbaca

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

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/ProductCard.jsx b/src/lib/product/components/ProductCard.jsx
index e10241a7..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 62704c101d17afb7f71389ef23d6183b2cd16dfa Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 14 Aug 2024 15:11:33 +0700
Subject: <iman> update self picking di product card

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

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/ProductCard.jsx b/src/lib/product/components/ProductCard.jsx
index 35e2a665..4b3f693c 100644
--- a/src/lib/product/components/ProductCard.jsx
+++ b/src/lib/product/components/ProductCard.jsx
@@ -147,9 +147,20 @@ const ProductCard = ({ product, simpleTitle, variant = 'vertical' }) => {
         </Link>
         <div className='p-2 sm:p-3 pb-3 text-caption-2 sm:text-body-2 leading-5'>
           {product?.manufacture?.name ? (
-            <Link href={URL.manufacture} className='mb-1'>
-              {product.manufacture.name}
-            </Link>
+            <div className='flex justify-between'>
+              <Link href={URL.manufacture} className='mb-1'>
+                <div>
+                  {product.manufacture.name}
+                </div>
+              </Link>
+              {product?.is_in_bu && (
+                <div className='bg-red-500 rounded'>
+                  <span className='p-[6px] text-xs text-white'>
+                    Click & Pickup
+                  </span>
+                </div>
+              )}
+            </div>
           ) : (
             <div>-</div>
           )}
@@ -292,9 +303,18 @@ const ProductCard = ({ product, simpleTitle, variant = 'vertical' }) => {
             </div>
           )}
           {product?.manufacture?.name ? (
-            <Link href={URL.manufacture} className='mb-1'>
+            <div className='flex justify-between'> 
+              <Link href={URL.manufacture} className='mb-1'>
               {product.manufacture.name}
             </Link>
+            {/* {product?.is_in_bu && (
+              <div className='bg-red-500 rounded'>
+                <span className='p-[6px] text-xs text-white'>
+                  Click & Pickup
+                </span>
+              </div>
+            )} */}
+            </div>
           ) : (
             <div>-</div>
           )}
-- 
cgit v1.2.3


From 33363a1a8dc7f4641b7b054dc72339bf53495102 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 15 Aug 2024 16:55:28 +0700
Subject: <iman> update pickup image on product card

---
 src/lib/product/components/ProductCard.jsx | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/ProductCard.jsx b/src/lib/product/components/ProductCard.jsx
index 4b3f693c..a1491c7f 100644
--- a/src/lib/product/components/ProductCard.jsx
+++ b/src/lib/product/components/ProductCard.jsx
@@ -146,24 +146,20 @@ const ProductCard = ({ product, simpleTitle, variant = 'vertical' }) => {
           )}
         </Link>
         <div className='p-2 sm:p-3 pb-3 text-caption-2 sm:text-body-2 leading-5'>
-          {product?.manufacture?.name ? (
-            <div className='flex justify-between'>
-              <Link href={URL.manufacture} className='mb-1'>
-                <div>
-                  {product.manufacture.name}
-                </div>
-              </Link>
+          <div className='flex justify-between '>
+              {product?.manufacture?.name ? (
+                  <Link href={URL.manufacture} className='mb-1 mt-1'>
+                      {product.manufacture.name}
+                  </Link>
+              ) : (
+                <div>-</div>
+              )}
               {product?.is_in_bu && (
-                <div className='bg-red-500 rounded'>
-                  <span className='p-[6px] text-xs text-white'>
-                    Click & Pickup
-                  </span>
+                <div className=''>
+                  <Image src='/images/PICKUP-NOW.png' alt='pickup now' width={90} height={12} />
                 </div>
               )}
-            </div>
-          ) : (
-            <div>-</div>
-          )}
+          </div>
           <Link
             href={URL.product}
             className={`mb-2 !text-gray_r-12 leading-6 block line-clamp-3 h-[64px]`}
-- 
cgit v1.2.3


From 6dafc3c06566646bdf23ab1da271e337b131ccd9 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 22 Aug 2024 10:27:47 +0700
Subject: <iman> update name field

---
 src/lib/product/components/ProductCard.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/ProductCard.jsx b/src/lib/product/components/ProductCard.jsx
index a1491c7f..611fb002 100644
--- a/src/lib/product/components/ProductCard.jsx
+++ b/src/lib/product/components/ProductCard.jsx
@@ -154,7 +154,7 @@ const ProductCard = ({ product, simpleTitle, variant = 'vertical' }) => {
               ) : (
                 <div>-</div>
               )}
-              {product?.is_in_bu && (
+              {product?.isInBu && (
                 <div className=''>
                   <Image src='/images/PICKUP-NOW.png' alt='pickup now' width={90} height={12} />
                 </div>
-- 
cgit v1.2.3


From 6111e1115ffba4ef336dfb763b3fd23e52b6668b Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 23 Aug 2024 10:50:47 +0700
Subject: <iman> update click image pickup now

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

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/ProductCard.jsx b/src/lib/product/components/ProductCard.jsx
index 611fb002..22ce0533 100644
--- a/src/lib/product/components/ProductCard.jsx
+++ b/src/lib/product/components/ProductCard.jsx
@@ -155,9 +155,11 @@ const ProductCard = ({ product, simpleTitle, variant = 'vertical' }) => {
                 <div>-</div>
               )}
               {product?.isInBu && (
-                <div className=''>
-                  <Image src='/images/PICKUP-NOW.png' alt='pickup now' width={90} height={12} />
-                </div>
+                <Link href='/panduan-pick-up-service' className='group'>
+                <Image src='/images/PICKUP-NOW.png' className='group-hover:scale-105 transition-transform duration-200' alt='pickup now' width={90} height={12} />
+            </Link>
+                
+                
               )}
           </div>
           <Link
-- 
cgit v1.2.3


From e9f3435ceb5d85e4926f26c3a893b96edb898918 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Sat, 24 Aug 2024 09:29:31 +0700
Subject: <iman> update ready stock search

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

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index 9f19aced..24cdc690 100644
--- a/src/lib/product/components/ProductSearch.jsx
+++ b/src/lib/product/components/ProductSearch.jsx
@@ -42,7 +42,7 @@ const ProductSearch = ({
   const [q, setQ] = useState(query?.q || '*');
   const [search, setSearch] = useState(query?.q || '*');
   const [limit, setLimit] = useState(router.query?.limit || 30);
-  const [orderBy, setOrderBy] = useState(router.query?.orderBy || 'popular');
+  const [orderBy, setOrderBy] = useState(router.query?.orderBy || 'stock');
   const [finalQuery, setFinalQuery] = useState({});
   const [queryFinal, setQueryFinal] = useState({});
   const [dataCategoriesProduct, setDataCategoriesProduct] = useState([])
-- 
cgit v1.2.3


From 49118c78bf93fbb4d35b163e4c4b6db0f0f8be27 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Sat, 24 Aug 2024 10:25:13 +0700
Subject: <iman> update search sort by stock on populer

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

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index 24cdc690..9f19aced 100644
--- a/src/lib/product/components/ProductSearch.jsx
+++ b/src/lib/product/components/ProductSearch.jsx
@@ -42,7 +42,7 @@ const ProductSearch = ({
   const [q, setQ] = useState(query?.q || '*');
   const [search, setSearch] = useState(query?.q || '*');
   const [limit, setLimit] = useState(router.query?.limit || 30);
-  const [orderBy, setOrderBy] = useState(router.query?.orderBy || 'stock');
+  const [orderBy, setOrderBy] = useState(router.query?.orderBy || 'popular');
   const [finalQuery, setFinalQuery] = useState({});
   const [queryFinal, setQueryFinal] = useState({});
   const [dataCategoriesProduct, setDataCategoriesProduct] = useState([])
-- 
cgit v1.2.3


From 24d28d7538d712dde9d0aa3570e7f4703b3e2f55 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 26 Aug 2024 10:55:34 +0700
Subject: <iman> update order by default product card

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

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index 9f19aced..eaeac71a 100644
--- a/src/lib/product/components/ProductSearch.jsx
+++ b/src/lib/product/components/ProductSearch.jsx
@@ -42,7 +42,7 @@ const ProductSearch = ({
   const [q, setQ] = useState(query?.q || '*');
   const [search, setSearch] = useState(query?.q || '*');
   const [limit, setLimit] = useState(router.query?.limit || 30);
-  const [orderBy, setOrderBy] = useState(router.query?.orderBy || 'popular');
+  const [orderBy, setOrderBy] = useState(router.query?.orderBy);
   const [finalQuery, setFinalQuery] = useState({});
   const [queryFinal, setQueryFinal] = useState({});
   const [dataCategoriesProduct, setDataCategoriesProduct] = useState([])
-- 
cgit v1.2.3


From 66629736b12fb8d86f6e8505e4bacf2c64bb7270 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 26 Aug 2024 15:27:46 +0700
Subject: <iman> update margin category icon on search

---
 src/lib/product/components/CategorySection.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/lib/product')

diff --git a/src/lib/product/components/CategorySection.jsx b/src/lib/product/components/CategorySection.jsx
index 2af3db10..e8ebb095 100644
--- a/src/lib/product/components/CategorySection.jsx
+++ b/src/lib/product/components/CategorySection.jsx
@@ -35,7 +35,7 @@ const CategorySection = ({ categories }) => {
                             <div className="group transition-colors duration-300 ">
                                 <div className="KartuInti h-12 w-26 max-w-sm lg:max-w-full flex flex-col border-[2px] border-gray-200 group-hover:border-red-400 rounded relative ">
                                     <div className="flex items-center justify-start h-full px-1 flex-row ">
-                                        <Image className="h-full" src={category?.image1920 ? category?.image1920 : '/images/noimage.jpeg'} width={56} height={48} alt={category?.name} />
+                                        <Image className="h-full p-1" src={category?.image1920 ? category?.image1920 : '/images/noimage.jpeg'} width={56} height={48} alt={category?.name} />
                                         <h2 className="text-gray-700 group-hover:text-[#E20613] line-clamp-2 content-center h-fit w-60 px-1 font-semibold text-sm text-start">{category?.name}</h2>
                                     </div>
                                 </div>
-- 
cgit v1.2.3