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/category/components/Category.jsx       | 79 ++++++++++++++++++++------
 src/lib/home/components/CategoryPilihan.jsx    | 32 +++++++++++
 src/lib/product/components/CategorySection.jsx | 22 +++++++
 src/lib/product/components/ProductSearch.jsx   | 20 +++++++
 src/pages/index.jsx                            | 22 ++++++-
 src/pages/shop/category/[slug].jsx             |  9 ++-
 src/styles/globals.css                         |  5 +-
 7 files changed, 166 insertions(+), 23 deletions(-)
 create mode 100644 src/lib/home/components/CategoryPilihan.jsx
 create mode 100644 src/lib/product/components/CategorySection.jsx

(limited to 'src')

diff --git a/src/lib/category/components/Category.jsx b/src/lib/category/components/Category.jsx
index e6ea5acf..c147a3b3 100644
--- a/src/lib/category/components/Category.jsx
+++ b/src/lib/category/components/Category.jsx
@@ -2,10 +2,14 @@ import odooApi from '@/core/api/odooApi'
 import Link from '@/core/components/elements/Link/Link'
 import DesktopView from '@/core/components/views/DesktopView'
 import { createSlug } from '@/core/utils/slug'
+import { ChevronRightIcon } from '@heroicons/react/24/outline'
+import Image from 'next/image'
 import { useEffect, useState } from 'react'
 
 const Category = () => {
   const [categories, setCategories] = useState([])
+  const [openCategories, setOpenCategory] = useState([]);
+  
 
   useEffect(() => {
     const loadCategories = async () => {
@@ -31,7 +35,7 @@ const Category = () => {
     <DesktopView>
       <div className='category-mega-box'>
         {categories?.map((category) => (
-          <div key={category.id}>
+          <div key={category.id} className='flex'>
             <Link
               href={createSlug('/shop/category/', category.name, category.id)}
               className='category-mega-box__parent'
@@ -39,33 +43,74 @@ const Category = () => {
               {category.name}
             </Link>
             <div className='category-mega-box__child-wrapper'>
-              <div className='grid grid-cols-3 gap-x-4 gap-y-6 max-h-full overflow-auto'>
+              <div className='grid grid-cols-3 gap-x-4 gap-y-6 max-h-full !w-[590px] overflow-auto'>
                 {category.childs.map((child1Category) => (
-                  <div key={child1Category.id}>
+                  <div key={child1Category.id} className='w-full'>
                     <Link
                       href={createSlug('/shop/category/', child1Category.name, child1Category.id)}
-                      className='category-mega-box__child-one mb-4'
+                      className='category-mega-box__child-one mb-4 w-full h-8 flex justify-center line-clamp-2'
                     >
                       {child1Category.name}
                     </Link>
-                    <div className='flex flex-col gap-y-3'>
-                      {child1Category.childs.map((child2Category) => (
-                        <Link
-                          href={createSlug(
-                            '/shop/category/',
-                            child2Category.name,
-                            child2Category.id
-                          )}
-                          className='category-mega-box__child-two'
-                          key={child2Category.id}
-                        >
-                          {child2Category.name}
-                        </Link>
+                    <div className='flex flex-col gap-y-3 w-full'>
+                      {child1Category.childs.map((child2Category, index) => (
+                        (index < 4) && (
+                          <Link
+                            href={createSlug('/shop/category/', child2Category.name, child2Category.id)}
+                            className='category-mega-box__child-two truncate'
+                            key={child2Category.id}
+                          >
+                            {child2Category.name}
+                          </Link>
+                        )
                       ))}
+                      {child1Category.childs.length > 5 && (
+                        <div className='flex hover:bg-gray_r-8/35 rounded-10'>
+                          <Link
+                            href={createSlug('/shop/category/', child1Category.name, child1Category.id)}
+                            className='category-mega-box__child-one flex items-center gap-4 font-bold hover:ml-4'
+                          >
+                            <p className='mt-2 mb-0 text-danger-500 font-semibold'>Lihat Semua</p>
+                            <ChevronRightIcon className='w-4 text-danger-500 font-bold' />
+                          </Link>
+                        </div>
+                      )}
                     </div>
                   </div>
                 ))}
               </div>
+              <div className='category-mega-box__child-wrapper !w-[260px] !flex !flex-col !gap-4'>
+                <div className='flex flex-col'>
+                  <div className='grid grid-cols-2 max-h-full w-full gap-2'>
+                    {category.childs.map((brand, index) => (
+                      (index < 8 ) && (
+                        <div key={brand.id} className='w-full flex items-center justify-center pb-2'>
+                          <Link
+                            href={createSlug('/shop/category/', brand.name, brand.id)}
+                            className='category-mega-box__child-one w-fit h-full flex items-center justify-center '
+                          >
+                            <Image src='https://erp.indoteknik.com/api/image/x_manufactures/x_logo_manufacture/661' alt='' width={104} height={44} objectFit='cover' />
+                          </Link>
+                        </div>
+                      )
+                    ))}
+                  </div>
+                  {category.childs.length > 8 && (
+                    <div className='flex hover:bg-gray_r-8/35 rounded-10'>
+                      <Link
+                        href={createSlug('/shop/category/', category.name, category.id)}
+                        className='category-mega-box__child-one flex items-center gap-4 font-bold hover:ml-4'
+                      >
+                        <p className='mt-2 mb-0 text-danger-500 font-semibold'>Lihat Semua Brand</p>
+                        <ChevronRightIcon className='w-4 text-danger-500 font-bold' />
+                      </Link>
+                    </div>
+                  )}
+                </div>
+                <div className='flex w-60 h-20 object-cover'>
+                  <Image src='https://erp.indoteknik.com/api/image/x_banner.banner/x_banner_image/397' alt='' width={275} height={4} />
+                </div>
+              </div>
             </div>
           </div>
         ))}
diff --git a/src/lib/home/components/CategoryPilihan.jsx b/src/lib/home/components/CategoryPilihan.jsx
new file mode 100644
index 00000000..c506ef29
--- /dev/null
+++ b/src/lib/home/components/CategoryPilihan.jsx
@@ -0,0 +1,32 @@
+import Image from 'next/image'
+import useCategoryHome from '../hooks/useCategoryHome'
+
+const CategoryPilihan = ({ id, categories }) => {
+  const { categoryHome } = useCategoryHome({ id })
+
+  return (
+    <section>
+        <div className='flex flex-row items-center gap-4'>
+            <h1>Kategori Pilihan</h1>
+            <p className='text-gray_r-10'>total produk</p>
+        </div>
+        <div className="group/item grid grid-cols-6 gap-2 w-full h-full col-span-2 border">
+                {categories.map((category) => (
+                    <div className="max-w-sm w-full gap-4 lg:max-w-full flex flex-col bg-white px-4 py-2 border-2 border-gray_r-8 rounded-lg">
+                        <div className="group/edit flex items-center justify-center group-hover/item:visible">
+                            <Image src='group-hover/ https://erp.indoteknik.com/api/image/product.template/image_256/544371?ratio=square' width={80} height={80} alt={category?.name} />
+                            <a class="group/edit invisible hover:bg-slate-200 group-hover/item:visible ..." href="tel:{person.phone}">
+                                <span class="group-hover/edit:text-gray-700 ...">Call</span>
+                            </a>
+                        </div>
+                        <div className="flex flex-col justify-center leading-normal items-center">
+                            <h2 className="text-gray-900 font-bold text-sm items-center text-center">{category?.name}</h2>
+                        </div>
+                    </div>
+                ))}
+            </div>
+    </section>
+  )
+}
+
+export default CategoryPilihan
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
diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index c097530c..9675c355 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -1,5 +1,5 @@
 import dynamic from 'next/dynamic';
-import { useRef } from 'react';
+import { useEffect, useRef, useState } from 'react';
 
 import { HeroBannerSkeleton } from '@/components/skeleton/BannerSkeleton';
 import { PopularProductSkeleton } from '@/components/skeleton/PopularProductSkeleton';
@@ -11,6 +11,9 @@ import { FlashSaleSkeleton } from '@/lib/flashSale/skeleton/FlashSaleSkeleton';
 import PreferredBrandSkeleton from '@/lib/home/components/Skeleton/PreferredBrandSkeleton';
 import PromotinProgram from '@/lib/promotinProgram/components/HomePage';
 import PagePopupIformation from '~/modules/popup-information';
+import CategoryPilihan from '../lib/home/components/CategoryPilihan';
+import odooApi from '@/core/api/odooApi';
+import { getIdFromSlug } from '@/core/utils/slug'
 
 const BasicLayout = dynamic(() =>
   import('@/core/components/layouts/BasicLayout')
@@ -52,7 +55,7 @@ const CustomerReviews = dynamic(() =>
 );
 const ServiceList = dynamic(() => import('@/lib/home/components/ServiceList'));
 
-export default function Home() {
+export default function Home({categoryId}) {
   const bannerRef = useRef(null);
   const wrapperRef = useRef(null);
 
@@ -61,6 +64,18 @@ export default function Home() {
       bannerRef.current?.querySelector(':first-child')?.clientHeight + 'px';
   };
 
+  const [dataCategories, setDataCategories] = useState([])
+
+  useEffect(() => {
+    const loadCategories = async () => {
+     const getCategories = await odooApi('GET', '/api/v1/category/child?partner_id='+{categoryId})
+     if(getCategories){
+      setDataCategories(getCategories)
+     }
+    }
+    loadCategories()
+  }, [])
+
   return (
     <BasicLayout>
       <Seo
@@ -104,7 +119,8 @@ export default function Home() {
             </div>
             <FlashSale />
             <PromotinProgram />
-            <CategoryHomeId />
+            <CategoryPilihan categories={dataCategories}/>
+            {/* <CategoryHomeId /> */}
             <BannerSection />
             <CustomerReviews />
           </div>
diff --git a/src/pages/shop/category/[slug].jsx b/src/pages/shop/category/[slug].jsx
index 1afe30bf..11840d47 100644
--- a/src/pages/shop/category/[slug].jsx
+++ b/src/pages/shop/category/[slug].jsx
@@ -5,6 +5,8 @@ import { useRouter } from 'next/router';
 import Seo from '@/core/components/Seo';
 import { getIdFromSlug, getNameFromSlug } from '@/core/utils/slug';
 import Breadcrumb from '@/lib/category/components/Breadcrumb';
+import { useEffect, useState } from 'react';
+import odooApi from '@/core/api/odooApi';
 
 const BasicLayout = dynamic(() =>
   import('@/core/components/layouts/BasicLayout')
@@ -12,10 +14,14 @@ const BasicLayout = dynamic(() =>
 const ProductSearch = dynamic(() =>
   import('@/lib/product/components/ProductSearch')
 );
+const CategorySection = dynamic(() =>
+  import('@/lib/product/components/CategorySection')
+)
 
 export default function CategoryDetail() {
   const router = useRouter();
   const { slug = '', page = 1 } = router.query;
+  const [dataCategories, setDataCategories] = useState([])
 
   const categoryName = getNameFromSlug(slug);
   const categoryId = getIdFromSlug(slug);
@@ -43,8 +49,9 @@ export default function CategoryDetail() {
 
       <Breadcrumb categoryId={categoryId} />
 
+
       {!_.isEmpty(router.query) && (
-        <ProductSearch query={query} prefixUrl={`/shop/category/${slug}`} />
+        <ProductSearch query={query} categories ={categoryId} prefixUrl={`/shop/category/${slug}`} />
       )}
     </BasicLayout>
   );
diff --git a/src/styles/globals.css b/src/styles/globals.css
index f6561b00..505dcab4 100644
--- a/src/styles/globals.css
+++ b/src/styles/globals.css
@@ -583,12 +583,11 @@ button {
     @apply absolute 
         left-[100%] 
         top-12
-        w-[40vw] 
         bg-gray_r-1/90
         backdrop-blur-md
         border 
         border-gray_r-6 
-        p-6 
+        p-6
         opacity-0
         h-full 
         transition-all
@@ -604,6 +603,7 @@ button {
         transition-colors 
         ease-linear 
         duration-100 
+        w-fit
         font-semibold;
 }
 
@@ -613,6 +613,7 @@ button {
         transition-colors 
         ease-linear 
         duration-100 
+        w-full
         font-normal;
 }
 
-- 
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/home/components/CategoryPilihan.jsx    | 38 ++++++++++++++++----------
 src/lib/product/components/CategorySection.jsx | 22 +++++++++------
 src/lib/product/components/ProductSearch.jsx   |  7 ++---
 3 files changed, 39 insertions(+), 28 deletions(-)

(limited to 'src')

diff --git a/src/lib/home/components/CategoryPilihan.jsx b/src/lib/home/components/CategoryPilihan.jsx
index c506ef29..3f1066e2 100644
--- a/src/lib/home/components/CategoryPilihan.jsx
+++ b/src/lib/home/components/CategoryPilihan.jsx
@@ -1,30 +1,40 @@
 import Image from 'next/image'
 import useCategoryHome from '../hooks/useCategoryHome'
+import Link from '@/core/components/elements/Link/Link'
+import { createSlug } from '@/core/utils/slug'
 
 const CategoryPilihan = ({ id, categories }) => {
   const { categoryHome } = useCategoryHome({ id })
-
+    console.log("id",id)
+    console.log("categories",categories)
   return (
     <section>
-        <div className='flex flex-row items-center gap-4'>
-            <h1>Kategori Pilihan</h1>
-            <p className='text-gray_r-10'>total produk</p>
+        <div className='flex flex-row items-center mb-4'>
+            <div className='font-semibold sm:text-h-lg mr-2'>Kategori Pilihan</div>
+            <p className='text-gray_r-10 text-sm'>200 Rb+ Produk Unggulan & 800+ Brand Rekomendasi tersedia!</p>
         </div>
-        <div className="group/item grid grid-cols-6 gap-2 w-full h-full col-span-2 border">
+        <div className="group/item grid grid-cols-6 gap-y-2 w-full h-full col-span-2 ">
                 {categories.map((category) => (
-                    <div className="max-w-sm w-full gap-4 lg:max-w-full flex flex-col bg-white px-4 py-2 border-2 border-gray_r-8 rounded-lg">
-                        <div className="group/edit flex items-center justify-center group-hover/item:visible">
-                            <Image src='group-hover/ https://erp.indoteknik.com/api/image/product.template/image_256/544371?ratio=square' width={80} height={80} alt={category?.name} />
-                            <a class="group/edit invisible hover:bg-slate-200 group-hover/item:visible ..." href="tel:{person.phone}">
-                                <span class="group-hover/edit:text-gray-700 ...">Call</span>
-                            </a>
+                    <div className="KartuInti h-48 w-60 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-col group-hover/item:visible">
+                                <div className=' h-36'>
+                                    <Image className='group-hover:scale-110 transition-transform duration-300' src='https://erp.indoteknik.com/api/image/product.template/image_256/544371?ratio=square' width={120} height={120} alt={category?.name} />
+                                </div>
+                                <h2 className="text-gray-700 content-center h-12 border-t-[1px] px-1 w-60 border-gray-200 font-normal text-sm text-center">{category?.name}</h2>
+                            </div>
                         </div>
-                        <div className="flex flex-col justify-center leading-normal items-center">
-                            <h2 className="text-gray-900 font-bold text-sm items-center text-center">{category?.name}</h2>
+                        <div className='KartuA relative inset-0  flex h-36 w-60   items-center justify-center opacity-0 group-hover:opacity-75 group-hover:bg-[#E20613] transition-opacity '>
+                            <Link
+                                href={createSlug('/shop/category/', category?.name, category?.id)}
+                                className='category-mega-box__parent text-white   rounded-lg'
+                            >
+                                Lihat semua
+                            </Link>
                         </div>
                     </div>
                 ))}
-            </div>
+        </div>
     </section>
   )
 }
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/home/components/CategoryPilihan.jsx    | 34 ++++++++++++++++++++++----
 src/lib/product/components/CategorySection.jsx | 22 ++++++++---------
 2 files changed, 40 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/lib/home/components/CategoryPilihan.jsx b/src/lib/home/components/CategoryPilihan.jsx
index 3f1066e2..4a1106b0 100644
--- a/src/lib/home/components/CategoryPilihan.jsx
+++ b/src/lib/home/components/CategoryPilihan.jsx
@@ -2,17 +2,41 @@ import Image from 'next/image'
 import useCategoryHome from '../hooks/useCategoryHome'
 import Link from '@/core/components/elements/Link/Link'
 import { createSlug } from '@/core/utils/slug'
+import { useEffect, useState } from 'react';
+import { bannerApi } from '../../../api/bannerApi';
+const { useQuery } = require('react-query')
+import { HeroBannerSkeleton } from '../../../components/skeleton/BannerSkeleton';
+
 
 const CategoryPilihan = ({ id, categories }) => {
-  const { categoryHome } = useCategoryHome({ id })
-    console.log("id",id)
-    console.log("categories",categories)
-  return (
-    <section>
+    const heroBanner = useQuery('categoryPilihan', bannerApi({ type: 'index-a-1' }));
+      
+      return (
+          <section>
         <div className='flex flex-row items-center mb-4'>
             <div className='font-semibold sm:text-h-lg mr-2'>Kategori Pilihan</div>
             <p className='text-gray_r-10 text-sm'>200 Rb+ Produk Unggulan & 800+ Brand Rekomendasi tersedia!</p>
         </div>
+        <div className='flex w-full h-48 bg-red-300 mb-4'>
+            {heroBanner.data &&
+                heroBanner.data?.length > 0 && (
+                    <div className='px-4 sm:px-0  object-fill '>
+                        {/* {heroBanner.data?.map((banner) => ( */}
+                            <Link key={heroBanner.data[0].id} href={heroBanner.data[0].url}>
+                                <Image
+                                width={439}
+                                height={150}
+                                quality={100}
+                                src={heroBanner.data[0].image}
+                                alt={heroBanner.data[0].name}
+                                className='h-48 object-fill w-full rounded hover:scale-105 transition duration-500 ease-in-out'
+                                />
+                            </Link>
+                            {/* ))} */}
+                    </div>
+                
+                )}
+        </div>
         <div className="group/item grid grid-cols-6 gap-y-2 w-full h-full col-span-2 ">
                 {categories.map((category) => (
                     <div className="KartuInti h-48 w-60 max-w-sm   lg:max-w-full flex flex-col   border-[1px] border-gray-200  relative group">
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 59cba752134fa41063956569a3f4e7ed2a6d2537 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 8 Jul 2024 08:48:29 +0700
Subject: <iman> add dynamic category

---
 src/lib/home/components/CategoryDynamic.jsx | 9 +++++++++
 src/pages/index.jsx                         | 2 ++
 2 files changed, 11 insertions(+)
 create mode 100644 src/lib/home/components/CategoryDynamic.jsx

(limited to 'src')

diff --git a/src/lib/home/components/CategoryDynamic.jsx b/src/lib/home/components/CategoryDynamic.jsx
new file mode 100644
index 00000000..59a1858b
--- /dev/null
+++ b/src/lib/home/components/CategoryDynamic.jsx
@@ -0,0 +1,9 @@
+const CategoryDynamic = ({}) =>{
+    return(
+        <div>
+            DISINI CATEGORY DYNAMIC
+        </div>
+    )
+};
+
+export default CategoryDynamic;
\ No newline at end of file
diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 9675c355..149352c2 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -12,6 +12,7 @@ import PreferredBrandSkeleton from '@/lib/home/components/Skeleton/PreferredBran
 import PromotinProgram from '@/lib/promotinProgram/components/HomePage';
 import PagePopupIformation from '~/modules/popup-information';
 import CategoryPilihan from '../lib/home/components/CategoryPilihan';
+import CategoryDynamic from '../lib/home/components/CategoryDynamic';
 import odooApi from '@/core/api/odooApi';
 import { getIdFromSlug } from '@/core/utils/slug'
 
@@ -120,6 +121,7 @@ export default function Home({categoryId}) {
             <FlashSale />
             <PromotinProgram />
             <CategoryPilihan categories={dataCategories}/>
+            <CategoryDynamic/>
             {/* <CategoryHomeId /> */}
             <BannerSection />
             <CustomerReviews />
-- 
cgit v1.2.3


From bc7c0d1891db37ad314bd5016e19917e0f1e63be Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 17 Jul 2024 15:38:45 +0700
Subject: <iman> update error code

---
 src/api/promoApi.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/api/promoApi.js b/src/api/promoApi.js
index f262db8d..3f85db8e 100644
--- a/src/api/promoApi.js
+++ b/src/api/promoApi.js
@@ -13,11 +13,11 @@ export const fetchPromoItems = async (type) => {
   }
 };
 
-export const fetchPromoItemsSolr = async (type) => {
+export const fetchPromoItemsSolr = async (type, start, rows) => {
   // let query = type ? `type_value_s:${type}` : '*:*';
   let sort ='sort=if(exists(sequence_i),0,1) asc, sequence_i asc, if(exists(total_qty_sold_f), total_qty_sold_f, -1) desc';
-  let start = 0
-  let rows = 100
+  // let start = 0
+  // let rows = 100
   // let start = 0
   // let rows = 10
   try {
-- 
cgit v1.2.3


From 0840f5ccc7493dfa091508db84bad8a21e073268 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 18 Jul 2024 17:24:36 +0700
Subject: <iman> update category-management

---
 src/lib/home/components/CategoryDynamic.jsx | 95 ++++++++++++++++++++++++++---
 src/lib/home/hooks/useCategoryManagement.js | 34 +++++++++++
 src/pages/index.jsx                         |  9 ++-
 3 files changed, 129 insertions(+), 9 deletions(-)
 create mode 100644 src/lib/home/hooks/useCategoryManagement.js

(limited to 'src')

diff --git a/src/lib/home/components/CategoryDynamic.jsx b/src/lib/home/components/CategoryDynamic.jsx
index 59a1858b..e3052d11 100644
--- a/src/lib/home/components/CategoryDynamic.jsx
+++ b/src/lib/home/components/CategoryDynamic.jsx
@@ -1,9 +1,90 @@
-const CategoryDynamic = ({}) =>{
-    return(
-        <div>
-            DISINI CATEGORY DYNAMIC
-        </div>
-    )
+import React, { useEffect, useState } from 'react';
+import {fetchProductManagementSolr} from '../hooks/useCategoryManagement';
+import NextImage from 'next/image';
+import Link from "next/link"
+import router from 'next/router';
+import { createSlug } from '@/core/utils/slug'
+
+const CategoryDynamic =    () => {
+  const [promoItems, setPromoItems] = useState([]);
+  useEffect(() => {
+    const loadPromo = async () => {
+      
+      try {
+        const items = await fetchProductManagementSolr();
+        setPromoItems(items);
+
+      } catch (loadError) {
+        // console.error("Error loading promo items:", loadError)
+      }
+    }
+
+  
+      loadPromo()
+
+  },[]);
+ 
+  const image = 'https://erp.indoteknik.com/api/image/product.template/image_256/544371?ratio=square'
+  const handleLink = (name, id) => {
+    return `/shop/category/${name}/${id}`;
 };
 
-export default CategoryDynamic;
\ No newline at end of file
+  console.log("promoItems",promoItems)
+
+  return (
+    <div>
+      <div className='font-semibold sm:text-h-lg mb-6 px-4 sm:px-0'>Kategori Pilihan</div>
+      {/* Render category data */}
+      {promoItems && promoItems.map((category) => (
+        <div key={category.id}>
+          <div className='bagian-judul flex flex-row justify-start items-center gap-3'>
+              <div className='font-semibold sm:text-h-lg mr-2'>{category.name}</div>
+              <p className='text-gray_r-10 text-sm'>999 rb+ Produk tersedia</p>
+            <Link href={createSlug('/shop/category/', category?.name, category?.id)} className="!text-red-500 font-semibold">Lihat Semua</Link>
+          </div>
+          <p>
+            Kategori level 1 : {category.name} - ID level 1 : {category.id}
+            <NextImage
+                src={category.image? category.image : image}
+                alt={category.name}
+                width={90}
+                height={30}
+              />
+          </p>
+          <div>
+            {category.category_id2.map((index)=> (
+              <div key={index.id}>
+                  <p>
+                    id LEVEL 2: {index.id_level_2} - Name LEVEL 2: {index.name}
+                    <NextImage
+                      src={index.image? index.image : image}
+                      alt={index.name}
+                      width={90}
+                      height={30}
+                    />
+                    <div>
+                      {index.child_frontend_id_i.map((x)=> (
+                        <div key={x.id}>
+                              <p>
+                                id LEVEL 3: {x.id_level_3} - name LEVEL 3: {x.name}
+                                <NextImage
+                                  src={x.image? x.image : image}
+                                  alt={x.name}
+                                  width={90}
+                                  height={30}
+                                />
+                              </p>
+                          </div>
+                        ))}
+                    </div>
+                  </p>
+              </div>
+            ))}
+          </div>
+        </div>
+      ))}
+    </div>
+  );
+}
+
+export default CategoryDynamic;
diff --git a/src/lib/home/hooks/useCategoryManagement.js b/src/lib/home/hooks/useCategoryManagement.js
new file mode 100644
index 00000000..7c01df6e
--- /dev/null
+++ b/src/lib/home/hooks/useCategoryManagement.js
@@ -0,0 +1,34 @@
+export const fetchProductManagementSolr = async () => {
+  try {
+    const queryParams = new URLSearchParams({q: 'type_value_s:bundling'})
+    const response = await fetch(`/solr/product_category_management/query?q=*:*&q.op=OR&indent=true`);
+    // console.log("response", response)
+    if (!response.ok) {
+      throw new Error(`HTTP error! status: ${response.status}`);
+    }
+    const data = await response.json();
+    // console.log("data",data)
+    const dataManagement = await map(data.response.docs);
+    // console.log("dataManagement",dataManagement)
+    return dataManagement;
+  } catch (error) {
+    console.error("Error fetching promotion data:", error);
+    return [];
+  }
+};
+
+const map = async (promotions) => {
+  const result = [];
+  for (const promotion of promotions) {
+    const data = {
+      id: promotion.id,
+      category_id: promotion.category_id_i,
+      name: promotion.name_s,
+      sequence: promotion.sequence_i,
+      image: promotion.image_s,
+      category_id2: JSON.parse(promotion.category_id2_s),
+    };
+    result.push(data);
+  }
+  return result;
+};
diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 149352c2..b5d004ca 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -12,7 +12,7 @@ import PreferredBrandSkeleton from '@/lib/home/components/Skeleton/PreferredBran
 import PromotinProgram from '@/lib/promotinProgram/components/HomePage';
 import PagePopupIformation from '~/modules/popup-information';
 import CategoryPilihan from '../lib/home/components/CategoryPilihan';
-import CategoryDynamic from '../lib/home/components/CategoryDynamic';
+// import CategoryDynamic from '../lib/home/components/CategoryDynamic';
 import odooApi from '@/core/api/odooApi';
 import { getIdFromSlug } from '@/core/utils/slug'
 
@@ -51,6 +51,11 @@ const BannerSection = dynamic(() =>
 const CategoryHomeId = dynamic(() =>
   import('@/lib/home/components/CategoryHomeId')
 );
+
+const CategoryDynamic = dynamic(() =>
+  import('@/lib/home/components/CategoryDynamic')
+);
+
 const CustomerReviews = dynamic(() =>
   import('@/lib/review/components/CustomerReviews')
 );
@@ -122,7 +127,7 @@ export default function Home({categoryId}) {
             <PromotinProgram />
             <CategoryPilihan categories={dataCategories}/>
             <CategoryDynamic/>
-            {/* <CategoryHomeId /> */}
+            <CategoryHomeId />
             <BannerSection />
             <CustomerReviews />
           </div>
-- 
cgit v1.2.3


From 8564ea1361d40560679df6823b28dfc7e02ab197 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 19 Jul 2024 16:45:46 +0700
Subject: <iman> update view category dynamic

---
 src/lib/home/components/CategoryDynamic.jsx | 81 +++++++++++++----------------
 src/lib/home/hooks/useCategoryManagement.js |  2 +-
 2 files changed, 38 insertions(+), 45 deletions(-)

(limited to 'src')

diff --git a/src/lib/home/components/CategoryDynamic.jsx b/src/lib/home/components/CategoryDynamic.jsx
index e3052d11..4180438a 100644
--- a/src/lib/home/components/CategoryDynamic.jsx
+++ b/src/lib/home/components/CategoryDynamic.jsx
@@ -18,66 +18,59 @@ const CategoryDynamic =    () => {
         // console.error("Error loading promo items:", loadError)
       }
     }
-
-  
       loadPromo()
 
   },[]);
- 
-  const image = 'https://erp.indoteknik.com/api/image/product.template/image_256/544371?ratio=square'
-  const handleLink = (name, id) => {
-    return `/shop/category/${name}/${id}`;
-};
 
   console.log("promoItems",promoItems)
 
   return (
     <div>
-      <div className='font-semibold sm:text-h-lg mb-6 px-4 sm:px-0'>Kategori Pilihan</div>
+      {/* <div className='font-semibold sm:text-h-lg mb-2 px-4 sm:px-0'>Kategori Pilihan</div> */}
       {/* Render category data */}
       {promoItems && promoItems.map((category) => (
         <div key={category.id}>
-          <div className='bagian-judul flex flex-row justify-start items-center gap-3'>
+          <div className='bagian-judul flex flex-row justify-start items-center gap-3 mb-4 mt-4'>
               <div className='font-semibold sm:text-h-lg mr-2'>{category.name}</div>
               <p className='text-gray_r-10 text-sm'>999 rb+ Produk tersedia</p>
-            <Link href={createSlug('/shop/category/', category?.name, category?.id)} className="!text-red-500 font-semibold">Lihat Semua</Link>
+            <Link href={createSlug('/shop/category/', category?.name, category?.category_id)} className="!text-red-500 font-semibold">Lihat Semua</Link>
           </div>
-          <p>
-            Kategori level 1 : {category.name} - ID level 1 : {category.id}
-            <NextImage
-                src={category.image? category.image : image}
-                alt={category.name}
-                width={90}
-                height={30}
-              />
-          </p>
-          <div>
+          <div className='grid grid-cols-3 gap-2'>
             {category.category_id2.map((index)=> (
-              <div key={index.id}>
-                  <p>
-                    id LEVEL 2: {index.id_level_2} - Name LEVEL 2: {index.name}
-                    <NextImage
-                      src={index.image? index.image : image}
-                      alt={index.name}
-                      width={90}
-                      height={30}
-                    />
-                    <div>
-                      {index.child_frontend_id_i.map((x)=> (
-                        <div key={x.id}>
-                              <p>
-                                id LEVEL 3: {x.id_level_3} - name LEVEL 3: {x.name}
-                                <NextImage
-                                  src={x.image? x.image : image}
-                                  alt={x.name}
-                                  width={90}
-                                  height={30}
-                                />
-                              </p>
-                          </div>
-                        ))}
+              <div key={index.id} className='border justify-start items-start'>
+                <div className='p-3'>
+                    <div className='flex flex-row border mb-2 justify-start items-center'>
+                      <NextImage
+                        src={index.image? index.image : "https://erp.indoteknik.com/api/image/product.template/image_256/120726?ratio=square"}
+                        alt={index.name}
+                        width={90}
+                        height={30}
+                        className='object-fit'
+                      />
+                      <div className='bagian-judul flex flex-col justify-center items-start gap-2 ml-2'>
+                          <div className='font-semibold text-lg mr-2'>{index.name}</div>
+                          <p className='text-gray_r-10 text-sm'>999 rb+ Produk</p>
+                          <Link href={createSlug('/shop/category/', index?.name, index?.id_level_2)} className="!text-red-500 font-semibold">Lihat Semua</Link>
+                      </div>
+                    </div>
+                    <div className='grid grid-cols-2 gap-2 overflow-y-auto max-h-[240px]' >
+                        {index.child_frontend_id_i.map((x)=> (
+                          <div key={x.id}>
+                                <Link href={createSlug('/shop/category/', x?.name, x?.id_level_3)} className="flex flex-row gap-2 border group hover:border-red-500">
+                                    <NextImage
+                                      src={x.image? x.image : "https://erp.indoteknik.com/api/image/product.template/image_256/127221?ratio=square"}
+                                      alt={x.name}
+                                      width={40}
+                                      height={40}
+                                    />
+                                    <div className='bagian-judul flex flex-col justify-center items-center gap-2 break-words line-clamp-2 group-hover:text-red-500'>
+                                        <div className='font-semibold line-clamp-2 group-hover:text-red-500 text-sm mr-2'>{x.name}</div>
+                                    </div>
+                                </Link>
+                            </div>
+                          ))}
                     </div>
-                  </p>
+                </div>
               </div>
             ))}
           </div>
diff --git a/src/lib/home/hooks/useCategoryManagement.js b/src/lib/home/hooks/useCategoryManagement.js
index 7c01df6e..db4e79e1 100644
--- a/src/lib/home/hooks/useCategoryManagement.js
+++ b/src/lib/home/hooks/useCategoryManagement.js
@@ -1,7 +1,7 @@
 export const fetchProductManagementSolr = async () => {
   try {
     const queryParams = new URLSearchParams({q: 'type_value_s:bundling'})
-    const response = await fetch(`/solr/product_category_management/query?q=*:*&q.op=OR&indent=true`);
+    const response = await fetch(`/solr/product_category_management/query?q=*:*&q.op=OR&sort=sequence_i asc&indent=true`);
     // console.log("response", response)
     if (!response.ok) {
       throw new Error(`HTTP error! status: ${response.status}`);
-- 
cgit v1.2.3


From 911e0fdc6beb2f97c7e390a6aec5773202189d68 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 19 Jul 2024 17:07:23 +0700
Subject: <iman> update mobile view

---
 src/lib/home/components/CategoryDynamicMobile.jsx | 69 +++++++++++++++++++++++
 src/pages/index.jsx                               |  8 +++
 2 files changed, 77 insertions(+)
 create mode 100644 src/lib/home/components/CategoryDynamicMobile.jsx

(limited to 'src')

diff --git a/src/lib/home/components/CategoryDynamicMobile.jsx b/src/lib/home/components/CategoryDynamicMobile.jsx
new file mode 100644
index 00000000..a550bd62
--- /dev/null
+++ b/src/lib/home/components/CategoryDynamicMobile.jsx
@@ -0,0 +1,69 @@
+import React, { useEffect, useState } from 'react';
+import {fetchProductManagementSolr} from '../hooks/useCategoryManagement';
+import NextImage from 'next/image';
+import Link from "next/link"
+import router from 'next/router';
+import { createSlug } from '@/core/utils/slug'
+import { Swiper, SwiperProps, SwiperSlide }  from 'swiper/react';
+import 'swiper/css';
+
+const CategoryDynamicMobile =    () => {
+  const [promoItems, setPromoItems] = useState([]);
+  useEffect(() => {
+    const loadPromo = async () => {
+      
+      try {
+        const items = await fetchProductManagementSolr();
+        setPromoItems(items);
+
+      } catch (loadError) {
+        // console.error("Error loading promo items:", loadError)
+      }
+    }
+      loadPromo()
+
+  },[]);
+
+  console.log("promoItems",promoItems)
+
+  return (
+    <div className='p-4'>
+      {/* <div className='font-semibold sm:text-h-lg mb-2 px-4 sm:px-0'>Kategori Pilihan</div> */}
+      {/* Render category data */}
+      {promoItems && promoItems.map((category) => (
+        <div key={category.id}>
+          <div className='bagian-judul flex flex-row justify-between items-center gap-3 mb-4 mt-4'>
+              <div className='font-semibold sm:text-h-sm mr-2'>{category.name}</div>
+                <Link href={createSlug('/shop/category/', category?.name, category?.category_id)} className="!text-red-500 font-semibold text-sm">Lihat Semua</Link>
+          </div>
+          <Swiper slidesPerView={2.3} spaceBetween={10}>
+          {category.category_id2.map((index)=> (
+            <SwiperSlide>
+              <div key={index.id} className='border justify-start items-start'>
+                <div className='p-3'>
+                    <div className='flex flex-row border mb-2 justify-start items-center'>
+                      <NextImage
+                        src={index.image? index.image : "https://erp.indoteknik.com/api/image/product.template/image_256/120726?ratio=square"}
+                        alt={index.name}
+                        width={90}
+                        height={30}
+                        className='object-fit'
+                      />
+                      <div className='bagian-judul flex flex-col justify-center items-start gap-2 ml-2'>
+                          <div className='font-semibold text-lg mr-2'>{index.name}</div>
+                          <p className='text-gray_r-10 text-sm'>999 rb+ Produk</p>
+                          <Link href={createSlug('/shop/category/', index?.name, index?.id_level_2)} className="!text-red-500 font-semibold">Lihat Semua</Link>
+                      </div>
+                    </div>
+                </div>
+              </div>
+            </SwiperSlide>
+            ))}
+          </Swiper>
+        </div>
+      ))}
+    </div>
+  );
+}
+
+export default CategoryDynamicMobile;
diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index b5d004ca..0255e239 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -56,6 +56,10 @@ const CategoryDynamic = dynamic(() =>
   import('@/lib/home/components/CategoryDynamic')
 );
 
+const CategoryDynamicMobile = dynamic(() =>
+  import('@/lib/home/components/CategoryDynamicMobile')
+);
+
 const CustomerReviews = dynamic(() =>
   import('@/lib/review/components/CustomerReviews')
 );
@@ -153,6 +157,10 @@ export default function Home({categoryId}) {
           <DelayRender renderAfter={600}>
             <PromotinProgram />
           </DelayRender>
+          <DelayRender renderAfter={600}>
+            {/* <CategoryPilihan categories={dataCategories}/> */}
+            <CategoryDynamicMobile/>
+          </DelayRender>
           <DelayRender renderAfter={800}>
             <PopularProduct />
           </DelayRender>
-- 
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/home/components/CategoryDynamic.jsx       | 14 ++--
 src/lib/home/components/CategoryDynamicMobile.jsx | 97 +++++++++++++++--------
 src/lib/home/components/CategoryPilihan.jsx       |  2 +-
 src/lib/product/components/CategorySection.jsx    | 51 +++++++++---
 src/lib/product/components/ProductSearch.jsx      |  1 +
 5 files changed, 111 insertions(+), 54 deletions(-)

(limited to 'src')

diff --git a/src/lib/home/components/CategoryDynamic.jsx b/src/lib/home/components/CategoryDynamic.jsx
index 4180438a..244543be 100644
--- a/src/lib/home/components/CategoryDynamic.jsx
+++ b/src/lib/home/components/CategoryDynamic.jsx
@@ -26,22 +26,20 @@ const CategoryDynamic =    () => {
 
   return (
     <div>
-      {/* <div className='font-semibold sm:text-h-lg mb-2 px-4 sm:px-0'>Kategori Pilihan</div> */}
-      {/* Render category data */}
       {promoItems && promoItems.map((category) => (
         <div key={category.id}>
           <div className='bagian-judul flex flex-row justify-start items-center gap-3 mb-4 mt-4'>
               <div className='font-semibold sm:text-h-lg mr-2'>{category.name}</div>
               <p className='text-gray_r-10 text-sm'>999 rb+ Produk tersedia</p>
-            <Link href={createSlug('/shop/category/', category?.name, category?.category_id)} className="!text-red-500 font-semibold">Lihat Semua</Link>
+              <Link href={createSlug('/shop/category/', category?.name, category?.category_id)} className="!text-red-500 font-semibold">Lihat Semua</Link>
           </div>
           <div className='grid grid-cols-3 gap-2'>
             {category.category_id2.map((index)=> (
-              <div key={index.id} className='border justify-start items-start'>
+              <div key={index.id} className='border rounded justify-start items-start'>
                 <div className='p-3'>
-                    <div className='flex flex-row border mb-2 justify-start items-center'>
+                    <div className='flex flex-row border rounded mb-2 justify-start items-center'>
                       <NextImage
-                        src={index.image? index.image : "https://erp.indoteknik.com/api/image/product.template/image_256/120726?ratio=square"}
+                        src={index.image? index.image : "/images/noimage.jpeg"}
                         alt={index.name}
                         width={90}
                         height={30}
@@ -56,9 +54,9 @@ const CategoryDynamic =    () => {
                     <div className='grid grid-cols-2 gap-2 overflow-y-auto max-h-[240px]' >
                         {index.child_frontend_id_i.map((x)=> (
                           <div key={x.id}>
-                                <Link href={createSlug('/shop/category/', x?.name, x?.id_level_3)} className="flex flex-row gap-2 border group hover:border-red-500">
+                                <Link href={createSlug('/shop/category/', x?.name, x?.id_level_3)} className="flex flex-row gap-2 border rounded group hover:border-red-500">
                                     <NextImage
-                                      src={x.image? x.image : "https://erp.indoteknik.com/api/image/product.template/image_256/127221?ratio=square"}
+                                      src={x.image? x.image : "/images/noimage.jpeg"}
                                       alt={x.name}
                                       width={40}
                                       height={40}
diff --git a/src/lib/home/components/CategoryDynamicMobile.jsx b/src/lib/home/components/CategoryDynamicMobile.jsx
index a550bd62..317042b8 100644
--- a/src/lib/home/components/CategoryDynamicMobile.jsx
+++ b/src/lib/home/components/CategoryDynamicMobile.jsx
@@ -1,69 +1,102 @@
 import React, { useEffect, useState } from 'react';
-import {fetchProductManagementSolr} from '../hooks/useCategoryManagement';
+import { fetchProductManagementSolr } from '../hooks/useCategoryManagement';
 import NextImage from 'next/image';
-import Link from "next/link"
-import router from 'next/router';
-import { createSlug } from '@/core/utils/slug'
-import { Swiper, SwiperProps, SwiperSlide }  from 'swiper/react';
+import Link from "next/link";
+import { createSlug } from '@/core/utils/slug';
+import { Swiper, SwiperSlide } from 'swiper/react';
 import 'swiper/css';
 
-const CategoryDynamicMobile =    () => {
+const CategoryDynamicMobile = () => {
   const [promoItems, setPromoItems] = useState([]);
+  const [selectedCategory, setSelectedCategory] = useState({});
+
   useEffect(() => {
     const loadPromo = async () => {
-      
       try {
         const items = await fetchProductManagementSolr();
         setPromoItems(items);
-
+        if (items.length > 0) {
+          const initialSelections = items.reduce((acc, category) => {
+            if (category.category_id2.length > 0) {
+              acc[category.id] = category.category_id2[0].id_level_2;
+            }
+            return acc;
+          }, {});
+          setSelectedCategory(initialSelections);
+        }
       } catch (loadError) {
         // console.error("Error loading promo items:", loadError)
       }
-    }
-      loadPromo()
+    };
+    loadPromo();
+  }, []);
 
-  },[]);
-
-  console.log("promoItems",promoItems)
+  const handleCategoryLevel2Click = (categoryLevel1Id, categoryLevel2Id) => {
+    setSelectedCategory(prev => ({
+      ...prev,
+      [categoryLevel1Id]: categoryLevel2Id
+    }));
+  };
 
   return (
     <div className='p-4'>
-      {/* <div className='font-semibold sm:text-h-lg mb-2 px-4 sm:px-0'>Kategori Pilihan</div> */}
-      {/* Render category data */}
       {promoItems && promoItems.map((category) => (
         <div key={category.id}>
           <div className='bagian-judul flex flex-row justify-between items-center gap-3 mb-4 mt-4'>
-              <div className='font-semibold sm:text-h-sm mr-2'>{category.name}</div>
-                <Link href={createSlug('/shop/category/', category?.name, category?.category_id)} className="!text-red-500 font-semibold text-sm">Lihat Semua</Link>
+            <div className='font-semibold sm:text-h-sm mr-2'>{category.name}</div>
+            <Link href={createSlug('/shop/category/', category?.name, category?.category_id)} className="!text-red-500 font-semibold text-sm">Lihat Semua</Link>
           </div>
           <Swiper slidesPerView={2.3} spaceBetween={10}>
-          {category.category_id2.map((index)=> (
-            <SwiperSlide>
-              <div key={index.id} className='border justify-start items-start'>
-                <div className='p-3'>
-                    <div className='flex flex-row border mb-2 justify-start items-center'>
+            {category.category_id2.map((index) => (
+              <SwiperSlide key={index.id}>
+                <div
+                  onClick={() => handleCategoryLevel2Click(category.id, index?.id_level_2)}
+                  className={`border flex justify-start items-center max-w-48 max-h-16 rounded ${selectedCategory[category.id] === index?.id_level_2 ? 'bg-red-50 border-red-500 text-red-500' : 'border-gray-200 text-gray-900'}`}
+                >
+                  <div className='p-1 flex justify-start items-center'>
+                    <div className='flex flex-row justify-center items-center'>
                       <NextImage
-                        src={index.image? index.image : "https://erp.indoteknik.com/api/image/product.template/image_256/120726?ratio=square"}
+                        src={index.image ? index.image : "/images/noimage.jpeg"}
                         alt={index.name}
-                        width={90}
+                        width={30}
                         height={30}
-                        className='object-fit'
+                        className='object-'
                       />
-                      <div className='bagian-judul flex flex-col justify-center items-start gap-2 ml-2'>
-                          <div className='font-semibold text-lg mr-2'>{index.name}</div>
-                          <p className='text-gray_r-10 text-sm'>999 rb+ Produk</p>
-                          <Link href={createSlug('/shop/category/', index?.name, index?.id_level_2)} className="!text-red-500 font-semibold">Lihat Semua</Link>
+                      <div className='bagian-judul flex flex-col justify-center items-start gap-1 ml-2'>
+                        <div className='font-semibold text-[10px] line-clamp-1'>{index.name}</div>
+                        <p className='text-gray_r-10 text-[10px]'>999 rb+ Produk</p>
                       </div>
                     </div>
+                  </div>
                 </div>
-              </div>
-            </SwiperSlide>
+              </SwiperSlide>
             ))}
           </Swiper>
+          <div className='p-3 mt-2 border'>
+            <div className='grid grid-cols-2 gap-2 overflow-y-auto max-h-[240px]'>
+              {category.category_id2.map((index) => (
+                selectedCategory[category.id] === index?.id_level_2 && index.child_frontend_id_i.map((x) => (
+                  <div key={x.id}>
+                    <Link href={createSlug('/shop/category/', x?.name, x?.id_level_3)} className="flex flex-row gap-1 border rounded group hover:border-red-500">
+                      <NextImage
+                        src={x.image ? x.image : "/images/noimage.jpeg"}
+                        alt={x.name}
+                        width={40}
+                        height={40}
+                      />
+                      <div className='bagian-judul flex flex-col justify-center items-start gap-1 break-words line-clamp-2 group-hover:text-red-500'>
+                        <div className='font-semibold line-clamp-2 group-hover:text-red-500 text-[10px]'>{x.name}</div>
+                      </div>
+                    </Link>
+                  </div>
+                ))
+              ))}
+            </div>
+          </div>
         </div>
       ))}
     </div>
   );
-}
+};
 
 export default CategoryDynamicMobile;
diff --git a/src/lib/home/components/CategoryPilihan.jsx b/src/lib/home/components/CategoryPilihan.jsx
index 4a1106b0..409a8918 100644
--- a/src/lib/home/components/CategoryPilihan.jsx
+++ b/src/lib/home/components/CategoryPilihan.jsx
@@ -43,7 +43,7 @@ const CategoryPilihan = ({ id, categories }) => {
                         <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-col group-hover/item:visible">
                                 <div className=' h-36'>
-                                    <Image className='group-hover:scale-110 transition-transform duration-300' src='https://erp.indoteknik.com/api/image/product.template/image_256/544371?ratio=square' width={120} height={120} alt={category?.name} />
+                                    <Image className='group-hover:scale-110 transition-transform duration-300' src={category?.image_1920? category?.image_1920 : '/images/noimage.jpeg'}  width={120} height={120} alt={category?.name} />
                                 </div>
                                 <h2 className="text-gray-700 content-center h-12 border-t-[1px] px-1 w-60 border-gray-200 font-normal text-sm text-center">{category?.name}</h2>
                             </div>
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 a181665f20207db5617d794df8159483fef0c2a8 Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Mon, 22 Jul 2024 11:16:47 +0700
Subject: no message

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

(limited to 'src')

diff --git a/src/lib/product/components/ProductCard.jsx b/src/lib/product/components/ProductCard.jsx
index 818dbbcf..3b5fab28 100644
--- a/src/lib/product/components/ProductCard.jsx
+++ b/src/lib/product/components/ProductCard.jsx
@@ -18,7 +18,7 @@ const ProductCard = ({ product, simpleTitle, variant = 'vertical' }) => {
 
   let voucherPastiHemat = 0;
 
-  if (product?.voucherPastiHemat.length > 0) {
+  if (product?.voucherPastiHemat?.length > 0) {
     const stringVoucher = product?.voucherPastiHemat[0];
     const validJsonString = stringVoucher.replace(/'/g, '"');
     voucherPastiHemat = JSON.parse(validJsonString);
-- 
cgit v1.2.3


From 1a3bef5d01fb50ad731f269f0a76b5c5fd52813d Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 22 Jul 2024 16:56:30 +0700
Subject: <update brand view

---
 src/lib/brand/components/BrandCard.jsx     |  2 +-
 src/lib/home/components/PreferredBrand.jsx | 41 ++++++++++++++++++++++--------
 2 files changed, 31 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/lib/brand/components/BrandCard.jsx b/src/lib/brand/components/BrandCard.jsx
index 731214ff..39b1aec1 100644
--- a/src/lib/brand/components/BrandCard.jsx
+++ b/src/lib/brand/components/BrandCard.jsx
@@ -8,7 +8,7 @@ const BrandCard = ({ brand }) => {
   return (
     <Link
       href={createSlug('/shop/brands/', brand.name, brand.id)}
-      className={`py-1 px-2 rounded border border-gray_r-6 flex justify-center items-center ${
+      className={`py-1 px-2  border-gray_r-6 flex justify-center items-center hover:scale-110 transition duration-500 ease-in-out ${
         isMobile ? 'h-16' : 'h-24'
       }`}
     >
diff --git a/src/lib/home/components/PreferredBrand.jsx b/src/lib/home/components/PreferredBrand.jsx
index 571c4745..fc899665 100644
--- a/src/lib/home/components/PreferredBrand.jsx
+++ b/src/lib/home/components/PreferredBrand.jsx
@@ -1,4 +1,5 @@
-import { Swiper, SwiperSlide } from 'swiper/react'
+import { Swiper, SwiperProps, SwiperSlide }  from 'swiper/react';
+import  { Navigation, Pagination, Autoplay } from 'swiper';
 import usePreferredBrand from '../hooks/usePreferredBrand'
 import PreferredBrandSkeleton from './Skeleton/PreferredBrandSkeleton'
 import BrandCard from '@/lib/brand/components/BrandCard'
@@ -10,6 +11,22 @@ const PreferredBrand = () => {
   let params = 'prioritas'
   const { preferredBrands } = usePreferredBrand(query)
   const { isMobile, isDesktop } = useDevice()
+  const swiperBanner = {
+    modules:[Navigation, Pagination, Autoplay],
+    autoplay: {
+      delay: 4000,
+      disableOnInteraction: false
+    },
+    loop: true,
+    className: 'h-[70px] md:h-[100px] w-full',
+    slidesPerView: isMobile ? 4 : 8,
+    spaceBetween: isMobile ? 12 : 0,
+    pagination: {
+      dynamicBullets: true,
+      dynamicMainBullets: isMobile ? 6 : 8,
+      clickable: true,
+    }
+  }
 
   return (
     <div className='px-4 sm:px-0'>
@@ -21,16 +38,18 @@ const PreferredBrand = () => {
           </Link>
         )}
       </div>
-      {preferredBrands.isLoading && <PreferredBrandSkeleton />}
-      {!preferredBrands.isLoading && (
-        <Swiper slidesPerView={isMobile ? 3.5 : 7.5} spaceBetween={isMobile ? 12 : 24} freeMode>
-          {preferredBrands.data?.data.map((brand) => (
-            <SwiperSlide key={brand.id}>
-              <BrandCard brand={brand} />
-            </SwiperSlide>
-          ))}
-        </Swiper>
-      )}
+      <div className='border rounded border-gray_r-6'>
+        {preferredBrands.isLoading && <PreferredBrandSkeleton />}
+        {!preferredBrands.isLoading && (
+          <Swiper {...swiperBanner}>
+            {preferredBrands.data?.data.map((brand) => (
+              <SwiperSlide key={brand.id}>
+                <BrandCard brand={brand} />
+              </SwiperSlide>
+            ))}
+          </Swiper>
+        )}
+      </div>
     </div>
   )
 }
-- 
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/home/components/CategoryDynamic.jsx    |  4 --
 src/lib/product/components/CategorySection.jsx | 67 +++++++++++++++++++-------
 src/pages/index.jsx                            |  2 +-
 3 files changed, 51 insertions(+), 22 deletions(-)

(limited to 'src')

diff --git a/src/lib/home/components/CategoryDynamic.jsx b/src/lib/home/components/CategoryDynamic.jsx
index 244543be..2edd5485 100644
--- a/src/lib/home/components/CategoryDynamic.jsx
+++ b/src/lib/home/components/CategoryDynamic.jsx
@@ -19,11 +19,7 @@ const CategoryDynamic =    () => {
       }
     }
       loadPromo()
-
   },[]);
-
-  console.log("promoItems",promoItems)
-
   return (
     <div>
       {promoItems && promoItems.map((category) => (
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>
diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 0255e239..cdbe0dd0 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -158,7 +158,7 @@ export default function Home({categoryId}) {
             <PromotinProgram />
           </DelayRender>
           <DelayRender renderAfter={600}>
-            {/* <CategoryPilihan categories={dataCategories}/> */}
+            <CategoryPilihan categories={dataCategories}/>
             <CategoryDynamicMobile/>
           </DelayRender>
           <DelayRender renderAfter={800}>
-- 
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/home/api/categoryManagementApi.js         |  8 +++++
 src/lib/home/components/CategoryDynamic.jsx       | 32 ++++++-----------
 src/lib/home/components/CategoryDynamicMobile.jsx | 41 +++++++++++----------
 src/lib/home/components/CategoryPilihan.jsx       |  2 +-
 src/lib/home/hooks/useCategoryManagement.js       | 43 ++++++-----------------
 src/lib/product/components/CategorySection.jsx    | 10 +++---
 6 files changed, 55 insertions(+), 81 deletions(-)
 create mode 100644 src/lib/home/api/categoryManagementApi.js

(limited to 'src')

diff --git a/src/lib/home/api/categoryManagementApi.js b/src/lib/home/api/categoryManagementApi.js
new file mode 100644
index 00000000..b70d60ce
--- /dev/null
+++ b/src/lib/home/api/categoryManagementApi.js
@@ -0,0 +1,8 @@
+import odooApi from '@/core/api/odooApi'
+
+const categoryManagementApi = async () => {
+    const dataCategoryManagement = await odooApi('GET', '/api/v1/categories_management')
+    return dataCategoryManagement
+}
+
+export default categoryManagementApi
diff --git a/src/lib/home/components/CategoryDynamic.jsx b/src/lib/home/components/CategoryDynamic.jsx
index 2edd5485..cac8a138 100644
--- a/src/lib/home/components/CategoryDynamic.jsx
+++ b/src/lib/home/components/CategoryDynamic.jsx
@@ -1,36 +1,24 @@
 import React, { useEffect, useState } from 'react';
-import {fetchProductManagementSolr} from '../hooks/useCategoryManagement';
+import useCategoryManagement  from '../hooks/useCategoryManagement';
 import NextImage from 'next/image';
 import Link from "next/link"
 import router from 'next/router';
 import { createSlug } from '@/core/utils/slug'
 
-const CategoryDynamic =    () => {
-  const [promoItems, setPromoItems] = useState([]);
-  useEffect(() => {
-    const loadPromo = async () => {
-      
-      try {
-        const items = await fetchProductManagementSolr();
-        setPromoItems(items);
-
-      } catch (loadError) {
-        // console.error("Error loading promo items:", loadError)
-      }
-    }
-      loadPromo()
-  },[]);
+const CategoryDynamic =  () => {
+  const { categoryManagement } = useCategoryManagement()
+  
   return (
     <div>
-      {promoItems && promoItems.map((category) => (
+      {categoryManagement && categoryManagement.data?.map((category) => (
         <div key={category.id}>
           <div className='bagian-judul flex flex-row justify-start items-center gap-3 mb-4 mt-4'>
               <div className='font-semibold sm:text-h-lg mr-2'>{category.name}</div>
               <p className='text-gray_r-10 text-sm'>999 rb+ Produk tersedia</p>
-              <Link href={createSlug('/shop/category/', category?.name, category?.category_id)} className="!text-red-500 font-semibold">Lihat Semua</Link>
+              <Link href={createSlug('/shop/category/', category?.name, category?.categoryIdI)} className="!text-red-500 font-semibold">Lihat Semua</Link>
           </div>
           <div className='grid grid-cols-3 gap-2'>
-            {category.category_id2.map((index)=> (
+            {category.categories.map((index)=> (
               <div key={index.id} className='border rounded justify-start items-start'>
                 <div className='p-3'>
                     <div className='flex flex-row border rounded mb-2 justify-start items-center'>
@@ -44,13 +32,13 @@ const CategoryDynamic =    () => {
                       <div className='bagian-judul flex flex-col justify-center items-start gap-2 ml-2'>
                           <div className='font-semibold text-lg mr-2'>{index.name}</div>
                           <p className='text-gray_r-10 text-sm'>999 rb+ Produk</p>
-                          <Link href={createSlug('/shop/category/', index?.name, index?.id_level_2)} className="!text-red-500 font-semibold">Lihat Semua</Link>
+                          <Link href={createSlug('/shop/category/', index?.name, index?.idLevel2)} className="!text-red-500 font-semibold">Lihat Semua</Link>
                       </div>
                     </div>
                     <div className='grid grid-cols-2 gap-2 overflow-y-auto max-h-[240px]' >
-                        {index.child_frontend_id_i.map((x)=> (
+                        {index.childFrontendIdI.map((x)=> (
                           <div key={x.id}>
-                                <Link href={createSlug('/shop/category/', x?.name, x?.id_level_3)} className="flex flex-row gap-2 border rounded group hover:border-red-500">
+                                <Link href={createSlug('/shop/category/', x?.name, x?.idLevel3)} className="flex flex-row gap-2 border rounded group hover:border-red-500">
                                     <NextImage
                                       src={x.image? x.image : "/images/noimage.jpeg"}
                                       alt={x.name}
diff --git a/src/lib/home/components/CategoryDynamicMobile.jsx b/src/lib/home/components/CategoryDynamicMobile.jsx
index 317042b8..c1433a2d 100644
--- a/src/lib/home/components/CategoryDynamicMobile.jsx
+++ b/src/lib/home/components/CategoryDynamicMobile.jsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { fetchProductManagementSolr } from '../hooks/useCategoryManagement';
+import useCategoryManagement  from '../hooks/useCategoryManagement';
 import NextImage from 'next/image';
 import Link from "next/link";
 import { createSlug } from '@/core/utils/slug';
@@ -7,51 +7,50 @@ import { Swiper, SwiperSlide } from 'swiper/react';
 import 'swiper/css';
 
 const CategoryDynamicMobile = () => {
-  const [promoItems, setPromoItems] = useState([]);
+  const { categoryManagement } = useCategoryManagement()
   const [selectedCategory, setSelectedCategory] = useState({});
 
   useEffect(() => {
     const loadPromo = async () => {
       try {
-        const items = await fetchProductManagementSolr();
-        setPromoItems(items);
-        if (items.length > 0) {
-          const initialSelections = items.reduce((acc, category) => {
-            if (category.category_id2.length > 0) {
-              acc[category.id] = category.category_id2[0].id_level_2;
+        if (categoryManagement.data?.length > 0) {
+          const initialSelections = categoryManagement.data.reduce((acc, category) => {
+            if (category.categories.length > 0) {
+              acc[category.id] = category.categories[0].idLevel2;
             }
             return acc;
           }, {});
           setSelectedCategory(initialSelections);
         }
       } catch (loadError) {
-        // console.error("Error loading promo items:", loadError)
+        // console.error("Error loading promo items:", loadError);
       }
     };
+
     loadPromo();
-  }, []);
+  }, [categoryManagement.data]);
 
-  const handleCategoryLevel2Click = (categoryLevel1Id, categoryLevel2Id) => {
+  const handleCategoryLevel2Click = (categoryIdI, idLevel2) => {
     setSelectedCategory(prev => ({
       ...prev,
-      [categoryLevel1Id]: categoryLevel2Id
+      [categoryIdI]: idLevel2
     }));
   };
-
+ 
   return (
     <div className='p-4'>
-      {promoItems && promoItems.map((category) => (
+      {categoryManagement.data && categoryManagement.data.map((category) => (
         <div key={category.id}>
           <div className='bagian-judul flex flex-row justify-between items-center gap-3 mb-4 mt-4'>
             <div className='font-semibold sm:text-h-sm mr-2'>{category.name}</div>
-            <Link href={createSlug('/shop/category/', category?.name, category?.category_id)} className="!text-red-500 font-semibold text-sm">Lihat Semua</Link>
+            <Link href={createSlug('/shop/category/', category?.name, category?.categoryIdI)} className="!text-red-500 font-semibold text-sm">Lihat Semua</Link>
           </div>
           <Swiper slidesPerView={2.3} spaceBetween={10}>
-            {category.category_id2.map((index) => (
+            {category.categories.map((index) => (
               <SwiperSlide key={index.id}>
                 <div
-                  onClick={() => handleCategoryLevel2Click(category.id, index?.id_level_2)}
-                  className={`border flex justify-start items-center max-w-48 max-h-16 rounded ${selectedCategory[category.id] === index?.id_level_2 ? 'bg-red-50 border-red-500 text-red-500' : 'border-gray-200 text-gray-900'}`}
+                  onClick={() => handleCategoryLevel2Click(category.id, index?.idLevel2)}
+                  className={`border flex justify-start items-center max-w-48 max-h-16 rounded ${selectedCategory[category.id] === index?.idLevel2 ? 'bg-red-50 border-red-500 text-red-500' : 'border-gray-200 text-gray-900'}`}
                 >
                   <div className='p-1 flex justify-start items-center'>
                     <div className='flex flex-row justify-center items-center'>
@@ -74,10 +73,10 @@ const CategoryDynamicMobile = () => {
           </Swiper>
           <div className='p-3 mt-2 border'>
             <div className='grid grid-cols-2 gap-2 overflow-y-auto max-h-[240px]'>
-              {category.category_id2.map((index) => (
-                selectedCategory[category.id] === index?.id_level_2 && index.child_frontend_id_i.map((x) => (
+              {category.categories.map((index) => (
+                selectedCategory[category.id] === index?.idLevel2 && index.childFrontendIdI.map((x) => (
                   <div key={x.id}>
-                    <Link href={createSlug('/shop/category/', x?.name, x?.id_level_3)} className="flex flex-row gap-1 border rounded group hover:border-red-500">
+                    <Link href={createSlug('/shop/category/', x?.name, x?.idLevel3)} className="flex flex-row gap-1 border rounded group hover:border-red-500">
                       <NextImage
                         src={x.image ? x.image : "/images/noimage.jpeg"}
                         alt={x.name}
diff --git a/src/lib/home/components/CategoryPilihan.jsx b/src/lib/home/components/CategoryPilihan.jsx
index 409a8918..7b9f0094 100644
--- a/src/lib/home/components/CategoryPilihan.jsx
+++ b/src/lib/home/components/CategoryPilihan.jsx
@@ -43,7 +43,7 @@ const CategoryPilihan = ({ id, categories }) => {
                         <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-col group-hover/item:visible">
                                 <div className=' h-36'>
-                                    <Image className='group-hover:scale-110 transition-transform duration-300' src={category?.image_1920? category?.image_1920 : '/images/noimage.jpeg'}  width={120} height={120} alt={category?.name} />
+                                    <Image className='group-hover:scale-110 transition-transform duration-300' src={category?.image1920? category?.image1920 : '/images/noimage.jpeg'}  width={120} height={120} alt={category?.name} />
                                 </div>
                                 <h2 className="text-gray-700 content-center h-12 border-t-[1px] px-1 w-60 border-gray-200 font-normal text-sm text-center">{category?.name}</h2>
                             </div>
diff --git a/src/lib/home/hooks/useCategoryManagement.js b/src/lib/home/hooks/useCategoryManagement.js
index db4e79e1..c1dda585 100644
--- a/src/lib/home/hooks/useCategoryManagement.js
+++ b/src/lib/home/hooks/useCategoryManagement.js
@@ -1,34 +1,13 @@
-export const fetchProductManagementSolr = async () => {
-  try {
-    const queryParams = new URLSearchParams({q: 'type_value_s:bundling'})
-    const response = await fetch(`/solr/product_category_management/query?q=*:*&q.op=OR&sort=sequence_i asc&indent=true`);
-    // console.log("response", response)
-    if (!response.ok) {
-      throw new Error(`HTTP error! status: ${response.status}`);
-    }
-    const data = await response.json();
-    // console.log("data",data)
-    const dataManagement = await map(data.response.docs);
-    // console.log("dataManagement",dataManagement)
-    return dataManagement;
-  } catch (error) {
-    console.error("Error fetching promotion data:", error);
-    return [];
-  }
-};
+import categoryManagementApi from '../api/categoryManagementApi'
+import { useQuery } from 'react-query'
+
+const useCategoryManagement = () => {
+  const fetchCategoryManagement = async () => await categoryManagementApi()
+  const { isLoading, data } = useQuery('categoryManagementApi', fetchCategoryManagement)
 
-const map = async (promotions) => {
-  const result = [];
-  for (const promotion of promotions) {
-    const data = {
-      id: promotion.id,
-      category_id: promotion.category_id_i,
-      name: promotion.name_s,
-      sequence: promotion.sequence_i,
-      image: promotion.image_s,
-      category_id2: JSON.parse(promotion.category_id2_s),
-    };
-    result.push(data);
+  return {
+    categoryManagement: { data, isLoading }
   }
-  return result;
-};
+}
+
+export default useCategoryManagement
\ No newline at end of file
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 aed8055fbef665984574bc98bb6223c1c54a821a Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 23 Jul 2024 09:42:57 +0700
Subject: <iman> marged develompent & category management

---
 src/lib/brand/components/BrandCard.jsx            |   2 +-
 src/lib/category/components/Category.jsx          |  79 +++++++++++++----
 src/lib/home/api/categoryManagementApi.js         |   8 ++
 src/lib/home/components/CategoryDynamic.jsx       |  65 ++++++++++++++
 src/lib/home/components/CategoryDynamicMobile.jsx | 101 ++++++++++++++++++++++
 src/lib/home/components/CategoryPilihan.jsx       |  66 ++++++++++++++
 src/lib/home/components/PreferredBrand.jsx        |  42 ++++++---
 src/lib/home/hooks/useCategoryManagement.js       |  13 +++
 src/lib/product/components/CategorySection.jsx    |  84 ++++++++++++++++++
 src/lib/product/components/ProductSearch.jsx      |  18 ++++
 src/pages/index.jsx                               |  35 +++++++-
 src/pages/shop/category/[slug].jsx                |   9 +-
 src/styles/globals.css                            |   5 +-
 13 files changed, 492 insertions(+), 35 deletions(-)
 create mode 100644 src/lib/home/api/categoryManagementApi.js
 create mode 100644 src/lib/home/components/CategoryDynamic.jsx
 create mode 100644 src/lib/home/components/CategoryDynamicMobile.jsx
 create mode 100644 src/lib/home/components/CategoryPilihan.jsx
 create mode 100644 src/lib/home/hooks/useCategoryManagement.js
 create mode 100644 src/lib/product/components/CategorySection.jsx

(limited to 'src')

diff --git a/src/lib/brand/components/BrandCard.jsx b/src/lib/brand/components/BrandCard.jsx
index 731214ff..39b1aec1 100644
--- a/src/lib/brand/components/BrandCard.jsx
+++ b/src/lib/brand/components/BrandCard.jsx
@@ -8,7 +8,7 @@ const BrandCard = ({ brand }) => {
   return (
     <Link
       href={createSlug('/shop/brands/', brand.name, brand.id)}
-      className={`py-1 px-2 rounded border border-gray_r-6 flex justify-center items-center ${
+      className={`py-1 px-2  border-gray_r-6 flex justify-center items-center hover:scale-110 transition duration-500 ease-in-out ${
         isMobile ? 'h-16' : 'h-24'
       }`}
     >
diff --git a/src/lib/category/components/Category.jsx b/src/lib/category/components/Category.jsx
index e6ea5acf..c147a3b3 100644
--- a/src/lib/category/components/Category.jsx
+++ b/src/lib/category/components/Category.jsx
@@ -2,10 +2,14 @@ import odooApi from '@/core/api/odooApi'
 import Link from '@/core/components/elements/Link/Link'
 import DesktopView from '@/core/components/views/DesktopView'
 import { createSlug } from '@/core/utils/slug'
+import { ChevronRightIcon } from '@heroicons/react/24/outline'
+import Image from 'next/image'
 import { useEffect, useState } from 'react'
 
 const Category = () => {
   const [categories, setCategories] = useState([])
+  const [openCategories, setOpenCategory] = useState([]);
+  
 
   useEffect(() => {
     const loadCategories = async () => {
@@ -31,7 +35,7 @@ const Category = () => {
     <DesktopView>
       <div className='category-mega-box'>
         {categories?.map((category) => (
-          <div key={category.id}>
+          <div key={category.id} className='flex'>
             <Link
               href={createSlug('/shop/category/', category.name, category.id)}
               className='category-mega-box__parent'
@@ -39,33 +43,74 @@ const Category = () => {
               {category.name}
             </Link>
             <div className='category-mega-box__child-wrapper'>
-              <div className='grid grid-cols-3 gap-x-4 gap-y-6 max-h-full overflow-auto'>
+              <div className='grid grid-cols-3 gap-x-4 gap-y-6 max-h-full !w-[590px] overflow-auto'>
                 {category.childs.map((child1Category) => (
-                  <div key={child1Category.id}>
+                  <div key={child1Category.id} className='w-full'>
                     <Link
                       href={createSlug('/shop/category/', child1Category.name, child1Category.id)}
-                      className='category-mega-box__child-one mb-4'
+                      className='category-mega-box__child-one mb-4 w-full h-8 flex justify-center line-clamp-2'
                     >
                       {child1Category.name}
                     </Link>
-                    <div className='flex flex-col gap-y-3'>
-                      {child1Category.childs.map((child2Category) => (
-                        <Link
-                          href={createSlug(
-                            '/shop/category/',
-                            child2Category.name,
-                            child2Category.id
-                          )}
-                          className='category-mega-box__child-two'
-                          key={child2Category.id}
-                        >
-                          {child2Category.name}
-                        </Link>
+                    <div className='flex flex-col gap-y-3 w-full'>
+                      {child1Category.childs.map((child2Category, index) => (
+                        (index < 4) && (
+                          <Link
+                            href={createSlug('/shop/category/', child2Category.name, child2Category.id)}
+                            className='category-mega-box__child-two truncate'
+                            key={child2Category.id}
+                          >
+                            {child2Category.name}
+                          </Link>
+                        )
                       ))}
+                      {child1Category.childs.length > 5 && (
+                        <div className='flex hover:bg-gray_r-8/35 rounded-10'>
+                          <Link
+                            href={createSlug('/shop/category/', child1Category.name, child1Category.id)}
+                            className='category-mega-box__child-one flex items-center gap-4 font-bold hover:ml-4'
+                          >
+                            <p className='mt-2 mb-0 text-danger-500 font-semibold'>Lihat Semua</p>
+                            <ChevronRightIcon className='w-4 text-danger-500 font-bold' />
+                          </Link>
+                        </div>
+                      )}
                     </div>
                   </div>
                 ))}
               </div>
+              <div className='category-mega-box__child-wrapper !w-[260px] !flex !flex-col !gap-4'>
+                <div className='flex flex-col'>
+                  <div className='grid grid-cols-2 max-h-full w-full gap-2'>
+                    {category.childs.map((brand, index) => (
+                      (index < 8 ) && (
+                        <div key={brand.id} className='w-full flex items-center justify-center pb-2'>
+                          <Link
+                            href={createSlug('/shop/category/', brand.name, brand.id)}
+                            className='category-mega-box__child-one w-fit h-full flex items-center justify-center '
+                          >
+                            <Image src='https://erp.indoteknik.com/api/image/x_manufactures/x_logo_manufacture/661' alt='' width={104} height={44} objectFit='cover' />
+                          </Link>
+                        </div>
+                      )
+                    ))}
+                  </div>
+                  {category.childs.length > 8 && (
+                    <div className='flex hover:bg-gray_r-8/35 rounded-10'>
+                      <Link
+                        href={createSlug('/shop/category/', category.name, category.id)}
+                        className='category-mega-box__child-one flex items-center gap-4 font-bold hover:ml-4'
+                      >
+                        <p className='mt-2 mb-0 text-danger-500 font-semibold'>Lihat Semua Brand</p>
+                        <ChevronRightIcon className='w-4 text-danger-500 font-bold' />
+                      </Link>
+                    </div>
+                  )}
+                </div>
+                <div className='flex w-60 h-20 object-cover'>
+                  <Image src='https://erp.indoteknik.com/api/image/x_banner.banner/x_banner_image/397' alt='' width={275} height={4} />
+                </div>
+              </div>
             </div>
           </div>
         ))}
diff --git a/src/lib/home/api/categoryManagementApi.js b/src/lib/home/api/categoryManagementApi.js
new file mode 100644
index 00000000..b70d60ce
--- /dev/null
+++ b/src/lib/home/api/categoryManagementApi.js
@@ -0,0 +1,8 @@
+import odooApi from '@/core/api/odooApi'
+
+const categoryManagementApi = async () => {
+    const dataCategoryManagement = await odooApi('GET', '/api/v1/categories_management')
+    return dataCategoryManagement
+}
+
+export default categoryManagementApi
diff --git a/src/lib/home/components/CategoryDynamic.jsx b/src/lib/home/components/CategoryDynamic.jsx
new file mode 100644
index 00000000..cac8a138
--- /dev/null
+++ b/src/lib/home/components/CategoryDynamic.jsx
@@ -0,0 +1,65 @@
+import React, { useEffect, useState } from 'react';
+import useCategoryManagement  from '../hooks/useCategoryManagement';
+import NextImage from 'next/image';
+import Link from "next/link"
+import router from 'next/router';
+import { createSlug } from '@/core/utils/slug'
+
+const CategoryDynamic =  () => {
+  const { categoryManagement } = useCategoryManagement()
+  
+  return (
+    <div>
+      {categoryManagement && categoryManagement.data?.map((category) => (
+        <div key={category.id}>
+          <div className='bagian-judul flex flex-row justify-start items-center gap-3 mb-4 mt-4'>
+              <div className='font-semibold sm:text-h-lg mr-2'>{category.name}</div>
+              <p className='text-gray_r-10 text-sm'>999 rb+ Produk tersedia</p>
+              <Link href={createSlug('/shop/category/', category?.name, category?.categoryIdI)} className="!text-red-500 font-semibold">Lihat Semua</Link>
+          </div>
+          <div className='grid grid-cols-3 gap-2'>
+            {category.categories.map((index)=> (
+              <div key={index.id} className='border rounded justify-start items-start'>
+                <div className='p-3'>
+                    <div className='flex flex-row border rounded mb-2 justify-start items-center'>
+                      <NextImage
+                        src={index.image? index.image : "/images/noimage.jpeg"}
+                        alt={index.name}
+                        width={90}
+                        height={30}
+                        className='object-fit'
+                      />
+                      <div className='bagian-judul flex flex-col justify-center items-start gap-2 ml-2'>
+                          <div className='font-semibold text-lg mr-2'>{index.name}</div>
+                          <p className='text-gray_r-10 text-sm'>999 rb+ Produk</p>
+                          <Link href={createSlug('/shop/category/', index?.name, index?.idLevel2)} className="!text-red-500 font-semibold">Lihat Semua</Link>
+                      </div>
+                    </div>
+                    <div className='grid grid-cols-2 gap-2 overflow-y-auto max-h-[240px]' >
+                        {index.childFrontendIdI.map((x)=> (
+                          <div key={x.id}>
+                                <Link href={createSlug('/shop/category/', x?.name, x?.idLevel3)} className="flex flex-row gap-2 border rounded group hover:border-red-500">
+                                    <NextImage
+                                      src={x.image? x.image : "/images/noimage.jpeg"}
+                                      alt={x.name}
+                                      width={40}
+                                      height={40}
+                                    />
+                                    <div className='bagian-judul flex flex-col justify-center items-center gap-2 break-words line-clamp-2 group-hover:text-red-500'>
+                                        <div className='font-semibold line-clamp-2 group-hover:text-red-500 text-sm mr-2'>{x.name}</div>
+                                    </div>
+                                </Link>
+                            </div>
+                          ))}
+                    </div>
+                </div>
+              </div>
+            ))}
+          </div>
+        </div>
+      ))}
+    </div>
+  );
+}
+
+export default CategoryDynamic;
diff --git a/src/lib/home/components/CategoryDynamicMobile.jsx b/src/lib/home/components/CategoryDynamicMobile.jsx
new file mode 100644
index 00000000..c1433a2d
--- /dev/null
+++ b/src/lib/home/components/CategoryDynamicMobile.jsx
@@ -0,0 +1,101 @@
+import React, { useEffect, useState } from 'react';
+import useCategoryManagement  from '../hooks/useCategoryManagement';
+import NextImage from 'next/image';
+import Link from "next/link";
+import { createSlug } from '@/core/utils/slug';
+import { Swiper, SwiperSlide } from 'swiper/react';
+import 'swiper/css';
+
+const CategoryDynamicMobile = () => {
+  const { categoryManagement } = useCategoryManagement()
+  const [selectedCategory, setSelectedCategory] = useState({});
+
+  useEffect(() => {
+    const loadPromo = async () => {
+      try {
+        if (categoryManagement.data?.length > 0) {
+          const initialSelections = categoryManagement.data.reduce((acc, category) => {
+            if (category.categories.length > 0) {
+              acc[category.id] = category.categories[0].idLevel2;
+            }
+            return acc;
+          }, {});
+          setSelectedCategory(initialSelections);
+        }
+      } catch (loadError) {
+        // console.error("Error loading promo items:", loadError);
+      }
+    };
+
+    loadPromo();
+  }, [categoryManagement.data]);
+
+  const handleCategoryLevel2Click = (categoryIdI, idLevel2) => {
+    setSelectedCategory(prev => ({
+      ...prev,
+      [categoryIdI]: idLevel2
+    }));
+  };
+ 
+  return (
+    <div className='p-4'>
+      {categoryManagement.data && categoryManagement.data.map((category) => (
+        <div key={category.id}>
+          <div className='bagian-judul flex flex-row justify-between items-center gap-3 mb-4 mt-4'>
+            <div className='font-semibold sm:text-h-sm mr-2'>{category.name}</div>
+            <Link href={createSlug('/shop/category/', category?.name, category?.categoryIdI)} className="!text-red-500 font-semibold text-sm">Lihat Semua</Link>
+          </div>
+          <Swiper slidesPerView={2.3} spaceBetween={10}>
+            {category.categories.map((index) => (
+              <SwiperSlide key={index.id}>
+                <div
+                  onClick={() => handleCategoryLevel2Click(category.id, index?.idLevel2)}
+                  className={`border flex justify-start items-center max-w-48 max-h-16 rounded ${selectedCategory[category.id] === index?.idLevel2 ? 'bg-red-50 border-red-500 text-red-500' : 'border-gray-200 text-gray-900'}`}
+                >
+                  <div className='p-1 flex justify-start items-center'>
+                    <div className='flex flex-row justify-center items-center'>
+                      <NextImage
+                        src={index.image ? index.image : "/images/noimage.jpeg"}
+                        alt={index.name}
+                        width={30}
+                        height={30}
+                        className='object-'
+                      />
+                      <div className='bagian-judul flex flex-col justify-center items-start gap-1 ml-2'>
+                        <div className='font-semibold text-[10px] line-clamp-1'>{index.name}</div>
+                        <p className='text-gray_r-10 text-[10px]'>999 rb+ Produk</p>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </SwiperSlide>
+            ))}
+          </Swiper>
+          <div className='p-3 mt-2 border'>
+            <div className='grid grid-cols-2 gap-2 overflow-y-auto max-h-[240px]'>
+              {category.categories.map((index) => (
+                selectedCategory[category.id] === index?.idLevel2 && index.childFrontendIdI.map((x) => (
+                  <div key={x.id}>
+                    <Link href={createSlug('/shop/category/', x?.name, x?.idLevel3)} className="flex flex-row gap-1 border rounded group hover:border-red-500">
+                      <NextImage
+                        src={x.image ? x.image : "/images/noimage.jpeg"}
+                        alt={x.name}
+                        width={40}
+                        height={40}
+                      />
+                      <div className='bagian-judul flex flex-col justify-center items-start gap-1 break-words line-clamp-2 group-hover:text-red-500'>
+                        <div className='font-semibold line-clamp-2 group-hover:text-red-500 text-[10px]'>{x.name}</div>
+                      </div>
+                    </Link>
+                  </div>
+                ))
+              ))}
+            </div>
+          </div>
+        </div>
+      ))}
+    </div>
+  );
+};
+
+export default CategoryDynamicMobile;
diff --git a/src/lib/home/components/CategoryPilihan.jsx b/src/lib/home/components/CategoryPilihan.jsx
new file mode 100644
index 00000000..7b9f0094
--- /dev/null
+++ b/src/lib/home/components/CategoryPilihan.jsx
@@ -0,0 +1,66 @@
+import Image from 'next/image'
+import useCategoryHome from '../hooks/useCategoryHome'
+import Link from '@/core/components/elements/Link/Link'
+import { createSlug } from '@/core/utils/slug'
+import { useEffect, useState } from 'react';
+import { bannerApi } from '../../../api/bannerApi';
+const { useQuery } = require('react-query')
+import { HeroBannerSkeleton } from '../../../components/skeleton/BannerSkeleton';
+
+
+const CategoryPilihan = ({ id, categories }) => {
+    const heroBanner = useQuery('categoryPilihan', bannerApi({ type: 'index-a-1' }));
+      
+      return (
+          <section>
+        <div className='flex flex-row items-center mb-4'>
+            <div className='font-semibold sm:text-h-lg mr-2'>Kategori Pilihan</div>
+            <p className='text-gray_r-10 text-sm'>200 Rb+ Produk Unggulan & 800+ Brand Rekomendasi tersedia!</p>
+        </div>
+        <div className='flex w-full h-48 bg-red-300 mb-4'>
+            {heroBanner.data &&
+                heroBanner.data?.length > 0 && (
+                    <div className='px-4 sm:px-0  object-fill '>
+                        {/* {heroBanner.data?.map((banner) => ( */}
+                            <Link key={heroBanner.data[0].id} href={heroBanner.data[0].url}>
+                                <Image
+                                width={439}
+                                height={150}
+                                quality={100}
+                                src={heroBanner.data[0].image}
+                                alt={heroBanner.data[0].name}
+                                className='h-48 object-fill w-full rounded hover:scale-105 transition duration-500 ease-in-out'
+                                />
+                            </Link>
+                            {/* ))} */}
+                    </div>
+                
+                )}
+        </div>
+        <div className="group/item grid grid-cols-6 gap-y-2 w-full h-full col-span-2 ">
+                {categories.map((category) => (
+                    <div className="KartuInti h-48 w-60 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-col group-hover/item:visible">
+                                <div className=' h-36'>
+                                    <Image className='group-hover:scale-110 transition-transform duration-300' src={category?.image1920? category?.image1920 : '/images/noimage.jpeg'}  width={120} height={120} alt={category?.name} />
+                                </div>
+                                <h2 className="text-gray-700 content-center h-12 border-t-[1px] px-1 w-60 border-gray-200 font-normal text-sm text-center">{category?.name}</h2>
+                            </div>
+                        </div>
+                        <div className='KartuA relative inset-0  flex h-36 w-60   items-center justify-center opacity-0 group-hover:opacity-75 group-hover:bg-[#E20613] transition-opacity '>
+                            <Link
+                                href={createSlug('/shop/category/', category?.name, category?.id)}
+                                className='category-mega-box__parent text-white   rounded-lg'
+                            >
+                                Lihat semua
+                            </Link>
+                        </div>
+                    </div>
+                ))}
+        </div>
+    </section>
+  )
+}
+
+export default CategoryPilihan
diff --git a/src/lib/home/components/PreferredBrand.jsx b/src/lib/home/components/PreferredBrand.jsx
index 6b64a444..1aa9746b 100644
--- a/src/lib/home/components/PreferredBrand.jsx
+++ b/src/lib/home/components/PreferredBrand.jsx
@@ -1,5 +1,5 @@
-import { Swiper, SwiperSlide } from 'swiper/react'
-import { useCallback, useEffect, useState } from 'react'
+import { Swiper, SwiperProps, SwiperSlide }  from 'swiper/react';
+import  { Navigation, Pagination, Autoplay } from 'swiper';
 import usePreferredBrand from '../hooks/usePreferredBrand'
 import PreferredBrandSkeleton from './Skeleton/PreferredBrandSkeleton'
 import BrandCard from '@/lib/brand/components/BrandCard'
@@ -38,6 +38,22 @@ const PreferredBrand = () => {
 
   const { preferredBrands } = usePreferredBrand(query)
   const { isMobile, isDesktop } = useDevice()
+  const swiperBanner = {
+    modules:[Navigation, Pagination, Autoplay],
+    autoplay: {
+      delay: 4000,
+      disableOnInteraction: false
+    },
+    loop: true,
+    className: 'h-[70px] md:h-[100px] w-full',
+    slidesPerView: isMobile ? 4 : 8,
+    spaceBetween: isMobile ? 12 : 0,
+    pagination: {
+      dynamicBullets: true,
+      dynamicMainBullets: isMobile ? 6 : 8,
+      clickable: true,
+    }
+  }
 
   return (
     <div className='px-4 sm:px-0'>
@@ -54,16 +70,18 @@ const PreferredBrand = () => {
           </Link>
         )}
       </div>
-      {manufactures.isLoading && <PreferredBrandSkeleton />}
-      {!manufactures.isLoading && (
-        <Swiper slidesPerView={isMobile ? 3.5 : 7.5} spaceBetween={isMobile ? 12 : 24} freeMode>
-          {manufactures.map((manufacture) => (
-            <SwiperSlide key={manufacture.id}>
-              <BrandCard brand={manufacture} />
-            </SwiperSlide>
-          ))}
-        </Swiper>
-      )}
+      <div className='border rounded border-gray_r-6'>
+        {preferredBrands.isLoading && <PreferredBrandSkeleton />}
+        {!preferredBrands.isLoading && (
+          <Swiper {...swiperBanner}>
+            {preferredBrands.data?.data.map((brand) => (
+              <SwiperSlide key={brand.id}>
+                <BrandCard brand={brand} />
+              </SwiperSlide>
+            ))}
+          </Swiper>
+        )}
+      </div>
     </div>
   )
 }
diff --git a/src/lib/home/hooks/useCategoryManagement.js b/src/lib/home/hooks/useCategoryManagement.js
new file mode 100644
index 00000000..c1dda585
--- /dev/null
+++ b/src/lib/home/hooks/useCategoryManagement.js
@@ -0,0 +1,13 @@
+import categoryManagementApi from '../api/categoryManagementApi'
+import { useQuery } from 'react-query'
+
+const useCategoryManagement = () => {
+  const fetchCategoryManagement = async () => await categoryManagementApi()
+  const { isLoading, data } = useQuery('categoryManagementApi', fetchCategoryManagement)
+
+  return {
+    categoryManagement: { data, isLoading }
+  }
+}
+
+export default useCategoryManagement
\ No newline at end of file
diff --git a/src/lib/product/components/CategorySection.jsx b/src/lib/product/components/CategorySection.jsx
new file mode 100644
index 00000000..749a56eb
--- /dev/null
+++ b/src/lib/product/components/CategorySection.jsx
@@ -0,0 +1,84 @@
+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'
+
+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 && (
+                <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-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>
+                            </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.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>
+                    ))}
+                    </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>
+    )
+}
+
+export default CategorySection
diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index b1a5d409..34018ffe 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,9 @@ 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) {
@@ -115,6 +120,16 @@ const ProductSearch = ({
       checkIfBrand();
     }
   }, [q]);
+ 
+  useEffect(() => {
+    const loadCategories = async () => {
+      const getCategories = await odooApi('GET', `/api/v1/category/child?parent_id=${categoryId}`) 
+     if(getCategories){
+      setDataCategories(getCategories)
+     }
+    }
+    loadCategories()
+  }, [])
 
   const brands = [];
   for (
@@ -323,6 +338,7 @@ const ProductSearch = ({
               SpellingComponent
             )}
           </div>
+          <CategorySection categories={dataCategories}/>
 
           {productFound > 0 && (
             <div className='flex items-center gap-x-2 mb-5 justify-between'>
@@ -411,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
diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 8af963fb..d2f6073b 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -1,5 +1,5 @@
 import dynamic from 'next/dynamic';
-import { useRef } from 'react';
+import { useEffect, useRef, useState } from 'react';
 
 import { HeroBannerSkeleton } from '@/components/skeleton/BannerSkeleton';
 import { PopularProductSkeleton } from '@/components/skeleton/PopularProductSkeleton';
@@ -11,6 +11,10 @@ import { FlashSaleSkeleton } from '@/lib/flashSale/skeleton/FlashSaleSkeleton';
 import PreferredBrandSkeleton from '@/lib/home/components/Skeleton/PreferredBrandSkeleton';
 import PromotinProgram from '@/lib/promotinProgram/components/HomePage';
 import PagePopupIformation from '~/modules/popup-information';
+import CategoryPilihan from '../lib/home/components/CategoryPilihan';
+// import CategoryDynamic from '../lib/home/components/CategoryDynamic';
+import odooApi from '@/core/api/odooApi';
+import { getIdFromSlug } from '@/core/utils/slug'
 import useProductDetail from '~/modules/product-detail/stores/useProductDetail';
 import { getAuth } from '~/libs/auth';
 
@@ -54,12 +58,21 @@ const BannerSection = dynamic(() =>
 const CategoryHomeId = dynamic(() =>
   import('@/lib/home/components/CategoryHomeId')
 );
+
+const CategoryDynamic = dynamic(() =>
+  import('@/lib/home/components/CategoryDynamic')
+);
+
+const CategoryDynamicMobile = dynamic(() =>
+  import('@/lib/home/components/CategoryDynamicMobile')
+);
+
 const CustomerReviews = dynamic(() =>
   import('@/lib/review/components/CustomerReviews')
 );
 const ServiceList = dynamic(() => import('@/lib/home/components/ServiceList'));
 
-export default function Home() {
+export default function Home({categoryId}) {
   const bannerRef = useRef(null);
   const wrapperRef = useRef(null);
 
@@ -70,6 +83,18 @@ export default function Home() {
       bannerRef.current?.querySelector(':first-child')?.clientHeight + 'px';
   };
 
+  const [dataCategories, setDataCategories] = useState([])
+
+  useEffect(() => {
+    const loadCategories = async () => {
+     const getCategories = await odooApi('GET', '/api/v1/category/child?partner_id='+{categoryId})
+     if(getCategories){
+      setDataCategories(getCategories)
+     }
+    }
+    loadCategories()
+  }, [])
+
   return (
     <BasicLayout>
       <Seo
@@ -117,6 +142,8 @@ export default function Home() {
               </>
             )}
             <PromotinProgram />
+            <CategoryPilihan categories={dataCategories}/>
+            <CategoryDynamic/>
             <CategoryHomeId />
             <BannerSection />
             <CustomerReviews />
@@ -150,6 +177,10 @@ export default function Home() {
           <DelayRender renderAfter={600}>
             <PromotinProgram />
           </DelayRender>
+          <DelayRender renderAfter={600}>
+            <CategoryPilihan categories={dataCategories}/>
+            <CategoryDynamicMobile/>
+          </DelayRender>
           <DelayRender renderAfter={800}>
             <PopularProduct />
           </DelayRender>
diff --git a/src/pages/shop/category/[slug].jsx b/src/pages/shop/category/[slug].jsx
index 1afe30bf..11840d47 100644
--- a/src/pages/shop/category/[slug].jsx
+++ b/src/pages/shop/category/[slug].jsx
@@ -5,6 +5,8 @@ import { useRouter } from 'next/router';
 import Seo from '@/core/components/Seo';
 import { getIdFromSlug, getNameFromSlug } from '@/core/utils/slug';
 import Breadcrumb from '@/lib/category/components/Breadcrumb';
+import { useEffect, useState } from 'react';
+import odooApi from '@/core/api/odooApi';
 
 const BasicLayout = dynamic(() =>
   import('@/core/components/layouts/BasicLayout')
@@ -12,10 +14,14 @@ const BasicLayout = dynamic(() =>
 const ProductSearch = dynamic(() =>
   import('@/lib/product/components/ProductSearch')
 );
+const CategorySection = dynamic(() =>
+  import('@/lib/product/components/CategorySection')
+)
 
 export default function CategoryDetail() {
   const router = useRouter();
   const { slug = '', page = 1 } = router.query;
+  const [dataCategories, setDataCategories] = useState([])
 
   const categoryName = getNameFromSlug(slug);
   const categoryId = getIdFromSlug(slug);
@@ -43,8 +49,9 @@ export default function CategoryDetail() {
 
       <Breadcrumb categoryId={categoryId} />
 
+
       {!_.isEmpty(router.query) && (
-        <ProductSearch query={query} prefixUrl={`/shop/category/${slug}`} />
+        <ProductSearch query={query} categories ={categoryId} prefixUrl={`/shop/category/${slug}`} />
       )}
     </BasicLayout>
   );
diff --git a/src/styles/globals.css b/src/styles/globals.css
index f6561b00..505dcab4 100644
--- a/src/styles/globals.css
+++ b/src/styles/globals.css
@@ -583,12 +583,11 @@ button {
     @apply absolute 
         left-[100%] 
         top-12
-        w-[40vw] 
         bg-gray_r-1/90
         backdrop-blur-md
         border 
         border-gray_r-6 
-        p-6 
+        p-6
         opacity-0
         h-full 
         transition-all
@@ -604,6 +603,7 @@ button {
         transition-colors 
         ease-linear 
         duration-100 
+        w-fit
         font-semibold;
 }
 
@@ -613,6 +613,7 @@ button {
         transition-colors 
         ease-linear 
         duration-100 
+        w-full
         font-normal;
 }
 
-- 
cgit v1.2.3


From cf48c684d2f8da4dd70e2ed0f57623169bc5106f Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 23 Jul 2024 10:01:58 +0700
Subject: <iman> update error code

---
 src/lib/home/components/PreferredBrand.jsx | 34 +-----------------------------
 1 file changed, 1 insertion(+), 33 deletions(-)

(limited to 'src')

diff --git a/src/lib/home/components/PreferredBrand.jsx b/src/lib/home/components/PreferredBrand.jsx
index 1aa9746b..f822b9a0 100644
--- a/src/lib/home/components/PreferredBrand.jsx
+++ b/src/lib/home/components/PreferredBrand.jsx
@@ -5,37 +5,10 @@ import PreferredBrandSkeleton from './Skeleton/PreferredBrandSkeleton'
 import BrandCard from '@/lib/brand/components/BrandCard'
 import useDevice from '@/core/hooks/useDevice'
 import Link from '@/core/components/elements/Link/Link'
-import axios from 'axios'
 
 const PreferredBrand = () => {
   let query = 'level_s'
   let params = 'prioritas'
-  const [isLoading, setIsLoading] = useState(true)
-  const [startWith, setStartWith] = useState(null)
-  const [manufactures, setManufactures] = useState([])
-
-  const loadBrand = useCallback(async () => {
-    setIsLoading(true)
-    const name = startWith ? `${startWith}*` : ''
-    const result = await axios(`${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/brands?params=${name}`)
-    
-    setIsLoading(false)
-    setManufactures((manufactures) => [...result.data])
-  }, [startWith])
-
-  const toggleStartWith = (alphabet) => {
-    setManufactures([])
-    if (alphabet == startWith) {
-      setStartWith(null)
-      return
-    }
-    setStartWith(alphabet)
-  }
-
-  useEffect(() => {
-    loadBrand()
-  }, [loadBrand])
-
   const { preferredBrands } = usePreferredBrand(query)
   const { isMobile, isDesktop } = useDevice()
   const swiperBanner = {
@@ -64,11 +37,6 @@ const PreferredBrand = () => {
             Lihat Semua
           </Link>
         )}
-        {isMobile && (
-          <Link href='/shop/brands' className='!text-red-500 font-semibold sm:text-h-sm'>
-            Lihat Semua
-          </Link>
-        )}
       </div>
       <div className='border rounded border-gray_r-6'>
         {preferredBrands.isLoading && <PreferredBrandSkeleton />}
@@ -86,4 +54,4 @@ const PreferredBrand = () => {
   )
 }
 
-export default PreferredBrand
+export default PreferredBrand
\ No newline at end of file
-- 
cgit v1.2.3


From 1d770053ce0b75eab1d3755085d03c9d32fe3a83 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 23 Jul 2024 10:07:46 +0700
Subject: <iman> update error log

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

(limited to 'src')

diff --git a/src/lib/home/components/CategoryPilihan.jsx b/src/lib/home/components/CategoryPilihan.jsx
index 7b9f0094..73e42626 100644
--- a/src/lib/home/components/CategoryPilihan.jsx
+++ b/src/lib/home/components/CategoryPilihan.jsx
@@ -20,7 +20,7 @@ const CategoryPilihan = ({ id, categories }) => {
         <div className='flex w-full h-48 bg-red-300 mb-4'>
             {heroBanner.data &&
                 heroBanner.data?.length > 0 && (
-                    <div className='px-4 sm:px-0  object-fill '>
+                    <div key={heroBanner.data.id} className='px-4 sm:px-0  object-fill '>
                         {/* {heroBanner.data?.map((banner) => ( */}
                             <Link key={heroBanner.data[0].id} href={heroBanner.data[0].url}>
                                 <Image
@@ -39,7 +39,7 @@ const CategoryPilihan = ({ id, categories }) => {
         </div>
         <div className="group/item grid grid-cols-6 gap-y-2 w-full h-full col-span-2 ">
                 {categories.map((category) => (
-                    <div className="KartuInti h-48 w-60 max-w-sm   lg:max-w-full flex flex-col   border-[1px] border-gray-200  relative group">
+                    <div key={category.id} className="KartuInti h-48 w-60 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-col group-hover/item:visible">
                                 <div className=' h-36'>
-- 
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/brand/components/BrandCard.jsx         |   6 +-
 src/lib/home/components/CategoryDynamic.jsx    | 119 ++++++++++++++-----------
 src/lib/home/components/PreferredBrand.jsx     |  44 +++++++--
 src/lib/product/components/CategorySection.jsx | 109 +++++++++++++---------
 4 files changed, 176 insertions(+), 102 deletions(-)

(limited to 'src')

diff --git a/src/lib/brand/components/BrandCard.jsx b/src/lib/brand/components/BrandCard.jsx
index 39b1aec1..2d78d956 100644
--- a/src/lib/brand/components/BrandCard.jsx
+++ b/src/lib/brand/components/BrandCard.jsx
@@ -16,9 +16,9 @@ const BrandCard = ({ brand }) => {
         <Image
           src={brand.logo}
           alt={brand.name}
-          width={128}
-          height={128}
-          className='h-full w-full object-contain object-center'
+          width={50}
+          height={50}
+          className='h-full w-[122px] object-contain object-center'
         />
       )}
       {!brand.logo && (
diff --git a/src/lib/home/components/CategoryDynamic.jsx b/src/lib/home/components/CategoryDynamic.jsx
index cac8a138..fa1df286 100644
--- a/src/lib/home/components/CategoryDynamic.jsx
+++ b/src/lib/home/components/CategoryDynamic.jsx
@@ -1,65 +1,84 @@
 import React, { useEffect, useState } from 'react';
-import useCategoryManagement  from '../hooks/useCategoryManagement';
+import useCategoryManagement from '../hooks/useCategoryManagement';
 import NextImage from 'next/image';
-import Link from "next/link"
+import Link from "next/link";
 import router from 'next/router';
-import { createSlug } from '@/core/utils/slug'
+import { createSlug } from '@/core/utils/slug';
+
+const CategoryDynamic = () => {
+  const { categoryManagement } = useCategoryManagement();
+
+  const calculateLevel3Products = (category) => {
+    return category.childFrontendIdI.reduce((total, child) => total + (child.numFound || 0), 0);
+  };
+
+  const calculateLevel2Products = (category) => {
+    return category.categories.reduce((total, subCategory) => {
+      const level3Products = calculateLevel3Products(subCategory);
+      return total + (subCategory.numFound || 0) + level3Products;
+    }, 0);
+  };
 
-const CategoryDynamic =  () => {
-  const { categoryManagement } = useCategoryManagement()
-  
   return (
     <div>
-      {categoryManagement && categoryManagement.data?.map((category) => (
-        <div key={category.id}>
-          <div className='bagian-judul flex flex-row justify-start items-center gap-3 mb-4 mt-4'>
+      {categoryManagement && categoryManagement.data?.map((category) => {
+        const countLevel2 = calculateLevel2Products(category);
+
+        return (
+          <div key={category.id}>
+            <div className='bagian-judul flex flex-row justify-start items-center gap-3 mb-4 mt-4'>
               <div className='font-semibold sm:text-h-lg mr-2'>{category.name}</div>
-              <p className='text-gray_r-10 text-sm'>999 rb+ Produk tersedia</p>
+              <p className='text-gray_r-10 text-sm'>{countLevel2} Produk tersedia</p>
               <Link href={createSlug('/shop/category/', category?.name, category?.categoryIdI)} className="!text-red-500 font-semibold">Lihat Semua</Link>
-          </div>
-          <div className='grid grid-cols-3 gap-2'>
-            {category.categories.map((index)=> (
-              <div key={index.id} className='border rounded justify-start items-start'>
-                <div className='p-3'>
-                    <div className='flex flex-row border rounded mb-2 justify-start items-center'>
-                      <NextImage
-                        src={index.image? index.image : "/images/noimage.jpeg"}
-                        alt={index.name}
-                        width={90}
-                        height={30}
-                        className='object-fit'
-                      />
-                      <div className='bagian-judul flex flex-col justify-center items-start gap-2 ml-2'>
-                          <div className='font-semibold text-lg mr-2'>{index.name}</div>
-                          <p className='text-gray_r-10 text-sm'>999 rb+ Produk</p>
-                          <Link href={createSlug('/shop/category/', index?.name, index?.idLevel2)} className="!text-red-500 font-semibold">Lihat Semua</Link>
+            </div>
+            <div className='grid grid-cols-3 gap-2'>
+              {category.categories.map((subCategory) => {
+                const countLevel3 = calculateLevel3Products(subCategory);
+
+                return (
+                  <div key={subCategory.id} className='border rounded justify-start items-start'>
+                    <div className='p-3'>
+                      <div className='flex flex-row border rounded mb-2 justify-start items-center'>
+                        <NextImage
+                          src={subCategory.image ? subCategory.image : "/images/noimage.jpeg"}
+                          alt={subCategory.name}
+                          width={90}
+                          height={30}
+                          className='object-fit'
+                        />
+                        <div className='bagian-judul flex flex-col justify-center items-start gap-2 ml-2'>
+                          <div className='font-semibold text-lg mr-2'>{subCategory.name}</div>
+                          <p className='text-gray_r-10 text-sm'>{(subCategory.numFound || 0) + countLevel3} Produk</p>
+                          <Link href={createSlug('/shop/category/', subCategory?.name, subCategory?.idLevel2)} className="!text-red-500 font-semibold">Lihat Semua</Link>
+                        </div>
+                      </div>
+                      <div className='grid grid-cols-2 gap-2 overflow-y-auto max-h-[240px]'>
+                        {subCategory.childFrontendIdI.map((childCategory) => (
+                          <div key={childCategory.id}>
+                            <Link href={createSlug('/shop/category/', childCategory?.name, childCategory?.idLevel3)} className="flex flex-row gap-2 border rounded group hover:border-red-500">
+                              <NextImage
+                                src={childCategory.image ? childCategory.image : "/images/noimage.jpeg"}
+                                alt={childCategory.name}
+                                width={40}
+                                height={40}
+                              />
+                              <div className='bagian-judul flex flex-col justify-center items-center gap-2 break-words line-clamp-2 group-hover:text-red-500'>
+                                <div className='font-semibold line-clamp-2 group-hover:text-red-500 text-sm mr-2'>{childCategory.name}</div>
+                              </div>
+                            </Link>
+                          </div>
+                        ))}
                       </div>
                     </div>
-                    <div className='grid grid-cols-2 gap-2 overflow-y-auto max-h-[240px]' >
-                        {index.childFrontendIdI.map((x)=> (
-                          <div key={x.id}>
-                                <Link href={createSlug('/shop/category/', x?.name, x?.idLevel3)} className="flex flex-row gap-2 border rounded group hover:border-red-500">
-                                    <NextImage
-                                      src={x.image? x.image : "/images/noimage.jpeg"}
-                                      alt={x.name}
-                                      width={40}
-                                      height={40}
-                                    />
-                                    <div className='bagian-judul flex flex-col justify-center items-center gap-2 break-words line-clamp-2 group-hover:text-red-500'>
-                                        <div className='font-semibold line-clamp-2 group-hover:text-red-500 text-sm mr-2'>{x.name}</div>
-                                    </div>
-                                </Link>
-                            </div>
-                          ))}
-                    </div>
-                </div>
-              </div>
-            ))}
+                  </div>
+                );
+              })}
+            </div>
           </div>
-        </div>
-      ))}
+        );
+      })}
     </div>
   );
-}
+};
 
 export default CategoryDynamic;
diff --git a/src/lib/home/components/PreferredBrand.jsx b/src/lib/home/components/PreferredBrand.jsx
index fc899665..ae12505d 100644
--- a/src/lib/home/components/PreferredBrand.jsx
+++ b/src/lib/home/components/PreferredBrand.jsx
@@ -1,14 +1,42 @@
-import { Swiper, SwiperProps, SwiperSlide }  from 'swiper/react';
+import { Swiper, SwiperSlide } from 'swiper/react'
 import  { Navigation, Pagination, Autoplay } from 'swiper';
+import { useCallback, useEffect, useState } from 'react'
 import usePreferredBrand from '../hooks/usePreferredBrand'
 import PreferredBrandSkeleton from './Skeleton/PreferredBrandSkeleton'
 import BrandCard from '@/lib/brand/components/BrandCard'
 import useDevice from '@/core/hooks/useDevice'
 import Link from '@/core/components/elements/Link/Link'
+import axios from 'axios'
 
 const PreferredBrand = () => {
   let query = 'level_s'
   let params = 'prioritas'
+  const [isLoading, setIsLoading] = useState(true)
+  const [startWith, setStartWith] = useState(null)
+  const [manufactures, setManufactures] = useState([])
+
+  const loadBrand = useCallback(async () => {
+    setIsLoading(true)
+    const name = startWith ? `${startWith}*` : ''
+    const result = await axios(`${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/brands?params=${name}`)
+    
+    setIsLoading(false)
+    setManufactures((manufactures) => [...result.data])
+  }, [startWith])
+
+  const toggleStartWith = (alphabet) => {
+    setManufactures([])
+    if (alphabet == startWith) {
+      setStartWith(null)
+      return
+    }
+    setStartWith(alphabet)
+  }
+
+  useEffect(() => {
+    loadBrand()
+  }, [loadBrand])
+
   const { preferredBrands } = usePreferredBrand(query)
   const { isMobile, isDesktop } = useDevice()
   const swiperBanner = {
@@ -27,7 +55,7 @@ const PreferredBrand = () => {
       clickable: true,
     }
   }
-
+  const preferredBrandsData = manufactures ? manufactures.slice(0, 20) : []
   return (
     <div className='px-4 sm:px-0'>
       <div className='flex justify-between items-center mb-4'>
@@ -39,12 +67,12 @@ const PreferredBrand = () => {
         )}
       </div>
       <div className='border rounded border-gray_r-6'>
-        {preferredBrands.isLoading && <PreferredBrandSkeleton />}
-        {!preferredBrands.isLoading && (
+        {manufactures.isLoading && <PreferredBrandSkeleton />}
+        {!manufactures.isLoading && (
           <Swiper {...swiperBanner}>
-            {preferredBrands.data?.data.map((brand) => (
-              <SwiperSlide key={brand.id}>
-                <BrandCard brand={brand} />
+            {preferredBrandsData.map((manufacture) => (
+              <SwiperSlide key={manufacture.id}>
+                <BrandCard brand={manufacture} />
               </SwiperSlide>
             ))}
           </Swiper>
@@ -54,4 +82,4 @@ const PreferredBrand = () => {
   )
 }
 
-export default PreferredBrand
+export default PreferredBrand
\ No newline at end of file
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 2fbfdb7a3d090b0ad8dae5527464b25e5df65c25 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 23 Jul 2024 14:40:23 +0700
Subject: Merge branch 'Feature/category-management' into development

# Conflicts:
#	src/lib/home/components/CategoryDynamic.jsx
#	src/lib/home/components/CategoryPilihan.jsx
#	src/lib/home/components/PreferredBrand.jsx
#	src/lib/product/components/CategorySection.jsx
#	src/pages/index.jsx
---
 src/pages/index.jsx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index db868470..0f2add9a 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -64,13 +64,13 @@ const CategoryHomeId = dynamic(() =>
   import('@/lib/home/components/CategoryHomeId')
 );
 
-const CategoryDynamic = dynamic(() =>
-  import('@/lib/home/components/CategoryDynamic')
-);
+// const CategoryDynamic = dynamic(() =>
+//   import('@/lib/home/components/CategoryDynamic')
+// );
 
-const CategoryDynamicMobile = dynamic(() =>
-  import('@/lib/home/components/CategoryDynamicMobile')
-);
+// const CategoryDynamicMobile = dynamic(() =>
+//   import('@/lib/home/components/CategoryDynamicMobile')
+// );
 
 
 const CategoryDynamic = dynamic(() =>
@@ -86,7 +86,7 @@ const CustomerReviews = dynamic(() =>
 );
 const ServiceList = dynamic(() => import('@/lib/home/components/ServiceList'));
 
-export default function Home({categoryId}) {
+
 export default function Home({categoryId}) {
   const bannerRef = useRef(null);
   const wrapperRef = useRef(null);
@@ -98,7 +98,7 @@ export default function Home({categoryId}) {
       bannerRef.current?.querySelector(':first-child')?.clientHeight + 'px';
   };
 
-  const [dataCategories, setDataCategories] = useState([])
+  // const [dataCategories, setDataCategories] = useState([])
 
   useEffect(() => {
     const loadCategories = async () => {
-- 
cgit v1.2.3


From ca30fe957369a16f6833d6a3bd37df74182b2911 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 23 Jul 2024 14:45:17 +0700
Subject: <iman> update error code

---
 src/pages/index.jsx | 18 ------------------
 1 file changed, 18 deletions(-)

(limited to 'src')

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 0f2add9a..c720547e 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -1,7 +1,5 @@
 import dynamic from 'next/dynamic';
 import { useEffect, useRef, useState } from 'react';
-import { useEffect, useRef, useState } from 'react';
-
 import { HeroBannerSkeleton } from '@/components/skeleton/BannerSkeleton';
 import { PopularProductSkeleton } from '@/components/skeleton/PopularProductSkeleton';
 import Seo from '@/core/components/Seo';
@@ -13,15 +11,8 @@ import PreferredBrandSkeleton from '@/lib/home/components/Skeleton/PreferredBran
 import PromotinProgram from '@/lib/promotinProgram/components/HomePage';
 import PagePopupIformation from '~/modules/popup-information';
 import CategoryPilihan from '../lib/home/components/CategoryPilihan';
-// import CategoryDynamic from '../lib/home/components/CategoryDynamic';
 import odooApi from '@/core/api/odooApi';
-import { getIdFromSlug } from '@/core/utils/slug'
-import useProductDetail from '~/modules/product-detail/stores/useProductDetail';
 import { getAuth } from '~/libs/auth';
-import CategoryPilihan from '../lib/home/components/CategoryPilihan';
-// import CategoryDynamic from '../lib/home/components/CategoryDynamic';
-import odooApi from '@/core/api/odooApi';
-import { getIdFromSlug } from '@/core/utils/slug'
 
 const BasicLayout = dynamic(() =>
   import('@/core/components/layouts/BasicLayout')
@@ -64,15 +55,6 @@ const CategoryHomeId = dynamic(() =>
   import('@/lib/home/components/CategoryHomeId')
 );
 
-// const CategoryDynamic = dynamic(() =>
-//   import('@/lib/home/components/CategoryDynamic')
-// );
-
-// const CategoryDynamicMobile = dynamic(() =>
-//   import('@/lib/home/components/CategoryDynamicMobile')
-// );
-
-
 const CategoryDynamic = dynamic(() =>
   import('@/lib/home/components/CategoryDynamic')
 );
-- 
cgit v1.2.3


From f6e0632292b1600341fccfd9d14c1ffe1be0f309 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 23 Jul 2024 14:46:42 +0700
Subject: <iman> update error code

---
 src/pages/index.jsx | 43 +++++++++++++++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index cdbe0dd0..578c4e2d 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -1,6 +1,5 @@
 import dynamic from 'next/dynamic';
 import { useEffect, useRef, useState } from 'react';
-
 import { HeroBannerSkeleton } from '@/components/skeleton/BannerSkeleton';
 import { PopularProductSkeleton } from '@/components/skeleton/PopularProductSkeleton';
 import Seo from '@/core/components/Seo';
@@ -12,9 +11,8 @@ import PreferredBrandSkeleton from '@/lib/home/components/Skeleton/PreferredBran
 import PromotinProgram from '@/lib/promotinProgram/components/HomePage';
 import PagePopupIformation from '~/modules/popup-information';
 import CategoryPilihan from '../lib/home/components/CategoryPilihan';
-// import CategoryDynamic from '../lib/home/components/CategoryDynamic';
 import odooApi from '@/core/api/odooApi';
-import { getIdFromSlug } from '@/core/utils/slug'
+import { getAuth } from '~/libs/auth';
 
 const BasicLayout = dynamic(() =>
   import('@/core/components/layouts/BasicLayout')
@@ -45,6 +43,11 @@ const FlashSale = dynamic(
     loading: () => <FlashSaleSkeleton />,
   }
 );
+
+const ProgramPromotion = dynamic(() =>
+  import('@/lib/home/components/PromotionProgram')
+);
+
 const BannerSection = dynamic(() =>
   import('@/lib/home/components/BannerSection')
 );
@@ -65,17 +68,18 @@ const CustomerReviews = dynamic(() =>
 );
 const ServiceList = dynamic(() => import('@/lib/home/components/ServiceList'));
 
+
 export default function Home({categoryId}) {
   const bannerRef = useRef(null);
   const wrapperRef = useRef(null);
 
+  const auth = getAuth();
+
   const handleOnLoad = () => {
     wrapperRef.current.style.height =
       bannerRef.current?.querySelector(':first-child')?.clientHeight + 'px';
   };
 
-  const [dataCategories, setDataCategories] = useState([])
-
   useEffect(() => {
     const loadCategories = async () => {
      const getCategories = await odooApi('GET', '/api/v1/category/child?partner_id='+{categoryId})
@@ -86,6 +90,8 @@ export default function Home({categoryId}) {
     loadCategories()
   }, [])
 
+  const [dataCategories, setDataCategories] = useState([])
+
   return (
     <BasicLayout>
       <Seo
@@ -122,15 +128,21 @@ export default function Home({categoryId}) {
             </div>
           </div>
 
-          <div className='my-16 flex flex-col gap-y-16'>
+          <div className='my-16 flex flex-col gap-y-8'>
             <ServiceList />
             <div id='flashsale'>
               <PreferredBrand />
             </div>
-            <FlashSale />
+            {!auth?.feature?.soApproval && (
+              <>
+                <ProgramPromotion /> <FlashSale />
+              </>
+            )}
             <PromotinProgram />
             <CategoryPilihan categories={dataCategories}/>
             <CategoryDynamic/>
+            <CategoryPilihan categories={dataCategories}/>
+            <CategoryDynamic/>
             <CategoryHomeId />
             <BannerSection />
             <CustomerReviews />
@@ -151,11 +163,22 @@ export default function Home({categoryId}) {
               <PreferredBrand />
             </div>
           </DelayRender>
+          {!auth?.feature?.soApproval && (
+            <>
+              <DelayRender renderAfter={400}>
+                <ProgramPromotion />
+              </DelayRender>
+              <DelayRender renderAfter={600}>
+                <FlashSale />
+              </DelayRender>
+            </>
+          )}
           <DelayRender renderAfter={600}>
-            <FlashSale />
+            <PromotinProgram />
           </DelayRender>
           <DelayRender renderAfter={600}>
-            <PromotinProgram />
+            <CategoryPilihan categories={dataCategories}/>
+            <CategoryDynamicMobile/>
           </DelayRender>
           <DelayRender renderAfter={600}>
             <CategoryPilihan categories={dataCategories}/>
@@ -175,4 +198,4 @@ export default function Home({categoryId}) {
       </MobileView>
     </BasicLayout>
   );
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3


From c36d43c9b41eeb6f0c996476eaa8a2d13fbf42d1 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 23 Jul 2024 14:47:17 +0700
Subject: <iman> update error code

---
 src/pages/index.jsx | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index c720547e..578c4e2d 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -80,8 +80,6 @@ export default function Home({categoryId}) {
       bannerRef.current?.querySelector(':first-child')?.clientHeight + 'px';
   };
 
-  // const [dataCategories, setDataCategories] = useState([])
-
   useEffect(() => {
     const loadCategories = async () => {
      const getCategories = await odooApi('GET', '/api/v1/category/child?partner_id='+{categoryId})
@@ -94,16 +92,6 @@ export default function Home({categoryId}) {
 
   const [dataCategories, setDataCategories] = useState([])
 
-  useEffect(() => {
-    const loadCategories = async () => {
-     const getCategories = await odooApi('GET', '/api/v1/category/child?partner_id='+{categoryId})
-     if(getCategories){
-      setDataCategories(getCategories)
-     }
-    }
-    loadCategories()
-  }, [])
-
   return (
     <BasicLayout>
       <Seo
@@ -210,4 +198,4 @@ export default function Home({categoryId}) {
       </MobileView>
     </BasicLayout>
   );
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 70ac7c6ee5d13f1aca58904d4cc3db3998e7dee0 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 23 Jul 2024 15:00:28 +0700
Subject: <iman> update error code

---
 src/pages/index.jsx | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'src')

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 578c4e2d..6558f605 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -141,8 +141,6 @@ export default function Home({categoryId}) {
             <PromotinProgram />
             <CategoryPilihan categories={dataCategories}/>
             <CategoryDynamic/>
-            <CategoryPilihan categories={dataCategories}/>
-            <CategoryDynamic/>
             <CategoryHomeId />
             <BannerSection />
             <CustomerReviews />
@@ -180,10 +178,6 @@ export default function Home({categoryId}) {
             <CategoryPilihan categories={dataCategories}/>
             <CategoryDynamicMobile/>
           </DelayRender>
-          <DelayRender renderAfter={600}>
-            <CategoryPilihan categories={dataCategories}/>
-            <CategoryDynamicMobile/>
-          </DelayRender>
           <DelayRender renderAfter={800}>
             <PopularProduct />
           </DelayRender>
-- 
cgit v1.2.3


From e244185f6a83ad396be4d1f84bf22c2d6be0997e Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 23 Jul 2024 15:11:48 +0700
Subject: <iman> update error code

---
 src/pages/index.jsx | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 6558f605..60dcb9e0 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -44,10 +44,6 @@ const FlashSale = dynamic(
   }
 );
 
-const ProgramPromotion = dynamic(() =>
-  import('@/lib/home/components/PromotionProgram')
-);
-
 const BannerSection = dynamic(() =>
   import('@/lib/home/components/BannerSection')
 );
@@ -135,7 +131,7 @@ export default function Home({categoryId}) {
             </div>
             {!auth?.feature?.soApproval && (
               <>
-                <ProgramPromotion /> <FlashSale />
+                <FlashSale />
               </>
             )}
             <PromotinProgram />
@@ -163,9 +159,6 @@ export default function Home({categoryId}) {
           </DelayRender>
           {!auth?.feature?.soApproval && (
             <>
-              <DelayRender renderAfter={400}>
-                <ProgramPromotion />
-              </DelayRender>
               <DelayRender renderAfter={600}>
                 <FlashSale />
               </DelayRender>
-- 
cgit v1.2.3


From 44e1ed755b6714fbf76216ef914a8dfc73bef367 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 23 Jul 2024 15:21:12 +0700
Subject: merge

---
 src/pages/index.jsx | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 578c4e2d..ad654922 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -13,6 +13,7 @@ import PagePopupIformation from '~/modules/popup-information';
 import CategoryPilihan from '../lib/home/components/CategoryPilihan';
 import odooApi from '@/core/api/odooApi';
 import { getAuth } from '~/libs/auth';
+import { getAuth } from '~/libs/auth';
 
 const BasicLayout = dynamic(() =>
   import('@/core/components/layouts/BasicLayout')
@@ -92,6 +93,8 @@ export default function Home({categoryId}) {
 
   const [dataCategories, setDataCategories] = useState([])
 
+  const [dataCategories, setDataCategories] = useState([])
+
   return (
     <BasicLayout>
       <Seo
@@ -128,6 +131,7 @@ export default function Home({categoryId}) {
             </div>
           </div>
 
+          <div className='my-16 flex flex-col gap-y-8'>
           <div className='my-16 flex flex-col gap-y-8'>
             <ServiceList />
             <div id='flashsale'>
-- 
cgit v1.2.3


From 233f2501a7ad23bedb8d02b7a3e7762632108098 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 23 Jul 2024 15:23:28 +0700
Subject: <iman> update code

---
 src/pages/index.jsx | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index ad654922..0b2b6046 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -93,8 +93,6 @@ export default function Home({categoryId}) {
 
   const [dataCategories, setDataCategories] = useState([])
 
-  const [dataCategories, setDataCategories] = useState([])
-
   return (
     <BasicLayout>
       <Seo
@@ -145,12 +143,11 @@ export default function Home({categoryId}) {
             <PromotinProgram />
             <CategoryPilihan categories={dataCategories}/>
             <CategoryDynamic/>
-            <CategoryPilihan categories={dataCategories}/>
-            <CategoryDynamic/>
             <CategoryHomeId />
             <BannerSection />
             <CustomerReviews />
           </div>
+          </div>
         </div>
       </DesktopView>
 
@@ -184,10 +181,6 @@ export default function Home({categoryId}) {
             <CategoryPilihan categories={dataCategories}/>
             <CategoryDynamicMobile/>
           </DelayRender>
-          <DelayRender renderAfter={600}>
-            <CategoryPilihan categories={dataCategories}/>
-            <CategoryDynamicMobile/>
-          </DelayRender>
           <DelayRender renderAfter={800}>
             <PopularProduct />
           </DelayRender>
-- 
cgit v1.2.3


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

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

(limited to 'src')

diff --git a/src/lib/home/components/CategoryPilihan.jsx b/src/lib/home/components/CategoryPilihan.jsx
index 7b9f0094..54807686 100644
--- a/src/lib/home/components/CategoryPilihan.jsx
+++ b/src/lib/home/components/CategoryPilihan.jsx
@@ -9,7 +9,7 @@ import { HeroBannerSkeleton } from '../../../components/skeleton/BannerSkeleton'
 
 
 const CategoryPilihan = ({ id, categories }) => {
-    const heroBanner = useQuery('categoryPilihan', bannerApi({ type: 'index-a-1' }));
+    const heroBanner = useQuery('categoryPilihan', bannerApi({ type: 'banner-category-list' }));
       
       return (
           <section>
@@ -29,7 +29,7 @@ const CategoryPilihan = ({ id, categories }) => {
                                 quality={100}
                                 src={heroBanner.data[0].image}
                                 alt={heroBanner.data[0].name}
-                                className='h-48 object-fill w-full rounded hover:scale-105 transition duration-500 ease-in-out'
+                                className='h-48 object-fill w-full'
                                 />
                             </Link>
                             {/* ))} */}
@@ -41,9 +41,9 @@ const CategoryPilihan = ({ id, categories }) => {
                 {categories.map((category) => (
                     <div className="KartuInti h-48 w-60 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-col group-hover/item:visible">
-                                <div className=' h-36'>
-                                    <Image className='group-hover:scale-110 transition-transform duration-300' src={category?.image1920? category?.image1920 : '/images/noimage.jpeg'}  width={120} height={120} alt={category?.name} />
+                            <div className="group/edit flex items-center justify-end h-48 w-60  flex-col group-hover/item:visible">
+                                <div className=' h-36 flex justify-end items-end'>
+                                    <Image className='group-hover:scale-105 transition-transform duration-300 ' src={category?.image1920? category?.image1920 : '/images/noimage.jpeg'}  width={120} height={120} alt={category?.name} />
                                 </div>
                                 <h2 className="text-gray-700 content-center h-12 border-t-[1px] px-1 w-60 border-gray-200 font-normal text-sm text-center">{category?.name}</h2>
                             </div>
-- 
cgit v1.2.3


From 5214c9578aac1db612cd154cf04ee6d75750918d Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 24 Jul 2024 08:49:05 +0700
Subject: <iman> update error code

---
 src/pages/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 0b2b6046..110d8b17 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -13,7 +13,7 @@ import PagePopupIformation from '~/modules/popup-information';
 import CategoryPilihan from '../lib/home/components/CategoryPilihan';
 import odooApi from '@/core/api/odooApi';
 import { getAuth } from '~/libs/auth';
-import { getAuth } from '~/libs/auth';
+// import { getAuth } from '~/libs/auth';
 
 const BasicLayout = dynamic(() =>
   import('@/core/components/layouts/BasicLayout')
-- 
cgit v1.2.3


From 0768abc2828369a0c41a8042e0d005d32b5315ba Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 24 Jul 2024 08:59:29 +0700
Subject: <iman> update error code

---
 src/pages/index.jsx | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 60dcb9e0..0e4ee5e6 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -124,6 +124,7 @@ export default function Home({categoryId}) {
             </div>
           </div>
 
+          <div className='my-16 flex flex-col gap-y-8'>
           <div className='my-16 flex flex-col gap-y-8'>
             <ServiceList />
             <div id='flashsale'>
@@ -141,6 +142,7 @@ export default function Home({categoryId}) {
             <BannerSection />
             <CustomerReviews />
           </div>
+          </div>
         </div>
       </DesktopView>
 
-- 
cgit v1.2.3


From a264e12c5af60e82f6e496209b6ac81d4a994a10 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 24 Jul 2024 09:06:05 +0700
Subject: <iman> merge category management to development

---
 src/lib/home/components/CategoryPilihan.jsx | 10 +++++-----
 src/pages/index.jsx                         |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/lib/home/components/CategoryPilihan.jsx b/src/lib/home/components/CategoryPilihan.jsx
index 73e42626..5aa1fbcc 100644
--- a/src/lib/home/components/CategoryPilihan.jsx
+++ b/src/lib/home/components/CategoryPilihan.jsx
@@ -9,7 +9,7 @@ import { HeroBannerSkeleton } from '../../../components/skeleton/BannerSkeleton'
 
 
 const CategoryPilihan = ({ id, categories }) => {
-    const heroBanner = useQuery('categoryPilihan', bannerApi({ type: 'index-a-1' }));
+    const heroBanner = useQuery('categoryPilihan', bannerApi({ type: 'banner-category-list' }));
       
       return (
           <section>
@@ -29,7 +29,7 @@ const CategoryPilihan = ({ id, categories }) => {
                                 quality={100}
                                 src={heroBanner.data[0].image}
                                 alt={heroBanner.data[0].name}
-                                className='h-48 object-fill w-full rounded hover:scale-105 transition duration-500 ease-in-out'
+                                className='h-48 object-fill w-full'
                                 />
                             </Link>
                             {/* ))} */}
@@ -41,9 +41,9 @@ const CategoryPilihan = ({ id, categories }) => {
                 {categories.map((category) => (
                     <div key={category.id} className="KartuInti h-48 w-60 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-col group-hover/item:visible">
-                                <div className=' h-36'>
-                                    <Image className='group-hover:scale-110 transition-transform duration-300' src={category?.image1920? category?.image1920 : '/images/noimage.jpeg'}  width={120} height={120} alt={category?.name} />
+                            <div className="group/edit flex items-center justify-end h-48 w-60  flex-col group-hover/item:visible">
+                                <div className=' h-36 flex justify-end items-end'>
+                                    <Image className='group-hover:scale-105 transition-transform duration-300 ' src={category?.image1920? category?.image1920 : '/images/noimage.jpeg'}  width={120} height={120} alt={category?.name} />
                                 </div>
                                 <h2 className="text-gray-700 content-center h-12 border-t-[1px] px-1 w-60 border-gray-200 font-normal text-sm text-center">{category?.name}</h2>
                             </div>
diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 110d8b17..30a7ac1f 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -70,6 +70,7 @@ const CustomerReviews = dynamic(() =>
 const ServiceList = dynamic(() => import('@/lib/home/components/ServiceList'));
 
 
+
 export default function Home({categoryId}) {
   const bannerRef = useRef(null);
   const wrapperRef = useRef(null);
-- 
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/home/components/CategoryDynamic.jsx    | 50 ++++++++++++++++++--------
 src/lib/home/components/CategoryPilihan.jsx    |  3 +-
 src/lib/product/components/CategorySection.jsx | 11 ++----
 src/lib/product/components/ProductSearch.jsx   | 35 ++++++++++++++++--
 4 files changed, 70 insertions(+), 29 deletions(-)

(limited to 'src')

diff --git a/src/lib/home/components/CategoryDynamic.jsx b/src/lib/home/components/CategoryDynamic.jsx
index fa1df286..bbba2ceb 100644
--- a/src/lib/home/components/CategoryDynamic.jsx
+++ b/src/lib/home/components/CategoryDynamic.jsx
@@ -2,38 +2,58 @@ import React, { useEffect, useState } from 'react';
 import useCategoryManagement from '../hooks/useCategoryManagement';
 import NextImage from 'next/image';
 import Link from "next/link";
-import router from 'next/router';
 import { createSlug } from '@/core/utils/slug';
+import odooApi from '@/core/api/odooApi';
 
 const CategoryDynamic = () => {
   const { categoryManagement } = useCategoryManagement();
+  const [categoryData, setCategoryData] = useState({});
+  const [subCategoryData, setSubCategoryData] = useState({});
+  
+  useEffect(() => {
+    const fetchCategoryData = async () => {
+      if (categoryManagement && categoryManagement.data) {
+        const updatedCategoryData = {};
+        const updatedSubCategoryData = {};
+        
+        for (const category of categoryManagement.data) {
+          // Calculate level 1 products
+          const countLevel1 = await odooApi('GET', `/api/v1/category/numFound?parent_id=${category.categoryIdI}`);
+          // console.log("countLevel1.child",countLevel1)
+          
+          updatedCategoryData[category.categoryIdI] = countLevel1.numFound;
+          
+          
+          // Calculate level 2 products for each sub-category
+          for (const subCategory of countLevel1.children) {
+            updatedSubCategoryData[subCategory.id] = subCategory.numFound;
+          }
+        }
 
-  const calculateLevel3Products = (category) => {
-    return category.childFrontendIdI.reduce((total, child) => total + (child.numFound || 0), 0);
-  };
+        setCategoryData(updatedCategoryData);
+        setSubCategoryData(updatedSubCategoryData);
+      }
+    };
 
-  const calculateLevel2Products = (category) => {
-    return category.categories.reduce((total, subCategory) => {
-      const level3Products = calculateLevel3Products(subCategory);
-      return total + (subCategory.numFound || 0) + level3Products;
-    }, 0);
-  };
+    fetchCategoryData();
+  }, [categoryManagement, categoryData]);
+ 
 
   return (
     <div>
       {categoryManagement && categoryManagement.data?.map((category) => {
-        const countLevel2 = calculateLevel2Products(category);
-
+        const countLevel1 = categoryData[category.categoryIdI] || 0;
+        
         return (
           <div key={category.id}>
             <div className='bagian-judul flex flex-row justify-start items-center gap-3 mb-4 mt-4'>
               <div className='font-semibold sm:text-h-lg mr-2'>{category.name}</div>
-              <p className='text-gray_r-10 text-sm'>{countLevel2} Produk tersedia</p>
+              <p className='text-gray_r-10 text-sm'>{countLevel1} Produk tersedia</p>
               <Link href={createSlug('/shop/category/', category?.name, category?.categoryIdI)} className="!text-red-500 font-semibold">Lihat Semua</Link>
             </div>
             <div className='grid grid-cols-3 gap-2'>
               {category.categories.map((subCategory) => {
-                const countLevel3 = calculateLevel3Products(subCategory);
+                const countLevel2 = subCategoryData[subCategory.idLevel2] || 0;
 
                 return (
                   <div key={subCategory.id} className='border rounded justify-start items-start'>
@@ -48,7 +68,7 @@ const CategoryDynamic = () => {
                         />
                         <div className='bagian-judul flex flex-col justify-center items-start gap-2 ml-2'>
                           <div className='font-semibold text-lg mr-2'>{subCategory.name}</div>
-                          <p className='text-gray_r-10 text-sm'>{(subCategory.numFound || 0) + countLevel3} Produk</p>
+                          <p className='text-gray_r-10 text-sm'>{countLevel2} Produk tersedia</p>
                           <Link href={createSlug('/shop/category/', subCategory?.name, subCategory?.idLevel2)} className="!text-red-500 font-semibold">Lihat Semua</Link>
                         </div>
                       </div>
diff --git a/src/lib/home/components/CategoryPilihan.jsx b/src/lib/home/components/CategoryPilihan.jsx
index 54807686..ea78b349 100644
--- a/src/lib/home/components/CategoryPilihan.jsx
+++ b/src/lib/home/components/CategoryPilihan.jsx
@@ -10,7 +10,6 @@ import { HeroBannerSkeleton } from '../../../components/skeleton/BannerSkeleton'
 
 const CategoryPilihan = ({ id, categories }) => {
     const heroBanner = useQuery('categoryPilihan', bannerApi({ type: 'banner-category-list' }));
-      
       return (
           <section>
         <div className='flex flex-row items-center mb-4'>
@@ -38,7 +37,7 @@ const CategoryPilihan = ({ id, categories }) => {
                 )}
         </div>
         <div className="group/item grid grid-cols-6 gap-y-2 w-full h-full col-span-2 ">
-                {categories.map((category) => (
+                {categories?.map((category) => (
                     <div className="KartuInti h-48 w-60 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-end h-48 w-60  flex-col group-hover/item:visible">
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')

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')

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/home/api/CategoryPilihanApi.js       |  8 +++
 src/lib/home/components/CategoryDynamic.jsx  |  2 +-
 src/lib/home/components/CategoryPilihan.jsx  | 12 +++--
 src/lib/home/hooks/useCategoryPilihan.js     | 13 +++++
 src/lib/product/components/ProductSearch.jsx |  5 +-
 src/pages/api/shop/product-homepage.js       |  3 +-
 src/pages/api/shop/search.js                 |  2 +-
 src/pages/shop/lob/[slug].jsx                | 73 ++++++++++++++++++++++++++++
 8 files changed, 108 insertions(+), 10 deletions(-)
 create mode 100644 src/lib/home/api/CategoryPilihanApi.js
 create mode 100644 src/lib/home/hooks/useCategoryPilihan.js
 create mode 100644 src/pages/shop/lob/[slug].jsx

(limited to 'src')

diff --git a/src/lib/home/api/CategoryPilihanApi.js b/src/lib/home/api/CategoryPilihanApi.js
new file mode 100644
index 00000000..8a0b38d3
--- /dev/null
+++ b/src/lib/home/api/CategoryPilihanApi.js
@@ -0,0 +1,8 @@
+import odooApi from '@/core/api/odooApi'
+
+const categoryPilihanApi = async () => {
+    const dataCategoryPilihan = await odooApi('GET', '/api/v1/lob_homepage')
+    return dataCategoryPilihan
+}
+
+export default categoryPilihanApi
diff --git a/src/lib/home/components/CategoryDynamic.jsx b/src/lib/home/components/CategoryDynamic.jsx
index bbba2ceb..6ab03ec3 100644
--- a/src/lib/home/components/CategoryDynamic.jsx
+++ b/src/lib/home/components/CategoryDynamic.jsx
@@ -21,7 +21,7 @@ const CategoryDynamic = () => {
           const countLevel1 = await odooApi('GET', `/api/v1/category/numFound?parent_id=${category.categoryIdI}`);
           // console.log("countLevel1.child",countLevel1)
           
-          updatedCategoryData[category.categoryIdI] = countLevel1.numFound;
+          updatedCategoryData[category.categoryIdI] = countLevel1?.numFound;
           
           
           // Calculate level 2 products for each sub-category
diff --git a/src/lib/home/components/CategoryPilihan.jsx b/src/lib/home/components/CategoryPilihan.jsx
index ea78b349..9f184709 100644
--- a/src/lib/home/components/CategoryPilihan.jsx
+++ b/src/lib/home/components/CategoryPilihan.jsx
@@ -6,9 +6,11 @@ import { useEffect, useState } from 'react';
 import { bannerApi } from '../../../api/bannerApi';
 const { useQuery } = require('react-query')
 import { HeroBannerSkeleton } from '../../../components/skeleton/BannerSkeleton';
-
+import useCategoryPilihan from '../hooks/useCategoryPilihan';
 
 const CategoryPilihan = ({ id, categories }) => {
+    const { categoryPilihan } = useCategoryPilihan();
+    console.log("categoryPilihan",categoryPilihan)
     const heroBanner = useQuery('categoryPilihan', bannerApi({ type: 'banner-category-list' }));
       return (
           <section>
@@ -37,19 +39,19 @@ const CategoryPilihan = ({ id, categories }) => {
                 )}
         </div>
         <div className="group/item grid grid-cols-6 gap-y-2 w-full h-full col-span-2 ">
-                {categories?.map((category) => (
+                {categoryPilihan?.data?.map((category) => (
                     <div className="KartuInti h-48 w-60 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-end h-48 w-60  flex-col group-hover/item:visible">
                                 <div className=' h-36 flex justify-end items-end'>
-                                    <Image className='group-hover:scale-105 transition-transform duration-300 ' src={category?.image1920? category?.image1920 : '/images/noimage.jpeg'}  width={120} height={120} alt={category?.name} />
+                                    <Image className='group-hover:scale-105 transition-transform duration-300 ' src={category?.image? category?.image : '/images/noimage.jpeg'}  width={120} height={120} alt={category?.name} />
                                 </div>
-                                <h2 className="text-gray-700 content-center h-12 border-t-[1px] px-1 w-60 border-gray-200 font-normal text-sm text-center">{category?.name}</h2>
+                                <h2 className="text-gray-700 content-center h-12 border-t-[1px] px-1 w-60 border-gray-200 font-normal text-sm text-center">{category?.industries}</h2>
                             </div>
                         </div>
                         <div className='KartuA relative inset-0  flex h-36 w-60   items-center justify-center opacity-0 group-hover:opacity-75 group-hover:bg-[#E20613] transition-opacity '>
                             <Link
-                                href={createSlug('/shop/category/', category?.name, category?.id)}
+                                href={createSlug('/shop/lob/', category?.industries, category?.id)}
                                 className='category-mega-box__parent text-white   rounded-lg'
                             >
                                 Lihat semua
diff --git a/src/lib/home/hooks/useCategoryPilihan.js b/src/lib/home/hooks/useCategoryPilihan.js
new file mode 100644
index 00000000..12a86f7e
--- /dev/null
+++ b/src/lib/home/hooks/useCategoryPilihan.js
@@ -0,0 +1,13 @@
+import categoryPilihanApi from '../api/CategoryPilihanApi'
+import { useQuery } from 'react-query'
+
+const useCategoryPilihan = () => {
+  const fetchCategoryPilihan = async () => await categoryPilihanApi()
+  const { isLoading, data } = useQuery('categoryPilihanApi', fetchCategoryPilihan)
+
+  return {
+    categoryPilihan: { data, isLoading }
+  }
+}
+
+export default useCategoryPilihan
\ No newline at end of file
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 = [];
diff --git a/src/pages/api/shop/product-homepage.js b/src/pages/api/shop/product-homepage.js
index 02c01ee0..61732c77 100644
--- a/src/pages/api/shop/product-homepage.js
+++ b/src/pages/api/shop/product-homepage.js
@@ -36,7 +36,8 @@ const respoonseMap = (productHomepage, products) => {
     name: productHomepage.name_s,
     image: productHomepage.image_s,
     url: productHomepage.url_s,
-    products: products
+    products: products,
+    categoryIds: productHomepage.category_id_ids,
   }
 
   return productMapped
diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index b6b8c795..66f517ae 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -56,7 +56,7 @@ export default async function handler(req, res) {
     `start=${parseInt(offset)}`,
     `rows=${limit}`,
     `sort=${paramOrderBy}`,
-    `fq=-publish_b:false`,
+    // `fq=-publish_b:false`,
   ];
 
   if (priceFrom > 0 || priceTo > 0) {
diff --git a/src/pages/shop/lob/[slug].jsx b/src/pages/shop/lob/[slug].jsx
new file mode 100644
index 00000000..be8db639
--- /dev/null
+++ b/src/pages/shop/lob/[slug].jsx
@@ -0,0 +1,73 @@
+import _ from 'lodash';
+import dynamic from 'next/dynamic';
+import { useRouter } from 'next/router';
+import Seo from '@/core/components/Seo';
+import { getIdFromSlug, getNameFromSlug } from '@/core/utils/slug';
+import Breadcrumb from '@/lib/category/components/Breadcrumb';
+import { useEffect, useState } from 'react';
+import odooApi from '@/core/api/odooApi';
+
+const BasicLayout = dynamic(() => import('@/core/components/layouts/BasicLayout'));
+const ProductSearch = dynamic(() => import('@/lib/product/components/ProductSearch'));
+const CategorySection = dynamic(() => import('@/lib/product/components/CategorySection'));
+
+export default function CategoryDetail() {
+  const router = useRouter();
+  const { slug = '', page = 1 } = router.query;
+  const [dataLob, setDataLob] = useState([]);
+  const [finalQuery, setFinalQuery] = useState({});
+  
+  const categoryName = getNameFromSlug(slug);
+  const lobId = getIdFromSlug(slug);
+
+  useEffect(() => {
+    const fetchCategoryData = async () => {
+      try {
+        const lobData = await odooApi('GET', `/api/v1/lob_homepage?lob_id=${lobId}`);
+        setDataLob(lobData);
+      } catch (error) {
+        console.error("Error fetching category data:", error);
+      }
+    };
+
+    fetchCategoryData();
+  }, [lobId]);
+
+  console.log("dataLob",dataLob)
+  
+  useEffect(() => {
+      const collectIds = (categories) => {
+          return categories?.categoryIds?.map(data => data.id) || [];
+        };
+        
+        const ids = collectIds(dataLob[0]);
+        const newQuery = {
+            fq: `category_id_ids:(${ids.join(' OR ')})`,
+            page: 1,
+            brand: router.query.brand || '',
+        };
+        setFinalQuery(newQuery);
+        console.log("finalQuery",finalQuery)
+  }, [dataLob, router.query.brand]);
+
+  return (
+    <BasicLayout>
+      <Seo
+        title={`Beli ${categoryName} di Indoteknik`}
+        description={`Jual ${categoryName} Kirim Jakarta Surabaya Semarang Makassar Manado Denpasar Balikpapan Medan Palembang Lampung Bali Bandung Makassar Manado.`}
+        additionalMetaTags={[
+          {
+            property: 'keywords',
+            content: `Jual ${categoryName}, harga ${categoryName}, ${categoryName} murah, toko ${categoryName}, ${categoryName} jakarta, ${categoryName} surabaya`,
+          },
+        ]}
+      />
+
+      <Breadcrumb categoryId={getIdFromSlug(slug)} />
+
+      {!_.isEmpty(router.query) && (
+        <ProductSearch query={finalQuery} categories={getIdFromSlug(slug)} prefixUrl={`/shop/lob/${slug}`} />
+      )}
+    </BasicLayout>
+  );
+}
-- 
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/home/components/CategoryPilihan.jsx  |  1 -
 src/lib/lob/components/Breadcrumb.jsx        | 55 ++++++++++++++++
 src/lib/product/components/ProductSearch.jsx | 98 +++++++++++++++++++++-------
 src/pages/api/shop/search.js                 |  2 +-
 src/pages/shop/lob/[slug].jsx                | 71 +++++++++++++++-----
 5 files changed, 186 insertions(+), 41 deletions(-)
 create mode 100644 src/lib/lob/components/Breadcrumb.jsx

(limited to 'src')

diff --git a/src/lib/home/components/CategoryPilihan.jsx b/src/lib/home/components/CategoryPilihan.jsx
index 9f184709..5548fc1b 100644
--- a/src/lib/home/components/CategoryPilihan.jsx
+++ b/src/lib/home/components/CategoryPilihan.jsx
@@ -10,7 +10,6 @@ import useCategoryPilihan from '../hooks/useCategoryPilihan';
 
 const CategoryPilihan = ({ id, categories }) => {
     const { categoryPilihan } = useCategoryPilihan();
-    console.log("categoryPilihan",categoryPilihan)
     const heroBanner = useQuery('categoryPilihan', bannerApi({ type: 'banner-category-list' }));
       return (
           <section>
diff --git a/src/lib/lob/components/Breadcrumb.jsx b/src/lib/lob/components/Breadcrumb.jsx
new file mode 100644
index 00000000..04d9a691
--- /dev/null
+++ b/src/lib/lob/components/Breadcrumb.jsx
@@ -0,0 +1,55 @@
+import odooApi from '@/core/api/odooApi'
+import { createSlug } from '@/core/utils/slug'
+import {
+  Breadcrumb as ChakraBreadcrumb,
+  BreadcrumbItem,
+  BreadcrumbLink,
+  Skeleton
+} from '@chakra-ui/react'
+import Link from 'next/link'
+import React from 'react'
+import { useQuery } from 'react-query'
+
+/**
+ * Render a breadcrumb component.
+ *
+ * @param {object} categoryId - The ID of the category.
+ * @return {JSX.Element} The breadcrumb component.
+ */
+const Breadcrumb = ({ categoryId }) => {
+    const breadcrumbs = useQuery(
+        `lob-breadcrumbs/${categoryId}`,
+        async () => await odooApi('GET', `/api/v1/lob_homepage?lob_id=${categoryId}`)
+    )
+  return (
+    <div className='container mx-auto py-4 md:py-6'>
+      <Skeleton isLoaded={!breadcrumbs.isLoading} className='w-2/3'>
+        <ChakraBreadcrumb>
+          <BreadcrumbItem>
+            <BreadcrumbLink as={Link} href='/' className='!text-danger-500 whitespace-nowrap'>
+              Home
+            </BreadcrumbLink>
+          </BreadcrumbItem>
+
+          {breadcrumbs.data?.map((category, index) => (
+            <BreadcrumbItem key={index} isCurrentPage={index === breadcrumbs.data.length - 1}>
+              {index === breadcrumbs.data.length - 1 ? (
+                <BreadcrumbLink className='whitespace-nowrap'>{category.industries}</BreadcrumbLink>
+              ) : (
+                <BreadcrumbLink
+                  as={Link}
+                  href={createSlug('/shop/lob/', category.industries, category.id)}
+                  className='!text-danger-500 whitespace-nowrap'
+                >
+                  {category.industries}
+                </BreadcrumbLink>
+              )}
+            </BreadcrumbItem>
+          ))}
+        </ChakraBreadcrumb>
+      </Skeleton>
+    </div>
+  )
+}
+
+export default Breadcrumb
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 = [];
diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index 66f517ae..b6b8c795 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -56,7 +56,7 @@ export default async function handler(req, res) {
     `start=${parseInt(offset)}`,
     `rows=${limit}`,
     `sort=${paramOrderBy}`,
-    // `fq=-publish_b:false`,
+    `fq=-publish_b:false`,
   ];
 
   if (priceFrom > 0 || priceTo > 0) {
diff --git a/src/pages/shop/lob/[slug].jsx b/src/pages/shop/lob/[slug].jsx
index be8db639..d02ec8ac 100644
--- a/src/pages/shop/lob/[slug].jsx
+++ b/src/pages/shop/lob/[slug].jsx
@@ -3,9 +3,10 @@ import dynamic from 'next/dynamic';
 import { useRouter } from 'next/router';
 import Seo from '@/core/components/Seo';
 import { getIdFromSlug, getNameFromSlug } from '@/core/utils/slug';
-import Breadcrumb from '@/lib/category/components/Breadcrumb';
+import Breadcrumb from '../../../lib/lob/components/Breadcrumb';
 import { useEffect, useState } from 'react';
 import odooApi from '@/core/api/odooApi';
+import { div } from 'lodash-contrib';
 
 const BasicLayout = dynamic(() => import('@/core/components/layouts/BasicLayout'));
 const ProductSearch = dynamic(() => import('@/lib/product/components/ProductSearch'));
@@ -16,9 +17,20 @@ export default function CategoryDetail() {
   const { slug = '', page = 1 } = router.query;
   const [dataLob, setDataLob] = useState([]);
   const [finalQuery, setFinalQuery] = useState({});
+  const [dataCategoriesProduct, setDataCategoriesProduct] = useState([])
+  const [data, setData] = useState([])
+  const dataIdCategories = []
   
   const categoryName = getNameFromSlug(slug);
   const lobId = getIdFromSlug(slug);
+  const q = router?.query.q || null;
+  const query = {
+    fq: `id:${lobId}`,
+    page,
+  };
+  if (q) {
+    query.q = q;
+  }
 
   useEffect(() => {
     const fetchCategoryData = async () => {
@@ -33,22 +45,40 @@ export default function CategoryDetail() {
     fetchCategoryData();
   }, [lobId]);
 
-  console.log("dataLob",dataLob)
-  
+  const collectIdsCategory = (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 collectIds = (categories) => {
-          return categories?.categoryIds?.map(data => data.id) || [];
-        };
-        
-        const ids = collectIds(dataLob[0]);
-        const newQuery = {
-            fq: `category_id_ids:(${ids.join(' OR ')})`,
-            page: 1,
-            brand: router.query.brand || '',
-        };
-        setFinalQuery(newQuery);
-        console.log("finalQuery",finalQuery)
-  }, [dataLob, router.query.brand]);
+    const fetchCategoryData = async () => {
+      if (dataLob[0]?.categoryIds) {
+        for (const category of dataLob[0].categoryIds) {
+          const getCategoriesId = await odooApi('GET', `/api/v1/category/numFound?parent_id=${category.id}`);
+          if (getCategoriesId) {
+            setDataCategoriesProduct(getCategoriesId);
+            const ids = collectIdsCategory(getCategoriesId);
+            dataIdCategories.push(ids)
+          }
+        }
+        setData(dataIdCategories)
+      }
+    };
+    fetchCategoryData();
+    const mergedArray = data.flat();
+    const newQuery = {
+      fq: `category_id_ids:(${mergedArray.join(' OR ')})`,
+    };
+    setFinalQuery(newQuery);
+  }, [dataLob, ]);
 
   return (
     <BasicLayout>
@@ -64,9 +94,16 @@ export default function CategoryDetail() {
       />
 
       <Breadcrumb categoryId={getIdFromSlug(slug)} />
+      <div className='grid grid-cols-3'>
+        {dataLob[0]?.categoryIds && (
+          <div>
+            <image></image>
+          </div>
+        )}
+      </div>
 
       {!_.isEmpty(router.query) && (
-        <ProductSearch query={finalQuery} categories={getIdFromSlug(slug)} prefixUrl={`/shop/lob/${slug}`} />
+        <ProductSearch query={query} categories={getIdFromSlug(slug)} prefixUrl={`/shop/lob/${slug}`} />
       )}
     </BasicLayout>
   );
-- 
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/lob/components/Breadcrumb.jsx             |  4 +-
 src/lib/product/components/LobSectionCategory.jsx | 89 +++++++++++++++++++++++
 src/lib/product/components/ProductSearch.jsx      | 54 ++++++--------
 src/pages/shop/lob/[slug].jsx                     | 48 ------------
 4 files changed, 115 insertions(+), 80 deletions(-)
 create mode 100644 src/lib/product/components/LobSectionCategory.jsx

(limited to 'src')

diff --git a/src/lib/lob/components/Breadcrumb.jsx b/src/lib/lob/components/Breadcrumb.jsx
index 04d9a691..5722fd39 100644
--- a/src/lib/lob/components/Breadcrumb.jsx
+++ b/src/lib/lob/components/Breadcrumb.jsx
@@ -19,7 +19,7 @@ import { useQuery } from 'react-query'
 const Breadcrumb = ({ categoryId }) => {
     const breadcrumbs = useQuery(
         `lob-breadcrumbs/${categoryId}`,
-        async () => await odooApi('GET', `/api/v1/lob_homepage?lob_id=${categoryId}`)
+        async () => await odooApi('GET', `/api/v1/lob_homepage/${categoryId}/category_id`)
     )
   return (
     <div className='container mx-auto py-4 md:py-6'>
@@ -31,7 +31,7 @@ const Breadcrumb = ({ categoryId }) => {
             </BreadcrumbLink>
           </BreadcrumbItem>
 
-          {breadcrumbs.data?.map((category, index) => (
+          {breadcrumbs?.data?.map((category, index) => (
             <BreadcrumbItem key={index} isCurrentPage={index === breadcrumbs.data.length - 1}>
               {index === breadcrumbs.data.length - 1 ? (
                 <BreadcrumbLink className='whitespace-nowrap'>{category.industries}</BreadcrumbLink>
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'>
diff --git a/src/pages/shop/lob/[slug].jsx b/src/pages/shop/lob/[slug].jsx
index d02ec8ac..2153b565 100644
--- a/src/pages/shop/lob/[slug].jsx
+++ b/src/pages/shop/lob/[slug].jsx
@@ -32,54 +32,6 @@ export default function CategoryDetail() {
     query.q = q;
   }
 
-  useEffect(() => {
-    const fetchCategoryData = async () => {
-      try {
-        const lobData = await odooApi('GET', `/api/v1/lob_homepage?lob_id=${lobId}`);
-        setDataLob(lobData);
-      } catch (error) {
-        console.error("Error fetching category data:", error);
-      }
-    };
-
-    fetchCategoryData();
-  }, [lobId]);
-
-  const collectIdsCategory = (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 fetchCategoryData = async () => {
-      if (dataLob[0]?.categoryIds) {
-        for (const category of dataLob[0].categoryIds) {
-          const getCategoriesId = await odooApi('GET', `/api/v1/category/numFound?parent_id=${category.id}`);
-          if (getCategoriesId) {
-            setDataCategoriesProduct(getCategoriesId);
-            const ids = collectIdsCategory(getCategoriesId);
-            dataIdCategories.push(ids)
-          }
-        }
-        setData(dataIdCategories)
-      }
-    };
-    fetchCategoryData();
-    const mergedArray = data.flat();
-    const newQuery = {
-      fq: `category_id_ids:(${mergedArray.join(' OR ')})`,
-    };
-    setFinalQuery(newQuery);
-  }, [dataLob, ]);
-
   return (
     <BasicLayout>
       <Seo
-- 
cgit v1.2.3


From aad3092b7c2b293333d894a192c8056f6502c9a0 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 29 Jul 2024 14:15:41 +0700
Subject: <iman> update top banner

---
 src/core/components/elements/Navbar/TopBanner.jsx | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/core/components/elements/Navbar/TopBanner.jsx b/src/core/components/elements/Navbar/TopBanner.jsx
index 722a7501..83ef8c7a 100644
--- a/src/core/components/elements/Navbar/TopBanner.jsx
+++ b/src/core/components/elements/Navbar/TopBanner.jsx
@@ -4,6 +4,7 @@ import { useQuery } from 'react-query';
 import odooApi from '@/core/api/odooApi';
 import SmoothRender from '~/components/ui/smooth-render';
 import Link from '../Link/Link';
+import { background } from '@chakra-ui/react';
 
 const TopBanner = () => {
   const topBanner = useQuery({
@@ -12,7 +13,7 @@ const TopBanner = () => {
     refetchOnWindowFocus: false,
   });
 
-  const backgroundColor = topBanner.data?.[0]?.backgroundColor || 'transparent';
+  // const backgroundColor = topBanner.data?.[0]?.backgroundColor || 'transparent';
   const hasData = topBanner.data?.length > 0;
   const data = topBanner.data?.[0] || null;
 
@@ -22,16 +23,17 @@ const TopBanner = () => {
       height='36px'
       duration='700ms'
       delay='300ms'
-      style={{ backgroundColor }}
     >
-      <Link href={data?.url}>
-        <Image
-          src={data?.image}
-          alt={data?.name}
-          width={1440}
-          height={40}
-          className='object-cover object-center h-full mx-auto'
-        />
+     <Link
+        href={data?.url}
+        className="block"
+        style={{
+          backgroundImage: `url('${data?.image}')`,
+          backgroundPosition: 'center',
+          backgroundSize: 'cover',
+          height: '36px',
+        }}
+      >
       </Link>
     </SmoothRender>
   );
-- 
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')

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 1f07818ba6718755684de5863e01636805b80867 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 29 Jul 2024 15:16:00 +0700
Subject: <iman> update to avoid conflict

---
 src/pages/index.jsx | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 0e4ee5e6..30a7ac1f 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -13,6 +13,7 @@ import PagePopupIformation from '~/modules/popup-information';
 import CategoryPilihan from '../lib/home/components/CategoryPilihan';
 import odooApi from '@/core/api/odooApi';
 import { getAuth } from '~/libs/auth';
+// import { getAuth } from '~/libs/auth';
 
 const BasicLayout = dynamic(() =>
   import('@/core/components/layouts/BasicLayout')
@@ -44,6 +45,10 @@ const FlashSale = dynamic(
   }
 );
 
+const ProgramPromotion = dynamic(() =>
+  import('@/lib/home/components/PromotionProgram')
+);
+
 const BannerSection = dynamic(() =>
   import('@/lib/home/components/BannerSection')
 );
@@ -65,6 +70,7 @@ const CustomerReviews = dynamic(() =>
 const ServiceList = dynamic(() => import('@/lib/home/components/ServiceList'));
 
 
+
 export default function Home({categoryId}) {
   const bannerRef = useRef(null);
   const wrapperRef = useRef(null);
@@ -132,7 +138,7 @@ export default function Home({categoryId}) {
             </div>
             {!auth?.feature?.soApproval && (
               <>
-                <FlashSale />
+                <ProgramPromotion /> <FlashSale />
               </>
             )}
             <PromotinProgram />
@@ -161,6 +167,9 @@ export default function Home({categoryId}) {
           </DelayRender>
           {!auth?.feature?.soApproval && (
             <>
+              <DelayRender renderAfter={400}>
+                <ProgramPromotion />
+              </DelayRender>
               <DelayRender renderAfter={600}>
                 <FlashSale />
               </DelayRender>
-- 
cgit v1.2.3


From a59ed6e73a599a82d6ef248c57ad29f2ab9cb15d Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 29 Jul 2024 15:23:01 +0700
Subject: <iman> Merge branch 'Feature/category-management' into development

---
 src/core/components/elements/Navbar/TopBanner.jsx |  22 ++--
 src/lib/home/api/CategoryPilihanApi.js            |   8 ++
 src/lib/home/components/CategoryDynamic.jsx       |  50 ++++++---
 src/lib/home/components/CategoryPilihan.jsx       |  14 +--
 src/lib/home/hooks/useCategoryPilihan.js          |  13 +++
 src/lib/lob/components/Breadcrumb.jsx             |  55 ++++++++++
 src/lib/product/components/CategorySection.jsx    |  11 +-
 src/lib/product/components/LobSectionCategory.jsx |  82 +++++++++++++++
 src/lib/product/components/ProductSearch.jsx      | 123 ++++++++++++++++++++--
 src/pages/api/shop/product-homepage.js            |   3 +-
 src/pages/shop/lob/[slug].jsx                     |  62 +++++++++++
 11 files changed, 390 insertions(+), 53 deletions(-)
 create mode 100644 src/lib/home/api/CategoryPilihanApi.js
 create mode 100644 src/lib/home/hooks/useCategoryPilihan.js
 create mode 100644 src/lib/lob/components/Breadcrumb.jsx
 create mode 100644 src/lib/product/components/LobSectionCategory.jsx
 create mode 100644 src/pages/shop/lob/[slug].jsx

(limited to 'src')

diff --git a/src/core/components/elements/Navbar/TopBanner.jsx b/src/core/components/elements/Navbar/TopBanner.jsx
index 722a7501..83ef8c7a 100644
--- a/src/core/components/elements/Navbar/TopBanner.jsx
+++ b/src/core/components/elements/Navbar/TopBanner.jsx
@@ -4,6 +4,7 @@ import { useQuery } from 'react-query';
 import odooApi from '@/core/api/odooApi';
 import SmoothRender from '~/components/ui/smooth-render';
 import Link from '../Link/Link';
+import { background } from '@chakra-ui/react';
 
 const TopBanner = () => {
   const topBanner = useQuery({
@@ -12,7 +13,7 @@ const TopBanner = () => {
     refetchOnWindowFocus: false,
   });
 
-  const backgroundColor = topBanner.data?.[0]?.backgroundColor || 'transparent';
+  // const backgroundColor = topBanner.data?.[0]?.backgroundColor || 'transparent';
   const hasData = topBanner.data?.length > 0;
   const data = topBanner.data?.[0] || null;
 
@@ -22,16 +23,17 @@ const TopBanner = () => {
       height='36px'
       duration='700ms'
       delay='300ms'
-      style={{ backgroundColor }}
     >
-      <Link href={data?.url}>
-        <Image
-          src={data?.image}
-          alt={data?.name}
-          width={1440}
-          height={40}
-          className='object-cover object-center h-full mx-auto'
-        />
+     <Link
+        href={data?.url}
+        className="block"
+        style={{
+          backgroundImage: `url('${data?.image}')`,
+          backgroundPosition: 'center',
+          backgroundSize: 'cover',
+          height: '36px',
+        }}
+      >
       </Link>
     </SmoothRender>
   );
diff --git a/src/lib/home/api/CategoryPilihanApi.js b/src/lib/home/api/CategoryPilihanApi.js
new file mode 100644
index 00000000..8a0b38d3
--- /dev/null
+++ b/src/lib/home/api/CategoryPilihanApi.js
@@ -0,0 +1,8 @@
+import odooApi from '@/core/api/odooApi'
+
+const categoryPilihanApi = async () => {
+    const dataCategoryPilihan = await odooApi('GET', '/api/v1/lob_homepage')
+    return dataCategoryPilihan
+}
+
+export default categoryPilihanApi
diff --git a/src/lib/home/components/CategoryDynamic.jsx b/src/lib/home/components/CategoryDynamic.jsx
index fa1df286..6ab03ec3 100644
--- a/src/lib/home/components/CategoryDynamic.jsx
+++ b/src/lib/home/components/CategoryDynamic.jsx
@@ -2,38 +2,58 @@ import React, { useEffect, useState } from 'react';
 import useCategoryManagement from '../hooks/useCategoryManagement';
 import NextImage from 'next/image';
 import Link from "next/link";
-import router from 'next/router';
 import { createSlug } from '@/core/utils/slug';
+import odooApi from '@/core/api/odooApi';
 
 const CategoryDynamic = () => {
   const { categoryManagement } = useCategoryManagement();
+  const [categoryData, setCategoryData] = useState({});
+  const [subCategoryData, setSubCategoryData] = useState({});
+  
+  useEffect(() => {
+    const fetchCategoryData = async () => {
+      if (categoryManagement && categoryManagement.data) {
+        const updatedCategoryData = {};
+        const updatedSubCategoryData = {};
+        
+        for (const category of categoryManagement.data) {
+          // Calculate level 1 products
+          const countLevel1 = await odooApi('GET', `/api/v1/category/numFound?parent_id=${category.categoryIdI}`);
+          // console.log("countLevel1.child",countLevel1)
+          
+          updatedCategoryData[category.categoryIdI] = countLevel1?.numFound;
+          
+          
+          // Calculate level 2 products for each sub-category
+          for (const subCategory of countLevel1.children) {
+            updatedSubCategoryData[subCategory.id] = subCategory.numFound;
+          }
+        }
 
-  const calculateLevel3Products = (category) => {
-    return category.childFrontendIdI.reduce((total, child) => total + (child.numFound || 0), 0);
-  };
+        setCategoryData(updatedCategoryData);
+        setSubCategoryData(updatedSubCategoryData);
+      }
+    };
 
-  const calculateLevel2Products = (category) => {
-    return category.categories.reduce((total, subCategory) => {
-      const level3Products = calculateLevel3Products(subCategory);
-      return total + (subCategory.numFound || 0) + level3Products;
-    }, 0);
-  };
+    fetchCategoryData();
+  }, [categoryManagement, categoryData]);
+ 
 
   return (
     <div>
       {categoryManagement && categoryManagement.data?.map((category) => {
-        const countLevel2 = calculateLevel2Products(category);
-
+        const countLevel1 = categoryData[category.categoryIdI] || 0;
+        
         return (
           <div key={category.id}>
             <div className='bagian-judul flex flex-row justify-start items-center gap-3 mb-4 mt-4'>
               <div className='font-semibold sm:text-h-lg mr-2'>{category.name}</div>
-              <p className='text-gray_r-10 text-sm'>{countLevel2} Produk tersedia</p>
+              <p className='text-gray_r-10 text-sm'>{countLevel1} Produk tersedia</p>
               <Link href={createSlug('/shop/category/', category?.name, category?.categoryIdI)} className="!text-red-500 font-semibold">Lihat Semua</Link>
             </div>
             <div className='grid grid-cols-3 gap-2'>
               {category.categories.map((subCategory) => {
-                const countLevel3 = calculateLevel3Products(subCategory);
+                const countLevel2 = subCategoryData[subCategory.idLevel2] || 0;
 
                 return (
                   <div key={subCategory.id} className='border rounded justify-start items-start'>
@@ -48,7 +68,7 @@ const CategoryDynamic = () => {
                         />
                         <div className='bagian-judul flex flex-col justify-center items-start gap-2 ml-2'>
                           <div className='font-semibold text-lg mr-2'>{subCategory.name}</div>
-                          <p className='text-gray_r-10 text-sm'>{(subCategory.numFound || 0) + countLevel3} Produk</p>
+                          <p className='text-gray_r-10 text-sm'>{countLevel2} Produk tersedia</p>
                           <Link href={createSlug('/shop/category/', subCategory?.name, subCategory?.idLevel2)} className="!text-red-500 font-semibold">Lihat Semua</Link>
                         </div>
                       </div>
diff --git a/src/lib/home/components/CategoryPilihan.jsx b/src/lib/home/components/CategoryPilihan.jsx
index 5aa1fbcc..6efc1070 100644
--- a/src/lib/home/components/CategoryPilihan.jsx
+++ b/src/lib/home/components/CategoryPilihan.jsx
@@ -6,11 +6,11 @@ import { useEffect, useState } from 'react';
 import { bannerApi } from '../../../api/bannerApi';
 const { useQuery } = require('react-query')
 import { HeroBannerSkeleton } from '../../../components/skeleton/BannerSkeleton';
-
+import useCategoryPilihan from '../hooks/useCategoryPilihan';
 
 const CategoryPilihan = ({ id, categories }) => {
+    const { categoryPilihan } = useCategoryPilihan();
     const heroBanner = useQuery('categoryPilihan', bannerApi({ type: 'banner-category-list' }));
-      
       return (
           <section>
         <div className='flex flex-row items-center mb-4'>
@@ -38,19 +38,19 @@ const CategoryPilihan = ({ id, categories }) => {
                 )}
         </div>
         <div className="group/item grid grid-cols-6 gap-y-2 w-full h-full col-span-2 ">
-                {categories.map((category) => (
-                    <div key={category.id} className="KartuInti h-48 w-60 max-w-sm   lg:max-w-full flex flex-col   border-[1px] border-gray-200  relative group">
+                {categoryPilihan?.data?.map((category) => (
+                    <div className="KartuInti h-48 w-60 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-end h-48 w-60  flex-col group-hover/item:visible">
                                 <div className=' h-36 flex justify-end items-end'>
-                                    <Image className='group-hover:scale-105 transition-transform duration-300 ' src={category?.image1920? category?.image1920 : '/images/noimage.jpeg'}  width={120} height={120} alt={category?.name} />
+                                    <Image className='group-hover:scale-105 transition-transform duration-300 ' src={category?.image? category?.image : '/images/noimage.jpeg'}  width={120} height={120} alt={category?.name} />
                                 </div>
-                                <h2 className="text-gray-700 content-center h-12 border-t-[1px] px-1 w-60 border-gray-200 font-normal text-sm text-center">{category?.name}</h2>
+                                <h2 className="text-gray-700 content-center h-12 border-t-[1px] px-1 w-60 border-gray-200 font-normal text-sm text-center">{category?.industries}</h2>
                             </div>
                         </div>
                         <div className='KartuA relative inset-0  flex h-36 w-60   items-center justify-center opacity-0 group-hover:opacity-75 group-hover:bg-[#E20613] transition-opacity '>
                             <Link
-                                href={createSlug('/shop/category/', category?.name, category?.id)}
+                                href={createSlug('/shop/lob/', category?.industries, category?.id)}
                                 className='category-mega-box__parent text-white   rounded-lg'
                             >
                                 Lihat semua
diff --git a/src/lib/home/hooks/useCategoryPilihan.js b/src/lib/home/hooks/useCategoryPilihan.js
new file mode 100644
index 00000000..12a86f7e
--- /dev/null
+++ b/src/lib/home/hooks/useCategoryPilihan.js
@@ -0,0 +1,13 @@
+import categoryPilihanApi from '../api/CategoryPilihanApi'
+import { useQuery } from 'react-query'
+
+const useCategoryPilihan = () => {
+  const fetchCategoryPilihan = async () => await categoryPilihanApi()
+  const { isLoading, data } = useQuery('categoryPilihanApi', fetchCategoryPilihan)
+
+  return {
+    categoryPilihan: { data, isLoading }
+  }
+}
+
+export default useCategoryPilihan
\ No newline at end of file
diff --git a/src/lib/lob/components/Breadcrumb.jsx b/src/lib/lob/components/Breadcrumb.jsx
new file mode 100644
index 00000000..5722fd39
--- /dev/null
+++ b/src/lib/lob/components/Breadcrumb.jsx
@@ -0,0 +1,55 @@
+import odooApi from '@/core/api/odooApi'
+import { createSlug } from '@/core/utils/slug'
+import {
+  Breadcrumb as ChakraBreadcrumb,
+  BreadcrumbItem,
+  BreadcrumbLink,
+  Skeleton
+} from '@chakra-ui/react'
+import Link from 'next/link'
+import React from 'react'
+import { useQuery } from 'react-query'
+
+/**
+ * Render a breadcrumb component.
+ *
+ * @param {object} categoryId - The ID of the category.
+ * @return {JSX.Element} The breadcrumb component.
+ */
+const Breadcrumb = ({ categoryId }) => {
+    const breadcrumbs = useQuery(
+        `lob-breadcrumbs/${categoryId}`,
+        async () => await odooApi('GET', `/api/v1/lob_homepage/${categoryId}/category_id`)
+    )
+  return (
+    <div className='container mx-auto py-4 md:py-6'>
+      <Skeleton isLoaded={!breadcrumbs.isLoading} className='w-2/3'>
+        <ChakraBreadcrumb>
+          <BreadcrumbItem>
+            <BreadcrumbLink as={Link} href='/' className='!text-danger-500 whitespace-nowrap'>
+              Home
+            </BreadcrumbLink>
+          </BreadcrumbItem>
+
+          {breadcrumbs?.data?.map((category, index) => (
+            <BreadcrumbItem key={index} isCurrentPage={index === breadcrumbs.data.length - 1}>
+              {index === breadcrumbs.data.length - 1 ? (
+                <BreadcrumbLink className='whitespace-nowrap'>{category.industries}</BreadcrumbLink>
+              ) : (
+                <BreadcrumbLink
+                  as={Link}
+                  href={createSlug('/shop/lob/', category.industries, category.id)}
+                  className='!text-danger-500 whitespace-nowrap'
+                >
+                  {category.industries}
+                </BreadcrumbLink>
+              )}
+            </BreadcrumbItem>
+          ))}
+        </ChakraBreadcrumb>
+      </Skeleton>
+    </div>
+  )
+}
+
+export default Breadcrumb
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/LobSectionCategory.jsx b/src/lib/product/components/LobSectionCategory.jsx
new file mode 100644
index 00000000..34a09e46
--- /dev/null
+++ b/src/lib/product/components/LobSectionCategory.jsx
@@ -0,0 +1,82 @@
+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-4 w-full h-full">
+                    {displayedCategories?.map((category) => (
+                        <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={1.2} spaceBetween={10}>
+                        {displayedCategories?.map((category) => (
+                            <SwiperSlide key={category?.id}>
+                                <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>
+                        ))}
+                    </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 34018ffe..4d510c5b 100644
--- a/src/lib/product/components/ProductSearch.jsx
+++ b/src/lib/product/components/ProductSearch.jsx
@@ -27,7 +27,9 @@ import ProductSearchSkeleton from './Skeleton/ProductSearchSkeleton';
 import SideBanner from '~/modules/side-banner';
 import FooterBanner from '~/modules/footer-banner';
 import CategorySection from './CategorySection';
+import LobSectionCategory from './LobSectionCategory';
 import { getIdFromSlug } from '@/core/utils/slug'
+import { data } from 'autoprefixer';
 
 const ProductSearch = ({
   query,
@@ -36,14 +38,105 @@ 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 [orderBy, setOrderBy] = useState(router.query?.orderBy || 'popular');
+  const [finalQuery, setFinalQuery] = useState({});
+  const [queryFinal, setQueryFinal] = useState({});
+  const [dataCategoriesProduct, setDataCategoriesProduct] = useState([])
+  const [dataCategoriesLob, setDataCategoriesLob] = useState([])
+  const categoryId = getIdFromSlug(prefixUrl)
+  const [data, setData] = useState([])
+  const [dataLob, setDataLob] = useState([]);
   if (defaultBrand) query.brand = defaultBrand.toLowerCase();
+  const dataIdCategories = []
+  useEffect(() => {
+    if(prefixUrl.includes('category')){
+      const loadProduct = async () => {
+        const getCategoriesId = await odooApi('GET', `/api/v1/category/numFound?parent_id=${categoryId}`);
+        if (getCategoriesId) {
+          setDataCategoriesProduct(getCategoriesId);
+        }
+      };
+      loadProduct();
+    }else if(prefixUrl.includes('lob')){
+      const loadProduct = async () => {
+        const lobData = await odooApi('GET', `/api/v1/lob_homepage/${categoryId}/category_id`);
+         
+        if (lobData) {
+          setDataLob(lobData);
+        }
+      };
+      loadProduct();
+      
+    }
+  }, [categoryId]);
+  
+  const collectIds = (category) => {
+    const ids = [];
+    function recurse(cat) {
+      if (cat && cat.id) {
+        ids.push(cat.id);
+      }
+      if (Array.isArray(cat.children)) {
+        cat.children.forEach(recurse);
+      }
+    }
+    recurse(category);
+    return ids;
+  };
+  
+  useEffect(() => {
+    if(prefixUrl.includes('category')){
+      const ids = collectIds(dataCategoriesProduct);
+      const newQuery = {
+        fq: `category_id_ids:(${ids.join(' OR ')})`,
+        page,
+        brand : router.query.brand? router.query.brand : '',
+        category : router.query.category? router.query.category : '',
+      };
+      setFinalQuery(newQuery);
+    } else if (prefixUrl.includes('lob')){
+      
+      const fetchCategoryData = async () => {
+        if (dataLob[0]?.categoryIds) {
+          
+          for (const cate of dataLob[0].categoryIds) {
+           
+            dataIdCategories.push(cate.childId)
+          }
+          
+        
+          const mergedArray = dataIdCategories.flat();
+         
+          const newQuery = {
+            fq: `category_id_ids:(${mergedArray.join(' OR ')})`,
+            page,
+            brand : router.query.brand? router.query.brand : '',
+            category : router.query.category? router.query.category : '',
+          };
+       
+          setFinalQuery(newQuery);
+         
+        }
+      };
+      fetchCategoryData();
+    }
+  }, [dataCategoriesProduct, dataLob]);
+
+  useEffect(() => {
+    if (prefixUrl.includes('category') || prefixUrl.includes('lob')) {
+      setQueryFinal({ ...finalQuery, q, limit, orderBy });
+    } else {
+      setQueryFinal({ ...query, q, limit, orderBy });
+    }
+  }, [prefixUrl,dataCategoriesProduct, query, finalQuery]);
+
   const { productSearch } = useProductSearch({
-    query: { ...query, q, limit, orderBy },
+    query: queryFinal,
     operation: 'AND',
   });
   const [products, setProducts] = useState(null);
@@ -63,6 +156,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,9 +165,7 @@ const ProductSearch = ({
   const productRows = limit;
   const productFound = productSearch.data?.response.numFound;
   const [dataCategories, setDataCategories] = useState([])
-
-  const categoryId = getIdFromSlug(prefixUrl)
-
+  
   useEffect(() => {
     if (productFound == 0 && query.q && !spellings) {
       searchSpellApi({ query: query.q }).then((response) => {
@@ -103,7 +195,7 @@ const ProductSearch = ({
       });
     }
   }, [productFound, query, spellings]);
-
+  let id = []
   useEffect(() => {
     const checkIfBrand = async () => {
       const brand = await axios(
@@ -122,15 +214,20 @@ 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()
   }, [])
 
+
+
+
   const brands = [];
   for (
     let i = 0;
@@ -277,6 +374,8 @@ const ProductSearch = ({
   };
 
   const isNotReadyStockPage = router.asPath !== '/shop/search?orderBy=stock';
+  
+  console.log("finalQuery",finalQuery)
 
   return (
     <>
@@ -338,6 +437,7 @@ const ProductSearch = ({
               SpellingComponent
             )}
           </div>
+          <LobSectionCategory categories={dataLob}/>
           <CategorySection categories={dataCategories}/>
 
           {productFound > 0 && (
@@ -429,6 +529,7 @@ const ProductSearch = ({
           </div>
 
           <div className='w-9/12 pl-6'>
+            <LobSectionCategory categories={dataLob}/>
             <CategorySection categories={dataCategories}/>
             {bannerPromotionHeader && bannerPromotionHeader?.image && (
               <div className='mb-3'>
diff --git a/src/pages/api/shop/product-homepage.js b/src/pages/api/shop/product-homepage.js
index 02c01ee0..61732c77 100644
--- a/src/pages/api/shop/product-homepage.js
+++ b/src/pages/api/shop/product-homepage.js
@@ -36,7 +36,8 @@ const respoonseMap = (productHomepage, products) => {
     name: productHomepage.name_s,
     image: productHomepage.image_s,
     url: productHomepage.url_s,
-    products: products
+    products: products,
+    categoryIds: productHomepage.category_id_ids,
   }
 
   return productMapped
diff --git a/src/pages/shop/lob/[slug].jsx b/src/pages/shop/lob/[slug].jsx
new file mode 100644
index 00000000..2153b565
--- /dev/null
+++ b/src/pages/shop/lob/[slug].jsx
@@ -0,0 +1,62 @@
+import _ from 'lodash';
+import dynamic from 'next/dynamic';
+import { useRouter } from 'next/router';
+import Seo from '@/core/components/Seo';
+import { getIdFromSlug, getNameFromSlug } from '@/core/utils/slug';
+import Breadcrumb from '../../../lib/lob/components/Breadcrumb';
+import { useEffect, useState } from 'react';
+import odooApi from '@/core/api/odooApi';
+import { div } from 'lodash-contrib';
+
+const BasicLayout = dynamic(() => import('@/core/components/layouts/BasicLayout'));
+const ProductSearch = dynamic(() => import('@/lib/product/components/ProductSearch'));
+const CategorySection = dynamic(() => import('@/lib/product/components/CategorySection'));
+
+export default function CategoryDetail() {
+  const router = useRouter();
+  const { slug = '', page = 1 } = router.query;
+  const [dataLob, setDataLob] = useState([]);
+  const [finalQuery, setFinalQuery] = useState({});
+  const [dataCategoriesProduct, setDataCategoriesProduct] = useState([])
+  const [data, setData] = useState([])
+  const dataIdCategories = []
+  
+  const categoryName = getNameFromSlug(slug);
+  const lobId = getIdFromSlug(slug);
+  const q = router?.query.q || null;
+  const query = {
+    fq: `id:${lobId}`,
+    page,
+  };
+  if (q) {
+    query.q = q;
+  }
+
+  return (
+    <BasicLayout>
+      <Seo
+        title={`Beli ${categoryName} di Indoteknik`}
+        description={`Jual ${categoryName} Kirim Jakarta Surabaya Semarang Makassar Manado Denpasar Balikpapan Medan Palembang Lampung Bali Bandung Makassar Manado.`}
+        additionalMetaTags={[
+          {
+            property: 'keywords',
+            content: `Jual ${categoryName}, harga ${categoryName}, ${categoryName} murah, toko ${categoryName}, ${categoryName} jakarta, ${categoryName} surabaya`,
+          },
+        ]}
+      />
+
+      <Breadcrumb categoryId={getIdFromSlug(slug)} />
+      <div className='grid grid-cols-3'>
+        {dataLob[0]?.categoryIds && (
+          <div>
+            <image></image>
+          </div>
+        )}
+      </div>
+
+      {!_.isEmpty(router.query) && (
+        <ProductSearch query={query} categories={getIdFromSlug(slug)} prefixUrl={`/shop/lob/${slug}`} />
+      )}
+    </BasicLayout>
+  );
+}
-- 
cgit v1.2.3


From e79b956cd190419100e52a5468f91eefb7933387 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 29 Jul 2024 15:25:59 +0700
Subject: <iman> update category management

---
 src/pages/index.jsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 30a7ac1f..64c880c7 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -45,9 +45,9 @@ const FlashSale = dynamic(
   }
 );
 
-const ProgramPromotion = dynamic(() =>
-  import('@/lib/home/components/PromotionProgram')
-);
+// const ProgramPromotion = dynamic(() =>
+//   import('@/lib/home/components/PromotionProgram')
+// );
 
 const BannerSection = dynamic(() =>
   import('@/lib/home/components/BannerSection')
@@ -138,7 +138,7 @@ export default function Home({categoryId}) {
             </div>
             {!auth?.feature?.soApproval && (
               <>
-                <ProgramPromotion /> <FlashSale />
+                {/* <ProgramPromotion /> <FlashSale /> */}
               </>
             )}
             <PromotinProgram />
@@ -168,7 +168,7 @@ export default function Home({categoryId}) {
           {!auth?.feature?.soApproval && (
             <>
               <DelayRender renderAfter={400}>
-                <ProgramPromotion />
+                {/* <ProgramPromotion /> */}
               </DelayRender>
               <DelayRender renderAfter={600}>
                 <FlashSale />
-- 
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 ++++++++++++--------
 src/pages/shop/lob/[slug].jsx                | 49 +++++++++++++++++++++++++++-
 2 files changed, 69 insertions(+), 15 deletions(-)

(limited to 'src')

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>
diff --git a/src/pages/shop/lob/[slug].jsx b/src/pages/shop/lob/[slug].jsx
index 2153b565..cdaf3c91 100644
--- a/src/pages/shop/lob/[slug].jsx
+++ b/src/pages/shop/lob/[slug].jsx
@@ -24,8 +24,55 @@ export default function CategoryDetail() {
   const categoryName = getNameFromSlug(slug);
   const lobId = getIdFromSlug(slug);
   const q = router?.query.q || null;
+
+  useEffect(() => {
+    if(router.pathname.includes('lob')){
+      const loadProduct = async () => {
+        const lobData = await odooApi('GET', `/api/v1/lob_homepage/${lobId}/category_id`);
+         
+        if (lobData) {
+          setDataLob(lobData);
+        }
+      };
+      loadProduct();
+      
+    }
+  }, [lobId]);
+
+  useEffect(() => {
+     if (router.pathname.includes('lob')){
+      
+      const fetchCategoryData = async () => {
+        if (dataLob[0]?.categoryIds) {
+          
+          for (const cate of dataLob[0].categoryIds) {
+           
+            dataIdCategories.push(cate.childId)
+          }
+          
+        
+          setData(dataIdCategories.flat())
+         
+          // const newQuery = {
+          //   fq: `category_id_ids:(${mergedArray.join(' OR ')})`,
+          //   category : router.query.category? router.query.category : '',
+          //   page : router.query.page? router.query.page : 1,
+          //   brand : router.query.brand? router.query.brand : '',
+          //   priceFrom,
+          //   priceTo,
+          //   limit,
+          //   orderBy
+          // };
+       
+          // setFinalQuery(newQuery);
+         
+        }
+      };
+      fetchCategoryData();
+    }
+  }, [dataCategoriesProduct, dataLob]);
   const query = {
-    fq: `id:${lobId}`,
+    fq: `category_id_ids:(${data.join(' OR ')})`,
     page,
   };
   if (q) {
-- 
cgit v1.2.3


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

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

(limited to 'src')

diff --git a/src/lib/home/components/CategoryPilihan.jsx b/src/lib/home/components/CategoryPilihan.jsx
index 5548fc1b..183c123a 100644
--- a/src/lib/home/components/CategoryPilihan.jsx
+++ b/src/lib/home/components/CategoryPilihan.jsx
@@ -39,7 +39,7 @@ const CategoryPilihan = ({ id, categories }) => {
         </div>
         <div className="group/item grid grid-cols-6 gap-y-2 w-full h-full col-span-2 ">
                 {categoryPilihan?.data?.map((category) => (
-                    <div className="KartuInti h-48 w-60 max-w-sm   lg:max-w-full flex flex-col   border-[1px] border-gray-200  relative group">
+                    <div key={category.id} className="KartuInti h-48 w-60 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-end h-48 w-60  flex-col group-hover/item:visible">
                                 <div className=' h-36 flex justify-end items-end'>
-- 
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 ++--
 src/pages/shop/lob/[slug].jsx                     | 63 +----------------------
 3 files changed, 5 insertions(+), 68 deletions(-)

(limited to 'src')

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>
diff --git a/src/pages/shop/lob/[slug].jsx b/src/pages/shop/lob/[slug].jsx
index cdaf3c91..d939c25c 100644
--- a/src/pages/shop/lob/[slug].jsx
+++ b/src/pages/shop/lob/[slug].jsx
@@ -25,60 +25,6 @@ export default function CategoryDetail() {
   const lobId = getIdFromSlug(slug);
   const q = router?.query.q || null;
 
-  useEffect(() => {
-    if(router.pathname.includes('lob')){
-      const loadProduct = async () => {
-        const lobData = await odooApi('GET', `/api/v1/lob_homepage/${lobId}/category_id`);
-         
-        if (lobData) {
-          setDataLob(lobData);
-        }
-      };
-      loadProduct();
-      
-    }
-  }, [lobId]);
-
-  useEffect(() => {
-     if (router.pathname.includes('lob')){
-      
-      const fetchCategoryData = async () => {
-        if (dataLob[0]?.categoryIds) {
-          
-          for (const cate of dataLob[0].categoryIds) {
-           
-            dataIdCategories.push(cate.childId)
-          }
-          
-        
-          setData(dataIdCategories.flat())
-         
-          // const newQuery = {
-          //   fq: `category_id_ids:(${mergedArray.join(' OR ')})`,
-          //   category : router.query.category? router.query.category : '',
-          //   page : router.query.page? router.query.page : 1,
-          //   brand : router.query.brand? router.query.brand : '',
-          //   priceFrom,
-          //   priceTo,
-          //   limit,
-          //   orderBy
-          // };
-       
-          // setFinalQuery(newQuery);
-         
-        }
-      };
-      fetchCategoryData();
-    }
-  }, [dataCategoriesProduct, dataLob]);
-  const query = {
-    fq: `category_id_ids:(${data.join(' OR ')})`,
-    page,
-  };
-  if (q) {
-    query.q = q;
-  }
-
   return (
     <BasicLayout>
       <Seo
@@ -93,16 +39,9 @@ export default function CategoryDetail() {
       />
 
       <Breadcrumb categoryId={getIdFromSlug(slug)} />
-      <div className='grid grid-cols-3'>
-        {dataLob[0]?.categoryIds && (
-          <div>
-            <image></image>
-          </div>
-        )}
-      </div>
 
       {!_.isEmpty(router.query) && (
-        <ProductSearch query={query} categories={getIdFromSlug(slug)} prefixUrl={`/shop/lob/${slug}`} />
+        <ProductSearch query={router.query} categories={getIdFromSlug(slug)} prefixUrl={`/shop/lob/${slug}`} />
       )}
     </BasicLayout>
   );
-- 
cgit v1.2.3


From de27df05af1f23d70099d36d11e07f35faff26c6 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 30 Jul 2024 13:25:14 +0700
Subject: <iman> update mobile view

---
 .../components/elements/Navbar/NavbarMobile.jsx    |   4 +-
 src/core/components/elements/Navbar/TopBanner.jsx  |  29 ++--
 src/lib/home/components/CategoryPilihan.jsx        | 147 +++++++++++++++------
 3 files changed, 119 insertions(+), 61 deletions(-)

(limited to 'src')

diff --git a/src/core/components/elements/Navbar/NavbarMobile.jsx b/src/core/components/elements/Navbar/NavbarMobile.jsx
index bcf45e0a..90314671 100644
--- a/src/core/components/elements/Navbar/NavbarMobile.jsx
+++ b/src/core/components/elements/Navbar/NavbarMobile.jsx
@@ -11,7 +11,7 @@ import Image from 'next/image';
 import { useEffect, useState } from 'react';
 import MobileView from '../../views/MobileView';
 import Link from '../Link/Link';
-// import TopBanner from './TopBanner';
+import TopBanner from './TopBanner';
 
 const Search = dynamic(() => import('./Search'));
 
@@ -39,7 +39,7 @@ const NavbarMobile = () => {
 
   return (
     <MobileView>
-      {/* <TopBanner /> */}
+      <TopBanner />
       <nav className='px-4 py-2 pb-3 sticky top-0 z-50 bg-white shadow'>
         <div className='flex justify-between items-center mb-2'>
           <Link href='/'>
diff --git a/src/core/components/elements/Navbar/TopBanner.jsx b/src/core/components/elements/Navbar/TopBanner.jsx
index 83ef8c7a..df47e87d 100644
--- a/src/core/components/elements/Navbar/TopBanner.jsx
+++ b/src/core/components/elements/Navbar/TopBanner.jsx
@@ -1,12 +1,12 @@
 import Image from 'next/image';
-import { useQuery } from 'react-query';
-
+import { useQuery } from 'react-query';import useDevice from '@/core/hooks/useDevice'
 import odooApi from '@/core/api/odooApi';
 import SmoothRender from '~/components/ui/smooth-render';
 import Link from '../Link/Link';
 import { background } from '@chakra-ui/react';
 
 const TopBanner = () => {
+  const { isDesktop, isMobile } = useDevice()
   const topBanner = useQuery({
     queryKey: 'topBanner',
     queryFn: async () => await odooApi('GET', '/api/v1/banner?type=top-banner'),
@@ -20,22 +20,21 @@ const TopBanner = () => {
   return (
     <SmoothRender
       isLoaded={hasData}
-      height='36px'
+      // height='36px'
       duration='700ms'
       delay='300ms'
-    >
-     <Link
-        href={data?.url}
-        className="block"
-        style={{
-          backgroundImage: `url('${data?.image}')`,
-          backgroundPosition: 'center',
-          backgroundSize: 'cover',
-          height: '36px',
-        }}
+      className='h-auto'
       >
-      </Link>
-    </SmoothRender>
+      <Link
+          href={data?.url}
+          className="block bg-cover bg-center h-3 md:h-6 lg:h-[36px]"
+          style={{
+            backgroundImage: `url('${data?.image}')`,
+          }}
+        >
+        </Link>
+
+      </SmoothRender>
   );
 };
 
diff --git a/src/lib/home/components/CategoryPilihan.jsx b/src/lib/home/components/CategoryPilihan.jsx
index 183c123a..e47524aa 100644
--- a/src/lib/home/components/CategoryPilihan.jsx
+++ b/src/lib/home/components/CategoryPilihan.jsx
@@ -7,59 +7,118 @@ import { bannerApi } from '../../../api/bannerApi';
 const { useQuery } = require('react-query')
 import { HeroBannerSkeleton } from '../../../components/skeleton/BannerSkeleton';
 import useCategoryPilihan from '../hooks/useCategoryPilihan';
+import useDevice from '@/core/hooks/useDevice'
+import { Swiper, SwiperSlide } from 'swiper/react';
+import 'swiper/css';
 
 const CategoryPilihan = ({ id, categories }) => {
+    const { isDesktop, isMobile } = useDevice()
     const { categoryPilihan } = useCategoryPilihan();
     const heroBanner = useQuery('categoryPilihan', bannerApi({ type: 'banner-category-list' }));
       return (
           <section>
-        <div className='flex flex-row items-center mb-4'>
-            <div className='font-semibold sm:text-h-lg mr-2'>Kategori Pilihan</div>
-            <p className='text-gray_r-10 text-sm'>200 Rb+ Produk Unggulan & 800+ Brand Rekomendasi tersedia!</p>
-        </div>
-        <div className='flex w-full h-48 bg-red-300 mb-4'>
-            {heroBanner.data &&
-                heroBanner.data?.length > 0 && (
-                    <div className='px-4 sm:px-0  object-fill '>
-                        {/* {heroBanner.data?.map((banner) => ( */}
-                            <Link key={heroBanner.data[0].id} href={heroBanner.data[0].url}>
-                                <Image
-                                width={439}
-                                height={150}
-                                quality={100}
-                                src={heroBanner.data[0].image}
-                                alt={heroBanner.data[0].name}
-                                className='h-48 object-fill w-full'
-                                />
-                            </Link>
-                            {/* ))} */}
+            {isDesktop && (
+                <div>
+                    <div className='flex flex-row items-center mb-4'>
+                        <div className='font-semibold sm:text-h-lg mr-2'>LOB Kategori Pilihan</div>
+                        <p className='text-gray_r-10 text-sm'>200 Rb+ Produk Unggulan & 800+ Brand Rekomendasi tersedia!</p>
                     </div>
-                
-                )}
-        </div>
-        <div className="group/item grid grid-cols-6 gap-y-2 w-full h-full col-span-2 ">
-                {categoryPilihan?.data?.map((category) => (
-                    <div key={category.id} className="KartuInti h-48 w-60 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-end h-48 w-60  flex-col group-hover/item:visible">
-                                <div className=' h-36 flex justify-end items-end'>
-                                    <Image className='group-hover:scale-105 transition-transform duration-300 ' src={category?.image? category?.image : '/images/noimage.jpeg'}  width={120} height={120} alt={category?.name} />
+                    <div className='flex w-full h-48 justify-center mb-4'>
+                        {heroBanner.data &&
+                            heroBanner.data?.length > 0 && (
+                                <div className=' '>
+                                        <Link key={heroBanner.data[0].id} href={heroBanner.data[0].url}>
+                                            <Image
+                                            width={1260}
+                                            height={170}
+                                            quality={100}
+                                            // src={heroBanner.data[0].image}
+                                            src={"https://erp.indoteknik.com/web/image?model=x_banner.banner&id=345&field=x_banner_image&unique=09202023101820"}
+                                            alt={heroBanner.data[0].name}
+                                            className='h-48 object-cover w-full'
+                                            />
+                                        </Link>
                                 </div>
-                                <h2 className="text-gray-700 content-center h-12 border-t-[1px] px-1 w-60 border-gray-200 font-normal text-sm text-center">{category?.industries}</h2>
-                            </div>
-                        </div>
-                        <div className='KartuA relative inset-0  flex h-36 w-60   items-center justify-center opacity-0 group-hover:opacity-75 group-hover:bg-[#E20613] transition-opacity '>
-                            <Link
-                                href={createSlug('/shop/lob/', category?.industries, category?.id)}
-                                className='category-mega-box__parent text-white   rounded-lg'
-                            >
-                                Lihat semua
-                            </Link>
-                        </div>
+                            
+                            )}
                     </div>
-                ))}
-        </div>
-    </section>
+                    <div className="group/item grid grid-cols-6 gap-y-2 w-full h-full col-span-2 ">
+                            {categoryPilihan?.data?.map((category) => (
+                                <div key={category.id} className="KartuInti h-48 w-60 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-end h-48 w-60  flex-col group-hover/item:visible">
+                                            <div className=' h-36 flex justify-end items-end'>
+                                                <Image className='group-hover:scale-105 transition-transform duration-300 ' src={category?.image? category?.image : '/images/noimage.jpeg'}  width={120} height={120} alt={category?.name} />
+                                            </div>
+                                            <h2 className="text-gray-700 content-center h-12 border-t-[1px] px-1 w-60 border-gray-200 font-normal text-sm text-center">{category?.industries}</h2>
+                                        </div>
+                                    </div>
+                                    <div className='KartuA relative inset-0  flex h-36 w-60   items-center justify-center opacity-0 group-hover:opacity-75 group-hover:bg-[#E20613] transition-opacity '>
+                                        <Link
+                                            href={createSlug('/shop/lob/', category?.industries, category?.id)}
+                                            className='category-mega-box__parent text-white   rounded-lg'
+                                        >
+                                            Lihat semua
+                                        </Link>
+                                    </div>
+                                </div>
+                            ))}
+                    </div>
+                </div>
+            )}
+            {isMobile && (
+                <div className='p-4'>
+                    <div className='flex flex-row items-center mb-4'>
+                        <div className='font-semibold sm:text-h-md mr-2'>LOB Kategori Pilihan</div>
+                        {/* <p className='text-gray_r-10 text-sm'>200 Rb+ Produk Unggulan & 800+ Brand Rekomendasi tersedia!</p> */}
+                    </div>
+                    <div className='flex mb-4'>
+                        {heroBanner.data &&
+                            heroBanner.data?.length > 0 && (
+                                <div className=' object-fill '>
+                                        <Link key={heroBanner.data[0].id} href={heroBanner.data[0].url}>
+                                            <Image
+                                            width={439}
+                                            height={150}
+                                            quality={100}
+                                            src={heroBanner.data[0].image}
+                                            alt={heroBanner.data[0].name}
+                                            className='object-cover'
+                                            />
+                                        </Link>
+                                </div>
+                            
+                            )}
+                    </div>
+                        <Swiper slidesPerView={2.1} spaceBetween={10}>
+                            {categoryPilihan?.data?.map((category) => (
+                                <SwiperSlide key={category.id}>
+                                    <div key={category.id} className="KartuInti h-48 w-48 max-w-sm   lg:max-w-full flex flex-col   border-[1px] border-gray-200  relative group">
+                                        <div className='KartuB absolute h-48 w-48 inset-0 flex items-center justify-center '>
+                                            <div className="group/edit flex items-center justify-end h-48 w-48  flex-col group-hover/item:visible">
+                                                <div className=' h-36 flex justify-end items-end'>
+                                                    <Image className='group-hover:scale-105 transition-transform duration-300 ' src={category?.image? category?.image : '/images/noimage.jpeg'}  width={120} height={120} alt={category?.name} />
+                                                </div>
+                                                <h2 className="text-gray-700 content-center h-12 border-t-[1px] px-1 w-48 border-gray-200 font-normal text-sm text-center">{category?.industries}</h2>
+                                            </div>
+                                        </div>
+                                        <div className='KartuA relative inset-0  flex h-36 w-48   items-center justify-center opacity-0 group-hover:opacity-75 group-hover:bg-[#E20613] transition-opacity '>
+                                            <Link
+                                                href={createSlug('/shop/lob/', category?.industries, category?.id)}
+                                                className='category-mega-box__parent text-white   rounded-lg'
+                                            >
+                                                Lihat semua
+                                            </Link>
+                                        </div>
+                                    </div>
+                                </SwiperSlide>
+                            ))}
+
+                        </Swiper>
+                    
+                </div>
+            )}
+            </section>
   )
 }
 
-- 
cgit v1.2.3


From a3875b3e803d7075fa8788286fb478bb0c825d26 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 30 Jul 2024 14:06:55 +0700
Subject: <iman> update category management banner

---
 src/lib/home/components/CategoryPilihan.jsx | 17 ++++++-----------
 src/pages/index.jsx                         |  2 +-
 2 files changed, 7 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/lib/home/components/CategoryPilihan.jsx b/src/lib/home/components/CategoryPilihan.jsx
index e47524aa..72e6f6a8 100644
--- a/src/lib/home/components/CategoryPilihan.jsx
+++ b/src/lib/home/components/CategoryPilihan.jsx
@@ -23,25 +23,21 @@ const CategoryPilihan = ({ id, categories }) => {
                         <div className='font-semibold sm:text-h-lg mr-2'>LOB Kategori Pilihan</div>
                         <p className='text-gray_r-10 text-sm'>200 Rb+ Produk Unggulan & 800+ Brand Rekomendasi tersedia!</p>
                     </div>
-                    <div className='flex w-full h-48 justify-center mb-4'>
                         {heroBanner.data &&
                             heroBanner.data?.length > 0 && (
-                                <div className=' '>
-                                        <Link key={heroBanner.data[0].id} href={heroBanner.data[0].url}>
+                                <div className='flex w-full h-full justify-center mb-4 bg-cover bg-center'>
+                                        <Link  key={heroBanner.data[0].id} href={heroBanner.data[0].url}>
                                             <Image
                                             width={1260}
                                             height={170}
                                             quality={100}
-                                            // src={heroBanner.data[0].image}
-                                            src={"https://erp.indoteknik.com/web/image?model=x_banner.banner&id=345&field=x_banner_image&unique=09202023101820"}
+                                            src={heroBanner.data[0].image}
                                             alt={heroBanner.data[0].name}
-                                            className='h-48 object-cover w-full'
+                                            className='h-full object-cover w-full'
                                             />
                                         </Link>
-                                </div>
-                            
+                            </div>
                             )}
-                    </div>
                     <div className="group/item grid grid-cols-6 gap-y-2 w-full h-full col-span-2 ">
                             {categoryPilihan?.data?.map((category) => (
                                 <div key={category.id} className="KartuInti h-48 w-60 max-w-sm   lg:max-w-full flex flex-col   border-[1px] border-gray-200  relative group">
@@ -72,7 +68,7 @@ const CategoryPilihan = ({ id, categories }) => {
                         <div className='font-semibold sm:text-h-md mr-2'>LOB Kategori Pilihan</div>
                         {/* <p className='text-gray_r-10 text-sm'>200 Rb+ Produk Unggulan & 800+ Brand Rekomendasi tersedia!</p> */}
                     </div>
-                    <div className='flex mb-4'>
+                    <div className='flex'>
                         {heroBanner.data &&
                             heroBanner.data?.length > 0 && (
                                 <div className=' object-fill '>
@@ -87,7 +83,6 @@ const CategoryPilihan = ({ id, categories }) => {
                                             />
                                         </Link>
                                 </div>
-                            
                             )}
                     </div>
                         <Swiper slidesPerView={2.1} spaceBetween={10}>
diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 64c880c7..9d9d5dc0 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -156,7 +156,7 @@ export default function Home({categoryId}) {
         <DelayRender renderAfter={200}>
           <HeroBanner />
         </DelayRender>
-        <div className='flex flex-col gap-y-12 my-6'>
+        <div className='flex flex-col gap-y-4 my-6'>
           <DelayRender renderAfter={400}>
             <ServiceList />
           </DelayRender>
-- 
cgit v1.2.3


From d14f51d91cfb8851ae2c335628737d2f516dbf6a Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 30 Jul 2024 14:25:53 +0700
Subject: <iman> update category management

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

(limited to 'src')

diff --git a/src/lib/home/components/CategoryPilihan.jsx b/src/lib/home/components/CategoryPilihan.jsx
index 72e6f6a8..6568621c 100644
--- a/src/lib/home/components/CategoryPilihan.jsx
+++ b/src/lib/home/components/CategoryPilihan.jsx
@@ -88,7 +88,7 @@ const CategoryPilihan = ({ id, categories }) => {
                         <Swiper slidesPerView={2.1} spaceBetween={10}>
                             {categoryPilihan?.data?.map((category) => (
                                 <SwiperSlide key={category.id}>
-                                    <div key={category.id} className="KartuInti h-48 w-48 max-w-sm   lg:max-w-full flex flex-col   border-[1px] border-gray-200  relative group">
+                                    <div key={category.id} className="KartuInti mt-2 h-48 w-48 max-w-sm   lg:max-w-full flex flex-col   border-[1px] border-gray-200  relative group">
                                         <div className='KartuB absolute h-48 w-48 inset-0 flex items-center justify-center '>
                                             <div className="group/edit flex items-center justify-end h-48 w-48  flex-col group-hover/item:visible">
                                                 <div className=' h-36 flex justify-end items-end'>
-- 
cgit v1.2.3


From 53d214ef3222bcc4169b188bff3dadf6c43f6b7e Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 30 Jul 2024 14:27:23 +0700
Subject: <iman> git aMerge branch 'Feature/category-management' into
 development

---
 .../components/elements/Navbar/NavbarMobile.jsx    |   4 +-
 src/core/components/elements/Navbar/TopBanner.jsx  |  29 ++---
 src/lib/home/components/CategoryPilihan.jsx        | 142 ++++++++++++++-------
 src/pages/index.jsx                                |   4 +-
 4 files changed, 116 insertions(+), 63 deletions(-)

(limited to 'src')

diff --git a/src/core/components/elements/Navbar/NavbarMobile.jsx b/src/core/components/elements/Navbar/NavbarMobile.jsx
index bcf45e0a..90314671 100644
--- a/src/core/components/elements/Navbar/NavbarMobile.jsx
+++ b/src/core/components/elements/Navbar/NavbarMobile.jsx
@@ -11,7 +11,7 @@ import Image from 'next/image';
 import { useEffect, useState } from 'react';
 import MobileView from '../../views/MobileView';
 import Link from '../Link/Link';
-// import TopBanner from './TopBanner';
+import TopBanner from './TopBanner';
 
 const Search = dynamic(() => import('./Search'));
 
@@ -39,7 +39,7 @@ const NavbarMobile = () => {
 
   return (
     <MobileView>
-      {/* <TopBanner /> */}
+      <TopBanner />
       <nav className='px-4 py-2 pb-3 sticky top-0 z-50 bg-white shadow'>
         <div className='flex justify-between items-center mb-2'>
           <Link href='/'>
diff --git a/src/core/components/elements/Navbar/TopBanner.jsx b/src/core/components/elements/Navbar/TopBanner.jsx
index 83ef8c7a..df47e87d 100644
--- a/src/core/components/elements/Navbar/TopBanner.jsx
+++ b/src/core/components/elements/Navbar/TopBanner.jsx
@@ -1,12 +1,12 @@
 import Image from 'next/image';
-import { useQuery } from 'react-query';
-
+import { useQuery } from 'react-query';import useDevice from '@/core/hooks/useDevice'
 import odooApi from '@/core/api/odooApi';
 import SmoothRender from '~/components/ui/smooth-render';
 import Link from '../Link/Link';
 import { background } from '@chakra-ui/react';
 
 const TopBanner = () => {
+  const { isDesktop, isMobile } = useDevice()
   const topBanner = useQuery({
     queryKey: 'topBanner',
     queryFn: async () => await odooApi('GET', '/api/v1/banner?type=top-banner'),
@@ -20,22 +20,21 @@ const TopBanner = () => {
   return (
     <SmoothRender
       isLoaded={hasData}
-      height='36px'
+      // height='36px'
       duration='700ms'
       delay='300ms'
-    >
-     <Link
-        href={data?.url}
-        className="block"
-        style={{
-          backgroundImage: `url('${data?.image}')`,
-          backgroundPosition: 'center',
-          backgroundSize: 'cover',
-          height: '36px',
-        }}
+      className='h-auto'
       >
-      </Link>
-    </SmoothRender>
+      <Link
+          href={data?.url}
+          className="block bg-cover bg-center h-3 md:h-6 lg:h-[36px]"
+          style={{
+            backgroundImage: `url('${data?.image}')`,
+          }}
+        >
+        </Link>
+
+      </SmoothRender>
   );
 };
 
diff --git a/src/lib/home/components/CategoryPilihan.jsx b/src/lib/home/components/CategoryPilihan.jsx
index 451d289e..6568621c 100644
--- a/src/lib/home/components/CategoryPilihan.jsx
+++ b/src/lib/home/components/CategoryPilihan.jsx
@@ -7,59 +7,113 @@ import { bannerApi } from '../../../api/bannerApi';
 const { useQuery } = require('react-query')
 import { HeroBannerSkeleton } from '../../../components/skeleton/BannerSkeleton';
 import useCategoryPilihan from '../hooks/useCategoryPilihan';
+import useDevice from '@/core/hooks/useDevice'
+import { Swiper, SwiperSlide } from 'swiper/react';
+import 'swiper/css';
 
 const CategoryPilihan = ({ id, categories }) => {
+    const { isDesktop, isMobile } = useDevice()
     const { categoryPilihan } = useCategoryPilihan();
     const heroBanner = useQuery('categoryPilihan', bannerApi({ type: 'banner-category-list' }));
       return (
           <section>
-        <div className='flex flex-row items-center mb-4'>
-            <div className='font-semibold sm:text-h-lg mr-2'>Kategori Pilihan</div>
-            <p className='text-gray_r-10 text-sm'>200 Rb+ Produk Unggulan & 800+ Brand Rekomendasi tersedia!</p>
-        </div>
-        <div className='flex w-full h-48 bg-red-300 mb-4'>
-            {heroBanner.data &&
-                heroBanner.data?.length > 0 && (
-                    <div key={heroBanner.data.id} className='px-4 sm:px-0  object-fill '>
-                        {/* {heroBanner.data?.map((banner) => ( */}
-                            <Link key={heroBanner.data[0].id} href={heroBanner.data[0].url}>
-                                <Image
-                                width={439}
-                                height={150}
-                                quality={100}
-                                src={heroBanner.data[0].image}
-                                alt={heroBanner.data[0].name}
-                                className='h-48 object-fill w-full'
-                                />
-                            </Link>
-                            {/* ))} */}
+            {isDesktop && (
+                <div>
+                    <div className='flex flex-row items-center mb-4'>
+                        <div className='font-semibold sm:text-h-lg mr-2'>LOB Kategori Pilihan</div>
+                        <p className='text-gray_r-10 text-sm'>200 Rb+ Produk Unggulan & 800+ Brand Rekomendasi tersedia!</p>
                     </div>
-                
-                )}
-        </div>
-        <div className="group/item grid grid-cols-6 gap-y-2 w-full h-full col-span-2 ">
-                {categoryPilihan?.data?.map((category) => (
-                    <div key={category.id} className="KartuInti h-48 w-60 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-end h-48 w-60  flex-col group-hover/item:visible">
-                                <div className=' h-36 flex justify-end items-end'>
-                                    <Image className='group-hover:scale-105 transition-transform duration-300 ' src={category?.image? category?.image : '/images/noimage.jpeg'}  width={120} height={120} alt={category?.name} />
-                                </div>
-                                <h2 className="text-gray-700 content-center h-12 border-t-[1px] px-1 w-60 border-gray-200 font-normal text-sm text-center">{category?.industries}</h2>
+                        {heroBanner.data &&
+                            heroBanner.data?.length > 0 && (
+                                <div className='flex w-full h-full justify-center mb-4 bg-cover bg-center'>
+                                        <Link  key={heroBanner.data[0].id} href={heroBanner.data[0].url}>
+                                            <Image
+                                            width={1260}
+                                            height={170}
+                                            quality={100}
+                                            src={heroBanner.data[0].image}
+                                            alt={heroBanner.data[0].name}
+                                            className='h-full object-cover w-full'
+                                            />
+                                        </Link>
                             </div>
-                        </div>
-                        <div className='KartuA relative inset-0  flex h-36 w-60   items-center justify-center opacity-0 group-hover:opacity-75 group-hover:bg-[#E20613] transition-opacity '>
-                            <Link
-                                href={createSlug('/shop/lob/', category?.industries, category?.id)}
-                                className='category-mega-box__parent text-white   rounded-lg'
-                            >
-                                Lihat semua
-                            </Link>
-                        </div>
+                            )}
+                    <div className="group/item grid grid-cols-6 gap-y-2 w-full h-full col-span-2 ">
+                            {categoryPilihan?.data?.map((category) => (
+                                <div key={category.id} className="KartuInti h-48 w-60 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-end h-48 w-60  flex-col group-hover/item:visible">
+                                            <div className=' h-36 flex justify-end items-end'>
+                                                <Image className='group-hover:scale-105 transition-transform duration-300 ' src={category?.image? category?.image : '/images/noimage.jpeg'}  width={120} height={120} alt={category?.name} />
+                                            </div>
+                                            <h2 className="text-gray-700 content-center h-12 border-t-[1px] px-1 w-60 border-gray-200 font-normal text-sm text-center">{category?.industries}</h2>
+                                        </div>
+                                    </div>
+                                    <div className='KartuA relative inset-0  flex h-36 w-60   items-center justify-center opacity-0 group-hover:opacity-75 group-hover:bg-[#E20613] transition-opacity '>
+                                        <Link
+                                            href={createSlug('/shop/lob/', category?.industries, category?.id)}
+                                            className='category-mega-box__parent text-white   rounded-lg'
+                                        >
+                                            Lihat semua
+                                        </Link>
+                                    </div>
+                                </div>
+                            ))}
+                    </div>
+                </div>
+            )}
+            {isMobile && (
+                <div className='p-4'>
+                    <div className='flex flex-row items-center mb-4'>
+                        <div className='font-semibold sm:text-h-md mr-2'>LOB Kategori Pilihan</div>
+                        {/* <p className='text-gray_r-10 text-sm'>200 Rb+ Produk Unggulan & 800+ Brand Rekomendasi tersedia!</p> */}
                     </div>
-                ))}
-        </div>
-    </section>
+                    <div className='flex'>
+                        {heroBanner.data &&
+                            heroBanner.data?.length > 0 && (
+                                <div className=' object-fill '>
+                                        <Link key={heroBanner.data[0].id} href={heroBanner.data[0].url}>
+                                            <Image
+                                            width={439}
+                                            height={150}
+                                            quality={100}
+                                            src={heroBanner.data[0].image}
+                                            alt={heroBanner.data[0].name}
+                                            className='object-cover'
+                                            />
+                                        </Link>
+                                </div>
+                            )}
+                    </div>
+                        <Swiper slidesPerView={2.1} spaceBetween={10}>
+                            {categoryPilihan?.data?.map((category) => (
+                                <SwiperSlide key={category.id}>
+                                    <div key={category.id} className="KartuInti mt-2 h-48 w-48 max-w-sm   lg:max-w-full flex flex-col   border-[1px] border-gray-200  relative group">
+                                        <div className='KartuB absolute h-48 w-48 inset-0 flex items-center justify-center '>
+                                            <div className="group/edit flex items-center justify-end h-48 w-48  flex-col group-hover/item:visible">
+                                                <div className=' h-36 flex justify-end items-end'>
+                                                    <Image className='group-hover:scale-105 transition-transform duration-300 ' src={category?.image? category?.image : '/images/noimage.jpeg'}  width={120} height={120} alt={category?.name} />
+                                                </div>
+                                                <h2 className="text-gray-700 content-center h-12 border-t-[1px] px-1 w-48 border-gray-200 font-normal text-sm text-center">{category?.industries}</h2>
+                                            </div>
+                                        </div>
+                                        <div className='KartuA relative inset-0  flex h-36 w-48   items-center justify-center opacity-0 group-hover:opacity-75 group-hover:bg-[#E20613] transition-opacity '>
+                                            <Link
+                                                href={createSlug('/shop/lob/', category?.industries, category?.id)}
+                                                className='category-mega-box__parent text-white   rounded-lg'
+                                            >
+                                                Lihat semua
+                                            </Link>
+                                        </div>
+                                    </div>
+                                </SwiperSlide>
+                            ))}
+
+                        </Swiper>
+                    
+                </div>
+            )}
+            </section>
   )
 }
 
diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 64c880c7..d649ee17 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -61,7 +61,7 @@ const CategoryDynamic = dynamic(() =>
 );
 
 const CategoryDynamicMobile = dynamic(() =>
-  import('@/lib/home/components/CategoryDynamicMobile')
+import('@/lib/home/components/CategoryDynamicMobile')
 );
 
 const CustomerReviews = dynamic(() =>
@@ -156,7 +156,7 @@ export default function Home({categoryId}) {
         <DelayRender renderAfter={200}>
           <HeroBanner />
         </DelayRender>
-        <div className='flex flex-col gap-y-12 my-6'>
+        <div className='flex flex-col gap-y-4 my-6'>
           <DelayRender renderAfter={400}>
             <ServiceList />
           </DelayRender>
-- 
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')

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')

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')

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')

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 067b536d7ea507575bd5bc3c12815927bd40d103 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 30 Jul 2024 16:06:13 +0700
Subject: <iman> add skeleton

---
 src/lib/home/components/CategoryDynamic.jsx | 114 +++++++++++++++-------------
 1 file changed, 63 insertions(+), 51 deletions(-)

(limited to 'src')

diff --git a/src/lib/home/components/CategoryDynamic.jsx b/src/lib/home/components/CategoryDynamic.jsx
index 6ab03ec3..dda7cdc4 100644
--- a/src/lib/home/components/CategoryDynamic.jsx
+++ b/src/lib/home/components/CategoryDynamic.jsx
@@ -4,6 +4,7 @@ import NextImage from 'next/image';
 import Link from "next/link";
 import { createSlug } from '@/core/utils/slug';
 import odooApi from '@/core/api/odooApi';
+import { Skeleton} from '@chakra-ui/react'
 
 const CategoryDynamic = () => {
   const { categoryManagement } = useCategoryManagement();
@@ -41,62 +42,73 @@ const CategoryDynamic = () => {
 
   return (
     <div>
-      {categoryManagement && categoryManagement.data?.map((category) => {
-        const countLevel1 = categoryData[category.categoryIdI] || 0;
-        
-        return (
-          <div key={category.id}>
-            <div className='bagian-judul flex flex-row justify-start items-center gap-3 mb-4 mt-4'>
-              <div className='font-semibold sm:text-h-lg mr-2'>{category.name}</div>
-              <p className='text-gray_r-10 text-sm'>{countLevel1} Produk tersedia</p>
-              <Link href={createSlug('/shop/category/', category?.name, category?.categoryIdI)} className="!text-red-500 font-semibold">Lihat Semua</Link>
-            </div>
-            <div className='grid grid-cols-3 gap-2'>
-              {category.categories.map((subCategory) => {
-                const countLevel2 = subCategoryData[subCategory.idLevel2] || 0;
+        {categoryManagement && categoryManagement.data?.map((category) => {
+          const countLevel1 = categoryData[category.categoryIdI] || 0;
+          
+          return (
+            <Skeleton isLoaded={categoryManagement}>
+            <div key={category.id}>
+              <div className='bagian-judul flex flex-row justify-start items-center gap-3 mb-4 mt-4'>
+                <div className='font-semibold sm:text-h-lg mr-2'>{category.name}</div>
+                <p className={`text-gray_r-10 text-sm ${countLevel1 === 0 ? 'animate-pulse ' : ''}`}>
+                  {countLevel1 === 0 ? 'Menghitung jumlah produk...' : `${countLevel1} Produk tersedia`}
+              </p>
+                <Link href={createSlug('/shop/category/', category?.name, category?.categoryIdI)} className="!text-red-500 font-semibold">Lihat Semua</Link>
+              </div>
+              <div className='grid grid-cols-3 gap-2'>
+                {category.categories.map((subCategory) => {
+                  const countLevel2 = subCategoryData[subCategory.idLevel2] || 0;
 
-                return (
-                  <div key={subCategory.id} className='border rounded justify-start items-start'>
-                    <div className='p-3'>
-                      <div className='flex flex-row border rounded mb-2 justify-start items-center'>
-                        <NextImage
-                          src={subCategory.image ? subCategory.image : "/images/noimage.jpeg"}
-                          alt={subCategory.name}
-                          width={90}
-                          height={30}
-                          className='object-fit'
-                        />
-                        <div className='bagian-judul flex flex-col justify-center items-start gap-2 ml-2'>
-                          <div className='font-semibold text-lg mr-2'>{subCategory.name}</div>
-                          <p className='text-gray_r-10 text-sm'>{countLevel2} Produk tersedia</p>
-                          <Link href={createSlug('/shop/category/', subCategory?.name, subCategory?.idLevel2)} className="!text-red-500 font-semibold">Lihat Semua</Link>
-                        </div>
-                      </div>
-                      <div className='grid grid-cols-2 gap-2 overflow-y-auto max-h-[240px]'>
-                        {subCategory.childFrontendIdI.map((childCategory) => (
-                          <div key={childCategory.id}>
-                            <Link href={createSlug('/shop/category/', childCategory?.name, childCategory?.idLevel3)} className="flex flex-row gap-2 border rounded group hover:border-red-500">
-                              <NextImage
-                                src={childCategory.image ? childCategory.image : "/images/noimage.jpeg"}
-                                alt={childCategory.name}
-                                width={40}
-                                height={40}
-                              />
-                              <div className='bagian-judul flex flex-col justify-center items-center gap-2 break-words line-clamp-2 group-hover:text-red-500'>
-                                <div className='font-semibold line-clamp-2 group-hover:text-red-500 text-sm mr-2'>{childCategory.name}</div>
-                              </div>
-                            </Link>
+                  return (
+                    <div key={subCategory.id} className='border rounded justify-start items-start'>
+                      <div className='p-3'>
+                        <div className='flex flex-row border rounded mb-2 justify-start items-center'>
+                          <NextImage
+                            src={subCategory.image ? subCategory.image : "/images/noimage.jpeg"}
+                            alt={subCategory.name}
+                            width={90}
+                            height={30}
+                            className='object-fit'
+                          />
+                          <div className='bagian-judul flex flex-col justify-center items-start gap-2 ml-2'>
+                            <div className='font-semibold text-lg mr-2'>{subCategory.name}</div>
+                            {/* <p className={`text-gray_r-10 text-sm ${countLevel2 === 0 ? 'animate-pulse ' : ''}`}>
+                              {countLevel2 === 0 ? 'Menghitung jumlah produk...' : `${countLevel2} Produk tersedia`}
+                            </p> */}
+                            <Skeleton isLoaded={countLevel2 != 0}>
+                            <p className={`text-gray_r-10 text-sm`}>
+                              {countLevel2} Produk tersedia
+                            </p>
+                            </Skeleton>
+                            <Link href={createSlug('/shop/category/', subCategory?.name, subCategory?.idLevel2)} className="!text-red-500 font-semibold">Lihat Semua</Link>
                           </div>
-                        ))}
+                        </div>
+                        <div className='grid grid-cols-2 gap-2 overflow-y-auto max-h-[240px]'>
+                          {subCategory.childFrontendIdI.map((childCategory) => (
+                            <div key={childCategory.id}>
+                              <Link href={createSlug('/shop/category/', childCategory?.name, childCategory?.idLevel3)} className="flex flex-row gap-2 border rounded group hover:border-red-500">
+                                <NextImage
+                                  src={childCategory.image ? childCategory.image : "/images/noimage.jpeg"}
+                                  alt={childCategory.name}
+                                  width={40}
+                                  height={40}
+                                />
+                                <div className='bagian-judul flex flex-col justify-center items-center gap-2 break-words line-clamp-2 group-hover:text-red-500'>
+                                  <div className='font-semibold line-clamp-2 group-hover:text-red-500 text-sm mr-2'>{childCategory.name}</div>
+                                </div>
+                              </Link>
+                            </div>
+                          ))}
+                        </div>
                       </div>
                     </div>
-                  </div>
-                );
-              })}
+                  );
+                })}
+              </div>
             </div>
-          </div>
-        );
-      })}
+          </Skeleton>
+          );
+        })}
     </div>
   );
 };
-- 
cgit v1.2.3


From c62a5dd32e961f06a01d0a535d2fbf37118ff2e7 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 30 Jul 2024 16:09:07 +0700
Subject: <iman> add key missing

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

(limited to 'src')

diff --git a/src/lib/home/components/CategoryDynamic.jsx b/src/lib/home/components/CategoryDynamic.jsx
index dda7cdc4..60e01df0 100644
--- a/src/lib/home/components/CategoryDynamic.jsx
+++ b/src/lib/home/components/CategoryDynamic.jsx
@@ -46,7 +46,7 @@ const CategoryDynamic = () => {
           const countLevel1 = categoryData[category.categoryIdI] || 0;
           
           return (
-            <Skeleton isLoaded={categoryManagement}>
+            <Skeleton key={category.id} isLoaded={categoryManagement}>
             <div key={category.id}>
               <div className='bagian-judul flex flex-row justify-start items-center gap-3 mb-4 mt-4'>
                 <div className='font-semibold sm:text-h-lg mr-2'>{category.name}</div>
-- 
cgit v1.2.3


From 8fe0cdf1f457148eb39d5438b13bbec7bc912976 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 31 Jul 2024 08:59:17 +0700
Subject: <iman> update category management

---
 src/lib/home/components/CategoryDynamic.jsx | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/lib/home/components/CategoryDynamic.jsx b/src/lib/home/components/CategoryDynamic.jsx
index 60e01df0..f2d1a16f 100644
--- a/src/lib/home/components/CategoryDynamic.jsx
+++ b/src/lib/home/components/CategoryDynamic.jsx
@@ -18,14 +18,10 @@ const CategoryDynamic = () => {
         const updatedSubCategoryData = {};
         
         for (const category of categoryManagement.data) {
-          // Calculate level 1 products
           const countLevel1 = await odooApi('GET', `/api/v1/category/numFound?parent_id=${category.categoryIdI}`);
-          // console.log("countLevel1.child",countLevel1)
           
           updatedCategoryData[category.categoryIdI] = countLevel1?.numFound;
           
-          
-          // Calculate level 2 products for each sub-category
           for (const subCategory of countLevel1.children) {
             updatedSubCategoryData[subCategory.id] = subCategory.numFound;
           }
@@ -50,9 +46,9 @@ const CategoryDynamic = () => {
             <div key={category.id}>
               <div className='bagian-judul flex flex-row justify-start items-center gap-3 mb-4 mt-4'>
                 <div className='font-semibold sm:text-h-lg mr-2'>{category.name}</div>
-                <p className={`text-gray_r-10 text-sm ${countLevel1 === 0 ? 'animate-pulse ' : ''}`}>
-                  {countLevel1 === 0 ? 'Menghitung jumlah produk...' : `${countLevel1} Produk tersedia`}
-              </p>
+                <Skeleton isLoaded={countLevel1 !=0}>
+                  <p className={`text-gray_r-10 text-sm`}>{countLevel1} Produk tersedia</p>
+                </Skeleton>
                 <Link href={createSlug('/shop/category/', category?.name, category?.categoryIdI)} className="!text-red-500 font-semibold">Lihat Semua</Link>
               </div>
               <div className='grid grid-cols-3 gap-2'>
@@ -72,9 +68,6 @@ const CategoryDynamic = () => {
                           />
                           <div className='bagian-judul flex flex-col justify-center items-start gap-2 ml-2'>
                             <div className='font-semibold text-lg mr-2'>{subCategory.name}</div>
-                            {/* <p className={`text-gray_r-10 text-sm ${countLevel2 === 0 ? 'animate-pulse ' : ''}`}>
-                              {countLevel2 === 0 ? 'Menghitung jumlah produk...' : `${countLevel2} Produk tersedia`}
-                            </p> */}
                             <Skeleton isLoaded={countLevel2 != 0}>
                             <p className={`text-gray_r-10 text-sm`}>
                               {countLevel2} Produk tersedia
-- 
cgit v1.2.3


From 7cac694f5a78f01e7e8185f7d37b758e9b7dab34 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 31 Jul 2024 14:01:48 +0700
Subject: <iman> add pop up cart

---
 src/lib/cart/components/Cartheader.jsx | 250 +++++++++++++++++++++++++++++++++
 1 file changed, 250 insertions(+)

(limited to 'src')

diff --git a/src/lib/cart/components/Cartheader.jsx b/src/lib/cart/components/Cartheader.jsx
index 19f79bc9..a7dd621d 100644
--- a/src/lib/cart/components/Cartheader.jsx
+++ b/src/lib/cart/components/Cartheader.jsx
@@ -1,14 +1,21 @@
 import { useCallback, useEffect, useMemo, useState } from 'react'
 import { getCartApi } from '../api/CartApi'
+import currencyFormat from '@/core/utils/currencyFormat'
+import Image from '@/core/components/elements/Image/Image'
+import { createSlug } from '@/core/utils/slug'
 import useAuth from '@/core/hooks/useAuth'
 import { useRouter } from 'next/router'
 import odooApi from '@/core/api/odooApi'
 import { useProductCartContext } from '@/contexts/ProductCartContext'
+import whatsappUrl from '@/core/utils/whatsappUrl'
+import { AnimatePresence, motion } from 'framer-motion'
+import style from '../../../../src-migrate/modules/cart/styles/item-promo.module.css'
 
 const { ShoppingCartIcon, PhotoIcon } = require('@heroicons/react/24/outline')
 const { default: Link } = require('next/link')
 
 const Cardheader = (cartCount) => {
+  
   const router = useRouter()
   const [subTotal, setSubTotal] = useState(null)
   const [buttonLoading, SetButtonTerapkan] = useState(false)
@@ -109,6 +116,249 @@ const Cardheader = (cartCount) => {
           </span>
         </Link>
       </div>
+      <AnimatePresence>
+        {isHovered && (
+          <>
+            <motion.div
+              initial={{ opacity: 0 }}
+              animate={{ opacity: 1 }}
+              exit={{ opacity: 0 }}
+              transition={{ duration: 0.15 }}
+              className='fixed top-[230px] left-0 w-full h-full bg-black/50 z-10'
+            />
+
+            <motion.div
+              initial={{ opacity: 0 }}
+              animate={{ opacity: 1, transition: { duration: 0.2 } }}
+              exit={{ opacity: 0, transition: { duration: 0.3 } }}
+              className='absolute z-10 left-0 w-96'
+              onMouseEnter={handleMouseEnter}
+              onMouseLeave={handleMouseLeave}
+            >
+              <motion.div
+                initial={{ height: 0 }}
+                animate={{ height: 'auto' }}
+                exit={{ height: 0 }}
+                className='w-full max-w-md p-2 bg-white border border-gray-200 rounded-lg shadow overflow-hidden'
+              >
+                <div className='p-2 flex justify-between items-center'>
+                  <h5 className='text-base font-semibold leading-none'>Keranjang Belanja</h5>
+                  <Link href='/shop/cart' class='text-sm font-medium text-red-600 underline'>
+                    Lihat Semua
+                  </Link>
+                </div>
+                <hr className='mt-3 mb-3 border border-gray-100' />
+                <div className='flow-root max-h-[250px] overflow-y-auto'>
+                  {!auth && (
+                    <div className='justify-center p-4'>
+                      <p className='text-gray-500 text-center '>
+                        Silahkan{' '}
+                        <Link href='/login' className='text-red-600 underline leading-6'>
+                          Login
+                        </Link>{' '}
+                        Untuk Melihat Daftar Keranjang Belanja Anda
+                      </p>
+                    </div>
+                  )}
+                  {isLoading &&
+                    itemLoading.map((item) => (
+                      <div key={item} role='status' className='max-w-sm animate-pulse'>
+                        <div className='flex items-center space-x-4 mb- 2'>
+                          <div className='flex-shrink-0'>
+                            <PhotoIcon className='h-16 w-16 text-gray-500' />
+                          </div>
+                          <div className='flex-1 min-w-0'>
+                            <div className='h-2.5 bg-gray-200 rounded-full dark:bg-gray-700 w-48 mb-4'></div>
+                            <div className='h-2 bg-gray-200 rounded-full dark:bg-gray-700 max-w-[360px] mb-2.5'></div>
+                            <div className='h-2 bg-gray-200 rounded-full dark:bg-gray-700 mb-2.5'></div>
+                          </div>
+                        </div>
+                      </div>
+                    ))}
+                  {auth && products.length === 0 && !isLoading && (
+                    <div className='justify-center p-4'>
+                      <p className='text-gray-500 text-center '>
+                        Tidak Ada Produk di Keranjang Belanja Anda
+                      </p>
+                    </div>
+                  )}
+                  {auth && products.length > 0 && !isLoading && (
+                    <>
+                      <ul role='list' className='divide-y divide-gray-200 dark:divide-gray-700'>
+                        {products &&
+                          products?.map((product, index) => (
+                            <>
+                              <li className='py-1 sm:py-2'>
+                                <div className='flex items-center space-x-4'>
+                                  <div className='bagian gambar flex-shrink-0'>
+                                    {product.cartType === 'promotion' &&  (
+                                      <Image
+                                        src={product.imageProgram[0]}
+                                        alt={product.name}
+                                        className='object-contain object-center border border-gray_r-6 h-16 w-16 rounded-md'
+                                      />
+                                    )}
+                                    {product.cartType === 'product' && (
+                                      <Link
+                                        href={createSlug(
+                                          '/shop/product/',
+                                          product?.parent.name,
+                                          product?.parent.id
+                                        )}
+                                        className='line-clamp-2 leading-6 !text-gray_r-12 font-normal'
+                                      >
+                                        <Image
+                                          src={product?.parent?.image}
+                                          alt={product?.name}
+                                          className='object-contain object-center border border-gray_r-6 h-16 w-16 rounded-md'
+                                        />
+                                      </Link>
+                                    )}
+                                  </div>
+                                  <div className='bagian tulisan dan harga flex-1 min-w-0'>
+                                    {product.cartType === 'promotion' && (
+                                          <p className='text-caption-2 font-medium text-gray-900 truncate dark:text-white'>
+                                            {product.name}
+                                          </p>
+                                      )}
+                                    {product.cartType === 'product' && (
+                                      <Link
+                                        href={createSlug(
+                                          '/shop/product/',
+                                          product?.parent.name,
+                                          product?.parent.id
+                                        )}
+                                        className='line-clamp-2 leading-6 !text-gray_r-12 font-normal'
+                                      >
+                                        {' '}
+                                        <p className='text-caption-2 font-medium text-gray-900 truncate dark:text-white'>
+                                          {product.parent.name}
+                                        </p>
+                                      </Link>
+                                    )}
+
+                                    {product?.hasFlashsale && (
+                                      <div className='flex gap-x-1 items-center mb-2 mt-1'>
+                                        <div className='badge-solid-red'>
+                                          {product?.price?.discountPercentage}%
+                                        </div>
+                                        <div className='text-gray_r-11 line-through text-caption-2'>
+                                          {currencyFormat(product?.price?.price)}
+                                        </div>
+                                      </div>
+                                    )}
+                                    
+                                    <div className='flex justify-between items-center'>
+                                      <div className='font-semibold text-sm text-red-600'>
+                                        {product?.price?.priceDiscount > 0 ? (
+                                          currencyFormat(product?.price?.priceDiscount)
+                                        ) : (
+                                          <span className='text-gray_r-12/90 font-normal text-caption-1'>
+                                            <a
+                                              href={whatsappUrl('product', {
+                                                name: product.name,
+                                                manufacture: product.manufacture?.name,
+                                                url: createSlug(
+                                                  '/shop/product/',
+                                                  product.name,
+                                                  product.id,
+                                                  true
+                                                )
+                                              })}
+                                              className='text-danger-500 underline'
+                                              rel='noopener noreferrer'
+                                              target='_blank'
+                                            >
+                                              Call For Price
+                                            </a>
+                                          </span>
+                                        )}
+                                      </div>
+                                    </div>
+                                  </div>
+                                </div>
+                                  <div className="flex flex-col">
+                                      {product.products?.map((product) => 
+                                        <div key={product.id} className='md:ml-8 ml-4 mt-2 flex'>
+                                          <Link href={createSlug('/shop/product/', product.parent.name, product.parent.id.toString())} className='md:h-12 md:w-12 md:min-w-[48px] h-10 w-10 min-w-[40px] border border-gray-300 rounded '>
+                                            {product?.image && <Image src={product.image} alt={product.name} width={40} height={40} className='w-full h-full object-fill' />}
+                                          </Link>
+                                  
+                                          <div className="ml-4 w-full flex flex-col gap-y-1">
+                                            <Link href={createSlug('/shop/product/', product.parent.name, product.parent.id.toString())} className="text-caption-2 font-medium text-gray-900 truncate dark:text-white">
+                                              {product.displayName}
+                                            </Link>
+                                    
+                                            <div className='flex w-full'>
+                                              <div className="flex flex-col">
+                                                {/* <div className="text-gray-500 text-caption-1">{product.code}</div> */}
+                                                <div>
+                                                  <span className="text-gray-500 text-caption-1">Berat Barang: </span>
+                                                  <span className="text-gray-500 text-caption-1">{product.packageWeight} Kg</span>
+                                                </div>
+                                              </div>
+                                            </div>
+                                          </div>
+                                    
+                                        </div>
+                                        )}
+                                      {product.freeProducts?.map((product) => 
+                                        <div key={product.id} className='md:ml-8 ml-4 mt-2 flex'>
+                                        <Link href={createSlug('/shop/product/', product.parent.name, product.parent.id.toString())} className='md:h-12 md:w-12 md:min-w-[48px] h-10 w-10 min-w-[40px] border border-gray-300 rounded '>
+                                          {product?.image && <Image src={product.image} alt={product.name} width={40} height={40} className='w-full h-full object-fill' />}
+                                        </Link>
+                                  
+                                        <div className="ml-4 w-full flex flex-col gap-y-1">
+                                          <Link href={createSlug('/shop/product/', product.parent.name, product.parent.id.toString())} className="text-caption-2 font-medium text-gray-900 truncate dark:text-white">
+                                            {product.displayName}
+                                          </Link>
+                                  
+                                          <div className='flex w-full'>
+                                              <div className="flex flex-col">
+                                                {/* <div className="text-gray-500 text-caption-1">{product.code}</div> */}
+                                                <div>
+                                                  <span className="text-gray-500 text-caption-1">Berat Barang: </span>
+                                                  <span className="text-gray-500 text-caption-1">{product.packageWeight} Kg</span>
+                                                </div>
+                                              </div>
+                                            </div>
+                                          </div>
+                                    
+                                        </div>
+                                      )}
+                                    </div>
+                              </li>
+                            </>
+                          ))}
+                      </ul>
+                      <hr />
+                    </>
+                  )}
+                </div>
+                {auth && products.length > 0 && !isLoading && (
+                  <>
+                    <div className='mt-3'>
+                      <span className='text-gray-400 text-caption-2'>Subtotal Sebelum PPN : </span>
+                      <span className='font-semibold text-red-600'>{currencyFormat(subTotal)}</span>
+                    </div>
+                    <div className='mt-5 mb-2'>
+                      <button
+                        type='button'
+                        className='btn-solid-red rounded-lg w-full'
+                        onClick={handleCheckout}
+                        disabled={buttonLoading}
+                      >
+                        {buttonLoading ? 'Loading...' : 'Lanjutkan Ke Pembayaran'}
+                      </button>
+                    </div>
+                  </>
+                )}
+              </motion.div>
+            </motion.div>
+          </>
+        )}
+      </AnimatePresence>
+
     </div>
   )
 }
-- 
cgit v1.2.3


From 12f581a4c0c4a3316385015622823c9e5935bb05 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 31 Jul 2024 14:13:10 +0700
Subject: <iman> update pop up cart

---
 src/lib/cart/components/Cartheader.jsx      | 19 ++++++++++++++++---
 src/lib/home/components/CategoryDynamic.jsx |  2 +-
 2 files changed, 17 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/lib/cart/components/Cartheader.jsx b/src/lib/cart/components/Cartheader.jsx
index a7dd621d..c8aa7cc3 100644
--- a/src/lib/cart/components/Cartheader.jsx
+++ b/src/lib/cart/components/Cartheader.jsx
@@ -26,6 +26,7 @@ const Cardheader = (cartCount) => {
     useProductCartContext()
 
   const [isHovered, setIsHovered] = useState(false)
+  const [isTop, setIsTop] = useState(true)
 
   const products = useMemo(() => {
     return productCart?.products || []
@@ -84,12 +85,24 @@ const Cardheader = (cartCount) => {
     setCountCart(cartCount.cartCount)
   }, [cartCount])
 
+  useEffect(() => {
+    const handleScroll = () => {
+      setIsTop(window.scrollY === 0)
+    }
+
+    window.addEventListener('scroll', handleScroll)
+    return () => {
+      window.removeEventListener('scroll', handleScroll)
+    }
+  }, [])
+
   const handleCheckout = async () => {
     SetButtonTerapkan(true)
     let checkoutAll = await odooApi('POST', `/api/v1/user/${auth.id}/cart/select-all`)
     router.push('/shop/checkout')
   }
 
+
   return (
     <div className='relative group'>
       <div>
@@ -121,10 +134,10 @@ const Cardheader = (cartCount) => {
           <>
             <motion.div
               initial={{ opacity: 0 }}
-              animate={{ opacity: 1 }}
+              animate={{ opacity: 1, top: isTop ? 230 : 155 }}
               exit={{ opacity: 0 }}
-              transition={{ duration: 0.15 }}
-              className='fixed top-[230px] left-0 w-full h-full bg-black/50 z-10'
+              transition={{ duration: 0.15, top: { duration: 0.3 } }}
+              className={`fixed left-0 w-full h-full bg-black/50 z-10`}
             />
 
             <motion.div
diff --git a/src/lib/home/components/CategoryDynamic.jsx b/src/lib/home/components/CategoryDynamic.jsx
index 6ab03ec3..dae17c94 100644
--- a/src/lib/home/components/CategoryDynamic.jsx
+++ b/src/lib/home/components/CategoryDynamic.jsx
@@ -25,7 +25,7 @@ const CategoryDynamic = () => {
           
           
           // Calculate level 2 products for each sub-category
-          for (const subCategory of countLevel1.children) {
+          for (const subCategory of countLevel1?.children) {
             updatedSubCategoryData[subCategory.id] = subCategory.numFound;
           }
         }
-- 
cgit v1.2.3


From 6e5766739b0684919c8630580403ed279cc3a71e Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 31 Jul 2024 14:14:27 +0700
Subject: <iman> back log

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

(limited to 'src')

diff --git a/src/lib/home/components/CategoryDynamic.jsx b/src/lib/home/components/CategoryDynamic.jsx
index dae17c94..6ab03ec3 100644
--- a/src/lib/home/components/CategoryDynamic.jsx
+++ b/src/lib/home/components/CategoryDynamic.jsx
@@ -25,7 +25,7 @@ const CategoryDynamic = () => {
           
           
           // Calculate level 2 products for each sub-category
-          for (const subCategory of countLevel1?.children) {
+          for (const subCategory of countLevel1.children) {
             updatedSubCategoryData[subCategory.id] = subCategory.numFound;
           }
         }
-- 
cgit v1.2.3


From 8a03b5a325692fd39c193f2a12b1a9aa4af1553e Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 31 Jul 2024 14:31:34 +0700
Subject: <iman> update cart pop up

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

(limited to 'src')

diff --git a/src/lib/cart/components/Cartheader.jsx b/src/lib/cart/components/Cartheader.jsx
index c8aa7cc3..7d43a4da 100644
--- a/src/lib/cart/components/Cartheader.jsx
+++ b/src/lib/cart/components/Cartheader.jsx
@@ -290,7 +290,7 @@ const Cardheader = (cartCount) => {
                                     </div>
                                   </div>
                                 </div>
-                                  <div className="flex flex-col">
+                                  <div className="flex flex-col w-3/4">
                                       {product.products?.map((product) => 
                                         <div key={product.id} className='md:ml-8 ml-4 mt-2 flex'>
                                           <Link href={createSlug('/shop/product/', product.parent.name, product.parent.id.toString())} className='md:h-12 md:w-12 md:min-w-[48px] h-10 w-10 min-w-[40px] border border-gray-300 rounded '>
-- 
cgit v1.2.3


From d57ca7be5e2de9c48f4229b20a49a94bf05e88d1 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 2 Aug 2024 14:55:16 +0700
Subject: <iman> update cart pop up

---
 src/lib/cart/components/Cartheader.jsx | 259 ++++++++++++++++++++++++++++++++-
 1 file changed, 257 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/lib/cart/components/Cartheader.jsx b/src/lib/cart/components/Cartheader.jsx
index 19f79bc9..e3a5cc1f 100644
--- a/src/lib/cart/components/Cartheader.jsx
+++ b/src/lib/cart/components/Cartheader.jsx
@@ -4,7 +4,12 @@ import useAuth from '@/core/hooks/useAuth'
 import { useRouter } from 'next/router'
 import odooApi from '@/core/api/odooApi'
 import { useProductCartContext } from '@/contexts/ProductCartContext'
-
+import currencyFormat from '@/core/utils/currencyFormat'
+import Image from '@/core/components/elements/Image/Image'
+import { createSlug } from '@/core/utils/slug'
+import whatsappUrl from '@/core/utils/whatsappUrl'
+import { AnimatePresence, motion } from 'framer-motion'
+import style from '../../../../src-migrate/modules/cart/styles/item-promo.module.css'
 const { ShoppingCartIcon, PhotoIcon } = require('@heroicons/react/24/outline')
 const { default: Link } = require('next/link')
 
@@ -19,7 +24,7 @@ const Cardheader = (cartCount) => {
     useProductCartContext()
 
   const [isHovered, setIsHovered] = useState(false)
-
+  const [isTop, setIsTop] = useState(true)
   const products = useMemo(() => {
     return productCart?.products || []
   }, [productCart])
@@ -77,6 +82,16 @@ const Cardheader = (cartCount) => {
     setCountCart(cartCount.cartCount)
   }, [cartCount])
 
+  useEffect(() => {
+    const handleScroll = () => {
+      setIsTop(window.scrollY === 0)
+    }
+    window.addEventListener('scroll', handleScroll)
+    return () => {
+      window.removeEventListener('scroll', handleScroll)
+    }
+  }, [])
+
   const handleCheckout = async () => {
     SetButtonTerapkan(true)
     let checkoutAll = await odooApi('POST', `/api/v1/user/${auth.id}/cart/select-all`)
@@ -109,6 +124,246 @@ const Cardheader = (cartCount) => {
           </span>
         </Link>
       </div>
+      <AnimatePresence>
+        {isHovered && (
+          <>
+            <motion.div
+              initial={{ opacity: 0 }}
+              animate={{ opacity: 1, top: isTop ? 230 : 155 }}
+              exit={{ opacity: 0 }}
+              transition={{ duration: 0.15, top: { duration: 0.3 } }}
+              className={`fixed left-0 w-full h-full bg-black/50 z-10`}
+            />
+            <motion.div
+              initial={{ opacity: 0 }}
+              animate={{ opacity: 1, transition: { duration: 0.2 } }}
+              exit={{ opacity: 0, transition: { duration: 0.3 } }}
+              className='absolute z-10 left-0 w-96'
+              onMouseEnter={handleMouseEnter}
+              onMouseLeave={handleMouseLeave}
+            >
+              <motion.div
+                initial={{ height: 0 }}
+                animate={{ height: 'auto' }}
+                exit={{ height: 0 }}
+                className='w-full max-w-md p-2 bg-white border border-gray-200 rounded-lg shadow overflow-hidden'
+              >
+                <div className='p-2 flex justify-between items-center'>
+                  <h5 className='text-base font-semibold leading-none'>Keranjang Belanja</h5>
+                  <Link href='/shop/cart' class='text-sm font-medium text-red-600 underline'>
+                    Lihat Semua
+                  </Link>
+                </div>
+                <hr className='mt-3 mb-3 border border-gray-100' />
+                <div className='flow-root max-h-[250px] overflow-y-auto'>
+                  {!auth && (
+                    <div className='justify-center p-4'>
+                      <p className='text-gray-500 text-center '>
+                        Silahkan{' '}
+                        <Link href='/login' className='text-red-600 underline leading-6'>
+                          Login
+                        </Link>{' '}
+                        Untuk Melihat Daftar Keranjang Belanja Anda
+                      </p>
+                    </div>
+                  )}
+                  {isLoading &&
+                    itemLoading.map((item) => (
+                      <div key={item} role='status' className='max-w-sm animate-pulse'>
+                        <div className='flex items-center space-x-4 mb- 2'>
+                          <div className='flex-shrink-0'>
+                            <PhotoIcon className='h-16 w-16 text-gray-500' />
+                          </div>
+                          <div className='flex-1 min-w-0'>
+                            <div className='h-2.5 bg-gray-200 rounded-full dark:bg-gray-700 w-48 mb-4'></div>
+                            <div className='h-2 bg-gray-200 rounded-full dark:bg-gray-700 max-w-[360px] mb-2.5'></div>
+                            <div className='h-2 bg-gray-200 rounded-full dark:bg-gray-700 mb-2.5'></div>
+                          </div>
+                        </div>
+                      </div>
+                    ))}
+                  {auth && products.length === 0 && !isLoading && (
+                    <div className='justify-center p-4'>
+                      <p className='text-gray-500 text-center '>
+                        Tidak Ada Produk di Keranjang Belanja Anda
+                      </p>
+                    </div>
+                  )}
+                  {auth && products.length > 0 && !isLoading && (
+                    <>
+                      <ul role='list' className='divide-y divide-gray-200 dark:divide-gray-700'>
+                        {products &&
+                          products?.map((product, index) => (
+                            <>
+                              <li className='py-1 sm:py-2'>
+                                <div className='flex items-center space-x-4'>
+                                  <div className='bagian gambar flex-shrink-0'>
+                                    {product.cartType === 'promotion' &&  (
+                                      <Image
+                                        src={product.imageProgram[0]}
+                                        alt={product.name}
+                                        className='object-contain object-center border border-gray_r-6 h-16 w-16 rounded-md'
+                                      />
+                                    )}
+                                    {product.cartType === 'product' && (
+                                      <Link
+                                        href={createSlug(
+                                          '/shop/product/',
+                                          product?.parent.name,
+                                          product?.parent.id
+                                        )}
+                                        className='line-clamp-2 leading-6 !text-gray_r-12 font-normal'
+                                      >
+                                        <Image
+                                          src={product?.parent?.image}
+                                          alt={product?.name}
+                                          className='object-contain object-center border border-gray_r-6 h-16 w-16 rounded-md'
+                                        />
+                                      </Link>
+                                    )}
+                                  </div>
+                                  <div className='bagian tulisan dan harga flex-1 min-w-0'>
+                                    {product.cartType === 'promotion' && (
+                                          <p className='text-caption-2 font-medium text-gray-900 truncate dark:text-white'>
+                                            {product.name}
+                                          </p>
+                                      )}
+                                    {product.cartType === 'product' && (
+                                      <Link
+                                        href={createSlug(
+                                          '/shop/product/',
+                                          product?.parent.name,
+                                          product?.parent.id
+                                        )}
+                                        className='line-clamp-2 leading-6 !text-gray_r-12 font-normal'
+                                      >
+                                        {' '}
+                                        <p className='text-caption-2 font-medium text-gray-900 truncate dark:text-white'>
+                                          {product.parent.name}
+                                        </p>
+                                      </Link>
+                                    )}
+                                    {product?.hasFlashsale && (
+                                      <div className='flex gap-x-1 items-center mb-2 mt-1'>
+                                        <div className='badge-solid-red'>
+                                          {product?.price?.discountPercentage}%
+                                        </div>
+                                        <div className='text-gray_r-11 line-through text-caption-2'>
+                                          {currencyFormat(product?.price?.price)}
+                                        </div>
+                                      </div>
+                                    )}
+                                    
+                                    <div className='flex justify-between items-center'>
+                                      <div className='font-semibold text-sm text-red-600'>
+                                        {product?.price?.priceDiscount > 0 ? (
+                                          currencyFormat(product?.price?.priceDiscount)
+                                        ) : (
+                                          <span className='text-gray_r-12/90 font-normal text-caption-1'>
+                                            <a
+                                              href={whatsappUrl('product', {
+                                                name: product.name,
+                                                manufacture: product.manufacture?.name,
+                                                url: createSlug(
+                                                  '/shop/product/',
+                                                  product.name,
+                                                  product.id,
+                                                  true
+                                                )
+                                              })}
+                                              className='text-danger-500 underline'
+                                              rel='noopener noreferrer'
+                                              target='_blank'
+                                            >
+                                              Call For Price
+                                            </a>
+                                          </span>
+                                        )}
+                                      </div>
+                                    </div>
+                                  </div>
+                                </div>
+                                  <div className="flex flex-col w-3/4">
+                                      {product.products?.map((product) => 
+                                        <div key={product.id} className='md:ml-8 ml-4 mt-2 flex'>
+                                          <Link href={createSlug('/shop/product/', product.parent.name, product.parent.id.toString())} className='md:h-12 md:w-12 md:min-w-[48px] h-10 w-10 min-w-[40px] border border-gray-300 rounded '>
+                                            {product?.image && <Image src={product.image} alt={product.name} width={40} height={40} className='w-full h-full object-fill' />}
+                                          </Link>
+                                  
+                                          <div className="ml-4 w-full flex flex-col gap-y-1">
+                                            <Link href={createSlug('/shop/product/', product.parent.name, product.parent.id.toString())} className="text-caption-2 font-medium text-gray-900 truncate dark:text-white">
+                                              {product.displayName}
+                                            </Link>
+                                    
+                                            <div className='flex w-full'>
+                                              <div className="flex flex-col">
+                                                {/* <div className="text-gray-500 text-caption-1">{product.code}</div> */}
+                                                <div>
+                                                  <span className="text-gray-500 text-caption-1">Berat Barang: </span>
+                                                  <span className="text-gray-500 text-caption-1">{product.packageWeight} Kg</span>
+                                                </div>
+                                              </div>
+                                            </div>
+                                          </div>
+                                    
+                                        </div>
+                                        )}
+                                      {product.freeProducts?.map((product) => 
+                                        <div key={product.id} className='md:ml-8 ml-4 mt-2 flex'>
+                                        <Link href={createSlug('/shop/product/', product.parent.name, product.parent.id.toString())} className='md:h-12 md:w-12 md:min-w-[48px] h-10 w-10 min-w-[40px] border border-gray-300 rounded '>
+                                          {product?.image && <Image src={product.image} alt={product.name} width={40} height={40} className='w-full h-full object-fill' />}
+                                        </Link>
+                                  
+                                        <div className="ml-4 w-full flex flex-col gap-y-1">
+                                          <Link href={createSlug('/shop/product/', product.parent.name, product.parent.id.toString())} className="text-caption-2 font-medium text-gray-900 truncate dark:text-white">
+                                            {product.displayName}
+                                          </Link>
+                                  
+                                          <div className='flex w-full'>
+                                              <div className="flex flex-col">
+                                                {/* <div className="text-gray-500 text-caption-1">{product.code}</div> */}
+                                                <div>
+                                                  <span className="text-gray-500 text-caption-1">Berat Barang: </span>
+                                                  <span className="text-gray-500 text-caption-1">{product.packageWeight} Kg</span>
+                                                </div>
+                                              </div>
+                                            </div>
+                                          </div>
+                                    
+                                        </div>
+                                      )}
+                                    </div>
+                              </li>
+                            </>
+                          ))}
+                      </ul>
+                      <hr />
+                    </>
+                  )}
+                </div>
+                {auth && products.length > 0 && !isLoading && (
+                  <>
+                    <div className='mt-3'>
+                      <span className='text-gray-400 text-caption-2'>Subtotal Sebelum PPN : </span>
+                      <span className='font-semibold text-red-600'>{currencyFormat(subTotal)}</span>
+                    </div>
+                    <div className='mt-5 mb-2'>
+                      <button
+                        type='button'
+                        className='btn-solid-red rounded-lg w-full'
+                        onClick={handleCheckout}
+                        disabled={buttonLoading}
+                      >
+                        {buttonLoading ? 'Loading...' : 'Lanjutkan Ke Pembayaran'}
+                      </button>
+                    </div>
+                  </>
+                )}
+              </motion.div>
+            </motion.div>
+          </>
+        )}
+      </AnimatePresence>
     </div>
   )
 }
-- 
cgit v1.2.3


From cf8a2c77f5a76a3b1dc10db6de56a4958de7b068 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Sat, 3 Aug 2024 08:41:51 +0700
Subject: <iman> update error code

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

(limited to 'src')

diff --git a/src/lib/cart/components/Cartheader.jsx b/src/lib/cart/components/Cartheader.jsx
index f76634ce..c7a8f0b8 100644
--- a/src/lib/cart/components/Cartheader.jsx
+++ b/src/lib/cart/components/Cartheader.jsx
@@ -1,15 +1,12 @@
 import { useCallback, useEffect, useMemo, useState } from 'react'
 import { getCartApi } from '../api/CartApi'
 import currencyFormat from '@/core/utils/currencyFormat'
-import Image from '@/core/components/elements/Image/Image'
 import { createSlug } from '@/core/utils/slug'
 import useAuth from '@/core/hooks/useAuth'
 import { useRouter } from 'next/router'
 import odooApi from '@/core/api/odooApi'
 import { useProductCartContext } from '@/contexts/ProductCartContext'
-import currencyFormat from '@/core/utils/currencyFormat'
 import Image from '@/core/components/elements/Image/Image'
-import { createSlug } from '@/core/utils/slug'
 import whatsappUrl from '@/core/utils/whatsappUrl'
 import { AnimatePresence, motion } from 'framer-motion'
 import style from '../../../../src-migrate/modules/cart/styles/item-promo.module.css'
-- 
cgit v1.2.3


From aaac6b72dddf8ef8460941797a1f6d88f289f726 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 5 Aug 2024 15:59:30 +0700
Subject: <iman> update category management

---
 src/lib/category/api/popularProduct.js       | 36 +++++++++++
 src/lib/category/components/Category.jsx     | 35 ++--------
 src/lib/category/components/PopularBrand.jsx | 96 ++++++++++++++++++++++++++++
 src/lib/home/components/CategoryDynamic.jsx  |  3 +-
 4 files changed, 140 insertions(+), 30 deletions(-)
 create mode 100644 src/lib/category/api/popularProduct.js
 create mode 100644 src/lib/category/components/PopularBrand.jsx

(limited to 'src')

diff --git a/src/lib/category/api/popularProduct.js b/src/lib/category/api/popularProduct.js
new file mode 100644
index 00000000..2298f6fa
--- /dev/null
+++ b/src/lib/category/api/popularProduct.js
@@ -0,0 +1,36 @@
+
+export const fetchPromoItemsSolr = async (category_id_ids) => {
+    let sort ='sort=qty_sold_f desc';
+    try {
+        const queryParams = new URLSearchParams({ q: category_id_ids });
+        // const response = await fetch(`/solr/product/select?${queryParams.toString()}&rows=2000&fl=manufacture_name_s&${sort}`);
+        console.log("queryParams",queryParams)
+        
+        // const response = await fetch(`/solr/product/select?${queryParams.toString()}`);
+        const response = await fetch(`/solr/promotion_program_lines/select?${queryParams.toString()}&rows=10&start=0&${sort}`);
+        console.log("response",response)
+        if (!response.ok) {
+            throw new Error(`HTTP error! status: ${response.status}`);
+        }
+        const data = await response.json();
+      const promotions = await map(data.response.docs);
+      return promotions;
+    } catch (error) {
+      console.error("Error fetching promotion data:", error);
+      return [];
+    }
+  };
+
+  const map = async (promotions) => {
+    const result = [];
+    for (const promotion of promotions) {
+      const data = {
+        id: promotion.id,
+        name: promotion.display_name_s,
+        manufacture_name: promotion.manufacture_name_s,
+        manufacture_id: promotion.manufacture_id_i,
+      };
+      result.push(data);
+    }
+    return result;
+  };
\ No newline at end of file
diff --git a/src/lib/category/components/Category.jsx b/src/lib/category/components/Category.jsx
index c147a3b3..1f3d7a51 100644
--- a/src/lib/category/components/Category.jsx
+++ b/src/lib/category/components/Category.jsx
@@ -5,6 +5,7 @@ import { createSlug } from '@/core/utils/slug'
 import { ChevronRightIcon } from '@heroicons/react/24/outline'
 import Image from 'next/image'
 import { useEffect, useState } from 'react'
+import PopularBrand from './PopularBrand'
 
 const Category = () => {
   const [categories, setCategories] = useState([])
@@ -30,6 +31,7 @@ const Category = () => {
     }
     loadCategories()
   }, [])
+  console.log("categories",categories)
 
   return (
     <DesktopView>
@@ -38,8 +40,11 @@ const Category = () => {
           <div key={category.id} className='flex'>
             <Link
               href={createSlug('/shop/category/', category.name, category.id)}
-              className='category-mega-box__parent'
+              className='category-mega-box__parent flex items-center'
             >
+              <div className='w-6 h-6 border mr-2 rounded-full flex justify-center items-center'>
+                <Image src={category.image} alt='' width={16} height={16} />
+              </div>
               {category.name}
             </Link>
             <div className='category-mega-box__child-wrapper'>
@@ -80,33 +85,7 @@ const Category = () => {
                 ))}
               </div>
               <div className='category-mega-box__child-wrapper !w-[260px] !flex !flex-col !gap-4'>
-                <div className='flex flex-col'>
-                  <div className='grid grid-cols-2 max-h-full w-full gap-2'>
-                    {category.childs.map((brand, index) => (
-                      (index < 8 ) && (
-                        <div key={brand.id} className='w-full flex items-center justify-center pb-2'>
-                          <Link
-                            href={createSlug('/shop/category/', brand.name, brand.id)}
-                            className='category-mega-box__child-one w-fit h-full flex items-center justify-center '
-                          >
-                            <Image src='https://erp.indoteknik.com/api/image/x_manufactures/x_logo_manufacture/661' alt='' width={104} height={44} objectFit='cover' />
-                          </Link>
-                        </div>
-                      )
-                    ))}
-                  </div>
-                  {category.childs.length > 8 && (
-                    <div className='flex hover:bg-gray_r-8/35 rounded-10'>
-                      <Link
-                        href={createSlug('/shop/category/', category.name, category.id)}
-                        className='category-mega-box__child-one flex items-center gap-4 font-bold hover:ml-4'
-                      >
-                        <p className='mt-2 mb-0 text-danger-500 font-semibold'>Lihat Semua Brand</p>
-                        <ChevronRightIcon className='w-4 text-danger-500 font-bold' />
-                      </Link>
-                    </div>
-                  )}
-                </div>
+              <PopularBrand category={category} />
                 <div className='flex w-60 h-20 object-cover'>
                   <Image src='https://erp.indoteknik.com/api/image/x_banner.banner/x_banner_image/397' alt='' width={275} height={4} />
                 </div>
diff --git a/src/lib/category/components/PopularBrand.jsx b/src/lib/category/components/PopularBrand.jsx
new file mode 100644
index 00000000..32623f91
--- /dev/null
+++ b/src/lib/category/components/PopularBrand.jsx
@@ -0,0 +1,96 @@
+import odooApi from '@/core/api/odooApi'
+import {React } from 'react'
+import axios from 'axios';
+import { useQuery } from 'react-query'
+import Link from '@/core/components/elements/Link/Link'
+import { createSlug } from '@/core/utils/slug'
+import Image from 'next/image'
+import { ChevronRightIcon } from '@heroicons/react/24/outline'
+import useProductSearch from '../../../lib/product/hooks/useProductSearch';
+import { SolrResponse } from "~/types/solr";
+import {fetchPromoItemsSolr} from '../api/popularProduct'
+const SOLR_HOST = process.env.SOLR_HOST
+
+const PopularBrand = ({ category }) => {
+
+    const queryFinal = {
+        fq: `category_id_ids:(${category.categoryDataIds.join(' OR ')})`,
+        fl: 'manufacture_name_s,qty_sold_f',
+        sort: 'qty_sold_f desc',
+        rows: '2000'
+    };
+    
+    // Konversi objek queryFinal menjadi string query
+    // const queryString = new URLSearchParams(queryFinal).toString();
+    
+    async function fetchTopBrands() {
+        try {
+            // const items = await fetchPromoItemsSolr(`category_id_ids:(${category.categoryDataIds.join(' OR ')})`); 
+            const items = await fetchPromoItemsSolr(`type_value_s:discount_loading`);
+
+            console.log("queryFinal", queryFinal);
+            console.log("items", items);
+    
+            // Fungsi untuk deduplikasi dan mengambil 12 nama brand teratas
+            function getTop12UniqueBrands(products) {
+                const brandSet = new Set();
+                const topBrands = [];
+    
+                for (const product of products) {
+                    if (!brandSet.has(product.manufacture_name_s)) {
+                        brandSet.add(product.manufacture_name_s);
+                        topBrands.push(product.manufacture_name_s);
+                    }
+                    if (topBrands.length === 12) break;
+                }
+    
+                return topBrands;
+            }
+    
+            // Menggunakan hasil pencarian produk
+            const products = items;
+            const top12UniqueBrands = getTop12UniqueBrands(products);
+    
+            console.log('top12UniqueBrands',top12UniqueBrands);
+            return top12UniqueBrands;
+        } catch (error) {
+            console.error("Error fetching data from Solr", error);
+            throw error;
+        }
+    }
+    
+    fetchTopBrands();
+
+
+  return (
+    <div className='flex flex-col'>
+                  <div className='grid grid-cols-2 max-h-full w-full gap-2'>
+                    {category.childs.map((brand, index) => (
+                      (index < 8 ) && (
+                        <div key={brand.id} className='w-full flex items-center justify-center pb-2'>
+                          <Link
+                            href={createSlug('/shop/category/', brand.name, brand.id)}
+                            className='category-mega-box__child-one w-fit h-full flex items-center justify-center '
+                          >
+                            <Image src='https://erp.indoteknik.com/api/image/x_manufactures/x_logo_manufacture/661' alt='' width={104} height={44} objectFit='cover' />
+                          </Link>
+                        </div>
+                      )
+                    ))}
+                  </div>
+                  {category.childs.length > 8 && (
+                    <div className='flex hover:bg-gray_r-8/35 rounded-10'>
+                      <Link
+                        href={createSlug('/shop/category/', category.name, category.id)}
+                        className='category-mega-box__child-one flex items-center gap-4 font-bold hover:ml-4'
+                      >
+                        <p className='mt-2 mb-0 text-danger-500 font-semibold'>Lihat Semua Brand</p>
+                        <ChevronRightIcon className='w-4 text-danger-500 font-bold' />
+                      </Link>
+                    </div>
+        )}
+    </div>
+  )
+}
+
+export default PopularBrand
diff --git a/src/lib/home/components/CategoryDynamic.jsx b/src/lib/home/components/CategoryDynamic.jsx
index f2d1a16f..0cc43d91 100644
--- a/src/lib/home/components/CategoryDynamic.jsx
+++ b/src/lib/home/components/CategoryDynamic.jsx
@@ -33,9 +33,8 @@ const CategoryDynamic = () => {
     };
 
     fetchCategoryData();
-  }, [categoryManagement, categoryData]);
+  }, [categoryManagement.isLoading]);
  
-
   return (
     <div>
         {categoryManagement && categoryManagement.data?.map((category) => {
-- 
cgit v1.2.3


From 54fca7062ee0963d6ea6a22a82fba7fa3fa516e5 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 5 Aug 2024 17:07:35 +0700
Subject: <iman> update category management

---
 src/lib/category/api/popularProduct.js       |   7 +-
 src/lib/category/components/Category.jsx     |   2 +-
 src/lib/category/components/PopularBrand.jsx | 105 ++++++++++++---------------
 3 files changed, 48 insertions(+), 66 deletions(-)

(limited to 'src')

diff --git a/src/lib/category/api/popularProduct.js b/src/lib/category/api/popularProduct.js
index 2298f6fa..e17e0ae5 100644
--- a/src/lib/category/api/popularProduct.js
+++ b/src/lib/category/api/popularProduct.js
@@ -3,12 +3,7 @@ export const fetchPromoItemsSolr = async (category_id_ids) => {
     let sort ='sort=qty_sold_f desc';
     try {
         const queryParams = new URLSearchParams({ q: category_id_ids });
-        // const response = await fetch(`/solr/product/select?${queryParams.toString()}&rows=2000&fl=manufacture_name_s&${sort}`);
-        console.log("queryParams",queryParams)
-        
-        // const response = await fetch(`/solr/product/select?${queryParams.toString()}`);
-        const response = await fetch(`/solr/promotion_program_lines/select?${queryParams.toString()}&rows=10&start=0&${sort}`);
-        console.log("response",response)
+        const response = await fetch(`/solr/product/select?${queryParams.toString()}&rows=2000&fl=manufacture_name_s,manufacture_id_i,id,display_name_s&${sort}`);
         if (!response.ok) {
             throw new Error(`HTTP error! status: ${response.status}`);
         }
diff --git a/src/lib/category/components/Category.jsx b/src/lib/category/components/Category.jsx
index 1f3d7a51..ff958378 100644
--- a/src/lib/category/components/Category.jsx
+++ b/src/lib/category/components/Category.jsx
@@ -31,7 +31,7 @@ const Category = () => {
     }
     loadCategories()
   }, [])
-  console.log("categories",categories)
+  // console.log("categories",categories)
 
   return (
     <DesktopView>
diff --git a/src/lib/category/components/PopularBrand.jsx b/src/lib/category/components/PopularBrand.jsx
index 32623f91..dca731e8 100644
--- a/src/lib/category/components/PopularBrand.jsx
+++ b/src/lib/category/components/PopularBrand.jsx
@@ -1,5 +1,5 @@
 import odooApi from '@/core/api/odooApi'
-import {React } from 'react'
+import React, { useEffect, useState } from 'react'
 import axios from 'axios';
 import { useQuery } from 'react-query'
 import Link from '@/core/components/elements/Link/Link'
@@ -8,89 +8,76 @@ import Image from 'next/image'
 import { ChevronRightIcon } from '@heroicons/react/24/outline'
 import useProductSearch from '../../../lib/product/hooks/useProductSearch';
 import { SolrResponse } from "~/types/solr";
-import {fetchPromoItemsSolr} from '../api/popularProduct'
+import { fetchPromoItemsSolr } from '../api/popularProduct'
+
 const SOLR_HOST = process.env.SOLR_HOST
 
 const PopularBrand = ({ category }) => {
+    const [topBrands, setTopBrands] = useState([]);
 
-    const queryFinal = {
-        fq: `category_id_ids:(${category.categoryDataIds.join(' OR ')})`,
-        fl: 'manufacture_name_s,qty_sold_f',
-        sort: 'qty_sold_f desc',
-        rows: '2000'
-    };
-    
-    // Konversi objek queryFinal menjadi string query
-    // const queryString = new URLSearchParams(queryFinal).toString();
-    
-    async function fetchTopBrands() {
+    const fetchTopBrands = async () => {
         try {
-            // const items = await fetchPromoItemsSolr(`category_id_ids:(${category.categoryDataIds.join(' OR ')})`); 
-            const items = await fetchPromoItemsSolr(`type_value_s:discount_loading`);
-
-            console.log("queryFinal", queryFinal);
-            console.log("items", items);
-    
+            const items = await fetchPromoItemsSolr(`category_id_ids:(${category.categoryDataIds.join(' OR ')})`);
+            // console.log("id",items)
             // Fungsi untuk deduplikasi dan mengambil 12 nama brand teratas
-            function getTop12UniqueBrands(products) {
+            const getTop12UniqueBrands = (prod) => {
                 const brandSet = new Set();
                 const topBrands = [];
-    
-                for (const product of products) {
-                    if (!brandSet.has(product.manufacture_name_s)) {
-                        brandSet.add(product.manufacture_name_s);
-                        topBrands.push(product.manufacture_name_s);
+                
+                for (const product of prod) {
+                    if (!brandSet.has(product.manufacture_name)) {
+                        brandSet.add(product.manufacture_name);
+                        topBrands.push({ name: product.manufacture_name, id: product.manufacture_id });
+                    }else{
                     }
-                    if (topBrands.length === 12) break;
+                    if (topBrands.length === 18) break;
                 }
-    
                 return topBrands;
             }
-    
+
             // Menggunakan hasil pencarian produk
             const products = items;
             const top12UniqueBrands = getTop12UniqueBrands(products);
-    
-            console.log('top12UniqueBrands',top12UniqueBrands);
-            return top12UniqueBrands;
+
+            // console.log('top12UniqueBrands', top12UniqueBrands);
+            setTopBrands(top12UniqueBrands);
         } catch (error) {
             console.error("Error fetching data from Solr", error);
             throw error;
         }
     }
-    
-    fetchTopBrands();
 
+    useEffect(() => {
+        fetchTopBrands();
+    }, [category]);
 
-  return (
-    <div className='flex flex-col'>
-                  <div className='grid grid-cols-2 max-h-full w-full gap-2'>
-                    {category.childs.map((brand, index) => (
-                      (index < 8 ) && (
-                        <div key={brand.id} className='w-full flex items-center justify-center pb-2'>
-                          <Link
-                            href={createSlug('/shop/category/', brand.name, brand.id)}
-                            className='category-mega-box__child-one w-fit h-full flex items-center justify-center '
-                          >
-                            <Image src='https://erp.indoteknik.com/api/image/x_manufactures/x_logo_manufacture/661' alt='' width={104} height={44} objectFit='cover' />
-                          </Link>
-                        </div>
-                      )
-                    ))}
-                  </div>
-                  {category.childs.length > 8 && (
-                    <div className='flex hover:bg-gray_r-8/35 rounded-10'>
-                      <Link
+    return (
+        <div className='flex flex-col'>
+            <div className='grid grid-cols-3 max-h-full w-full gap-2'>
+                {topBrands.map((brand, index) => (
+                    <div key={index} className='w-full flex items-center justify-center pb-2'>
+                        <Link
+                            href={createSlug('/shop/brands/', brand.name, brand.id)}
+                            className='category-mega-box__child-one w-8 h-full flex items-center justify-center '
+                        >
+                            <Image src={`https://erp.indoteknik.com/api/image/x_manufactures/x_logo_manufacture/${brand.id}` } alt={`${brand.name}`} width={104} height={44} objectFit='cover' />
+                        </Link>
+                    </div>
+                ))}
+            </div>
+            {/* {topBrands.length > 8 && (
+                <div className='flex hover:bg-gray_r-8/35 rounded-10'>
+                    <Link
                         href={createSlug('/shop/category/', category.name, category.id)}
                         className='category-mega-box__child-one flex items-center gap-4 font-bold hover:ml-4'
-                      >
+                    >
                         <p className='mt-2 mb-0 text-danger-500 font-semibold'>Lihat Semua Brand</p>
                         <ChevronRightIcon className='w-4 text-danger-500 font-bold' />
-                      </Link>
-                    </div>
-        )}
-    </div>
-  )
+                    </Link>
+                </div>
+            )} */}
+        </div>
+    )
 }
 
-export default PopularBrand
+export default PopularBrand;
-- 
cgit v1.2.3


From 807931ee9bcb063157ceb8368e5ee0941450c6ca Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 6 Aug 2024 14:32:41 +0700
Subject: <iman> add quotation pop up

---
 src/contexts/ProductQuotationContext.js            |  17 ++
 .../components/elements/Navbar/NavbarDesktop.jsx   |  58 +++++--
 src/lib/quotation/components/Quotationheader.jsx   | 189 +++++++++++++++++++++
 3 files changed, 249 insertions(+), 15 deletions(-)
 create mode 100644 src/contexts/ProductQuotationContext.js
 create mode 100644 src/lib/quotation/components/Quotationheader.jsx

(limited to 'src')

diff --git a/src/contexts/ProductQuotationContext.js b/src/contexts/ProductQuotationContext.js
new file mode 100644
index 00000000..f9e17830
--- /dev/null
+++ b/src/contexts/ProductQuotationContext.js
@@ -0,0 +1,17 @@
+import React, { createContext, useContext, useState } from 'react';
+
+const ProductQuotationContext = createContext();
+
+export const useProductQuotationContext = () => useContext(ProductQuotationContext);
+
+export const ProductQuotationProvider = ({ children }) => {
+  const [productQuotation, setProductQuotation] = useState([]);
+  const [refreshQuotation, setRefreshQuotation] = useState(false);
+  const [isLoading, setIsloading] = useState(false);
+
+  return (
+    <ProductQuotationContext.Provider value={{ productQuotation, setProductQuotation, refreshQuotation, setRefreshQuotation, isLoading, setIsloading }}>
+      {children}
+    </ProductQuotationContext.Provider>
+  );
+};
diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx
index 7d9e4264..49c4cd6e 100644
--- a/src/core/components/elements/Navbar/NavbarDesktop.jsx
+++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx
@@ -5,7 +5,9 @@ import { createSlug } from '@/core/utils/slug';
 import whatsappUrl from '@/core/utils/whatsappUrl';
 import IndoteknikLogo from '@/images/logo.png';
 import Cardheader from '@/lib/cart/components/Cartheader';
+import Quotationheader from '@/lib/quotation/components/QuotationHeader'
 import Category from '@/lib/category/components/Category';
+import { useProductQuotationContext } from '@/contexts/ProductQuotationContext'
 import {
   ChevronDownIcon,
   DocumentCheckIcon,
@@ -28,6 +30,7 @@ import {
   useDisclosure,
 } from '@chakra-ui/react';
 import style from "./style/NavbarDesktop.module.css";
+import useTransactions from '@/lib/transaction/hooks/useTransactions';
 
 const Search = dynamic(() => import('./Search'), { ssr: false });
 const TopBanner = dynamic(() => import('./TopBanner'), { ssr: false });
@@ -37,6 +40,8 @@ const NavbarDesktop = () => {
   const auth = useAuth();
 
   const [cartCount, setCartCount] = useState(0);
+  const [quotationCount, setQuotationCount] = useState(0);
+  // const { setProductQuotation, refreshQuotation, setRefreshQuotation, isLoading, setIsloading } = useProductQuotationContext()
 
   const [templateWA, setTemplateWA] = useState(null);
   const [payloadWA, setPayloadWa] = useState(null);
@@ -47,6 +52,16 @@ const NavbarDesktop = () => {
   const { product } = useProductContext();
   const { isOpen, onOpen, onClose } = useDisclosure();
 
+  const query = {
+    context: 'quotation',
+    site:
+      (auth?.webRole === null && auth?.site ? auth.site : null),
+  };
+  
+  const { transactions } = useTransactions({query});
+  const pendingTransactions = transactions?.data?.saleOrders.filter(transaction => transaction.status === 'draft');
+  
+  
   useEffect(() => {
     if (router.pathname === '/shop/product/[slug]') {
       setPayloadWa({
@@ -55,11 +70,11 @@ const NavbarDesktop = () => {
         url: createSlug('/shop/product/', product?.name, product?.id, true),
       });
       setTemplateWA('product');
-
+      
       setUrlPath(router.asPath);
     }
   }, [product, router]);
-
+  
   useEffect(() => {
     const handleCartChange = () => {
       const cart = async () => {
@@ -69,14 +84,36 @@ const NavbarDesktop = () => {
       cart();
     };
     handleCartChange();
-
+    
     window.addEventListener('localStorageChange', handleCartChange);
-
+    
     return () => {
       window.removeEventListener('localStorageChange', handleCartChange);
     };
   }, []);
+  
+  // useEffect(() => {
+  //   setProductQuotation(pendingTransactions)
+  // }, [transactions, ])
+  // console.log("Pending Transactions", pendingTransactions); 
+  // console.log("pendingTransactions.length", pendingTransactions.length); 
+
+  useEffect(() => {
+    const handleQuotationChange = () => {
+      const quotation = async () => {
+        setQuotationCount(pendingTransactions?.length);
+      };
+      quotation();
+    };
+    handleQuotationChange();
 
+    window.addEventListener('localStorageChange', handleQuotationChange);
+
+    return () => {
+      window.removeEventListener('localStorageChange', handleQuotationChange);
+    };
+  }, []);
+  console.log("quotationCount",quotationCount)
   return (
     <DesktopView>
       <TopBanner />
@@ -139,17 +176,8 @@ const NavbarDesktop = () => {
             <Search />
           </div>
           <div className='flex gap-x-4 items-center'>
-            <Link
-              href='/my/transactions'
-              target='_blank'
-              rel='noreferrer'
-              className='flex items-center gap-x-2 !text-gray_r-12/80'
-            >
-              <DocumentCheckIcon className='w-7' />
-              Daftar
-              <br />
-              Quotation
-            </Link>
+
+            <Quotationheader quotationCount={quotationCount} />
 
             <Cardheader cartCount={cartCount} />
 
diff --git a/src/lib/quotation/components/Quotationheader.jsx b/src/lib/quotation/components/Quotationheader.jsx
new file mode 100644
index 00000000..141b731e
--- /dev/null
+++ b/src/lib/quotation/components/Quotationheader.jsx
@@ -0,0 +1,189 @@
+import { useCallback, useEffect, useMemo, useState } from 'react';
+import { getQuotationApi } from '../api/QuotationApi';
+import currencyFormat from '@/core/utils/currencyFormat';
+import { createSlug } from '@/core/utils/slug';
+import useAuth from '@/core/hooks/useAuth';
+import { useRouter } from 'next/router';
+import odooApi from '@/core/api/odooApi';
+import { useProductQuotationContext } from '@/contexts/ProductQuotationContext';
+import Image from '@/core/components/elements/Image/Image';
+import whatsappUrl from '@/core/utils/whatsappUrl';
+import { AnimatePresence, motion } from 'framer-motion';
+import style from '../../../../src-migrate/modules/cart/styles/item-promo.module.css';
+import useTransactions from '../../transaction/hooks/useTransactions';
+const { DocumentCheckIcon, PhotoIcon } = require('@heroicons/react/24/outline');
+const { default: Link } = require('next/link');
+
+const Quotationheader = (quotationCount) => {
+  const auth = useAuth();
+  const query = {
+    context: 'quotation',
+    site: auth?.webRole === null && auth?.site ? auth.site : null,
+  };
+
+  const router = useRouter();
+  const [subTotal, setSubTotal] = useState(null);
+  const [buttonLoading, SetButtonTerapkan] = useState(false);
+  const itemLoading = [1, 2, 3];
+  const [countQuotation, setCountQuotation] = useState(null);
+  const { productQuotation, setProductQuotation, refreshQuotation, setRefreshQuotation, isLoading, setIsloading } =
+    useProductQuotationContext();
+
+  const [isHovered, setIsHovered] = useState(false);
+  const [isTop, setIsTop] = useState(true);
+  const qotation = useMemo(() => {
+    return productQuotation || [];
+  }, [productQuotation]);
+
+  const handleMouseEnter = () => {
+    setIsHovered(true);
+    getCart();
+  };
+
+  const handleMouseLeave = () => {
+    setIsHovered(false);
+  };
+
+  const getCart = () => {
+    if (!productQuotation && auth) {
+      refreshCartf();
+    }
+  };
+  const refreshCartf = useCallback(async () => {
+    setIsloading(true);
+    let { transactions } = await useTransactions({ query });
+    let pendingTransactions = transactions?.data?.saleOrders.filter(transaction => transaction.status === 'draft');
+    setProductQuotation(pendingTransactions);
+    setCountQuotation(pendingTransactions.length);
+    setIsloading(false);
+  }, [setProductQuotation, setIsloading]);
+
+  useEffect(() => {
+    if (refreshQuotation) {
+      refreshCartf();
+    }
+    setRefreshQuotation(false);
+  }, [refreshQuotation, refreshCartf, setRefreshQuotation]);
+
+  useEffect(() => {
+    setCountQuotation(quotationCount.cartCount);
+  }, [quotationCount]);
+
+  useEffect(() => {
+    const handleScroll = () => {
+      setIsTop(window.scrollY === 0);
+    };
+    window.addEventListener('scroll', handleScroll);
+    return () => {
+      window.removeEventListener('scroll', handleScroll);
+    };
+  }, []);
+
+  const handleCheckout = async () => {
+    SetButtonTerapkan(true);
+    let checkoutAll = await odooApi('POST', `/api/v1/user/${auth.id}/cart/select-all`);
+    router.push('/shop/quotation');
+  };
+
+  return (
+    <div className='relative group'>
+      <div>
+        <Link
+          href='/my/quotations'
+          target='_blank'
+          rel='noreferrer'
+          className='flex items-center gap-x-2 !text-gray_r-12/80'
+          onMouseEnter={handleMouseEnter}
+          onMouseLeave={handleMouseLeave}
+        >
+          <div className={`relative ${countQuotation > 0 && 'mr-2'}`}>
+            <DocumentCheckIcon className='w-7' />
+            {countQuotation > 0 && (
+              <span className='absolute -top-2 -right-2 badge-solid-red rounded-full w-5 h-5 flex items-center justify-center'>
+                {countQuotation}
+              </span>
+            )}
+          </div>
+          <span>
+            Daftar
+            <br />
+            Quotation
+          </span>
+        </Link>
+      </div>
+      <AnimatePresence>
+        {isHovered && (
+          <>
+            <motion.div
+              initial={{ opacity: 0 }}
+              animate={{ opacity: 1, top: isTop ? 230 : 155 }}
+              exit={{ opacity: 0 }}
+              transition={{ duration: 0.15, top: { duration: 0.3 } }}
+              className={`fixed left-0 w-full h-full bg-black/50 z-10`}
+            />
+            <motion.div
+              initial={{ opacity: 0 }}
+              animate={{ opacity: 1, transition: { duration: 0.2 } }}
+              exit={{ opacity: 0, transition: { duration: 0.3 } }}
+              className='absolute z-10 left-0 w-96'
+              onMouseEnter={handleMouseEnter}
+              onMouseLeave={handleMouseLeave}
+            >
+              <motion.div
+                initial={{ height: 0 }}
+                animate={{ height: 'auto' }}
+                exit={{ height: 0 }}
+                className='w-full max-w-md p-2 bg-white border border-gray-200 rounded-lg shadow overflow-hidden'
+              >
+                <div className='p-2 flex justify-between items-center'>
+                  <h5 className='text-base font-semibold leading-none'>Daftar Quotation</h5>
+                  <Link href='/shop/cart' class='text-sm font-medium text-red-600 underline'>
+                    Lihat Semua
+                  </Link>
+                </div>
+                <hr className='mt-3 mb-3 border border-gray-100' />
+                <div className='flow-root max-h-[250px] overflow-y-auto'>
+                  {!auth && (
+                    <div className='justify-center p-4'>
+                      <p className='text-gray-500 text-center '>
+                        Silahkan{' '}
+                        <Link href='/login' className='text-red-600 underline leading-6'>
+                          Login
+                        </Link>{' '}
+                        Untuk Melihat Daftar Keranjang Belanja Anda
+                      </p>
+                    </div>
+                  )}
+                  {isLoading &&
+                    itemLoading.map((item) => (
+                      <div key={item} role='status' className='max-w-sm animate-pulse'>
+                        <div className='flex items-center space-x-4 mb- 2'>
+                          <div className='flex-shrink-0'>
+                            <PhotoIcon className='h-16 w-16 text-gray-500' />
+                          </div>
+                          <div className='flex-1 min-w-0'>
+                            <div className='h-2.5 bg-gray-200 rounded-full dark:bg-gray-700 w-48 mb-4'></div>
+                            <div className='h-2 bg-gray-200 rounded-full dark:bg-gray-700 max-w-[360px] mb-2.5'></div>
+                            <div className='h-2 bg-gray-200 rounded-full dark:bg-gray-700 mb-2.5'></div>
+                          </div>
+                        </div>
+                      </div>
+                    ))}
+                  {auth && qotation.length === 0 && !isLoading && (
+                    <div className='justify-center p-4'>
+                      <p className='text-gray-500 text-center '>
+                        Tidak Ada Quotation
+                      </p>
+                    </div>
+                  )}
+                </div>
+              </motion.div>
+            </motion.div>
+          </>
+        )}
+      </AnimatePresence>
+    </div>
+  );
+};
+
+export default Quotationheader;
-- 
cgit v1.2.3


From f3aa76b1810b3bc8b25bd02c76b50384893fc453 Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Tue, 6 Aug 2024 15:12:56 +0700
Subject: voucher

---
 src/lib/checkout/api/getVoucher.js       |   1 +
 src/lib/checkout/components/Checkout.jsx | 118 ++++++++++++++++++++++---------
 2 files changed, 87 insertions(+), 32 deletions(-)

(limited to 'src')

diff --git a/src/lib/checkout/api/getVoucher.js b/src/lib/checkout/api/getVoucher.js
index 779cef43..ead4ffbe 100644
--- a/src/lib/checkout/api/getVoucher.js
+++ b/src/lib/checkout/api/getVoucher.js
@@ -3,6 +3,7 @@ import { getAuth } from '@/core/utils/auth'
 
 export const getVoucher = async (id, query) => {
   const queryParam = new URLSearchParams(query);
+  console.log('ini params string',queryParam.toString())
   const url = `/api/v1/user/${id}/voucher?${queryParam.toString()}`;
   const dataVoucher = await odooApi('GET', url);
   return dataVoucher;
diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index 09a791ee..84f68dab 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -131,6 +131,7 @@ const Checkout = () => {
         setLoadingVoucher(true);
         let dataVoucher = await getVoucher(auth?.id, {
           source: query,
+          type: 'all,brand',
         });
         SetListVoucher(dataVoucher);
 
@@ -146,40 +147,71 @@ const Checkout = () => {
   };
 
   const VoucherCode = async (code) => {
-    const source = 'code=' + code + '&source=' + query;
     // let dataVoucher = await findVoucher(code, auth.id, query);
-    let dataVoucher = await getVoucherNew(source);
+    let dataVoucher = await getVoucher(auth?.id, {
+      source: query,
+      code: code
+    });
     if (dataVoucher.length <= 0) {
       SetFindVoucher(1);
       return;
     }
 
     let addNewLine = dataVoucher[0];
-    let checkList = listVouchers?.findIndex(
-      (voucher) => voucher.code == addNewLine.code
-    );
-    if (checkList >= 0) {
-      if (listVouchers[checkList].canApply) {
-        ToggleSwitch(code);
-        SetCodeVoucher(null);
-      } else {
-        SetSelisihHargaCode(listVouchers[checkList].differenceToApply);
+    console.log('addNewLine', addNewLine);
+    if (addNewLine.applyType != 'shipping') {
+      let checkList = listVouchers?.findIndex(
+        (voucher) => voucher.code == addNewLine.code
+      );
+      if (checkList >= 0) {
+        if (listVouchers[checkList].canApply) {
+          ToggleSwitch(code);
+          SetCodeVoucher(null);
+        } else {
+          SetSelisihHargaCode(listVouchers[checkList].differenceToApply);
+          SetFindVoucher(2);
+        }
+        return;
+      }
+      if (cartCheckout?.subtotal < addNewLine.minPurchaseAmount) {
+        SetSelisihHargaCode(
+          currencyFormat(addNewLine.minPurchaseAmount - cartCheckout?.subtotal)
+        );
         SetFindVoucher(2);
+        return;
+      } else {
+        SetFindVoucher(3);
+        SetButtonTerapkan(true);
       }
-      return;
-    }
-    if (cartCheckout?.subtotal < addNewLine.minPurchaseAmount) {
-      SetSelisihHargaCode(
-        currencyFormat(addNewLine.minPurchaseAmount - cartCheckout?.subtotal)
-      );
-      SetFindVoucher(2);
-      return;
+      SetListVoucher((prevList) => [addNewLine, ...prevList]);
+      SetActiveVoucher(addNewLine.code);
     } else {
-      SetFindVoucher(3);
-      SetButtonTerapkan(true);
+      let checkList = listVoucherShippings?.findIndex(
+        (voucher) => voucher.code == addNewLine.code
+      );
+      if (checkList >= 0) {
+        if (listVoucherShippings[checkList].canApply) {
+          ToggleSwitch(code);
+          SetCodeVoucher(null);
+        } else {
+          SetSelisihHargaCode(listVoucherShippings[checkList].differenceToApply);
+          SetFindVoucher(2);
+        }
+        return;
+      }
+      if (cartCheckout?.subtotal < addNewLine.minPurchaseAmount) {
+        SetSelisihHargaCode(
+          currencyFormat(addNewLine.minPurchaseAmount - cartCheckout?.subtotal)
+        );
+        SetFindVoucher(2);
+        return;
+      } else {
+        SetFindVoucher(3);
+        SetButtonTerapkan(true);
+      }
+      SetListVoucherShipping((prevList) => [addNewLine, ...prevList]);
+      setActiveVoucherShipping(addNewLine.code);
     }
-    SetListVoucher((prevList) => [addNewLine, ...prevList]);
-    SetActiveVoucher(addNewLine.code);
   };
 
   useEffect(() => {
@@ -187,7 +219,7 @@ const Checkout = () => {
   }, [bottomPopup]);
 
   useEffect(() => {
-    voucher();
+    // voucher();
     const loadExpedisi = async () => {
       let dataExpedisi = await ExpedisiList();
       dataExpedisi = dataExpedisi.map((expedisi) => ({
@@ -210,13 +242,24 @@ const Checkout = () => {
     };
   }, []);
 
-  const hitungDiscountVoucher = (code) => {
-    let dataVoucherIndex = listVouchers.findIndex(
-      (voucher) => voucher.code == code
-    );
-    let dataActiveVoucher = listVouchers[dataVoucherIndex];
-
-    let countDiscount = dataActiveVoucher.discountVoucher;
+  const hitungDiscountVoucher = (code, source) => {
+    let countDiscount = 0;
+    if(source === 'voucher'){
+      let dataVoucherIndex = listVouchers.findIndex(
+        (voucher) => voucher.code == code
+      );
+      let dataActiveVoucher = listVouchers[dataVoucherIndex];
+  
+      countDiscount = dataActiveVoucher.discountVoucher;
+    }else{
+      let dataVoucherIndex = listVoucherShippings.findIndex(
+        (voucher) => voucher.code == code
+      );
+      let dataActiveVoucher = listVoucherShippings[dataVoucherIndex];
+  
+      countDiscount = dataActiveVoucher.discountVoucher;
+    }
+    
 
     /*if (dataActiveVoucher.discountType === 'percentage') {
       countDiscount = cartCheckout?.subtotal * (dataActiveVoucher.discountAmount / 100)
@@ -237,11 +280,22 @@ const Checkout = () => {
     if (!listVouchers) return;
     if (!activeVoucher) return;
 
-    const countDiscount = hitungDiscountVoucher(activeVoucher);
+    console.log('voucher')
+    const countDiscount = hitungDiscountVoucher(activeVoucher, 'voucher');
 
     SetDiscountVoucher(countDiscount);
   }, [activeVoucher, listVouchers]);
 
+  useEffect(() => {
+    if (!listVoucherShippings) return;
+    if (!activeVoucherShipping) return;
+
+    console.log('voucher shipping')
+    const countDiscount = hitungDiscountVoucher(activeVoucherShipping, 'voucher_shipping');
+
+    SetDiscountVoucher(countDiscount);
+  }, [activeVoucherShipping, listVoucherShippings]);
+
   useEffect(() => {
     if (qVoucher === 'PASTIHEMAT' && listVouchers) {
       let code = qVoucher;
-- 
cgit v1.2.3


From a63b03fffdf46ecddecf356d1d00d6582add75cf Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 6 Aug 2024 17:05:01 +0700
Subject: <iman> update cart pop up

---
 src/contexts/ProductCartContext.js                 |  4 +-
 src/contexts/ProductQuotationContext.js            | 17 ------
 .../components/elements/Navbar/NavbarDesktop.jsx   | 35 +++++------
 src/lib/quotation/components/Quotationheader.jsx   | 67 ++++++++++++++++++----
 4 files changed, 76 insertions(+), 47 deletions(-)
 delete mode 100644 src/contexts/ProductQuotationContext.js

(limited to 'src')

diff --git a/src/contexts/ProductCartContext.js b/src/contexts/ProductCartContext.js
index 06e97563..19889e07 100644
--- a/src/contexts/ProductCartContext.js
+++ b/src/contexts/ProductCartContext.js
@@ -4,12 +4,14 @@ const ProductCartContext = createContext()
 
 export const ProductCartProvider = ({ children }) => {
   const [productCart, setProductCart] = useState(null)
+  const [productQuotation, setProductQuotation] = useState(null)
+  const [refreshQuotation, setRefreshQuotation] = useState(false)
   const [refreshCart, setRefreshCart] = useState(false)
   const [isLoading, setIsloading] = useState(false)
 
   return (
     <ProductCartContext.Provider
-      value={{ productCart, setProductCart, refreshCart, setRefreshCart, isLoading, setIsloading }}
+      value={{ productCart, setProductCart, refreshCart, setRefreshCart, isLoading, setIsloading, productQuotation, setProductQuotation, refreshQuotation, setRefreshQuotation }}
     >
       {children}
     </ProductCartContext.Provider>
diff --git a/src/contexts/ProductQuotationContext.js b/src/contexts/ProductQuotationContext.js
deleted file mode 100644
index f9e17830..00000000
--- a/src/contexts/ProductQuotationContext.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import React, { createContext, useContext, useState } from 'react';
-
-const ProductQuotationContext = createContext();
-
-export const useProductQuotationContext = () => useContext(ProductQuotationContext);
-
-export const ProductQuotationProvider = ({ children }) => {
-  const [productQuotation, setProductQuotation] = useState([]);
-  const [refreshQuotation, setRefreshQuotation] = useState(false);
-  const [isLoading, setIsloading] = useState(false);
-
-  return (
-    <ProductQuotationContext.Provider value={{ productQuotation, setProductQuotation, refreshQuotation, setRefreshQuotation, isLoading, setIsloading }}>
-      {children}
-    </ProductQuotationContext.Provider>
-  );
-};
diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx
index 49c4cd6e..c0e9b383 100644
--- a/src/core/components/elements/Navbar/NavbarDesktop.jsx
+++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx
@@ -7,7 +7,7 @@ import IndoteknikLogo from '@/images/logo.png';
 import Cardheader from '@/lib/cart/components/Cartheader';
 import Quotationheader from '@/lib/quotation/components/QuotationHeader'
 import Category from '@/lib/category/components/Category';
-import { useProductQuotationContext } from '@/contexts/ProductQuotationContext'
+import { useProductCartContext } from '@/contexts/ProductCartContext';
 import {
   ChevronDownIcon,
   DocumentCheckIcon,
@@ -41,8 +41,9 @@ const NavbarDesktop = () => {
 
   const [cartCount, setCartCount] = useState(0);
   const [quotationCount, setQuotationCount] = useState(0);
-  // const { setProductQuotation, refreshQuotation, setRefreshQuotation, isLoading, setIsloading } = useProductQuotationContext()
-
+  const { productCart, setProductCart, refreshCart, setRefreshCart, isLoading, setIsloading, productQuotation, setProductQuotation, refreshQuotation, setRefreshQuotation } =
+  useProductCartContext();
+  const [pendingTransactions, setPendingTransactions] = useState([])
   const [templateWA, setTemplateWA] = useState(null);
   const [payloadWA, setPayloadWa] = useState(null);
   const [urlPath, setUrlPath] = useState(null);
@@ -51,15 +52,22 @@ const NavbarDesktop = () => {
 
   const { product } = useProductContext();
   const { isOpen, onOpen, onClose } = useDisclosure();
-
+  
   const query = {
     context: 'quotation',
     site:
-      (auth?.webRole === null && auth?.site ? auth.site : null),
+    (auth?.webRole === null && auth?.site ? auth.site : null),
   };
   
-  const { transactions } = useTransactions({query});
-  const pendingTransactions = transactions?.data?.saleOrders.filter(transaction => transaction.status === 'draft');
+  const { transactions } = useTransactions({ query });
+  const data = transactions?.data?.saleOrders.filter(
+    (transaction) => transaction.status === 'draft'
+  );
+
+  useEffect(() => {
+    setProductQuotation(data);
+    setPendingTransactions(data);
+  }, [transactions.data]);
   
   
   useEffect(() => {
@@ -83,7 +91,7 @@ const NavbarDesktop = () => {
       };
       cart();
     };
-    handleCartChange();
+    handleCartChange(); 
     
     window.addEventListener('localStorageChange', handleCartChange);
     
@@ -91,12 +99,6 @@ const NavbarDesktop = () => {
       window.removeEventListener('localStorageChange', handleCartChange);
     };
   }, []);
-  
-  // useEffect(() => {
-  //   setProductQuotation(pendingTransactions)
-  // }, [transactions, ])
-  // console.log("Pending Transactions", pendingTransactions); 
-  // console.log("pendingTransactions.length", pendingTransactions.length); 
 
   useEffect(() => {
     const handleQuotationChange = () => {
@@ -112,8 +114,8 @@ const NavbarDesktop = () => {
     return () => {
       window.removeEventListener('localStorageChange', handleQuotationChange);
     };
-  }, []);
-  console.log("quotationCount",quotationCount)
+  }, [pendingTransactions]);
+  
   return (
     <DesktopView>
       <TopBanner />
@@ -176,7 +178,6 @@ const NavbarDesktop = () => {
             <Search />
           </div>
           <div className='flex gap-x-4 items-center'>
-
             <Quotationheader quotationCount={quotationCount} />
 
             <Cardheader cartCount={cartCount} />
diff --git a/src/lib/quotation/components/Quotationheader.jsx b/src/lib/quotation/components/Quotationheader.jsx
index 141b731e..9f0f17a6 100644
--- a/src/lib/quotation/components/Quotationheader.jsx
+++ b/src/lib/quotation/components/Quotationheader.jsx
@@ -1,16 +1,15 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
-import { getQuotationApi } from '../api/QuotationApi';
-import currencyFormat from '@/core/utils/currencyFormat';
 import { createSlug } from '@/core/utils/slug';
 import useAuth from '@/core/hooks/useAuth';
 import { useRouter } from 'next/router';
 import odooApi from '@/core/api/odooApi';
-import { useProductQuotationContext } from '@/contexts/ProductQuotationContext';
+import { useProductCartContext } from '@/contexts/ProductCartContext';
 import Image from '@/core/components/elements/Image/Image';
 import whatsappUrl from '@/core/utils/whatsappUrl';
 import { AnimatePresence, motion } from 'framer-motion';
 import style from '../../../../src-migrate/modules/cart/styles/item-promo.module.css';
 import useTransactions from '../../transaction/hooks/useTransactions';
+import currencyFormat from '@/core/utils/currencyFormat';
 const { DocumentCheckIcon, PhotoIcon } = require('@heroicons/react/24/outline');
 const { default: Link } = require('next/link');
 
@@ -20,14 +19,14 @@ const Quotationheader = (quotationCount) => {
     context: 'quotation',
     site: auth?.webRole === null && auth?.site ? auth.site : null,
   };
-
+  
   const router = useRouter();
   const [subTotal, setSubTotal] = useState(null);
   const [buttonLoading, SetButtonTerapkan] = useState(false);
   const itemLoading = [1, 2, 3];
   const [countQuotation, setCountQuotation] = useState(null);
-  const { productQuotation, setProductQuotation, refreshQuotation, setRefreshQuotation, isLoading, setIsloading } =
-    useProductQuotationContext();
+  const { productCart, setProductCart, refreshCart, setRefreshCart, isLoading, setIsloading, productQuotation, setProductQuotation, refreshQuotation, setRefreshQuotation } =
+  useProductCartContext();
 
   const [isHovered, setIsHovered] = useState(false);
   const [isTop, setIsTop] = useState(true);
@@ -49,12 +48,12 @@ const Quotationheader = (quotationCount) => {
       refreshCartf();
     }
   };
+  let { transactions } = useTransactions({ query });
   const refreshCartf = useCallback(async () => {
     setIsloading(true);
-    let { transactions } = await useTransactions({ query });
     let pendingTransactions = transactions?.data?.saleOrders.filter(transaction => transaction.status === 'draft');
     setProductQuotation(pendingTransactions);
-    setCountQuotation(pendingTransactions.length);
+    setCountQuotation(pendingTransactions?.length ? pendingTransactions?.length : pendingTransactions?.length);
     setIsloading(false);
   }, [setProductQuotation, setIsloading]);
 
@@ -66,7 +65,7 @@ const Quotationheader = (quotationCount) => {
   }, [refreshQuotation, refreshCartf, setRefreshQuotation]);
 
   useEffect(() => {
-    setCountQuotation(quotationCount.cartCount);
+    setCountQuotation(quotationCount.quotationCount);
   }, [quotationCount]);
 
   useEffect(() => {
@@ -85,6 +84,8 @@ const Quotationheader = (quotationCount) => {
     router.push('/shop/quotation');
   };
 
+  console.log("quotation",qotation)
+
   return (
     <div className='relative group'>
       <div>
@@ -105,7 +106,7 @@ const Quotationheader = (quotationCount) => {
             )}
           </div>
           <span>
-            Daftar
+            List
             <br />
             Quotation
           </span>
@@ -137,7 +138,7 @@ const Quotationheader = (quotationCount) => {
               >
                 <div className='p-2 flex justify-between items-center'>
                   <h5 className='text-base font-semibold leading-none'>Daftar Quotation</h5>
-                  <Link href='/shop/cart' class='text-sm font-medium text-red-600 underline'>
+                  <Link href='/my/quotations' class='text-sm font-medium text-red-600 underline'>
                     Lihat Semua
                   </Link>
                 </div>
@@ -150,7 +151,7 @@ const Quotationheader = (quotationCount) => {
                         <Link href='/login' className='text-red-600 underline leading-6'>
                           Login
                         </Link>{' '}
-                        Untuk Melihat Daftar Keranjang Belanja Anda
+                        Untuk Melihat Daftar Quotation Anda
                       </p>
                     </div>
                   )}
@@ -176,6 +177,48 @@ const Quotationheader = (quotationCount) => {
                       </p>
                     </div>
                   )}
+                  {auth && qotation.length > 0 && !isLoading && (
+                    <>
+                      <ul role='list' className='divide-y divide-gray-200 dark:divide-gray-700'>
+                        {qotation &&
+                          qotation?.map((product, index) => (
+                            <>
+                              <li className='py-1 sm:py-2'>
+                                <div className='flex justify-between border p-1 flex-col gap-y-2'>
+                                  <div className='flex justify-between'>
+                                    <p className='tanggal text-base'>{product.dateOrder}</p>
+                                    <p className='badge-red h-fit md:text-caption-2 whitespace-nowrap'>Pending Quotation</p>
+                                  </div>
+                                  <div className='bagian tengah flex justify-between'>
+                                    <div className='no transaksi '>  
+                                      <p className='text-base'>
+                                        No. Transaksi
+                                      </p>
+                                      <p className='font-semibold text-red-500'>
+                                        {product.name}
+                                      </p>
+                                    </div>
+                                    <div className='purchase'>
+                                    <p className='text-base'>
+                                    No. Purchase Order
+                                      </p>
+                                      <p className='font-semibold text-red-500'>
+                                      {product.purchaseOrderFile}
+                                      </p>
+                                    </div>
+                                  </div>
+                                  <div className='bagian bawah flex justify-between'>
+                                    <p className='font-semibold'>Total</p>
+                                    <p className='font-semibold'>{currencyFormat(product.amountTotal)}</p>
+                                  </div>
+                                </div>
+                              </li>
+                            </>
+                          ))}
+                      </ul>
+                      <hr />
+                    </>
+                  )}
                 </div>
               </motion.div>
             </motion.div>
-- 
cgit v1.2.3


From a1ed8969b451acc7867622fc302b0fd2b3c970a2 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 7 Aug 2024 12:10:50 +0700
Subject: <iman> update quotation pop up

---
 src/lib/quotation/components/Quotationheader.jsx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/lib/quotation/components/Quotationheader.jsx b/src/lib/quotation/components/Quotationheader.jsx
index 9f0f17a6..c9686b5a 100644
--- a/src/lib/quotation/components/Quotationheader.jsx
+++ b/src/lib/quotation/components/Quotationheader.jsx
@@ -184,26 +184,26 @@ const Quotationheader = (quotationCount) => {
                           qotation?.map((product, index) => (
                             <>
                               <li className='py-1 sm:py-2'>
-                                <div className='flex justify-between border p-1 flex-col gap-y-2'>
+                                <div className='flex justify-between border p-2 flex-col gap-y-2'>
                                   <div className='flex justify-between'>
-                                    <p className='tanggal text-base'>{product.dateOrder}</p>
-                                    <p className='badge-red h-fit md:text-caption-2 whitespace-nowrap'>Pending Quotation</p>
+                                    <p className='tanggal text-xs'>{product.dateOrder}</p>
+                                    <p className='badge-red h-fit md:text-caption-1 whitespace-nowrap'>Pending Quotation</p>
                                   </div>
                                   <div className='bagian tengah flex justify-between'>
                                     <div className='no transaksi '>  
-                                      <p className='text-base'>
+                                      <p className='text-xs'>
                                         No. Transaksi
                                       </p>
-                                      <p className='font-semibold text-red-500'>
+                                      <Link href='/my/quotations' className='font-semibold text-sm text-red-500'>
                                         {product.name}
-                                      </p>
+                                      </Link>
                                     </div>
                                     <div className='purchase'>
-                                    <p className='text-base'>
+                                    <p className='text-xs'>
                                     No. Purchase Order
                                       </p>
                                       <p className='font-semibold text-red-500'>
-                                      {product.purchaseOrderFile}
+                                      {product.purchaseOrderFile ? product.purchaseOrderFile : '-'}
                                       </p>
                                     </div>
                                   </div>
-- 
cgit v1.2.3


From 86c880442fc0abbc4c356da4fa8a20bc5759aff3 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 7 Aug 2024 14:00:07 +0700
Subject: <iman> quotation update popup

---
 src/lib/quotation/components/Quotationheader.jsx | 54 +++++++++++++-----------
 1 file changed, 29 insertions(+), 25 deletions(-)

(limited to 'src')

diff --git a/src/lib/quotation/components/Quotationheader.jsx b/src/lib/quotation/components/Quotationheader.jsx
index c9686b5a..79011682 100644
--- a/src/lib/quotation/components/Quotationheader.jsx
+++ b/src/lib/quotation/components/Quotationheader.jsx
@@ -184,33 +184,37 @@ const Quotationheader = (quotationCount) => {
                           qotation?.map((product, index) => (
                             <>
                               <li className='py-1 sm:py-2'>
-                                <div className='flex justify-between border p-2 flex-col gap-y-2'>
-                                  <div className='flex justify-between'>
-                                    <p className='tanggal text-xs'>{product.dateOrder}</p>
-                                    <p className='badge-red h-fit md:text-caption-1 whitespace-nowrap'>Pending Quotation</p>
-                                  </div>
-                                  <div className='bagian tengah flex justify-between'>
-                                    <div className='no transaksi '>  
-                                      <p className='text-xs'>
-                                        No. Transaksi
-                                      </p>
-                                      <Link href='/my/quotations' className='font-semibold text-sm text-red-500'>
-                                        {product.name}
-                                      </Link>
+                                <div className='flex justify-between border p-2 flex-col gap-y-2 hover:border-red-500'>
+                                <Link 
+                                    href={`/my/quotations/${product?.id}`}
+                                    className='hover:border-red-500' 
+                                     >
+                                    <div className='flex justify-between mb-2'>
+                                      <div className='flex flex-row items-center'>
+                                      <p className='tanggal text-xs opacity-80 mr-[2px]'>Sales : </p>
+                                      <p className='tanggal text-xs text-red-500 font-semibold'>{product.sales}</p>
+                                      </div>
+                                      <div className='flex flex-row items-center'>
+                                      <p className='text-xs opacity-80 mr-[2px]'>Status :</p>
+                                      <p className='badge-red h-fit text-xs whitespace-nowrap'>Pending Quotation</p>
+                                      </div>
                                     </div>
-                                    <div className='purchase'>
-                                    <p className='text-xs'>
-                                    No. Purchase Order
-                                      </p>
-                                      <p className='font-semibold text-red-500'>
-                                      {product.purchaseOrderFile ? product.purchaseOrderFile : '-'}
-                                      </p>
+                                    <div className='flex justify-between mb-2'>
+                                      <div className='flex flex-col items-start'>
+                                        <p className=' text-xs opacity-80 mr-[2px]'>No. Transaksi</p>
+                                        <p className=' text-sm text-red-500 font-semibold'> {product.name}</p>
+                                      </div>
+                                      <div className='flex flex-col items-end'>
+                                        <p className='text-xs opacity-80 mr-[2px]'>No. Purchase Order</p>
+                                        <p className='font-semibold text-sm text-red-500'> {product.purchaseOrderName ? product.purchaseOrderName : '-'}</p>
+                                      </div>
                                     </div>
-                                  </div>
-                                  <div className='bagian bawah flex justify-between'>
-                                    <p className='font-semibold'>Total</p>
-                                    <p className='font-semibold'>{currencyFormat(product.amountTotal)}</p>
-                                  </div>
+                                    <div className='my-0.5 h-0.5 bg-gray-200'></div>
+                                    <div className='bagian bawah flex justify-between mt-2'>
+                                      <p className='font-semibold text-base'>Total</p>
+                                      <p className='font-semibold text-base'>{currencyFormat(product.amountTotal)}</p>
+                                    </div>
+                                </Link>
                                 </div>
                               </li>
                             </>
-- 
cgit v1.2.3


From bad8abd263bd43c59dad8e61e2f5f35bfe5b7746 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 8 Aug 2024 11:37:58 +0700
Subject: <iman> update quotation pop up

---
 src/lib/quotation/components/Quotation.jsx       |  7 +++--
 src/lib/quotation/components/Quotationheader.jsx | 38 +++++++++++++++++++++---
 2 files changed, 39 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/lib/quotation/components/Quotation.jsx b/src/lib/quotation/components/Quotation.jsx
index df234dc2..3fac6f29 100644
--- a/src/lib/quotation/components/Quotation.jsx
+++ b/src/lib/quotation/components/Quotation.jsx
@@ -9,6 +9,7 @@ import _ from 'lodash';
 import { deleteItemCart, getCart, getItemCart } from '@/core/utils/cart';
 import currencyFormat from '@/core/utils/currencyFormat';
 import { toast } from 'react-hot-toast';
+import { useProductCartContext } from '@/contexts/ProductCartContext';
 // import checkoutApi from '@/lib/checkout/api/checkoutApi'
 import { useRouter } from 'next/router';
 import VariantGroupCard from '@/lib/variant/components/VariantGroupCard';
@@ -38,11 +39,12 @@ const { getProductsCheckout } = require('@/lib/checkout/api/checkoutApi');
 const Quotation = () => {
   const router = useRouter();
   const auth = useAuth();
-
+  
   const { data: cartCheckout } = useQuery('cartCheckout', () =>
     getProductsCheckout()
-  );
+);
 
+const {  setRefreshQuotation } = useProductCartContext();
   const SELF_PICKUP_ID = 32;
 
   const [products, setProducts] = useState(null);
@@ -293,6 +295,7 @@ const Quotation = () => {
     if (isSuccess?.id) {
       for (const product of products) deleteItemCart({ productId: product.id });
       router.push(`/shop/quotation/finish?id=${isSuccess.id}`);
+      setRefreshQuotation(true);
       return;
     }
     
diff --git a/src/lib/quotation/components/Quotationheader.jsx b/src/lib/quotation/components/Quotationheader.jsx
index 79011682..14743fd6 100644
--- a/src/lib/quotation/components/Quotationheader.jsx
+++ b/src/lib/quotation/components/Quotationheader.jsx
@@ -30,6 +30,7 @@ const Quotationheader = (quotationCount) => {
 
   const [isHovered, setIsHovered] = useState(false);
   const [isTop, setIsTop] = useState(true);
+
   const qotation = useMemo(() => {
     return productQuotation || [];
   }, [productQuotation]);
@@ -49,6 +50,7 @@ const Quotationheader = (quotationCount) => {
     }
   };
   let { transactions } = useTransactions({ query });
+
   const refreshCartf = useCallback(async () => {
     setIsloading(true);
     let pendingTransactions = transactions?.data?.saleOrders.filter(transaction => transaction.status === 'draft');
@@ -57,6 +59,18 @@ const Quotationheader = (quotationCount) => {
     setIsloading(false);
   }, [setProductQuotation, setIsloading]);
 
+  useEffect(() => {
+    if (!qotation) return
+
+    let calculateTotalDiscountAmount = 0
+    for (const product of qotation) {
+      // if (qotation.quantity == '') continue  
+      calculateTotalDiscountAmount += product.amountUntaxed
+    }
+    let subTotal = calculateTotalDiscountAmount
+    setSubTotal(subTotal)
+  }, [qotation])
+
   useEffect(() => {
     if (refreshQuotation) {
       refreshCartf();
@@ -84,8 +98,6 @@ const Quotationheader = (quotationCount) => {
     router.push('/shop/quotation');
   };
 
-  console.log("quotation",qotation)
-
   return (
     <div className='relative group'>
       <div>
@@ -211,8 +223,8 @@ const Quotationheader = (quotationCount) => {
                                     </div>
                                     <div className='my-0.5 h-0.5 bg-gray-200'></div>
                                     <div className='bagian bawah flex justify-between mt-2'>
-                                      <p className='font-semibold text-base'>Total</p>
-                                      <p className='font-semibold text-base'>{currencyFormat(product.amountTotal)}</p>
+                                      <p className='font-semibold text-sm'>Total</p>
+                                      <p className='font-semibold text-sm'>{currencyFormat(product.amountUntaxed)}</p>
                                     </div>
                                 </Link>
                                 </div>
@@ -224,6 +236,24 @@ const Quotationheader = (quotationCount) => {
                     </>
                   )}
                 </div>
+                {auth && qotation.length > 0 && !isLoading && (
+                  <>
+                    <div className='mt-3'>
+                      <span className='text-gray-400 text-caption-2'>Subtotal Sebelum PPN : </span>
+                      <span className='font-semibold text-red-600'>{currencyFormat(subTotal)}</span>
+                    </div>
+                    <div className='mt-5 mb-2'>
+                      <button
+                        type='button'
+                        className='btn-yellow rounded-lg w-full'
+                        onClick={handleCheckout}
+                        disabled={buttonLoading}
+                      >
+                        {buttonLoading ? 'Loading...' : 'Buat Quotation'}
+                      </button>
+                    </div>
+                  </>
+                )}
               </motion.div>
             </motion.div>
           </>
-- 
cgit v1.2.3


From 29662765048f561af5ab0dc586a37bd80068b633 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 8 Aug 2024 11:45:59 +0700
Subject: <iman> update location quotationHeader

---
 src/core/components/elements/Navbar/NavbarDesktop.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx
index c0e9b383..85e77b2d 100644
--- a/src/core/components/elements/Navbar/NavbarDesktop.jsx
+++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx
@@ -5,7 +5,7 @@ import { createSlug } from '@/core/utils/slug';
 import whatsappUrl from '@/core/utils/whatsappUrl';
 import IndoteknikLogo from '@/images/logo.png';
 import Cardheader from '@/lib/cart/components/Cartheader';
-import Quotationheader from '@/lib/quotation/components/QuotationHeader'
+import Quotationheader from '../../../../../src/lib/quotation/components/QuotationHeader'
 import Category from '@/lib/category/components/Category';
 import { useProductCartContext } from '@/contexts/ProductCartContext';
 import {
-- 
cgit v1.2.3


From 6e36b0e78c7ac56c8b7d2f27a19838e9aaa9da98 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 8 Aug 2024 12:03:04 +0700
Subject: <iman> add import quotationHeader

---
 src/core/components/elements/Navbar/NavbarDesktop.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx
index 85e77b2d..03335df6 100644
--- a/src/core/components/elements/Navbar/NavbarDesktop.jsx
+++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx
@@ -5,7 +5,7 @@ import { createSlug } from '@/core/utils/slug';
 import whatsappUrl from '@/core/utils/whatsappUrl';
 import IndoteknikLogo from '@/images/logo.png';
 import Cardheader from '@/lib/cart/components/Cartheader';
-import Quotationheader from '../../../../../src/lib/quotation/components/QuotationHeader'
+import Quotationheader from "../../../../../src/lib/quotation/components/Quotationheader.jsx"
 import Category from '@/lib/category/components/Category';
 import { useProductCartContext } from '@/contexts/ProductCartContext';
 import {
-- 
cgit v1.2.3


From 079f8029445fdd243e267a4af7c7a4d5780afa24 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 8 Aug 2024 14:11:32 +0700
Subject: <iman> update pop up quotation & cart

---
 src/contexts/ProductCartContext.js                   |  5 ++---
 .../components/elements/Navbar/NavbarDesktop.jsx     |  3 ---
 src/lib/cart/components/Cartheader.jsx               |  1 +
 src/lib/quotation/components/Quotation.jsx           |  4 ++--
 src/lib/quotation/components/Quotationheader.jsx     | 20 +++++++++-----------
 5 files changed, 14 insertions(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/contexts/ProductCartContext.js b/src/contexts/ProductCartContext.js
index 19889e07..3a21d2e0 100644
--- a/src/contexts/ProductCartContext.js
+++ b/src/contexts/ProductCartContext.js
@@ -4,14 +4,13 @@ const ProductCartContext = createContext()
 
 export const ProductCartProvider = ({ children }) => {
   const [productCart, setProductCart] = useState(null)
-  const [productQuotation, setProductQuotation] = useState(null)
-  const [refreshQuotation, setRefreshQuotation] = useState(false)
   const [refreshCart, setRefreshCart] = useState(false)
   const [isLoading, setIsloading] = useState(false)
+  const [productQuotation, setProductQuotation] = useState(null)
 
   return (
     <ProductCartContext.Provider
-      value={{ productCart, setProductCart, refreshCart, setRefreshCart, isLoading, setIsloading, productQuotation, setProductQuotation, refreshQuotation, setRefreshQuotation }}
+      value={{ productCart, setProductCart, refreshCart, setRefreshCart, isLoading, setIsloading, productQuotation, setProductQuotation}}
     >
       {children}
     </ProductCartContext.Provider>
diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx
index 03335df6..2e8c982e 100644
--- a/src/core/components/elements/Navbar/NavbarDesktop.jsx
+++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx
@@ -41,8 +41,6 @@ const NavbarDesktop = () => {
 
   const [cartCount, setCartCount] = useState(0);
   const [quotationCount, setQuotationCount] = useState(0);
-  const { productCart, setProductCart, refreshCart, setRefreshCart, isLoading, setIsloading, productQuotation, setProductQuotation, refreshQuotation, setRefreshQuotation } =
-  useProductCartContext();
   const [pendingTransactions, setPendingTransactions] = useState([])
   const [templateWA, setTemplateWA] = useState(null);
   const [payloadWA, setPayloadWa] = useState(null);
@@ -65,7 +63,6 @@ const NavbarDesktop = () => {
   );
 
   useEffect(() => {
-    setProductQuotation(data);
     setPendingTransactions(data);
   }, [transactions.data]);
   
diff --git a/src/lib/cart/components/Cartheader.jsx b/src/lib/cart/components/Cartheader.jsx
index c7a8f0b8..6967d180 100644
--- a/src/lib/cart/components/Cartheader.jsx
+++ b/src/lib/cart/components/Cartheader.jsx
@@ -81,6 +81,7 @@ const Cardheader = (cartCount) => {
 
   useEffect(() => {
     setCountCart(cartCount.cartCount)
+    setRefreshCart(false)
   }, [cartCount])
 
   useEffect(() => {
diff --git a/src/lib/quotation/components/Quotation.jsx b/src/lib/quotation/components/Quotation.jsx
index 3fac6f29..0ad042de 100644
--- a/src/lib/quotation/components/Quotation.jsx
+++ b/src/lib/quotation/components/Quotation.jsx
@@ -44,7 +44,7 @@ const Quotation = () => {
     getProductsCheckout()
 );
 
-const {  setRefreshQuotation } = useProductCartContext();
+const {  setRefreshCart } = useProductCartContext();
   const SELF_PICKUP_ID = 32;
 
   const [products, setProducts] = useState(null);
@@ -295,7 +295,7 @@ const {  setRefreshQuotation } = useProductCartContext();
     if (isSuccess?.id) {
       for (const product of products) deleteItemCart({ productId: product.id });
       router.push(`/shop/quotation/finish?id=${isSuccess.id}`);
-      setRefreshQuotation(true);
+      setRefreshCart(true);
       return;
     }
     
diff --git a/src/lib/quotation/components/Quotationheader.jsx b/src/lib/quotation/components/Quotationheader.jsx
index 14743fd6..10e3e147 100644
--- a/src/lib/quotation/components/Quotationheader.jsx
+++ b/src/lib/quotation/components/Quotationheader.jsx
@@ -25,7 +25,7 @@ const Quotationheader = (quotationCount) => {
   const [buttonLoading, SetButtonTerapkan] = useState(false);
   const itemLoading = [1, 2, 3];
   const [countQuotation, setCountQuotation] = useState(null);
-  const { productCart, setProductCart, refreshCart, setRefreshCart, isLoading, setIsloading, productQuotation, setProductQuotation, refreshQuotation, setRefreshQuotation } =
+  const { productCart, setProductCart, refreshCart, setRefreshCart, isLoading, setIsloading, productQuotation, setProductQuotation } =
   useProductCartContext();
 
   const [isHovered, setIsHovered] = useState(false);
@@ -72,11 +72,11 @@ const Quotationheader = (quotationCount) => {
   }, [qotation])
 
   useEffect(() => {
-    if (refreshQuotation) {
+    if (refreshCart) {
       refreshCartf();
     }
-    setRefreshQuotation(false);
-  }, [refreshQuotation, refreshCartf, setRefreshQuotation]);
+    setRefreshCart(false);
+  }, [ refreshCartf, setRefreshCart]);
 
   useEffect(() => {
     setCountQuotation(quotationCount.quotationCount);
@@ -150,9 +150,6 @@ const Quotationheader = (quotationCount) => {
               >
                 <div className='p-2 flex justify-between items-center'>
                   <h5 className='text-base font-semibold leading-none'>Daftar Quotation</h5>
-                  <Link href='/my/quotations' class='text-sm font-medium text-red-600 underline'>
-                    Lihat Semua
-                  </Link>
                 </div>
                 <hr className='mt-3 mb-3 border border-gray-100' />
                 <div className='flow-root max-h-[250px] overflow-y-auto'>
@@ -221,7 +218,8 @@ const Quotationheader = (quotationCount) => {
                                         <p className='font-semibold text-sm text-red-500'> {product.purchaseOrderName ? product.purchaseOrderName : '-'}</p>
                                       </div>
                                     </div>
-                                    <div className='my-0.5 h-0.5 bg-gray-200'></div>
+                                    {/* <div className='my-0.5 h-0.5 bg-gray-200'></div> */}
+                                    <hr className='mt-3 mb-3 border border-gray-100' />
                                     <div className='bagian bawah flex justify-between mt-2'>
                                       <p className='font-semibold text-sm'>Total</p>
                                       <p className='font-semibold text-sm'>{currencyFormat(product.amountUntaxed)}</p>
@@ -238,18 +236,18 @@ const Quotationheader = (quotationCount) => {
                 </div>
                 {auth && qotation.length > 0 && !isLoading && (
                   <>
-                    <div className='mt-3'>
+                    <div className='mt-3 ml-1'>
                       <span className='text-gray-400 text-caption-2'>Subtotal Sebelum PPN : </span>
                       <span className='font-semibold text-red-600'>{currencyFormat(subTotal)}</span>
                     </div>
                     <div className='mt-5 mb-2'>
                       <button
                         type='button'
-                        className='btn-yellow rounded-lg w-full'
+                        className='btn-solid-red rounded-lg w-full'
                         onClick={handleCheckout}
                         disabled={buttonLoading}
                       >
-                        {buttonLoading ? 'Loading...' : 'Buat Quotation'}
+                        {buttonLoading ? 'Loading...' : 'Lihat Semua'}
                       </button>
                     </div>
                   </>
-- 
cgit v1.2.3


From 64489b794a80b381d86ea226f0fe36457d5836be Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 8 Aug 2024 15:06:37 +0700
Subject: <iman> update quotation pop up bug

---
 src/core/components/elements/Navbar/NavbarDesktop.jsx | 2 +-
 src/lib/quotation/components/Quotationheader.jsx      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx
index 2e8c982e..1163aff3 100644
--- a/src/core/components/elements/Navbar/NavbarDesktop.jsx
+++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx
@@ -175,7 +175,7 @@ const NavbarDesktop = () => {
             <Search />
           </div>
           <div className='flex gap-x-4 items-center'>
-            <Quotationheader quotationCount={quotationCount} />
+            <Quotationheader quotationCount={quotationCount} data={pendingTransactions} />
 
             <Cardheader cartCount={cartCount} />
 
diff --git a/src/lib/quotation/components/Quotationheader.jsx b/src/lib/quotation/components/Quotationheader.jsx
index 10e3e147..0bb4dfe0 100644
--- a/src/lib/quotation/components/Quotationheader.jsx
+++ b/src/lib/quotation/components/Quotationheader.jsx
@@ -80,6 +80,7 @@ const Quotationheader = (quotationCount) => {
 
   useEffect(() => {
     setCountQuotation(quotationCount.quotationCount);
+    setProductQuotation(quotationCount.data);
   }, [quotationCount]);
 
   useEffect(() => {
-- 
cgit v1.2.3


From 3de1a412bba31b19b8b443dd91df8aff8d6eda07 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 8 Aug 2024 16:22:00 +0700
Subject: <iman> update link button

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

(limited to 'src')

diff --git a/src/lib/quotation/components/Quotationheader.jsx b/src/lib/quotation/components/Quotationheader.jsx
index 0bb4dfe0..4529c977 100644
--- a/src/lib/quotation/components/Quotationheader.jsx
+++ b/src/lib/quotation/components/Quotationheader.jsx
@@ -96,7 +96,7 @@ const Quotationheader = (quotationCount) => {
   const handleCheckout = async () => {
     SetButtonTerapkan(true);
     let checkoutAll = await odooApi('POST', `/api/v1/user/${auth.id}/cart/select-all`);
-    router.push('/shop/quotation');
+    router.push('/my/quotations');
   };
 
   return (
-- 
cgit v1.2.3


From 8a4d7247dd4163050f95055f13391b709bb29e66 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Sat, 10 Aug 2024 13:22:42 +0700
Subject: <iman> add feature tracking order

---
 src/lib/tracking-order/component/TrackingOrder.jsx | 94 ++++++++++++++++++++++
 src/pages/tracking-order.jsx                       | 26 ++++++
 2 files changed, 120 insertions(+)
 create mode 100644 src/lib/tracking-order/component/TrackingOrder.jsx
 create mode 100644 src/pages/tracking-order.jsx

(limited to 'src')

diff --git a/src/lib/tracking-order/component/TrackingOrder.jsx b/src/lib/tracking-order/component/TrackingOrder.jsx
new file mode 100644
index 00000000..476e6507
--- /dev/null
+++ b/src/lib/tracking-order/component/TrackingOrder.jsx
@@ -0,0 +1,94 @@
+import odooApi from '@/core/api/odooApi'
+import HookFormSelect from '@/core/components/elements/Select/HookFormSelect'
+import cityApi from '@/lib/address/api/cityApi'
+import { yupResolver } from '@hookform/resolvers/yup'
+import React, { useEffect, useRef, useState } from 'react'
+import ReCAPTCHA from 'react-google-recaptcha'
+import { Controller, useForm } from 'react-hook-form'
+import { toast } from 'react-hot-toast'
+import * as Yup from 'yup'
+import { useRouter } from 'next/router'
+import Manifest from '@/lib/treckingAwb/component/Manifest'
+const TrackingOrder = () => {
+    const [idAWB, setIdAWB] = useState(null)
+    const closePopup = () => {
+        setIdAWB(null)
+      }
+    const {
+        register,
+        handleSubmit,
+        formState: { errors },
+        control,
+        reset
+      } = useForm({
+        resolver: yupResolver(validationSchema),
+        defaultValues
+      })
+
+    const onSubmitHandler = async (values) => {
+        console.log('values',values)
+        // setIdAWB(shipment.id)
+        // setIdAWB(20623)
+        setIdAWB(25085)
+      }
+  return (
+    <div className='container mx-auto flex py-10 flex-col'>
+        <h1 className='text-h-sm md:text-title-sm font-semibold mb-6'>Tracking Order</h1>
+        <div className='flex justify-start items-start'>
+            <span className='text-base w-full'>Untuk melacak pesanan Anda, masukkan ID Pesanan Anda di kotak di bawah ini dan tekan tombol "Lacak". ID ini diberikan kepada Anda pada tanda terima dan dalam email konfirmasi yang seharusnya Anda terima.</span>
+        </div>
+        <div>
+            <form onSubmit={handleSubmit(onSubmitHandler)} className='flex mt-4 flex-row w-full '>
+                <div className=' w-[90%] grid grid-cols-2 gap-4'>
+                    <div className='flex flex-col '>
+                        <label className='form-label mb-2'>ID Pesanan*</label>
+                        <input
+                            {...register('id')}
+                            placeholder='dapat dilihat pada email konfirmasi anda'
+                            type='text'
+                            className='form-input mb-2'
+                            aria-invalid={errors.id?.message}
+                            />
+                            {console.log("errors",errors)}
+                        <div className='text-caption-2 text-danger-500 mt-1'>{errors.id?.message}</div>
+                    </div>
+                    <div className='flex flex-col '>
+                        <label className='form-label mb-2'>Email Penagihan*</label>
+                        <input
+                            {...register('email')}
+                            placeholder='Email yang anda gunakan saat pembayaran'
+                            type='text'
+                            className='form-input'
+                            aria-invalid={errors.email?.message}
+                        />
+                        <div className='text-caption-2 text-danger-500 mt-1'>{errors.email?.message}</div>
+                    </div>
+                </div>
+                <div className={` ${errors.id?.message ? 'mt-2' : 'mt-5'} flex items-center ml-4`}>
+                    <button
+                        type='submit'
+                        className='bg-red-600 border border-red-600 rounded-md text-sm text-white w-24 h-11 mb-1 content-center'
+                    >
+                        Lacak
+                    </button>
+
+                </div>
+            </form>
+            <Manifest idAWB={idAWB} closePopup={closePopup} />
+        </div>
+    </div>
+  )
+}
+
+const validationSchema = Yup.object().shape({
+    email: Yup.string().email('Format harus seperti contoh@email.com'),
+    id: Yup.string().required('Harus di-isi'),
+  })
+  
+  const defaultValues = {
+    email: '',
+    id: ''
+  }
+
+
+export default TrackingOrder
diff --git a/src/pages/tracking-order.jsx b/src/pages/tracking-order.jsx
new file mode 100644
index 00000000..18e1a78a
--- /dev/null
+++ b/src/pages/tracking-order.jsx
@@ -0,0 +1,26 @@
+import Seo from '@/core/components/Seo'
+import dynamic from 'next/dynamic'
+import SimpleFooter from '@/core/components/elements/Footer/SimpleFooter';
+import BasicLayout from '@/core/components/layouts/BasicLayout';
+import DesktopView from '@/core/components/views/DesktopView';
+import MobileView from '@/core/components/views/MobileView';
+const PageTrackingOrder = dynamic(() => import('@/lib/tracking-order/component/TrackingOrder'))
+
+export default function TrackingOrder() {
+  return (
+    <>
+      <Seo title='Tracking Order - Indoteknik.com' />
+
+      <DesktopView>
+        <BasicLayout>
+          <PageTrackingOrder/>
+        </BasicLayout>
+      </DesktopView>
+
+      <MobileView>
+        
+        <SimpleFooter />
+      </MobileView>
+    </>
+  );
+}
-- 
cgit v1.2.3


From 9ee852f139aed0f1034798b6a22b76eb9bd03aa4 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 12 Aug 2024 16:35:23 +0700
Subject: <iman> update tracking order

---
 src/lib/tracking-order/api/trackingOrder.js        |   8 +
 src/lib/tracking-order/component/TrackingOrder.jsx | 164 +++++++++++++--------
 2 files changed, 107 insertions(+), 65 deletions(-)
 create mode 100644 src/lib/tracking-order/api/trackingOrder.js

(limited to 'src')

diff --git a/src/lib/tracking-order/api/trackingOrder.js b/src/lib/tracking-order/api/trackingOrder.js
new file mode 100644
index 00000000..cc48c40c
--- /dev/null
+++ b/src/lib/tracking-order/api/trackingOrder.js
@@ -0,0 +1,8 @@
+import odooApi from "@/core/api/odooApi";
+
+export const trackingOrder = async ({query}) => {
+    const params = new URLSearchParams(query).toString();
+    const list = await odooApi('GET', `/api/v1/tracking_order?${params}`)
+
+    return list;
+}
diff --git a/src/lib/tracking-order/component/TrackingOrder.jsx b/src/lib/tracking-order/component/TrackingOrder.jsx
index 476e6507..c9f739b3 100644
--- a/src/lib/tracking-order/component/TrackingOrder.jsx
+++ b/src/lib/tracking-order/component/TrackingOrder.jsx
@@ -1,94 +1,128 @@
-import odooApi from '@/core/api/odooApi'
-import HookFormSelect from '@/core/components/elements/Select/HookFormSelect'
-import cityApi from '@/lib/address/api/cityApi'
 import { yupResolver } from '@hookform/resolvers/yup'
-import React, { useEffect, useRef, useState } from 'react'
-import ReCAPTCHA from 'react-google-recaptcha'
-import { Controller, useForm } from 'react-hook-form'
-import { toast } from 'react-hot-toast'
+import React, { useEffect, useState } from 'react' 
+import { useForm } from 'react-hook-form'
 import * as Yup from 'yup'
-import { useRouter } from 'next/router'
 import Manifest from '@/lib/treckingAwb/component/Manifest'
+import { trackingOrder } from '../api/trackingOrder'
+import { useQuery } from 'react-query'
+import { Spinner } from '@chakra-ui/react';
+import { Search } from 'lucide-react';
+import odooApi from '@/core/api/odooApi'
+
 const TrackingOrder = () => {
     const [idAWB, setIdAWB] = useState(null)
+    const [inputQuery, setInputQuery] = useState(null)
+    const [buttonClick, setButtonClick] = useState(false)
+    const [apiError, setApiError] = useState(null) // State to store API error message
+    
     const closePopup = () => {
         setIdAWB(null)
-      }
+        setButtonClick(false)
+        setInputQuery(null)
+        setApiError(null) // Reset error message on close
+    }
+    
     const {
         register,
         handleSubmit,
         formState: { errors },
         control,
         reset
-      } = useForm({
+    } = useForm({
         resolver: yupResolver(validationSchema),
         defaultValues
-      })
+    })
+    
+    const query = {
+        email: inputQuery?.email,
+        so: inputQuery?.id
+    }
+    
+    const { data: tracking, isLoading, isError, error } = useQuery(
+        ['tracking', query],
+        () => trackingOrder({ query: query }),
+        {
+            enabled: !!query.email && !!query.so,
+            onSuccess: (data) => {
+                if (buttonClick) {
+                    if (data?.code === 403 || data?.code === 400 || data?.code === 404) {
+                        setApiError(data?.description);
+                    } else if (data?.pickings?.length > 0) {
+                        setIdAWB(data.pickings[0]?.id);
+                    } else {
+                        setApiError('No pickings data available');
+                    }
+                    setButtonClick(false);
+                    setInputQuery(null);
+                }
+            },
+        }
+    );
 
     const onSubmitHandler = async (values) => {
-        console.log('values',values)
-        // setIdAWB(shipment.id)
-        // setIdAWB(20623)
-        setIdAWB(25085)
-      }
-  return (
-    <div className='container mx-auto flex py-10 flex-col'>
-        <h1 className='text-h-sm md:text-title-sm font-semibold mb-6'>Tracking Order</h1>
-        <div className='flex justify-start items-start'>
-            <span className='text-base w-full'>Untuk melacak pesanan Anda, masukkan ID Pesanan Anda di kotak di bawah ini dan tekan tombol "Lacak". ID ini diberikan kepada Anda pada tanda terima dan dalam email konfirmasi yang seharusnya Anda terima.</span>
-        </div>
-        <div>
-            <form onSubmit={handleSubmit(onSubmitHandler)} className='flex mt-4 flex-row w-full '>
-                <div className=' w-[90%] grid grid-cols-2 gap-4'>
-                    <div className='flex flex-col '>
-                        <label className='form-label mb-2'>ID Pesanan*</label>
-                        <input
-                            {...register('id')}
-                            placeholder='dapat dilihat pada email konfirmasi anda'
-                            type='text'
-                            className='form-input mb-2'
-                            aria-invalid={errors.id?.message}
+        setInputQuery(values)
+        setButtonClick(true)
+    }
+
+    return (
+        <div className='container mx-auto flex py-10 flex-col'>
+            <h1 className='text-h-sm md:text-title-sm font-semibold mb-6'>Tracking Order</h1>
+            <div className='flex justify-start items-start'>
+                <span className='text-base w-full'>Untuk melacak pesanan Anda, masukkan ID Pesanan Anda di kotak di bawah ini dan tekan tombol "Lacak". ID ini diberikan kepada Anda pada tanda terima dan dalam email konfirmasi yang seharusnya Anda terima.</span>
+            </div>
+            <div>
+                <form onSubmit={handleSubmit(onSubmitHandler)} className='flex mt-4 flex-row w-full '>
+                    <div className='w-[90%] grid grid-cols-2 gap-4'>
+                        <div className='flex flex-col '>
+                            <label className='form-label mb-2'>ID Pesanan*</label>
+                            <input
+                                {...register('id')}
+                                placeholder='dapat dilihat pada email konfirmasi anda'
+                                type='text'
+                                className='form-input mb-2'
+                                aria-invalid={errors.id?.message}
                             />
-                            {console.log("errors",errors)}
-                        <div className='text-caption-2 text-danger-500 mt-1'>{errors.id?.message}</div>
+                            <div className='text-caption-2 text-danger-500 mt-1'>{errors.id?.message}</div>
+                        </div>
+                        <div className='flex flex-col '>
+                            <label className='form-label mb-2'>Email Penagihan*</label>
+                            <input
+                                {...register('email')}
+                                placeholder='Email yang anda gunakan saat pembayaran'
+                                type='text'
+                                className='form-input'
+                                aria-invalid={errors.email?.message}
+                            />
+                            <div className='text-caption-2 text-danger-500 mt-1'>{errors.email?.message}</div>
+                        </div>
                     </div>
-                    <div className='flex flex-col '>
-                        <label className='form-label mb-2'>Email Penagihan*</label>
-                        <input
-                            {...register('email')}
-                            placeholder='Email yang anda gunakan saat pembayaran'
-                            type='text'
-                            className='form-input'
-                            aria-invalid={errors.email?.message}
-                        />
-                        <div className='text-caption-2 text-danger-500 mt-1'>{errors.email?.message}</div>
+                    <div className={` ${errors.id?.message ? 'mt-2' : 'mt-5'} flex items-center ml-4`}>
+                        <button
+                            type='submit'
+                            className='bg-red-600 border border-red-600 rounded-md text-sm text-white w-24 h-11 mb-1 content-center flex flex-row justify-center items-center'
+                        >
+                            {isLoading && <Spinner size='xs' className='mr-2'/>}
+                            {!isLoading && <Search size={16} strokeWidth={1} className='mr-2'/>} 
+                            <p>Lacak</p>
+                        </button>
                     </div>
-                </div>
-                <div className={` ${errors.id?.message ? 'mt-2' : 'mt-5'} flex items-center ml-4`}>
-                    <button
-                        type='submit'
-                        className='bg-red-600 border border-red-600 rounded-md text-sm text-white w-24 h-11 mb-1 content-center'
-                    >
-                        Lacak
-                    </button>
-
-                </div>
-            </form>
-            <Manifest idAWB={idAWB} closePopup={closePopup} />
+                </form>
+                {/* Display the API error message */}
+                {apiError && <div className='text-danger-500 mt-4'>{apiError}</div>}
+                <Manifest idAWB={idAWB} closePopup={closePopup} />
+            </div>
         </div>
-    </div>
-  )
+    )
 }
 
 const validationSchema = Yup.object().shape({
-    email: Yup.string().email('Format harus seperti contoh@email.com'),
+    email: Yup.string().email('Format harus seperti contoh@email.com').required('Harus di-isi'),
     id: Yup.string().required('Harus di-isi'),
-  })
-  
-  const defaultValues = {
+})
+
+const defaultValues = {
     email: '',
     id: ''
-  }
-
+}
 
 export default TrackingOrder
-- 
cgit v1.2.3


From 4dc62bbe5262be23b2622853973e803f63214a60 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 12 Aug 2024 17:09:13 +0700
Subject: <iman> update category management

---
 src/lib/category/components/Category.jsx     | 32 ++++++++++++++++++++++++++--
 src/lib/category/components/PopularBrand.jsx |  2 +-
 2 files changed, 31 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/lib/category/components/Category.jsx b/src/lib/category/components/Category.jsx
index ff958378..b10cb661 100644
--- a/src/lib/category/components/Category.jsx
+++ b/src/lib/category/components/Category.jsx
@@ -6,11 +6,36 @@ import { ChevronRightIcon } from '@heroicons/react/24/outline'
 import Image from 'next/image'
 import { useEffect, useState } from 'react'
 import PopularBrand from './PopularBrand'
+import { bannerApi } from '@/api/bannerApi';
+const { useQuery } = require('react-query')
 
 const Category = () => {
   const [categories, setCategories] = useState([])
   const [openCategories, setOpenCategory] = useState([]);
+  const [banner, setBanner] = useState([]);
+
+  const promotionProgram = useQuery('banner-promo-category-card', bannerApi({ type: 'banner-promo-category-card' }));
+  // const promotionProgram = useQuery('promotionProgram', bannerApi({ type: 'banner-promotion' }));
   
+  useEffect(() => {
+    const loadCategories = async () => {
+      let dataCategories = await odooApi('GET', '/api/v1/category/tree')
+      dataCategories = dataCategories?.map((category) => {
+        category.childs = category.childs.map((child1Category) => {
+          return {
+            ...child1Category,
+            isOpen: false
+          }
+        })
+        return {
+          ...category,
+          isOpen: false
+        }
+      })
+      setCategories(dataCategories)
+    }
+    loadCategories()
+  }, [])
 
   useEffect(() => {
     const loadCategories = async () => {
@@ -86,9 +111,12 @@ const Category = () => {
               </div>
               <div className='category-mega-box__child-wrapper !w-[260px] !flex !flex-col !gap-4'>
               <PopularBrand category={category} />
-                <div className='flex w-60 h-20 object-cover'>
-                  <Image src='https://erp.indoteknik.com/api/image/x_banner.banner/x_banner_image/397' alt='' width={275} height={4} />
+              {promotionProgram?.data[0]?.map((banner, index)=>(
+                <div key={index} className='flex w-60 h-20 object-cover'>
+                  {/* <Image src='https://erp.indoteknik.com/api/image/x_banner.banner/x_banner_image/397' alt='' width={275} height={4} /> */}
+                  <Image src={`${banner.image}`} alt={`${banner.name}`} width={275} height={4} />
                 </div>
+              ))}
               </div>
             </div>
           </div>
diff --git a/src/lib/category/components/PopularBrand.jsx b/src/lib/category/components/PopularBrand.jsx
index dca731e8..7c297d39 100644
--- a/src/lib/category/components/PopularBrand.jsx
+++ b/src/lib/category/components/PopularBrand.jsx
@@ -17,7 +17,7 @@ const PopularBrand = ({ category }) => {
 
     const fetchTopBrands = async () => {
         try {
-            const items = await fetchPromoItemsSolr(`category_id_ids:(${category.categoryDataIds.join(' OR ')})`);
+            const items = await fetchPromoItemsSolr(`category_id_ids:(${category?.categoryDataIds.join(' OR ')})`);
             // console.log("id",items)
             // Fungsi untuk deduplikasi dan mengambil 12 nama brand teratas
             const getTop12UniqueBrands = (prod) => {
-- 
cgit v1.2.3


From 3e11fce63de4b0d99a1e48c9998d6fcfcec13d98 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 12 Aug 2024 17:11:07 +0700
Subject: <iman> update error code

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

(limited to 'src')

diff --git a/src/lib/category/components/PopularBrand.jsx b/src/lib/category/components/PopularBrand.jsx
index 7c297d39..09c0f8a1 100644
--- a/src/lib/category/components/PopularBrand.jsx
+++ b/src/lib/category/components/PopularBrand.jsx
@@ -17,7 +17,7 @@ const PopularBrand = ({ category }) => {
 
     const fetchTopBrands = async () => {
         try {
-            const items = await fetchPromoItemsSolr(`category_id_ids:(${category?.categoryDataIds.join(' OR ')})`);
+            const items = await fetchPromoItemsSolr(`category_id_ids:(${category?.categoryDataIds?.join(' OR ')})`);
             // console.log("id",items)
             // Fungsi untuk deduplikasi dan mengambil 12 nama brand teratas
             const getTop12UniqueBrands = (prod) => {
-- 
cgit v1.2.3


From 0a889a2acb147ffe3fe0ad1ca205683c7bf3fe82 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 13 Aug 2024 09:12:51 +0700
Subject: <iman> add tracking order to footer

---
 src/core/components/elements/Footer/BasicFooter.jsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/core/components/elements/Footer/BasicFooter.jsx b/src/core/components/elements/Footer/BasicFooter.jsx
index 4beea604..8f024d86 100644
--- a/src/core/components/elements/Footer/BasicFooter.jsx
+++ b/src/core/components/elements/Footer/BasicFooter.jsx
@@ -175,7 +175,7 @@ const CustomerGuide = () => (
   <div>
     <div className={headerClassName}>Bantuan & Panduan</div>
     <ul className='flex flex-col gap-y-3'>
-      <li>
+      <li >
         <InternalItemLink href='/metode-pembayaran'>
           Metode Pembayaran
         </InternalItemLink>
@@ -210,6 +210,11 @@ const CustomerGuide = () => (
           Panduan Pick Up Service
         </InternalItemLink>
       </li>
+      <li>
+        <InternalItemLink href='/tracking-order'>
+          Tracking Order
+        </InternalItemLink>
+      </li>
     </ul>
   </div>
 );
-- 
cgit v1.2.3


From 004a9a644aed65d5c02263f19cce8b7c3000f354 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 13 Aug 2024 10:19:38 +0700
Subject: <iman> update category

---
 src/lib/category/api/popularProduct.js       |  5 ++--
 src/lib/category/components/Category.jsx     | 38 ++++++++++++++--------------
 src/lib/category/components/PopularBrand.jsx |  4 +--
 3 files changed, 24 insertions(+), 23 deletions(-)

(limited to 'src')

diff --git a/src/lib/category/api/popularProduct.js b/src/lib/category/api/popularProduct.js
index e17e0ae5..146c9449 100644
--- a/src/lib/category/api/popularProduct.js
+++ b/src/lib/category/api/popularProduct.js
@@ -1,9 +1,10 @@
 
-export const fetchPromoItemsSolr = async (category_id_ids) => {
+export const fetchPopulerProductSolr = async (category_id_ids) => {
     let sort ='sort=qty_sold_f desc';
     try {
         const queryParams = new URLSearchParams({ q: category_id_ids });
-        const response = await fetch(`/solr/product/select?${queryParams.toString()}&rows=2000&fl=manufacture_name_s,manufacture_id_i,id,display_name_s&${sort}`);
+        const response = await fetch(`/solr/product/select?${queryParams.toString()}&rows=2000&fl=manufacture_name_s,manufacture_id_i,id,display_name_s,qty_sold_f&${sort}`);
+        console.log("response",response)
         if (!response.ok) {
             throw new Error(`HTTP error! status: ${response.status}`);
         }
diff --git a/src/lib/category/components/Category.jsx b/src/lib/category/components/Category.jsx
index b10cb661..374cdf78 100644
--- a/src/lib/category/components/Category.jsx
+++ b/src/lib/category/components/Category.jsx
@@ -37,25 +37,25 @@ const Category = () => {
     loadCategories()
   }, [])
 
-  useEffect(() => {
-    const loadCategories = async () => {
-      let dataCategories = await odooApi('GET', '/api/v1/category/tree')
-      dataCategories = dataCategories?.map((category) => {
-        category.childs = category.childs.map((child1Category) => {
-          return {
-            ...child1Category,
-            isOpen: false
-          }
-        })
-        return {
-          ...category,
-          isOpen: false
-        }
-      })
-      setCategories(dataCategories)
-    }
-    loadCategories()
-  }, [])
+  // useEffect(() => {
+  //   const loadCategories = async () => {
+  //     let dataCategories = await odooApi('GET', '/api/v1/category/tree')
+  //     dataCategories = dataCategories?.map((category) => {
+  //       category.childs = category.childs.map((child1Category) => {
+  //         return {
+  //           ...child1Category,
+  //           isOpen: false
+  //         }
+  //       })
+  //       return {
+  //         ...category,
+  //         isOpen: false
+  //       }
+  //     })
+  //     setCategories(dataCategories)
+  //   }
+  //   loadCategories()
+  // }, [])
   // console.log("categories",categories)
 
   return (
diff --git a/src/lib/category/components/PopularBrand.jsx b/src/lib/category/components/PopularBrand.jsx
index 09c0f8a1..f0b12e2c 100644
--- a/src/lib/category/components/PopularBrand.jsx
+++ b/src/lib/category/components/PopularBrand.jsx
@@ -8,7 +8,7 @@ import Image from 'next/image'
 import { ChevronRightIcon } from '@heroicons/react/24/outline'
 import useProductSearch from '../../../lib/product/hooks/useProductSearch';
 import { SolrResponse } from "~/types/solr";
-import { fetchPromoItemsSolr } from '../api/popularProduct'
+import { fetchPopulerProductSolr } from '../api/popularProduct'
 
 const SOLR_HOST = process.env.SOLR_HOST
 
@@ -17,7 +17,7 @@ const PopularBrand = ({ category }) => {
 
     const fetchTopBrands = async () => {
         try {
-            const items = await fetchPromoItemsSolr(`category_id_ids:(${category?.categoryDataIds?.join(' OR ')})`);
+            const items = await fetchPopulerProductSolr(`category_id_ids:(${category?.categoryDataIds?.join(' OR ')})`);
             // console.log("id",items)
             // Fungsi untuk deduplikasi dan mengambil 12 nama brand teratas
             const getTop12UniqueBrands = (prod) => {
-- 
cgit v1.2.3


From 4fa3d1026ebabeb75dafc3bb9c630ea300859959 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 13 Aug 2024 11:23:19 +0700
Subject: <iman> update tracking order

---
 src/lib/tracking-order/component/TrackingOrder.jsx | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/lib/tracking-order/component/TrackingOrder.jsx b/src/lib/tracking-order/component/TrackingOrder.jsx
index c9f739b3..03b21b3e 100644
--- a/src/lib/tracking-order/component/TrackingOrder.jsx
+++ b/src/lib/tracking-order/component/TrackingOrder.jsx
@@ -7,7 +7,7 @@ import { trackingOrder } from '../api/trackingOrder'
 import { useQuery } from 'react-query'
 import { Spinner } from '@chakra-ui/react';
 import { Search } from 'lucide-react';
-import odooApi from '@/core/api/odooApi'
+import whatsappUrl from '@/core/utils/whatsappUrl';
 
 const TrackingOrder = () => {
     const [idAWB, setIdAWB] = useState(null)
@@ -68,7 +68,17 @@ const TrackingOrder = () => {
         <div className='container mx-auto flex py-10 flex-col'>
             <h1 className='text-h-sm md:text-title-sm font-semibold mb-6'>Tracking Order</h1>
             <div className='flex justify-start items-start'>
-                <span className='text-base w-full'>Untuk melacak pesanan Anda, masukkan ID Pesanan Anda di kotak di bawah ini dan tekan tombol "Lacak". ID ini diberikan kepada Anda pada tanda terima dan dalam email konfirmasi yang seharusnya Anda terima.</span>
+            <span className='text-base w-full'>
+                {`Untuk melacak pesanan Anda, masukkan Nomor Transaksi di kotak bawah ini dan masukkan Email login anda lalu tekan tombol "Lacak". Nomor Transaksi ini dapat Anda lihat dalam menu `}
+                <a href='/my/transactions' className='text-red-500'>
+                    Daftar Transaksi
+                </a>
+                {`. Jika mengalami kesulitan `}
+                <a href={whatsappUrl()} target='_blank' rel='noreferrer' className='text-red-500'>
+                    hubungi kami
+                </a>
+                {`.`}
+            </span>
             </div>
             <div>
                 <form onSubmit={handleSubmit(onSubmitHandler)} className='flex mt-4 flex-row w-full '>
-- 
cgit v1.2.3


From f97e2c348e3c4b3984eb598ac34de98e35fdde28 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 13 Aug 2024 12:00:17 +0700
Subject: <iman> update number wa

---
 src/lib/tracking-order/component/TrackingOrder.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/lib/tracking-order/component/TrackingOrder.jsx b/src/lib/tracking-order/component/TrackingOrder.jsx
index 03b21b3e..cf790832 100644
--- a/src/lib/tracking-order/component/TrackingOrder.jsx
+++ b/src/lib/tracking-order/component/TrackingOrder.jsx
@@ -74,7 +74,7 @@ const TrackingOrder = () => {
                     Daftar Transaksi
                 </a>
                 {`. Jika mengalami kesulitan `}
-                <a href={whatsappUrl()} target='_blank' rel='noreferrer' className='text-red-500'>
+                <a href='https://wa.me/6281717181922' target='_blank' rel='noreferrer' className='text-red-500'>
                     hubungi kami
                 </a>
                 {`.`}
-- 
cgit v1.2.3


From e8745f729cb48a2cab96f8f216617240326f2018 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 13 Aug 2024 14:39:08 +0700
Subject: <iman> add feature pickup service

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

(limited to 'src')

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index 09a791ee..5f771f41 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -1295,7 +1295,7 @@ const Checkout = () => {
                 <div className='flex flex-col gap-y-8 border-t border-gray-300 pt-8'>
                   {!!products &&
                     snakecaseKeys(products).map((item, index) => (
-                      <CartItem key={index} item={item} editable={false} />
+                      <CartItem key={index} item={item} editable={false} selfPicking={selectedExpedisi === '1,32' ? true : false} />
                     ))}
                 </div>
               </div>
-- 
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 ++++++++++++++++++++++++----
 src/utils/solrMapping.js                   |  1 +
 2 files changed, 25 insertions(+), 4 deletions(-)

(limited to 'src')

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>
           )}
diff --git a/src/utils/solrMapping.js b/src/utils/solrMapping.js
index d4694eb2..fee474be 100644
--- a/src/utils/solrMapping.js
+++ b/src/utils/solrMapping.js
@@ -38,6 +38,7 @@ export const productMappingSolr = (products, pricelist) => {
       qtySold: product?.qty_sold_f || 0,
       isTkdn:product?.tkdn_b || false,
       isSni:product?.sni_b || false,
+      is_in_bu:product?.is_in_bu_b || false,
       voucherPastiHemat:product?.voucher_pastihemat || []
     };
 
-- 
cgit v1.2.3


From c324065cf2270c4e489749f0281eb45a5f120b08 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 14 Aug 2024 15:20:16 +0700
Subject: <iman> change <a> to <Link>

---
 src/lib/tracking-order/component/TrackingOrder.jsx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/lib/tracking-order/component/TrackingOrder.jsx b/src/lib/tracking-order/component/TrackingOrder.jsx
index cf790832..394979c1 100644
--- a/src/lib/tracking-order/component/TrackingOrder.jsx
+++ b/src/lib/tracking-order/component/TrackingOrder.jsx
@@ -8,6 +8,7 @@ import { useQuery } from 'react-query'
 import { Spinner } from '@chakra-ui/react';
 import { Search } from 'lucide-react';
 import whatsappUrl from '@/core/utils/whatsappUrl';
+import Link from 'next/link'
 
 const TrackingOrder = () => {
     const [idAWB, setIdAWB] = useState(null)
@@ -70,13 +71,13 @@ const TrackingOrder = () => {
             <div className='flex justify-start items-start'>
             <span className='text-base w-full'>
                 {`Untuk melacak pesanan Anda, masukkan Nomor Transaksi di kotak bawah ini dan masukkan Email login anda lalu tekan tombol "Lacak". Nomor Transaksi ini dapat Anda lihat dalam menu `}
-                <a href='/my/transactions' className='text-red-500'>
+                <Link href='/my/transactions' className='text-red-500'>
                     Daftar Transaksi
-                </a>
+                </Link>
                 {`. Jika mengalami kesulitan `}
-                <a href='https://wa.me/6281717181922' target='_blank' rel='noreferrer' className='text-red-500'>
+                <Link href='https://wa.me/6281717181922' target='_blank' rel='noreferrer' className='text-red-500'>
                     hubungi kami
-                </a>
+                </Link>
                 {`.`}
             </span>
             </div>
-- 
cgit v1.2.3


From ad82ceb618565eec7b1e955c8ba12243d26253f1 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 15 Aug 2024 11:27:35 +0700
Subject: <iman> update view

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

(limited to 'src')

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index 5f771f41..6deba693 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -1004,7 +1004,7 @@ const Checkout = () => {
         <div className='p-4 flex flex-col gap-y-4'>
           {!!products &&
             snakecaseKeys(products).map((item, index) => (
-              <CartItem key={index} item={item} editable={false} />
+              <CartItem key={index} item={item} editable={false} selfPicking={selectedExpedisi === '1,32' ? true : false}/>
             ))}
         </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')

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 7e26430c7e808c167a330fc2cd4ce217f288757c Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 20 Aug 2024 16:29:22 +0700
Subject: <iman> delete border brand homepage

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

(limited to 'src')

diff --git a/src/lib/home/components/PreferredBrand.jsx b/src/lib/home/components/PreferredBrand.jsx
index fdefb526..56268db7 100644
--- a/src/lib/home/components/PreferredBrand.jsx
+++ b/src/lib/home/components/PreferredBrand.jsx
@@ -71,7 +71,7 @@ const PreferredBrand = () => {
           </Link>
         )}
       </div>
-      <div className='border rounded border-gray_r-6'>
+      <div className=''>
         {manufactures.isLoading && <PreferredBrandSkeleton />}
         {!manufactures.isLoading && (
           <Swiper {...swiperBanner}>
-- 
cgit v1.2.3


From 16db179d5bb5ebd3ce946fb6e682539ffc8f728e Mon Sep 17 00:00:00 2001
From: Imanuel Marinao <imanuel.mariano.5@gmail.com>
Date: Tue, 20 Aug 2024 20:40:32 +0700
Subject: <iman> update avoid error

---
 src/core/components/elements/Navbar/TopBanner.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/core/components/elements/Navbar/TopBanner.jsx b/src/core/components/elements/Navbar/TopBanner.jsx
index 5ea8f635..f438ae67 100644
--- a/src/core/components/elements/Navbar/TopBanner.jsx
+++ b/src/core/components/elements/Navbar/TopBanner.jsx
@@ -6,7 +6,7 @@ import Link from '../Link/Link';
 import { background } from '@chakra-ui/react';
 import { useEffect } from 'react';
 
-const TopBanner = ({ onLoad }) => {
+const TopBanner = ({ onLoad = () => {} }) => {
   const { isDesktop, isMobile } = useDevice()
   const topBanner = useQuery({
     queryKey: 'topBanner',
-- 
cgit v1.2.3


From 152eee248c4a793250526954e62a9e82258d615a Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 21 Aug 2024 11:44:08 +0700
Subject: <iman> update image margin

---
 src/lib/home/components/CategoryDynamic.jsx | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/lib/home/components/CategoryDynamic.jsx b/src/lib/home/components/CategoryDynamic.jsx
index 0cc43d91..b7798a24 100644
--- a/src/lib/home/components/CategoryDynamic.jsx
+++ b/src/lib/home/components/CategoryDynamic.jsx
@@ -82,6 +82,7 @@ const CategoryDynamic = () => {
                                 <NextImage
                                   src={childCategory.image ? childCategory.image : "/images/noimage.jpeg"}
                                   alt={childCategory.name}
+                                  className='p-2 ml-1'
                                   width={40}
                                   height={40}
                                 />
-- 
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')

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 5e2a8d315fa0bc58a18d4df5a995e402388995c9 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 22 Aug 2024 13:10:29 +0700
Subject: <iman> update category dropdown

---
 src/lib/category/api/popularProduct.js       |  3 +-
 src/lib/category/components/Category.jsx     | 30 ++-----------------
 src/lib/category/components/PopularBrand.jsx | 45 ++++++++++++++++++----------
 src/styles/globals.css                       |  3 +-
 4 files changed, 36 insertions(+), 45 deletions(-)

(limited to 'src')

diff --git a/src/lib/category/api/popularProduct.js b/src/lib/category/api/popularProduct.js
index 48f8a2a0..3fdfc41c 100644
--- a/src/lib/category/api/popularProduct.js
+++ b/src/lib/category/api/popularProduct.js
@@ -3,7 +3,7 @@ export const fetchPopulerProductSolr = async (category_id_ids) => {
     let sort ='sort=qty_sold_f desc';
     try {
         const queryParams = new URLSearchParams({ q: category_id_ids });
-        const response = await fetch(`/solr/product/select?${queryParams.toString()}&rows=2000&fl=manufacture_name_s,manufacture_id_i,id,display_name_s,qty_sold_f&${sort}`);
+        const response = await fetch(`/solr/product/select?${queryParams.toString()}&rows=2000&fl=manufacture_name_s,manufacture_id_i,id,display_name_s,qty_sold_f,qty_sold_f&${sort}`);
         if (!response.ok) {
             throw new Error(`HTTP error! status: ${response.status}`);
         }
@@ -24,6 +24,7 @@ export const fetchPopulerProductSolr = async (category_id_ids) => {
         name: promotion.display_name_s,
         manufacture_name: promotion.manufacture_name_s,
         manufacture_id: promotion.manufacture_id_i,
+        qty_sold: promotion.qty_sold_f,
       };
       result.push(data);
     }
diff --git a/src/lib/category/components/Category.jsx b/src/lib/category/components/Category.jsx
index 374cdf78..f76e6e42 100644
--- a/src/lib/category/components/Category.jsx
+++ b/src/lib/category/components/Category.jsx
@@ -15,7 +15,6 @@ const Category = () => {
   const [banner, setBanner] = useState([]);
 
   const promotionProgram = useQuery('banner-promo-category-card', bannerApi({ type: 'banner-promo-category-card' }));
-  // const promotionProgram = useQuery('promotionProgram', bannerApi({ type: 'banner-promotion' }));
   
   useEffect(() => {
     const loadCategories = async () => {
@@ -36,28 +35,6 @@ const Category = () => {
     }
     loadCategories()
   }, [])
-
-  // useEffect(() => {
-  //   const loadCategories = async () => {
-  //     let dataCategories = await odooApi('GET', '/api/v1/category/tree')
-  //     dataCategories = dataCategories?.map((category) => {
-  //       category.childs = category.childs.map((child1Category) => {
-  //         return {
-  //           ...child1Category,
-  //           isOpen: false
-  //         }
-  //       })
-  //       return {
-  //         ...category,
-  //         isOpen: false
-  //       }
-  //     })
-  //     setCategories(dataCategories)
-  //   }
-  //   loadCategories()
-  // }, [])
-  // console.log("categories",categories)
-
   return (
     <DesktopView>
       <div className='category-mega-box'>
@@ -67,8 +44,8 @@ const Category = () => {
               href={createSlug('/shop/category/', category.name, category.id)}
               className='category-mega-box__parent flex items-center'
             >
-              <div className='w-6 h-6 border mr-2 rounded-full flex justify-center items-center'>
-                <Image src={category.image} alt='' width={16} height={16} />
+              <div className='mr-2  flex justify-center items-center'>
+                <Image src={category.image} alt='' width={25} height={25} />
               </div>
               {category.name}
             </Link>
@@ -111,9 +88,8 @@ const Category = () => {
               </div>
               <div className='category-mega-box__child-wrapper !w-[260px] !flex !flex-col !gap-4'>
               <PopularBrand category={category} />
-              {promotionProgram?.data[0]?.map((banner, index)=>(
+              {Array.isArray(promotionProgram?.data) && promotionProgram?.data.length > 0 && promotionProgram?.data[0]?.map((banner, index) => (
                 <div key={index} className='flex w-60 h-20 object-cover'>
-                  {/* <Image src='https://erp.indoteknik.com/api/image/x_banner.banner/x_banner_image/397' alt='' width={275} height={4} /> */}
                   <Image src={`${banner.image}`} alt={`${banner.name}`} width={275} height={4} />
                 </div>
               ))}
diff --git a/src/lib/category/components/PopularBrand.jsx b/src/lib/category/components/PopularBrand.jsx
index f0b12e2c..4777fded 100644
--- a/src/lib/category/components/PopularBrand.jsx
+++ b/src/lib/category/components/PopularBrand.jsx
@@ -18,28 +18,41 @@ const PopularBrand = ({ category }) => {
     const fetchTopBrands = async () => {
         try {
             const items = await fetchPopulerProductSolr(`category_id_ids:(${category?.categoryDataIds?.join(' OR ')})`);
-            // console.log("id",items)
-            // Fungsi untuk deduplikasi dan mengambil 12 nama brand teratas
             const getTop12UniqueBrands = (prod) => {
-                const brandSet = new Set();
-                const topBrands = [];
-                
+                const brandMap = new Map();
+    
                 for (const product of prod) {
-                    if (!brandSet.has(product.manufacture_name)) {
-                        brandSet.add(product.manufacture_name);
-                        topBrands.push({ name: product.manufacture_name, id: product.manufacture_id });
-                    }else{
+                    const { manufacture_name, manufacture_id, qty_sold } = product;
+    
+                    if (brandMap.has(manufacture_name)) {
+                        // Update the existing brand's qty_sold
+                        brandMap.set(manufacture_name, {
+                            name: manufacture_name,
+                            id: manufacture_id,
+                            qty_sold: brandMap.get(manufacture_name).qty_sold + qty_sold
+                        });
+                    } else {
+                        // Add a new brand to the map
+                        brandMap.set(manufacture_name, {
+                            name: manufacture_name,
+                            id: manufacture_id,
+                            qty_sold
+                        });
                     }
-                    if (topBrands.length === 18) break;
                 }
-                return topBrands;
-            }
-
-            // Menggunakan hasil pencarian produk
+    
+                // Convert the map to an array and sort by qty_sold in descending order
+                const sortedBrands = Array.from(brandMap.values()).sort((a, b) => b.qty_sold - a.qty_sold);
+    
+                // Return the top 12 brands
+                return sortedBrands.slice(0, 18);
+            };
+    
+            // Using the fetched products
             const products = items;
             const top12UniqueBrands = getTop12UniqueBrands(products);
-
-            // console.log('top12UniqueBrands', top12UniqueBrands);
+    
+            // Set the top 12 brands to the state
             setTopBrands(top12UniqueBrands);
         } catch (error) {
             console.error("Error fetching data from Solr", error);
diff --git a/src/styles/globals.css b/src/styles/globals.css
index 505dcab4..b3ca85f4 100644
--- a/src/styles/globals.css
+++ b/src/styles/globals.css
@@ -563,7 +563,8 @@ button {
 }
 
 .category-mega-box > div:hover .category-mega-box__parent {
-    @apply bg-gray_r-5;
+    @apply bg-gray_r-5
+    w-full;
 }
 
 .category-mega-box > div:hover .category-mega-box__child-wrapper {
-- 
cgit v1.2.3


From 6623dba2f6cd4a4ca7b25f7086991afef092cd26 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 22 Aug 2024 15:48:00 +0700
Subject: <iman> update new register view

---
 src/pages/api/activation-request.js | 2 +-
 src/styles/globals.css              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/pages/api/activation-request.js b/src/pages/api/activation-request.js
index 61dbb597..64a67bbc 100644
--- a/src/pages/api/activation-request.js
+++ b/src/pages/api/activation-request.js
@@ -7,7 +7,7 @@ export default async function handler(req, res) {
     let result = await odooApi('POST', '/api/v1/user/activation-request', { email })
     if (result.activationRequest) {
       mailer.sendMail({
-        from: 'sales@indoteknik.com',
+        from: 'noreply@indoteknik.com',
         to: result.user.email,
         subject: 'Permintaan Aktivasi Akun Indoteknik',
         html: `
diff --git a/src/styles/globals.css b/src/styles/globals.css
index f6561b00..ebd5e9a5 100644
--- a/src/styles/globals.css
+++ b/src/styles/globals.css
@@ -98,7 +98,7 @@ button {
             border
             text-gray_r-12
             border-gray_r-7
-            !bg-white
+            bg-white
             bg-transparent
             w-full
             leading-none
-- 
cgit v1.2.3


From ae5891eba4ad89fd8281d26ce765b3b5d6662483 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 22 Aug 2024 17:22:28 +0700
Subject: <iman> update email

---
 src/pages/api/activation-request.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/pages/api/activation-request.js b/src/pages/api/activation-request.js
index 61dbb597..64a67bbc 100644
--- a/src/pages/api/activation-request.js
+++ b/src/pages/api/activation-request.js
@@ -7,7 +7,7 @@ export default async function handler(req, res) {
     let result = await odooApi('POST', '/api/v1/user/activation-request', { email })
     if (result.activationRequest) {
       mailer.sendMail({
-        from: 'sales@indoteknik.com',
+        from: 'noreply@indoteknik.com',
         to: result.user.email,
         subject: 'Permintaan Aktivasi Akun Indoteknik',
         html: `
-- 
cgit v1.2.3


From 07dd60c2706d960ebb9cebe093b449f32c5f87a2 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 23 Aug 2024 09:32:19 +0700
Subject: <iman> update activation request from mail

---
 src/pages/api/activation-request.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/pages/api/activation-request.js b/src/pages/api/activation-request.js
index 64a67bbc..98d27f78 100644
--- a/src/pages/api/activation-request.js
+++ b/src/pages/api/activation-request.js
@@ -7,7 +7,7 @@ export default async function handler(req, res) {
     let result = await odooApi('POST', '/api/v1/user/activation-request', { email })
     if (result.activationRequest) {
       mailer.sendMail({
-        from: 'noreply@indoteknik.com',
+        from: 'Indoteknik.com <noreply@indoteknik.com>',
         to: result.user.email,
         subject: 'Permintaan Aktivasi Akun Indoteknik',
         html: `
-- 
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')

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 d2c8f6bf211a95b3278c2e2f26bc9de342eed7ad Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 23 Aug 2024 11:13:54 +0700
Subject: <iman> update google tag to new tag

---
 src/pages/_document.jsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/pages/_document.jsx b/src/pages/_document.jsx
index cd60bd89..6af6294f 100644
--- a/src/pages/_document.jsx
+++ b/src/pages/_document.jsx
@@ -41,13 +41,13 @@ export default function MyDocument() {
           content='328wmjs7hcnz74rwsqzxvq50rmbtm2'
         />
 
-        <Script
+        {/* <Script
           async
           strategy='beforeInteractive'
           src='https://www.googletagmanager.com/gtag/js?id=UA-10501937-1'
-        />
+        /> */}
 
-        <Script
+        {/* <Script
           async
           id='google-analytics-ua'
           strategy='beforeInteractive'
@@ -59,7 +59,7 @@ export default function MyDocument() {
               gtag('config', 'UA-10501937-1');
             `,
           }}
-        />
+        /> */}
 
         <Script
           async
-- 
cgit v1.2.3


From 8629883ac83fce8fc2e2200f57299f06fef6cf53 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 23 Aug 2024 13:53:46 +0700
Subject: <iman> update not found brand

---
 src/pages/shop/brands/[slug].jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/pages/shop/brands/[slug].jsx b/src/pages/shop/brands/[slug].jsx
index e786ef78..88e9b302 100644
--- a/src/pages/shop/brands/[slug].jsx
+++ b/src/pages/shop/brands/[slug].jsx
@@ -18,7 +18,7 @@ export default function BrandDetail() {
   const brandName = getNameFromSlug(slug)
   const id = getIdFromSlug(slug)
   const {brand} = useBrand({id})
-  if (!brand || !brand.data || _.isEmpty(brand.data)) {
+  if ( !brand.isLoading && _.isEmpty(brand.data)) {
     return <PageNotFound />;
   }
   return (
-- 
cgit v1.2.3


From 500c6cf822114a82ca90c70b212e2f969f4d30da Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 23 Aug 2024 14:04:44 +0700
Subject: <iman> add ready stock

---
 src/api/productApi.js                |  5 ++++-
 src/components/ui/PopularProduct.jsx | 23 ++++++++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/api/productApi.js b/src/api/productApi.js
index 009d95ef..4a29b59d 100644
--- a/src/api/productApi.js
+++ b/src/api/productApi.js
@@ -2,8 +2,11 @@ import axios from 'axios'
 
 export const popularProductApi = () => {
   return async () => {
+    const today = new Date();
+    const dayOfYear = Math.floor((today - new Date(today.getFullYear(), 0, 0)) / 86400000);
+    const page = (dayOfYear % 24) + 1;
     const dataPopularProducts = await axios(
-      `${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/search?q=*&page=1&orderBy=popular-weekly&priceFrom=1`
+      `${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/search?q=*&page=${page}&orderBy=stock&priceFrom=1`
     )
     return dataPopularProducts.data.response
   }
diff --git a/src/components/ui/PopularProduct.jsx b/src/components/ui/PopularProduct.jsx
index bbbd18bc..92b2a1b6 100644
--- a/src/components/ui/PopularProduct.jsx
+++ b/src/components/ui/PopularProduct.jsx
@@ -5,6 +5,7 @@ import { useQuery } from 'react-query'
 import { PopularProductSkeleton } from '../skeleton/PopularProductSkeleton'
 import DesktopView from '@/core/components/views/DesktopView'
 import ProductCard from '@/lib/product/components/ProductCard'
+import Link from '@/core/components/elements/Link/Link'
 
 const PopularProduct = () => {
   const popularProduct = useQuery('popularProduct', popularProductApi())
@@ -16,15 +17,31 @@ const PopularProduct = () => {
       <>
         <MobileView>
           <div className='px-4'>
-            <div className='font-semibold mb-4'>Produk Banyak Dilihat</div>
+          <div className='font-semibold mb-4 flex justify-between items-center'><p>
+              Produk Ready Stock
+              </p> 
+              <Link
+                href='/shop/search?orderBy=stock'
+                className=''
+              >
+                <p className='text-danger-500 font-semibold'>Lihat Semua</p>
+                </Link></div>
             <ProductSlider products={popularProduct.data} simpleTitle />
           </div>
         </MobileView>
 
         <DesktopView>
           <div className='border border-gray_r-6 h-full overflow-auto'>
-            <div className='font-semibold text-center p-4 bg-gray_r-1 border-b border-gray_r-6 sticky top-0 z-10'>
-              Produk Banyak Dilihat
+          <div className='font-semibold text-center p-4 bg-gray_r-1 border-b border-gray_r-6 sticky top-0 z-10 flex justify-between items-center'>
+             <p>
+              Produk Ready Stock
+              </p> 
+              <Link
+                href='/shop/search?orderBy=stock'
+                className=''
+              >
+                <p className='text-danger-500 font-semibold'>Lihat Semua</p>
+                </Link>
             </div>
             <div className='h-full divide-y divide-gray_r-6'>
               {popularProduct.data &&
-- 
cgit v1.2.3


From 67731281227f961c9b56f9f310951a8e5c82ab39 Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Fri, 23 Aug 2024 14:19:05 +0700
Subject: bug fixing checkout ios env

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

(limited to 'src')

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index 09a791ee..47f148d1 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -389,12 +389,38 @@ const Checkout = () => {
     if (typeof file !== 'undefined') data.po_file = await getFileBase64(file);
 
     const isCheckouted = await checkoutApi({ data });
+
     if (!isCheckouted?.id) {
       toast.error('Gagal melakukan transaksi, terjadi kesalahan internal');
       return;
-    }
+    } else {
+      gtagPurchase(products, biayaKirim, isCheckouted.name);
+
+      gtag('event', 'conversion', {
+        send_to: 'AW-954540379/nDymCL3BhaQYENvClMcD',
+        value:
+          cartCheckout?.grandTotal +
+          Math.round(parseInt(biayaKirim * 1.1) / 1000) * 1000,
+        currency: 'IDR',
+        transaction_id: isCheckouted.id,
+      });
 
-    gtagPurchase(products, biayaKirim, isCheckouted.name);
+      for (const product of products) deleteItemCart({ productId: product.id });
+      if (grandTotal > 0) {
+        const payment = await axios.post(
+          `${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/midtrans-payment?transactionId=${isCheckouted.id}`
+        );
+        setIsLoading(false);
+        window.location.href = payment.data.redirectUrl;
+      } else {
+        window.location.href = `${
+          process.env.NEXT_PUBLIC_SELF_HOST
+        }/shop/checkout/success?order_id=${isCheckouted.name.replace(
+          /\//g,
+          '-'
+        )}`;
+      }
+    }
 
     const midtrans = async () => {
       for (const product of products) deleteItemCart({ productId: product.id });
@@ -413,16 +439,6 @@ const Checkout = () => {
         )}`;
       }
     };
-
-    gtag('event', 'conversion', {
-      send_to: 'AW-954540379/nDymCL3BhaQYENvClMcD',
-      value:
-        cartCheckout?.grandTotal +
-        Math.round(parseInt(biayaKirim * 1.1) / 1000) * 1000,
-      currency: 'IDR',
-      transaction_id: isCheckouted.id,
-      event_callback: midtrans,
-    });
   };
 
   const handlingActivateCode = async () => {
-- 
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/core/components/elements/Navbar/NavbarDesktop.jsx | 2 +-
 src/lib/product/components/ProductSearch.jsx          | 2 +-
 src/pages/api/shop/search.js                          | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx
index 2ddf5efe..6c308f11 100644
--- a/src/core/components/elements/Navbar/NavbarDesktop.jsx
+++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx
@@ -291,7 +291,7 @@ const NavbarDesktop = () => {
               <Link
                 href='/shop/search?orderBy=stock'
                 className={`${
-                  router.asPath === '/shop/search?orderBy=stock' &&
+                  router.asPath.includes('/shop/search?orderBy=stock') &&
                   'bg-gray_r-3'
                 } p-4 flex-1 flex justify-center items-center !text-gray_r-12/80 hover:bg-gray_r-3 idt-transition group`}
                 target='_blank'
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([])
diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index 6f98efcb..eadccede 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -18,6 +18,8 @@ export default async function handler(req, res) {
 
   let { stock = '' } = req.query;
 
+  let isStock = false
+
   let paramOrderBy = '';
   switch (orderBy) {
     case 'price-asc':
@@ -33,6 +35,7 @@ export default async function handler(req, res) {
       paramOrderBy += 'search_rank_weekly_i DESC';
       break;
     case 'stock':
+      isStock = true
       paramOrderBy += 'product_rating_f DESC, stock_total_f DESC';
       break;
     case 'flashsale-price-asc':
@@ -94,7 +97,7 @@ export default async function handler(req, res) {
         .join(' OR ')}`
     );
   // if (category) parameter.push(`fq=category_name:${capitalizeFirstLetter(category.replace(/,/g, ' OR '))}`)
-  if (stock) parameter.push(`fq=stock_total_f:{1 TO *}`);
+  if (stock || isStock) parameter.push(`fq=stock_total_f:[0.1 TO *]`);
 
   // Single fq in url params
   if (typeof fq === 'string') parameter.push(`fq=${fq}`);
-- 
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 +-
 src/pages/api/shop/search.js                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

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([])
diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index eadccede..f476faf8 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -29,7 +29,7 @@ export default async function handler(req, res) {
       paramOrderBy += 'price_tier1_v2_f DESC';
       break;
     case 'popular':
-      paramOrderBy += 'product_rating_f DESC, search_rank_i DESC,';
+      paramOrderBy += 'stock_total_f DESC, product_rating_f DESC, search_rank_i DESC,';
       break;
     case 'popular-weekly':
       paramOrderBy += 'search_rank_weekly_i DESC';
-- 
cgit v1.2.3


From eb849656d807aa22d14f97f79b6114c599628b42 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 26 Aug 2024 10:37:39 +0700
Subject: <iman> back to original code before stock

---
 src/pages/api/shop/search.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index f476faf8..6f98efcb 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -18,8 +18,6 @@ export default async function handler(req, res) {
 
   let { stock = '' } = req.query;
 
-  let isStock = false
-
   let paramOrderBy = '';
   switch (orderBy) {
     case 'price-asc':
@@ -29,13 +27,12 @@ export default async function handler(req, res) {
       paramOrderBy += 'price_tier1_v2_f DESC';
       break;
     case 'popular':
-      paramOrderBy += 'stock_total_f DESC, product_rating_f DESC, search_rank_i DESC,';
+      paramOrderBy += 'product_rating_f DESC, search_rank_i DESC,';
       break;
     case 'popular-weekly':
       paramOrderBy += 'search_rank_weekly_i DESC';
       break;
     case 'stock':
-      isStock = true
       paramOrderBy += 'product_rating_f DESC, stock_total_f DESC';
       break;
     case 'flashsale-price-asc':
@@ -97,7 +94,7 @@ export default async function handler(req, res) {
         .join(' OR ')}`
     );
   // if (category) parameter.push(`fq=category_name:${capitalizeFirstLetter(category.replace(/,/g, ' OR '))}`)
-  if (stock || isStock) parameter.push(`fq=stock_total_f:[0.1 TO *]`);
+  if (stock) parameter.push(`fq=stock_total_f:{1 TO *}`);
 
   // Single fq in url params
   if (typeof fq === 'string') parameter.push(`fq=${fq}`);
-- 
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')

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 f5477dc98ce5da703ff27b4a05d5ba59e4c5298e Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 26 Aug 2024 13:19:23 +0700
Subject: <iman> change v1 to v2 API

---
 src/lib/auth/api/registerApi.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/lib/auth/api/registerApi.js b/src/lib/auth/api/registerApi.js
index f9413f8c..580960d4 100644
--- a/src/lib/auth/api/registerApi.js
+++ b/src/lib/auth/api/registerApi.js
@@ -1,7 +1,7 @@
 import odooApi from '@/core/api/odooApi'
 
 const registerApi = async ({ ...data }) => {
-  const dataRegister = await odooApi('POST', '/api/v1/user/register', data)
+  const dataRegister = await odooApi('POST', '/api/v2/user/register', data)
   return dataRegister
 }
 
-- 
cgit v1.2.3


From 6e02e43d6df8b73a61ab59502abe941aeb83f799 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 26 Aug 2024 14:32:45 +0700
Subject: <iman> change v2 to v1 api

---
 src/lib/auth/api/registerApi.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/lib/auth/api/registerApi.js b/src/lib/auth/api/registerApi.js
index 580960d4..f9413f8c 100644
--- a/src/lib/auth/api/registerApi.js
+++ b/src/lib/auth/api/registerApi.js
@@ -1,7 +1,7 @@
 import odooApi from '@/core/api/odooApi'
 
 const registerApi = async ({ ...data }) => {
-  const dataRegister = await odooApi('POST', '/api/v2/user/register', data)
+  const dataRegister = await odooApi('POST', '/api/v1/user/register', data)
   return dataRegister
 }
 
-- 
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')

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


From bbb2736f0e21192467c1d6888b1c05d290c49863 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 28 Aug 2024 09:22:35 +0700
Subject: <iman> update mobile view

---
 src/pages/tracking-order.jsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/pages/tracking-order.jsx b/src/pages/tracking-order.jsx
index 18e1a78a..002acd42 100644
--- a/src/pages/tracking-order.jsx
+++ b/src/pages/tracking-order.jsx
@@ -18,8 +18,9 @@ export default function TrackingOrder() {
       </DesktopView>
 
       <MobileView>
-        
-        <SimpleFooter />
+        <BasicLayout>
+          <PageTrackingOrder/>
+        </BasicLayout>
       </MobileView>
     </>
   );
-- 
cgit v1.2.3


From af6494b92528cee8fae7173e8290c4ebbc334efa Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Wed, 28 Aug 2024 09:47:39 +0700
Subject: handling ready to ship

---
 src/lib/product/components/ProductSearch.jsx |  4 +++-
 src/pages/api/shop/search.js                 | 30 +++++++++++++++++++++++-----
 2 files changed, 28 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index eaeac71a..d6e649a8 100644
--- a/src/lib/product/components/ProductSearch.jsx
+++ b/src/lib/product/components/ProductSearch.jsx
@@ -382,6 +382,8 @@ const ProductSearch = ({
   };
 
   const isNotReadyStockPage = router.asPath !== '/shop/search?orderBy=stock';
+
+  console.log('is spelling', spellings);
   return (
     <>
       <MobileView>
@@ -575,7 +577,7 @@ const ProductSearch = ({
             />
             <div className='flex justify-between items-center mb-5'>
               <div className='leading-6 text-gray_r-11'>
-                {!spellings ? (
+                {spellings?.length < 1 || !spellings ? (
                   <>
                     Menampilkan&nbsp;
                     {pageCount > 1 ? (
diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index 6f98efcb..a19224df 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -1,6 +1,7 @@
 import { productMappingSolr } from '@/utils/solrMapping';
 import axios from 'axios';
 import camelcaseObjectDeep from 'camelcase-object-deep';
+import searchSuggestApi from '@/core/api/searchSuggestApi';
 
 export default async function handler(req, res) {
   const {
@@ -42,10 +43,29 @@ export default async function handler(req, res) {
       paramOrderBy += '';
       break;
   }
-  
+
+  // let suggestWord = null;
+  // let keywords = q;
+  // let checkQ = null;
+
+  // if (q != '*') {
+  //   checkQ = q.trim().split(/[\s\+\-\!\(\)\{\}\[\]\^"~\*\?:\\\/]+/);
+  //   if (checkQ.length > 1) {
+  //     const dataSearchSuggest = await axios(
+  //       `${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/suggest?q=${checkQ[1]}`
+  //     );
+  //     suggestWord = dataSearchSuggest.data.suggestions[0];
+  //   }
+  //   if (suggestWord && suggestWord?.term.split(' ').length <= 1) {
+  //     keywords = `"${escapeSolrQuery(checkQ[0] + ' ' + suggestWord?.term)}"`;
+  //   }
+  // }
+
+  // let newQ = keywords;
+
   let checkQ = q.trim().split(/[\s\+\-\!\(\)\{\}\[\]\^"~\*\?:\\\/]+/);
   let newQ = checkQ.length > 1 ? escapeSolrQuery(q) + '*' : escapeSolrQuery(q);
-  
+
   let offset = (page - 1) * limit;
   let parameter = [
     'facet.field=manufacture_name_s',
@@ -54,7 +74,7 @@ export default async function handler(req, res) {
     'indent=true',
     `facet.query=${escapeSolrQuery(q)}`,
     `q.op=${operation}`,
-    `q=${newQ}`,
+    `q=name_s:${newQ}`,
     'qf=name_s',
     `start=${parseInt(offset)}`,
     `rows=${limit}`,
@@ -105,6 +125,7 @@ export default async function handler(req, res) {
   let result = await axios(
     process.env.SOLR_HOST + '/solr/product/select?' + parameter.join('&')
   );
+  console.log('ini search', parameter.join('&'));
   try {
     result.data.response.products = productMappingSolr(
       result.data.response.docs,
@@ -126,7 +147,7 @@ export default async function handler(req, res) {
 
 const escapeSolrQuery = (query) => {
   if (query == '*') return query;
-  
+
   query = query.replace(/-/g, ' ');
 
   const specialChars = /([\+\!\(\)\{\}\[\]\^"~\*\?:\\\/])/g;
@@ -141,7 +162,6 @@ const escapeSolrQuery = (query) => {
   return escapedWords.join(' ');
 };
 
-
 /*const productResponseMap = (products, pricelist) => {
   return products.map((product) => {
     let price = product.price_tier1_v2_f || 0
-- 
cgit v1.2.3


From 1bfd8851c66f4029ee6e5088b3776819bf61f4b7 Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Wed, 28 Aug 2024 14:58:42 +0700
Subject: voucher shipping code

---
 src/lib/checkout/components/Checkout.jsx | 206 ++++++++++++++++++-------------
 1 file changed, 121 insertions(+), 85 deletions(-)

(limited to 'src')

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index 384e7105..2e3d4e58 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -150,68 +150,88 @@ const Checkout = () => {
     // let dataVoucher = await findVoucher(code, auth.id, query);
     let dataVoucher = await getVoucher(auth?.id, {
       source: query,
-      code: code
+      code: code,
     });
     if (dataVoucher.length <= 0) {
       SetFindVoucher(1);
       return;
     }
 
-    let addNewLine = dataVoucher[0];
-    console.log('addNewLine', addNewLine);
-    if (addNewLine.applyType != 'shipping') {
-      let checkList = listVouchers?.findIndex(
-        (voucher) => voucher.code == addNewLine.code
-      );
-      if (checkList >= 0) {
-        if (listVouchers[checkList].canApply) {
-          ToggleSwitch(code);
-          SetCodeVoucher(null);
-        } else {
-          SetSelisihHargaCode(listVouchers[checkList].differenceToApply);
+    dataVoucher.forEach((addNewLine) => {
+      if (addNewLine.applyType !== 'shipping') {
+        // Mencari voucher dalam listVouchers
+        let checkList = listVouchers?.findIndex(
+          (voucher) => voucher.code === addNewLine.code
+        );
+
+        if (checkList >= 0) {
+          if (listVouchers[checkList].canApply) {
+            ToggleSwitch(addNewLine.code); // Perbaikan: Gunakan code voucher yang benar
+            SetCodeVoucher(null);
+          } else {
+            SetSelisihHargaCode(listVouchers[checkList].differenceToApply);
+            SetFindVoucher(2);
+          }
+          return; // Hentikan eksekusi lebih lanjut pada iterasi ini
+        }
+
+        // Memeriksa apakah subtotal memenuhi syarat minimal pembelian
+        if (cartCheckout?.subtotal < addNewLine.minPurchaseAmount) {
+          SetSelisihHargaCode(
+            currencyFormat(
+              addNewLine.minPurchaseAmount - cartCheckout?.subtotal
+            )
+          );
           SetFindVoucher(2);
+          return;
+        } else {
+          SetFindVoucher(3);
+          SetButtonTerapkan(true);
         }
-        return;
-      }
-      if (cartCheckout?.subtotal < addNewLine.minPurchaseAmount) {
-        SetSelisihHargaCode(
-          currencyFormat(addNewLine.minPurchaseAmount - cartCheckout?.subtotal)
-        );
-        SetFindVoucher(2);
-        return;
+
+        // Tambahkan voucher ke list dan set voucher aktif
+        SetListVoucher((prevList) => [addNewLine, ...prevList]);
+        SetActiveVoucher(addNewLine.code);
       } else {
-        SetFindVoucher(3);
-        SetButtonTerapkan(true);
-      }
-      SetListVoucher((prevList) => [addNewLine, ...prevList]);
-      SetActiveVoucher(addNewLine.code);
-    } else {
-      let checkList = listVoucherShippings?.findIndex(
-        (voucher) => voucher.code == addNewLine.code
-      );
-      if (checkList >= 0) {
-        if (listVoucherShippings[checkList].canApply) {
-          ToggleSwitch(code);
-          SetCodeVoucher(null);
-        } else {
-          SetSelisihHargaCode(listVoucherShippings[checkList].differenceToApply);
+        // Mencari voucher dalam listVoucherShippings
+        let checkList = listVoucherShippings?.findIndex(
+          (voucher) => voucher.code === addNewLine.code
+        );
+
+        if (checkList >= 0) {
+          if (listVoucherShippings[checkList].canApply) {
+            ToggleSwitch(addNewLine.code); // Perbaikan: Gunakan code voucher yang benar
+            SetCodeVoucher(null);
+          } else {
+            SetSelisihHargaCode(
+              listVoucherShippings[checkList].differenceToApply
+            );
+            SetFindVoucher(2);
+          }
+          return; // Hentikan eksekusi lebih lanjut pada iterasi ini
+        }
+
+        // Memeriksa apakah subtotal memenuhi syarat minimal pembelian
+        if (cartCheckout?.subtotal < addNewLine.minPurchaseAmount) {
+          SetSelisihHargaCode(
+            currencyFormat(
+              addNewLine.minPurchaseAmount - cartCheckout?.subtotal
+            )
+          );
           SetFindVoucher(2);
+          return;
+        } else {
+          SetFindVoucher(3);
+          SetButtonTerapkan(true);
         }
-        return;
-      }
-      if (cartCheckout?.subtotal < addNewLine.minPurchaseAmount) {
-        SetSelisihHargaCode(
-          currencyFormat(addNewLine.minPurchaseAmount - cartCheckout?.subtotal)
-        );
-        SetFindVoucher(2);
-        return;
-      } else {
-        SetFindVoucher(3);
-        SetButtonTerapkan(true);
+
+        // Tambahkan voucher ke list pengiriman dan set voucher aktif pengiriman
+        SetListVoucherShipping((prevList) => [addNewLine, ...prevList]);
+        setActiveVoucherShipping(addNewLine.code);
       }
-      SetListVoucherShipping((prevList) => [addNewLine, ...prevList]);
-      setActiveVoucherShipping(addNewLine.code);
-    }
+    });
+
+    // let addNewLine = dataVoucher[0];
   };
 
   useEffect(() => {
@@ -244,22 +264,21 @@ const Checkout = () => {
 
   const hitungDiscountVoucher = (code, source) => {
     let countDiscount = 0;
-    if(source === 'voucher'){
+    if (source === 'voucher') {
       let dataVoucherIndex = listVouchers.findIndex(
         (voucher) => voucher.code == code
       );
       let dataActiveVoucher = listVouchers[dataVoucherIndex];
-  
+
       countDiscount = dataActiveVoucher.discountVoucher;
-    }else{
+    } else {
       let dataVoucherIndex = listVoucherShippings.findIndex(
         (voucher) => voucher.code == code
       );
       let dataActiveVoucher = listVoucherShippings[dataVoucherIndex];
-  
+
       countDiscount = dataActiveVoucher.discountVoucher;
     }
-    
 
     /*if (dataActiveVoucher.discountType === 'percentage') {
       countDiscount = cartCheckout?.subtotal * (dataActiveVoucher.discountAmount / 100)
@@ -276,25 +295,24 @@ const Checkout = () => {
     return countDiscount;
   };
 
-  useEffect(() => {
-    if (!listVouchers) return;
-    if (!activeVoucher) return;
+  // useEffect(() => {
+  //   if (!listVouchers) return;
+  //   if (!activeVoucher) return;
 
-    console.log('voucher')
-    const countDiscount = hitungDiscountVoucher(activeVoucher, 'voucher');
+  //   console.log('voucher')
+  //   const countDiscount = hitungDiscountVoucher(activeVoucher, 'voucher');
 
-    SetDiscountVoucher(countDiscount);
-  }, [activeVoucher, listVouchers]);
+  //   SetDiscountVoucher(countDiscount);
+  // }, [activeVoucher, listVouchers]);
 
-  useEffect(() => {
-    if (!listVoucherShippings) return;
-    if (!activeVoucherShipping) return;
+  // useEffect(() => {
+  //   if (!listVoucherShippings) return;
+  //   if (!activeVoucherShipping) return;
 
-    console.log('voucher shipping')
-    const countDiscount = hitungDiscountVoucher(activeVoucherShipping, 'voucher_shipping');
+  //   const countDiscount = hitungDiscountVoucher(activeVoucherShipping, 'voucher_shipping');
 
-    SetDiscountVoucher(countDiscount);
-  }, [activeVoucherShipping, listVoucherShippings]);
+  //   SetDiscountVoucherOngkir(countDiscount);
+  // }, [activeVoucherShipping, listVoucherShippings]);
 
   useEffect(() => {
     if (qVoucher === 'PASTIHEMAT' && listVouchers) {
@@ -553,6 +571,10 @@ const Checkout = () => {
 
   const finalShippingAmt = biayaKirim - discShippingAmt;
 
+  const totalDiscountVoucher =
+    cartCheckout?.discountVoucher +
+    (cartCheckout?.discountVoucherShipping || 0);
+
   return (
     <>
       <BottomPopup
@@ -663,6 +685,19 @@ const Checkout = () => {
           )}
 
           <hr className='mt-8 mb-4 border-gray_r-8' />
+          {/* {!loadingVoucher &&
+            listVouchers?.length === 1 &&
+            listVoucherShippings?.length === 1}
+          {
+            <div className='flex items-center justify-center mt-4 mb-4'>
+              <div className='text-center'>
+                <h1 className='font-bold mb-4'>Tidak ada voucher tersedia</h1>
+                <p className='text-gray-500'>
+                  Maaf, saat ini tidak ada voucher yang tersedia.
+                </p>
+              </div>
+            </div>
+          } */}
 
           {listVoucherShippings && listVoucherShippings?.length > 0 && (
             <div>
@@ -801,16 +836,7 @@ const Checkout = () => {
           <hr className='mt-8 mb-4 border-gray_r-8' />
 
           <div>
-            {!loadingVoucher && listVouchers?.length === 0 ? (
-              <div className='flex items-center justify-center mt-4 mb-4'>
-                <div className='text-center'>
-                  <h1 className='font-bold mb-4'>Tidak ada voucher tersedia</h1>
-                  <p className='text-gray-500'>
-                    Maaf, saat ini tidak ada voucher yang tersedia.
-                  </p>
-                </div>
-              </div>
-            ) : (
+            {loadingVoucher && listVouchers?.length > 0 && (
               <h3 className='font-semibold mb-4'>
                 Promo Khusus Untuk {auth?.name}
               </h3>
@@ -1074,7 +1100,12 @@ const Checkout = () => {
         <div className='p-4 flex flex-col gap-y-4'>
           {!!products &&
             snakecaseKeys(products).map((item, index) => (
-              <CartItem key={index} item={item} editable={false} selfPicking={selectedExpedisi === '1,32' ? true : false}/>
+              <CartItem
+                key={index}
+                item={item}
+                editable={false}
+                selfPicking={selectedExpedisi === '1,32' ? true : false}
+              />
             ))}
         </div>
 
@@ -1137,7 +1168,7 @@ const Checkout = () => {
                 <div className='flex gap-x-2 justify-between'>
                   <div className='text-gray_r-11'>Diskon Voucher</div>
                   <div className='text-danger-500'>
-                    - {currencyFormat(discountVoucher)}
+                    - {currencyFormat(cartCheckout?.discountVoucher)}
                   </div>
                 </div>
               )}
@@ -1365,7 +1396,12 @@ const Checkout = () => {
                 <div className='flex flex-col gap-y-8 border-t border-gray-300 pt-8'>
                   {!!products &&
                     snakecaseKeys(products).map((item, index) => (
-                      <CartItem key={index} item={item} editable={false} selfPicking={selectedExpedisi === '1,32' ? true : false} />
+                      <CartItem
+                        key={index}
+                        item={item}
+                        editable={false}
+                        selfPicking={selectedExpedisi === '1,32' ? true : false}
+                      />
                     ))}
                 </div>
               </div>
@@ -1432,7 +1468,7 @@ const Checkout = () => {
                       <div className='flex gap-x-2 justify-between'>
                         <div className='text-gray_r-11'>Diskon Voucher</div>
                         <div className='text-danger-500'>
-                          - {currencyFormat(discountVoucher)}
+                          - {currencyFormat(cartCheckout?.discountVoucher)}
                         </div>
                       </div>
                     )}
@@ -1501,10 +1537,10 @@ const Checkout = () => {
                           className='object-contain object-center h-6 w-full rounded-md'
                         />
                       </span>
-                      {activeVoucher ? (
+                      {activeVoucher || activeVoucherShipping ? (
                         <div className=''>
                           <div className='text-left text-sm text-black font-semibold'>
-                            Hemat {currencyFormat(discountVoucher)}
+                            Hemat {currencyFormat(totalDiscountVoucher)}
                           </div>
                           <div className='text-left mt-1 text-green-600 text-xs'>
                             Voucher berhasil digunakan
-- 
cgit v1.2.3


From 6786d929b549d10ed1abc11f42d31af84d91bd38 Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Wed, 28 Aug 2024 15:36:04 +0700
Subject: voucher

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

(limited to 'src')

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index 2e3d4e58..2d0f0f62 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -836,7 +836,7 @@ const Checkout = () => {
           <hr className='mt-8 mb-4 border-gray_r-8' />
 
           <div>
-            {loadingVoucher && listVouchers?.length > 0 && (
+            {!loadingVoucher && listVouchers?.length > 0 && (
               <h3 className='font-semibold mb-4'>
                 Promo Khusus Untuk {auth?.name}
               </h3>
-- 
cgit v1.2.3


From 3159d3a9772eb03231cb56730997b627a44d0a81 Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Wed, 28 Aug 2024 15:47:59 +0700
Subject: fixing error goole merhanct

---
 src/pages/google_merchant/products/[page].js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/pages/google_merchant/products/[page].js b/src/pages/google_merchant/products/[page].js
index 6e0eb703..80017f93 100644
--- a/src/pages/google_merchant/products/[page].js
+++ b/src/pages/google_merchant/products/[page].js
@@ -50,7 +50,7 @@ export async function getServerSideProps({ res, query }) {
     let categoryId = null;
 
     if (brandId && brandId in brandsData) {
-      categoryId = brandsData[brandId].category_ids?.[0] ?? null;
+      categoryId = brandsData[brandId]?.category_ids?.[0] ?? null;
     } else {
       const solrBrand = await getBrandById(brandId);
       brandsData[brandId] = solrBrand;
-- 
cgit v1.2.3


From 59327836c5e200e5eb474929f45e6e2a03eecfbe Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Wed, 28 Aug 2024 15:51:23 +0700
Subject: feedback renca

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

(limited to 'src')

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index 2d0f0f62..54acdf7c 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -701,7 +701,7 @@ const Checkout = () => {
 
           {listVoucherShippings && listVoucherShippings?.length > 0 && (
             <div>
-              <h3 className='font-semibold mb-4'>Promo Gratis Ongkir</h3>
+              <h3 className='font-semibold mb-4'>Promo Extra Potongan Ongkir</h3>
               {listVoucherShippings?.map((item) => (
                 <div key={item.id} className='relative'>
                   <div
-- 
cgit v1.2.3


From 425284d3aa2cff3b67316d1e83c9e2e8bc80ce58 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 28 Aug 2024 16:52:37 +0700
Subject: <iman> update code if no auth

---
 src/lib/treckingAwb/component/Manifest.jsx | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/lib/treckingAwb/component/Manifest.jsx b/src/lib/treckingAwb/component/Manifest.jsx
index cf2fa4ed..fbc95702 100644
--- a/src/lib/treckingAwb/component/Manifest.jsx
+++ b/src/lib/treckingAwb/component/Manifest.jsx
@@ -40,10 +40,18 @@ const Manifest = ({ idAWB, closePopup }) => {
   const getManifest = async () => {
     setIsLoading(true)
     const auth = getAuth()
-    const list = await odooApi(
-      'GET',
-      `/api/v1/partner/${auth.partnerId}/stock-picking/${idAWB}/tracking`
-    )
+    let list
+    if(auth){
+      list = await odooApi(
+        'GET',
+        `/api/v1/partner/${auth.partnerId}/stock-picking/${idAWB}/tracking`
+      )
+    }else{
+      list = await odooApi(
+        'GET',
+        `/api/v1/stock-picking/${idAWB}/tracking`
+      )
+    }
     setManifests(list)
     setIsLoading(false)
   }
-- 
cgit v1.2.3


From 2dff6fa7f787306aaaa5546d453fab17e4cbe811 Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Thu, 29 Aug 2024 09:02:15 +0700
Subject: bug fixing google merchants

---
 src/pages/google_merchant/products/[page].js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/pages/google_merchant/products/[page].js b/src/pages/google_merchant/products/[page].js
index 80017f93..0c2cf3c5 100644
--- a/src/pages/google_merchant/products/[page].js
+++ b/src/pages/google_merchant/products/[page].js
@@ -58,7 +58,7 @@ export async function getServerSideProps({ res, query }) {
     }
 
     if (categoryId && categoryId in categoriesData) {
-      categoryName = categoriesData[categoryId].name_s ?? null;
+      categoryName = categoriesData[categoryId]?.name_s ?? null;
     } else {
       const solrCategory = await getCategoryById(categoryId);
       categoriesData[categoryId] = solrCategory;
-- 
cgit v1.2.3


From fe7680a0018db9aa22cb15efd963a1cd0a8155c2 Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Thu, 29 Aug 2024 13:11:07 +0700
Subject: delete console log

---
 src/lib/checkout/api/getVoucher.js | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src')

diff --git a/src/lib/checkout/api/getVoucher.js b/src/lib/checkout/api/getVoucher.js
index ead4ffbe..779cef43 100644
--- a/src/lib/checkout/api/getVoucher.js
+++ b/src/lib/checkout/api/getVoucher.js
@@ -3,7 +3,6 @@ import { getAuth } from '@/core/utils/auth'
 
 export const getVoucher = async (id, query) => {
   const queryParam = new URLSearchParams(query);
-  console.log('ini params string',queryParam.toString())
   const url = `/api/v1/user/${id}/voucher?${queryParam.toString()}`;
   const dataVoucher = await odooApi('GET', url);
   return dataVoucher;
-- 
cgit v1.2.3


From a75f8676f71e83082088544349ecbf9b4fd80b61 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 29 Aug 2024 13:37:53 +0700
Subject: <iman> add my profile in dropdown

---
 src/core/components/elements/Navbar/NavbarUserDropdown.jsx | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/core/components/elements/Navbar/NavbarUserDropdown.jsx b/src/core/components/elements/Navbar/NavbarUserDropdown.jsx
index 42bdc12a..2a345341 100644
--- a/src/core/components/elements/Navbar/NavbarUserDropdown.jsx
+++ b/src/core/components/elements/Navbar/NavbarUserDropdown.jsx
@@ -23,6 +23,7 @@ const NavbarUserDropdown = () => {
         <Link href='/my/invoices'>Invoice & Faktur Pajak</Link>
         <Link href='/my/wishlist'>Wishlist</Link>
         <Link href='/my/address'>Daftar Alamat</Link>
+        <Link href='/my/profile'>Profil Saya</Link>
         {!atuh?.external &&
           <Link href='/my/recomendation'>Dashboard Recomendation</Link>
         }
-- 
cgit v1.2.3


From 266d123ea9a2516913aa6f72d8c5855aea99652c Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 29 Aug 2024 15:42:22 +0700
Subject: <iman> update navbar category link & change category dynamic to
 slider

---
 .../components/elements/Navbar/NavbarDesktop.jsx   |   5 +-
 src/lib/home/components/CategoryDynamic.jsx        | 130 ++++++++++++---------
 2 files changed, 78 insertions(+), 57 deletions(-)

(limited to 'src')

diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx
index 6c308f11..d3f53950 100644
--- a/src/core/components/elements/Navbar/NavbarDesktop.jsx
+++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx
@@ -225,8 +225,7 @@ const NavbarDesktop = () => {
 
         <div className='container mx-auto mt-6'>
           <div className='flex'>
-            <button
-              type='button'
+            <div
               onClick={() => setIsOpenCategory((isOpen) => !isOpen)}
               onBlur={() => setIsOpenCategory(false)}
               className='w-3/12 p-4 font-semibold border border-gray_r-6 rounded-t-xl flex items-center relative'
@@ -243,7 +242,7 @@ const NavbarDesktop = () => {
               >
                 <Category />
               </div>
-            </button>
+            </div>
             <div className='w-6/12 flex px-1 divide-x divide-gray_r-6'>
             
             <Link
diff --git a/src/lib/home/components/CategoryDynamic.jsx b/src/lib/home/components/CategoryDynamic.jsx
index b7798a24..7f8a4135 100644
--- a/src/lib/home/components/CategoryDynamic.jsx
+++ b/src/lib/home/components/CategoryDynamic.jsx
@@ -4,7 +4,12 @@ import NextImage from 'next/image';
 import Link from "next/link";
 import { createSlug } from '@/core/utils/slug';
 import odooApi from '@/core/api/odooApi';
-import { Skeleton} from '@chakra-ui/react'
+import { Skeleton } from '@chakra-ui/react';
+import { Swiper, SwiperSlide } from 'swiper/react';
+import 'swiper/css';
+import 'swiper/css/navigation';
+import 'swiper/css/pagination';
+import { Navigation, Pagination, Autoplay } from 'swiper';
 
 const CategoryDynamic = () => {
   const { categoryManagement } = useCategoryManagement();
@@ -34,6 +39,18 @@ const CategoryDynamic = () => {
 
     fetchCategoryData();
   }, [categoryManagement.isLoading]);
+
+  const swiperBanner = {
+    autoplay: {
+      delay: 6000,
+      disableOnInteraction: false,
+    },
+    modules: [Pagination, Autoplay],
+    loop: true, 
+    classNames:'mySwiper',
+    slidesPerView: 3,
+    spaceBetween:10, 
+  };
  
   return (
     <div>
@@ -42,64 +59,69 @@ const CategoryDynamic = () => {
           
           return (
             <Skeleton key={category.id} isLoaded={categoryManagement}>
-            <div key={category.id}>
-              <div className='bagian-judul flex flex-row justify-start items-center gap-3 mb-4 mt-4'>
-                <div className='font-semibold sm:text-h-lg mr-2'>{category.name}</div>
-                <Skeleton isLoaded={countLevel1 !=0}>
-                  <p className={`text-gray_r-10 text-sm`}>{countLevel1} Produk tersedia</p>
-                </Skeleton>
-                <Link href={createSlug('/shop/category/', category?.name, category?.categoryIdI)} className="!text-red-500 font-semibold">Lihat Semua</Link>
-              </div>
-              <div className='grid grid-cols-3 gap-2'>
-                {category.categories.map((subCategory) => {
-                  const countLevel2 = subCategoryData[subCategory.idLevel2] || 0;
+              <div key={category.id}>
+                <div className='bagian-judul flex flex-row justify-start items-center gap-3 mb-4 mt-4'>
+                  <div className='font-semibold sm:text-h-lg mr-2'>{category.name}</div>
+                  <Skeleton isLoaded={countLevel1 != 0}>
+                    <p className={`text-gray_r-10 text-sm`}>{countLevel1} Produk tersedia</p>
+                  </Skeleton>
+                  <Link href={createSlug('/shop/category/', category?.name, category?.categoryIdI)} className="!text-red-500 font-semibold">Lihat Semua</Link>
+                </div>
+                
+                {/* Swiper for SubCategories */}
+                <Swiper {...swiperBanner}
+                >
+                  {category.categories.map((subCategory) => {
+                    const countLevel2 = subCategoryData[subCategory.idLevel2] || 0;
 
-                  return (
-                    <div key={subCategory.id} className='border rounded justify-start items-start'>
-                      <div className='p-3'>
-                        <div className='flex flex-row border rounded mb-2 justify-start items-center'>
-                          <NextImage
-                            src={subCategory.image ? subCategory.image : "/images/noimage.jpeg"}
-                            alt={subCategory.name}
-                            width={90}
-                            height={30}
-                            className='object-fit'
-                          />
-                          <div className='bagian-judul flex flex-col justify-center items-start gap-2 ml-2'>
-                            <div className='font-semibold text-lg mr-2'>{subCategory.name}</div>
-                            <Skeleton isLoaded={countLevel2 != 0}>
-                            <p className={`text-gray_r-10 text-sm`}>
-                              {countLevel2} Produk tersedia
-                            </p>
-                            </Skeleton>
-                            <Link href={createSlug('/shop/category/', subCategory?.name, subCategory?.idLevel2)} className="!text-red-500 font-semibold">Lihat Semua</Link>
-                          </div>
-                        </div>
-                        <div className='grid grid-cols-2 gap-2 overflow-y-auto max-h-[240px]'>
-                          {subCategory.childFrontendIdI.map((childCategory) => (
-                            <div key={childCategory.id}>
-                              <Link href={createSlug('/shop/category/', childCategory?.name, childCategory?.idLevel3)} className="flex flex-row gap-2 border rounded group hover:border-red-500">
-                                <NextImage
-                                  src={childCategory.image ? childCategory.image : "/images/noimage.jpeg"}
-                                  alt={childCategory.name}
-                                  className='p-2 ml-1'
-                                  width={40}
-                                  height={40}
-                                />
-                                <div className='bagian-judul flex flex-col justify-center items-center gap-2 break-words line-clamp-2 group-hover:text-red-500'>
-                                  <div className='font-semibold line-clamp-2 group-hover:text-red-500 text-sm mr-2'>{childCategory.name}</div>
+                    return (
+                      <SwiperSlide key={subCategory.id}>
+                        <div className='border rounded justify-start items-start '>
+                          <div className='p-3'>
+                            <div className='flex flex-row border rounded mb-2 justify-start items-center'>
+                              <NextImage
+                                src={subCategory.image ? subCategory.image : "/images/noimage.jpeg"}
+                                alt={subCategory.name}
+                                width={90}
+                                height={30}
+                                className='object-fit'
+                              />
+                              <div className='bagian-judul flex flex-col justify-center items-start gap-2 ml-2'>
+                                <div className='font-semibold text-lg mr-2'>{subCategory.name}</div>
+                                <Skeleton isLoaded={countLevel2 != 0}>
+                                  <p className={`text-gray_r-10 text-sm`}>
+                                    {countLevel2} Produk tersedia
+                                  </p>
+                                </Skeleton>
+                                <Link href={createSlug('/shop/category/', subCategory?.name, subCategory?.idLevel2)} className="!text-red-500 font-semibold">Lihat Semua</Link>
+                              </div>
+                            </div>
+                            <div className='grid grid-cols-2 gap-2 overflow-y-auto max-h-[240px] min-h-[240px] content-start'>
+                              {subCategory.childFrontendIdI.map((childCategory) => (
+                                <div key={childCategory.id} className=''>
+                                  <Link href={createSlug('/shop/category/', childCategory?.name, childCategory?.idLevel3)} className="flex flex-row gap-2 border rounded group hover:border-red-500">
+                                    <NextImage
+                                      src={childCategory.image ? childCategory.image : "/images/noimage.jpeg"}
+                                      alt={childCategory.name}
+                                      className='p-2 ml-1'
+                                      width={40}
+                                      height={40}
+                                    />
+                                    <div className='bagian-judul flex flex-col justify-center items-center gap-2 break-words line-clamp-2 group-hover:text-red-500'>
+                                      <div className='font-semibold line-clamp-2 group-hover:text-red-500 text-sm mr-2'>{childCategory.name}</div>
+                                    </div>
+                                  </Link>
                                 </div>
-                              </Link>
+                              ))}
                             </div>
-                          ))}
+                          </div>
                         </div>
-                      </div>
-                    </div>
-                  );
-                })}
+                      </SwiperSlide>
+                    );
+                  })}
+                </Swiper>
               </div>
-            </div>
-          </Skeleton>
+            </Skeleton>
           );
         })}
     </div>
-- 
cgit v1.2.3


From 35c3eaad59dac0f0837dc43d5d4355c7e77803e5 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 29 Aug 2024 16:08:55 +0700
Subject: <iman> update mobile view

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

(limited to 'src')

diff --git a/src/lib/home/components/CategoryDynamicMobile.jsx b/src/lib/home/components/CategoryDynamicMobile.jsx
index c1433a2d..4d2fa0ec 100644
--- a/src/lib/home/components/CategoryDynamicMobile.jsx
+++ b/src/lib/home/components/CategoryDynamicMobile.jsx
@@ -59,7 +59,7 @@ const CategoryDynamicMobile = () => {
                         alt={index.name}
                         width={30}
                         height={30}
-                        className='object-'
+                        className=''
                       />
                       <div className='bagian-judul flex flex-col justify-center items-start gap-1 ml-2'>
                         <div className='font-semibold text-[10px] line-clamp-1'>{index.name}</div>
@@ -82,6 +82,7 @@ const CategoryDynamicMobile = () => {
                         alt={x.name}
                         width={40}
                         height={40}
+                        className='p-2'
                       />
                       <div className='bagian-judul flex flex-col justify-center items-start gap-1 break-words line-clamp-2 group-hover:text-red-500'>
                         <div className='font-semibold line-clamp-2 group-hover:text-red-500 text-[10px]'>{x.name}</div>
-- 
cgit v1.2.3


From 28691cd9eed9ea4480d978ae83a8a9424caf8ef4 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 29 Aug 2024 16:13:51 +0700
Subject: <iman> add pagintion

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

(limited to 'src')

diff --git a/src/lib/home/components/CategoryDynamic.jsx b/src/lib/home/components/CategoryDynamic.jsx
index 7f8a4135..48a60323 100644
--- a/src/lib/home/components/CategoryDynamic.jsx
+++ b/src/lib/home/components/CategoryDynamic.jsx
@@ -41,15 +41,15 @@ const CategoryDynamic = () => {
   }, [categoryManagement.isLoading]);
 
   const swiperBanner = {
-    autoplay: {
-      delay: 6000,
-      disableOnInteraction: false,
-    },
-    modules: [Pagination, Autoplay],
+    modules: [Pagination, ],
     loop: true, 
     classNames:'mySwiper',
     slidesPerView: 3,
     spaceBetween:10, 
+    pagination: {
+      dynamicBullets: true,
+      clickable: true,
+    }
   };
  
   return (
-- 
cgit v1.2.3


From 47c66a1c432feaf898e3285520dfa892d22d4ad2 Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Fri, 30 Aug 2024 10:25:04 +0700
Subject: search eenggin

---
 src/pages/api/shop/search.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index a19224df..61f5bf2d 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -65,6 +65,7 @@ export default async function handler(req, res) {
 
   let checkQ = q.trim().split(/[\s\+\-\!\(\)\{\}\[\]\^"~\*\?:\\\/]+/);
   let newQ = checkQ.length > 1 ? escapeSolrQuery(q) + '*' : escapeSolrQuery(q);
+  let excludeDescription = checkQ.map(term => `-description_t:"${term}"`).join(', ');
 
   let offset = (page - 1) * limit;
   let parameter = [
@@ -74,12 +75,12 @@ export default async function handler(req, res) {
     'indent=true',
     `facet.query=${escapeSolrQuery(q)}`,
     `q.op=${operation}`,
-    `q=name_s:${newQ}`,
+    `q=${newQ}`,
     'qf=name_s',
     `start=${parseInt(offset)}`,
     `rows=${limit}`,
     `sort=${paramOrderBy}`,
-    `fq=-publish_b:false, product_rating_f:[8 TO *], price_tier1_v2_f:[1 TO *]`,
+    `fq=-publish_b:false, product_rating_f:[8 TO *], price_tier1_v2_f:[1 TO *], ${excludeDescription}`,
   ];
 
   if (priceFrom > 0 || priceTo > 0) {
-- 
cgit v1.2.3


From cf3bcd1f3d1e0649204a786e9532a099772dad85 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Sat, 31 Aug 2024 09:42:34 +0700
Subject: <iman> update cart pop up

---
 src/core/components/elements/Navbar/NavbarDesktop.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx
index 0d0e8550..ff08a4a1 100644
--- a/src/core/components/elements/Navbar/NavbarDesktop.jsx
+++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx
@@ -136,7 +136,7 @@ const NavbarDesktop = () => {
     return () => {
       window.removeEventListener('localStorageChange', handleCartChange);
     };
-  }, []);
+  }, [transactions.data]);
 
   useEffect(() => {
     const handleQuotationChange = () => {
-- 
cgit v1.2.3


From a76376b74c02ee6875b68b6cfb59090a159df40a Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Sat, 31 Aug 2024 11:44:49 +0700
Subject: <iman> update new cart pop up

---
 src/core/components/elements/Navbar/NavbarDesktop.jsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx
index ff08a4a1..454202df 100644
--- a/src/core/components/elements/Navbar/NavbarDesktop.jsx
+++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx
@@ -32,6 +32,7 @@ import {
 } from '@chakra-ui/react';
 import style from "./style/NavbarDesktop.module.css";
 import useTransactions from '@/lib/transaction/hooks/useTransactions';
+import { useCartStore } from '~/modules/cart/stores/useCartStore';
 
 const Search = dynamic(() => import('./Search'), { ssr: false });
 const TopBanner = dynamic(() => import('./TopBanner'), { ssr: false });
@@ -46,7 +47,7 @@ const NavbarDesktop = () => {
   const [templateWA, setTemplateWA] = useState(null);
   const [payloadWA, setPayloadWa] = useState(null);
   const [urlPath, setUrlPath] = useState(null);
-
+  const { loadCart, cart, summary, updateCartItem } = useCartStore();
   const router = useRouter();
 
   const { product } = useProductContext();
@@ -136,7 +137,7 @@ const NavbarDesktop = () => {
     return () => {
       window.removeEventListener('localStorageChange', handleCartChange);
     };
-  }, [transactions.data]);
+  }, [transactions.data, cart]);
 
   useEffect(() => {
     const handleQuotationChange = () => {
-- 
cgit v1.2.3


From 702b5d9b6e215ad812fadaff3325e1e6164d3b24 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 2 Sep 2024 10:54:00 +0700
Subject: <iman> update pop up tambah keranjang

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

(limited to 'src')

diff --git a/src/lib/cart/components/Cartheader.jsx b/src/lib/cart/components/Cartheader.jsx
index 6967d180..ddb77c1f 100644
--- a/src/lib/cart/components/Cartheader.jsx
+++ b/src/lib/cart/components/Cartheader.jsx
@@ -48,7 +48,7 @@ const Cardheader = (cartCount) => {
     setIsloading(true)
     let cart = await getCartApi()
     setProductCart(cart)
-    setCountCart(cart.productTotal)
+    setCountCart(cart?.productTotal)
     setIsloading(false)
   }, [setProductCart, setIsloading])
 
-- 
cgit v1.2.3


From 58a8e3c000c6364f81e37a38f1cf6031b7430985 Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Mon, 2 Sep 2024 13:05:46 +0700
Subject: update

---
 src/pages/api/shop/search.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index 61f5bf2d..0227a7eb 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -75,12 +75,14 @@ export default async function handler(req, res) {
     'indent=true',
     `facet.query=${escapeSolrQuery(q)}`,
     `q.op=${operation}`,
-    `q=${newQ}`,
-    'qf=name_s',
+    `q=tool box`,
+    `defType=dismax`,
+    'qf=name_s^2, description_s, category_name, manufacture_name_s',
+    `mm=${checkQ.length}`,
     `start=${parseInt(offset)}`,
     `rows=${limit}`,
     `sort=${paramOrderBy}`,
-    `fq=-publish_b:false, product_rating_f:[8 TO *], price_tier1_v2_f:[1 TO *], ${excludeDescription}`,
+    `fq=-publish_b:false, product_rating_f:[8 TO *], price_tier1_v2_f:[1 TO *]`,
   ];
 
   if (priceFrom > 0 || priceTo > 0) {
-- 
cgit v1.2.3


From bf805f7da68891250a10d85d9206607de3cbfacf Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 2 Sep 2024 13:24:07 +0700
Subject: <iman> temp save update fetch data promotion program line

---
 src/lib/product/api/productSearchApi.js      |   2 +-
 src/lib/product/components/ProductSearch.jsx |   2 +-
 src/pages/api/shop/promo.js                  | 205 +++++++++++++++++++++++++++
 src/pages/shop/promo/[slug].tsx              |  67 ++++++---
 src/utils/solrMapping.js                     |  29 ++++
 5 files changed, 285 insertions(+), 20 deletions(-)
 create mode 100644 src/pages/api/shop/promo.js

(limited to 'src')

diff --git a/src/lib/product/api/productSearchApi.js b/src/lib/product/api/productSearchApi.js
index 1626b7b7..2f792fd4 100644
--- a/src/lib/product/api/productSearchApi.js
+++ b/src/lib/product/api/productSearchApi.js
@@ -3,7 +3,7 @@ import axios from 'axios'
 
 const productSearchApi = async ({ query, operation = 'AND' }) => {
   const dataProductSearch = await axios(
-    `${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/search?${query}&operation=${operation}`
+    `${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/promo?${query}&operation=${operation}`
   )
   return dataProductSearch.data
 }
diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index eaeac71a..1f083722 100644
--- a/src/lib/product/components/ProductSearch.jsx
+++ b/src/lib/product/components/ProductSearch.jsx
@@ -87,7 +87,7 @@ const ProductSearch = ({
     recurse(category);
     return ids;
   };
-  
+  console.log("queryFinal",queryFinal)
   useEffect(() => {
     if(prefixUrl.includes('category')){
       const ids = collectIds(dataCategoriesProduct);
diff --git a/src/pages/api/shop/promo.js b/src/pages/api/shop/promo.js
new file mode 100644
index 00000000..4b4c09b7
--- /dev/null
+++ b/src/pages/api/shop/promo.js
@@ -0,0 +1,205 @@
+import { map } from '@/utils/solrMapping';
+import axios from 'axios';
+import camelcaseObjectDeep from 'camelcase-object-deep';
+
+export default async function handler(req, res) {
+  console.log("req_iman",req)
+  const {
+    q = '*',
+    page = 1,
+    brand = '',
+    category = '',
+    priceFrom = 0,
+    priceTo = 0,
+    orderBy = '',
+    operation = 'AND',
+    fq = '',
+    limit = 30,
+  } = req.query;
+
+  let { stock = '' } = req.query;
+
+  let paramOrderBy = '';
+  switch (orderBy) {
+    case 'price-asc':
+      paramOrderBy += 'price_tier1_v2_f ASC';
+      break;
+    case 'price-desc':
+      paramOrderBy += 'price_tier1_v2_f DESC';
+      break;
+    case 'popular':
+      paramOrderBy += 'product_rating_f DESC, search_rank_i DESC,';
+      break;
+    case 'popular-weekly':
+      paramOrderBy += 'search_rank_weekly_i DESC';
+      break;
+    case 'stock':
+      paramOrderBy += 'product_rating_f DESC, stock_total_f DESC';
+      break;
+    case 'flashsale-price-asc':
+      paramOrderBy += 'flashsale_price_f ASC';
+      break;
+    default:
+      paramOrderBy += '';
+      break;
+  }
+  
+  let checkQ = q.trim().split(/[\s\+\-\!\(\)\{\}\[\]\^"~\*\?:\\\/]+/);
+  let newQ = checkQ.length > 1 ? escapeSolrQuery(q) + '*' : escapeSolrQuery(q);
+  
+  let offset = (page - 1) * limit;
+  let parameter = [
+    // 'facet.field=manufacture_name_s',
+    // 'facet.field=category_name',
+    'facet=true',
+    'indent=true',
+    // `facet.query=${escapeSolrQuery(q)}`,
+    `q.op=${operation}`,
+    `q=${newQ}`,
+    // 'qf=name_s',
+    `start=${parseInt(offset)}`,
+    `rows=${limit}`,
+    `sort=${paramOrderBy}`,
+    // `fq=-publish_b:false, product_rating_f:[8 TO *], price_tier1_v2_f:[1 TO *]`,
+  ];
+
+  if (priceFrom > 0 || priceTo > 0) {
+    parameter.push(
+      `fq=price_tier1_v2_f:[${priceFrom == '' ? '*' : priceFrom} TO ${
+        priceTo == '' ? '*' : priceTo
+      }]`
+    );
+  }
+
+  let { auth } = req.cookies;
+  if (auth) {
+    auth = JSON.parse(auth);
+    if (auth.feature.onlyReadyStock) stock = true;
+  }
+
+  if (brand)
+    parameter.push(
+      `fq=${brand
+        .split(',')
+        .map(
+          (manufacturer) =>
+            `manufacture_name:"${encodeURIComponent(manufacturer)}"`
+        )
+        .join(' OR ')}`
+    );
+  if (category)
+    parameter.push(
+      `fq=${category
+        .split(',')
+        .map((cat) => `category_name:"${encodeURIComponent(cat)}"`)
+        .join(' OR ')}`
+    );
+  // if (category) parameter.push(`fq=category_name:${capitalizeFirstLetter(category.replace(/,/g, ' OR '))}`)
+  if (stock) parameter.push(`fq=stock_total_f:{1 TO *}`);
+
+  // Single fq in url params
+  if (typeof fq === 'string') parameter.push(`fq=${fq}`);
+  // Multi fq in url params
+  if (Array.isArray(fq))
+    parameter = parameter.concat(fq.map((val) => `fq=${val}`));
+
+  console.log("parameter",parameter)
+  
+  let result = await axios(
+    process.env.SOLR_HOST + '/solr/promotion_program_lines/select?' + parameter.join('&')
+  );
+  console.log("result",result)
+  try {
+    result.data.response.products = map(
+      result.data.response.docs,
+      auth?.pricelist || false
+    );
+    result.data.responseHeader.params.start = parseInt(
+      result.data.responseHeader.params.start
+    );
+    result.data.responseHeader.params.rows = parseInt(
+      result.data.responseHeader.params.rows
+    );
+    delete result.data.response.docs;
+    result.data = camelcaseObjectDeep(result.data);
+    res.status(200).json(result.data);
+  } catch (error) {
+    res.status(400).json({ error: error.message });
+  }
+}
+
+const escapeSolrQuery = (query) => {
+  if (query == '*') return query;
+  
+  query = query.replace(/-/g, ' ');
+
+  const specialChars = /([\+\!\(\)\{\}\[\]\^"~\*\?:\\\/])/g;
+  const words = query.split(/\s+/);
+  const escapedWords = words.map((word) => {
+    if (specialChars.test(word)) {
+      return word.replace(specialChars, '\\$1');
+    }
+    return word;
+  });
+
+  return escapedWords.join(' ');
+};
+
+
+/*const productResponseMap = (products, pricelist) => {
+  return products.map((product) => {
+    let price = product.price_tier1_v2_f || 0
+    let priceDiscount = product.price_discount_f || 0
+    let discountPercentage = product.discount_f || 0
+
+    if (pricelist) {
+      // const pricelistDiscount = product?.[`price_${pricelist}_f`] || false
+      // const pricelistDiscountPerc = product?.[`discount_${pricelist}_f`] || false
+
+      // if (pricelistDiscount && pricelistDiscount > 0) priceDiscount = pricelistDiscount
+      // if (pricelistDiscountPerc && pricelistDiscountPerc > 0)
+      //   discountPercentage = pricelistDiscountPerc
+
+      price = product?.[`price_${pricelist}_f`] || 0
+    }
+
+    if (product?.flashsale_id_i > 0) {
+      price = product?.flashsale_base_price_f || 0
+      priceDiscount = product?.flashsale_price_f || 0
+      discountPercentage = product?.flashsale_discount_f || 0
+    }
+
+    let productMapped = {
+      id: product.product_id_i || '',
+      image: product.image_s || '',
+      code: product.default_code_s || '',
+      name: product.name_s || '',
+      lowestPrice: { price, priceDiscount, discountPercentage },
+      variantTotal: product.variant_total_i || 0,
+      stockTotal: product.stock_total_f || 0,
+      weight: product.weight_f || 0,
+      manufacture: {},
+      categories: [],
+      flashSale: {
+        id: product?.flashsale_id_i,
+        name: product?.product?.flashsale_name_s,
+        tag : product?.flashsale_tag_s || 'FLASH SALE'
+      }
+    }
+
+    if (product.manufacture_id_i && product.manufacture_name_s) {
+      productMapped.manufacture = {
+        id: product.manufacture_id_i || '',
+        name: product.manufacture_name_s || ''
+      }
+    }
+
+    productMapped.categories = [
+      {
+        id: product.category_id_i || '',
+        name: product.category_name_s || ''
+      }
+    ]
+    return productMapped
+  })
+}*/
diff --git a/src/pages/shop/promo/[slug].tsx b/src/pages/shop/promo/[slug].tsx
index aaee1249..92f5b7f8 100644
--- a/src/pages/shop/promo/[slug].tsx
+++ b/src/pages/shop/promo/[slug].tsx
@@ -2,30 +2,31 @@ import dynamic from 'next/dynamic'
 import NextImage from 'next/image';
 import { useEffect, useState } from 'react'
 import { useRouter } from 'next/router'
-import Seo from '../../../core/components/Seo'
-import Promocrumb from '../../../lib/promo/components/Promocrumb'
-import { fetchPromoItemsSolr, fetchVariantSolr } from '../../../api/promoApi'
+import Seo from '../../../core/components/Seo.jsx'
+import Promocrumb from '../../../lib/promo/components/Promocrumb.jsx'
+import { fetchPromoItemsSolr, fetchVariantSolr } from '../../../api/promoApi.js'
 import LogoSpinner from '../../../core/components/elements/Spinner/LogoSpinner.jsx'
-import ProductPromoCard from '../../../../src-migrate/modules/product-promo/components/Card'
-import { IPromotion } from '../../../../src-migrate/types/promotion'
+import ProductPromoCard from '../../../../src-migrate/modules/product-promo/components/Card.tsx'
+import { IPromotion } from '../../../../src-migrate/types/promotion.ts'
 import React from 'react'
 import { SolrResponse } from "../../../../src-migrate/types/solr.ts";
-import DesktopView from '../../../core/components/views/DesktopView';
-import MobileView from '../../../core/components/views/MobileView';
+import DesktopView from '../../../core/components/views/DesktopView.jsx';
+import MobileView from '../../../core/components/views/MobileView.jsx';
 import 'swiper/swiper-bundle.css';
-import useDevice from '../../../core/hooks/useDevice'
-import ProductFilterDesktop from '../../../lib/product/components/ProductFilterDesktopPromotion';
-import ProductFilter from '../../../lib/product/components/ProductFilter';
+import useDevice from '../../../core/hooks/useDevice.js'
+import ProductFilterDesktop from '../../../lib/product/components/ProductFilterDesktopPromotion.jsx';
+import ProductFilter from '../../../lib/product/components/ProductFilter.jsx';
 import { HStack, Image, Tag, TagCloseButton, TagLabel } from '@chakra-ui/react';
-import { formatCurrency } from '../../../core/utils/formatValue';
-import Pagination from '../../../core/components/elements/Pagination/Pagination';
-import SideBanner from '../../../../src-migrate/modules/side-banner';
-import whatsappUrl from '../../../core/utils/whatsappUrl';
+import { formatCurrency } from '../../../core/utils/formatValue.js';
+import Pagination from '../../../core/components/elements/Pagination/Pagination.js';
+import SideBanner from '../../../../src-migrate/modules/side-banner/index.tsx';
+import whatsappUrl from '../../../core/utils/whatsappUrl.js';
 import { cons, toQuery } from 'lodash-contrib';
 import _ from 'lodash';
-import useActive from '../../../core/hooks/useActive';
+import useActive from '../../../core/hooks/useActive.js';
+import useProductSearch from '../../../lib/product/hooks/useProductSearch.js';
 
-const BasicLayout = dynamic(() => import('../../../core/components/layouts/BasicLayout'))
+const BasicLayout = dynamic(() => import('../../../core/components/layouts/BasicLayout.jsx'))
 
 export default function PromoDetail() {
   const router = useRouter()
@@ -40,9 +41,39 @@ export default function PromoDetail() {
   const [categories, setCategories] = useState<Category[]>([]);
   const [brandValues, setBrandValues] = useState<string[]>([]);
   const [categoryValues, setCategoryValues] = useState<string[]>([]);
-  const [orderBy, setOrderBy] = useState(router.query?.orderBy || 'popular');
+  const [orderBy, setOrderBy] = useState(router.query?.orderBy);
   const popup = useActive();
   const prefixUrl = `/shop/promo/${slug}`
+  const [queryFinal, setQueryFinal] = useState({});
+  const [limit, setLimit] = useState<number>(30);
+  const [q, setQ] = useState('**');
+  const [finalQuery, setFinalQuery] = useState({fq: `type_value_s:${slug}`});
+  const [products, setProducts] = useState(null);
+  useEffect(() => {
+    setQueryFinal({ ...finalQuery, q, limit, orderBy });
+}, [router.query, prefixUrl, slug, brand, category, priceFrom, priceTo, currentPage]);
+  useEffect(() => {
+      setQueryFinal({ ...finalQuery, q, limit, orderBy });
+  }, [router.query, prefixUrl, slug, brand, category, priceFrom, priceTo, currentPage]);
+
+  const { productSearch } = useProductSearch({
+    query: queryFinal,
+    operation: 'OR',
+  });
+
+  console.log("productSearch",productSearch)
+  console.log("queryFinal",queryFinal)
+
+  const pageCount = Math.ceil(productSearch.data?.response.numFound / limit);
+  const productStart = productSearch.data?.responseHeader.params.start;
+  const productRows = limit;
+  const productFound = productSearch.data?.response.numFound;
+
+  useEffect(() => {
+    setProducts(productSearch.data?.response?.products);
+  }, [productSearch]);
+
+  console.log("products",products)
 
   useEffect(() => {
     if (router.query.brand) {
@@ -91,7 +122,7 @@ export default function PromoDetail() {
       setCurrentPage(pageNumber)
       
       try {
-        const items = await fetchPromoItemsSolr(`type_value_s:${Array.isArray(slug) ? slug[0] : slug}`,0,100);
+        const items = await fetchPromoItemsSolr(`type_value_s:${Array.isArray(slug) ? slug[0] : slug}`,0,10);
         setPromoItems(items);
         
         if (items.length === 0) {
diff --git a/src/utils/solrMapping.js b/src/utils/solrMapping.js
index fee474be..e93b0b54 100644
--- a/src/utils/solrMapping.js
+++ b/src/utils/solrMapping.js
@@ -1,3 +1,31 @@
+const map = (promotions) => {
+  const result = [];
+  for (const promotion of promotions) {
+    const data = {
+      id: promotion.id,
+      program_id: promotion.program_id_i,
+      name: promotion.name_s,
+      type: {
+        value: promotion.type_value_s,
+        label: promotion.type_label_s,
+      },
+      limit: promotion.package_limit_i,
+      limit_user: promotion.package_limit_user_i,
+      limit_trx: promotion.package_limit_trx_i,
+      price: promotion.price_f,
+      sequence: promotion.sequence_i,
+      total_qty: promotion.total_qty_i,
+      products: JSON.parse(promotion.products_s),
+      product_id: promotion.product_ids[0],
+      qty_sold_f:promotion.total_qty_sold_f,
+      free_products: JSON.parse(promotion.free_products_s),
+    };
+    result.push(data);
+  }
+  return result;
+};
+
+
 export const productMappingSolr = (products, pricelist) => {
   return products.map((product) => {
     let price = product.price_tier1_v2_f || 0;
@@ -123,3 +151,4 @@ const flashsaleTime = (endDate) => {
     isFlashSale: flashsaleEndDate > currentTime,
   };
 };
+
-- 
cgit v1.2.3


From 4710e3573a8af2f38f03f8da4a2ab9d7f3115415 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 2 Sep 2024 13:38:56 +0700
Subject: <iman> delete fungsi loop

---
 src/lib/home/components/CategoryDynamic.jsx | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/lib/home/components/CategoryDynamic.jsx b/src/lib/home/components/CategoryDynamic.jsx
index 48a60323..0ab9312a 100644
--- a/src/lib/home/components/CategoryDynamic.jsx
+++ b/src/lib/home/components/CategoryDynamic.jsx
@@ -27,8 +27,8 @@ const CategoryDynamic = () => {
           
           updatedCategoryData[category.categoryIdI] = countLevel1?.numFound;
           
-          for (const subCategory of countLevel1.children) {
-            updatedSubCategoryData[subCategory.id] = subCategory.numFound;
+          for (const subCategory of countLevel1?.children) {
+            updatedSubCategoryData[subCategory.id] = subCategory?.numFound;
           }
         }
 
@@ -42,7 +42,6 @@ const CategoryDynamic = () => {
 
   const swiperBanner = {
     modules: [Pagination, ],
-    loop: true, 
     classNames:'mySwiper',
     slidesPerView: 3,
     spaceBetween:10, 
@@ -84,10 +83,10 @@ const CategoryDynamic = () => {
                                 alt={subCategory.name}
                                 width={90}
                                 height={30}
-                                className='object-fit'
+                                className='object-fit p-4'
                               />
                               <div className='bagian-judul flex flex-col justify-center items-start gap-2 ml-2'>
-                                <div className='font-semibold text-lg mr-2'>{subCategory.name}</div>
+                                <div className='font-semibold text-lg mr-2'>{subCategory?.name}</div>
                                 <Skeleton isLoaded={countLevel2 != 0}>
                                   <p className={`text-gray_r-10 text-sm`}>
                                     {countLevel2} Produk tersedia
-- 
cgit v1.2.3


From 3f384749fe51a2763e7e99351f36ce70954afb7a Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 2 Sep 2024 14:40:34 +0700
Subject: <iman> temp save

---
 src/lib/product/api/productSearchApi.js |   2 +-
 src/pages/api/shop/promo.js             |   7 +-
 src/pages/shop/promo/[slug].jsx         | 550 +++++++++++++++++++++++++++++++
 src/pages/shop/promo/[slug].tsx         | 554 --------------------------------
 src/utils/solrMapping.js                |   2 +-
 5 files changed, 556 insertions(+), 559 deletions(-)
 create mode 100644 src/pages/shop/promo/[slug].jsx
 delete mode 100644 src/pages/shop/promo/[slug].tsx

(limited to 'src')

diff --git a/src/lib/product/api/productSearchApi.js b/src/lib/product/api/productSearchApi.js
index 2f792fd4..670661aa 100644
--- a/src/lib/product/api/productSearchApi.js
+++ b/src/lib/product/api/productSearchApi.js
@@ -1,7 +1,7 @@
 import _ from 'lodash-contrib'
 import axios from 'axios'
 
-const productSearchApi = async ({ query, operation = 'AND' }) => {
+const productSearchApi = async ({ query, operation = 'OR' }) => {
   const dataProductSearch = await axios(
     `${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/promo?${query}&operation=${operation}`
   )
diff --git a/src/pages/api/shop/promo.js b/src/pages/api/shop/promo.js
index 4b4c09b7..353ff3df 100644
--- a/src/pages/api/shop/promo.js
+++ b/src/pages/api/shop/promo.js
@@ -1,4 +1,4 @@
-import { map } from '@/utils/solrMapping';
+import { productMappingSolr, promoMappingSolr } from '@/utils/solrMapping';
 import axios from 'axios';
 import camelcaseObjectDeep from 'camelcase-object-deep';
 
@@ -55,7 +55,7 @@ export default async function handler(req, res) {
     'indent=true',
     // `facet.query=${escapeSolrQuery(q)}`,
     `q.op=${operation}`,
-    `q=${newQ}`,
+    `q=${q}`,
     // 'qf=name_s',
     `start=${parseInt(offset)}`,
     `rows=${limit}`,
@@ -110,7 +110,7 @@ export default async function handler(req, res) {
   );
   console.log("result",result)
   try {
-    result.data.response.products = map(
+    result.data.response.products = promoMappingSolr(
       result.data.response.docs,
       auth?.pricelist || false
     );
@@ -121,6 +121,7 @@ export default async function handler(req, res) {
       result.data.responseHeader.params.rows
     );
     delete result.data.response.docs;
+    console.log("result.data",result.data)
     result.data = camelcaseObjectDeep(result.data);
     res.status(200).json(result.data);
   } catch (error) {
diff --git a/src/pages/shop/promo/[slug].jsx b/src/pages/shop/promo/[slug].jsx
new file mode 100644
index 00000000..544286f9
--- /dev/null
+++ b/src/pages/shop/promo/[slug].jsx
@@ -0,0 +1,550 @@
+import dynamic from 'next/dynamic'
+import NextImage from 'next/image';
+import { useEffect, useState } from 'react'
+import { useRouter } from 'next/router'
+import Seo from '../../../core/components/Seo.jsx'
+import Promocrumb from '../../../lib/promo/components/Promocrumb.jsx'
+import { fetchPromoItemsSolr, fetchVariantSolr } from '../../../api/promoApi.js'
+import LogoSpinner from '../../../core/components/elements/Spinner/LogoSpinner.jsx'
+import ProductPromoCard from '../../../../src-migrate/modules/product-promo/components/Card.tsx'
+import { IPromotion } from '../../../../src-migrate/types/promotion.ts'
+import React from 'react'
+import { SolrResponse } from "../../../../src-migrate/types/solr.ts";
+import DesktopView from '../../../core/components/views/DesktopView.jsx';
+import MobileView from '../../../core/components/views/MobileView.jsx';
+import 'swiper/swiper-bundle.css';
+import useDevice from '../../../core/hooks/useDevice.js'
+import ProductFilterDesktop from '../../../lib/product/components/ProductFilterDesktopPromotion.jsx';
+import ProductFilter from '../../../lib/product/components/ProductFilter.jsx';
+import { HStack, Image, Tag, TagCloseButton, TagLabel } from '@chakra-ui/react';
+import { formatCurrency } from '../../../core/utils/formatValue.js';
+import Pagination from '../../../core/components/elements/Pagination/Pagination.js';
+import SideBanner from '../../../../src-migrate/modules/side-banner/index.tsx';
+import whatsappUrl from '../../../core/utils/whatsappUrl.js';
+import { cons, toQuery } from 'lodash-contrib';
+import _ from 'lodash';
+import useActive from '../../../core/hooks/useActive.js';
+import useProductSearch from '../../../lib/product/hooks/useProductSearch.js';
+
+const BasicLayout = dynamic(() => import('../../../core/components/layouts/BasicLayout.jsx'))
+
+export default function PromoDetail() {
+  const router = useRouter()
+  const { slug = '', brand ='', category='', priceFrom = '', priceTo = '', page = '1' } = router.query
+  const [promoItems, setPromoItems] = useState([])
+  const [promoData, setPromoData] = useState(null)
+  const [currentPage, setCurrentPage] = useState(parseInt(10) || 1);
+  const itemsPerPage = 12; // Jumlah item yang ingin ditampilkan per halaman
+  const [loading, setLoading] = useState(true);
+  const { isMobile, isDesktop } = useDevice()
+  const [brands, setBrands] = useState([]);
+  const [categories, setCategories] = useState([]);
+  const [brandValues, setBrandValues] = useState([]);
+  const [categoryValues, setCategoryValues] = useState([]);
+  const [orderBy, setOrderBy] = useState(router.query?.orderBy);
+  const popup = useActive();
+  const prefixUrl = `/shop/promo/${slug}`
+  const [queryFinal, setQueryFinal] = useState({});
+  const [limit, setLimit] = useState<number>(30);
+  const [q, setQ] = useState('*');
+  const [finalQuery, setFinalQuery] = useState({fq: `type_value_s:${slug}`});
+  const [products, setProducts] = useState(null);
+  useEffect(() => {
+    setQueryFinal({ ...finalQuery, q, limit, orderBy });
+}, [router.query, prefixUrl, slug, brand, category, priceFrom, priceTo, currentPage]);
+  useEffect(() => {
+      setQueryFinal({ ...finalQuery, q, limit, orderBy });
+  }, [router.query, prefixUrl, slug, brand, category, priceFrom, priceTo, currentPage]);
+
+  const { productSearch } = useProductSearch({
+    query: queryFinal,
+    operation: 'OR',
+  });
+
+  console.log("productSearch",productSearch)
+  console.log("queryFinal",queryFinal)
+
+  const pageCount = Math.ceil(productSearch.data?.response.numFound / limit);
+  const productStart = productSearch.data?.responseHeader.params.start;
+  const productRows = limit;
+  const productFound = productSearch.data?.response.numFound;
+
+  useEffect(() => {
+    setProducts(productSearch.data?.response?.products);
+  }, [productSearch]);
+
+  console.log("products",products)
+
+
+
+
+
+
+
+  useEffect(() => {
+    if (router.query.brand) {
+      let brandsArray= [];
+      if (Array.isArray(router.query.brand)) {
+        brandsArray = router.query.brand;
+      } else if (typeof router.query.brand === 'string') {
+        brandsArray = router.query.brand.split(',').map((brand) => brand.trim());
+      }
+      setBrandValues(brandsArray);
+    } else {
+      setBrandValues([]);
+    }
+
+    if (router.query.category) {
+      let categoriesArray= [];
+
+      if (Array.isArray(router.query.category)) {
+        categoriesArray = router.query.category;
+      } else if (typeof router.query.category === 'string') {
+        categoriesArray = router.query.category.split(',').map((category) => category.trim());
+      }
+      setCategoryValues(categoriesArray);
+    } else {
+      setCategoryValues([]);
+    }
+  }, [router.query.brand, router.query.category]);
+
+  useEffect(() => {
+    const loadPromo = async () => {
+      setLoading(true);
+      const brandsData = [];
+      const categoriesData= [];
+      
+      const pageNumber = Array.isArray(page) ? parseInt(page[0], 10) : parseInt(page, 10);
+      setCurrentPage(pageNumber)
+      
+      try {
+        const items = await fetchPromoItemsSolr(`type_value_s:${Array.isArray(slug) ? slug[0] : slug}`,0,10);
+        setPromoItems(items);
+        
+        if (items.length === 0) {
+          setPromoData([])
+          setLoading(false);
+          return;
+          }
+          
+          const brandArray = Array.isArray(brand) ? brand : brand.split(',');
+          const categoryArray = Array.isArray(category) ? category : category.split(',');
+          
+          const promoDataPromises = items.map(async (item) => {
+            
+            try { 
+              let brandQuery = '';
+              if (brand) {
+                brandQuery = brandArray.map(b => `manufacture_name_s:${b}`).join(' OR ');
+                brandQuery = `(${brandQuery})`;
+              }
+  
+              let categoryQuery = '';
+              if (category) {
+                categoryQuery = categoryArray.map(c => `category_name:${c}`).join(' OR ');
+                categoryQuery = `(${categoryQuery})`;
+              }
+  
+              let priceQuery = '';
+              if (priceFrom && priceTo) {
+                priceQuery = `price_f:[${priceFrom} TO ${priceTo}]`;
+              } else if (priceFrom) {
+                priceQuery = `price_f:[${priceFrom} TO *]`;
+              } else if (priceTo) {
+                priceQuery = `price_f:[* TO ${priceTo}]`;
+              }
+  
+              let combinedQuery = '';
+              let combinedQueryPrice = `${priceQuery}`;
+              if (brand && category && priceFrom || priceTo) {
+                combinedQuery = `${brandQuery} AND ${categoryQuery} `;
+              } else if (brand && category) {
+                combinedQuery = `${brandQuery} AND ${categoryQuery}`;
+              } else if (brand && priceFrom || priceTo) {
+                combinedQuery = `${brandQuery}`;
+              } else if (category && priceFrom || priceTo) {
+                combinedQuery = `${categoryQuery}`;
+              } else if (brand) {
+                combinedQuery = brandQuery;
+              } else if (category) {
+                combinedQuery = categoryQuery;
+              }
+  
+              if (combinedQuery && priceFrom || priceTo) {
+                const response = await fetchVariantSolr(`id:${item.product_id} AND ${combinedQuery}`);
+                const product = response.response.docs[0];
+                const product_id = product.id;
+                const response2 = await fetchPromoItemsSolr(`type_value_s:${Array.isArray(slug) ? slug[0] : slug} AND product_ids:${product_id} AND ${combinedQueryPrice}`,0,100);  
+                return response2;
+              }else if(combinedQuery){
+                const response = await fetchVariantSolr(`id:${item.product_id} AND ${combinedQuery}`);
+                const product = response.response.docs[0];
+                const product_id = product.id;
+                const response2 = await fetchPromoItemsSolr(`type_value_s:${Array.isArray(slug) ? slug[0] : slug} AND product_ids:${product_id} `,0,100); 
+                return response2;
+              } else {
+                const response = await fetchPromoItemsSolr(`id:${item.id}`,0,100);
+                return response;
+              }
+            } catch (fetchError) {
+              return [];
+            }
+          });
+
+        const promoDataArray = await Promise.all(promoDataPromises);
+        const mergedPromoData = promoDataArray.reduce((accumulator, currentValue) => accumulator.concat(currentValue), []);
+        setPromoData(mergedPromoData);
+
+        const dataBrandCategoryPromises = promoDataArray.map(async (promoData) => {
+          if (promoData) {
+            const dataBrandCategory = promoData.map(async (item) => {
+              let response;
+              if(category){
+                const categoryQuery = categoryArray.map(c => `category_name:${c}`).join(' OR ');
+                response = await fetchVariantSolr(`id:${item.products[0].product_id} AND (${categoryQuery})`);
+              }else{
+                response = await fetchVariantSolr(`id:${item.products[0].product_id}`)    
+              }
+              
+
+              if (response.response?.docs?.length > 0) {
+                const product = response.response.docs[0];
+                const manufactureNameS = product.manufacture_name;
+                if (Array.isArray(manufactureNameS)) {
+                  for (let i = 0; i < manufactureNameS.length; i += 2) {
+                    const brand = manufactureNameS[i];
+                    const qty = 1;
+                    const existingBrandIndex = brandsData.findIndex(b => b.brand === brand);
+                    if (existingBrandIndex !== -1) {
+                      brandsData[existingBrandIndex].qty += qty;
+                    } else {
+                      brandsData.push({ brand, qty });
+                    }
+                  }
+                }
+
+                const categoryNameS = product.category_name;
+                if (Array.isArray(categoryNameS)) {
+                  for (let i = 0; i < categoryNameS.length; i += 2) {
+                    const name = categoryNameS[i];
+                    const qty = 1;
+                    const existingCategoryIndex = categoriesData.findIndex(c => c.name === name);
+                    if (existingCategoryIndex !== -1) {
+                      categoriesData[existingCategoryIndex].qty += qty;
+                    } else {
+                      categoriesData.push({ name, qty });
+                    }
+                  }
+                }
+              }
+            });
+
+            return Promise.all(dataBrandCategory);
+          }
+        });
+
+        await Promise.all(dataBrandCategoryPromises);
+        setBrands(brandsData);
+        setCategories(categoriesData);
+        setLoading(false);
+
+      } catch (loadError) {
+        // console.error("Error loading promo items:", loadError)
+        setLoading(false);
+      }
+    }
+
+    if (slug) {
+      loadPromo()
+    }
+  },[slug, brand, category, priceFrom, priceTo, currentPage]);
+
+
+  function capitalizeFirstLetter(string) {
+    string = string.replace(/_/g, ' ');
+    return string.replace(/(^\w|\s\w)/g, function(match) {
+        return match.toUpperCase();
+    });
+  }
+
+  const handleDeleteFilter = async (source, value) => {
+    let params = {
+      q: router.query.q,
+      orderBy: '',
+      brand: brandValues.join(','),
+      category: categoryValues.join(','),
+      priceFrom: priceFrom || '',
+      priceTo: priceTo || '',
+    };
+
+    let brands = brandValues;
+    let catagories = categoryValues;
+    switch (source) {
+      case 'brands':
+        brands = brandValues.filter((item) => item !== value);
+        params.brand = brands.join(',');
+        await setBrandValues(brands);
+        break;
+      case 'category':
+        catagories = categoryValues.filter((item) => item !== value);
+        params.category = catagories.join(',');
+        await setCategoryValues(catagories);
+        break;
+      case 'price':
+        params.priceFrom = '';
+      params.priceTo = '';    
+      break;
+      case 'delete':
+        params = {
+          q: router.query.q,
+          orderBy: '',
+          brand: '',
+          category: '',
+          priceFrom: '',
+          priceTo: '',
+        };
+        break;
+    }
+
+    handleSubmitFilter(params);
+  };
+  const handleSubmitFilter = (params) => {
+    params = _.pickBy(params, _.identity);
+    params = toQuery(params);
+    router.push(`${slug}?${params}`);
+  };
+ 
+  const visiblePromotions = promoData?.slice( (currentPage-1) * itemsPerPage, currentPage * 12)
+
+  const toQuery = (obj) => {
+    const str = Object.keys(obj)
+      .map(key => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`)
+      .join('&')
+    return str
+  }
+ 
+  const whatPromo = capitalizeFirstLetter(slug)
+  const queryWithoutSlug = _.omit(router.query, ['slug'])
+  const queryString = toQuery(queryWithoutSlug)
+  
+  return (
+    <BasicLayout>
+      <Seo
+        title={`Promo ${Array.isArray(slug) ? slug[0] : slug} Terkini`} 
+        description='B2B Marketplace MRO & Industri dengan Layanan Pembayaran Tempo, Faktur Pajak, Online Quotation, Garansi Resmi & Harga Kompetitif'
+      />
+      <Promocrumb brandName={whatPromo} />
+      <MobileView>
+        <div className='p-4 pt-0'>
+          <h1 className='mb-2 font-semibold text-h-sm'>Promo {whatPromo}</h1>
+      
+            <FilterChoicesComponent
+                  brandValues={brandValues}
+                  categoryValues={categoryValues}
+                  priceFrom={priceFrom}
+                  priceTo={priceTo}
+                  handleDeleteFilter={handleDeleteFilter}
+                />
+            {promoItems.length >= 1 && (
+            <div className='flex items-center gap-x-2 mb-5 justify-between'>
+              <div>
+                <button
+                  className='btn-light py-2 px-5 h-[40px]'
+                  onClick={popup.activate}
+                >
+                  Filter
+                </button>
+              </div>
+            </div>
+          )}
+          
+          {loading ? (
+                <div className='container flex justify-center my-4'>
+                  <LogoSpinner width={48} height={48} />
+                </div>
+              ) : promoData && promoItems.length >= 1 ? (
+                <>
+                <div className='grid grid-cols-1 gap-x-1 gap-y-1'>
+                  {visiblePromotions?.map((promotion) => (
+                    <div key={promotion.id} className="min-w-36 max-w-[400px] mb-[20px] sm:w-full md:w-1/2 lg:w-1/3 xl:w-1/4 ">
+                      <ProductPromoCard promotion={promotion}/>
+                    </div>
+                  ))}
+                </div>
+              </>
+              ) : (
+                <div className="text-center my-8">
+                  <p>Belum ada promo pada kategori ini</p>
+                </div>
+              )}  
+
+              <Pagination
+                  pageCount={Math.ceil((promoData?.length ?? 0) / itemsPerPage)}
+                  currentPage={currentPage}
+                  url={`${prefixUrl}?${toQuery(_.omit(queryWithoutSlug, ['page']))}`}
+                  className='mt-6 mb-2'
+                />
+              <ProductFilter
+                active={popup.active}
+                close={popup.deactivate}
+                brands={brands || []}
+                categories={categories || []}
+                prefixUrl={router.asPath.includes('?') ? `${router.asPath}` : `${router.asPath}?`}
+                defaultBrand={null}
+              />
+        </div>
+
+      </MobileView>
+      <DesktopView>
+        <div className='container mx-auto flex mb-3 flex-col'>
+          <div className='w-full pl-6'>
+            <h1 className='text-2xl mb-2 font-semibold'>Promo {whatPromo}</h1>
+              <div className=' w-full h-full flex flex-row items-center '>
+                
+                    <div className='detail-filter w-1/2 flex justify-start items-center  mt-4'>
+
+                  <FilterChoicesComponent
+                    brandValues={brandValues}
+                    categoryValues={categoryValues}
+                    priceFrom={priceFrom}
+                    priceTo={priceTo}
+                    handleDeleteFilter={handleDeleteFilter}
+                  />
+                    </div>
+                    <div className='Filter w-1/2 flex flex-col'>
+
+                    <ProductFilterDesktop
+                          brands={brands || []}
+                          categories={categories || []}  
+                          prefixUrl={'/shop/promo'}
+                          // defaultBrand={null}
+                        />
+                    </div>
+                </div>
+              {loading ? (
+                <div className='container flex justify-center my-4'>
+                  <LogoSpinner width={48} height={48} />
+                </div>
+              ) : promoData && promoItems.length >= 1 ? (
+                <>
+                <div className='grid grid-cols-1 gap-x-6  sm:grid-cols-1 md:grid-cols-2 lg:grid-cols-2 xl:grid-cols-3'>
+                  {products?.map((promotion) => (
+                    <div key={promotion.id} className="min-w-[400px] max-w-[400px]  mb-[20px] sm:min-w-[350px] md:min-w-[380px] lg:min-w-[400px] xl:min-w-[400px] ">
+                      <ProductPromoCard promotion={promotion}/>
+                    </div>
+                  ))}
+                </div>
+              </>
+              ) : (
+                <div className="text-center my-8">
+                  <p>Belum ada promo pada kategori ini</p>
+                </div>
+              )}          
+              <div className='flex justify-between items-center mt-6 mb-2'>
+                <div className='pt-2 pb-6 flex items-center gap-x-3'>
+                  <NextImage
+                    src='/images/logo-question.png'
+                    alt='Logo Question Indoteknik'
+                    width={60}
+                    height={60}
+                  />
+                  <div className='text-gray_r-12/90'>
+                    <span>
+                      Barang yang anda cari tidak ada?{' '}
+                      <a
+                        href={
+                          router.query?.q
+                            ? whatsappUrl('productSearch', {
+                                name: router.query.q,
+                              })
+                            : whatsappUrl()
+                        }
+                        className='text-danger-500'
+                      >
+                        Hubungi Kami
+                      </a>
+                    </span>
+                  </div>
+                </div>
+
+                
+                
+                <Pagination
+                  pageCount={Math.ceil((promoData?.length ?? 0) / itemsPerPage)}
+                  currentPage={currentPage}
+                  url={`${prefixUrl}?${toQuery(_.omit(queryWithoutSlug, ['page']))}`}
+                  className='mt-6 mb-2'
+                />
+              </div>
+
+          </div>
+        </div>
+      </DesktopView>
+    </BasicLayout>
+  )
+  }
+  
+const FilterChoicesComponent = ({
+  brandValues,
+  categoryValues,
+  priceFrom,
+  priceTo,
+  handleDeleteFilter,
+  }) => (
+  <div className='flex items-center mb-4'>
+    <HStack spacing={2} className='flex-wrap'>
+      {brandValues?.map((value, index) => (
+        <Tag
+          size='lg'
+          key={index}
+          borderRadius='lg'
+          variant='outline'
+          colorScheme='gray'
+          >
+          <TagLabel>{value}</TagLabel>
+          <TagCloseButton onClick={() => handleDeleteFilter('brands', value)} />
+        </Tag>
+      ))}
+
+      {categoryValues?.map((value, index) => (
+        <Tag
+          size='lg'
+          key={index}
+          borderRadius='lg'
+          variant='outline'
+          colorScheme='gray'
+          >
+          <TagLabel>{value}</TagLabel>
+          <TagCloseButton
+            onClick={() => handleDeleteFilter('category', value)}
+            />
+        </Tag>
+      ))}
+      {priceFrom && priceTo && (
+        <Tag size='lg' borderRadius='lg' variant='outline' colorScheme='gray'>
+          <TagLabel>
+            {formatCurrency(priceFrom) + '-' + formatCurrency(priceTo)}
+          </TagLabel>
+          <TagCloseButton
+            onClick={() => handleDeleteFilter('price', priceFrom)}
+            />
+        </Tag>
+      )}
+      {brandValues?.length > 0 ||
+      categoryValues?.length > 0 ||
+      priceFrom ||
+      priceTo ? (
+        <span>
+          <button
+            className='btn-transparent py-2 px-5 h-[40px] text-red-700'
+            onClick={() => handleDeleteFilter('delete')}
+            >
+            Hapus Semua
+          </button>
+        </span>
+      ) : (
+        ''
+        )}
+    </HStack>
+  </div>
+);
diff --git a/src/pages/shop/promo/[slug].tsx b/src/pages/shop/promo/[slug].tsx
deleted file mode 100644
index 92f5b7f8..00000000
--- a/src/pages/shop/promo/[slug].tsx
+++ /dev/null
@@ -1,554 +0,0 @@
-import dynamic from 'next/dynamic'
-import NextImage from 'next/image';
-import { useEffect, useState } from 'react'
-import { useRouter } from 'next/router'
-import Seo from '../../../core/components/Seo.jsx'
-import Promocrumb from '../../../lib/promo/components/Promocrumb.jsx'
-import { fetchPromoItemsSolr, fetchVariantSolr } from '../../../api/promoApi.js'
-import LogoSpinner from '../../../core/components/elements/Spinner/LogoSpinner.jsx'
-import ProductPromoCard from '../../../../src-migrate/modules/product-promo/components/Card.tsx'
-import { IPromotion } from '../../../../src-migrate/types/promotion.ts'
-import React from 'react'
-import { SolrResponse } from "../../../../src-migrate/types/solr.ts";
-import DesktopView from '../../../core/components/views/DesktopView.jsx';
-import MobileView from '../../../core/components/views/MobileView.jsx';
-import 'swiper/swiper-bundle.css';
-import useDevice from '../../../core/hooks/useDevice.js'
-import ProductFilterDesktop from '../../../lib/product/components/ProductFilterDesktopPromotion.jsx';
-import ProductFilter from '../../../lib/product/components/ProductFilter.jsx';
-import { HStack, Image, Tag, TagCloseButton, TagLabel } from '@chakra-ui/react';
-import { formatCurrency } from '../../../core/utils/formatValue.js';
-import Pagination from '../../../core/components/elements/Pagination/Pagination.js';
-import SideBanner from '../../../../src-migrate/modules/side-banner/index.tsx';
-import whatsappUrl from '../../../core/utils/whatsappUrl.js';
-import { cons, toQuery } from 'lodash-contrib';
-import _ from 'lodash';
-import useActive from '../../../core/hooks/useActive.js';
-import useProductSearch from '../../../lib/product/hooks/useProductSearch.js';
-
-const BasicLayout = dynamic(() => import('../../../core/components/layouts/BasicLayout.jsx'))
-
-export default function PromoDetail() {
-  const router = useRouter()
-  const { slug = '', brand ='', category='', priceFrom = '', priceTo = '', page = '1' } = router.query
-  const [promoItems, setPromoItems] = useState<any[]>([])
-  const [promoData, setPromoData] = useState<IPromotion[] | null>(null)
-  const [currentPage, setCurrentPage] = useState(parseInt(page as string, 10) || 1);
-  const itemsPerPage = 12; // Jumlah item yang ingin ditampilkan per halaman
-  const [loading, setLoading] = useState(true);
-  const { isMobile, isDesktop } = useDevice()
-  const [brands, setBrands] = useState<Brand[]>([]);
-  const [categories, setCategories] = useState<Category[]>([]);
-  const [brandValues, setBrandValues] = useState<string[]>([]);
-  const [categoryValues, setCategoryValues] = useState<string[]>([]);
-  const [orderBy, setOrderBy] = useState(router.query?.orderBy);
-  const popup = useActive();
-  const prefixUrl = `/shop/promo/${slug}`
-  const [queryFinal, setQueryFinal] = useState({});
-  const [limit, setLimit] = useState<number>(30);
-  const [q, setQ] = useState('**');
-  const [finalQuery, setFinalQuery] = useState({fq: `type_value_s:${slug}`});
-  const [products, setProducts] = useState(null);
-  useEffect(() => {
-    setQueryFinal({ ...finalQuery, q, limit, orderBy });
-}, [router.query, prefixUrl, slug, brand, category, priceFrom, priceTo, currentPage]);
-  useEffect(() => {
-      setQueryFinal({ ...finalQuery, q, limit, orderBy });
-  }, [router.query, prefixUrl, slug, brand, category, priceFrom, priceTo, currentPage]);
-
-  const { productSearch } = useProductSearch({
-    query: queryFinal,
-    operation: 'OR',
-  });
-
-  console.log("productSearch",productSearch)
-  console.log("queryFinal",queryFinal)
-
-  const pageCount = Math.ceil(productSearch.data?.response.numFound / limit);
-  const productStart = productSearch.data?.responseHeader.params.start;
-  const productRows = limit;
-  const productFound = productSearch.data?.response.numFound;
-
-  useEffect(() => {
-    setProducts(productSearch.data?.response?.products);
-  }, [productSearch]);
-
-  console.log("products",products)
-
-  useEffect(() => {
-    if (router.query.brand) {
-      let brandsArray: string[] = [];
-      if (Array.isArray(router.query.brand)) {
-        brandsArray = router.query.brand;
-      } else if (typeof router.query.brand === 'string') {
-        brandsArray = router.query.brand.split(',').map((brand) => brand.trim());
-      }
-      setBrandValues(brandsArray);
-    } else {
-      setBrandValues([]);
-    }
-
-    if (router.query.category) {
-      let categoriesArray: string[] = [];
-
-      if (Array.isArray(router.query.category)) {
-        categoriesArray = router.query.category;
-      } else if (typeof router.query.category === 'string') {
-        categoriesArray = router.query.category.split(',').map((category) => category.trim());
-      }
-      setCategoryValues(categoriesArray);
-    } else {
-      setCategoryValues([]);
-    }
-  }, [router.query.brand, router.query.category]);
-
-  interface Brand {
-    brand: string;
-    qty: number;
-  }
-
-  interface Category {
-    name: string;
-    qty: number;
-  }
-
-  useEffect(() => {
-    const loadPromo = async () => {
-      setLoading(true);
-      const brandsData: Brand[] = [];
-      const categoriesData: Category[] = [];
-      
-      const pageNumber = Array.isArray(page) ? parseInt(page[0], 10) : parseInt(page, 10);
-      setCurrentPage(pageNumber)
-      
-      try {
-        const items = await fetchPromoItemsSolr(`type_value_s:${Array.isArray(slug) ? slug[0] : slug}`,0,10);
-        setPromoItems(items);
-        
-        if (items.length === 0) {
-          setPromoData([])
-          setLoading(false);
-          return;
-          }
-          
-          const brandArray = Array.isArray(brand) ? brand : brand.split(',');
-          const categoryArray = Array.isArray(category) ? category : category.split(',');
-          
-          const promoDataPromises = items.map(async (item) => {
-            
-            try { 
-              let brandQuery = '';
-              if (brand) {
-                brandQuery = brandArray.map(b => `manufacture_name_s:${b}`).join(' OR ');
-                brandQuery = `(${brandQuery})`;
-              }
-  
-              let categoryQuery = '';
-              if (category) {
-                categoryQuery = categoryArray.map(c => `category_name:${c}`).join(' OR ');
-                categoryQuery = `(${categoryQuery})`;
-              }
-  
-              let priceQuery = '';
-              if (priceFrom && priceTo) {
-                priceQuery = `price_f:[${priceFrom} TO ${priceTo}]`;
-              } else if (priceFrom) {
-                priceQuery = `price_f:[${priceFrom} TO *]`;
-              } else if (priceTo) {
-                priceQuery = `price_f:[* TO ${priceTo}]`;
-              }
-  
-              let combinedQuery = '';
-              let combinedQueryPrice = `${priceQuery}`;
-              if (brand && category && priceFrom || priceTo) {
-                combinedQuery = `${brandQuery} AND ${categoryQuery} `;
-              } else if (brand && category) {
-                combinedQuery = `${brandQuery} AND ${categoryQuery}`;
-              } else if (brand && priceFrom || priceTo) {
-                combinedQuery = `${brandQuery}`;
-              } else if (category && priceFrom || priceTo) {
-                combinedQuery = `${categoryQuery}`;
-              } else if (brand) {
-                combinedQuery = brandQuery;
-              } else if (category) {
-                combinedQuery = categoryQuery;
-              }
-  
-              if (combinedQuery && priceFrom || priceTo) {
-                const response = await fetchVariantSolr(`id:${item.product_id} AND ${combinedQuery}`);
-                const product = response.response.docs[0];
-                const product_id = product.id;
-                const response2 = await fetchPromoItemsSolr(`type_value_s:${Array.isArray(slug) ? slug[0] : slug} AND product_ids:${product_id} AND ${combinedQueryPrice}`,0,100);  
-                return response2;
-              }else if(combinedQuery){
-                const response = await fetchVariantSolr(`id:${item.product_id} AND ${combinedQuery}`);
-                const product = response.response.docs[0];
-                const product_id = product.id;
-                const response2 = await fetchPromoItemsSolr(`type_value_s:${Array.isArray(slug) ? slug[0] : slug} AND product_ids:${product_id} `,0,100); 
-                return response2;
-              } else {
-                const response = await fetchPromoItemsSolr(`id:${item.id}`,0,100);
-                return response;
-              }
-            } catch (fetchError) {
-              return [];
-            }
-          });
-
-        const promoDataArray = await Promise.all(promoDataPromises);
-        const mergedPromoData = promoDataArray.reduce((accumulator, currentValue) => accumulator.concat(currentValue), []);
-        setPromoData(mergedPromoData);
-
-        const dataBrandCategoryPromises = promoDataArray.map(async (promoData) => {
-          if (promoData) {
-            const dataBrandCategory = promoData.map(async (item) => {
-              let response;
-              if(category){
-                const categoryQuery = categoryArray.map(c => `category_name:${c}`).join(' OR ');
-                response = await fetchVariantSolr(`id:${item.products[0].product_id} AND (${categoryQuery})`);
-              }else{
-                response = await fetchVariantSolr(`id:${item.products[0].product_id}`)    
-              }
-              
-
-              if (response.response?.docs?.length > 0) {
-                const product = response.response.docs[0];
-                const manufactureNameS = product.manufacture_name;
-                if (Array.isArray(manufactureNameS)) {
-                  for (let i = 0; i < manufactureNameS.length; i += 2) {
-                    const brand = manufactureNameS[i];
-                    const qty = 1;
-                    const existingBrandIndex = brandsData.findIndex(b => b.brand === brand);
-                    if (existingBrandIndex !== -1) {
-                      brandsData[existingBrandIndex].qty += qty;
-                    } else {
-                      brandsData.push({ brand, qty });
-                    }
-                  }
-                }
-
-                const categoryNameS = product.category_name;
-                if (Array.isArray(categoryNameS)) {
-                  for (let i = 0; i < categoryNameS.length; i += 2) {
-                    const name = categoryNameS[i];
-                    const qty = 1;
-                    const existingCategoryIndex = categoriesData.findIndex(c => c.name === name);
-                    if (existingCategoryIndex !== -1) {
-                      categoriesData[existingCategoryIndex].qty += qty;
-                    } else {
-                      categoriesData.push({ name, qty });
-                    }
-                  }
-                }
-              }
-            });
-
-            return Promise.all(dataBrandCategory);
-          }
-        });
-
-        await Promise.all(dataBrandCategoryPromises);
-        setBrands(brandsData);
-        setCategories(categoriesData);
-        setLoading(false);
-
-      } catch (loadError) {
-        // console.error("Error loading promo items:", loadError)
-        setLoading(false);
-      }
-    }
-
-    if (slug) {
-      loadPromo()
-    }
-  },[slug, brand, category, priceFrom, priceTo, currentPage]);
-
-
-  function capitalizeFirstLetter(string) {
-    string = string.replace(/_/g, ' ');
-    return string.replace(/(^\w|\s\w)/g, function(match) {
-        return match.toUpperCase();
-    });
-  }
-
-  const handleDeleteFilter = async (source, value) => {
-    let params = {
-      q: router.query.q,
-      orderBy: '',
-      brand: brandValues.join(','),
-      category: categoryValues.join(','),
-      priceFrom: priceFrom || '',
-      priceTo: priceTo || '',
-    };
-
-    let brands = brandValues;
-    let catagories = categoryValues;
-    switch (source) {
-      case 'brands':
-        brands = brandValues.filter((item) => item !== value);
-        params.brand = brands.join(',');
-        await setBrandValues(brands);
-        break;
-      case 'category':
-        catagories = categoryValues.filter((item) => item !== value);
-        params.category = catagories.join(',');
-        await setCategoryValues(catagories);
-        break;
-      case 'price':
-        params.priceFrom = '';
-      params.priceTo = '';    
-      break;
-      case 'delete':
-        params = {
-          q: router.query.q,
-          orderBy: '',
-          brand: '',
-          category: '',
-          priceFrom: '',
-          priceTo: '',
-        };
-        break;
-    }
-
-    handleSubmitFilter(params);
-  };
-  const handleSubmitFilter = (params) => {
-    params = _.pickBy(params, _.identity);
-    params = toQuery(params);
-    router.push(`${slug}?${params}`);
-  };
- 
-  const visiblePromotions = promoData?.slice( (currentPage-1) * itemsPerPage, currentPage * 12)
-
-  const toQuery = (obj) => {
-    const str = Object.keys(obj)
-      .map(key => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`)
-      .join('&')
-    return str
-  }
- 
-  const whatPromo = capitalizeFirstLetter(slug)
-  const queryWithoutSlug = _.omit(router.query, ['slug'])
-  const queryString = toQuery(queryWithoutSlug)
-  
-  return (
-    <BasicLayout>
-      <Seo
-        title={`Promo ${Array.isArray(slug) ? slug[0] : slug} Terkini`} 
-        description='B2B Marketplace MRO & Industri dengan Layanan Pembayaran Tempo, Faktur Pajak, Online Quotation, Garansi Resmi & Harga Kompetitif'
-      />
-      <Promocrumb brandName={whatPromo} />
-      <MobileView>
-        <div className='p-4 pt-0'>
-          <h1 className='mb-2 font-semibold text-h-sm'>Promo {whatPromo}</h1>
-      
-            <FilterChoicesComponent
-                  brandValues={brandValues}
-                  categoryValues={categoryValues}
-                  priceFrom={priceFrom}
-                  priceTo={priceTo}
-                  handleDeleteFilter={handleDeleteFilter}
-                />
-            {promoItems.length >= 1 && (
-            <div className='flex items-center gap-x-2 mb-5 justify-between'>
-              <div>
-                <button
-                  className='btn-light py-2 px-5 h-[40px]'
-                  onClick={popup.activate}
-                >
-                  Filter
-                </button>
-              </div>
-            </div>
-          )}
-          
-          {loading ? (
-                <div className='container flex justify-center my-4'>
-                  <LogoSpinner width={48} height={48} />
-                </div>
-              ) : promoData && promoItems.length >= 1 ? (
-                <>
-                <div className='grid grid-cols-1 gap-x-1 gap-y-1'>
-                  {visiblePromotions?.map((promotion) => (
-                    <div key={promotion.id} className="min-w-36 max-w-[400px] mb-[20px] sm:w-full md:w-1/2 lg:w-1/3 xl:w-1/4 ">
-                      <ProductPromoCard promotion={promotion}/>
-                    </div>
-                  ))}
-                </div>
-              </>
-              ) : (
-                <div className="text-center my-8">
-                  <p>Belum ada promo pada kategori ini</p>
-                </div>
-              )}  
-
-              <Pagination
-                  pageCount={Math.ceil((promoData?.length ?? 0) / itemsPerPage)}
-                  currentPage={currentPage}
-                  url={`${prefixUrl}?${toQuery(_.omit(queryWithoutSlug, ['page']))}`}
-                  className='mt-6 mb-2'
-                />
-              <ProductFilter
-                active={popup.active}
-                close={popup.deactivate}
-                brands={brands || []}
-                categories={categories || []}
-                prefixUrl={router.asPath.includes('?') ? `${router.asPath}` : `${router.asPath}?`}
-                defaultBrand={null}
-              />
-        </div>
-
-      </MobileView>
-      <DesktopView>
-        <div className='container mx-auto flex mb-3 flex-col'>
-          <div className='w-full pl-6'>
-            <h1 className='text-2xl mb-2 font-semibold'>Promo {whatPromo}</h1>
-              <div className=' w-full h-full flex flex-row items-center '>
-                
-                    <div className='detail-filter w-1/2 flex justify-start items-center  mt-4'>
-
-                  <FilterChoicesComponent
-                    brandValues={brandValues}
-                    categoryValues={categoryValues}
-                    priceFrom={priceFrom}
-                    priceTo={priceTo}
-                    handleDeleteFilter={handleDeleteFilter}
-                  />
-                    </div>
-                    <div className='Filter w-1/2 flex flex-col'>
-
-                    <ProductFilterDesktop
-                          brands={brands || []}
-                          categories={categories || []}  
-                          prefixUrl={'/shop/promo'}
-                          // defaultBrand={null}
-                        />
-                    </div>
-                </div>
-              {loading ? (
-                <div className='container flex justify-center my-4'>
-                  <LogoSpinner width={48} height={48} />
-                </div>
-              ) : promoData && promoItems.length >= 1 ? (
-                <>
-                <div className='grid grid-cols-1 gap-x-6  sm:grid-cols-1 md:grid-cols-2 lg:grid-cols-2 xl:grid-cols-3'>
-                  {visiblePromotions?.map((promotion) => (
-                    <div key={promotion.id} className="min-w-[400px] max-w-[400px]  mb-[20px] sm:min-w-[350px] md:min-w-[380px] lg:min-w-[400px] xl:min-w-[400px] ">
-                      <ProductPromoCard promotion={promotion}/>
-                    </div>
-                  ))}
-                </div>
-              </>
-              ) : (
-                <div className="text-center my-8">
-                  <p>Belum ada promo pada kategori ini</p>
-                </div>
-              )}          
-              <div className='flex justify-between items-center mt-6 mb-2'>
-                <div className='pt-2 pb-6 flex items-center gap-x-3'>
-                  <NextImage
-                    src='/images/logo-question.png'
-                    alt='Logo Question Indoteknik'
-                    width={60}
-                    height={60}
-                  />
-                  <div className='text-gray_r-12/90'>
-                    <span>
-                      Barang yang anda cari tidak ada?{' '}
-                      <a
-                        href={
-                          router.query?.q
-                            ? whatsappUrl('productSearch', {
-                                name: router.query.q,
-                              })
-                            : whatsappUrl()
-                        }
-                        className='text-danger-500'
-                      >
-                        Hubungi Kami
-                      </a>
-                    </span>
-                  </div>
-                </div>
-
-                
-                
-                <Pagination
-                  pageCount={Math.ceil((promoData?.length ?? 0) / itemsPerPage)}
-                  currentPage={currentPage}
-                  url={`${prefixUrl}?${toQuery(_.omit(queryWithoutSlug, ['page']))}`}
-                  className='mt-6 mb-2'
-                />
-              </div>
-
-          </div>
-        </div>
-      </DesktopView>
-    </BasicLayout>
-  )
-  }
-  
-const FilterChoicesComponent = ({
-  brandValues,
-  categoryValues,
-  priceFrom,
-  priceTo,
-  handleDeleteFilter,
-  }) => (
-  <div className='flex items-center mb-4'>
-    <HStack spacing={2} className='flex-wrap'>
-      {brandValues?.map((value, index) => (
-        <Tag
-          size='lg'
-          key={index}
-          borderRadius='lg'
-          variant='outline'
-          colorScheme='gray'
-          >
-          <TagLabel>{value}</TagLabel>
-          <TagCloseButton onClick={() => handleDeleteFilter('brands', value)} />
-        </Tag>
-      ))}
-
-      {categoryValues?.map((value, index) => (
-        <Tag
-          size='lg'
-          key={index}
-          borderRadius='lg'
-          variant='outline'
-          colorScheme='gray'
-          >
-          <TagLabel>{value}</TagLabel>
-          <TagCloseButton
-            onClick={() => handleDeleteFilter('category', value)}
-            />
-        </Tag>
-      ))}
-      {priceFrom && priceTo && (
-        <Tag size='lg' borderRadius='lg' variant='outline' colorScheme='gray'>
-          <TagLabel>
-            {formatCurrency(priceFrom) + '-' + formatCurrency(priceTo)}
-          </TagLabel>
-          <TagCloseButton
-            onClick={() => handleDeleteFilter('price', priceFrom)}
-            />
-        </Tag>
-      )}
-      {brandValues?.length > 0 ||
-      categoryValues?.length > 0 ||
-      priceFrom ||
-      priceTo ? (
-        <span>
-          <button
-            className='btn-transparent py-2 px-5 h-[40px] text-red-700'
-            onClick={() => handleDeleteFilter('delete')}
-            >
-            Hapus Semua
-          </button>
-        </span>
-      ) : (
-        ''
-        )}
-    </HStack>
-  </div>
-);
diff --git a/src/utils/solrMapping.js b/src/utils/solrMapping.js
index e93b0b54..7a115753 100644
--- a/src/utils/solrMapping.js
+++ b/src/utils/solrMapping.js
@@ -1,4 +1,4 @@
-const map = (promotions) => {
+export const promoMappingSolr = (promotions, pricelist) => {
   const result = [];
   for (const promotion of promotions) {
     const data = {
-- 
cgit v1.2.3


From 52b6604cac87d06500597de8dd56be61eb6fad10 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 2 Sep 2024 14:46:44 +0700
Subject: <iman> update category management

---
 src/lib/home/components/CategoryDynamic.jsx | 52 ++++++++++++++---------------
 1 file changed, 26 insertions(+), 26 deletions(-)

(limited to 'src')

diff --git a/src/lib/home/components/CategoryDynamic.jsx b/src/lib/home/components/CategoryDynamic.jsx
index 0ab9312a..c257e9f9 100644
--- a/src/lib/home/components/CategoryDynamic.jsx
+++ b/src/lib/home/components/CategoryDynamic.jsx
@@ -13,32 +13,32 @@ import { Navigation, Pagination, Autoplay } from 'swiper';
 
 const CategoryDynamic = () => {
   const { categoryManagement } = useCategoryManagement();
-  const [categoryData, setCategoryData] = useState({});
-  const [subCategoryData, setSubCategoryData] = useState({});
+  // const [categoryData, setCategoryData] = useState({});
+  // const [subCategoryData, setSubCategoryData] = useState({});
   
-  useEffect(() => {
-    const fetchCategoryData = async () => {
-      if (categoryManagement && categoryManagement.data) {
-        const updatedCategoryData = {};
-        const updatedSubCategoryData = {};
+  // useEffect(() => {
+  //   const fetchCategoryData = async () => {
+  //     if (categoryManagement && categoryManagement.data) {
+  //       const updatedCategoryData = {};
+  //       const updatedSubCategoryData = {};
         
-        for (const category of categoryManagement.data) {
-          const countLevel1 = await odooApi('GET', `/api/v1/category/numFound?parent_id=${category.categoryIdI}`);
+  //       for (const category of categoryManagement.data) {
+  //         const countLevel1 = await odooApi('GET', `/api/v1/category/numFound?parent_id=${category.categoryIdI}`);
           
-          updatedCategoryData[category.categoryIdI] = countLevel1?.numFound;
+  //         updatedCategoryData[category.categoryIdI] = countLevel1?.numFound;
           
-          for (const subCategory of countLevel1?.children) {
-            updatedSubCategoryData[subCategory.id] = subCategory?.numFound;
-          }
-        }
+  //         for (const subCategory of countLevel1?.children) {
+  //           updatedSubCategoryData[subCategory.id] = subCategory?.numFound;
+  //         }
+  //       }
 
-        setCategoryData(updatedCategoryData);
-        setSubCategoryData(updatedSubCategoryData);
-      }
-    };
+  //       setCategoryData(updatedCategoryData);
+  //       setSubCategoryData(updatedSubCategoryData);
+  //     }
+  //   };
 
-    fetchCategoryData();
-  }, [categoryManagement.isLoading]);
+  //   fetchCategoryData();
+  // }, [categoryManagement.isLoading]);
 
   const swiperBanner = {
     modules: [Pagination, ],
@@ -54,16 +54,16 @@ const CategoryDynamic = () => {
   return (
     <div>
         {categoryManagement && categoryManagement.data?.map((category) => {
-          const countLevel1 = categoryData[category.categoryIdI] || 0;
+          // const countLevel1 = categoryData[category.categoryIdI] || 0;
           
           return (
             <Skeleton key={category.id} isLoaded={categoryManagement}>
               <div key={category.id}>
                 <div className='bagian-judul flex flex-row justify-start items-center gap-3 mb-4 mt-4'>
                   <div className='font-semibold sm:text-h-lg mr-2'>{category.name}</div>
-                  <Skeleton isLoaded={countLevel1 != 0}>
+                  {/* <Skeleton isLoaded={countLevel1 != 0}>
                     <p className={`text-gray_r-10 text-sm`}>{countLevel1} Produk tersedia</p>
-                  </Skeleton>
+                  </Skeleton> */}
                   <Link href={createSlug('/shop/category/', category?.name, category?.categoryIdI)} className="!text-red-500 font-semibold">Lihat Semua</Link>
                 </div>
                 
@@ -71,7 +71,7 @@ const CategoryDynamic = () => {
                 <Swiper {...swiperBanner}
                 >
                   {category.categories.map((subCategory) => {
-                    const countLevel2 = subCategoryData[subCategory.idLevel2] || 0;
+                    // const countLevel2 = subCategoryData[subCategory.idLevel2] || 0;
 
                     return (
                       <SwiperSlide key={subCategory.id}>
@@ -87,11 +87,11 @@ const CategoryDynamic = () => {
                               />
                               <div className='bagian-judul flex flex-col justify-center items-start gap-2 ml-2'>
                                 <div className='font-semibold text-lg mr-2'>{subCategory?.name}</div>
-                                <Skeleton isLoaded={countLevel2 != 0}>
+                                {/* <Skeleton isLoaded={countLevel2 != 0}>
                                   <p className={`text-gray_r-10 text-sm`}>
                                     {countLevel2} Produk tersedia
                                   </p>
-                                </Skeleton>
+                                </Skeleton> */}
                                 <Link href={createSlug('/shop/category/', subCategory?.name, subCategory?.idLevel2)} className="!text-red-500 font-semibold">Lihat Semua</Link>
                               </div>
                             </div>
-- 
cgit v1.2.3


From 277f7eea312492c66ec8d942199dba65593e78b8 Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Mon, 2 Sep 2024 15:12:58 +0700
Subject: new

---
 src/pages/api/shop/search.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index 0227a7eb..d0343fb8 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -2,6 +2,7 @@ import { productMappingSolr } from '@/utils/solrMapping';
 import axios from 'axios';
 import camelcaseObjectDeep from 'camelcase-object-deep';
 import searchSuggestApi from '@/core/api/searchSuggestApi';
+import { ECDH } from 'crypto';
 
 export default async function handler(req, res) {
   const {
@@ -65,7 +66,7 @@ export default async function handler(req, res) {
 
   let checkQ = q.trim().split(/[\s\+\-\!\(\)\{\}\[\]\^"~\*\?:\\\/]+/);
   let newQ = checkQ.length > 1 ? escapeSolrQuery(q) + '*' : escapeSolrQuery(q);
-  let excludeDescription = checkQ.map(term => `-description_t:"${term}"`).join(', ');
+  let excludeDescription = checkQ.map(term => escapeSolrQuery(term)).join(' AND ');
 
   let offset = (page - 1) * limit;
   let parameter = [
@@ -75,10 +76,8 @@ export default async function handler(req, res) {
     'indent=true',
     `facet.query=${escapeSolrQuery(q)}`,
     `q.op=${operation}`,
-    `q=tool box`,
-    `defType=dismax`,
+    `q=${excludeDescription}*`,
     'qf=name_s^2, description_s, category_name, manufacture_name_s',
-    `mm=${checkQ.length}`,
     `start=${parseInt(offset)}`,
     `rows=${limit}`,
     `sort=${paramOrderBy}`,
-- 
cgit v1.2.3


From b30e6a53d660f9ccbc0ded640c2a1dc5df673ff2 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 2 Sep 2024 16:43:25 +0700
Subject: <iman> update fetch data

---
 src/lib/product/api/productSearchApi.js      |  2 +-
 src/lib/product/components/ProductSearch.jsx |  1 -
 src/lib/promo/api/productSearchApi.js        | 12 ++++++++++++
 src/lib/promo/hooks/usePromotionSearch.js    | 15 +++++++++++++++
 src/pages/api/shop/promo.js                  |  6 +++---
 src/pages/shop/promo/[slug].jsx              |  6 +++---
 src/utils/solrMapping.js                     | 12 +++++-------
 7 files changed, 39 insertions(+), 15 deletions(-)
 create mode 100644 src/lib/promo/api/productSearchApi.js
 create mode 100644 src/lib/promo/hooks/usePromotionSearch.js

(limited to 'src')

diff --git a/src/lib/product/api/productSearchApi.js b/src/lib/product/api/productSearchApi.js
index 670661aa..8ff8e57d 100644
--- a/src/lib/product/api/productSearchApi.js
+++ b/src/lib/product/api/productSearchApi.js
@@ -3,7 +3,7 @@ import axios from 'axios'
 
 const productSearchApi = async ({ query, operation = 'OR' }) => {
   const dataProductSearch = await axios(
-    `${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/promo?${query}&operation=${operation}`
+    `${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/search?${query}&operation=${operation}`
   )
   return dataProductSearch.data
 }
diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index 1f083722..ab55cae0 100644
--- a/src/lib/product/components/ProductSearch.jsx
+++ b/src/lib/product/components/ProductSearch.jsx
@@ -87,7 +87,6 @@ const ProductSearch = ({
     recurse(category);
     return ids;
   };
-  console.log("queryFinal",queryFinal)
   useEffect(() => {
     if(prefixUrl.includes('category')){
       const ids = collectIds(dataCategoriesProduct);
diff --git a/src/lib/promo/api/productSearchApi.js b/src/lib/promo/api/productSearchApi.js
new file mode 100644
index 00000000..582b4486
--- /dev/null
+++ b/src/lib/promo/api/productSearchApi.js
@@ -0,0 +1,12 @@
+import _ from 'lodash-contrib'
+import axios from 'axios'
+
+const productSearchApi = async ({ query, operation = 'AND' }) => {
+  const dataProductSearch = await axios(
+    `${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/promo?${query}&operation=${operation}`
+  )
+  console.log("dataProductSearch.data",dataProductSearch.data)
+  return dataProductSearch.data
+}
+
+export default productSearchApi
diff --git a/src/lib/promo/hooks/usePromotionSearch.js b/src/lib/promo/hooks/usePromotionSearch.js
new file mode 100644
index 00000000..1a194646
--- /dev/null
+++ b/src/lib/promo/hooks/usePromotionSearch.js
@@ -0,0 +1,15 @@
+import { useQuery } from 'react-query'
+import productSearchApi from '../api/productSearchApi'
+import _ from 'lodash-contrib'
+
+const usePromotionSearch = ({ query, operation  }) => {
+  const queryString = _.toQuery(query)
+  const fetchProductSearch = async () => await productSearchApi({ query: queryString , operation : operation})
+  const productSearch = useQuery(`promoSearch-${queryString}`, fetchProductSearch)
+
+  return {
+    productSearch
+  }
+}
+
+export default usePromotionSearch
diff --git a/src/pages/api/shop/promo.js b/src/pages/api/shop/promo.js
index 353ff3df..e6867e89 100644
--- a/src/pages/api/shop/promo.js
+++ b/src/pages/api/shop/promo.js
@@ -108,12 +108,12 @@ export default async function handler(req, res) {
   let result = await axios(
     process.env.SOLR_HOST + '/solr/promotion_program_lines/select?' + parameter.join('&')
   );
-  console.log("result",result)
   try {
     result.data.response.products = promoMappingSolr(
-      result.data.response.docs,
-      auth?.pricelist || false
+      result.data.response.docs
     );
+    console.log("result.data.response.products",result.data.response.products)
+    
     result.data.responseHeader.params.start = parseInt(
       result.data.responseHeader.params.start
     );
diff --git a/src/pages/shop/promo/[slug].jsx b/src/pages/shop/promo/[slug].jsx
index 544286f9..ce73ebd1 100644
--- a/src/pages/shop/promo/[slug].jsx
+++ b/src/pages/shop/promo/[slug].jsx
@@ -24,7 +24,7 @@ import whatsappUrl from '../../../core/utils/whatsappUrl.js';
 import { cons, toQuery } from 'lodash-contrib';
 import _ from 'lodash';
 import useActive from '../../../core/hooks/useActive.js';
-import useProductSearch from '../../../lib/product/hooks/useProductSearch.js';
+import useProductSearch from '../../../lib/promo/hooks/usePromotionSearch.js';
 
 const BasicLayout = dynamic(() => import('../../../core/components/layouts/BasicLayout.jsx'))
 
@@ -45,7 +45,7 @@ export default function PromoDetail() {
   const popup = useActive();
   const prefixUrl = `/shop/promo/${slug}`
   const [queryFinal, setQueryFinal] = useState({});
-  const [limit, setLimit] = useState<number>(30);
+  const [limit, setLimit] = useState(30);
   const [q, setQ] = useState('*');
   const [finalQuery, setFinalQuery] = useState({fq: `type_value_s:${slug}`});
   const [products, setProducts] = useState(null);
@@ -365,7 +365,7 @@ export default function PromoDetail() {
               ) : promoData && promoItems.length >= 1 ? (
                 <>
                 <div className='grid grid-cols-1 gap-x-1 gap-y-1'>
-                  {visiblePromotions?.map((promotion) => (
+                  {products?.map((promotion) => (
                     <div key={promotion.id} className="min-w-36 max-w-[400px] mb-[20px] sm:w-full md:w-1/2 lg:w-1/3 xl:w-1/4 ">
                       <ProductPromoCard promotion={promotion}/>
                     </div>
diff --git a/src/utils/solrMapping.js b/src/utils/solrMapping.js
index 7a115753..637d7c09 100644
--- a/src/utils/solrMapping.js
+++ b/src/utils/solrMapping.js
@@ -1,7 +1,6 @@
-export const promoMappingSolr = (promotions, pricelist) => {
-  const result = [];
-  for (const promotion of promotions) {
-    const data = {
+export const promoMappingSolr = (promotions) => {
+  return promotions.map((promotion) =>{
+    let productMapped = {
       id: promotion.id,
       program_id: promotion.program_id_i,
       name: promotion.name_s,
@@ -20,9 +19,8 @@ export const promoMappingSolr = (promotions, pricelist) => {
       qty_sold_f:promotion.total_qty_sold_f,
       free_products: JSON.parse(promotion.free_products_s),
     };
-    result.push(data);
-  }
-  return result;
+    return productMapped;
+  })
 };
 
 
-- 
cgit v1.2.3


From 8d0e7bfbd4da7908ac5b0195185fbd574958a1cb Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 2 Sep 2024 16:55:04 +0700
Subject: <iman> update mobile view

---
 src/lib/home/components/CategoryDynamicMobile.jsx | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src')

diff --git a/src/lib/home/components/CategoryDynamicMobile.jsx b/src/lib/home/components/CategoryDynamicMobile.jsx
index 4d2fa0ec..2877a5a7 100644
--- a/src/lib/home/components/CategoryDynamicMobile.jsx
+++ b/src/lib/home/components/CategoryDynamicMobile.jsx
@@ -63,7 +63,6 @@ const CategoryDynamicMobile = () => {
                       />
                       <div className='bagian-judul flex flex-col justify-center items-start gap-1 ml-2'>
                         <div className='font-semibold text-[10px] line-clamp-1'>{index.name}</div>
-                        <p className='text-gray_r-10 text-[10px]'>999 rb+ Produk</p>
                       </div>
                     </div>
                   </div>
-- 
cgit v1.2.3


From 68ec9564aef424b86702512637c9cb738b44f215 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 2 Sep 2024 17:11:10 +0700
Subject: <iman> update search

---
 src/pages/api/shop/promo.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/pages/api/shop/promo.js b/src/pages/api/shop/promo.js
index e6867e89..61fff4e5 100644
--- a/src/pages/api/shop/promo.js
+++ b/src/pages/api/shop/promo.js
@@ -122,7 +122,8 @@ export default async function handler(req, res) {
     );
     delete result.data.response.docs;
     console.log("result.data",result.data)
-    result.data = camelcaseObjectDeep(result.data);
+    // result.data = camelcaseObjectDeep(result.data);
+    result.data = result.data;
     res.status(200).json(result.data);
   } catch (error) {
     res.status(400).json({ error: error.message });
-- 
cgit v1.2.3


From dab7f8a1ebd135d9335f1a53346c91d32a2be9f9 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 3 Sep 2024 08:46:46 +0700
Subject: <iman> update tempt

---
 src/pages/shop/promo/[slug].jsx | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/pages/shop/promo/[slug].jsx b/src/pages/shop/promo/[slug].jsx
index ce73ebd1..71ce8344 100644
--- a/src/pages/shop/promo/[slug].jsx
+++ b/src/pages/shop/promo/[slug].jsx
@@ -37,7 +37,7 @@ export default function PromoDetail() {
   const itemsPerPage = 12; // Jumlah item yang ingin ditampilkan per halaman
   const [loading, setLoading] = useState(true);
   const { isMobile, isDesktop } = useDevice()
-  const [brands, setBrands] = useState([]);
+  // const [brands, setBrands] = useState([]);
   const [categories, setCategories] = useState([]);
   const [brandValues, setBrandValues] = useState([]);
   const [categoryValues, setCategoryValues] = useState([]);
@@ -75,7 +75,20 @@ export default function PromoDetail() {
 
   console.log("products",products)
 
-
+  const brands = [];
+  for (
+    let i = 0;
+    i < productSearch.data?.facetCounts?.facetFields?.manufactureNameS.length;
+    i += 2
+  ) {
+    const brand =
+      productSearch.data?.facetCounts?.facetFields?.manufactureNameS[i];
+    const qty =
+      productSearch.data?.facetCounts?.facetFields?.manufactureNameS[i + 1];
+    if (qty > 0) {
+      brands.push({ brand, qty });
+    }
+  }
 
 
 
@@ -403,13 +416,13 @@ export default function PromoDetail() {
                 
                     <div className='detail-filter w-1/2 flex justify-start items-center  mt-4'>
 
-                  <FilterChoicesComponent
+                  {/* <FilterChoicesComponent
                     brandValues={brandValues}
                     categoryValues={categoryValues}
                     priceFrom={priceFrom}
                     priceTo={priceTo}
                     handleDeleteFilter={handleDeleteFilter}
-                  />
+                  /> */}
                     </div>
                     <div className='Filter w-1/2 flex flex-col'>
 
@@ -470,8 +483,8 @@ export default function PromoDetail() {
                 
                 
                 <Pagination
-                  pageCount={Math.ceil((promoData?.length ?? 0) / itemsPerPage)}
-                  currentPage={currentPage}
+                  pageCount={pageCount}
+                  currentPage={parseInt(page)}
                   url={`${prefixUrl}?${toQuery(_.omit(queryWithoutSlug, ['page']))}`}
                   className='mt-6 mb-2'
                 />
-- 
cgit v1.2.3


From 39cf7a6066d3b7064cb57e4f5583232b4d4d2292 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 3 Sep 2024 08:53:30 +0700
Subject: <iman> delete popular brand

---
 src/lib/category/components/Category.jsx     |  4 +-
 src/lib/category/components/PopularBrand.jsx | 88 ++++++++++++++--------------
 2 files changed, 46 insertions(+), 46 deletions(-)

(limited to 'src')

diff --git a/src/lib/category/components/Category.jsx b/src/lib/category/components/Category.jsx
index f76e6e42..91553295 100644
--- a/src/lib/category/components/Category.jsx
+++ b/src/lib/category/components/Category.jsx
@@ -86,14 +86,14 @@ const Category = () => {
                   </div>
                 ))}
               </div>
-              <div className='category-mega-box__child-wrapper !w-[260px] !flex !flex-col !gap-4'>
+              {/* <div className='category-mega-box__child-wrapper !w-[260px] !flex !flex-col !gap-4'>
               <PopularBrand category={category} />
               {Array.isArray(promotionProgram?.data) && promotionProgram?.data.length > 0 && promotionProgram?.data[0]?.map((banner, index) => (
                 <div key={index} className='flex w-60 h-20 object-cover'>
                   <Image src={`${banner.image}`} alt={`${banner.name}`} width={275} height={4} />
                 </div>
               ))}
-              </div>
+              </div> */}
             </div>
           </div>
         ))}
diff --git a/src/lib/category/components/PopularBrand.jsx b/src/lib/category/components/PopularBrand.jsx
index 4777fded..8124b5b4 100644
--- a/src/lib/category/components/PopularBrand.jsx
+++ b/src/lib/category/components/PopularBrand.jsx
@@ -13,60 +13,60 @@ import { fetchPopulerProductSolr } from '../api/popularProduct'
 const SOLR_HOST = process.env.SOLR_HOST
 
 const PopularBrand = ({ category }) => {
-    const [topBrands, setTopBrands] = useState([]);
+    // const [topBrands, setTopBrands] = useState([]);
 
-    const fetchTopBrands = async () => {
-        try {
-            const items = await fetchPopulerProductSolr(`category_id_ids:(${category?.categoryDataIds?.join(' OR ')})`);
-            const getTop12UniqueBrands = (prod) => {
-                const brandMap = new Map();
+    // const fetchTopBrands = async () => {
+    //     try {
+    //         const items = await fetchPopulerProductSolr(`category_id_ids:(${category?.categoryDataIds?.join(' OR ')})`);
+    //         const getTop12UniqueBrands = (prod) => {
+    //             const brandMap = new Map();
     
-                for (const product of prod) {
-                    const { manufacture_name, manufacture_id, qty_sold } = product;
+    //             for (const product of prod) {
+    //                 const { manufacture_name, manufacture_id, qty_sold } = product;
     
-                    if (brandMap.has(manufacture_name)) {
-                        // Update the existing brand's qty_sold
-                        brandMap.set(manufacture_name, {
-                            name: manufacture_name,
-                            id: manufacture_id,
-                            qty_sold: brandMap.get(manufacture_name).qty_sold + qty_sold
-                        });
-                    } else {
-                        // Add a new brand to the map
-                        brandMap.set(manufacture_name, {
-                            name: manufacture_name,
-                            id: manufacture_id,
-                            qty_sold
-                        });
-                    }
-                }
+    //                 if (brandMap.has(manufacture_name)) {
+    //                     // Update the existing brand's qty_sold
+    //                     brandMap.set(manufacture_name, {
+    //                         name: manufacture_name,
+    //                         id: manufacture_id,
+    //                         qty_sold: brandMap.get(manufacture_name).qty_sold + qty_sold
+    //                     });
+    //                 } else {
+    //                     // Add a new brand to the map
+    //                     brandMap.set(manufacture_name, {
+    //                         name: manufacture_name,
+    //                         id: manufacture_id,
+    //                         qty_sold
+    //                     });
+    //                 }
+    //             }
     
-                // Convert the map to an array and sort by qty_sold in descending order
-                const sortedBrands = Array.from(brandMap.values()).sort((a, b) => b.qty_sold - a.qty_sold);
+    //             // Convert the map to an array and sort by qty_sold in descending order
+    //             const sortedBrands = Array.from(brandMap.values()).sort((a, b) => b.qty_sold - a.qty_sold);
     
-                // Return the top 12 brands
-                return sortedBrands.slice(0, 18);
-            };
+    //             // Return the top 12 brands
+    //             return sortedBrands.slice(0, 18);
+    //         };
     
-            // Using the fetched products
-            const products = items;
-            const top12UniqueBrands = getTop12UniqueBrands(products);
+    //         // Using the fetched products
+    //         const products = items;
+    //         const top12UniqueBrands = getTop12UniqueBrands(products);
     
-            // Set the top 12 brands to the state
-            setTopBrands(top12UniqueBrands);
-        } catch (error) {
-            console.error("Error fetching data from Solr", error);
-            throw error;
-        }
-    }
+    //         // Set the top 12 brands to the state
+    //         setTopBrands(top12UniqueBrands);
+    //     } catch (error) {
+    //         console.error("Error fetching data from Solr", error);
+    //         throw error;
+    //     }
+    // }
 
-    useEffect(() => {
-        fetchTopBrands();
-    }, [category]);
+    // useEffect(() => {
+    //     fetchTopBrands();
+    // }, [category]);
 
     return (
         <div className='flex flex-col'>
-            <div className='grid grid-cols-3 max-h-full w-full gap-2'>
+            {/* <div className='grid grid-cols-3 max-h-full w-full gap-2'>
                 {topBrands.map((brand, index) => (
                     <div key={index} className='w-full flex items-center justify-center pb-2'>
                         <Link
@@ -77,7 +77,7 @@ const PopularBrand = ({ category }) => {
                         </Link>
                     </div>
                 ))}
-            </div>
+            </div> */}
             {/* {topBrands.length > 8 && (
                 <div className='flex hover:bg-gray_r-8/35 rounded-10'>
                     <Link
-- 
cgit v1.2.3


From 5c36cea8bccd9a9c06f61d82314af398afe0875f Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Tue, 3 Sep 2024 11:01:30 +0700
Subject: fixing feedback pak iwan (point 5)

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

(limited to 'src')

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index 54acdf7c..22265734 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -174,7 +174,6 @@ const Checkout = () => {
           }
           return; // Hentikan eksekusi lebih lanjut pada iterasi ini
         }
-
         // Memeriksa apakah subtotal memenuhi syarat minimal pembelian
         if (cartCheckout?.subtotal < addNewLine.minPurchaseAmount) {
           SetSelisihHargaCode(
@@ -191,7 +190,9 @@ const Checkout = () => {
 
         // Tambahkan voucher ke list dan set voucher aktif
         SetListVoucher((prevList) => [addNewLine, ...prevList]);
-        SetActiveVoucher(addNewLine.code);
+        if (addNewLine.canApply) {
+          SetActiveVoucher(addNewLine.code);
+        }
       } else {
         // Mencari voucher dalam listVoucherShippings
         let checkList = listVoucherShippings?.findIndex(
@@ -227,7 +228,9 @@ const Checkout = () => {
 
         // Tambahkan voucher ke list pengiriman dan set voucher aktif pengiriman
         SetListVoucherShipping((prevList) => [addNewLine, ...prevList]);
-        setActiveVoucherShipping(addNewLine.code);
+        if (addNewLine.canApply) {
+          setActiveVoucherShipping(addNewLine.code);
+        }
       }
     });
 
@@ -701,7 +704,9 @@ const Checkout = () => {
 
           {listVoucherShippings && listVoucherShippings?.length > 0 && (
             <div>
-              <h3 className='font-semibold mb-4'>Promo Extra Potongan Ongkir</h3>
+              <h3 className='font-semibold mb-4'>
+                Promo Extra Potongan Ongkir
+              </h3>
               {listVoucherShippings?.map((item) => (
                 <div key={item.id} className='relative'>
                   <div
-- 
cgit v1.2.3


From 105ffc8cfa4d8efd51bb7654bfdd279df2a64779 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 3 Sep 2024 12:19:44 +0700
Subject: <iman> update tempt

---
 src/pages/api/shop/promo.js     |  6 ++++--
 src/pages/shop/promo/[slug].jsx | 27 ++++++++++++++++++++++-----
 src/utils/solrMapping.js        |  6 ++++--
 3 files changed, 30 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/pages/api/shop/promo.js b/src/pages/api/shop/promo.js
index 61fff4e5..57635958 100644
--- a/src/pages/api/shop/promo.js
+++ b/src/pages/api/shop/promo.js
@@ -49,8 +49,8 @@ export default async function handler(req, res) {
   
   let offset = (page - 1) * limit;
   let parameter = [
-    // 'facet.field=manufacture_name_s',
-    // 'facet.field=category_name',
+    'facet.field=manufacture_name_s',
+    'facet.field=category_name',
     'facet=true',
     'indent=true',
     // `facet.query=${escapeSolrQuery(q)}`,
@@ -108,7 +108,9 @@ export default async function handler(req, res) {
   let result = await axios(
     process.env.SOLR_HOST + '/solr/promotion_program_lines/select?' + parameter.join('&')
   );
+  console.log("result",result.data)
   try {
+    console.log("result.data.response.docs",result.data.response.docs)
     result.data.response.products = promoMappingSolr(
       result.data.response.docs
     );
diff --git a/src/pages/shop/promo/[slug].jsx b/src/pages/shop/promo/[slug].jsx
index 71ce8344..169ea0b5 100644
--- a/src/pages/shop/promo/[slug].jsx
+++ b/src/pages/shop/promo/[slug].jsx
@@ -38,14 +38,14 @@ export default function PromoDetail() {
   const [loading, setLoading] = useState(true);
   const { isMobile, isDesktop } = useDevice()
   // const [brands, setBrands] = useState([]);
-  const [categories, setCategories] = useState([]);
+  // const [categories, setCategories] = useState([]);
   const [brandValues, setBrandValues] = useState([]);
   const [categoryValues, setCategoryValues] = useState([]);
   const [orderBy, setOrderBy] = useState(router.query?.orderBy);
   const popup = useActive();
   const prefixUrl = `/shop/promo/${slug}`
   const [queryFinal, setQueryFinal] = useState({});
-  const [limit, setLimit] = useState(30);
+  const [limit, setLimit] = useState(22);
   const [q, setQ] = useState('*');
   const [finalQuery, setFinalQuery] = useState({fq: `type_value_s:${slug}`});
   const [products, setProducts] = useState(null);
@@ -78,18 +78,35 @@ export default function PromoDetail() {
   const brands = [];
   for (
     let i = 0;
-    i < productSearch.data?.facetCounts?.facetFields?.manufactureNameS.length;
+    i < productSearch.data?.facet_counts?.facet_fields?.manufacture_name_s.length;
     i += 2
   ) {
     const brand =
-      productSearch.data?.facetCounts?.facetFields?.manufactureNameS[i];
+      productSearch.data?.facet_counts?.facet_fields?.manufacture_name_s[i];
     const qty =
-      productSearch.data?.facetCounts?.facetFields?.manufactureNameS[i + 1];
+      productSearch.data?.facet_counts?.facet_fields?.manufacture_name_s[i + 1];
     if (qty > 0) {
       brands.push({ brand, qty });
     }
   }
 
+  console.log("brands",brands)
+
+  const categories = [];
+  for (
+    let i = 0;
+    i < productSearch.data?.facet_counts?.facet_fields?.category_name.length;
+    i += 2
+  ) {
+    const name = productSearch.data?.facet_counts?.facet_fields?.category_name[i];
+    const qty =
+      productSearch.data?.facet_counts?.facet_fields?.category_name[i + 1];
+    if (qty > 0) {
+      categories.push({ name, qty });
+    }
+  }
+  
+
 
 
 
diff --git a/src/utils/solrMapping.js b/src/utils/solrMapping.js
index 637d7c09..15bf3afb 100644
--- a/src/utils/solrMapping.js
+++ b/src/utils/solrMapping.js
@@ -14,11 +14,13 @@ export const promoMappingSolr = (promotions) => {
       price: promotion.price_f,
       sequence: promotion.sequence_i,
       total_qty: promotion.total_qty_i,
-      products: JSON.parse(promotion.products_s),
+      products: JSON.parse(promotion.products_s) || '',
       product_id: promotion.product_ids[0],
       qty_sold_f:promotion.total_qty_sold_f,
-      free_products: JSON.parse(promotion.free_products_s),
+      free_products: JSON.parse(promotion.free_products_s)
     };
+    console.log("productMapped",productMapped)
+    // console.log("promotions",promotions)
     return productMapped;
   })
 };
-- 
cgit v1.2.3


From ad168bf46919b46f708625b7d2fdc56606ec9af6 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 3 Sep 2024 14:01:02 +0700
Subject: <iman> update all promo fix

---
 src/lib/promo/api/productSearchApi.js |   1 -
 src/pages/api/shop/promo.js           |  15 +-
 src/pages/shop/promo/[slug].jsx       | 272 ++++++----------------------------
 src/utils/solrMapping.js              |   2 -
 4 files changed, 47 insertions(+), 243 deletions(-)

(limited to 'src')

diff --git a/src/lib/promo/api/productSearchApi.js b/src/lib/promo/api/productSearchApi.js
index 582b4486..2f792fd4 100644
--- a/src/lib/promo/api/productSearchApi.js
+++ b/src/lib/promo/api/productSearchApi.js
@@ -5,7 +5,6 @@ const productSearchApi = async ({ query, operation = 'AND' }) => {
   const dataProductSearch = await axios(
     `${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/promo?${query}&operation=${operation}`
   )
-  console.log("dataProductSearch.data",dataProductSearch.data)
   return dataProductSearch.data
 }
 
diff --git a/src/pages/api/shop/promo.js b/src/pages/api/shop/promo.js
index 57635958..221a9adb 100644
--- a/src/pages/api/shop/promo.js
+++ b/src/pages/api/shop/promo.js
@@ -3,7 +3,6 @@ import axios from 'axios';
 import camelcaseObjectDeep from 'camelcase-object-deep';
 
 export default async function handler(req, res) {
-  console.log("req_iman",req)
   const {
     q = '*',
     page = 1,
@@ -11,7 +10,7 @@ export default async function handler(req, res) {
     category = '',
     priceFrom = 0,
     priceTo = 0,
-    orderBy = '',
+    orderBy = 'if(exists(sequence_i),0,1) asc, sequence_i asc,',
     operation = 'AND',
     fq = '',
     limit = 30,
@@ -19,7 +18,7 @@ export default async function handler(req, res) {
 
   let { stock = '' } = req.query;
 
-  let paramOrderBy = '';
+  let paramOrderBy = 'if(exists(sequence_i),0,1) asc, sequence_i asc,';
   switch (orderBy) {
     case 'price-asc':
       paramOrderBy += 'price_tier1_v2_f ASC';
@@ -60,7 +59,7 @@ export default async function handler(req, res) {
     `start=${parseInt(offset)}`,
     `rows=${limit}`,
     `sort=${paramOrderBy}`,
-    // `fq=-publish_b:false, product_rating_f:[8 TO *], price_tier1_v2_f:[1 TO *]`,
+    `fq=product_ids:[* TO *]`,
   ];
 
   if (priceFrom > 0 || priceTo > 0) {
@@ -83,7 +82,7 @@ export default async function handler(req, res) {
         .split(',')
         .map(
           (manufacturer) =>
-            `manufacture_name:"${encodeURIComponent(manufacturer)}"`
+            `manufacture_name_s:"${encodeURIComponent(manufacturer)}"`
         )
         .join(' OR ')}`
     );
@@ -102,19 +101,14 @@ export default async function handler(req, res) {
   // Multi fq in url params
   if (Array.isArray(fq))
     parameter = parameter.concat(fq.map((val) => `fq=${val}`));
-
-  console.log("parameter",parameter)
   
   let result = await axios(
     process.env.SOLR_HOST + '/solr/promotion_program_lines/select?' + parameter.join('&')
   );
-  console.log("result",result.data)
   try {
-    console.log("result.data.response.docs",result.data.response.docs)
     result.data.response.products = promoMappingSolr(
       result.data.response.docs
     );
-    console.log("result.data.response.products",result.data.response.products)
     
     result.data.responseHeader.params.start = parseInt(
       result.data.responseHeader.params.start
@@ -123,7 +117,6 @@ export default async function handler(req, res) {
       result.data.responseHeader.params.rows
     );
     delete result.data.response.docs;
-    console.log("result.data",result.data)
     // result.data = camelcaseObjectDeep(result.data);
     result.data = result.data;
     res.status(200).json(result.data);
diff --git a/src/pages/shop/promo/[slug].jsx b/src/pages/shop/promo/[slug].jsx
index 169ea0b5..cfb2c841 100644
--- a/src/pages/shop/promo/[slug].jsx
+++ b/src/pages/shop/promo/[slug].jsx
@@ -4,12 +4,9 @@ import { useEffect, useState } from 'react'
 import { useRouter } from 'next/router'
 import Seo from '../../../core/components/Seo.jsx'
 import Promocrumb from '../../../lib/promo/components/Promocrumb.jsx'
-import { fetchPromoItemsSolr, fetchVariantSolr } from '../../../api/promoApi.js'
 import LogoSpinner from '../../../core/components/elements/Spinner/LogoSpinner.jsx'
 import ProductPromoCard from '../../../../src-migrate/modules/product-promo/components/Card.tsx'
-import { IPromotion } from '../../../../src-migrate/types/promotion.ts'
 import React from 'react'
-import { SolrResponse } from "../../../../src-migrate/types/solr.ts";
 import DesktopView from '../../../core/components/views/DesktopView.jsx';
 import MobileView from '../../../core/components/views/MobileView.jsx';
 import 'swiper/swiper-bundle.css';
@@ -19,9 +16,7 @@ import ProductFilter from '../../../lib/product/components/ProductFilter.jsx';
 import { HStack, Image, Tag, TagCloseButton, TagLabel } from '@chakra-ui/react';
 import { formatCurrency } from '../../../core/utils/formatValue.js';
 import Pagination from '../../../core/components/elements/Pagination/Pagination.js';
-import SideBanner from '../../../../src-migrate/modules/side-banner/index.tsx';
 import whatsappUrl from '../../../core/utils/whatsappUrl.js';
-import { cons, toQuery } from 'lodash-contrib';
 import _ from 'lodash';
 import useActive from '../../../core/hooks/useActive.js';
 import useProductSearch from '../../../lib/promo/hooks/usePromotionSearch.js';
@@ -30,39 +25,54 @@ const BasicLayout = dynamic(() => import('../../../core/components/layouts/Basic
 
 export default function PromoDetail() {
   const router = useRouter()
-  const { slug = '', brand ='', category='', priceFrom = '', priceTo = '', page = '1' } = router.query
-  const [promoItems, setPromoItems] = useState([])
-  const [promoData, setPromoData] = useState(null)
+  const { slug = '', brand ='', category='', page = '1' } = router.query
   const [currentPage, setCurrentPage] = useState(parseInt(10) || 1);
-  const itemsPerPage = 12; // Jumlah item yang ingin ditampilkan per halaman
-  const [loading, setLoading] = useState(true);
-  const { isMobile, isDesktop } = useDevice()
-  // const [brands, setBrands] = useState([]);
-  // const [categories, setCategories] = useState([]);
-  const [brandValues, setBrandValues] = useState([]);
-  const [categoryValues, setCategoryValues] = useState([]);
   const [orderBy, setOrderBy] = useState(router.query?.orderBy);
   const popup = useActive();
   const prefixUrl = `/shop/promo/${slug}`
   const [queryFinal, setQueryFinal] = useState({});
-  const [limit, setLimit] = useState(22);
+  const [limit, setLimit] = useState(30);
   const [q, setQ] = useState('*');
-  const [finalQuery, setFinalQuery] = useState({fq: `type_value_s:${slug}`});
+  const [finalQuery, setFinalQuery] = useState({});
   const [products, setProducts] = useState(null);
+  const [brandValues, setBrand] = useState(
+    !router.pathname.includes('brands')
+      ? router.query.brand
+        ? router.query.brand.split(',')
+        : []
+      : []
+  );
+  
+  const [categoryValues, setCategory] = useState(
+    router.query?.category?.split(',') || router.query?.category?.split(',')
+  );
+  
+  const [priceFrom, setPriceFrom] = useState(router.query?.priceFrom || null);
+  const [priceTo, setPriceTo] = useState(router.query?.priceTo || null);
+
+
   useEffect(() => {
-    setQueryFinal({ ...finalQuery, q, limit, orderBy });
+    const newQuery = {
+      fq: `type_value_s:${slug}`,
+      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);
 }, [router.query, prefixUrl, slug, brand, category, priceFrom, priceTo, currentPage]);
   useEffect(() => {
       setQueryFinal({ ...finalQuery, q, limit, orderBy });
-  }, [router.query, prefixUrl, slug, brand, category, priceFrom, priceTo, currentPage]);
+  }, [router.query, prefixUrl, slug, brand, category, priceFrom, priceTo, currentPage, finalQuery]);
 
   const { productSearch } = useProductSearch({
     query: queryFinal,
     operation: 'OR',
   });
 
-  console.log("productSearch",productSearch)
-  console.log("queryFinal",queryFinal)
 
   const pageCount = Math.ceil(productSearch.data?.response.numFound / limit);
   const productStart = productSearch.data?.responseHeader.params.start;
@@ -73,8 +83,6 @@ export default function PromoDetail() {
     setProducts(productSearch.data?.response?.products);
   }, [productSearch]);
 
-  console.log("products",products)
-
   const brands = [];
   for (
     let i = 0;
@@ -90,8 +98,6 @@ export default function PromoDetail() {
     }
   }
 
-  console.log("brands",brands)
-
   const categories = [];
   for (
     let i = 0;
@@ -105,190 +111,6 @@ export default function PromoDetail() {
       categories.push({ name, qty });
     }
   }
-  
-
-
-
-
-
-  useEffect(() => {
-    if (router.query.brand) {
-      let brandsArray= [];
-      if (Array.isArray(router.query.brand)) {
-        brandsArray = router.query.brand;
-      } else if (typeof router.query.brand === 'string') {
-        brandsArray = router.query.brand.split(',').map((brand) => brand.trim());
-      }
-      setBrandValues(brandsArray);
-    } else {
-      setBrandValues([]);
-    }
-
-    if (router.query.category) {
-      let categoriesArray= [];
-
-      if (Array.isArray(router.query.category)) {
-        categoriesArray = router.query.category;
-      } else if (typeof router.query.category === 'string') {
-        categoriesArray = router.query.category.split(',').map((category) => category.trim());
-      }
-      setCategoryValues(categoriesArray);
-    } else {
-      setCategoryValues([]);
-    }
-  }, [router.query.brand, router.query.category]);
-
-  useEffect(() => {
-    const loadPromo = async () => {
-      setLoading(true);
-      const brandsData = [];
-      const categoriesData= [];
-      
-      const pageNumber = Array.isArray(page) ? parseInt(page[0], 10) : parseInt(page, 10);
-      setCurrentPage(pageNumber)
-      
-      try {
-        const items = await fetchPromoItemsSolr(`type_value_s:${Array.isArray(slug) ? slug[0] : slug}`,0,10);
-        setPromoItems(items);
-        
-        if (items.length === 0) {
-          setPromoData([])
-          setLoading(false);
-          return;
-          }
-          
-          const brandArray = Array.isArray(brand) ? brand : brand.split(',');
-          const categoryArray = Array.isArray(category) ? category : category.split(',');
-          
-          const promoDataPromises = items.map(async (item) => {
-            
-            try { 
-              let brandQuery = '';
-              if (brand) {
-                brandQuery = brandArray.map(b => `manufacture_name_s:${b}`).join(' OR ');
-                brandQuery = `(${brandQuery})`;
-              }
-  
-              let categoryQuery = '';
-              if (category) {
-                categoryQuery = categoryArray.map(c => `category_name:${c}`).join(' OR ');
-                categoryQuery = `(${categoryQuery})`;
-              }
-  
-              let priceQuery = '';
-              if (priceFrom && priceTo) {
-                priceQuery = `price_f:[${priceFrom} TO ${priceTo}]`;
-              } else if (priceFrom) {
-                priceQuery = `price_f:[${priceFrom} TO *]`;
-              } else if (priceTo) {
-                priceQuery = `price_f:[* TO ${priceTo}]`;
-              }
-  
-              let combinedQuery = '';
-              let combinedQueryPrice = `${priceQuery}`;
-              if (brand && category && priceFrom || priceTo) {
-                combinedQuery = `${brandQuery} AND ${categoryQuery} `;
-              } else if (brand && category) {
-                combinedQuery = `${brandQuery} AND ${categoryQuery}`;
-              } else if (brand && priceFrom || priceTo) {
-                combinedQuery = `${brandQuery}`;
-              } else if (category && priceFrom || priceTo) {
-                combinedQuery = `${categoryQuery}`;
-              } else if (brand) {
-                combinedQuery = brandQuery;
-              } else if (category) {
-                combinedQuery = categoryQuery;
-              }
-  
-              if (combinedQuery && priceFrom || priceTo) {
-                const response = await fetchVariantSolr(`id:${item.product_id} AND ${combinedQuery}`);
-                const product = response.response.docs[0];
-                const product_id = product.id;
-                const response2 = await fetchPromoItemsSolr(`type_value_s:${Array.isArray(slug) ? slug[0] : slug} AND product_ids:${product_id} AND ${combinedQueryPrice}`,0,100);  
-                return response2;
-              }else if(combinedQuery){
-                const response = await fetchVariantSolr(`id:${item.product_id} AND ${combinedQuery}`);
-                const product = response.response.docs[0];
-                const product_id = product.id;
-                const response2 = await fetchPromoItemsSolr(`type_value_s:${Array.isArray(slug) ? slug[0] : slug} AND product_ids:${product_id} `,0,100); 
-                return response2;
-              } else {
-                const response = await fetchPromoItemsSolr(`id:${item.id}`,0,100);
-                return response;
-              }
-            } catch (fetchError) {
-              return [];
-            }
-          });
-
-        const promoDataArray = await Promise.all(promoDataPromises);
-        const mergedPromoData = promoDataArray.reduce((accumulator, currentValue) => accumulator.concat(currentValue), []);
-        setPromoData(mergedPromoData);
-
-        const dataBrandCategoryPromises = promoDataArray.map(async (promoData) => {
-          if (promoData) {
-            const dataBrandCategory = promoData.map(async (item) => {
-              let response;
-              if(category){
-                const categoryQuery = categoryArray.map(c => `category_name:${c}`).join(' OR ');
-                response = await fetchVariantSolr(`id:${item.products[0].product_id} AND (${categoryQuery})`);
-              }else{
-                response = await fetchVariantSolr(`id:${item.products[0].product_id}`)    
-              }
-              
-
-              if (response.response?.docs?.length > 0) {
-                const product = response.response.docs[0];
-                const manufactureNameS = product.manufacture_name;
-                if (Array.isArray(manufactureNameS)) {
-                  for (let i = 0; i < manufactureNameS.length; i += 2) {
-                    const brand = manufactureNameS[i];
-                    const qty = 1;
-                    const existingBrandIndex = brandsData.findIndex(b => b.brand === brand);
-                    if (existingBrandIndex !== -1) {
-                      brandsData[existingBrandIndex].qty += qty;
-                    } else {
-                      brandsData.push({ brand, qty });
-                    }
-                  }
-                }
-
-                const categoryNameS = product.category_name;
-                if (Array.isArray(categoryNameS)) {
-                  for (let i = 0; i < categoryNameS.length; i += 2) {
-                    const name = categoryNameS[i];
-                    const qty = 1;
-                    const existingCategoryIndex = categoriesData.findIndex(c => c.name === name);
-                    if (existingCategoryIndex !== -1) {
-                      categoriesData[existingCategoryIndex].qty += qty;
-                    } else {
-                      categoriesData.push({ name, qty });
-                    }
-                  }
-                }
-              }
-            });
-
-            return Promise.all(dataBrandCategory);
-          }
-        });
-
-        await Promise.all(dataBrandCategoryPromises);
-        setBrands(brandsData);
-        setCategories(categoriesData);
-        setLoading(false);
-
-      } catch (loadError) {
-        // console.error("Error loading promo items:", loadError)
-        setLoading(false);
-      }
-    }
-
-    if (slug) {
-      loadPromo()
-    }
-  },[slug, brand, category, priceFrom, priceTo, currentPage]);
-
 
   function capitalizeFirstLetter(string) {
     string = string.replace(/_/g, ' ');
@@ -302,7 +124,7 @@ export default function PromoDetail() {
       q: router.query.q,
       orderBy: '',
       brand: brandValues.join(','),
-      category: categoryValues.join(','),
+      category: categoryValues?.join(','),
       priceFrom: priceFrom || '',
       priceTo: priceTo || '',
     };
@@ -344,7 +166,6 @@ export default function PromoDetail() {
     router.push(`${slug}?${params}`);
   };
  
-  const visiblePromotions = promoData?.slice( (currentPage-1) * itemsPerPage, currentPage * 12)
 
   const toQuery = (obj) => {
     const str = Object.keys(obj)
@@ -355,7 +176,6 @@ export default function PromoDetail() {
  
   const whatPromo = capitalizeFirstLetter(slug)
   const queryWithoutSlug = _.omit(router.query, ['slug'])
-  const queryString = toQuery(queryWithoutSlug)
   
   return (
     <BasicLayout>
@@ -375,7 +195,7 @@ export default function PromoDetail() {
                   priceTo={priceTo}
                   handleDeleteFilter={handleDeleteFilter}
                 />
-            {promoItems.length >= 1 && (
+            {products?.length >= 1 && (
             <div className='flex items-center gap-x-2 mb-5 justify-between'>
               <div>
                 <button
@@ -387,12 +207,10 @@ export default function PromoDetail() {
               </div>
             </div>
           )}
-          
-          {loading ? (
-                <div className='container flex justify-center my-4'>
+          {productSearch.isLoading && <div className='container flex justify-center my-4'>
                   <LogoSpinner width={48} height={48} />
-                </div>
-              ) : promoData && promoItems.length >= 1 ? (
+                </div>}
+          {products && (
                 <>
                 <div className='grid grid-cols-1 gap-x-1 gap-y-1'>
                   {products?.map((promotion) => (
@@ -402,15 +220,11 @@ export default function PromoDetail() {
                   ))}
                 </div>
               </>
-              ) : (
-                <div className="text-center my-8">
-                  <p>Belum ada promo pada kategori ini</p>
-                </div>
-              )}  
+              ) }
 
               <Pagination
-                  pageCount={Math.ceil((promoData?.length ?? 0) / itemsPerPage)}
-                  currentPage={currentPage}
+                  pageCount={pageCount}
+                  currentPage={parseInt(page)}
                   url={`${prefixUrl}?${toQuery(_.omit(queryWithoutSlug, ['page']))}`}
                   className='mt-6 mb-2'
                 />
@@ -433,13 +247,13 @@ export default function PromoDetail() {
                 
                     <div className='detail-filter w-1/2 flex justify-start items-center  mt-4'>
 
-                  {/* <FilterChoicesComponent
+                  <FilterChoicesComponent
                     brandValues={brandValues}
                     categoryValues={categoryValues}
                     priceFrom={priceFrom}
                     priceTo={priceTo}
                     handleDeleteFilter={handleDeleteFilter}
-                  /> */}
+                  />
                     </div>
                     <div className='Filter w-1/2 flex flex-col'>
 
@@ -451,11 +265,11 @@ export default function PromoDetail() {
                         />
                     </div>
                 </div>
-              {loading ? (
+              {productSearch.isLoading ? (
                 <div className='container flex justify-center my-4'>
                   <LogoSpinner width={48} height={48} />
                 </div>
-              ) : promoData && promoItems.length >= 1 ? (
+              ) : products && products.length >= 1 ? (
                 <>
                 <div className='grid grid-cols-1 gap-x-6  sm:grid-cols-1 md:grid-cols-2 lg:grid-cols-2 xl:grid-cols-3'>
                   {products?.map((promotion) => (
diff --git a/src/utils/solrMapping.js b/src/utils/solrMapping.js
index 15bf3afb..0d50b99b 100644
--- a/src/utils/solrMapping.js
+++ b/src/utils/solrMapping.js
@@ -19,8 +19,6 @@ export const promoMappingSolr = (promotions) => {
       qty_sold_f:promotion.total_qty_sold_f,
       free_products: JSON.parse(promotion.free_products_s)
     };
-    console.log("productMapped",productMapped)
-    // console.log("promotions",promotions)
     return productMapped;
   })
 };
-- 
cgit v1.2.3


From ab0402c015fc5346eed00267d4e9b10dd77dc823 Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Tue, 3 Sep 2024 14:03:05 +0700
Subject: bug fix checout mobile

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

(limited to 'src')

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index 22265734..f5975a99 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -1241,10 +1241,10 @@ const Checkout = () => {
                     className='object-contain object-center h-6 rounded-md'
                   />
                 </span>
-                {activeVoucher ? (
+                {activeVoucher || activeVoucherShipping ? (
                   <div className=''>
                     <div className='text-left text-sm text-black font-semibold'>
-                      Potongan Senilai {currencyFormat(discountVoucher)}
+                      Potongan Senilai {currencyFormat(totalDiscountVoucher)}
                     </div>
                     <div className='text-left mt-1 text-green-600 text-xs'>
                       Voucher berhasil digunakan
-- 
cgit v1.2.3


From 35850040a2e49d140d5ecf406dc1769e81badbf6 Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Tue, 3 Sep 2024 15:02:19 +0700
Subject: add link wa

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

(limited to 'src')

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index f5975a99..913bd273 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -1033,7 +1033,7 @@ const Checkout = () => {
             </div>
             <span className='leading-5'>
               Jika mengalami kesulitan dalam melakukan pembelian di website
-              Indoteknik. Hubungi kami disini
+              Indoteknik. <a href={whatsappUrl()}>Hubungi kami disini</a>
             </span>
           </Alert>
         </div>
-- 
cgit v1.2.3


From 985f29aa1d9b8cbea49d25c30099f88c86bdc13f Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Wed, 4 Sep 2024 09:10:28 +0700
Subject: noindex and nofollw in page variants

---
 src/pages/shop/product/variant/[slug].jsx | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/pages/shop/product/variant/[slug].jsx b/src/pages/shop/product/variant/[slug].jsx
index cb335e0a..42f38774 100644
--- a/src/pages/shop/product/variant/[slug].jsx
+++ b/src/pages/shop/product/variant/[slug].jsx
@@ -69,6 +69,8 @@ export default function ProductDetail({ product }) {
       <Seo
         title={product?.name || '' + ' - Indoteknik.com' || ''}
         description='Temukan pilihan produk B2B Industri &amp; Alat Teknik untuk Perusahaan, UMKM &amp; Pemerintah dengan lengkap, mudah dan transparan.'
+        noindex={true}
+        nofollow={true}
         openGraph={{
           url: process.env.NEXT_PUBLIC_SELF_HOST + router.asPath,
           images: [
-- 
cgit v1.2.3


From 212fda06b5b956e9908c6eb83864990dd589ca8e Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 4 Sep 2024 11:07:52 +0700
Subject: <iman> update mobile view category

---
 src/core/components/elements/Sidebar/Sidebar.jsx | 23 +++++++++++++++++------
 src/lib/product/components/CategorySection.jsx   |  7 ++++---
 2 files changed, 21 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/core/components/elements/Sidebar/Sidebar.jsx b/src/core/components/elements/Sidebar/Sidebar.jsx
index 55838890..d9c2c533 100644
--- a/src/core/components/elements/Sidebar/Sidebar.jsx
+++ b/src/core/components/elements/Sidebar/Sidebar.jsx
@@ -5,6 +5,8 @@ import { AnimatePresence, motion } from 'framer-motion'
 import { ChevronDownIcon, ChevronUpIcon, CogIcon, UserIcon } from '@heroicons/react/24/outline'
 import { Fragment, useEffect, useState } from 'react'
 import odooApi from '@/core/api/odooApi'
+import { createSlug } from '@/core/utils/slug'
+import Image from 'next/image'
 
 const Sidebar = ({ active, close }) => {
   const auth = useAuth()
@@ -155,9 +157,12 @@ const Sidebar = ({ active, close }) => {
                     <Fragment key={category.id}>
                       <div className='flex w-full text-gray_r-11 border-b border-gray_r-6 px-4 pl-8 items-center'>
                         <Link
-                          href={`/shop/search?category=${category.name}`}
-                          className='flex-1 font-normal !text-gray_r-11 py-4'
+                          href={createSlug('/shop/category/', category.name, category.id)}
+                          className='flex-1 font-normal !text-gray_r-11 py-4 flex items-center flex-row'
                         >
+                          <div className='mr-2  flex justify-center items-center'>
+                            <Image src={category.image} alt='' width={25} height={25} />
+                          </div>
                           {category.name}
                         </Link>
                         <div
@@ -177,9 +182,12 @@ const Sidebar = ({ active, close }) => {
                               }`}
                             >
                               <Link
-                                href={`/shop/search?category=${child1Category.name}`}
-                                className='flex-1 font-normal !text-gray_r-11'
+                                href={createSlug('/shop/category/', child1Category.name, child1Category.id)}
+                                className='flex-1 font-normal !text-gray_r-11 flex flex-row items-center'
                               >
+                                <div className='mr-2  flex justify-center items-center'>
+                                  <Image src={`https://erp.indoteknik.com/api/image/product.public.category/image_1920/${child1Category.id}`} alt='' width={25} height={25} />
+                                </div>
                                 {child1Category.name}
                               </Link>
                               {child1Category.childs.length > 0 && (
@@ -200,9 +208,12 @@ const Sidebar = ({ active, close }) => {
                               child1Category.childs.map((child2Category) => (
                                 <Link
                                   key={child2Category.id}
-                                  href={`/shop/search?category=${child2Category.name}`}
-                                  className='flex w-full font-normal !text-gray_r-11 border-b border-gray_r-6 p-4 pl-16'
+                                  href={createSlug('/shop/category/', child2Category.name, child2Category.id)}
+                                  className='flex w-full font-normal !text-gray_r-11 border-b border-gray_r-6 p-4 pl-16 flex-row'
                                 >
+                                  <div className='mr-2  flex justify-center items-center'>
+                                    <Image src={`https://erp.indoteknik.com/api/image/product.public.category/image_1920/${child2Category.id}`} alt='' width={25} height={25} />
+                                  </div>
                                   {child2Category.name}
                                 </Link>
                               ))}
diff --git a/src/lib/product/components/CategorySection.jsx b/src/lib/product/components/CategorySection.jsx
index e8ebb095..a287fa78 100644
--- a/src/lib/product/components/CategorySection.jsx
+++ b/src/lib/product/components/CategorySection.jsx
@@ -63,7 +63,7 @@ const CategorySection = ({ categories }) => {
             {isMobile && (
                 <div className="py-4">
                     <Swiper slidesPerView={2.3} spaceBetween={10}>
-                        {displayedCategories.map((category) => (
+                        {categories.map((category) => (
                             <SwiperSlide key={category?.id}>
                                 <Link href={createSlug('/shop/category/', category?.name, category?.id)} passHref>
                                     <div className="group transition-colors duration-300">
@@ -74,6 +74,7 @@ const CategorySection = ({ categories }) => {
                                                     width={56}
                                                     height={48}
                                                     alt={category?.name}
+                                                    className="p-3"
                                                 />
                                                 <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}
@@ -85,7 +86,7 @@ const CategorySection = ({ categories }) => {
                             </SwiperSlide>
                         ))}
                     </Swiper>
-                    {categories.length > 10 && (
+                    {/* {categories.length > 10 && (
                         <div className="w-full flex justify-end mt-4">
                             <button
                                 onClick={handleToggleCategories}
@@ -94,7 +95,7 @@ const CategorySection = ({ categories }) => {
                                 {isOpenCategory ? 'Sembunyikan Semua' : 'Lihat Semua'}
                             </button>
                         </div>
-                    )}
+                    )} */}
                 </div>
             )}
         </section>
-- 
cgit v1.2.3


From d0a74c4365eb4eeafd9df706b192f726be9dd03e Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Wed, 4 Sep 2024 15:18:38 +0700
Subject: cr sitemaps

---
 src/pages/sitemap/brands.xml.js      | 4 ++--
 src/pages/sitemap/products/[page].js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/pages/sitemap/brands.xml.js b/src/pages/sitemap/brands.xml.js
index c85c40e9..65a84e97 100644
--- a/src/pages/sitemap/brands.xml.js
+++ b/src/pages/sitemap/brands.xml.js
@@ -15,8 +15,8 @@ export async function getServerSideProps({ res }) {
     const url = sitemap.ele('url')
     url.ele('loc', createSlug(baseUrl, brand.name, brand.id))
     url.ele('lastmod', date.toISOString().slice(0, 10))
-    url.ele('changefreq', 'weekly')
-    url.ele('priority', '0.6')
+    url.ele('changefreq', 'daily')
+    url.ele('priority', '1.0')
   })
 
   res.setHeader('Content-Type', 'text/xml')
diff --git a/src/pages/sitemap/products/[page].js b/src/pages/sitemap/products/[page].js
index 2f9c3198..e39755d6 100644
--- a/src/pages/sitemap/products/[page].js
+++ b/src/pages/sitemap/products/[page].js
@@ -19,7 +19,7 @@ export async function getServerSideProps({ query, res }) {
     const url = sitemap.ele('url')
     url.ele('loc', createSlug(baseUrl, product.name, product.id))
     url.ele('lastmod', date.toISOString().slice(0, 10))
-    url.ele('changefreq', 'weekly')
+    url.ele('changefreq', 'daily')
     url.ele('priority', '0.8')
   })
 
-- 
cgit v1.2.3


From 555de668c83b44679af9ef34f3624a55b372cfce Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 4 Sep 2024 16:07:38 +0700
Subject: <iman> update new register edit data

---
 src/lib/auth/components/CompanyProfile.jsx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/lib/auth/components/CompanyProfile.jsx b/src/lib/auth/components/CompanyProfile.jsx
index 2faede9b..a4c25e40 100644
--- a/src/lib/auth/components/CompanyProfile.jsx
+++ b/src/lib/auth/components/CompanyProfile.jsx
@@ -20,6 +20,7 @@ const CompanyProfile = () => {
       npwp: ''
     }
   })
+  console.log("auth",auth)
 
   const [industries, setIndustries] = useState([])
   useEffect(() => {
@@ -42,11 +43,13 @@ const CompanyProfile = () => {
   useEffect(() => {
     const loadProfile = async () => {
       const dataProfile = await addressApi({ id: auth.parentId })
+      console.log("dataProfile",dataProfile)
       setValue('name', dataProfile.name)
       setValue('industry', dataProfile.industryId)
       setValue('companyType', dataProfile.companyTypeId)
       setValue('taxName', dataProfile.taxName)
       setValue('npwp', dataProfile.npwp)
+      setValue('alamat_wajib_pajak', dataProfile.alamatWajibPajak)
     }
     if (auth) loadProfile()
   }, [auth, setValue])
@@ -54,9 +57,11 @@ const CompanyProfile = () => {
   const onSubmitHandler = async (values) => {
     const data = {
       ...values,
+      id_user:auth.partnerId,
       company_type_id: values.companyType,
       industry_id: values.industry,
-      tax_name: values.taxName
+      tax_name: values.taxName,
+      alamat_lengkap_text:values.alamat_wajib_pajak
     }
     const isUpdated = await odooApi('PUT', `/api/v1/partner/${auth.parentId}`, data)
     if (isUpdated?.id) {
@@ -117,6 +122,9 @@ const CompanyProfile = () => {
             <div>
               <label>Nomor NPWP</label>
               <input {...register('npwp')} type='text' className='form-input mt-3' />
+            </div><div>
+              <label>Alamat Wajib Pajak</label>
+              <input {...register('alamat_wajib_pajak')} type='text' className='form-input mt-3' />
             </div>
           </div>
           <button type='submit' className='btn-yellow w-full mt-6'>
-- 
cgit v1.2.3


From e07b4470ba487c01e2420a115a285e7fd4a305ce Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Wed, 4 Sep 2024 17:12:44 +0700
Subject: fixing voucher shipping

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

(limited to 'src')

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index 913bd273..f63ef457 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -410,7 +410,7 @@ const Checkout = () => {
       Math.round(parseInt(finalShippingAmt * 1.1) / 1000) * 1000;
     const finalGT = GT < 0 ? 0 : GT;
     setGrandTotal(finalGT);
-  }, [biayaKirim, cartCheckout?.grandTotal, activeVoucher]);
+  }, [biayaKirim, cartCheckout?.grandTotal, activeVoucher, activeVoucherShipping]);
 
   const checkout = async () => {
     const file = poFile.current.files[0];
@@ -497,7 +497,7 @@ const Checkout = () => {
       }
     }
 
-    const midtrans = async () => {
+   /* const midtrans = async () => {
       for (const product of products) deleteItemCart({ productId: product.id });
       if (grandTotal > 0) {
         const payment = await axios.post(
@@ -513,7 +513,7 @@ const Checkout = () => {
           '-'
         )}`;
       }
-    };
+    };*/
   };
 
   const handlingActivateCode = async () => {
@@ -1189,7 +1189,7 @@ const Checkout = () => {
                 <div className='text-gray_r-11'>
                   Biaya Kirim <p className='text-xs mt-1'>{etdFix}</p>
                 </div>
-                <div>{currencyFormat(biayaKirim)}</div>
+                <div>{currencyFormat(Math.round(parseInt(biayaKirim * 1.1) / 1000) * 1000)}</div>
               </div>
               {activeVoucherShipping && voucherShippingAmt && (
                 <div className='flex gap-x-2 justify-between'>
@@ -1490,7 +1490,7 @@ const Checkout = () => {
                         Biaya Kirim
                         <p className='text-xs mt-1'>{etdFix}</p>
                       </div>
-                      <div>{currencyFormat(biayaKirim)}</div>
+                      <div>{currencyFormat(Math.round(parseInt(biayaKirim * 1.1) / 1000) * 1000) }</div>
                     </div>
                     {activeVoucherShipping && voucherShippingAmt && (
                       <div className='flex gap-x-2 justify-between'>
-- 
cgit v1.2.3


From 52ec2b8f09b43b69b5191e088ddc897cc08756e0 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 4 Sep 2024 17:28:47 +0700
Subject: <iman> update scroll side bar

---
 src/core/components/elements/Sidebar/Sidebar.jsx | 194 ++++++++++++-----------
 1 file changed, 98 insertions(+), 96 deletions(-)

(limited to 'src')

diff --git a/src/core/components/elements/Sidebar/Sidebar.jsx b/src/core/components/elements/Sidebar/Sidebar.jsx
index d9c2c533..ddae3e20 100644
--- a/src/core/components/elements/Sidebar/Sidebar.jsx
+++ b/src/core/components/elements/Sidebar/Sidebar.jsx
@@ -81,7 +81,7 @@ const Sidebar = ({ active, close }) => {
               exit={{ left: '-80%' }}
               transition={transition}
             >
-              <div className='divide-y divide-gray_r-6'>
+              <div className='divide-y divide-gray_r-6 h-full flex flex-col'>
                 <div className='p-4 flex gap-x-3'>
                   {!auth && (
                     <>
@@ -114,113 +114,115 @@ const Sidebar = ({ active, close }) => {
                         href='/my/menu'
                         className='!text-gray_r-11 ml-auto my-auto'
                       > 
-                        <UserIcon class='h-6 w-6 text-gray-500' />
+                        <UserIcon className='h-6 w-6 text-gray-500' />
                       </Link>
                     </>
                   )}
                 </div>
-                <SidebarLink className={itemClassName} href='/shop/promo'>
-                  Semua Promo
-                </SidebarLink>
-                <SidebarLink className={itemClassName} href='/shop/brands'>
-                  Semua Brand
-                </SidebarLink>
-                <SidebarLink
-                  className={itemClassName}
-                  href='https://blog.indoteknik.com/'
-                  target='_blank'
-                  rel='noreferrer noopener'
-                >
-                  Blog Indoteknik
-                </SidebarLink>
-                {/* <SidebarLink className={itemClassName} href='/video'>
-                  Indoteknik TV
-                </SidebarLink> */}
-                <SidebarLink className={itemClassName} href='/tentang-kami'>
-                  Tentang Indoteknik
-                </SidebarLink>
-                <SidebarLink className={itemClassName} href='/contact-us'>
-                  Hubungi Kami
-                </SidebarLink>
-                <button
-                  className={`${itemClassName} w-full text-left flex`}
-                  onClick={() => setOpenCategory(!isOpenCategory)}
-                >
-                  Kategori
-                  <div className='ml-auto'>
-                    {!isOpenCategory && <ChevronDownIcon className='text-gray_r-12 w-5' />}
-                    {isOpenCategory && <ChevronUpIcon className='text-gray_r-12 w-5' />}
-                  </div>
-                </button>
-                {isOpenCategory &&
-                  categories.map((category) => (
-                    <Fragment key={category.id}>
-                      <div className='flex w-full text-gray_r-11 border-b border-gray_r-6 px-4 pl-8 items-center'>
-                        <Link
-                          href={createSlug('/shop/category/', category.name, category.id)}
-                          className='flex-1 font-normal !text-gray_r-11 py-4 flex items-center flex-row'
-                        >
-                          <div className='mr-2  flex justify-center items-center'>
-                            <Image src={category.image} alt='' width={25} height={25} />
+                <div className='overflow-y-auto flex-1'>
+                  <SidebarLink className={itemClassName} href='/shop/promo'>
+                    Semua Promo
+                  </SidebarLink>
+                  <SidebarLink className={itemClassName} href='/shop/brands'>
+                    Semua Brand
+                  </SidebarLink>
+                  <SidebarLink
+                    className={itemClassName}
+                    href='https://blog.indoteknik.com/'
+                    target='_blank'
+                    rel='noreferrer noopener'
+                  >
+                    Blog Indoteknik
+                  </SidebarLink>
+                  {/* <SidebarLink className={itemClassName} href='/video'>
+                    Indoteknik TV
+                  </SidebarLink> */}
+                  <SidebarLink className={itemClassName} href='/tentang-kami'>
+                    Tentang Indoteknik
+                  </SidebarLink>
+                  <SidebarLink className={itemClassName} href='/contact-us'>
+                    Hubungi Kami
+                  </SidebarLink>
+                  <button
+                    className={`${itemClassName} w-full text-left flex`}
+                    onClick={() => setOpenCategory(!isOpenCategory)}
+                  >
+                    Kategori
+                    <div className='ml-auto'>
+                      {!isOpenCategory && <ChevronDownIcon className='text-gray_r-12 w-5' />}
+                      {isOpenCategory && <ChevronUpIcon className='text-gray_r-12 w-5' />}
+                    </div>
+                  </button>
+                  {isOpenCategory &&
+                    categories.map((category) => (
+                      <Fragment key={category.id}>
+                        <div className='flex w-full text-gray_r-11 border-b border-gray_r-6 px-4 pl-8 items-center'>
+                          <Link
+                            href={createSlug('/shop/category/', category.name, category.id)}
+                            className='flex-1 font-normal !text-gray_r-11 py-4 flex items-center flex-row'
+                          >
+                            <div className='mr-2  flex justify-center items-center'>
+                              <Image src={category.image} alt='' width={25} height={25} />
+                            </div>
+                            {category.name}
+                          </Link>
+                          <div
+                            className='ml-4 h-full py-4'
+                            onClick={() => toggleCategories(category.id)}
+                          >
+                            {!category.isOpen && <ChevronDownIcon className='text-gray_r-11 w-5' />}
+                            {category.isOpen && <ChevronUpIcon className='text-gray_r-11 w-5' />}
                           </div>
-                          {category.name}
-                        </Link>
-                        <div
-                          className='ml-4 h-full py-4'
-                          onClick={() => toggleCategories(category.id)}
-                        >
-                          {!category.isOpen && <ChevronDownIcon className='text-gray_r-11 w-5' />}
-                          {category.isOpen && <ChevronUpIcon className='text-gray_r-11 w-5' />}
                         </div>
-                      </div>
-                      {category.isOpen &&
-                        category.childs.map((child1Category) => (
-                          <Fragment key={child1Category.id}>
-                            <div
-                              className={`flex w-full !text-gray_r-11 border-b border-gray_r-6 p-4 pl-12 ${
-                                category.isOpen ? 'bg-gray_r-2' : ''
-                              }`}
-                            >
-                              <Link
-                                href={createSlug('/shop/category/', child1Category.name, child1Category.id)}
-                                className='flex-1 font-normal !text-gray_r-11 flex flex-row items-center'
+                        {category.isOpen &&
+                          category.childs.map((child1Category) => (
+                            <Fragment key={child1Category.id}>
+                              <div
+                                className={`flex w-full !text-gray_r-11 border-b border-gray_r-6 p-4 pl-12 ${
+                                  category.isOpen ? 'bg-gray_r-2' : ''
+                                }`}
                               >
-                                <div className='mr-2  flex justify-center items-center'>
-                                  <Image src={`https://erp.indoteknik.com/api/image/product.public.category/image_1920/${child1Category.id}`} alt='' width={25} height={25} />
-                                </div>
-                                {child1Category.name}
-                              </Link>
-                              {child1Category.childs.length > 0 && (
-                                <div
-                                  className='ml-4 h-full'
-                                  onClick={() => toggleCategories(child1Category.id)}
-                                >
-                                  {!child1Category.isOpen && (
-                                    <ChevronDownIcon className='text-gray_r-11 w-5' />
-                                  )}
-                                  {child1Category.isOpen && (
-                                    <ChevronUpIcon className='text-gray_r-11 w-5' />
-                                  )}
-                                </div>
-                              )}
-                            </div>
-                            {child1Category.isOpen &&
-                              child1Category.childs.map((child2Category) => (
                                 <Link
-                                  key={child2Category.id}
-                                  href={createSlug('/shop/category/', child2Category.name, child2Category.id)}
-                                  className='flex w-full font-normal !text-gray_r-11 border-b border-gray_r-6 p-4 pl-16 flex-row'
+                                  href={createSlug('/shop/category/', child1Category.name, child1Category.id)}
+                                  className='flex-1 font-normal !text-gray_r-11 flex flex-row items-center'
                                 >
                                   <div className='mr-2  flex justify-center items-center'>
-                                    <Image src={`https://erp.indoteknik.com/api/image/product.public.category/image_1920/${child2Category.id}`} alt='' width={25} height={25} />
+                                    <Image src={`https://erp.indoteknik.com/api/image/product.public.category/image_1920/${child1Category.id}`} alt='' width={25} height={25} />
                                   </div>
-                                  {child2Category.name}
+                                  {child1Category.name}
                                 </Link>
-                              ))}
-                          </Fragment>
-                        ))}
-                    </Fragment>
-                  ))}
+                                {child1Category.childs.length > 0 && (
+                                  <div
+                                    className='ml-4 h-full'
+                                    onClick={() => toggleCategories(child1Category.id)}
+                                  >
+                                    {!child1Category.isOpen && (
+                                      <ChevronDownIcon className='text-gray_r-11 w-5' />
+                                    )}
+                                    {child1Category.isOpen && (
+                                      <ChevronUpIcon className='text-gray_r-11 w-5' />
+                                    )}
+                                  </div>
+                                )}
+                              </div>
+                              {child1Category.isOpen &&
+                                child1Category.childs.map((child2Category) => (
+                                  <Link
+                                    key={child2Category.id}
+                                    href={createSlug('/shop/category/', child2Category.name, child2Category.id)}
+                                    className='flex w-full font-normal !text-gray_r-11 border-b border-gray_r-6 p-4 pl-16 flex-row'
+                                  >
+                                    <div className='mr-2  flex justify-center items-center'>
+                                      <Image src={`https://erp.indoteknik.com/api/image/product.public.category/image_1920/${child2Category.id}`} alt='' width={25} height={25} />
+                                    </div>
+                                    {child2Category.name}
+                                  </Link>
+                                ))}
+                            </Fragment>
+                          ))}
+                      </Fragment>
+                    ))}
+                </div>
               </div>
             </motion.div>
           </>
-- 
cgit v1.2.3


From d3e867689b9b171efb8f5a85c7a4cb39b7e7b8fd Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 5 Sep 2024 09:40:32 +0700
Subject: <iman> update new register

---
 src/lib/auth/components/CompanyProfile.jsx | 69 ++++++++++++++++++++++--------
 1 file changed, 52 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/lib/auth/components/CompanyProfile.jsx b/src/lib/auth/components/CompanyProfile.jsx
index a4c25e40..581c32b0 100644
--- a/src/lib/auth/components/CompanyProfile.jsx
+++ b/src/lib/auth/components/CompanyProfile.jsx
@@ -6,8 +6,10 @@ import { ChevronDownIcon, ChevronUpIcon } from '@heroicons/react/24/outline'
 import { useEffect, useState } from 'react'
 import { Controller, useForm } from 'react-hook-form'
 import { toast } from 'react-hot-toast'
+import BottomPopup from '@/core/components/elements/Popup/BottomPopup'
 
 const CompanyProfile = () => {
+  const [changeConfirmation, setChangeConfirmation] = useState(false)
   const auth = useAuth()
   const [isOpen, setIsOpen] = useState(false)
   const toggle = () => setIsOpen(!isOpen)
@@ -17,10 +19,10 @@ const CompanyProfile = () => {
       companyType: '',
       name: '',
       taxName: '',
-      npwp: ''
+      npwp: '',
+      alamat_wajib_pajak:'',
     }
   })
-  console.log("auth",auth)
 
   const [industries, setIndustries] = useState([])
   useEffect(() => {
@@ -43,7 +45,6 @@ const CompanyProfile = () => {
   useEffect(() => {
     const loadProfile = async () => {
       const dataProfile = await addressApi({ id: auth.parentId })
-      console.log("dataProfile",dataProfile)
       setValue('name', dataProfile.name)
       setValue('industry', dataProfile.industryId)
       setValue('companyType', dataProfile.companyTypeId)
@@ -55,24 +56,55 @@ const CompanyProfile = () => {
   }, [auth, setValue])
 
   const onSubmitHandler = async (values) => {
-    const data = {
-      ...values,
-      id_user:auth.partnerId,
-      company_type_id: values.companyType,
-      industry_id: values.industry,
-      tax_name: values.taxName,
-      alamat_lengkap_text:values.alamat_wajib_pajak
+    if(changeConfirmation){
+      const data = {
+        ...values,
+        company_type_id: values.companyType,
+        industry_id: values.industry,
+        tax_name: values.taxName,
+        alamat_lengkap_text:values.alamat_wajib_pajak
+      }
+      const isUpdated = await odooApi('PUT', `/api/v1/partner/${auth.parentId}`, data)
+      if (isUpdated?.id) {
+        toast.success('Berhasil mengubah profil', { duration: 1500 })
+        return
+      }
+      toast.error('Terjadi kesalahan internal')
     }
-    const isUpdated = await odooApi('PUT', `/api/v1/partner/${auth.parentId}`, data)
-    if (isUpdated?.id) {
-      toast.success('Berhasil mengubah profil', { duration: 1500 })
-      return
-    }
-    toast.error('Terjadi kesalahan internal')
+  }
+
+  const handleConfirmSubmit = () => {
+    setChangeConfirmation(false)
+    handleSubmit(onSubmitHandler)()
   }
 
   return (
     <>
+      <BottomPopup
+        active={changeConfirmation}
+        close={() => setChangeConfirmation(true)}
+        title='Ubah profil Bisnis'
+      >
+        <div className='leading-7 text-gray_r-12/80'>
+          Apakah anda yakin mengubah data bisnis?
+        </div>
+        <div className='flex mt-6 gap-x-4 md:justify-end'>
+          <button
+            className='btn-solid-red flex-1 md:flex-none'
+            type='button'
+            onClick={handleConfirmSubmit}
+          >
+            Ya, Ubah
+          </button>
+          <button
+            className='btn-light flex-1 md:flex-none'
+            type='button'
+            onClick={() => setChangeConfirmation(false)}
+          >
+            Batal
+          </button>
+        </div>
+      </BottomPopup>
       <button type='button' onClick={toggle} className='p-4 flex items-center text-left w-full'>
         <div>
           <div className='font-semibold mb-2'>Informasi Usaha</div>
@@ -87,7 +119,10 @@ const CompanyProfile = () => {
       </button>
 
       {isOpen && (
-        <form className='p-4 border-t border-gray_r-6' onSubmit={handleSubmit(onSubmitHandler)}>
+        <form className='p-4 border-t border-gray_r-6' onSubmit={(e) => {
+          e.preventDefault()
+          setChangeConfirmation(true) 
+        }}>
           <div className='grid grid-cols-1 sm:grid-cols-2 gap-4'>
             <div>
               <label className='block mb-3'>Klasifikasi Jenis Usaha</label>
-- 
cgit v1.2.3


From 969ca83a9adce96b3b58973654b29d3c2dd47a88 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 5 Sep 2024 17:49:57 +0700
Subject: <iman> update mapping solr

---
 src/lib/home/api/categoryManagementApi.js   | 47 +++++++++++++++++++++++++----
 src/lib/home/components/CategoryDynamic.jsx | 25 ++++++++++++++-
 2 files changed, 65 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/lib/home/api/categoryManagementApi.js b/src/lib/home/api/categoryManagementApi.js
index b70d60ce..63edd629 100644
--- a/src/lib/home/api/categoryManagementApi.js
+++ b/src/lib/home/api/categoryManagementApi.js
@@ -1,8 +1,43 @@
-import odooApi from '@/core/api/odooApi'
+// import odooApi from '@/core/api/odooApi'
 
-const categoryManagementApi = async () => {
-    const dataCategoryManagement = await odooApi('GET', '/api/v1/categories_management')
-    return dataCategoryManagement
-}
+// const categoryManagementApi = async () => {
+//     const dataCategoryManagement = await odooApi('GET', '/api/v1/categories_management')
+//     return dataCategoryManagement
+// }
 
-export default categoryManagementApi
+// export default categoryManagementApi
+
+
+
+export const fetchPopulerProductSolr = async (category_id_ids) => {
+    let sort ='sort=qty_sold_f desc';
+    try {
+        const queryParams = new URLSearchParams({ q: category_id_ids });
+        const response = await fetch(`/solr/category_management/query?q=*:*&q.op=OR&indent=true`);
+        if (!response.ok) {
+            throw new Error(`HTTP error! status: ${response.status}`);
+        }
+        const data = await response.json();
+      const promotions = await map(data.response.docs);
+      return promotions;
+    } catch (error) {
+      console.error("Error fetching promotion data:", error);
+      return [];
+    }
+  };
+
+  const map = async (promotions) => {
+    const result = [];
+    for (const promotion of promotions) {
+      const data = {
+        id: promotion.id,
+        name: promotion.name_s,
+        image: promotion.image_s,
+        sequence: promotion.sequence_i,
+        numFound: promotion.numFound_i,
+        categories_level_2:promotion.categories_level_2
+      };
+      result.push(data);
+    }
+    return result;
+  };
\ No newline at end of file
diff --git a/src/lib/home/components/CategoryDynamic.jsx b/src/lib/home/components/CategoryDynamic.jsx
index c257e9f9..11a15d6d 100644
--- a/src/lib/home/components/CategoryDynamic.jsx
+++ b/src/lib/home/components/CategoryDynamic.jsx
@@ -1,5 +1,6 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState, useCallback } from 'react';
 import useCategoryManagement from '../hooks/useCategoryManagement';
+import {fetchPopulerProductSolr} from '../api/categoryManagementApi'
 import NextImage from 'next/image';
 import Link from "next/link";
 import { createSlug } from '@/core/utils/slug';
@@ -12,6 +13,28 @@ import 'swiper/css/pagination';
 import { Navigation, Pagination, Autoplay } from 'swiper';
 
 const CategoryDynamic = () => {
+
+  const [manufactures, setManufactures] = useState([])
+  const loadBrand = useCallback(async () => {
+    // setIsLoading(true)
+    //Get brand from odoo
+    /*const result = await odooApi(
+      'GET',
+      `/api/v1/manufacture?limit=0&offset=${manufactures.length}&name=${name}`
+    )*/
+
+    // Change get brands from solr
+    const items = await fetchPopulerProductSolr();
+
+    console.log("items",items)
+    
+    // setIsLoading(false)
+    // setManufactures((manufactures) => [...result.data])
+  }, [])
+
+  useEffect(() => {
+    loadBrand()
+  }, [loadBrand])
   const { categoryManagement } = useCategoryManagement();
   // const [categoryData, setCategoryData] = useState({});
   // const [subCategoryData, setSubCategoryData] = useState({});
-- 
cgit v1.2.3


From 3b466589463522ded2f172474a0de533ef02d92c Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 6 Sep 2024 09:52:38 +0700
Subject: <iman> back to code

---
 src/lib/home/api/categoryManagementApi.js   | 47 ++++-------------------------
 src/lib/home/components/CategoryDynamic.jsx | 21 -------------
 2 files changed, 6 insertions(+), 62 deletions(-)

(limited to 'src')

diff --git a/src/lib/home/api/categoryManagementApi.js b/src/lib/home/api/categoryManagementApi.js
index 63edd629..b70d60ce 100644
--- a/src/lib/home/api/categoryManagementApi.js
+++ b/src/lib/home/api/categoryManagementApi.js
@@ -1,43 +1,8 @@
-// import odooApi from '@/core/api/odooApi'
+import odooApi from '@/core/api/odooApi'
 
-// const categoryManagementApi = async () => {
-//     const dataCategoryManagement = await odooApi('GET', '/api/v1/categories_management')
-//     return dataCategoryManagement
-// }
+const categoryManagementApi = async () => {
+    const dataCategoryManagement = await odooApi('GET', '/api/v1/categories_management')
+    return dataCategoryManagement
+}
 
-// export default categoryManagementApi
-
-
-
-export const fetchPopulerProductSolr = async (category_id_ids) => {
-    let sort ='sort=qty_sold_f desc';
-    try {
-        const queryParams = new URLSearchParams({ q: category_id_ids });
-        const response = await fetch(`/solr/category_management/query?q=*:*&q.op=OR&indent=true`);
-        if (!response.ok) {
-            throw new Error(`HTTP error! status: ${response.status}`);
-        }
-        const data = await response.json();
-      const promotions = await map(data.response.docs);
-      return promotions;
-    } catch (error) {
-      console.error("Error fetching promotion data:", error);
-      return [];
-    }
-  };
-
-  const map = async (promotions) => {
-    const result = [];
-    for (const promotion of promotions) {
-      const data = {
-        id: promotion.id,
-        name: promotion.name_s,
-        image: promotion.image_s,
-        sequence: promotion.sequence_i,
-        numFound: promotion.numFound_i,
-        categories_level_2:promotion.categories_level_2
-      };
-      result.push(data);
-    }
-    return result;
-  };
\ No newline at end of file
+export default categoryManagementApi
diff --git a/src/lib/home/components/CategoryDynamic.jsx b/src/lib/home/components/CategoryDynamic.jsx
index 11a15d6d..14015e28 100644
--- a/src/lib/home/components/CategoryDynamic.jsx
+++ b/src/lib/home/components/CategoryDynamic.jsx
@@ -14,27 +14,6 @@ import { Navigation, Pagination, Autoplay } from 'swiper';
 
 const CategoryDynamic = () => {
 
-  const [manufactures, setManufactures] = useState([])
-  const loadBrand = useCallback(async () => {
-    // setIsLoading(true)
-    //Get brand from odoo
-    /*const result = await odooApi(
-      'GET',
-      `/api/v1/manufacture?limit=0&offset=${manufactures.length}&name=${name}`
-    )*/
-
-    // Change get brands from solr
-    const items = await fetchPopulerProductSolr();
-
-    console.log("items",items)
-    
-    // setIsLoading(false)
-    // setManufactures((manufactures) => [...result.data])
-  }, [])
-
-  useEffect(() => {
-    loadBrand()
-  }, [loadBrand])
   const { categoryManagement } = useCategoryManagement();
   // const [categoryData, setCategoryData] = useState({});
   // const [subCategoryData, setSubCategoryData] = useState({});
-- 
cgit v1.2.3


From fc635c6ce35d8b40baffb456e25342957a781940 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 6 Sep 2024 10:47:09 +0700
Subject: <iman> update solr mapping category management

---
 src/lib/home/api/categoryManagementApi.js   | 70 ++++++++++++++++++++++++++---
 src/lib/home/components/CategoryDynamic.jsx | 21 +++++++++
 2 files changed, 85 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/lib/home/api/categoryManagementApi.js b/src/lib/home/api/categoryManagementApi.js
index b70d60ce..54a6c1ac 100644
--- a/src/lib/home/api/categoryManagementApi.js
+++ b/src/lib/home/api/categoryManagementApi.js
@@ -1,8 +1,66 @@
-import odooApi from '@/core/api/odooApi'
+// import odooApi from '@/core/api/odooApi'
 
-const categoryManagementApi = async () => {
-    const dataCategoryManagement = await odooApi('GET', '/api/v1/categories_management')
-    return dataCategoryManagement
-}
+// const categoryManagementApi = async () => {
+//     const dataCategoryManagement = await odooApi('GET', '/api/v1/categories_management')
+//     return dataCategoryManagement
+// }
 
-export default categoryManagementApi
+// export default categoryManagementApi
+
+
+
+export const fetchPopulerProductSolr = async () => {
+    let sort ='sort=sequence_i asc';
+    try {
+        const response = await fetch(`/solr/category_management/query?q=*:*&q.op=OR&indent=true&${sort}`);
+        if (!response.ok) {
+          throw new Error(`HTTP error! status: ${response.status}`);
+        }
+        const data = await response.json();
+      const promotions = await map(data.response.docs);
+      return promotions;
+    } catch (error) {
+      console.error("Error fetching promotion data:", error);
+      return [];
+    }
+  };
+
+  const map = async (promotions) => {
+    console.log("promotions",promotions)
+    const result = [];
+    for (const promotion of promotions) {
+      console.log("promotion",promotion)
+      const mappedCategories = promotion.categories.map((level2) => {
+        console.log("level2",JSON.parse(level2))
+        const childFrontend = level2.child_frontend_id_i.map((level3) => {
+          return {
+            id_level_3: level3.id_level_3,
+            name: level3.name,
+            numFound: level3.numFound,
+            image: level3.image
+          };
+        });
+  
+        return {
+          id_level_2: level2.id_level_2,
+          name: level2.name,
+          numFound: level2.numFound,
+          image: level2.image,
+          child_frontend_id_i: childFrontend
+        };
+      });
+  
+      const data = {
+        id: promotion.id,
+        category_id_i: promotion.category_id_i,
+        name: promotion.name_s,
+        sequence: promotion.sequence_i,
+        numFound: promotion.numFound_i,
+        image: promotion.image_s,
+        categories: mappedCategories
+      };
+      result.push(data);
+    }
+    return result;
+  };
+  
\ No newline at end of file
diff --git a/src/lib/home/components/CategoryDynamic.jsx b/src/lib/home/components/CategoryDynamic.jsx
index 14015e28..11a15d6d 100644
--- a/src/lib/home/components/CategoryDynamic.jsx
+++ b/src/lib/home/components/CategoryDynamic.jsx
@@ -14,6 +14,27 @@ import { Navigation, Pagination, Autoplay } from 'swiper';
 
 const CategoryDynamic = () => {
 
+  const [manufactures, setManufactures] = useState([])
+  const loadBrand = useCallback(async () => {
+    // setIsLoading(true)
+    //Get brand from odoo
+    /*const result = await odooApi(
+      'GET',
+      `/api/v1/manufacture?limit=0&offset=${manufactures.length}&name=${name}`
+    )*/
+
+    // Change get brands from solr
+    const items = await fetchPopulerProductSolr();
+
+    console.log("items",items)
+    
+    // setIsLoading(false)
+    // setManufactures((manufactures) => [...result.data])
+  }, [])
+
+  useEffect(() => {
+    loadBrand()
+  }, [loadBrand])
   const { categoryManagement } = useCategoryManagement();
   // const [categoryData, setCategoryData] = useState({});
   // const [subCategoryData, setSubCategoryData] = useState({});
-- 
cgit v1.2.3


From f7ad601638549f024201d3ee1fa920abe7c74f64 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 6 Sep 2024 14:59:17 +0700
Subject: <iman> update mapping solr data fetch

---
 src/lib/home/api/categoryManagementApi.js         | 82 ++++++++---------------
 src/lib/home/components/CategoryDynamic.jsx       | 38 ++++-------
 src/lib/home/components/CategoryDynamicMobile.jsx | 45 ++++++++-----
 src/lib/home/hooks/useCategoryManagement.js       | 13 ----
 4 files changed, 71 insertions(+), 107 deletions(-)
 delete mode 100644 src/lib/home/hooks/useCategoryManagement.js

(limited to 'src')

diff --git a/src/lib/home/api/categoryManagementApi.js b/src/lib/home/api/categoryManagementApi.js
index 54a6c1ac..3723681c 100644
--- a/src/lib/home/api/categoryManagementApi.js
+++ b/src/lib/home/api/categoryManagementApi.js
@@ -1,66 +1,40 @@
-// import odooApi from '@/core/api/odooApi'
-
-// const categoryManagementApi = async () => {
-//     const dataCategoryManagement = await odooApi('GET', '/api/v1/categories_management')
-//     return dataCategoryManagement
-// }
-
-// export default categoryManagementApi
-
-
-
-export const fetchPopulerProductSolr = async () => {
+export const fetchCategoryManagementSolr = async () => {
     let sort ='sort=sequence_i asc';
     try {
-        const response = await fetch(`/solr/category_management/query?q=*:*&q.op=OR&indent=true&${sort}`);
+        const response = await fetch(`/solr/category_management/query?q=*:*&q.op=OR&indent=true&${sort}&fq=categories:%5B*%20TO%20*%5D`);
         if (!response.ok) {
           throw new Error(`HTTP error! status: ${response.status}`);
         }
         const data = await response.json();
-      const promotions = await map(data.response.docs);
-      return promotions;
-    } catch (error) {
-      console.error("Error fetching promotion data:", error);
-      return [];
-    }
-  };
-
-  const map = async (promotions) => {
-    console.log("promotions",promotions)
-    const result = [];
-    for (const promotion of promotions) {
-      console.log("promotion",promotion)
-      const mappedCategories = promotion.categories.map((level2) => {
-        console.log("level2",JSON.parse(level2))
-        const childFrontend = level2.child_frontend_id_i.map((level3) => {
-          return {
-            id_level_3: level3.id_level_3,
-            name: level3.name,
-            numFound: level3.numFound,
-            image: level3.image
-          };
-        });
-  
-        return {
-          id_level_2: level2.id_level_2,
-          name: level2.name,
-          numFound: level2.numFound,
-          image: level2.image,
-          child_frontend_id_i: childFrontend
-        };
+        const promotions = await map(data.response.docs);
+        return promotions;
+      } catch (error) {
+        console.error("Error fetching promotion data:", error);
+        return [];
+      }
+    };
+    
+    const map = async (promotions) => {
+      return promotions.map((promotion) =>{
+        let parsedCategories = promotion.categories.map(category => {
+          // Parse string JSON utama
+          let parsedCategory = JSON.parse(category);
+      
+          // Parse setiap elemen di child_frontend_id_i jika ada
+          if (parsedCategory.child_frontend_id_i) {
+              parsedCategory.child_frontend_id_i = parsedCategory.child_frontend_id_i.map(child => JSON.parse(child));
+          }
+      
+          return parsedCategory;
       });
-  
-      const data = {
+      let productMapped = {
         id: promotion.id,
-        category_id_i: promotion.category_id_i,
         name: promotion.name_s,
+        image: promotion.image_s,
         sequence: promotion.sequence_i,
         numFound: promotion.numFound_i,
-        image: promotion.image_s,
-        categories: mappedCategories
+        categories: parsedCategories
       };
-      result.push(data);
-    }
-    return result;
-  };
-  
\ No newline at end of file
+      return productMapped;
+    })
+  };
\ No newline at end of file
diff --git a/src/lib/home/components/CategoryDynamic.jsx b/src/lib/home/components/CategoryDynamic.jsx
index 11a15d6d..ca104ada 100644
--- a/src/lib/home/components/CategoryDynamic.jsx
+++ b/src/lib/home/components/CategoryDynamic.jsx
@@ -1,6 +1,5 @@
 import React, { useEffect, useState, useCallback } from 'react';
-import useCategoryManagement from '../hooks/useCategoryManagement';
-import {fetchPopulerProductSolr} from '../api/categoryManagementApi'
+import {fetchCategoryManagementSolr} from '../api/categoryManagementApi'
 import NextImage from 'next/image';
 import Link from "next/link";
 import { createSlug } from '@/core/utils/slug';
@@ -14,28 +13,20 @@ import { Navigation, Pagination, Autoplay } from 'swiper';
 
 const CategoryDynamic = () => {
 
-  const [manufactures, setManufactures] = useState([])
+  const [categoryManagement, setCategoryManagement] = useState([])
+  const [isLoading, setIsLoading] = useState(false)
   const loadBrand = useCallback(async () => {
-    // setIsLoading(true)
-    //Get brand from odoo
-    /*const result = await odooApi(
-      'GET',
-      `/api/v1/manufacture?limit=0&offset=${manufactures.length}&name=${name}`
-    )*/
-
-    // Change get brands from solr
-    const items = await fetchPopulerProductSolr();
-
-    console.log("items",items)
+    setIsLoading(true)
+    const items = await fetchCategoryManagementSolr();
     
-    // setIsLoading(false)
-    // setManufactures((manufactures) => [...result.data])
+    setIsLoading(false)
+    setCategoryManagement(items)
   }, [])
 
   useEffect(() => {
     loadBrand()
   }, [loadBrand])
-  const { categoryManagement } = useCategoryManagement();
+  
   // const [categoryData, setCategoryData] = useState({});
   // const [subCategoryData, setSubCategoryData] = useState({});
   
@@ -76,18 +67,17 @@ const CategoryDynamic = () => {
  
   return (
     <div>
-        {categoryManagement && categoryManagement.data?.map((category) => {
+        {categoryManagement && categoryManagement?.map((category) => {
           // const countLevel1 = categoryData[category.categoryIdI] || 0;
-          
           return (
-            <Skeleton key={category.id} isLoaded={categoryManagement}>
+            <Skeleton key={category.id} isLoaded={!isLoading}>
               <div key={category.id}>
                 <div className='bagian-judul flex flex-row justify-start items-center gap-3 mb-4 mt-4'>
                   <div className='font-semibold sm:text-h-lg mr-2'>{category.name}</div>
                   {/* <Skeleton isLoaded={countLevel1 != 0}>
                     <p className={`text-gray_r-10 text-sm`}>{countLevel1} Produk tersedia</p>
                   </Skeleton> */}
-                  <Link href={createSlug('/shop/category/', category?.name, category?.categoryIdI)} className="!text-red-500 font-semibold">Lihat Semua</Link>
+                  <Link href={createSlug('/shop/category/', category?.name, category?.id)} className="!text-red-500 font-semibold">Lihat Semua</Link>
                 </div>
                 
                 {/* Swiper for SubCategories */}
@@ -115,13 +105,13 @@ const CategoryDynamic = () => {
                                     {countLevel2} Produk tersedia
                                   </p>
                                 </Skeleton> */}
-                                <Link href={createSlug('/shop/category/', subCategory?.name, subCategory?.idLevel2)} className="!text-red-500 font-semibold">Lihat Semua</Link>
+                                <Link href={createSlug('/shop/category/', subCategory?.name, subCategory?.id_level_2)} className="!text-red-500 font-semibold">Lihat Semua</Link>
                               </div>
                             </div>
                             <div className='grid grid-cols-2 gap-2 overflow-y-auto max-h-[240px] min-h-[240px] content-start'>
-                              {subCategory.childFrontendIdI.map((childCategory) => (
+                              {subCategory.child_frontend_id_i.map((childCategory) => (
                                 <div key={childCategory.id} className=''>
-                                  <Link href={createSlug('/shop/category/', childCategory?.name, childCategory?.idLevel3)} className="flex flex-row gap-2 border rounded group hover:border-red-500">
+                                  <Link href={createSlug('/shop/category/', childCategory?.name, childCategory?.id_level_3)} className="flex flex-row gap-2 border rounded group hover:border-red-500">
                                     <NextImage
                                       src={childCategory.image ? childCategory.image : "/images/noimage.jpeg"}
                                       alt={childCategory.name}
diff --git a/src/lib/home/components/CategoryDynamicMobile.jsx b/src/lib/home/components/CategoryDynamicMobile.jsx
index 2877a5a7..1061f3e4 100644
--- a/src/lib/home/components/CategoryDynamicMobile.jsx
+++ b/src/lib/home/components/CategoryDynamicMobile.jsx
@@ -1,22 +1,35 @@
-import React, { useEffect, useState } from 'react';
-import useCategoryManagement  from '../hooks/useCategoryManagement';
+import React, { useEffect, useState, useCallback } from 'react';
 import NextImage from 'next/image';
 import Link from "next/link";
 import { createSlug } from '@/core/utils/slug';
 import { Swiper, SwiperSlide } from 'swiper/react';
 import 'swiper/css';
+import {fetchCategoryManagementSolr} from '../api/categoryManagementApi'
 
 const CategoryDynamicMobile = () => {
-  const { categoryManagement } = useCategoryManagement()
   const [selectedCategory, setSelectedCategory] = useState({});
+  const [categoryManagement, setCategoryManagement] = useState([])
+  const [isLoading, setIsLoading] = useState(false)
+
+  const loadBrand = useCallback(async () => {
+    setIsLoading(true)
+    const items = await fetchCategoryManagementSolr();
+    
+    setIsLoading(false)
+    setCategoryManagement(items)
+  }, [])
+
+  useEffect(() => {
+    loadBrand()
+  }, [loadBrand])
 
   useEffect(() => {
     const loadPromo = async () => {
       try {
-        if (categoryManagement.data?.length > 0) {
-          const initialSelections = categoryManagement.data.reduce((acc, category) => {
+        if (categoryManagement?.length > 0) {
+          const initialSelections = categoryManagement.reduce((acc, category) => {
             if (category.categories.length > 0) {
-              acc[category.id] = category.categories[0].idLevel2;
+              acc[category.id] = category.categories[0].id_level_2;
             }
             return acc;
           }, {});
@@ -28,7 +41,7 @@ const CategoryDynamicMobile = () => {
     };
 
     loadPromo();
-  }, [categoryManagement.data]);
+  }, [categoryManagement]);
 
   const handleCategoryLevel2Click = (categoryIdI, idLevel2) => {
     setSelectedCategory(prev => ({
@@ -39,18 +52,18 @@ const CategoryDynamicMobile = () => {
  
   return (
     <div className='p-4'>
-      {categoryManagement.data && categoryManagement.data.map((category) => (
+      {categoryManagement && categoryManagement?.map((category) => (
         <div key={category.id}>
           <div className='bagian-judul flex flex-row justify-between items-center gap-3 mb-4 mt-4'>
-            <div className='font-semibold sm:text-h-sm mr-2'>{category.name}</div>
-            <Link href={createSlug('/shop/category/', category?.name, category?.categoryIdI)} className="!text-red-500 font-semibold text-sm">Lihat Semua</Link>
+            <div className='font-semibold sm:text-h-sm mr-2'>{category?.name}</div>
+            <Link href={createSlug('/shop/category/', category?.name, category?.id)} className="!text-red-500 font-semibold text-sm">Lihat Semua</Link>
           </div>
           <Swiper slidesPerView={2.3} spaceBetween={10}>
             {category.categories.map((index) => (
               <SwiperSlide key={index.id}>
                 <div
-                  onClick={() => handleCategoryLevel2Click(category.id, index?.idLevel2)}
-                  className={`border flex justify-start items-center max-w-48 max-h-16 rounded ${selectedCategory[category.id] === index?.idLevel2 ? 'bg-red-50 border-red-500 text-red-500' : 'border-gray-200 text-gray-900'}`}
+                  onClick={() => handleCategoryLevel2Click(category.id, index?.id_level_2)}
+                  className={`border flex justify-start items-center max-w-48 max-h-16 rounded ${selectedCategory[category.id] === index?.id_level_2 ? 'bg-red-50 border-red-500 text-red-500' : 'border-gray-200 text-gray-900'}`}
                 >
                   <div className='p-1 flex justify-start items-center'>
                     <div className='flex flex-row justify-center items-center'>
@@ -62,7 +75,7 @@ const CategoryDynamicMobile = () => {
                         className=''
                       />
                       <div className='bagian-judul flex flex-col justify-center items-start gap-1 ml-2'>
-                        <div className='font-semibold text-[10px] line-clamp-1'>{index.name}</div>
+                        <div className='font-semibold text-[10px] line-clamp-1'>{index?.name}</div>
                       </div>
                     </div>
                   </div>
@@ -73,9 +86,9 @@ const CategoryDynamicMobile = () => {
           <div className='p-3 mt-2 border'>
             <div className='grid grid-cols-2 gap-2 overflow-y-auto max-h-[240px]'>
               {category.categories.map((index) => (
-                selectedCategory[category.id] === index?.idLevel2 && index.childFrontendIdI.map((x) => (
+                selectedCategory[category.id] === index?.id_level_2 && index?.child_frontend_id_i.map((x) => (
                   <div key={x.id}>
-                    <Link href={createSlug('/shop/category/', x?.name, x?.idLevel3)} className="flex flex-row gap-1 border rounded group hover:border-red-500">
+                    <Link href={createSlug('/shop/category/', x?.name, x?.id_level_3)} className="flex flex-row gap-1 border rounded group hover:border-red-500">
                       <NextImage
                         src={x.image ? x.image : "/images/noimage.jpeg"}
                         alt={x.name}
@@ -84,7 +97,7 @@ const CategoryDynamicMobile = () => {
                         className='p-2'
                       />
                       <div className='bagian-judul flex flex-col justify-center items-start gap-1 break-words line-clamp-2 group-hover:text-red-500'>
-                        <div className='font-semibold line-clamp-2 group-hover:text-red-500 text-[10px]'>{x.name}</div>
+                        <div className='font-semibold line-clamp-2 group-hover:text-red-500 text-[10px]'>{x?.name}</div>
                       </div>
                     </Link>
                   </div>
diff --git a/src/lib/home/hooks/useCategoryManagement.js b/src/lib/home/hooks/useCategoryManagement.js
deleted file mode 100644
index c1dda585..00000000
--- a/src/lib/home/hooks/useCategoryManagement.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import categoryManagementApi from '../api/categoryManagementApi'
-import { useQuery } from 'react-query'
-
-const useCategoryManagement = () => {
-  const fetchCategoryManagement = async () => await categoryManagementApi()
-  const { isLoading, data } = useQuery('categoryManagementApi', fetchCategoryManagement)
-
-  return {
-    categoryManagement: { data, isLoading }
-  }
-}
-
-export default useCategoryManagement
\ No newline at end of file
-- 
cgit v1.2.3


From 4d9200650d232e4302f7e01df96751c3f9412693 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 6 Sep 2024 16:20:51 +0700
Subject: <iman> update data api

---
 src/lib/auth/components/CompanyProfile.jsx | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/lib/auth/components/CompanyProfile.jsx b/src/lib/auth/components/CompanyProfile.jsx
index 581c32b0..e37decc9 100644
--- a/src/lib/auth/components/CompanyProfile.jsx
+++ b/src/lib/auth/components/CompanyProfile.jsx
@@ -59,6 +59,7 @@ const CompanyProfile = () => {
     if(changeConfirmation){
       const data = {
         ...values,
+        id_user:auth.partnerId,
         company_type_id: values.companyType,
         industry_id: values.industry,
         tax_name: values.taxName,
-- 
cgit v1.2.3


From e1753f5cb16ce4094a6106a829339b8db2b99dd2 Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Fri, 6 Sep 2024 16:38:12 +0700
Subject: search

---
 src/pages/api/shop/search.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index d0343fb8..089a1722 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -66,7 +66,6 @@ export default async function handler(req, res) {
 
   let checkQ = q.trim().split(/[\s\+\-\!\(\)\{\}\[\]\^"~\*\?:\\\/]+/);
   let newQ = checkQ.length > 1 ? escapeSolrQuery(q) + '*' : escapeSolrQuery(q);
-  let excludeDescription = checkQ.map(term => escapeSolrQuery(term)).join(' AND ');
 
   let offset = (page - 1) * limit;
   let parameter = [
@@ -76,12 +75,13 @@ export default async function handler(req, res) {
     'indent=true',
     `facet.query=${escapeSolrQuery(q)}`,
     `q.op=${operation}`,
-    `q=${excludeDescription}*`,
-    'qf=name_s^2, description_s, category_name, manufacture_name_s',
+    `q=${newQ}`,
+    `defType=edismax`,
+    'qf=name_s description_clean_t category_name manufacture_name_s variants_code_t variants_name_t category_id_ids default_code_s',
     `start=${parseInt(offset)}`,
     `rows=${limit}`,
     `sort=${paramOrderBy}`,
-    `fq=-publish_b:false, product_rating_f:[8 TO *], price_tier1_v2_f:[1 TO *]`,
+    `fq=-publish_b:false, product_rating_f:[8 TO *], price_tier1_v2_f:[1 TO *]`
   ];
 
   if (priceFrom > 0 || priceTo > 0) {
@@ -127,7 +127,7 @@ export default async function handler(req, res) {
   let result = await axios(
     process.env.SOLR_HOST + '/solr/product/select?' + parameter.join('&')
   );
-  console.log('ini search', parameter.join('&'));
+  
   try {
     result.data.response.products = productMappingSolr(
       result.data.response.docs,
-- 
cgit v1.2.3


From 492db3e7515b2af3770e01c28d3aab76ea7755ee Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 9 Sep 2024 10:13:28 +0700
Subject: <iman> update code to get all data

---
 src/lib/home/api/categoryManagementApi.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/lib/home/api/categoryManagementApi.js b/src/lib/home/api/categoryManagementApi.js
index 3723681c..0aeb2aac 100644
--- a/src/lib/home/api/categoryManagementApi.js
+++ b/src/lib/home/api/categoryManagementApi.js
@@ -1,7 +1,7 @@
 export const fetchCategoryManagementSolr = async () => {
     let sort ='sort=sequence_i asc';
     try {
-        const response = await fetch(`/solr/category_management/query?q=*:*&q.op=OR&indent=true&${sort}&fq=categories:%5B*%20TO%20*%5D`);
+        const response = await fetch(`/solr/category_management/query?q=*:*&q.op=OR&indent=true&${sort}&&rows=20`);
         if (!response.ok) {
           throw new Error(`HTTP error! status: ${response.status}`);
         }
-- 
cgit v1.2.3


From 383adf9edeed30db9f5df8e9ed4752cd513f49a5 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 9 Sep 2024 14:37:47 +0700
Subject: <iman> update new register mobile

---
 src/styles/globals.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/styles/globals.css b/src/styles/globals.css
index ebd5e9a5..f712217a 100644
--- a/src/styles/globals.css
+++ b/src/styles/globals.css
@@ -117,7 +117,7 @@ button {
     }
 
     .form-msg-danger {
-        @apply text-danger-600 mt-2 block;
+        @apply text-danger-600 mt-2 block text-sm;
     }
 
     .btn-yellow,
-- 
cgit v1.2.3


From fefcfc05fd83421cedc76e0f690129fd9a057f77 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 9 Sep 2024 14:57:09 +0700
Subject: <iman> update fetch data all promo

---
 src/pages/api/shop/promo.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/pages/api/shop/promo.js b/src/pages/api/shop/promo.js
index 221a9adb..983f8fae 100644
--- a/src/pages/api/shop/promo.js
+++ b/src/pages/api/shop/promo.js
@@ -52,6 +52,7 @@ export default async function handler(req, res) {
     'facet.field=category_name',
     'facet=true',
     'indent=true',
+    `facet.limit=-1`,
     // `facet.query=${escapeSolrQuery(q)}`,
     `q.op=${operation}`,
     `q=${q}`,
@@ -60,6 +61,7 @@ export default async function handler(req, res) {
     `rows=${limit}`,
     `sort=${paramOrderBy}`,
     `fq=product_ids:[* TO *]`,
+    `active_b:true`,
   ];
 
   if (priceFrom > 0 || priceTo > 0) {
-- 
cgit v1.2.3


From 782a54c1a57ed16f6b28be3c6c589b35cc2fbc97 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 9 Sep 2024 15:15:20 +0700
Subject: <iman> update field active_b

---
 src/pages/api/shop/promo.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/pages/api/shop/promo.js b/src/pages/api/shop/promo.js
index 983f8fae..f90c8559 100644
--- a/src/pages/api/shop/promo.js
+++ b/src/pages/api/shop/promo.js
@@ -61,7 +61,7 @@ export default async function handler(req, res) {
     `rows=${limit}`,
     `sort=${paramOrderBy}`,
     `fq=product_ids:[* TO *]`,
-    `active_b:true`,
+    `fq=active_b:true`,
   ];
 
   if (priceFrom > 0 || priceTo > 0) {
-- 
cgit v1.2.3


From d1f93cea2efbbc045fbe9c5df4d94dea57c4a9b1 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 10 Sep 2024 14:03:45 +0700
Subject: <iman> updaet bug no footer

---
 src/core/components/layouts/AppLayout.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/core/components/layouts/AppLayout.jsx b/src/core/components/layouts/AppLayout.jsx
index ebbc1ad5..c72c1be5 100644
--- a/src/core/components/layouts/AppLayout.jsx
+++ b/src/core/components/layouts/AppLayout.jsx
@@ -15,7 +15,7 @@ const AppLayout = ({ children, title, withFooter = true }) => {
         <AppBar title={title} />
         {children}
       </AnimationLayout>
-      {withFooter && <BasicFooter />}
+      <BasicFooter />
     </>
   );
 };
-- 
cgit v1.2.3


From aff296d79cc148a919b33c2c589d6b803fb39a22 Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Tue, 10 Sep 2024 14:58:24 +0700
Subject: update

---
 src/core/api/odooApi.js      | 2 +-
 src/pages/api/shop/search.js | 3 ++-
 src/pages/index.jsx          | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/core/api/odooApi.js b/src/core/api/odooApi.js
index 3349ff4b..504d097a 100644
--- a/src/core/api/odooApi.js
+++ b/src/core/api/odooApi.js
@@ -64,7 +64,7 @@ const odooApi = async (method, url, data = {}, headers = {}) => {
     }
     return camelcaseObjectDeep(res.data.result) || [];
   } catch (error) {
-    console.log(error);
+    // console.log(error);
   }
 };
 
diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index 089a1722..1b6377f4 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -81,7 +81,8 @@ export default async function handler(req, res) {
     `start=${parseInt(offset)}`,
     `rows=${limit}`,
     `sort=${paramOrderBy}`,
-    `fq=-publish_b:false, product_rating_f:[8 TO *], price_tier1_v2_f:[1 TO *]`
+    `fq=-publish_b:false, product_rating_f:[8 TO *], price_tier1_v2_f:[1 TO *]`,
+    `mm=2`
   ];
 
   if (priceFrom > 0 || priceTo > 0) {
diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 613950a6..0e87205e 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -10,7 +10,7 @@ import { FlashSaleSkeleton } from '@/lib/flashSale/skeleton/FlashSaleSkeleton';
 import PreferredBrandSkeleton from '@/lib/home/components/Skeleton/PreferredBrandSkeleton';
 import BannerPromoSkeleton from '@/lib/home/components/Skeleton/BannerPromoSkeleton';
 import PromotinProgram from '@/lib/promotinProgram/components/HomePage';
-import PagePopupIformation from '~/modules/popup-information';
+import PagePopupIformation from '~/modules/popup-information'; // need change to dynamic and ssr : false
 import CategoryPilihan from '../lib/home/components/CategoryPilihan';
 import odooApi from '@/core/api/odooApi';
 import { getAuth } from '~/libs/auth';
@@ -56,7 +56,7 @@ const ProgramPromotion = dynamic(() =>
 
 const BannerSection = dynamic(() =>
   import('@/lib/home/components/BannerSection')
-);
+);  
 const CategoryHomeId = dynamic(() =>
   import('@/lib/home/components/CategoryHomeId')
 );
@@ -71,8 +71,8 @@ import('@/lib/home/components/CategoryDynamicMobile')
 
 const CustomerReviews = dynamic(() =>
   import('@/lib/review/components/CustomerReviews')
-);
-const ServiceList = dynamic(() => import('@/lib/home/components/ServiceList'));
+); // need to ssr:false
+const ServiceList = dynamic(() => import('@/lib/home/components/ServiceList')); // need to ssr: false
 
 
 
-- 
cgit v1.2.3


From 46faf7e7ba398a4137e93559b2efa5abf3df9663 Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Tue, 10 Sep 2024 15:15:09 +0700
Subject: [Renca testing google crowler]

---
 src/pages/shop/brands/[slug].jsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/pages/shop/brands/[slug].jsx b/src/pages/shop/brands/[slug].jsx
index 88e9b302..ed6724ea 100644
--- a/src/pages/shop/brands/[slug].jsx
+++ b/src/pages/shop/brands/[slug].jsx
@@ -18,9 +18,10 @@ export default function BrandDetail() {
   const brandName = getNameFromSlug(slug)
   const id = getIdFromSlug(slug)
   const {brand} = useBrand({id})
-  if ( !brand.isLoading && _.isEmpty(brand.data)) {
-    return <PageNotFound />;
-  }
+  // if ( !brand.isLoading && _.isEmpty(brand.data)) {
+  //   console.log('ini masuk pak')
+  //   return <PageNotFound />;
+  // }
   return (
     <BasicLayout>
       <Seo
-- 
cgit v1.2.3


From 88e982cb95ec49fe96452317b6b06000a6700d70 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 10 Sep 2024 16:01:33 +0700
Subject: <iman> update tampilan ga bisa di scrool

---
 src/core/components/layouts/AppLayout.jsx | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/core/components/layouts/AppLayout.jsx b/src/core/components/layouts/AppLayout.jsx
index c72c1be5..ec61ca06 100644
--- a/src/core/components/layouts/AppLayout.jsx
+++ b/src/core/components/layouts/AppLayout.jsx
@@ -10,13 +10,15 @@ const BasicFooter = dynamic(() => import('../elements/Footer/BasicFooter'), {
 
 const AppLayout = ({ children, title, withFooter = true }) => {
   return (
-    <>
-      <AnimationLayout>
-        <AppBar title={title} />
-        {children}
-      </AnimationLayout>
-      <BasicFooter />
-    </>
+    <div className='flex flex-col min-h-screen max-h-screen overflow-y-auto'>
+      <AppBar title={title} />
+      <div className='flex-grow p-4'>{children}</div>
+      {withFooter && (
+        <div className='mt-auto'>
+          <BasicFooter />
+        </div>
+      )}
+    </div>
   );
 };
 
-- 
cgit v1.2.3


From 1e8959ef719689bc8ddd2477fa12e960f4c9a759 Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Wed, 11 Sep 2024 10:02:37 +0700
Subject: cr - operation , handle minimum match

---
 src/pages/api/shop/search.js | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index 1b6377f4..550217d8 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -16,6 +16,7 @@ export default async function handler(req, res) {
     operation = 'AND',
     fq = '',
     limit = 30,
+    source = '',
   } = req.query;
 
   let { stock = '' } = req.query;
@@ -65,7 +66,18 @@ export default async function handler(req, res) {
   // let newQ = keywords;
 
   let checkQ = q.trim().split(/[\s\+\-\!\(\)\{\}\[\]\^"~\*\?:\\\/]+/);
-  let newQ = checkQ.length > 1 ? escapeSolrQuery(q) + '*' : escapeSolrQuery(q);
+  let newQ = escapeSolrQuery(q);
+
+  const formattedQuery = `(${newQ.split(' ').map(term => `${term}*`).join(' ') })`;
+  const mm = checkQ.length > 2 ?  checkQ.length > 5 ? '65%' : '85%' : `${checkQ.length}`;
+
+  const filterQueries = [
+    '-publish_b:false',
+    'product_rating_f:[8 TO *]',
+    'price_tier1_v2_f:[1 TO *]'
+  ];
+  
+  const fq_ = filterQueries.join('AND ');
 
   let offset = (page - 1) * limit;
   let parameter = [
@@ -74,15 +86,15 @@ export default async function handler(req, res) {
     'facet=true',
     'indent=true',
     `facet.query=${escapeSolrQuery(q)}`,
-    `q.op=${operation}`,
-    `q=${newQ}`,
+    `q.op=OR`,
+    `q=${source == 'similar' || checkQ.length < 3  ? newQ + '*' : formattedQuery }`,
     `defType=edismax`,
     'qf=name_s description_clean_t category_name manufacture_name_s variants_code_t variants_name_t category_id_ids default_code_s',
     `start=${parseInt(offset)}`,
     `rows=${limit}`,
     `sort=${paramOrderBy}`,
-    `fq=-publish_b:false, product_rating_f:[8 TO *], price_tier1_v2_f:[1 TO *]`,
-    `mm=2`
+    `fq=${encodeURIComponent(fq_)}`,
+    `mm=${encodeURIComponent(mm)}`,
   ];
 
   if (priceFrom > 0 || priceTo > 0) {
@@ -120,10 +132,12 @@ export default async function handler(req, res) {
   if (stock) parameter.push(`fq=stock_total_f:{1 TO *}`);
 
   // Single fq in url params
-  if (typeof fq === 'string') parameter.push(`fq=${fq}`);
+  if (typeof fq === 'string') parameter.push(`fq=${encodeURIComponent(fq)}`);
   // Multi fq in url params
   if (Array.isArray(fq))
-    parameter = parameter.concat(fq.map((val) => `fq=${val}`));
+    parameter = parameter.concat(fq.map((val) => `fq=${encodeURIComponent(val)}`));
+
+  console.log('ini params', parameter);
 
   let result = await axios(
     process.env.SOLR_HOST + '/solr/product/select?' + parameter.join('&')
-- 
cgit v1.2.3


From 3dc26efc067799c1cf5492f412538c906ecfe5b1 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 11 Sep 2024 10:09:49 +0700
Subject: <iman> ubah posisi profil saya pada dropdown

---
 .../elements/Navbar/NavbarUserDropdown.jsx         | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/core/components/elements/Navbar/NavbarUserDropdown.jsx b/src/core/components/elements/Navbar/NavbarUserDropdown.jsx
index 2a345341..c0698b6e 100644
--- a/src/core/components/elements/Navbar/NavbarUserDropdown.jsx
+++ b/src/core/components/elements/Navbar/NavbarUserDropdown.jsx
@@ -1,38 +1,38 @@
-import { deleteAuth } from '@/core/utils/auth'
-import Link from '../Link/Link'
-import { useRouter } from 'next/router'
-import { signOut, useSession } from 'next-auth/react'
-import useAuth from '@/core/hooks/useAuth'
+import { deleteAuth } from '@/core/utils/auth';
+import Link from '../Link/Link';
+import { useRouter } from 'next/router';
+import { signOut, useSession } from 'next-auth/react';
+import useAuth from '@/core/hooks/useAuth';
 
 const NavbarUserDropdown = () => {
-  const router = useRouter()
-  const atuh = useAuth()
+  const router = useRouter();
+  const atuh = useAuth();
 
   const logout = async () => {
     deleteAuth().then(() => {
-      router.push('/login')
-    })
-  }
+      router.push('/login');
+    });
+  };
 
   return (
     <div className='navbar-user-dropdown-wrapper'>
       <div className='navbar-user-dropdown'>
+        <Link href='/my/profile'>Profil Saya</Link>
         <Link href='/my/quotations'>Daftar Quotation</Link>
         <Link href='/my/transactions'>Daftar Transaksi</Link>
         <Link href='/my/shipments'>Daftar Pengiriman</Link>
         <Link href='/my/invoices'>Invoice & Faktur Pajak</Link>
         <Link href='/my/wishlist'>Wishlist</Link>
         <Link href='/my/address'>Daftar Alamat</Link>
-        <Link href='/my/profile'>Profil Saya</Link>
-        {!atuh?.external &&
+        {!atuh?.external && (
           <Link href='/my/recomendation'>Dashboard Recomendation</Link>
-        }
+        )}
         <button type='button' onClick={logout}>
           Keluar Akun
         </button>
       </div>
     </div>
-  )
-}
+  );
+};
 
-export default NavbarUserDropdown
+export default NavbarUserDropdown;
-- 
cgit v1.2.3


From 0112efd7ce539f4276c66e5ad553288a9bf61343 Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Wed, 11 Sep 2024 10:36:32 +0700
Subject: handle if leng 1

---
 src/pages/api/shop/search.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index 550217d8..68a9abcd 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -87,7 +87,7 @@ export default async function handler(req, res) {
     'indent=true',
     `facet.query=${escapeSolrQuery(q)}`,
     `q.op=OR`,
-    `q=${source == 'similar' || checkQ.length < 3  ? newQ + '*' : formattedQuery }`,
+    `q=${source == 'similar' || checkQ.length < 3  ?  checkQ.length < 2 ?  newQ : newQ + '*' : formattedQuery }`,
     `defType=edismax`,
     'qf=name_s description_clean_t category_name manufacture_name_s variants_code_t variants_name_t category_id_ids default_code_s',
     `start=${parseInt(offset)}`,
-- 
cgit v1.2.3


From 3918b401286243a6ceb376d267b802b87f1b1a2f Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Thu, 12 Sep 2024 10:16:12 +0700
Subject: handling similar

---
 src/pages/api/shop/search.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index 68a9abcd..6269d3ed 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -69,7 +69,7 @@ export default async function handler(req, res) {
   let newQ = escapeSolrQuery(q);
 
   const formattedQuery = `(${newQ.split(' ').map(term => `${term}*`).join(' ') })`;
-  const mm = checkQ.length > 2 ?  checkQ.length > 5 ? '65%' : '85%' : `${checkQ.length}`;
+  const mm = checkQ.length > 2 ?  checkQ.length > 5 ? '55%' : '85%' : `${checkQ.length}`;
 
   const filterQueries = [
     '-publish_b:false',
@@ -136,9 +136,7 @@ export default async function handler(req, res) {
   // Multi fq in url params
   if (Array.isArray(fq))
     parameter = parameter.concat(fq.map((val) => `fq=${encodeURIComponent(val)}`));
-
-  console.log('ini params', parameter);
-
+  
   let result = await axios(
     process.env.SOLR_HOST + '/solr/product/select?' + parameter.join('&')
   );
-- 
cgit v1.2.3


From 499954a8be814850103eece2dbd0306d6246989d Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 12 Sep 2024 15:12:42 +0700
Subject: <iman> update new register

---
 src/lib/auth/components/CompanyProfile.jsx | 179 ++++++++++++++++++-----------
 1 file changed, 113 insertions(+), 66 deletions(-)

(limited to 'src')

diff --git a/src/lib/auth/components/CompanyProfile.jsx b/src/lib/auth/components/CompanyProfile.jsx
index e37decc9..fc3d149b 100644
--- a/src/lib/auth/components/CompanyProfile.jsx
+++ b/src/lib/auth/components/CompanyProfile.jsx
@@ -1,18 +1,18 @@
-import odooApi from '@/core/api/odooApi'
-import HookFormSelect from '@/core/components/elements/Select/HookFormSelect'
-import useAuth from '@/core/hooks/useAuth'
-import addressApi from '@/lib/address/api/addressApi'
-import { ChevronDownIcon, ChevronUpIcon } from '@heroicons/react/24/outline'
-import { useEffect, useState } from 'react'
-import { Controller, useForm } from 'react-hook-form'
-import { toast } from 'react-hot-toast'
-import BottomPopup from '@/core/components/elements/Popup/BottomPopup'
+import odooApi from '@/core/api/odooApi';
+import HookFormSelect from '@/core/components/elements/Select/HookFormSelect';
+import useAuth from '@/core/hooks/useAuth';
+import addressApi from '@/lib/address/api/addressApi';
+import { ChevronDownIcon, ChevronUpIcon } from '@heroicons/react/24/outline';
+import { useEffect, useState } from 'react';
+import { Controller, useForm } from 'react-hook-form';
+import { toast } from 'react-hot-toast';
+import BottomPopup from '@/core/components/elements/Popup/BottomPopup';
 
 const CompanyProfile = () => {
-  const [changeConfirmation, setChangeConfirmation] = useState(false)
-  const auth = useAuth()
-  const [isOpen, setIsOpen] = useState(false)
-  const toggle = () => setIsOpen(!isOpen)
+  const [changeConfirmation, setChangeConfirmation] = useState(false);
+  const auth = useAuth();
+  const [isOpen, setIsOpen] = useState(false);
+  const toggle = () => setIsOpen(!isOpen);
   const { register, setValue, control, handleSubmit } = useForm({
     defaultValues: {
       industry: '',
@@ -20,64 +20,78 @@ const CompanyProfile = () => {
       name: '',
       taxName: '',
       npwp: '',
-      alamat_wajib_pajak:'',
-    }
-  })
+      alamat_wajib_pajak: '',
+    },
+  });
 
-  const [industries, setIndustries] = useState([])
+  const [industries, setIndustries] = useState([]);
   useEffect(() => {
     const loadIndustries = async () => {
-      const dataIndustries = await odooApi('GET', '/api/v1/partner/industry')
-      setIndustries(dataIndustries?.map((o) => ({ value: o.id, label: o.name })))
-    }
-    loadIndustries()
-  }, [])
+      const dataIndustries = await odooApi('GET', '/api/v1/partner/industry');
+      setIndustries(
+        dataIndustries?.map((o) => ({ value: o.id, label: o.name }))
+      );
+    };
+    loadIndustries();
+  }, []);
 
-  const [companyTypes, setCompanyTypes] = useState([])
+  const [companyTypes, setCompanyTypes] = useState([]);
   useEffect(() => {
     const loadCompanyTypes = async () => {
-      const dataCompanyTypes = await odooApi('GET', '/api/v1/partner/company_type')
-      setCompanyTypes(dataCompanyTypes?.map((o) => ({ value: o.id, label: o.name })))
-    }
-    loadCompanyTypes()
-  }, [])
+      const dataCompanyTypes = await odooApi(
+        'GET',
+        '/api/v1/partner/company_type'
+      );
+      setCompanyTypes(
+        dataCompanyTypes?.map((o) => ({ value: o.id, label: o.name }))
+      );
+    };
+    loadCompanyTypes();
+  }, []);
 
   useEffect(() => {
     const loadProfile = async () => {
-      const dataProfile = await addressApi({ id: auth.parentId })
-      setValue('name', dataProfile.name)
-      setValue('industry', dataProfile.industryId)
-      setValue('companyType', dataProfile.companyTypeId)
-      setValue('taxName', dataProfile.taxName)
-      setValue('npwp', dataProfile.npwp)
-      setValue('alamat_wajib_pajak', dataProfile.alamatWajibPajak)
-    }
-    if (auth) loadProfile()
-  }, [auth, setValue])
+      const dataProfile = await addressApi({ id: auth.parentId });
+      console.log('dataProfile', dataProfile);
+      setValue('name', dataProfile.name);
+      setValue('industry', dataProfile.industryId);
+      setValue('companyType', dataProfile.companyTypeId);
+      setValue('taxName', dataProfile.taxName);
+      setValue('npwp', dataProfile.npwp);
+      setValue('alamat_wajib_pajak', dataProfile.alamatWajibPajak);
+      setValue('alamat_bisnis', dataProfile.alamatBisnis);
+    };
+    if (auth) loadProfile();
+  }, [auth, setValue]);
 
   const onSubmitHandler = async (values) => {
-    if(changeConfirmation){
+    if (changeConfirmation) {
       const data = {
         ...values,
-        id_user:auth.partnerId,
+        id_user: auth.partnerId,
         company_type_id: values.companyType,
         industry_id: values.industry,
         tax_name: values.taxName,
-        alamat_lengkap_text:values.alamat_wajib_pajak
-      }
-      const isUpdated = await odooApi('PUT', `/api/v1/partner/${auth.parentId}`, data)
+        alamat_lengkap_text: values.alamat_wajib_pajak,
+        street: values.alamat_bisnis,
+      };
+      const isUpdated = await odooApi(
+        'PUT',
+        `/api/v1/partner/${auth.parentId}`,
+        data
+      );
       if (isUpdated?.id) {
-        toast.success('Berhasil mengubah profil', { duration: 1500 })
-        return
+        toast.success('Berhasil mengubah profil', { duration: 1500 });
+        return;
       }
-      toast.error('Terjadi kesalahan internal')
+      toast.error('Terjadi kesalahan internal');
     }
-  }
+  };
 
   const handleConfirmSubmit = () => {
-    setChangeConfirmation(false)
-    handleSubmit(onSubmitHandler)()
-  }
+    setChangeConfirmation(false);
+    handleSubmit(onSubmitHandler)();
+  };
 
   return (
     <>
@@ -106,11 +120,16 @@ const CompanyProfile = () => {
           </button>
         </div>
       </BottomPopup>
-      <button type='button' onClick={toggle} className='p-4 flex items-center text-left w-full'>
+      <button
+        type='button'
+        onClick={toggle}
+        className='p-4 flex items-center text-left w-full'
+      >
         <div>
           <div className='font-semibold mb-2'>Informasi Usaha</div>
           <div className='text-gray_r-11'>
-            Dibawah ini adalah data usaha yang anda masukkan, periksa kembali data usaha anda.
+            Dibawah ini adalah data usaha yang anda masukkan, periksa kembali
+            data usaha anda.
           </div>
         </div>
         <div className='ml-auto p-2 bg-gray_r-3 rounded'>
@@ -120,17 +139,22 @@ const CompanyProfile = () => {
       </button>
 
       {isOpen && (
-        <form className='p-4 border-t border-gray_r-6' onSubmit={(e) => {
-          e.preventDefault()
-          setChangeConfirmation(true) 
-        }}>
+        <form
+          className='p-4 border-t border-gray_r-6'
+          onSubmit={(e) => {
+            e.preventDefault();
+            setChangeConfirmation(true);
+          }}
+        >
           <div className='grid grid-cols-1 sm:grid-cols-2 gap-4'>
             <div>
               <label className='block mb-3'>Klasifikasi Jenis Usaha</label>
               <Controller
                 name='industry'
                 control={control}
-                render={(props) => <HookFormSelect {...props} options={industries} />}
+                render={(props) => (
+                  <HookFormSelect {...props} options={industries} />
+                )}
               />
             </div>
             <div className='flex flex-wrap'>
@@ -139,7 +163,9 @@ const CompanyProfile = () => {
                 <Controller
                   name='companyType'
                   control={control}
-                  render={(props) => <HookFormSelect {...props} options={companyTypes} />}
+                  render={(props) => (
+                    <HookFormSelect {...props} options={companyTypes} />
+                  )}
                 />
               </div>
               <div className='w-9/12 pl-1'>
@@ -153,14 +179,35 @@ const CompanyProfile = () => {
             </div>
             <div>
               <label>Nama Wajib Pajak</label>
-              <input {...register('taxName')} type='text' className='form-input mt-3' />
+              <input
+                {...register('taxName')}
+                type='text'
+                className='form-input mt-3'
+              />
             </div>
             <div>
-              <label>Nomor NPWP</label>
-              <input {...register('npwp')} type='text' className='form-input mt-3' />
-            </div><div>
               <label>Alamat Wajib Pajak</label>
-              <input {...register('alamat_wajib_pajak')} type='text' className='form-input mt-3' />
+              <input
+                {...register('alamat_wajib_pajak')}
+                type='text'
+                className='form-input mt-3'
+              />
+            </div>
+            <div>
+              <label>Alamat Bisnis</label>
+              <input
+                {...register('alamat_bisnis')}
+                type='text'
+                className='form-input mt-3'
+              />
+            </div>
+            <div>
+              <label>Nomor NPWP</label>
+              <input
+                {...register('npwp')}
+                type='text'
+                className='form-input mt-3'
+              />
             </div>
           </div>
           <button type='submit' className='btn-yellow w-full mt-6'>
@@ -169,7 +216,7 @@ const CompanyProfile = () => {
         </form>
       )}
     </>
-  )
-}
+  );
+};
 
-export default CompanyProfile
+export default CompanyProfile;
-- 
cgit v1.2.3


From aaf907c834343970e1d30b3ef49c13ed5f9d34ed Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 17 Sep 2024 09:01:04 +0700
Subject: <iman> add focus error when button submit click

---
 src/lib/auth/components/CompanyProfile.jsx | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src')

diff --git a/src/lib/auth/components/CompanyProfile.jsx b/src/lib/auth/components/CompanyProfile.jsx
index fc3d149b..70713bdf 100644
--- a/src/lib/auth/components/CompanyProfile.jsx
+++ b/src/lib/auth/components/CompanyProfile.jsx
@@ -52,7 +52,6 @@ const CompanyProfile = () => {
   useEffect(() => {
     const loadProfile = async () => {
       const dataProfile = await addressApi({ id: auth.parentId });
-      console.log('dataProfile', dataProfile);
       setValue('name', dataProfile.name);
       setValue('industry', dataProfile.industryId);
       setValue('companyType', dataProfile.companyTypeId);
-- 
cgit v1.2.3


From aa44cff228f73d2546466abb6344f249881f94be Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 17 Sep 2024 13:53:52 +0700
Subject: <iman< update new register

---
 src/lib/address/components/EditAddress.jsx | 195 +++++++++++++++++------------
 src/lib/auth/components/CompanyProfile.jsx |   4 +-
 src/pages/my/address/[id]/edit.jsx         |  28 ++---
 3 files changed, 134 insertions(+), 93 deletions(-)

(limited to 'src')

diff --git a/src/lib/address/components/EditAddress.jsx b/src/lib/address/components/EditAddress.jsx
index 520bba51..7a30a3d8 100644
--- a/src/lib/address/components/EditAddress.jsx
+++ b/src/lib/address/components/EditAddress.jsx
@@ -1,18 +1,19 @@
-import { yupResolver } from '@hookform/resolvers/yup'
-import { useRouter } from 'next/router'
-import { useEffect, useState } from 'react'
-import * as Yup from 'yup'
-import cityApi from '../api/cityApi'
-import { Controller, useForm } from 'react-hook-form'
-import districtApi from '../api/districtApi'
-import subDistrictApi from '../api/subDistrictApi'
-import editAddressApi from '../api/editAddressApi'
-import HookFormSelect from '@/core/components/elements/Select/HookFormSelect'
-import { toast } from 'react-hot-toast'
-import Menu from '@/lib/auth/components/Menu'
+import { yupResolver } from '@hookform/resolvers/yup';
+import { useRouter } from 'next/router';
+import { useEffect, useState } from 'react';
+import * as Yup from 'yup';
+import cityApi from '../api/cityApi';
+import { Controller, useForm } from 'react-hook-form';
+import districtApi from '../api/districtApi';
+import subDistrictApi from '../api/subDistrictApi';
+import editAddressApi from '../api/editAddressApi';
+import HookFormSelect from '@/core/components/elements/Select/HookFormSelect';
+import { toast } from 'react-hot-toast';
+import Menu from '@/lib/auth/components/Menu';
 
 const EditAddress = ({ id, defaultValues }) => {
-  const router = useRouter()
+  console.log('defaultValues', defaultValues);
+  const router = useRouter();
   const {
     register,
     formState: { errors },
@@ -20,87 +21,90 @@ const EditAddress = ({ id, defaultValues }) => {
     watch,
     setValue,
     getValues,
-    control
+    control,
   } = useForm({
     resolver: yupResolver(validationSchema),
-    defaultValues
-  })
+    defaultValues,
+  });
 
-  const [cities, setCities] = useState([])
-  const [districts, setDistricts] = useState([])
-  const [subDistricts, setSubDistricts] = useState([])
+  const [cities, setCities] = useState([]);
+  const [districts, setDistricts] = useState([]);
+  const [subDistricts, setSubDistricts] = useState([]);
 
   useEffect(() => {
     const loadCities = async () => {
-      let dataCities = await cityApi()
+      let dataCities = await cityApi();
       dataCities = dataCities.map((city) => ({
         value: city.id,
-        label: city.name
-      }))
-      setCities(dataCities)
-    }
-    loadCities()
-  }, [])
+        label: city.name,
+      }));
+      setCities(dataCities);
+    };
+    loadCities();
+  }, []);
 
-  const watchCity = watch('city')
+  const watchCity = watch('city');
   useEffect(() => {
-    setValue('district', '')
+    setValue('district', '');
     if (watchCity) {
       const loadDistricts = async () => {
-        let dataDistricts = await districtApi({ cityId: watchCity })
+        let dataDistricts = await districtApi({ cityId: watchCity });
         dataDistricts = dataDistricts.map((district) => ({
           value: district.id,
-          label: district.name
-        }))
-        setDistricts(dataDistricts)
-        let oldDistrict = getValues('oldDistrict')
+          label: district.name,
+        }));
+        setDistricts(dataDistricts);
+        let oldDistrict = getValues('oldDistrict');
         if (oldDistrict) {
-          setValue('district', oldDistrict)
-          setValue('oldDistrict', '')
+          setValue('district', oldDistrict);
+          setValue('oldDistrict', '');
         }
-      }
-      loadDistricts()
+      };
+      loadDistricts();
     }
-  }, [watchCity, setValue, getValues])
+  }, [watchCity, setValue, getValues]);
 
-  const watchDistrict = watch('district')
+  const watchDistrict = watch('district');
   useEffect(() => {
-    setValue('subDistrict', '')
+    setValue('subDistrict', '');
     if (watchDistrict) {
       const loadSubDistricts = async () => {
         let dataSubDistricts = await subDistrictApi({
-          districtId: watchDistrict
-        })
+          districtId: watchDistrict,
+        });
         dataSubDistricts = dataSubDistricts.map((district) => ({
           value: district.id,
-          label: district.name
-        }))
-        setSubDistricts(dataSubDistricts)
-        let oldSubDistrict = getValues('oldSubDistrict')
+          label: district.name,
+        }));
+        setSubDistricts(dataSubDistricts);
+        let oldSubDistrict = getValues('oldSubDistrict');
 
         if (oldSubDistrict) {
-          setValue('subDistrict', oldSubDistrict)
-          setValue('oldSubDistrict', '')
+          setValue('subDistrict', oldSubDistrict);
+          setValue('oldSubDistrict', '');
         }
-      }
-      loadSubDistricts()
+      };
+      loadSubDistricts();
     }
-  }, [watchDistrict, setValue, getValues])
+  }, [watchDistrict, setValue, getValues]);
 
   const onSubmitHandler = async (values) => {
     const data = {
       ...values,
+      phone: values.mobile,
+      street: values.street,
       city_id: values.city,
       district_id: values.district,
-      sub_district_id: values.subDistrict
-    }
+      sub_district_id: values.subDistrict,
+    };
+    console.log('data', data);
 
-    const address = await editAddressApi({ id, data })
+    const address = await editAddressApi({ id, data });
     if (address?.id) {
-      toast.success('Berhasil mengubah alamat')
-      router.back()
+      toast.success('Berhasil mengubah alamat');
+      router.back();
     }
-  }
+  };
 
   return (
     <div className='max-w-none md:container mx-auto flex p-0 md:py-10'>
@@ -108,7 +112,9 @@ const EditAddress = ({ id, defaultValues }) => {
         <Menu />
       </div>
       <div className='w-full md:w-9/12 p-4 bg-white border border-gray_r-6 rounded'>
-        <h1 className='text-title-sm font-semibold mb-6 hidden md:block'>Ubah Alamat</h1>
+        <h1 className='text-title-sm font-semibold mb-6 hidden md:block'>
+          Ubah Alamat
+        </h1>
         <form onSubmit={handleSubmit(onSubmitHandler)}>
           <div className='grid grid-cols-1 md:grid-cols-2 gap-4'>
             <div>
@@ -117,10 +123,16 @@ const EditAddress = ({ id, defaultValues }) => {
                 name='type'
                 control={control}
                 render={(props) => (
-                  <HookFormSelect {...props} isSearchable={false} options={types} />
+                  <HookFormSelect
+                    {...props}
+                    isSearchable={false}
+                    options={types}
+                  />
                 )}
               />
-              <div className='text-caption-2 text-danger-500 mt-1'>{errors.type?.message}</div>
+              <div className='text-caption-2 text-danger-500 mt-1'>
+                {errors.type?.message}
+              </div>
             </div>
 
             <div>
@@ -131,7 +143,9 @@ const EditAddress = ({ id, defaultValues }) => {
                 type='text'
                 className='form-input'
               />
-              <div className='text-caption-2 text-danger-500 mt-1'>{errors.name?.message}</div>
+              <div className='text-caption-2 text-danger-500 mt-1'>
+                {errors.name?.message}
+              </div>
             </div>
 
             <div>
@@ -142,7 +156,9 @@ const EditAddress = ({ id, defaultValues }) => {
                 type='email'
                 className='form-input'
               />
-              <div className='text-caption-2 text-danger-500 mt-1'>{errors.email?.message}</div>
+              <div className='text-caption-2 text-danger-500 mt-1'>
+                {errors.email?.message}
+              </div>
             </div>
 
             <div>
@@ -153,7 +169,9 @@ const EditAddress = ({ id, defaultValues }) => {
                 type='tel'
                 className='form-input'
               />
-              <div className='text-caption-2 text-danger-500 mt-1'>{errors.mobile?.message}</div>
+              <div className='text-caption-2 text-danger-500 mt-1'>
+                {errors.mobile?.message}
+              </div>
             </div>
 
             <div>
@@ -164,7 +182,9 @@ const EditAddress = ({ id, defaultValues }) => {
                 type='text'
                 className='form-input'
               />
-              <div className='text-caption-2 text-danger-500 mt-1'>{errors.street?.message}</div>
+              <div className='text-caption-2 text-danger-500 mt-1'>
+                {errors.street?.message}
+              </div>
             </div>
 
             <div>
@@ -175,7 +195,9 @@ const EditAddress = ({ id, defaultValues }) => {
                 type='number'
                 className='form-input'
               />
-              <div className='text-caption-2 text-danger-500 mt-1'>{errors.zip?.message}</div>
+              <div className='text-caption-2 text-danger-500 mt-1'>
+                {errors.zip?.message}
+              </div>
             </div>
 
             <div>
@@ -183,9 +205,13 @@ const EditAddress = ({ id, defaultValues }) => {
               <Controller
                 name='city'
                 control={control}
-                render={(props) => <HookFormSelect {...props} options={cities} />}
+                render={(props) => (
+                  <HookFormSelect {...props} options={cities} />
+                )}
               />
-              <div className='text-caption-2 text-danger-500 mt-1'>{errors.city?.message}</div>
+              <div className='text-caption-2 text-danger-500 mt-1'>
+                {errors.city?.message}
+              </div>
             </div>
 
             <div>
@@ -194,10 +220,16 @@ const EditAddress = ({ id, defaultValues }) => {
                 name='district'
                 control={control}
                 render={(props) => (
-                  <HookFormSelect {...props} options={districts} disabled={!watchCity} />
+                  <HookFormSelect
+                    {...props}
+                    options={districts}
+                    disabled={!watchCity}
+                  />
                 )}
               />
-              <div className='text-caption-2 text-danger-500 mt-1'>{errors.district?.message}</div>
+              <div className='text-caption-2 text-danger-500 mt-1'>
+                {errors.district?.message}
+              </div>
             </div>
 
             <div>
@@ -206,19 +238,26 @@ const EditAddress = ({ id, defaultValues }) => {
                 name='subDistrict'
                 control={control}
                 render={(props) => (
-                  <HookFormSelect {...props} options={subDistricts} disabled={!watchDistrict} />
+                  <HookFormSelect
+                    {...props}
+                    options={subDistricts}
+                    disabled={!watchDistrict}
+                  />
                 )}
               />
             </div>
           </div>
-          <button type='submit' className='btn-yellow w-full md:w-fit mt-6 ml-0 md:ml-auto'>
+          <button
+            type='submit'
+            className='btn-yellow w-full md:w-fit mt-6 ml-0 md:ml-auto'
+          >
             Simpan
           </button>
         </form>
       </div>
     </div>
-  )
-}
+  );
+};
 
 const validationSchema = Yup.object().shape({
   type: Yup.string().required('Harus di-pilih'),
@@ -228,14 +267,14 @@ const validationSchema = Yup.object().shape({
   street: Yup.string().required('Harus di-isi'),
   zip: Yup.string().required('Harus di-isi'),
   city: Yup.string().required('Harus di-pilih'),
-  district: Yup.string().required('Harus di-pilih')
-})
+  district: Yup.string().required('Harus di-pilih'),
+});
 
 const types = [
   { value: 'contact', label: 'Contact Address' },
   { value: 'invoice', label: 'Invoice Address' },
   { value: 'delivery', label: 'Delivery Address' },
-  { value: 'other', label: 'Other Address' }
-]
+  { value: 'other', label: 'Other Address' },
+];
 
-export default EditAddress
+export default EditAddress;
diff --git a/src/lib/auth/components/CompanyProfile.jsx b/src/lib/auth/components/CompanyProfile.jsx
index 70713bdf..f1577ca1 100644
--- a/src/lib/auth/components/CompanyProfile.jsx
+++ b/src/lib/auth/components/CompanyProfile.jsx
@@ -21,9 +21,10 @@ const CompanyProfile = () => {
       taxName: '',
       npwp: '',
       alamat_wajib_pajak: '',
+      alamat_bisnis: '',
     },
   });
-
+  console.log('auth', auth);
   const [industries, setIndustries] = useState([]);
   useEffect(() => {
     const loadIndustries = async () => {
@@ -74,6 +75,7 @@ const CompanyProfile = () => {
         alamat_lengkap_text: values.alamat_wajib_pajak,
         street: values.alamat_bisnis,
       };
+      console.log('data', data);
       const isUpdated = await odooApi(
         'PUT',
         `/api/v1/partner/${auth.parentId}`,
diff --git a/src/pages/my/address/[id]/edit.jsx b/src/pages/my/address/[id]/edit.jsx
index bd680b90..732ec9fc 100644
--- a/src/pages/my/address/[id]/edit.jsx
+++ b/src/pages/my/address/[id]/edit.jsx
@@ -1,11 +1,11 @@
-import Seo from '@/core/components/Seo'
-import AppLayout from '@/core/components/layouts/AppLayout'
-import BasicLayout from '@/core/components/layouts/BasicLayout'
-import DesktopView from '@/core/components/views/DesktopView'
-import MobileView from '@/core/components/views/MobileView'
-import addressApi from '@/lib/address/api/addressApi'
-import EditAddressComponent from '@/lib/address/components/EditAddress'
-import IsAuth from '@/lib/auth/components/IsAuth'
+import Seo from '@/core/components/Seo';
+import AppLayout from '@/core/components/layouts/AppLayout';
+import BasicLayout from '@/core/components/layouts/BasicLayout';
+import DesktopView from '@/core/components/views/DesktopView';
+import MobileView from '@/core/components/views/MobileView';
+import addressApi from '@/lib/address/api/addressApi';
+import EditAddressComponent from '@/lib/address/components/EditAddress';
+import IsAuth from '@/lib/auth/components/IsAuth';
 
 export default function EditAddress({ id, defaultValues }) {
   return (
@@ -24,12 +24,12 @@ export default function EditAddress({ id, defaultValues }) {
         </BasicLayout>
       </DesktopView>
     </IsAuth>
-  )
+  );
 }
 
 export async function getServerSideProps(context) {
-  const { id } = context.query
-  const address = await addressApi({ id })
+  const { id } = context.query;
+  const address = await addressApi({ id });
   const defaultValues = {
     type: address.type,
     name: address.name,
@@ -41,7 +41,7 @@ export async function getServerSideProps(context) {
     oldDistrict: address.district?.id || '',
     district: '',
     oldSubDistrict: address.subDistrict?.id || '',
-    subDistrict: ''
-  }
-  return { props: { id, defaultValues } }
+    subDistrict: '',
+  };
+  return { props: { id, defaultValues } };
 }
-- 
cgit v1.2.3


From c28642a0003f0bd996614cb6849d951c7e276a11 Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Tue, 17 Sep 2024 14:37:18 +0700
Subject: optimize page and tag html

---
 .../components/elements/Navbar/NavbarDesktop.jsx     |  8 ++++----
 src/lib/home/components/PreferredBrand.jsx           |  2 +-
 src/lib/home/components/PromotionProgram.jsx         |  2 +-
 src/pages/index.jsx                                  | 20 ++++++++++----------
 4 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx
index ebbcf857..2a51c41f 100644
--- a/src/core/components/elements/Navbar/NavbarDesktop.jsx
+++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx
@@ -293,7 +293,7 @@ const NavbarDesktop = () => {
                   />
                   </div>
               )}
-                <p className="absolute inset-0 flex justify-center items-center group-hover:scale-105 group-hover:text-red-500 transition-transform duration-200 z-10">Semua Promo</p>
+                <span className="absolute inset-0 flex justify-center items-center group-hover:scale-105 group-hover:text-red-500 transition-transform duration-200 z-10">Semua Promo</span>
               </Link>
               {/* {showPopup && router.pathname === '/' && (
                 <div className={`fixed ${isTop ? 'top-[170px]' : 'top-[90px]'} rounded-3xl left-[700px] w-fit object-center bg-green-50 text-xs font-medium text-green-700 ring-1 ring-inset ring-green-600/20 text-center p-2 z-50 transition-all duration-300`}>
@@ -312,7 +312,7 @@ const NavbarDesktop = () => {
                 target='_blank'
                 rel='noreferrer'
               >
-               <p className="group-hover:scale-105 group-hover:text-red-500 transition-transform duration-200">Semua Brand</p>
+               <span className="group-hover:scale-105 group-hover:text-red-500 transition-transform duration-200">Semua Brand</span>
               </Link>
               <Link
                 href='/shop/search?orderBy=stock'
@@ -323,7 +323,7 @@ const NavbarDesktop = () => {
                 target='_blank'
                 rel='noreferrer'
               >
-                <p className="group-hover:scale-105 group-hover:text-red-500 transition-transform duration-200">Ready Stock</p>
+                <span className="group-hover:scale-105 group-hover:text-red-500 transition-transform duration-200">Ready Stock</span>
               </Link>
               <Link
                 href='https://blog.indoteknik.com/'
@@ -331,7 +331,7 @@ const NavbarDesktop = () => {
                 target='_blank'
                 rel='noreferrer noopener'
               >
-                <p className="group-hover:scale-105 group-hover:text-red-500 transition-transform duration-200">Blog Indoteknik</p>
+                <span className="group-hover:scale-105 group-hover:text-red-500 transition-transform duration-200">Blog Indoteknik</span>
               </Link>
               {/* <Link
                 href='/video'
diff --git a/src/lib/home/components/PreferredBrand.jsx b/src/lib/home/components/PreferredBrand.jsx
index b30fa5c9..973bb77e 100644
--- a/src/lib/home/components/PreferredBrand.jsx
+++ b/src/lib/home/components/PreferredBrand.jsx
@@ -59,7 +59,7 @@ const PreferredBrand = () => {
   return (
     <div className='px-4 sm:px-0'>
       <div className='flex justify-between items-center mb-4'>
-        <div className='font-semibold sm:text-h-lg'>Brand Pilihan</div>
+        <h1 className='font-semibold sm:text-h-lg'><Link href='/shop/brands' className='!text-black font-semibold'>Brand Pilihan</Link></h1>
         {isDesktop && (
           <Link href='/shop/brands' className='!text-red-500 font-semibold'>
             Lihat Semua
diff --git a/src/lib/home/components/PromotionProgram.jsx b/src/lib/home/components/PromotionProgram.jsx
index c2f76069..fd8d6fda 100644
--- a/src/lib/home/components/PromotionProgram.jsx
+++ b/src/lib/home/components/PromotionProgram.jsx
@@ -16,7 +16,7 @@ const BannerSection = () => {
   return (
     <div className='px-4 sm:px-0'>
       <div className='flex justify-between items-center mb-4 '>
-        <div className='font-semibold sm:text-h-lg'>Promo Tersedia</div>
+        <h1 className='font-semibold sm:text-h-lg'> <Link href='/shop/promo' className='!text-black font-semibold' >Promo Tersedia</Link></h1>
         {isDesktop && (
           <Link href='/shop/promo' className='!text-red-500 font-semibold'>
           Lihat Semua
diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 0e87205e..6077c192 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -18,7 +18,7 @@ import { getAuth } from '~/libs/auth';
 import useProductDetail from '~/modules/product-detail/stores/useProductDetail';
 
 const BasicLayout = dynamic(() =>
-  import('@/core/components/layouts/BasicLayout')
+  import('@/core/components/layouts/BasicLayout'),{ssr: false}
 );
 const HeroBanner = dynamic(() => import('@/components/ui/HeroBanner'), {
   loading: () => <HeroBannerSkeleton />,
@@ -55,24 +55,24 @@ const ProgramPromotion = dynamic(() =>
 );
 
 const BannerSection = dynamic(() =>
-  import('@/lib/home/components/BannerSection')
+  import('@/lib/home/components/BannerSection'), {ssr: false}
 );  
 const CategoryHomeId = dynamic(() =>
-  import('@/lib/home/components/CategoryHomeId')
+  import('@/lib/home/components/CategoryHomeId'), {ssr: false}
 );
 
 const CategoryDynamic = dynamic(() =>
-  import('@/lib/home/components/CategoryDynamic')
+  import('@/lib/home/components/CategoryDynamic'), {ssr: false}
 );
 
 const CategoryDynamicMobile = dynamic(() =>
-import('@/lib/home/components/CategoryDynamicMobile')
+import('@/lib/home/components/CategoryDynamicMobile'), {ssr: false}
 );
 
 const CustomerReviews = dynamic(() =>
-  import('@/lib/review/components/CustomerReviews')
+  import('@/lib/review/components/CustomerReviews'), {ssr: false}
 ); // need to ssr:false
-const ServiceList = dynamic(() => import('@/lib/home/components/ServiceList')); // need to ssr: false
+const ServiceList = dynamic(() => import('@/lib/home/components/ServiceList'), {ssr: false}); // need to ssr: false
 
 
 
@@ -148,11 +148,11 @@ export default function Home({categoryId}) {
               </DelayRender>
               </>
             )}
-            <PromotinProgram />
+            {/* <PromotinProgram /> */}
             {dataCategories &&(
               <CategoryPilihan categories={dataCategories} />
             )}
-            <CategoryDynamic />
+            <CategoryDynamic /> 
             <CategoryHomeId />
             <BannerSection />
             <CustomerReviews />
@@ -183,7 +183,7 @@ export default function Home({categoryId}) {
             </>
           )}
           <DelayRender renderAfter={600}>
-            <PromotinProgram />
+            {/* <PromotinProgram /> */}
           </DelayRender>
           <DelayRender renderAfter={600}>
             {dataCategories &&(
-- 
cgit v1.2.3


From 87f8fc7887ac03558b1edd819bff31f44ca84f71 Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Tue, 17 Sep 2024 15:03:27 +0700
Subject: v mobile

---
 src/lib/home/components/PreferredBrand.jsx   | 2 +-
 src/lib/home/components/PromotionProgram.jsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/lib/home/components/PreferredBrand.jsx b/src/lib/home/components/PreferredBrand.jsx
index 973bb77e..4d53272b 100644
--- a/src/lib/home/components/PreferredBrand.jsx
+++ b/src/lib/home/components/PreferredBrand.jsx
@@ -59,7 +59,7 @@ const PreferredBrand = () => {
   return (
     <div className='px-4 sm:px-0'>
       <div className='flex justify-between items-center mb-4'>
-        <h1 className='font-semibold sm:text-h-lg'><Link href='/shop/brands' className='!text-black font-semibold'>Brand Pilihan</Link></h1>
+        <h1 className='font-semibold text-[14px] sm:text-h-lg'><Link href='/shop/brands' className='!text-black font-semibold'>Brand Pilihan</Link></h1>
         {isDesktop && (
           <Link href='/shop/brands' className='!text-red-500 font-semibold'>
             Lihat Semua
diff --git a/src/lib/home/components/PromotionProgram.jsx b/src/lib/home/components/PromotionProgram.jsx
index fd8d6fda..ae8d5d6f 100644
--- a/src/lib/home/components/PromotionProgram.jsx
+++ b/src/lib/home/components/PromotionProgram.jsx
@@ -16,7 +16,7 @@ const BannerSection = () => {
   return (
     <div className='px-4 sm:px-0'>
       <div className='flex justify-between items-center mb-4 '>
-        <h1 className='font-semibold sm:text-h-lg'> <Link href='/shop/promo' className='!text-black font-semibold' >Promo Tersedia</Link></h1>
+        <h1 className='font-semibold text-[14px] sm:text-h-lg'> <Link href='/shop/promo' className='!text-black font-semibold' >Promo Tersedia</Link></h1>
         {isDesktop && (
           <Link href='/shop/promo' className='!text-red-500 font-semibold'>
           Lihat Semua
-- 
cgit v1.2.3


From 7d5f7d239231cdfc439a57930e315586b206a0e5 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 17 Sep 2024 15:53:06 +0700
Subject: <iman> update new register

---
 src/lib/address/components/Addresses.jsx   | 135 +++++++++----
 src/lib/address/components/EditAddress.jsx | 311 ++++++++++++++++-------------
 src/lib/auth/components/CompanyProfile.jsx |   2 -
 3 files changed, 275 insertions(+), 173 deletions(-)

(limited to 'src')

diff --git a/src/lib/address/components/Addresses.jsx b/src/lib/address/components/Addresses.jsx
index a610d371..a8879607 100644
--- a/src/lib/address/components/Addresses.jsx
+++ b/src/lib/address/components/Addresses.jsx
@@ -1,34 +1,72 @@
-import Link from '@/core/components/elements/Link/Link'
-import Spinner from '@/core/components/elements/Spinner/Spinner'
-import useAuth from '@/core/hooks/useAuth'
-import { getItemAddress, updateItemAddress } from '@/core/utils/address'
-import { useRouter } from 'next/router'
-import useAddresses from '../hooks/useAddresses'
-import MobileView from '@/core/components/views/MobileView'
-import DesktopView from '@/core/components/views/DesktopView'
-import Menu from '@/lib/auth/components/Menu'
+import { useState } from 'react';
+import Link from '@/core/components/elements/Link/Link';
+import Spinner from '@/core/components/elements/Spinner/Spinner';
+import useAuth from '@/core/hooks/useAuth';
+import { getItemAddress, updateItemAddress } from '@/core/utils/address';
+import { useRouter } from 'next/router';
+import useAddresses from '../hooks/useAddresses';
+import MobileView from '@/core/components/views/MobileView';
+import DesktopView from '@/core/components/views/DesktopView';
+import Menu from '@/lib/auth/components/Menu';
+import BottomPopup from '@/core/components/elements/Popup/BottomPopup';
 
 const Addresses = () => {
-  const router = useRouter()
-  const { select = null } = router.query
-  const { addresses } = useAddresses()
-  const selectedAddress = getItemAddress(select || '')
+  const router = useRouter();
+  const { select = null } = router.query;
+  const { addresses } = useAddresses();
+  const selectedAddress = getItemAddress(select || '');
+  const [changeConfirmation, setChangeConfirmation] = useState(false);
+  const [selectedForChange, setSelectedForChange] = useState(null); // State baru untuk simpan alamat yang akan diubah
+
   const changeSelectedAddress = (id) => {
-    if (!select) return
-    updateItemAddress(select, id)
-    router.back()
-  }
+    if (!select) return;
+    updateItemAddress(select, id);
+    router.back();
+  };
+
+  const handleConfirmSubmit = () => {
+    setChangeConfirmation(false);
+    if (selectedForChange) {
+      router.push(`/my/address/${selectedForChange}/edit`);
+    }
+  };
 
   if (addresses.isLoading) {
     return (
       <div className='flex justify-center my-6'>
         <Spinner className='w-6 text-gray_r-12/50 fill-gray_r-12' />
       </div>
-    )
+    );
   }
 
   return (
     <>
+      <BottomPopup
+        active={changeConfirmation}
+        close={() => setChangeConfirmation(false)} // Menutup popup
+        title='Ubah alamat Bisnis'
+      >
+        <div className='leading-7 text-gray_r-12/80'>
+          Anda akan mengubah alamat utama bisnis?
+        </div>
+        <div className='flex mt-6 gap-x-4 md:justify-end'>
+          <button
+            className='btn-solid-red flex-1 md:flex-none'
+            type='button'
+            onClick={handleConfirmSubmit}
+          >
+            Yakin
+          </button>
+          <button
+            className='btn-light flex-1 md:flex-none'
+            type='button'
+            onClick={() => setChangeConfirmation(false)}
+          >
+            Batal
+          </button>
+        </div>
+      </BottomPopup>
+
       <MobileView>
         <div className='p-4'>
           <div className='text-right'>
@@ -37,7 +75,10 @@ const Addresses = () => {
 
           <div className='grid gap-y-4 mt-4'>
             {addresses.data?.map((address, index) => {
-              const type = address.type.charAt(0).toUpperCase() + address.type.slice(1) + ' Address'
+              const type =
+                address.type.charAt(0).toUpperCase() +
+                address.type.slice(1) +
+                ' Address';
               return (
                 <AddressCard
                   key={index}
@@ -45,9 +86,11 @@ const Addresses = () => {
                   type={type}
                   changeSelectedAddress={changeSelectedAddress}
                   selectedAddress={selectedAddress}
+                  setChangeConfirmation={setChangeConfirmation} // Memanggil popup
+                  setSelectedForChange={setSelectedForChange} // Simpan id address yang akan diubah
                   select={select}
                 />
-              )
+              );
             })}
           </div>
         </div>
@@ -72,7 +115,9 @@ const Addresses = () => {
             <div className='grid grid-cols-2 gap-4'>
               {addresses.data?.map((address, index) => {
                 const type =
-                  address.type.charAt(0).toUpperCase() + address.type.slice(1) + ' Address'
+                  address.type.charAt(0).toUpperCase() +
+                  address.type.slice(1) +
+                  ' Address';
                 return (
                   <AddressCard
                     key={index}
@@ -80,20 +125,30 @@ const Addresses = () => {
                     type={type}
                     changeSelectedAddress={changeSelectedAddress}
                     selectedAddress={selectedAddress}
+                    setChangeConfirmation={setChangeConfirmation}
+                    setSelectedForChange={setSelectedForChange}
                     select={select}
                   />
-                )
+                );
               })}
             </div>
           </div>
         </div>
       </DesktopView>
     </>
-  )
-}
+  );
+};
 
-const AddressCard = ({ address, selectedAddress, changeSelectedAddress, type, select }) => {
-  const auth = useAuth()
+const AddressCard = ({
+  address,
+  selectedAddress,
+  changeSelectedAddress,
+  type,
+  select,
+  setChangeConfirmation,
+  setSelectedForChange,
+}) => {
+  const auth = useAuth();
 
   return (
     <div
@@ -106,23 +161,33 @@ const AddressCard = ({ address, selectedAddress, changeSelectedAddress, type, se
           (select && 'cursor-pointer hover:bg-gray_r-4 transition')
         }`}
     >
-      <div onClick={() => changeSelectedAddress(address.id)} className={select && 'cursor-pointer'}>
+      <div
+        onClick={() => changeSelectedAddress(address.id)}
+        className={select && 'cursor-pointer'}
+      >
         <div className='flex gap-x-2'>
           <div className='badge-red'>{type}</div>
-          {auth?.partnerId == address.id && <div className='badge-green'>Utama</div>}
+          {auth?.partnerId == address.id && (
+            <div className='badge-green'>Utama</div>
+          )}
         </div>
         <p className='font-medium mt-2'>{address.name}</p>
-        {address.mobile && <p className='mt-2 text-gray_r-11'>{address.mobile}</p>}
+        {address.mobile && (
+          <p className='mt-2 text-gray_r-11'>{address.mobile}</p>
+        )}
         <p className='mt-1 leading-6 text-gray_r-11'>{address.street}</p>
       </div>
-      <Link
-        href={`/my/address/${address.id}/edit`}
+      <button
+        onClick={() => {
+          setSelectedForChange(address.id); // Set alamat yang dipilih
+          setChangeConfirmation(true); // Tampilkan popup konfirmasi
+        }}
         className='btn-light bg-white mt-3 w-full !text-gray_r-11'
       >
         Ubah Alamat
-      </Link>
+      </button>
     </div>
-  )
-}
+  );
+};
 
-export default Addresses
+export default Addresses;
diff --git a/src/lib/address/components/EditAddress.jsx b/src/lib/address/components/EditAddress.jsx
index 7a30a3d8..626709db 100644
--- a/src/lib/address/components/EditAddress.jsx
+++ b/src/lib/address/components/EditAddress.jsx
@@ -6,13 +6,16 @@ import cityApi from '../api/cityApi';
 import { Controller, useForm } from 'react-hook-form';
 import districtApi from '../api/districtApi';
 import subDistrictApi from '../api/subDistrictApi';
+import addressApi from '@/lib/address/api/addressApi';
 import editAddressApi from '../api/editAddressApi';
 import HookFormSelect from '@/core/components/elements/Select/HookFormSelect';
 import { toast } from 'react-hot-toast';
 import Menu from '@/lib/auth/components/Menu';
+import useAuth from '@/core/hooks/useAuth';
+import odooApi from '@/core/api/odooApi';
 
 const EditAddress = ({ id, defaultValues }) => {
-  console.log('defaultValues', defaultValues);
+  const auth = useAuth();
   const router = useRouter();
   const {
     register,
@@ -31,6 +34,20 @@ const EditAddress = ({ id, defaultValues }) => {
   const [districts, setDistricts] = useState([]);
   const [subDistricts, setSubDistricts] = useState([]);
 
+  useEffect(() => {
+    const loadProfile = async () => {
+      const dataProfile = await addressApi({ id: auth.parentId });
+      setValue('name', dataProfile.name);
+      setValue('industry', dataProfile.industryId);
+      setValue('companyType', dataProfile.companyTypeId);
+      setValue('taxName', dataProfile.taxName);
+      setValue('npwp', dataProfile.npwp);
+      setValue('alamat_wajib_pajak', dataProfile.alamatWajibPajak);
+      setValue('alamat_bisnis', dataProfile.alamatBisnis);
+    };
+    if (auth) loadProfile();
+  }, [auth, setValue]);
+
   useEffect(() => {
     const loadCities = async () => {
       let dataCities = await cityApi();
@@ -92,170 +109,192 @@ const EditAddress = ({ id, defaultValues }) => {
     const data = {
       ...values,
       phone: values.mobile,
-      street: values.street,
       city_id: values.city,
       district_id: values.district,
       sub_district_id: values.subDistrict,
     };
-    console.log('data', data);
+    const dataAlamat = {
+      ...values,
+      id_user: auth.partnerId,
+      company_type_id: values.companyType,
+      industry_id: values.industry,
+      tax_name: values.taxName,
+      alamat_lengkap_text: values.alamat_wajib_pajak,
+      street: values.street,
+    };
+
+    // const address = await editAddressApi({ id, data });
+    const isUpdated = await odooApi(
+      'PUT',
+      `/api/v1/partner/${auth.parentId}`,
+      dataAlamat
+    );
 
-    const address = await editAddressApi({ id, data });
-    if (address?.id) {
+    if (isUpdated?.id) {
+      // if (address?.id && isUpdated?.id) {
       toast.success('Berhasil mengubah alamat');
       router.back();
+    } else {
+      toast.error('Terjadi kesalahan internal');
+      router.back();
     }
   };
 
   return (
-    <div className='max-w-none md:container mx-auto flex p-0 md:py-10'>
-      <div className='hidden md:block w-3/12 pr-4'>
-        <Menu />
-      </div>
-      <div className='w-full md:w-9/12 p-4 bg-white border border-gray_r-6 rounded'>
-        <h1 className='text-title-sm font-semibold mb-6 hidden md:block'>
-          Ubah Alamat
-        </h1>
-        <form onSubmit={handleSubmit(onSubmitHandler)}>
-          <div className='grid grid-cols-1 md:grid-cols-2 gap-4'>
-            <div>
-              <label className='form-label mb-2'>Label Alamat</label>
-              <Controller
-                name='type'
-                control={control}
-                render={(props) => (
-                  <HookFormSelect
-                    {...props}
-                    isSearchable={false}
-                    options={types}
-                  />
-                )}
-              />
-              <div className='text-caption-2 text-danger-500 mt-1'>
-                {errors.type?.message}
+    <>
+      <div className='max-w-none md:container mx-auto flex p-0 md:py-10'>
+        <div className='hidden md:block w-3/12 pr-4'>
+          <Menu />
+        </div>
+        <div className='w-full md:w-9/12 p-4 bg-white border border-gray_r-6 rounded'>
+          <div className='flex justify-start items-center mb-6'>
+            <h1 className='text-title-sm font-semibold hidden md:block mr-2'>
+              Ubah Alamat
+            </h1>
+            {auth?.partnerId == id && <div className='badge-green'>Utama</div>}
+          </div>
+          <form onSubmit={handleSubmit(onSubmitHandler)}>
+            <div className='grid grid-cols-1 md:grid-cols-2 gap-4'>
+              <div>
+                <label className='form-label mb-2'>Label Alamat</label>
+                <Controller
+                  name='type'
+                  control={control}
+                  render={(props) => (
+                    <HookFormSelect
+                      {...props}
+                      isSearchable={false}
+                      options={types}
+                    />
+                  )}
+                />
+                <div className='text-caption-2 text-danger-500 mt-1'>
+                  {errors.type?.message}
+                </div>
               </div>
-            </div>
 
-            <div>
-              <label className='form-label mb-2'>Nama</label>
-              <input
-                {...register('name')}
-                placeholder='John Doe'
-                type='text'
-                className='form-input'
-              />
-              <div className='text-caption-2 text-danger-500 mt-1'>
-                {errors.name?.message}
+              <div>
+                <label className='form-label mb-2'>Nama</label>
+                <input
+                  {...register('name')}
+                  placeholder='John Doe'
+                  type='text'
+                  className='form-input'
+                />
+                <div className='text-caption-2 text-danger-500 mt-1'>
+                  {errors.name?.message}
+                </div>
               </div>
-            </div>
 
-            <div>
-              <label className='form-label mb-2'>Email</label>
-              <input
-                {...register('email')}
-                placeholder='johndoe@example.com'
-                type='email'
-                className='form-input'
-              />
-              <div className='text-caption-2 text-danger-500 mt-1'>
-                {errors.email?.message}
+              <div>
+                <label className='form-label mb-2'>Email</label>
+                <input
+                  {...register('email')}
+                  placeholder='johndoe@example.com'
+                  type='email'
+                  className='form-input'
+                />
+                <div className='text-caption-2 text-danger-500 mt-1'>
+                  {errors.email?.message}
+                </div>
               </div>
-            </div>
 
-            <div>
-              <label className='form-label mb-2'>Mobile</label>
-              <input
-                {...register('mobile')}
-                placeholder='08xxxxxxxx'
-                type='tel'
-                className='form-input'
-              />
-              <div className='text-caption-2 text-danger-500 mt-1'>
-                {errors.mobile?.message}
+              <div>
+                <label className='form-label mb-2'>Mobile</label>
+                <input
+                  {...register('mobile')}
+                  placeholder='08xxxxxxxx'
+                  type='tel'
+                  className='form-input'
+                />
+                <div className='text-caption-2 text-danger-500 mt-1'>
+                  {errors.mobile?.message}
+                </div>
               </div>
-            </div>
 
-            <div>
-              <label className='form-label mb-2'>Alamat</label>
-              <input
-                {...register('street')}
-                placeholder='Jl. Bandengan Utara 85A'
-                type='text'
-                className='form-input'
-              />
-              <div className='text-caption-2 text-danger-500 mt-1'>
-                {errors.street?.message}
+              <div>
+                <label className='form-label mb-2'>Alamat</label>
+                <input
+                  {...register('street')}
+                  placeholder='Jl. Bandengan Utara 85A'
+                  type='text'
+                  className='form-input'
+                />
+                <div className='text-caption-2 text-danger-500 mt-1'>
+                  {errors.street?.message}
+                </div>
               </div>
-            </div>
 
-            <div>
-              <label className='form-label mb-2'>Kode Pos</label>
-              <input
-                {...register('zip')}
-                placeholder='10100'
-                type='number'
-                className='form-input'
-              />
-              <div className='text-caption-2 text-danger-500 mt-1'>
-                {errors.zip?.message}
+              <div>
+                <label className='form-label mb-2'>Kode Pos</label>
+                <input
+                  {...register('zip')}
+                  placeholder='10100'
+                  type='number'
+                  className='form-input'
+                />
+                <div className='text-caption-2 text-danger-500 mt-1'>
+                  {errors.zip?.message}
+                </div>
               </div>
-            </div>
 
-            <div>
-              <label className='form-label mb-2'>Kota</label>
-              <Controller
-                name='city'
-                control={control}
-                render={(props) => (
-                  <HookFormSelect {...props} options={cities} />
-                )}
-              />
-              <div className='text-caption-2 text-danger-500 mt-1'>
-                {errors.city?.message}
+              <div>
+                <label className='form-label mb-2'>Kota</label>
+                <Controller
+                  name='city'
+                  control={control}
+                  render={(props) => (
+                    <HookFormSelect {...props} options={cities} />
+                  )}
+                />
+                <div className='text-caption-2 text-danger-500 mt-1'>
+                  {errors.city?.message}
+                </div>
               </div>
-            </div>
 
-            <div>
-              <label className='form-label mb-2'>Kecamatan</label>
-              <Controller
-                name='district'
-                control={control}
-                render={(props) => (
-                  <HookFormSelect
-                    {...props}
-                    options={districts}
-                    disabled={!watchCity}
-                  />
-                )}
-              />
-              <div className='text-caption-2 text-danger-500 mt-1'>
-                {errors.district?.message}
+              <div>
+                <label className='form-label mb-2'>Kecamatan</label>
+                <Controller
+                  name='district'
+                  control={control}
+                  render={(props) => (
+                    <HookFormSelect
+                      {...props}
+                      options={districts}
+                      disabled={!watchCity}
+                    />
+                  )}
+                />
+                <div className='text-caption-2 text-danger-500 mt-1'>
+                  {errors.district?.message}
+                </div>
               </div>
-            </div>
 
-            <div>
-              <label className='form-label mb-2'>Kelurahan</label>
-              <Controller
-                name='subDistrict'
-                control={control}
-                render={(props) => (
-                  <HookFormSelect
-                    {...props}
-                    options={subDistricts}
-                    disabled={!watchDistrict}
-                  />
-                )}
-              />
+              <div>
+                <label className='form-label mb-2'>Kelurahan</label>
+                <Controller
+                  name='subDistrict'
+                  control={control}
+                  render={(props) => (
+                    <HookFormSelect
+                      {...props}
+                      options={subDistricts}
+                      disabled={!watchDistrict}
+                    />
+                  )}
+                />
+              </div>
             </div>
-          </div>
-          <button
-            type='submit'
-            className='btn-yellow w-full md:w-fit mt-6 ml-0 md:ml-auto'
-          >
-            Simpan
-          </button>
-        </form>
+            <button
+              type='submit'
+              className='btn-yellow w-full md:w-fit mt-6 ml-0 md:ml-auto'
+            >
+              Simpan
+            </button>
+          </form>
+        </div>
       </div>
-    </div>
+    </>
   );
 };
 
diff --git a/src/lib/auth/components/CompanyProfile.jsx b/src/lib/auth/components/CompanyProfile.jsx
index f1577ca1..d4cf8657 100644
--- a/src/lib/auth/components/CompanyProfile.jsx
+++ b/src/lib/auth/components/CompanyProfile.jsx
@@ -24,7 +24,6 @@ const CompanyProfile = () => {
       alamat_bisnis: '',
     },
   });
-  console.log('auth', auth);
   const [industries, setIndustries] = useState([]);
   useEffect(() => {
     const loadIndustries = async () => {
@@ -75,7 +74,6 @@ const CompanyProfile = () => {
         alamat_lengkap_text: values.alamat_wajib_pajak,
         street: values.alamat_bisnis,
       };
-      console.log('data', data);
       const isUpdated = await odooApi(
         'PUT',
         `/api/v1/partner/${auth.parentId}`,
-- 
cgit v1.2.3


From dc3f5a3196a41c676f328aa0804af516d39e69f9 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 17 Sep 2024 16:23:41 +0700
Subject: <iman> update new register ubah alamat

---
 src/lib/address/components/Addresses.jsx   |  9 +++++--
 src/lib/address/components/EditAddress.jsx | 40 ++++++++++++++++--------------
 2 files changed, 28 insertions(+), 21 deletions(-)

(limited to 'src')

diff --git a/src/lib/address/components/Addresses.jsx b/src/lib/address/components/Addresses.jsx
index a8879607..9ca617ae 100644
--- a/src/lib/address/components/Addresses.jsx
+++ b/src/lib/address/components/Addresses.jsx
@@ -149,6 +149,7 @@ const AddressCard = ({
   setSelectedForChange,
 }) => {
   const auth = useAuth();
+  const router = useRouter();
 
   return (
     <div
@@ -179,8 +180,12 @@ const AddressCard = ({
       </div>
       <button
         onClick={() => {
-          setSelectedForChange(address.id); // Set alamat yang dipilih
-          setChangeConfirmation(true); // Tampilkan popup konfirmasi
+          if (type == 'Contact Address' && auth.parentId) {
+            setSelectedForChange(address.id); // Set alamat yang dipilih
+            setChangeConfirmation(true); // Tampilkan popup konfirmasi
+          } else {
+            router.push(`/my/address/${address.id}/edit`);
+          }
         }}
         className='btn-light bg-white mt-3 w-full !text-gray_r-11'
       >
diff --git a/src/lib/address/components/EditAddress.jsx b/src/lib/address/components/EditAddress.jsx
index 626709db..580aaeb8 100644
--- a/src/lib/address/components/EditAddress.jsx
+++ b/src/lib/address/components/EditAddress.jsx
@@ -37,7 +37,6 @@ const EditAddress = ({ id, defaultValues }) => {
   useEffect(() => {
     const loadProfile = async () => {
       const dataProfile = await addressApi({ id: auth.parentId });
-      setValue('name', dataProfile.name);
       setValue('industry', dataProfile.industryId);
       setValue('companyType', dataProfile.companyTypeId);
       setValue('taxName', dataProfile.taxName);
@@ -113,25 +112,28 @@ const EditAddress = ({ id, defaultValues }) => {
       district_id: values.district,
       sub_district_id: values.subDistrict,
     };
-    const dataAlamat = {
-      ...values,
-      id_user: auth.partnerId,
-      company_type_id: values.companyType,
-      industry_id: values.industry,
-      tax_name: values.taxName,
-      alamat_lengkap_text: values.alamat_wajib_pajak,
-      street: values.street,
-    };
-
-    // const address = await editAddressApi({ id, data });
-    const isUpdated = await odooApi(
-      'PUT',
-      `/api/v1/partner/${auth.parentId}`,
-      dataAlamat
-    );
+    const address = await editAddressApi({ id, data });
+    let dataAlamat;
+    let isUpdated = true;
+    if (auth?.partnerId == id) {
+      dataAlamat = {
+        ...values,
+        id_user: auth.partnerId,
+        company_type_id: values.companyType,
+        industry_id: values.industry,
+        tax_name: values.taxName,
+        alamat_lengkap_text: values.alamat_wajib_pajak,
+        street: values.street,
+      };
+      isUpdated = await odooApi(
+        'PUT',
+        `/api/v1/partner/${auth.parentId}`,
+        dataAlamat
+      );
+    }
 
-    if (isUpdated?.id) {
-      // if (address?.id && isUpdated?.id) {
+    // if (isUpdated?.id) {
+    if (address?.id) {
       toast.success('Berhasil mengubah alamat');
       router.back();
     } else {
-- 
cgit v1.2.3


From 44f9ea9e60e9dfb31fc3b9e4fbffc4767b6811a9 Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Tue, 17 Sep 2024 16:38:55 +0700
Subject: bugs kami juga suka di popup keranjang,

---
 src/lib/product/api/productSimilarApi.js | 2 +-
 src/pages/index.jsx                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/lib/product/api/productSimilarApi.js b/src/lib/product/api/productSimilarApi.js
index ecd6724a..51cc17fa 100644
--- a/src/lib/product/api/productSimilarApi.js
+++ b/src/lib/product/api/productSimilarApi.js
@@ -19,7 +19,7 @@ const productSimilarApi = async ({ query, source }) => {
     }
   }
   const dataProductSimilar = await axios(
-    `${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/search?q=${query}&page=1&orderBy=popular-weekly&operation=OR&priceFrom=1`
+    `${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/search?q=${query}&page=1&orderBy=popular-weekly&operation=OR&priceFrom=1&source=similar`
   )
   if (dataflashSale) {
     dataProductSimilar.data.response.products = [
diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 6077c192..3fd0e834 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -111,7 +111,7 @@ export default function Home({categoryId}) {
           },
         ]} />
 
-      <PagePopupIformation />
+      {/* <PagePopupIformation /> */}
 
       <DesktopView>
         <div className='container mx-auto'>
-- 
cgit v1.2.3


From 9551a800b68fb9002a55a79bd6e187587a46ff2f Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Tue, 17 Sep 2024 16:58:32 +0700
Subject: uncomment component

---
 src/pages/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 3fd0e834..6077c192 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -111,7 +111,7 @@ export default function Home({categoryId}) {
           },
         ]} />
 
-      {/* <PagePopupIformation /> */}
+      <PagePopupIformation />
 
       <DesktopView>
         <div className='container mx-auto'>
-- 
cgit v1.2.3


From 171f4328fce3144e4b72f94dcc3c2d2c7d8b4273 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 18 Sep 2024 09:33:02 +0700
Subject: <iman> change sales@indoteknik to noreply@indoteknik

---
 src/pages/api/shop/finish-checkout.js | 84 +++++++++++++++++++----------------
 1 file changed, 45 insertions(+), 39 deletions(-)

(limited to 'src')

diff --git a/src/pages/api/shop/finish-checkout.js b/src/pages/api/shop/finish-checkout.js
index 9eaa36db..4dcc915c 100644
--- a/src/pages/api/shop/finish-checkout.js
+++ b/src/pages/api/shop/finish-checkout.js
@@ -1,60 +1,66 @@
-import odooApi from '@/core/api/odooApi'
-import mailer from '@/core/utils/mailer'
-import FinishCheckoutEmail from '@/lib/checkout/email/FinishCheckoutEmail'
-import { render } from '@react-email/render'
-import axios from 'axios'
-import camelcaseObjectDeep from 'camelcase-object-deep'
+import odooApi from '@/core/api/odooApi';
+import mailer from '@/core/utils/mailer';
+import FinishCheckoutEmail from '@/lib/checkout/email/FinishCheckoutEmail';
+import { render } from '@react-email/render';
+import axios from 'axios';
+import camelcaseObjectDeep from 'camelcase-object-deep';
 
 export default async function handler(req, res) {
-  const { orderName = null } = req.query
+  const { orderName = null } = req.query;
 
   if (!orderName) {
-    return res.status(422).json({ error: 'parameter missing' })
+    return res.status(422).json({ error: 'parameter missing' });
   }
 
-  let { auth } = req.cookies
+  let { auth } = req.cookies;
 
   if (!auth) {
-    return res.status(401).json({ error: 'Unauthorized' })
+    return res.status(401).json({ error: 'Unauthorized' });
   }
-  auth = JSON.parse(auth)
+  auth = JSON.parse(auth);
 
-  const midtransAuthKey = btoa(process.env.MIDTRANS_SERVER_KEY + ':')
+  const midtransAuthKey = btoa(process.env.MIDTRANS_SERVER_KEY + ':');
   const midtransHeaders = {
     Accept: 'application/json',
     'Content-Type': 'application/json',
-    Authorization: `Basic ${midtransAuthKey}`
-  }
-  let midtransStatus = {}
+    Authorization: `Basic ${midtransAuthKey}`,
+  };
+  let midtransStatus = {};
   try {
-    midtransStatus = await axios.get(`${process.env.MIDTRANS_HOST}/v2/${orderName}/status`, {
-      headers: midtransHeaders
-    })
-    midtransStatus = camelcaseObjectDeep(midtransStatus.data)
+    midtransStatus = await axios.get(
+      `${process.env.MIDTRANS_HOST}/v2/${orderName}/status`,
+      {
+        headers: midtransHeaders,
+      }
+    );
+    midtransStatus = camelcaseObjectDeep(midtransStatus.data);
   } catch (error) {
-    console.log(error)
+    console.log(error);
   }
 
-  let statusPayment = 'manual'
+  let statusPayment = 'manual';
   if (midtransStatus?.orderId) {
-    const transactionStatus = midtransStatus.transactionStatus
-    statusPayment = 'failed'
+    const transactionStatus = midtransStatus.transactionStatus;
+    statusPayment = 'failed';
     if (['capture', 'settlement'].includes(transactionStatus)) {
-      statusPayment = 'success'
+      statusPayment = 'success';
     } else if (transactionStatus == 'pending') {
-      statusPayment = 'pending'
+      statusPayment = 'pending';
     }
   }
 
-  const query = `name=${orderName.replaceAll('-', '/')}&limit=1&context=quotation`
+  const query = `name=${orderName.replaceAll(
+    '-',
+    '/'
+  )}&limit=1&context=quotation`;
   const searchTransaction = await odooApi(
     'GET',
     `/api/v1/partner/${auth.partnerId}/sale_order?${query}`,
     {},
     { Token: auth.token }
-  )
+  );
   if (searchTransaction.saleOrderTotal == 0) {
-    return res.status(400).json({ error: 'Transaction Not Found' })
+    return res.status(400).json({ error: 'Transaction Not Found' });
   }
 
   let transaction = await odooApi(
@@ -62,17 +68,17 @@ export default async function handler(req, res) {
     `/api/v1/partner/${auth.partnerId}/sale_order/${searchTransaction.saleOrders[0].id}`,
     {},
     { Token: auth.token }
-  )
+  );
   if (!transaction?.id) {
-    return res.status(400).json({ error: 'Transaction Detail Not Found' })
+    return res.status(400).json({ error: 'Transaction Detail Not Found' });
   }
 
-  transaction.subtotal = 0
-  transaction.discountTotal = 0
+  transaction.subtotal = 0;
+  transaction.discountTotal = 0;
   for (const product of transaction.products) {
-    transaction.subtotal += product.price.price * product.quantity
+    transaction.subtotal += product.price.price * product.quantity;
     transaction.discountTotal -=
-      (product.price.price - product.price.priceDiscount) * product.quantity
+      (product.price.price - product.price.priceDiscount) * product.quantity;
   }
 
   const emailMessage = render(
@@ -81,14 +87,14 @@ export default async function handler(req, res) {
       payment={midtransStatus}
       statusPayment={statusPayment}
     />
-  )
+  );
 
   mailer.sendMail({
-    from: 'sales@indoteknik.com',
+    from: 'noreply@indoteknik.com',
     to: transaction.address.customer.email,
     subject: 'Pembelian di Indoteknik.com',
-    html: emailMessage
-  })
+    html: emailMessage,
+  });
 
-  return res.status(200).json({ description: 'success' })
+  return res.status(200).json({ description: 'success' });
 }
-- 
cgit v1.2.3


From 4aface3ba2fa7c74a152ac0fe03b9e32e3ef68e1 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 18 Sep 2024 10:06:14 +0700
Subject: <iman> update bug ga bisa pilih alamat

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

(limited to 'src')

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index 09a791ee..52f1b3ed 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -77,6 +77,9 @@ const Checkout = () => {
     if (!addresses) return;
 
     const matchAddress = (key) => {
+      if (key === 'invoicing') {
+        key = 'invoice';
+      }
       const addressToMatch = getItemAddress(key);
       const foundAddress = addresses.filter(
         (address) => address.id == addressToMatch
-- 
cgit v1.2.3


From baa9b1e32c0afabf074f6c181274312d757a7099 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 18 Sep 2024 10:55:35 +0700
Subject: <iman> update no login page if auth

---
 src/pages/login.jsx | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src')

diff --git a/src/pages/login.jsx b/src/pages/login.jsx
index 9a1aa85b..07d13784 100644
--- a/src/pages/login.jsx
+++ b/src/pages/login.jsx
@@ -1,3 +1,5 @@
+import { useEffect } from 'react';
+import { useRouter } from 'next/router';
 import Seo from '@/core/components/Seo';
 import SimpleFooter from '@/core/components/elements/Footer/SimpleFooter';
 import BasicLayout from '@/core/components/layouts/BasicLayout';
@@ -5,8 +7,18 @@ import DesktopView from '@/core/components/views/DesktopView';
 import MobileView from '@/core/components/views/MobileView';
 import LoginComponent from '@/lib/auth/components/Login';
 import AccountActivation from '~/modules/account-activation';
+import useAuth from '@/core/hooks/useAuth';
 
 export default function Login() {
+  const router = useRouter();
+  const auth = useAuth();
+
+  useEffect(() => {
+    if (auth) {
+      router.push('/');
+    }
+  }, [auth, router]);
+
   return (
     <>
       <Seo title='Login - Indoteknik.com' />
-- 
cgit v1.2.3


From fad165af76bb008076e96199f173fbe27b7835a8 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 18 Sep 2024 17:18:47 +0700
Subject: <iman> update alamat yang sama

---
 src/lib/auth/components/CompanyProfile.jsx | 40 ++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

(limited to 'src')

diff --git a/src/lib/auth/components/CompanyProfile.jsx b/src/lib/auth/components/CompanyProfile.jsx
index d4cf8657..ee9c1f58 100644
--- a/src/lib/auth/components/CompanyProfile.jsx
+++ b/src/lib/auth/components/CompanyProfile.jsx
@@ -24,6 +24,45 @@ const CompanyProfile = () => {
       alamat_bisnis: '',
     },
   });
+
+  const formatNpwp = (value) => {
+    try {
+      const cleaned = ('' + value).replace(/\D/g, '');
+      let match;
+      if (cleaned.length <= 15) {
+        match = cleaned.match(
+          /(\d{0,2})?(\d{0,3})?(\d{0,3})?(\d{0,1})?(\d{0,3})?(\d{0,3})$/
+        );
+      } else {
+        match = cleaned.match(
+          /(\d{0,3})?(\d{0,3})?(\d{0,3})?(\d{0,1})?(\d{0,3})?(\d{0,3})$/
+        );
+      }
+
+      if (match) {
+        return [
+          match[1],
+          match[2] ? '.' : '',
+          match[2],
+          match[3] ? '.' : '',
+          match[3],
+          match[4] ? '.' : '',
+          match[4],
+          match[5] ? '-' : '',
+          match[5],
+          match[6] ? '.' : '',
+          match[6],
+        ].join('');
+      }
+
+      // If match is null, return the original cleaned string or handle as needed
+      return cleaned;
+    } catch (error) {
+      // Handle error or return a default value
+      console.error('Error formatting NPWP:', error);
+      return value;
+    }
+  };
   const [industries, setIndustries] = useState([]);
   useEffect(() => {
     const loadIndustries = async () => {
@@ -206,6 +245,7 @@ const CompanyProfile = () => {
                 {...register('npwp')}
                 type='text'
                 className='form-input mt-3'
+                maxLength={16}
               />
             </div>
           </div>
-- 
cgit v1.2.3


From 81f06d02bef8701be568e7418828d925925c5b12 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 20 Sep 2024 10:58:20 +0700
Subject: <iman> update new register disebled email

---
 src/lib/address/components/CreateAddress.jsx | 205 +++++++++++++++++----------
 src/lib/address/components/EditAddress.jsx   |   2 +-
 2 files changed, 132 insertions(+), 75 deletions(-)

(limited to 'src')

diff --git a/src/lib/address/components/CreateAddress.jsx b/src/lib/address/components/CreateAddress.jsx
index 86519147..e315affe 100644
--- a/src/lib/address/components/CreateAddress.jsx
+++ b/src/lib/address/components/CreateAddress.jsx
@@ -1,76 +1,101 @@
-import HookFormSelect from '@/core/components/elements/Select/HookFormSelect'
-import useAuth from '@/core/hooks/useAuth'
-import { useRouter } from 'next/router'
-import { Controller, useForm } from 'react-hook-form'
-import * as Yup from 'yup'
-import cityApi from '../api/cityApi'
-import districtApi from '../api/districtApi'
-import subDistrictApi from '../api/subDistrictApi'
-import { useEffect, useState } from 'react'
-import createAddressApi from '../api/createAddressApi'
-import { toast } from 'react-hot-toast'
-import { yupResolver } from '@hookform/resolvers/yup'
-import Menu from '@/lib/auth/components/Menu'
+import HookFormSelect from '@/core/components/elements/Select/HookFormSelect';
+import useAuth from '@/core/hooks/useAuth';
+import { useRouter } from 'next/router';
+import { Controller, useForm } from 'react-hook-form';
+import * as Yup from 'yup';
+import cityApi from '../api/cityApi';
+import districtApi from '../api/districtApi';
+import subDistrictApi from '../api/subDistrictApi';
+import { useEffect, useState } from 'react';
+import createAddressApi from '../api/createAddressApi';
+import { toast } from 'react-hot-toast';
+import { yupResolver } from '@hookform/resolvers/yup';
+import Menu from '@/lib/auth/components/Menu';
+import useAddresses from '../hooks/useAddresses';
 
 const CreateAddress = () => {
-  const auth = useAuth()
-  const router = useRouter()
+  const auth = useAuth();
+  const router = useRouter();
   const {
     register,
     formState: { errors },
     handleSubmit,
     watch,
     setValue,
-    control
+    control,
   } = useForm({
     resolver: yupResolver(validationSchema),
-    defaultValues
-  })
-
-  const [cities, setCities] = useState([])
-  const [districts, setDistricts] = useState([])
-  const [subDistricts, setSubDistricts] = useState([])
+    defaultValues,
+  });
+  const { addresses = [] } = useAddresses(); // Ensure addresses is an array
+  const [cities, setCities] = useState([]);
+  const [districts, setDistricts] = useState([]);
+  const [subDistricts, setSubDistricts] = useState([]);
+  const [filteredTypes, setFilteredTypes] = useState(types); // State to manage filtered types
 
   useEffect(() => {
     const loadCities = async () => {
-      let dataCities = await cityApi()
-      dataCities = dataCities.map((city) => ({ value: city.id, label: city.name }))
-      setCities(dataCities)
+      let dataCities = await cityApi();
+      dataCities = dataCities.map((city) => ({
+        value: city.id,
+        label: city.name,
+      }));
+      setCities(dataCities);
+    };
+    loadCities();
+  }, []);
+
+  useEffect(() => {
+    if (addresses) {
+      let hasContactAddress = false;
+
+      for (let i = 0; i < addresses?.data?.length; i++) {
+        if (addresses.data[i].type === 'contact') {
+          hasContactAddress = true;
+          break;
+        }
+      }
+      if (hasContactAddress) {
+        setFilteredTypes(types.filter((type) => type.value !== 'contact'));
+      } else {
+        setFilteredTypes(types);
+      }
     }
-    loadCities()
-  }, [])
+  }, [auth]);
 
-  const watchCity = watch('city')
+  const watchCity = watch('city');
   useEffect(() => {
-    setValue('district', '')
+    setValue('district', '');
     if (watchCity) {
       const loadDistricts = async () => {
-        let dataDistricts = await districtApi({ cityId: watchCity })
+        let dataDistricts = await districtApi({ cityId: watchCity });
         dataDistricts = dataDistricts.map((district) => ({
           value: district.id,
-          label: district.name
-        }))
-        setDistricts(dataDistricts)
-      }
-      loadDistricts()
+          label: district.name,
+        }));
+        setDistricts(dataDistricts);
+      };
+      loadDistricts();
     }
-  }, [watchCity, setValue])
+  }, [watchCity, setValue]);
 
-  const watchDistrict = watch('district')
+  const watchDistrict = watch('district');
   useEffect(() => {
-    setValue('subDistrict', '')
+    setValue('subDistrict', '');
     if (watchDistrict) {
       const loadSubDistricts = async () => {
-        let dataSubDistricts = await subDistrictApi({ districtId: watchDistrict })
+        let dataSubDistricts = await subDistrictApi({
+          districtId: watchDistrict,
+        });
         dataSubDistricts = dataSubDistricts.map((district) => ({
           value: district.id,
-          label: district.name
-        }))
-        setSubDistricts(dataSubDistricts)
-      }
-      loadSubDistricts()
+          label: district.name,
+        }));
+        setSubDistricts(dataSubDistricts);
+      };
+      loadSubDistricts();
     }
-  }, [watchDistrict, setValue])
+  }, [watchDistrict, setValue]);
 
   const onSubmitHandler = async (values) => {
     const data = {
@@ -78,15 +103,15 @@ const CreateAddress = () => {
       city_id: values.city,
       district_id: values.district,
       sub_district_id: values.subDistrict,
-      parent_id: auth.partnerId
-    }
+      parent_id: auth.partnerId,
+    };
 
-    const address = await createAddressApi({ data })
+    const address = await createAddressApi({ data });
     if (address?.id) {
-      toast.success('Berhasil menambahkan alamat')
-      router.back()
+      toast.success('Berhasil menambahkan alamat');
+      router.back();
     }
-  }
+  };
 
   return (
     <div className='max-w-none md:container mx-auto flex p-0 md:py-10'>
@@ -102,10 +127,16 @@ const CreateAddress = () => {
                 name='type'
                 control={control}
                 render={(props) => (
-                  <HookFormSelect {...props} isSearchable={false} options={types} />
+                  <HookFormSelect
+                    {...props}
+                    isSearchable={false}
+                    options={filteredTypes}
+                  />
                 )}
               />
-              <div className='text-caption-2 text-danger-500 mt-1'>{errors.type?.message}</div>
+              <div className='text-caption-2 text-danger-500 mt-1'>
+                {errors.type?.message}
+              </div>
             </div>
 
             <div>
@@ -116,7 +147,9 @@ const CreateAddress = () => {
                 type='text'
                 className='form-input'
               />
-              <div className='text-caption-2 text-danger-500 mt-1'>{errors.name?.message}</div>
+              <div className='text-caption-2 text-danger-500 mt-1'>
+                {errors.name?.message}
+              </div>
             </div>
 
             <div>
@@ -127,7 +160,9 @@ const CreateAddress = () => {
                 type='email'
                 className='form-input'
               />
-              <div className='text-caption-2 text-danger-500 mt-1'>{errors.email?.message}</div>
+              <div className='text-caption-2 text-danger-500 mt-1'>
+                {errors.email?.message}
+              </div>
             </div>
 
             <div>
@@ -138,7 +173,9 @@ const CreateAddress = () => {
                 type='tel'
                 className='form-input'
               />
-              <div className='text-caption-2 text-danger-500 mt-1'>{errors.mobile?.message}</div>
+              <div className='text-caption-2 text-danger-500 mt-1'>
+                {errors.mobile?.message}
+              </div>
             </div>
 
             <div>
@@ -149,7 +186,9 @@ const CreateAddress = () => {
                 type='text'
                 className='form-input'
               />
-              <div className='text-caption-2 text-danger-500 mt-1'>{errors.street?.message}</div>
+              <div className='text-caption-2 text-danger-500 mt-1'>
+                {errors.street?.message}
+              </div>
             </div>
 
             <div>
@@ -160,7 +199,9 @@ const CreateAddress = () => {
                 type='number'
                 className='form-input'
               />
-              <div className='text-caption-2 text-danger-500 mt-1'>{errors.zip?.message}</div>
+              <div className='text-caption-2 text-danger-500 mt-1'>
+                {errors.zip?.message}
+              </div>
             </div>
 
             <div>
@@ -168,9 +209,13 @@ const CreateAddress = () => {
               <Controller
                 name='city'
                 control={control}
-                render={(props) => <HookFormSelect {...props} options={cities} />}
+                render={(props) => (
+                  <HookFormSelect {...props} options={cities} />
+                )}
               />
-              <div className='text-caption-2 text-danger-500 mt-1'>{errors.city?.message}</div>
+              <div className='text-caption-2 text-danger-500 mt-1'>
+                {errors.city?.message}
+              </div>
             </div>
 
             <div>
@@ -179,10 +224,16 @@ const CreateAddress = () => {
                 name='district'
                 control={control}
                 render={(props) => (
-                  <HookFormSelect {...props} options={districts} disabled={!watchCity} />
+                  <HookFormSelect
+                    {...props}
+                    options={districts}
+                    disabled={!watchCity}
+                  />
                 )}
               />
-              <div className='text-caption-2 text-danger-500 mt-1'>{errors.district?.message}</div>
+              <div className='text-caption-2 text-danger-500 mt-1'>
+                {errors.district?.message}
+              </div>
             </div>
 
             <div>
@@ -191,31 +242,37 @@ const CreateAddress = () => {
                 name='subDistrict'
                 control={control}
                 render={(props) => (
-                  <HookFormSelect {...props} options={subDistricts} disabled={!watchDistrict} />
+                  <HookFormSelect
+                    {...props}
+                    options={subDistricts}
+                    disabled={!watchDistrict}
+                  />
                 )}
               />
             </div>
           </div>
 
-          <button type='submit' className='btn-yellow w-full md:w-fit mt-6 ml-0 md:ml-auto'>
+          <button
+            type='submit'
+            className='btn-yellow w-full md:w-fit mt-6 ml-0 md:ml-auto'
+          >
             Simpan
           </button>
         </form>
       </div>
     </div>
-  )
-}
+  );
+};
 
 const validationSchema = Yup.object().shape({
   type: Yup.string().required('Harus di-pilih'),
   name: Yup.string().min(3, 'Minimal 3 karakter').required('Harus di-isi'),
-  // email: Yup.string().email('Format harus seperti contoh@email.com').required('Harus di-isi'),
   mobile: Yup.string().required('Harus di-isi'),
   street: Yup.string().required('Harus di-isi'),
   zip: Yup.string().required('Harus di-isi'),
   city: Yup.string().required('Harus di-pilih'),
-  district: Yup.string().required('Harus di-pilih')
-})
+  district: Yup.string().required('Harus di-pilih'),
+});
 
 const defaultValues = {
   type: '',
@@ -226,14 +283,14 @@ const defaultValues = {
   city: '',
   district: '',
   subDistrict: '',
-  zip: ''
-}
+  zip: '',
+};
 
 const types = [
   { value: 'contact', label: 'Contact Address' },
   { value: 'invoice', label: 'Invoice Address' },
   { value: 'delivery', label: 'Delivery Address' },
-  { value: 'other', label: 'Other Address' }
-]
+  { value: 'other', label: 'Other Address' },
+];
 
-export default CreateAddress
+export default CreateAddress;
diff --git a/src/lib/address/components/EditAddress.jsx b/src/lib/address/components/EditAddress.jsx
index 580aaeb8..590a0bc0 100644
--- a/src/lib/address/components/EditAddress.jsx
+++ b/src/lib/address/components/EditAddress.jsx
@@ -29,7 +29,6 @@ const EditAddress = ({ id, defaultValues }) => {
     resolver: yupResolver(validationSchema),
     defaultValues,
   });
-
   const [cities, setCities] = useState([]);
   const [districts, setDistricts] = useState([]);
   const [subDistricts, setSubDistricts] = useState([]);
@@ -195,6 +194,7 @@ const EditAddress = ({ id, defaultValues }) => {
                   placeholder='johndoe@example.com'
                   type='email'
                   className='form-input'
+                  disabled={auth?.partnerId == id && true}
                 />
                 <div className='text-caption-2 text-danger-500 mt-1'>
                   {errors.email?.message}
-- 
cgit v1.2.3


From 7fb2329475fe2a671127251370436c56f79d24d8 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 20 Sep 2024 13:45:57 +0700
Subject: <iman> update error edit alamat

---
 src/lib/address/components/EditAddress.jsx | 8 +++++---
 src/pages/my/address/[id]/edit.jsx         | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/lib/address/components/EditAddress.jsx b/src/lib/address/components/EditAddress.jsx
index 590a0bc0..ff6b1f12 100644
--- a/src/lib/address/components/EditAddress.jsx
+++ b/src/lib/address/components/EditAddress.jsx
@@ -42,6 +42,7 @@ const EditAddress = ({ id, defaultValues }) => {
       setValue('npwp', dataProfile.npwp);
       setValue('alamat_wajib_pajak', dataProfile.alamatWajibPajak);
       setValue('alamat_bisnis', dataProfile.alamatBisnis);
+      setValue('business_name', dataProfile.name);
     };
     if (auth) loadProfile();
   }, [auth, setValue]);
@@ -102,7 +103,6 @@ const EditAddress = ({ id, defaultValues }) => {
       loadSubDistricts();
     }
   }, [watchDistrict, setValue, getValues]);
-
   const onSubmitHandler = async (values) => {
     const data = {
       ...values,
@@ -116,13 +116,15 @@ const EditAddress = ({ id, defaultValues }) => {
     let isUpdated = true;
     if (auth?.partnerId == id) {
       dataAlamat = {
-        ...values,
         id_user: auth.partnerId,
         company_type_id: values.companyType,
         industry_id: values.industry,
         tax_name: values.taxName,
         alamat_lengkap_text: values.alamat_wajib_pajak,
         street: values.street,
+        business_name: values.business_name,
+        name: values.business_name,
+        npwp: values.npwp,
       };
       isUpdated = await odooApi(
         'PUT',
@@ -132,7 +134,7 @@ const EditAddress = ({ id, defaultValues }) => {
     }
 
     // if (isUpdated?.id) {
-    if (address?.id) {
+    if (address?.id && isUpdated?.id) {
       toast.success('Berhasil mengubah alamat');
       router.back();
     } else {
diff --git a/src/pages/my/address/[id]/edit.jsx b/src/pages/my/address/[id]/edit.jsx
index 732ec9fc..c552659b 100644
--- a/src/pages/my/address/[id]/edit.jsx
+++ b/src/pages/my/address/[id]/edit.jsx
@@ -42,6 +42,7 @@ export async function getServerSideProps(context) {
     district: '',
     oldSubDistrict: address.subDistrict?.id || '',
     subDistrict: '',
+    business_name: '',
   };
   return { props: { id, defaultValues } };
 }
-- 
cgit v1.2.3


From ee88c2f776f5dbacfacb78d3a2f04155e0d93a15 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 20 Sep 2024 14:37:00 +0700
Subject: <iman> add error handling

---
 src/lib/auth/components/CompanyProfile.jsx | 86 +++++++++++++-----------------
 1 file changed, 38 insertions(+), 48 deletions(-)

(limited to 'src')

diff --git a/src/lib/auth/components/CompanyProfile.jsx b/src/lib/auth/components/CompanyProfile.jsx
index ee9c1f58..6d5790b4 100644
--- a/src/lib/auth/components/CompanyProfile.jsx
+++ b/src/lib/auth/components/CompanyProfile.jsx
@@ -7,62 +7,25 @@ import { useEffect, useState } from 'react';
 import { Controller, useForm } from 'react-hook-form';
 import { toast } from 'react-hot-toast';
 import BottomPopup from '@/core/components/elements/Popup/BottomPopup';
+import { yupResolver } from '@hookform/resolvers/yup';
+import * as Yup from 'yup';
 
 const CompanyProfile = () => {
   const [changeConfirmation, setChangeConfirmation] = useState(false);
   const auth = useAuth();
   const [isOpen, setIsOpen] = useState(false);
   const toggle = () => setIsOpen(!isOpen);
-  const { register, setValue, control, handleSubmit } = useForm({
-    defaultValues: {
-      industry: '',
-      companyType: '',
-      name: '',
-      taxName: '',
-      npwp: '',
-      alamat_wajib_pajak: '',
-      alamat_bisnis: '',
-    },
+  const {
+    register,
+    formState: { errors },
+    setValue,
+    control,
+    handleSubmit,
+  } = useForm({
+    resolver: yupResolver(validationSchema),
+    defaultValues,
   });
 
-  const formatNpwp = (value) => {
-    try {
-      const cleaned = ('' + value).replace(/\D/g, '');
-      let match;
-      if (cleaned.length <= 15) {
-        match = cleaned.match(
-          /(\d{0,2})?(\d{0,3})?(\d{0,3})?(\d{0,1})?(\d{0,3})?(\d{0,3})$/
-        );
-      } else {
-        match = cleaned.match(
-          /(\d{0,3})?(\d{0,3})?(\d{0,3})?(\d{0,1})?(\d{0,3})?(\d{0,3})$/
-        );
-      }
-
-      if (match) {
-        return [
-          match[1],
-          match[2] ? '.' : '',
-          match[2],
-          match[3] ? '.' : '',
-          match[3],
-          match[4] ? '.' : '',
-          match[4],
-          match[5] ? '-' : '',
-          match[5],
-          match[6] ? '.' : '',
-          match[6],
-        ].join('');
-      }
-
-      // If match is null, return the original cleaned string or handle as needed
-      return cleaned;
-    } catch (error) {
-      // Handle error or return a default value
-      console.error('Error formatting NPWP:', error);
-      return value;
-    }
-  };
   const [industries, setIndustries] = useState([]);
   useEffect(() => {
     const loadIndustries = async () => {
@@ -91,6 +54,7 @@ const CompanyProfile = () => {
   useEffect(() => {
     const loadProfile = async () => {
       const dataProfile = await addressApi({ id: auth.parentId });
+      console.log('dataProfile', dataProfile);
       setValue('name', dataProfile.name);
       setValue('industry', dataProfile.industryId);
       setValue('companyType', dataProfile.companyTypeId);
@@ -103,6 +67,7 @@ const CompanyProfile = () => {
   }, [auth, setValue]);
 
   const onSubmitHandler = async (values) => {
+    console.log('values', values);
     if (changeConfirmation) {
       const data = {
         ...values,
@@ -222,6 +187,9 @@ const CompanyProfile = () => {
                 type='text'
                 className='form-input mt-3'
               />
+              <div className='text-caption-2 text-danger-500 mt-1'>
+                {errors.taxName?.message}
+              </div>
             </div>
             <div>
               <label>Alamat Wajib Pajak</label>
@@ -230,6 +198,9 @@ const CompanyProfile = () => {
                 type='text'
                 className='form-input mt-3'
               />
+              <div className='text-caption-2 text-danger-500 mt-1'>
+                {errors.alamat_wajib_pajak?.message}
+              </div>
             </div>
             <div>
               <label>Alamat Bisnis</label>
@@ -238,6 +209,9 @@ const CompanyProfile = () => {
                 type='text'
                 className='form-input mt-3'
               />
+              <div className='text-caption-2 text-danger-500 mt-1'>
+                {errors.alamat_bisnis?.message}
+              </div>
             </div>
             <div>
               <label>Nomor NPWP</label>
@@ -259,3 +233,19 @@ const CompanyProfile = () => {
 };
 
 export default CompanyProfile;
+
+const validationSchema = Yup.object().shape({
+  alamat_bisnis: Yup.string().required('Harus di-isi'),
+  alamat_wajib_pajak: Yup.string().required('Harus di-isi'),
+  taxName: Yup.string().required('Harus di-isi'),
+});
+
+const defaultValues = {
+  industry: '',
+  companyType: '',
+  name: '',
+  taxName: '',
+  npwp: '',
+  alamat_wajib_pajak: '',
+  alamat_bisnis: '',
+};
-- 
cgit v1.2.3


From 5b0a6e9c8660c5cc427a66bd2540206513225075 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 20 Sep 2024 14:41:18 +0700
Subject: <iman> delete console log

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

(limited to 'src')

diff --git a/src/lib/auth/components/CompanyProfile.jsx b/src/lib/auth/components/CompanyProfile.jsx
index 6d5790b4..80b424dc 100644
--- a/src/lib/auth/components/CompanyProfile.jsx
+++ b/src/lib/auth/components/CompanyProfile.jsx
@@ -54,7 +54,6 @@ const CompanyProfile = () => {
   useEffect(() => {
     const loadProfile = async () => {
       const dataProfile = await addressApi({ id: auth.parentId });
-      console.log('dataProfile', dataProfile);
       setValue('name', dataProfile.name);
       setValue('industry', dataProfile.industryId);
       setValue('companyType', dataProfile.companyTypeId);
@@ -67,7 +66,6 @@ const CompanyProfile = () => {
   }, [auth, setValue]);
 
   const onSubmitHandler = async (values) => {
-    console.log('values', values);
     if (changeConfirmation) {
       const data = {
         ...values,
-- 
cgit v1.2.3


From 09378e8389ad7dcca805e9dde10e26cf097ad97c Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 20 Sep 2024 14:50:01 +0700
Subject: <iman> update new register

---
 src/lib/auth/components/CompanyProfile.jsx | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/lib/auth/components/CompanyProfile.jsx b/src/lib/auth/components/CompanyProfile.jsx
index 80b424dc..9e1dd1f9 100644
--- a/src/lib/auth/components/CompanyProfile.jsx
+++ b/src/lib/auth/components/CompanyProfile.jsx
@@ -236,6 +236,9 @@ const validationSchema = Yup.object().shape({
   alamat_bisnis: Yup.string().required('Harus di-isi'),
   alamat_wajib_pajak: Yup.string().required('Harus di-isi'),
   taxName: Yup.string().required('Harus di-isi'),
+  npwp: Yup.string().required('Harus di-isi'),
+  industry: Yup.string().required('Harus di-pilih'),
+  companyType: Yup.string().required('Harus di-pilih'),
 });
 
 const defaultValues = {
-- 
cgit v1.2.3


From e7082aec2592932c8f27e4d191476b69aac7475b Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 20 Sep 2024 14:53:52 +0700
Subject: <iman> update

---
 src/lib/auth/components/CompanyProfile.jsx | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src')

diff --git a/src/lib/auth/components/CompanyProfile.jsx b/src/lib/auth/components/CompanyProfile.jsx
index 9e1dd1f9..606f56ea 100644
--- a/src/lib/auth/components/CompanyProfile.jsx
+++ b/src/lib/auth/components/CompanyProfile.jsx
@@ -176,6 +176,9 @@ const CompanyProfile = () => {
                   className='form-input'
                   placeholder='Cth: Indoteknik Dotcom Gemilang'
                 />
+                <div className='text-caption-2 text-danger-500 mt-1'>
+                  {errors.name?.message}
+                </div>
               </div>
             </div>
             <div>
@@ -219,6 +222,9 @@ const CompanyProfile = () => {
                 className='form-input mt-3'
                 maxLength={16}
               />
+              <div className='text-caption-2 text-danger-500 mt-1'>
+                {errors.npwp?.message}
+              </div>
             </div>
           </div>
           <button type='submit' className='btn-yellow w-full mt-6'>
@@ -237,6 +243,7 @@ const validationSchema = Yup.object().shape({
   alamat_wajib_pajak: Yup.string().required('Harus di-isi'),
   taxName: Yup.string().required('Harus di-isi'),
   npwp: Yup.string().required('Harus di-isi'),
+  name: Yup.string().required('Harus di-isi'),
   industry: Yup.string().required('Harus di-pilih'),
   companyType: Yup.string().required('Harus di-pilih'),
 });
-- 
cgit v1.2.3


From 1db54e16f970b4e09df89d432efd5a66ac775eb6 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 20 Sep 2024 14:55:40 +0700
Subject: <iman> update new register

---
 src/lib/auth/components/CompanyProfile.jsx | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src')

diff --git a/src/lib/auth/components/CompanyProfile.jsx b/src/lib/auth/components/CompanyProfile.jsx
index 606f56ea..7bda992f 100644
--- a/src/lib/auth/components/CompanyProfile.jsx
+++ b/src/lib/auth/components/CompanyProfile.jsx
@@ -157,6 +157,9 @@ const CompanyProfile = () => {
                   <HookFormSelect {...props} options={industries} />
                 )}
               />
+              <div className='text-caption-2 text-danger-500 mt-1'>
+                {errors.industry?.message}
+              </div>
             </div>
             <div className='flex flex-wrap'>
               <div className='w-full mb-3'>Badan Usaha</div>
@@ -168,6 +171,9 @@ const CompanyProfile = () => {
                     <HookFormSelect {...props} options={companyTypes} />
                   )}
                 />
+                <div className='text-caption-2 text-danger-500 mt-1'>
+                  {errors.companyType?.message}
+                </div>
               </div>
               <div className='w-9/12 pl-1'>
                 <input
-- 
cgit v1.2.3


From 840b50072a885dd3cf41ea3351d70c9a1d525ff4 Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Fri, 20 Sep 2024 15:11:11 +0700
Subject: update quiery preference brands

---
 src/lib/home/components/PreferredBrand.jsx | 8 ++++----
 src/pages/api/shop/brands.js               | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/lib/home/components/PreferredBrand.jsx b/src/lib/home/components/PreferredBrand.jsx
index 4d53272b..eefced60 100644
--- a/src/lib/home/components/PreferredBrand.jsx
+++ b/src/lib/home/components/PreferredBrand.jsx
@@ -9,7 +9,7 @@ import Link from '@/core/components/elements/Link/Link'
 import axios from 'axios'
 
 const PreferredBrand = () => {
-  let query = 'level_s'
+  let query = ''
   let params = 'prioritas'
   const [isLoading, setIsLoading] = useState(true)
   const [startWith, setStartWith] = useState(null)
@@ -18,7 +18,7 @@ const PreferredBrand = () => {
   const loadBrand = useCallback(async () => {
     setIsLoading(true)
     const name = startWith ? `${startWith}*` : ''
-    const result = await axios(`${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/brands?params=${name}`)
+    const result = await axios(`${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/brands?rows=20`)
     
     setIsLoading(false)
     setManufactures((manufactures) => [...result.data])
@@ -35,9 +35,9 @@ const PreferredBrand = () => {
 
   useEffect(() => {
     loadBrand()
-  }, [loadBrand])
+  }, [])
 
-  const { preferredBrands } = usePreferredBrand(query)
+  // const { preferredBrands } = usePreferredBrand(query)
   const { isMobile, isDesktop } = useDevice()
   const swiperBanner = {
     modules:[Navigation, Pagination, Autoplay],
diff --git a/src/pages/api/shop/brands.js b/src/pages/api/shop/brands.js
index cc64a7e7..9c2824b3 100644
--- a/src/pages/api/shop/brands.js
+++ b/src/pages/api/shop/brands.js
@@ -24,6 +24,8 @@ export default async function handler(req, res) {
           params = `name_s:${req.query.params}`.toLowerCase();
       }
     }
+    if(req.query.rows) rows = req.query.rows;
+    
     const url = `${SOLR_HOST}/solr/brands/select?q=${params}&q.op=OR&indent=true&rows=${rows}&${sort}`;
     let brands = await axios(url);
     let dataBrands = responseMap(brands.data.response.docs);
-- 
cgit v1.2.3


From 45162d053721911e74bdeac09d2d1f1eaff44f1b Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 23 Sep 2024 16:44:13 +0700
Subject: <iman> update code, false code

---
 src/lib/home/api/categoryManagementApi.js         |  78 +++++-----
 src/lib/home/components/CategoryDynamic.jsx       | 135 +++++++++++------
 src/lib/home/components/CategoryDynamicMobile.jsx | 174 +++++++++++++---------
 3 files changed, 234 insertions(+), 153 deletions(-)

(limited to 'src')

diff --git a/src/lib/home/api/categoryManagementApi.js b/src/lib/home/api/categoryManagementApi.js
index 0aeb2aac..2ff4fdfc 100644
--- a/src/lib/home/api/categoryManagementApi.js
+++ b/src/lib/home/api/categoryManagementApi.js
@@ -1,40 +1,44 @@
 export const fetchCategoryManagementSolr = async () => {
-    let sort ='sort=sequence_i asc';
-    try {
-        const response = await fetch(`/solr/category_management/query?q=*:*&q.op=OR&indent=true&${sort}&&rows=20`);
-        if (!response.ok) {
-          throw new Error(`HTTP error! status: ${response.status}`);
-        }
-        const data = await response.json();
-        const promotions = await map(data.response.docs);
-        return promotions;
-      } catch (error) {
-        console.error("Error fetching promotion data:", error);
-        return [];
+  let sort = 'sort=sequence_i asc';
+  try {
+    const response = await fetch(
+      `/solr/category_management/query?q=*:*&q.op=OR&indent=true&${sort}&&rows=20`
+    );
+    if (!response.ok) {
+      throw new Error(`HTTP error! status: ${response.status}`);
+    }
+    const data = await response.json();
+    const promotions = await map(data.response.docs);
+    return promotions;
+  } catch (error) {
+    console.error('Error fetching promotion data:', error);
+    return [];
+  }
+};
+
+const map = async (promotions) => {
+  return promotions.map((promotion) => {
+    let parsedCategories = promotion.categories.map((category) => {
+      // Parse string JSON utama
+      let parsedCategory = JSON.parse(category);
+
+      // Parse setiap elemen di child_frontend_id_i jika ada
+      if (parsedCategory.child_frontend_id_i) {
+        parsedCategory.child_frontend_id_i =
+          parsedCategory.child_frontend_id_i.map((child) => JSON.parse(child));
       }
+
+      return parsedCategory;
+    });
+    let productMapped = {
+      id: promotion.id,
+      name: promotion.name_s,
+      image: promotion.image_s,
+      sequence: promotion.sequence_i,
+      numFound: promotion.numFound_i,
+      categories: parsedCategories,
+      category_id: promotion.category_id_i,
     };
-    
-    const map = async (promotions) => {
-      return promotions.map((promotion) =>{
-        let parsedCategories = promotion.categories.map(category => {
-          // Parse string JSON utama
-          let parsedCategory = JSON.parse(category);
-      
-          // Parse setiap elemen di child_frontend_id_i jika ada
-          if (parsedCategory.child_frontend_id_i) {
-              parsedCategory.child_frontend_id_i = parsedCategory.child_frontend_id_i.map(child => JSON.parse(child));
-          }
-      
-          return parsedCategory;
-      });
-      let productMapped = {
-        id: promotion.id,
-        name: promotion.name_s,
-        image: promotion.image_s,
-        sequence: promotion.sequence_i,
-        numFound: promotion.numFound_i,
-        categories: parsedCategories
-      };
-      return productMapped;
-    })
-  };
\ No newline at end of file
+    return productMapped;
+  });
+};
diff --git a/src/lib/home/components/CategoryDynamic.jsx b/src/lib/home/components/CategoryDynamic.jsx
index ca104ada..da2faf3d 100644
--- a/src/lib/home/components/CategoryDynamic.jsx
+++ b/src/lib/home/components/CategoryDynamic.jsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useState, useCallback } from 'react';
-import {fetchCategoryManagementSolr} from '../api/categoryManagementApi'
+import { fetchCategoryManagementSolr } from '../api/categoryManagementApi';
 import NextImage from 'next/image';
-import Link from "next/link";
+import Link from 'next/link';
 import { createSlug } from '@/core/utils/slug';
 import odooApi from '@/core/api/odooApi';
 import { Skeleton } from '@chakra-ui/react';
@@ -12,35 +12,34 @@ import 'swiper/css/pagination';
 import { Navigation, Pagination, Autoplay } from 'swiper';
 
 const CategoryDynamic = () => {
-
-  const [categoryManagement, setCategoryManagement] = useState([])
-  const [isLoading, setIsLoading] = useState(false)
+  const [categoryManagement, setCategoryManagement] = useState([]);
+  const [isLoading, setIsLoading] = useState(false);
   const loadBrand = useCallback(async () => {
-    setIsLoading(true)
+    setIsLoading(true);
     const items = await fetchCategoryManagementSolr();
-    
-    setIsLoading(false)
-    setCategoryManagement(items)
-  }, [])
+
+    setIsLoading(false);
+    setCategoryManagement(items);
+  }, []);
 
   useEffect(() => {
-    loadBrand()
-  }, [loadBrand])
-  
+    loadBrand();
+  }, [loadBrand]);
+
   // const [categoryData, setCategoryData] = useState({});
   // const [subCategoryData, setSubCategoryData] = useState({});
-  
+
   // useEffect(() => {
   //   const fetchCategoryData = async () => {
   //     if (categoryManagement && categoryManagement.data) {
   //       const updatedCategoryData = {};
   //       const updatedSubCategoryData = {};
-        
+
   //       for (const category of categoryManagement.data) {
   //         const countLevel1 = await odooApi('GET', `/api/v1/category/numFound?parent_id=${category.categoryIdI}`);
-          
+
   //         updatedCategoryData[category.categoryIdI] = countLevel1?.numFound;
-          
+
   //         for (const subCategory of countLevel1?.children) {
   //           updatedSubCategoryData[subCategory.id] = subCategory?.numFound;
   //         }
@@ -55,34 +54,46 @@ const CategoryDynamic = () => {
   // }, [categoryManagement.isLoading]);
 
   const swiperBanner = {
-    modules: [Pagination, ],
-    classNames:'mySwiper',
+    modules: [Pagination],
+    classNames: 'mySwiper',
     slidesPerView: 3,
-    spaceBetween:10, 
+    spaceBetween: 10,
     pagination: {
       dynamicBullets: true,
       clickable: true,
-    }
+    },
   };
- 
+
   return (
     <div>
-        {categoryManagement && categoryManagement?.map((category) => {
+      {categoryManagement &&
+        categoryManagement?.map((category) => {
+          console.log('category', category);
           // const countLevel1 = categoryData[category.categoryIdI] || 0;
           return (
             <Skeleton key={category.id} isLoaded={!isLoading}>
               <div key={category.id}>
                 <div className='bagian-judul flex flex-row justify-start items-center gap-3 mb-4 mt-4'>
-                  <div className='font-semibold sm:text-h-lg mr-2'>{category.name}</div>
+                  <div className='font-semibold sm:text-h-lg mr-2'>
+                    {category.name}
+                  </div>
                   {/* <Skeleton isLoaded={countLevel1 != 0}>
                     <p className={`text-gray_r-10 text-sm`}>{countLevel1} Produk tersedia</p>
                   </Skeleton> */}
-                  <Link href={createSlug('/shop/category/', category?.name, category?.id)} className="!text-red-500 font-semibold">Lihat Semua</Link>
+                  <Link
+                    href={createSlug(
+                      '/shop/category/',
+                      category?.name,
+                      category?.category_id
+                    )}
+                    className='!text-red-500 font-semibold'
+                  >
+                    Lihat Semua
+                  </Link>
                 </div>
-                
+
                 {/* Swiper for SubCategories */}
-                <Swiper {...swiperBanner}
-                >
+                <Swiper {...swiperBanner}>
                   {category.categories.map((subCategory) => {
                     // const countLevel2 = subCategoryData[subCategory.idLevel2] || 0;
 
@@ -92,39 +103,69 @@ const CategoryDynamic = () => {
                           <div className='p-3'>
                             <div className='flex flex-row border rounded mb-2 justify-start items-center'>
                               <NextImage
-                                src={subCategory.image ? subCategory.image : "/images/noimage.jpeg"}
+                                src={
+                                  subCategory.image
+                                    ? subCategory.image
+                                    : '/images/noimage.jpeg'
+                                }
                                 alt={subCategory.name}
                                 width={90}
                                 height={30}
                                 className='object-fit p-4'
                               />
                               <div className='bagian-judul flex flex-col justify-center items-start gap-2 ml-2'>
-                                <div className='font-semibold text-lg mr-2'>{subCategory?.name}</div>
+                                <div className='font-semibold text-lg mr-2'>
+                                  {subCategory?.name}
+                                </div>
                                 {/* <Skeleton isLoaded={countLevel2 != 0}>
                                   <p className={`text-gray_r-10 text-sm`}>
                                     {countLevel2} Produk tersedia
                                   </p>
                                 </Skeleton> */}
-                                <Link href={createSlug('/shop/category/', subCategory?.name, subCategory?.id_level_2)} className="!text-red-500 font-semibold">Lihat Semua</Link>
+                                <Link
+                                  href={createSlug(
+                                    '/shop/category/',
+                                    subCategory?.name,
+                                    subCategory?.id_level_2
+                                  )}
+                                  className='!text-red-500 font-semibold'
+                                >
+                                  Lihat Semua
+                                </Link>
                               </div>
                             </div>
                             <div className='grid grid-cols-2 gap-2 overflow-y-auto max-h-[240px] min-h-[240px] content-start'>
-                              {subCategory.child_frontend_id_i.map((childCategory) => (
-                                <div key={childCategory.id} className=''>
-                                  <Link href={createSlug('/shop/category/', childCategory?.name, childCategory?.id_level_3)} className="flex flex-row gap-2 border rounded group hover:border-red-500">
-                                    <NextImage
-                                      src={childCategory.image ? childCategory.image : "/images/noimage.jpeg"}
-                                      alt={childCategory.name}
-                                      className='p-2 ml-1'
-                                      width={40}
-                                      height={40}
-                                    />
-                                    <div className='bagian-judul flex flex-col justify-center items-center gap-2 break-words line-clamp-2 group-hover:text-red-500'>
-                                      <div className='font-semibold line-clamp-2 group-hover:text-red-500 text-sm mr-2'>{childCategory.name}</div>
-                                    </div>
-                                  </Link>
-                                </div>
-                              ))}
+                              {subCategory.child_frontend_id_i.map(
+                                (childCategory) => (
+                                  <div key={childCategory.id} className=''>
+                                    <Link
+                                      href={createSlug(
+                                        '/shop/category/',
+                                        childCategory?.name,
+                                        childCategory?.id_level_3
+                                      )}
+                                      className='flex flex-row gap-2 border rounded group hover:border-red-500'
+                                    >
+                                      <NextImage
+                                        src={
+                                          childCategory.image
+                                            ? childCategory.image
+                                            : '/images/noimage.jpeg'
+                                        }
+                                        alt={childCategory.name}
+                                        className='p-2 ml-1'
+                                        width={40}
+                                        height={40}
+                                      />
+                                      <div className='bagian-judul flex flex-col justify-center items-center gap-2 break-words line-clamp-2 group-hover:text-red-500'>
+                                        <div className='font-semibold line-clamp-2 group-hover:text-red-500 text-sm mr-2'>
+                                          {childCategory.name}
+                                        </div>
+                                      </div>
+                                    </Link>
+                                  </div>
+                                )
+                              )}
                             </div>
                           </div>
                         </div>
diff --git a/src/lib/home/components/CategoryDynamicMobile.jsx b/src/lib/home/components/CategoryDynamicMobile.jsx
index 1061f3e4..af151df2 100644
--- a/src/lib/home/components/CategoryDynamicMobile.jsx
+++ b/src/lib/home/components/CategoryDynamicMobile.jsx
@@ -1,38 +1,41 @@
 import React, { useEffect, useState, useCallback } from 'react';
 import NextImage from 'next/image';
-import Link from "next/link";
+import Link from 'next/link';
 import { createSlug } from '@/core/utils/slug';
 import { Swiper, SwiperSlide } from 'swiper/react';
 import 'swiper/css';
-import {fetchCategoryManagementSolr} from '../api/categoryManagementApi'
+import { fetchCategoryManagementSolr } from '../api/categoryManagementApi';
 
 const CategoryDynamicMobile = () => {
   const [selectedCategory, setSelectedCategory] = useState({});
-  const [categoryManagement, setCategoryManagement] = useState([])
-  const [isLoading, setIsLoading] = useState(false)
+  const [categoryManagement, setCategoryManagement] = useState([]);
+  const [isLoading, setIsLoading] = useState(false);
 
   const loadBrand = useCallback(async () => {
-    setIsLoading(true)
+    setIsLoading(true);
     const items = await fetchCategoryManagementSolr();
-    
-    setIsLoading(false)
-    setCategoryManagement(items)
-  }, [])
+
+    setIsLoading(false);
+    setCategoryManagement(items);
+  }, []);
 
   useEffect(() => {
-    loadBrand()
-  }, [loadBrand])
+    loadBrand();
+  }, [loadBrand]);
 
   useEffect(() => {
     const loadPromo = async () => {
       try {
         if (categoryManagement?.length > 0) {
-          const initialSelections = categoryManagement.reduce((acc, category) => {
-            if (category.categories.length > 0) {
-              acc[category.id] = category.categories[0].id_level_2;
-            }
-            return acc;
-          }, {});
+          const initialSelections = categoryManagement.reduce(
+            (acc, category) => {
+              if (category.categories.length > 0) {
+                acc[category.id] = category.categories[0].id_level_2;
+              }
+              return acc;
+            },
+            {}
+          );
           setSelectedCategory(initialSelections);
         }
       } catch (loadError) {
@@ -44,69 +47,102 @@ const CategoryDynamicMobile = () => {
   }, [categoryManagement]);
 
   const handleCategoryLevel2Click = (categoryIdI, idLevel2) => {
-    setSelectedCategory(prev => ({
+    setSelectedCategory((prev) => ({
       ...prev,
-      [categoryIdI]: idLevel2
+      [categoryIdI]: idLevel2,
     }));
   };
- 
+
   return (
     <div className='p-4'>
-      {categoryManagement && categoryManagement?.map((category) => (
-        <div key={category.id}>
-          <div className='bagian-judul flex flex-row justify-between items-center gap-3 mb-4 mt-4'>
-            <div className='font-semibold sm:text-h-sm mr-2'>{category?.name}</div>
-            <Link href={createSlug('/shop/category/', category?.name, category?.id)} className="!text-red-500 font-semibold text-sm">Lihat Semua</Link>
-          </div>
-          <Swiper slidesPerView={2.3} spaceBetween={10}>
-            {category.categories.map((index) => (
-              <SwiperSlide key={index.id}>
-                <div
-                  onClick={() => handleCategoryLevel2Click(category.id, index?.id_level_2)}
-                  className={`border flex justify-start items-center max-w-48 max-h-16 rounded ${selectedCategory[category.id] === index?.id_level_2 ? 'bg-red-50 border-red-500 text-red-500' : 'border-gray-200 text-gray-900'}`}
-                >
-                  <div className='p-1 flex justify-start items-center'>
-                    <div className='flex flex-row justify-center items-center'>
-                      <NextImage
-                        src={index.image ? index.image : "/images/noimage.jpeg"}
-                        alt={index.name}
-                        width={30}
-                        height={30}
-                        className=''
-                      />
-                      <div className='bagian-judul flex flex-col justify-center items-start gap-1 ml-2'>
-                        <div className='font-semibold text-[10px] line-clamp-1'>{index?.name}</div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </SwiperSlide>
-            ))}
-          </Swiper>
-          <div className='p-3 mt-2 border'>
-            <div className='grid grid-cols-2 gap-2 overflow-y-auto max-h-[240px]'>
+      {categoryManagement &&
+        categoryManagement?.map((category) => (
+          <div key={category.id}>
+            <div className='bagian-judul flex flex-row justify-between items-center gap-3 mb-4 mt-4'>
+              <div className='font-semibold sm:text-h-sm mr-2'>
+                {category?.name}
+              </div>
+              <Link
+                href={createSlug(
+                  '/shop/category/',
+                  category?.name,
+                  category?.category_id
+                )}
+                className='!text-red-500 font-semibold text-sm'
+              >
+                Lihat Semua
+              </Link>
+            </div>
+            <Swiper slidesPerView={2.3} spaceBetween={10}>
               {category.categories.map((index) => (
-                selectedCategory[category.id] === index?.id_level_2 && index?.child_frontend_id_i.map((x) => (
-                  <div key={x.id}>
-                    <Link href={createSlug('/shop/category/', x?.name, x?.id_level_3)} className="flex flex-row gap-1 border rounded group hover:border-red-500">
-                      <NextImage
-                        src={x.image ? x.image : "/images/noimage.jpeg"}
-                        alt={x.name}
-                        width={40}
-                        height={40}
-                        className='p-2'
-                      />
-                      <div className='bagian-judul flex flex-col justify-center items-start gap-1 break-words line-clamp-2 group-hover:text-red-500'>
-                        <div className='font-semibold line-clamp-2 group-hover:text-red-500 text-[10px]'>{x?.name}</div>
+                <SwiperSlide key={index.id}>
+                  <div
+                    onClick={() =>
+                      handleCategoryLevel2Click(category.id, index?.id_level_2)
+                    }
+                    className={`border flex justify-start items-center max-w-48 max-h-16 rounded ${
+                      selectedCategory[category.id] === index?.id_level_2
+                        ? 'bg-red-50 border-red-500 text-red-500'
+                        : 'border-gray-200 text-gray-900'
+                    }`}
+                  >
+                    <div className='p-1 flex justify-start items-center'>
+                      <div className='flex flex-row justify-center items-center'>
+                        <NextImage
+                          src={
+                            index.image ? index.image : '/images/noimage.jpeg'
+                          }
+                          alt={index.name}
+                          width={30}
+                          height={30}
+                          className=''
+                        />
+                        <div className='bagian-judul flex flex-col justify-center items-start gap-1 ml-2'>
+                          <div className='font-semibold text-[10px] line-clamp-1'>
+                            {index?.name}
+                          </div>
+                        </div>
                       </div>
-                    </Link>
+                    </div>
                   </div>
-                ))
+                </SwiperSlide>
               ))}
+            </Swiper>
+            <div className='p-3 mt-2 border'>
+              <div className='grid grid-cols-2 gap-2 overflow-y-auto max-h-[240px]'>
+                {category.categories.map(
+                  (index) =>
+                    selectedCategory[category.id] === index?.id_level_2 &&
+                    index?.child_frontend_id_i.map((x) => (
+                      <div key={x.id}>
+                        <Link
+                          href={createSlug(
+                            '/shop/category/',
+                            x?.name,
+                            x?.id_level_3
+                          )}
+                          className='flex flex-row gap-1 border rounded group hover:border-red-500'
+                        >
+                          <NextImage
+                            src={x.image ? x.image : '/images/noimage.jpeg'}
+                            alt={x.name}
+                            width={40}
+                            height={40}
+                            className='p-2'
+                          />
+                          <div className='bagian-judul flex flex-col justify-center items-start gap-1 break-words line-clamp-2 group-hover:text-red-500'>
+                            <div className='font-semibold line-clamp-2 group-hover:text-red-500 text-[10px]'>
+                              {x?.name}
+                            </div>
+                          </div>
+                        </Link>
+                      </div>
+                    ))
+                )}
+              </div>
             </div>
           </div>
-        </div>
-      ))}
+        ))}
     </div>
   );
 };
-- 
cgit v1.2.3


From 7d89c0280f1801db49b373a4691215833e6e7f92 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 23 Sep 2024 16:52:50 +0700
Subject: <iman> delete console log

---
 src/lib/home/components/CategoryDynamic.jsx  |   1 -
 src/lib/product/components/ProductSearch.jsx | 121 +++++++++++++--------------
 2 files changed, 59 insertions(+), 63 deletions(-)

(limited to 'src')

diff --git a/src/lib/home/components/CategoryDynamic.jsx b/src/lib/home/components/CategoryDynamic.jsx
index da2faf3d..79092c9d 100644
--- a/src/lib/home/components/CategoryDynamic.jsx
+++ b/src/lib/home/components/CategoryDynamic.jsx
@@ -68,7 +68,6 @@ const CategoryDynamic = () => {
     <div>
       {categoryManagement &&
         categoryManagement?.map((category) => {
-          console.log('category', category);
           // const countLevel1 = categoryData[category.categoryIdI] || 0;
           return (
             <Skeleton key={category.id} isLoaded={!isLoading}>
diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index 1edc31c9..26114acf 100644
--- a/src/lib/product/components/ProductSearch.jsx
+++ b/src/lib/product/components/ProductSearch.jsx
@@ -28,7 +28,7 @@ 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 { getIdFromSlug } from '@/core/utils/slug';
 import { data } from 'autoprefixer';
 
 const ProductSearch = ({
@@ -45,35 +45,40 @@ const ProductSearch = ({
   const [orderBy, setOrderBy] = useState(router.query?.orderBy);
   const [finalQuery, setFinalQuery] = useState({});
   const [queryFinal, setQueryFinal] = useState({});
-  const [dataCategoriesProduct, setDataCategoriesProduct] = useState([])
-  const [dataCategoriesLob, setDataCategoriesLob] = useState([])
-  const categoryId = getIdFromSlug(prefixUrl)
-  const [data, setData] = useState([])
+  const [dataCategoriesProduct, setDataCategoriesProduct] = useState([]);
+  const [dataCategoriesLob, setDataCategoriesLob] = useState([]);
+  const categoryId = getIdFromSlug(prefixUrl);
+  const [data, setData] = useState([]);
   const [dataLob, setDataLob] = useState([]);
   if (defaultBrand) query.brand = defaultBrand.toLowerCase();
-  const dataIdCategories = []
+  const dataIdCategories = [];
   useEffect(() => {
-    if(prefixUrl.includes('category')){
+    if (prefixUrl.includes('category')) {
       const loadProduct = async () => {
-        const getCategoriesId = await odooApi('GET', `/api/v1/category/numFound?parent_id=${categoryId}`);
+        const getCategoriesId = await odooApi(
+          'GET',
+          `/api/v1/category/numFound?parent_id=${categoryId}`
+        );
         if (getCategoriesId) {
           setDataCategoriesProduct(getCategoriesId);
         }
       };
       loadProduct();
-    }else if(prefixUrl.includes('lob')){
+    } else if (prefixUrl.includes('lob')) {
       const loadProduct = async () => {
-        const lobData = await odooApi('GET', `/api/v1/lob_homepage/${categoryId}/category_id`);
-         
+        const lobData = await odooApi(
+          'GET',
+          `/api/v1/lob_homepage/${categoryId}/category_id`
+        );
+
         if (lobData) {
           setDataLob(lobData);
         }
       };
       loadProduct();
-      
     }
   }, [categoryId]);
-  
+
   const collectIds = (category) => {
     const ids = [];
     function recurse(cat) {
@@ -88,45 +93,40 @@ const ProductSearch = ({
     return ids;
   };
   useEffect(() => {
-    if(prefixUrl.includes('category')){
+    if (prefixUrl.includes('category')) {
       const ids = collectIds(dataCategoriesProduct);
       const newQuery = {
         fq: `category_id_ids:(${ids.join(' OR ')})`,
-        page : router.query.page? router.query.page : 1,
-        brand : router.query.brand? router.query.brand : '',
-        category : router.query.category? router.query.category : '',
-        priceFrom : router.query.priceFrom? router.query.priceFrom : '',
-        priceTo : router.query.priceTo? router.query.priceTo : '',
-        limit : router.query.limit? router.query.limit : '',
-        orderBy : router.query.orderBy? router.query.orderBy : ''
+        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')){
-      
+    } else if (prefixUrl.includes('lob')) {
       const fetchCategoryData = async () => {
         if (dataLob[0]?.categoryIds) {
-          
           for (const cate of dataLob[0].categoryIds) {
-           
-            dataIdCategories.push(cate.childId)
+            dataIdCategories.push(cate.childId);
           }
-          
-        
+
           const mergedArray = dataIdCategories.flat();
-         
+
           const newQuery = {
             fq: `category_id_ids:(${mergedArray.join(' OR ')})`,
-            category : router.query.category? router.query.category : '',
-            page : router.query.page? router.query.page : 1,
-            brand : router.query.brand? router.query.brand : '',
-            priceFrom : router.query.priceFrom? router.query.priceFrom : '',
-            priceTo : router.query.priceTo? router.query.priceTo : '',
-            limit : router.query.limit? router.query.limit : '',
-            orderBy : router.query.orderBy? router.query.orderBy : ''
+            category: router.query.category ? router.query.category : '',
+            page: router.query.page ? router.query.page : 1,
+            brand: router.query.brand ? router.query.brand : '',
+            priceFrom: router.query.priceFrom ? router.query.priceFrom : '',
+            priceTo: router.query.priceTo ? router.query.priceTo : '',
+            limit: router.query.limit ? router.query.limit : '',
+            orderBy: router.query.orderBy ? router.query.orderBy : '',
           };
-       
+
           setFinalQuery(newQuery);
-         
         }
       };
       fetchCategoryData();
@@ -139,7 +139,7 @@ const ProductSearch = ({
     } else {
       setQueryFinal({ ...query, q, limit, orderBy });
     }
-  }, [prefixUrl,dataCategoriesProduct, query, finalQuery]);
+  }, [prefixUrl, dataCategoriesProduct, query, finalQuery]);
 
   const { productSearch } = useProductSearch({
     query: queryFinal,
@@ -162,7 +162,7 @@ const ProductSearch = ({
   const [categoryValues, setCategory] = useState(
     router.query?.category?.split(',') || router.query?.category?.split(',')
   );
-  
+
   const [priceFrom, setPriceFrom] = useState(router.query?.priceFrom || null);
   const [priceTo, setPriceTo] = useState(router.query?.priceTo || null);
 
@@ -170,8 +170,8 @@ const ProductSearch = ({
   const productStart = productSearch.data?.responseHeader.params.start;
   const productRows = limit;
   const productFound = productSearch.data?.response.numFound;
-  const [dataCategories, setDataCategories] = useState([])
-  
+  const [dataCategories, setDataCategories] = useState([]);
+
   useEffect(() => {
     if (productFound == 0 && query.q && !spellings) {
       searchSpellApi({ query: query.q }).then((response) => {
@@ -201,7 +201,7 @@ const ProductSearch = ({
       });
     }
   }, [productFound, query, spellings]);
-  let id = []
+  let id = [];
   useEffect(() => {
     const checkIfBrand = async () => {
       const brand = await axios(
@@ -218,21 +218,21 @@ const ProductSearch = ({
       checkIfBrand();
     }
   }, [q]);
- 
+
   useEffect(() => {
-    if(prefixUrl.includes('category')){
+    if (prefixUrl.includes('category')) {
       const loadCategories = async () => {
-        const getCategories = await odooApi('GET', `/api/v1/category/child?parent_id=${categoryId}`)
-       if(getCategories){
-        setDataCategories(getCategories)
-       }
-      }
-      loadCategories()
+        const getCategories = await odooApi(
+          'GET',
+          `/api/v1/category/child?parent_id=${categoryId}`
+        );
+        if (getCategories) {
+          setDataCategories(getCategories);
+        }
+      };
+      loadCategories();
     }
-  }, [])
-
-
-
+  }, []);
 
   const brands = [];
   for (
@@ -248,7 +248,6 @@ const ProductSearch = ({
       brands.push({ brand, qty });
     }
   }
-  
 
   const categories = [];
   for (
@@ -263,7 +262,6 @@ const ProductSearch = ({
       categories.push({ name, qty });
     }
   }
-  
 
   const orderOptions = [
     { value: '', label: 'Pilih Filter' },
@@ -382,7 +380,6 @@ const ProductSearch = ({
 
   const isNotReadyStockPage = router.asPath !== '/shop/search?orderBy=stock';
 
-  console.log('is spelling', spellings);
   return (
     <>
       <MobileView>
@@ -443,8 +440,8 @@ const ProductSearch = ({
               SpellingComponent
             )}
           </div>
-          <LobSectionCategory categories={dataLob}/>
-          <CategorySection categories={dataCategories}/>
+          <LobSectionCategory categories={dataLob} />
+          <CategorySection categories={dataCategories} />
 
           {productFound > 0 && (
             <div className='flex items-center gap-x-2 mb-5 justify-between'>
@@ -536,8 +533,8 @@ const ProductSearch = ({
           </div>
 
           <div className='w-9/12 pl-6'>
-            <LobSectionCategory categories={dataLob}/>
-            <CategorySection categories={dataCategories}/>
+            <LobSectionCategory categories={dataLob} />
+            <CategorySection categories={dataCategories} />
             {bannerPromotionHeader && bannerPromotionHeader?.image && (
               <div className='mb-3'>
                 <Image
-- 
cgit v1.2.3


From 431bf4103a5076eee834d9881cbe0684bb3f68ef Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 24 Sep 2024 09:40:23 +0700
Subject: <iman> update bug cart count mobile

---
 src/core/components/elements/Appbar/Appbar.jsx | 65 ++++++++++++++++----------
 1 file changed, 40 insertions(+), 25 deletions(-)

(limited to 'src')

diff --git a/src/core/components/elements/Appbar/Appbar.jsx b/src/core/components/elements/Appbar/Appbar.jsx
index 16bccbd5..e9abe657 100644
--- a/src/core/components/elements/Appbar/Appbar.jsx
+++ b/src/core/components/elements/Appbar/Appbar.jsx
@@ -1,8 +1,16 @@
-import { useRouter } from 'next/router'
-import Link from '../Link/Link'
-import { HomeIcon, Bars3Icon, ShoppingCartIcon, ChevronLeftIcon } from '@heroicons/react/24/outline'
-import { useEffect, useState } from 'react'
-import { getCart, getCountCart } from '@/core/utils/cart'
+import { useRouter } from 'next/router';
+import Link from '../Link/Link';
+import {
+  HomeIcon,
+  Bars3Icon,
+  ShoppingCartIcon,
+  ChevronLeftIcon,
+} from '@heroicons/react/24/outline';
+import { useEffect, useState } from 'react';
+import { getCart, getCountCart } from '@/core/utils/cart';
+import useTransactions from '@/lib/transaction/hooks/useTransactions';
+import { useCartStore } from '~/modules/cart/stores/useCartStore';
+import useAuth from '@/core/hooks/useAuth';
 
 /**
  * The AppBar component is a navigation component used to display a header or toolbar
@@ -13,26 +21,31 @@ import { getCart, getCountCart } from '@/core/utils/cart'
  * @returns {JSX.Element} - Rendered AppBar component.
  */
 const AppBar = ({ title }) => {
-  const router = useRouter()
-
-  const [cartCount, setCartCount] = useState(0)
-
+  const router = useRouter();
+  const auth = useAuth();
+  const { cart } = useCartStore();
+  const query = {
+    context: 'quotation',
+    site: auth?.webRole === null && auth?.site ? auth.site : null,
+  };
+  const [cartCount, setCartCount] = useState(0);
+  const { transactions } = useTransactions({ query });
   useEffect(() => {
     const handleCartChange = () => {
       const cart = async () => {
-        const listCart = await getCountCart()
-        setCartCount(listCart)
-      }
-      cart()
-    }
-    handleCartChange()
+        const listCart = await getCountCart();
+        setCartCount(listCart);
+      };
+      cart();
+    };
+    handleCartChange();
 
-    window.addEventListener('localStorageChange', handleCartChange)
+    window.addEventListener('localStorageChange', handleCartChange);
 
     return () => {
-      window.removeEventListener('localStorageChange', handleCartChange)
-    }
-  }, [])
+      window.removeEventListener('localStorageChange', handleCartChange);
+    };
+  }, [transactions.data, cart]);
 
   return (
     <nav className='sticky top-0 z-50 bg-white border-b border-gray_r-6 flex justify-between'>
@@ -46,9 +59,11 @@ const AppBar = ({ title }) => {
         <Link href='/shop/cart' className='py-4 px-2'>
           <div className='relative'>
             <ShoppingCartIcon className='w-6 text-gray_r-12' />
-            <span className='absolute -top-2 -right-2 badge-solid-red rounded-full w-5 h-5 flex items-center justify-center'>
-              {cartCount}
-            </span>
+            {cartCount > 0 && (
+              <span className='absolute -top-2 -right-2 badge-solid-red rounded-full w-5 h-5 flex items-center justify-center'>
+                {cartCount}
+              </span>
+            )}
           </div>
         </Link>
         <Link href='/' className='py-4 px-2'>
@@ -59,7 +74,7 @@ const AppBar = ({ title }) => {
         </Link>
       </div>
     </nav>
-  )
-}
+  );
+};
 
-export default AppBar
+export default AppBar;
-- 
cgit v1.2.3


From 36601aba6017aeef16f89351eb487238402ab52e Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 24 Sep 2024 16:12:50 +0700
Subject: <iman> update Perapihan Tag

---
 .../components/elements/Footer/BasicFooter.jsx     |   8 +-
 .../components/elements/Navbar/NavbarDesktop.jsx   |  95 +++----
 src/lib/home/components/BannerSection.jsx          |  20 +-
 src/lib/home/components/CategoryDynamic.jsx        |  15 +-
 src/lib/home/components/CategoryDynamicMobile.jsx  |  14 +-
 src/lib/home/components/CategoryHomeId.jsx         |  18 +-
 src/lib/home/components/CategoryPilihan.jsx        | 265 +++++++++++---------
 src/lib/home/components/PromotionProgram.jsx       | 118 ++++-----
 src/lib/home/components/ServiceList.jsx            |  34 ++-
 src/lib/quotation/components/Quotationheader.jsx   | 131 +++++++---
 src/lib/review/components/CustomerReviews.jsx      |  37 +--
 src/lib/tracking-order/component/TrackingOrder.jsx | 272 +++++++++++----------
 src/pages/my/profile.jsx                           |  69 +++---
 13 files changed, 630 insertions(+), 466 deletions(-)

(limited to 'src')

diff --git a/src/core/components/elements/Footer/BasicFooter.jsx b/src/core/components/elements/Footer/BasicFooter.jsx
index 8f024d86..4688b15b 100644
--- a/src/core/components/elements/Footer/BasicFooter.jsx
+++ b/src/core/components/elements/Footer/BasicFooter.jsx
@@ -175,7 +175,7 @@ const CustomerGuide = () => (
   <div>
     <div className={headerClassName}>Bantuan & Panduan</div>
     <ul className='flex flex-col gap-y-3'>
-      <li >
+      <li>
         <InternalItemLink href='/metode-pembayaran'>
           Metode Pembayaran
         </InternalItemLink>
@@ -395,7 +395,7 @@ const Payments = () => (
       alt='Metode Pembayaran - Indoteknik'
       width={512}
       height={512}
-      quality={100}
+      quality={85}
       className='w-full'
     />
   </div>
@@ -409,7 +409,7 @@ const Shippings = () => (
       alt='Jasa Pengiriman - Indoteknik'
       width={512}
       height={512}
-      quality={100}
+      quality={85}
       className='w-full'
     />
   </div>
@@ -423,7 +423,7 @@ const Secures = () => (
       alt='Keamanan Belanja - Indoteknik'
       width={512}
       height={512}
-      quality={100}
+      quality={85}
       className='w-full'
     />
   </div>
diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx
index 2a51c41f..d480aa8d 100644
--- a/src/core/components/elements/Navbar/NavbarDesktop.jsx
+++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx
@@ -5,7 +5,7 @@ import { createSlug } from '@/core/utils/slug';
 import whatsappUrl from '@/core/utils/whatsappUrl';
 import IndoteknikLogo from '@/images/logo.png';
 import Cardheader from '@/lib/cart/components/Cartheader';
-import Quotationheader from "../../../../../src/lib/quotation/components/Quotationheader.jsx"
+import Quotationheader from '../../../../../src/lib/quotation/components/Quotationheader.jsx';
 import Category from '@/lib/category/components/Category';
 import { useProductCartContext } from '@/contexts/ProductCartContext';
 import {
@@ -30,7 +30,7 @@ import {
   MenuList,
   useDisclosure,
 } from '@chakra-ui/react';
-import style from "./style/NavbarDesktop.module.css";
+import style from './style/NavbarDesktop.module.css';
 import useTransactions from '@/lib/transaction/hooks/useTransactions';
 import { useCartStore } from '~/modules/cart/stores/useCartStore';
 
@@ -43,7 +43,7 @@ const NavbarDesktop = () => {
 
   const [cartCount, setCartCount] = useState(0);
   const [quotationCount, setQuotationCount] = useState(0);
-  const [pendingTransactions, setPendingTransactions] = useState([])
+  const [pendingTransactions, setPendingTransactions] = useState([]);
   const [templateWA, setTemplateWA] = useState(null);
   const [payloadWA, setPayloadWa] = useState(null);
   const [urlPath, setUrlPath] = useState(null);
@@ -52,14 +52,17 @@ const NavbarDesktop = () => {
 
   const { product } = useProductContext();
   const { isOpen, onOpen, onClose } = useDisclosure();
-  
+
   const query = {
     context: 'quotation',
-    site:
-    (auth?.webRole === null && auth?.site ? auth.site : null),
+    site: auth?.webRole === null && auth?.site ? auth.site : null,
   };
-  
-  const { transactions } = useTransactions({ query });
+  let transactions = null;
+
+  if (auth) {
+    transactions = useTransactions({ query });
+  }
+
   const data = transactions?.data?.saleOrders.filter(
     (transaction) => transaction.status === 'draft'
   );
@@ -106,9 +109,8 @@ const NavbarDesktop = () => {
 
   useEffect(() => {
     setPendingTransactions(data);
-  }, [transactions.data]);
-  
-  
+  }, [transactions?.data]);
+
   useEffect(() => {
     if (router.pathname === '/shop/product/[slug]') {
       setPayloadWa({
@@ -117,11 +119,11 @@ const NavbarDesktop = () => {
         url: createSlug('/shop/product/', product?.name, product?.id, true),
       });
       setTemplateWA('product');
-      
+
       setUrlPath(router.asPath);
     }
   }, [product, router]);
-  
+
   useEffect(() => {
     const handleCartChange = () => {
       const cart = async () => {
@@ -130,14 +132,14 @@ const NavbarDesktop = () => {
       };
       cart();
     };
-    handleCartChange(); 
-    
+    handleCartChange();
+
     window.addEventListener('localStorageChange', handleCartChange);
-    
+
     return () => {
       window.removeEventListener('localStorageChange', handleCartChange);
     };
-  }, [transactions.data, cart]);
+  }, [transactions?.data, cart]);
 
   useEffect(() => {
     const handleQuotationChange = () => {
@@ -154,7 +156,7 @@ const NavbarDesktop = () => {
       window.removeEventListener('localStorageChange', handleQuotationChange);
     };
   }, [pendingTransactions]);
-  
+
   return (
     <DesktopView>
       <TopBanner onLoad={handleTopBannerLoad} />
@@ -174,7 +176,7 @@ const NavbarDesktop = () => {
               >
                 <div className='flex gap-x-1'>
                   <div>Fitur Layanan </div>
-                  <ChevronDownIcon className='w-5'/>
+                  <ChevronDownIcon className='w-5' />
                 </div>
               </MenuButton>
               <MenuList
@@ -217,7 +219,10 @@ const NavbarDesktop = () => {
             <Search />
           </div>
           <div className='flex gap-x-4 items-center'>
-            <Quotationheader quotationCount={quotationCount} data={pendingTransactions} />
+            <Quotationheader
+              quotationCount={quotationCount}
+              data={pendingTransactions}
+            />
 
             <Cardheader cartCount={cartCount} />
 
@@ -271,29 +276,30 @@ const NavbarDesktop = () => {
               </div>
             </div>
             <div className='w-6/12 flex px-1 divide-x divide-gray_r-6'>
-            
-            <Link
-                href="/shop/promo"
+              <Link
+                href='/shop/promo'
                 className={`${
                   router.asPath === '/shop/promo' && 'bg-gray_r-3'
                 }  flex-1 flex justify-center items-center !text-gray_r-12/80 hover:bg-gray_r-3 idt-transition group relative`} // Added relative position
-                target="_blank"
-                rel="noreferrer"
+                target='_blank'
+                rel='noreferrer'
               >
-              {showPopup &&  (
-                <div className='w-full h-full relative justify-end items-start'> 
+                {showPopup && (
+                  <div className='w-full h-full relative justify-end items-start'>
                     <Image
-                    src='/images/penawaran-terbatas.jpg'
-                    alt='penawaran terbatas'
-                    width={1440}
-                    height={160}
-                    quality={100}
-                    // className={`fixed ${isTop ? 'md:top-[145px] lg:top-[160px] ' : 'lg:top-[85px] top-[80px]'} rounded-3xl md:left-1/4 lg:left-1/4 xl:left-1/4 left-2/3 w-40 h-12  p-2 z-50 transition-all duration-300 animate-pulse`}
-                    className={`inline-block relative -top-8 transition-all duration-300 z-20 animate-pulse`}
-                  />
+                      src='/images/penawaran-terbatas.jpg'
+                      alt='penawaran terbatas'
+                      width={1440}
+                      height={160}
+                      quality={85}
+                      // className={`fixed ${isTop ? 'md:top-[145px] lg:top-[160px] ' : 'lg:top-[85px] top-[80px]'} rounded-3xl md:left-1/4 lg:left-1/4 xl:left-1/4 left-2/3 w-40 h-12  p-2 z-50 transition-all duration-300 animate-pulse`}
+                      className={`inline-block relative -top-8 transition-all duration-300 z-20 animate-pulse`}
+                    />
                   </div>
-              )}
-                <span className="absolute inset-0 flex justify-center items-center group-hover:scale-105 group-hover:text-red-500 transition-transform duration-200 z-10">Semua Promo</span>
+                )}
+                <span className='absolute inset-0 flex justify-center items-center group-hover:scale-105 group-hover:text-red-500 transition-transform duration-200 z-10'>
+                  Semua Promo
+                </span>
               </Link>
               {/* {showPopup && router.pathname === '/' && (
                 <div className={`fixed ${isTop ? 'top-[170px]' : 'top-[90px]'} rounded-3xl left-[700px] w-fit object-center bg-green-50 text-xs font-medium text-green-700 ring-1 ring-inset ring-green-600/20 text-center p-2 z-50 transition-all duration-300`}>
@@ -302,17 +308,18 @@ const NavbarDesktop = () => {
                     </p>
                 </div>
               )} */}
-              
 
               <Link
                 href='/shop/brands'
-                className={`${  
+                className={`${
                   router.asPath === '/shop/brands' && 'bg-gray_r-3'
                 } p-4 flex-1 flex justify-center items-center !text-gray_r-12/80 hover:bg-gray_r-3 idt-transition group`}
                 target='_blank'
                 rel='noreferrer'
               >
-               <span className="group-hover:scale-105 group-hover:text-red-500 transition-transform duration-200">Semua Brand</span>
+                <span className='group-hover:scale-105 group-hover:text-red-500 transition-transform duration-200'>
+                  Semua Brand
+                </span>
               </Link>
               <Link
                 href='/shop/search?orderBy=stock'
@@ -323,7 +330,9 @@ const NavbarDesktop = () => {
                 target='_blank'
                 rel='noreferrer'
               >
-                <span className="group-hover:scale-105 group-hover:text-red-500 transition-transform duration-200">Ready Stock</span>
+                <span className='group-hover:scale-105 group-hover:text-red-500 transition-transform duration-200'>
+                  Ready Stock
+                </span>
               </Link>
               <Link
                 href='https://blog.indoteknik.com/'
@@ -331,7 +340,9 @@ const NavbarDesktop = () => {
                 target='_blank'
                 rel='noreferrer noopener'
               >
-                <span className="group-hover:scale-105 group-hover:text-red-500 transition-transform duration-200">Blog Indoteknik</span>
+                <span className='group-hover:scale-105 group-hover:text-red-500 transition-transform duration-200'>
+                  Blog Indoteknik
+                </span>
               </Link>
               {/* <Link
                 href='/video'
diff --git a/src/lib/home/components/BannerSection.jsx b/src/lib/home/components/BannerSection.jsx
index 2010503d..f83c36fc 100644
--- a/src/lib/home/components/BannerSection.jsx
+++ b/src/lib/home/components/BannerSection.jsx
@@ -1,12 +1,12 @@
-import Link from '@/core/components/elements/Link/Link'
-import Image from 'next/image'
+import Link from '@/core/components/elements/Link/Link';
+import Image from 'next/image';
 
-const { useQuery } = require('react-query')
-const { default: bannerSectionApi } = require('../api/bannerSectionApi')
+const { useQuery } = require('react-query');
+const { default: bannerSectionApi } = require('../api/bannerSectionApi');
 
 const BannerSection = () => {
-  const fetchBannerSection = async () => await bannerSectionApi()
-  const bannerSection = useQuery('bannerSection', fetchBannerSection)
+  const fetchBannerSection = async () => await bannerSectionApi();
+  const bannerSection = useQuery('bannerSection', fetchBannerSection);
 
   return (
     bannerSection.data &&
@@ -17,7 +17,7 @@ const BannerSection = () => {
             <Image
               width={1024}
               height={512}
-              quality={100}
+              quality={85}
               src={banner.image}
               alt={banner.name}
               className='h-auto w-full rounded'
@@ -26,7 +26,7 @@ const BannerSection = () => {
         ))}
       </div>
     )
-  )
-}
+  );
+};
 
-export default BannerSection
+export default BannerSection;
diff --git a/src/lib/home/components/CategoryDynamic.jsx b/src/lib/home/components/CategoryDynamic.jsx
index 79092c9d..49a9a93f 100644
--- a/src/lib/home/components/CategoryDynamic.jsx
+++ b/src/lib/home/components/CategoryDynamic.jsx
@@ -3,13 +3,12 @@ import { fetchCategoryManagementSolr } from '../api/categoryManagementApi';
 import NextImage from 'next/image';
 import Link from 'next/link';
 import { createSlug } from '@/core/utils/slug';
-import odooApi from '@/core/api/odooApi';
 import { Skeleton } from '@chakra-ui/react';
 import { Swiper, SwiperSlide } from 'swiper/react';
 import 'swiper/css';
 import 'swiper/css/navigation';
 import 'swiper/css/pagination';
-import { Navigation, Pagination, Autoplay } from 'swiper';
+import { Pagination } from 'swiper';
 
 const CategoryDynamic = () => {
   const [categoryManagement, setCategoryManagement] = useState([]);
@@ -73,9 +72,9 @@ const CategoryDynamic = () => {
             <Skeleton key={category.id} isLoaded={!isLoading}>
               <div key={category.id}>
                 <div className='bagian-judul flex flex-row justify-start items-center gap-3 mb-4 mt-4'>
-                  <div className='font-semibold sm:text-h-lg mr-2'>
+                  <h1 className='font-semibold text-[14px] sm:text-h-lg mr-2'>
                     {category.name}
-                  </div>
+                  </h1>
                   {/* <Skeleton isLoaded={countLevel1 != 0}>
                     <p className={`text-gray_r-10 text-sm`}>{countLevel1} Produk tersedia</p>
                   </Skeleton> */}
@@ -113,9 +112,9 @@ const CategoryDynamic = () => {
                                 className='object-fit p-4'
                               />
                               <div className='bagian-judul flex flex-col justify-center items-start gap-2 ml-2'>
-                                <div className='font-semibold text-lg mr-2'>
+                                <h2 className='font-semibold text-lg mr-2'>
                                   {subCategory?.name}
-                                </div>
+                                </h2>
                                 {/* <Skeleton isLoaded={countLevel2 != 0}>
                                   <p className={`text-gray_r-10 text-sm`}>
                                     {countLevel2} Produk tersedia
@@ -157,9 +156,9 @@ const CategoryDynamic = () => {
                                         height={40}
                                       />
                                       <div className='bagian-judul flex flex-col justify-center items-center gap-2 break-words line-clamp-2 group-hover:text-red-500'>
-                                        <div className='font-semibold line-clamp-2 group-hover:text-red-500 text-sm mr-2'>
+                                        <h3 className='font-semibold line-clamp-2 group-hover:text-red-500 text-sm mr-2'>
                                           {childCategory.name}
-                                        </div>
+                                        </h3>
                                       </div>
                                     </Link>
                                   </div>
diff --git a/src/lib/home/components/CategoryDynamicMobile.jsx b/src/lib/home/components/CategoryDynamicMobile.jsx
index af151df2..4a8f13cf 100644
--- a/src/lib/home/components/CategoryDynamicMobile.jsx
+++ b/src/lib/home/components/CategoryDynamicMobile.jsx
@@ -59,9 +59,9 @@ const CategoryDynamicMobile = () => {
         categoryManagement?.map((category) => (
           <div key={category.id}>
             <div className='bagian-judul flex flex-row justify-between items-center gap-3 mb-4 mt-4'>
-              <div className='font-semibold sm:text-h-sm mr-2'>
-                {category?.name}
-              </div>
+              <h1 className='font-semibold text-[14px] sm:text-h-lg mr-2'>
+                {category.name}
+              </h1>
               <Link
                 href={createSlug(
                   '/shop/category/',
@@ -98,9 +98,9 @@ const CategoryDynamicMobile = () => {
                           className=''
                         />
                         <div className='bagian-judul flex flex-col justify-center items-start gap-1 ml-2'>
-                          <div className='font-semibold text-[10px] line-clamp-1'>
+                          <h2 className='font-semibold text-[10px] line-clamp-1'>
                             {index?.name}
-                          </div>
+                          </h2>
                         </div>
                       </div>
                     </div>
@@ -131,9 +131,9 @@ const CategoryDynamicMobile = () => {
                             className='p-2'
                           />
                           <div className='bagian-judul flex flex-col justify-center items-start gap-1 break-words line-clamp-2 group-hover:text-red-500'>
-                            <div className='font-semibold line-clamp-2 group-hover:text-red-500 text-[10px]'>
+                            <h3 className='font-semibold line-clamp-2 group-hover:text-red-500 text-[10px]'>
                               {x?.name}
-                            </div>
+                            </h3>
                           </div>
                         </Link>
                       </div>
diff --git a/src/lib/home/components/CategoryHomeId.jsx b/src/lib/home/components/CategoryHomeId.jsx
index 71428e27..9f436dac 100644
--- a/src/lib/home/components/CategoryHomeId.jsx
+++ b/src/lib/home/components/CategoryHomeId.jsx
@@ -1,13 +1,15 @@
-import { LazyLoadComponent } from 'react-lazy-load-image-component'
-import useCategoryHomeId from '../hooks/useCategoryHomeId'
-import CategoryHome from './CategoryHome'
+import { LazyLoadComponent } from 'react-lazy-load-image-component';
+import useCategoryHomeId from '../hooks/useCategoryHomeId';
+import CategoryHome from './CategoryHome';
 
 const CategoryHomeId = () => {
-  const { categoryHomeIds } = useCategoryHomeId()
+  const { categoryHomeIds } = useCategoryHomeId();
 
   return (
     <div>
-      <div className='font-semibold sm:text-h-lg mb-6 px-4 sm:px-0'>Kategori Pilihan</div>
+      <h1 className='font-semibold text-[14px] sm:text-h-lg mb-6 px-4 sm:px-0'>
+        Kategori Pilihan
+      </h1>
       <div className='flex flex-col gap-y-10'>
         {categoryHomeIds.data?.map((id) => (
           <LazyLoadComponent key={id}>
@@ -16,7 +18,7 @@ const CategoryHomeId = () => {
         ))}
       </div>
     </div>
-  )
-}
+  );
+};
 
-export default CategoryHomeId
+export default CategoryHomeId;
diff --git a/src/lib/home/components/CategoryPilihan.jsx b/src/lib/home/components/CategoryPilihan.jsx
index 6dbf771e..2e5ca721 100644
--- a/src/lib/home/components/CategoryPilihan.jsx
+++ b/src/lib/home/components/CategoryPilihan.jsx
@@ -1,123 +1,168 @@
-import Image from 'next/image'
-import useCategoryHome from '../hooks/useCategoryHome'
-import Link from '@/core/components/elements/Link/Link'
-import { createSlug } from '@/core/utils/slug'
+import Image from 'next/image';
+import useCategoryHome from '../hooks/useCategoryHome';
+import Link from '@/core/components/elements/Link/Link';
+import { createSlug } from '@/core/utils/slug';
 import { useEffect, useState } from 'react';
 import { bannerApi } from '../../../api/bannerApi';
-const { useQuery } = require('react-query')
+const { useQuery } = require('react-query');
 import { HeroBannerSkeleton } from '../../../components/skeleton/BannerSkeleton';
 import useCategoryPilihan from '../hooks/useCategoryPilihan';
-import useDevice from '@/core/hooks/useDevice'
+import useDevice from '@/core/hooks/useDevice';
 import { Swiper, SwiperSlide } from 'swiper/react';
 import 'swiper/css';
 
 const CategoryPilihan = ({ id, categories }) => {
-    const { isDesktop, isMobile } = useDevice()
-    const { categoryPilihan } = useCategoryPilihan();
-    const heroBanner = useQuery('categoryPilihan', bannerApi({ type: 'banner-category-list' }));
-      return (
-        categoryPilihan.length > 0 && (
-          <section>
-            {isDesktop && (
-                <div>
-                    <div className='flex flex-row items-center mb-4'>
-                        <div className='font-semibold sm:text-h-lg mr-2'>LOB Kategori Pilihan</div>
-                        <p className='text-gray_r-10 text-sm'>200 Rb+ Produk Unggulan & 800+ Brand Rekomendasi tersedia!</p>
-                    </div>
-                        {heroBanner.data &&
-                            heroBanner.data?.length > 0 && (
-                                <div className='flex w-full h-full justify-center mb-4 bg-cover bg-center'>
-                                        <Link  key={heroBanner.data[0].id} href={heroBanner.data[0].url}>
-                                            <Image
-                                            width={1260}
-                                            height={170}
-                                            quality={100}
-                                            src={heroBanner.data[0].image}
-                                            alt={heroBanner.data[0].name}
-                                            className='h-full object-cover w-full'
-                                            />
-                                        </Link>
-                            </div>
-                            )}
-                    <div className="group/item grid grid-cols-6 gap-y-2 w-full h-full col-span-2 ">
-                            {categoryPilihan?.data?.map((category) => (
-                                <div key={category.id} className="KartuInti h-48 w-60 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-end h-48 w-60  flex-col group-hover/item:visible">
-                                            <div className=' h-36 flex justify-end items-end'>
-                                                <Image className='group-hover:scale-105 transition-transform duration-300 ' src={category?.image? category?.image : '/images/noimage.jpeg'}  width={120} height={120} alt={category?.name} />
-                                            </div>
-                                            <h2 className="text-gray-700 content-center h-12 border-t-[1px] px-1 w-60 border-gray-200 font-normal text-sm text-center">{category?.industries}</h2>
-                                        </div>
-                                    </div>
-                                    <div className='KartuA relative inset-0  flex h-36 w-60   items-center justify-center opacity-0 group-hover:opacity-75 group-hover:bg-[#E20613] transition-opacity '>
-                                        <Link
-                                            href={createSlug('/shop/lob/', category?.industries, category?.id)}
-                                            className='category-mega-box__parent text-white   rounded-lg'
-                                        >
-                                            Lihat semua
-                                        </Link>
-                                    </div>
-                                </div>
-                            ))}
+  const { isDesktop, isMobile } = useDevice();
+  const { categoryPilihan } = useCategoryPilihan();
+  const heroBanner = useQuery(
+    'categoryPilihan',
+    bannerApi({ type: 'banner-category-list' })
+  );
+  return (
+    categoryPilihan.length > 0 && (
+      <section>
+        {isDesktop && (
+          <div>
+            <div className='flex flex-row items-center mb-4'>
+              <div className='font-semibold sm:text-h-lg mr-2'>
+                LOB Kategori Pilihan
+              </div>
+              <p className='text-gray_r-10 text-sm'>
+                200 Rb+ Produk Unggulan & 800+ Brand Rekomendasi tersedia!
+              </p>
+            </div>
+            {heroBanner.data && heroBanner.data?.length > 0 && (
+              <div className='flex w-full h-full justify-center mb-4 bg-cover bg-center'>
+                <Link key={heroBanner.data[0].id} href={heroBanner.data[0].url}>
+                  <Image
+                    width={1260}
+                    height={170}
+                    quality={85}
+                    src={heroBanner.data[0].image}
+                    alt={heroBanner.data[0].name}
+                    className='h-full object-cover w-full'
+                  />
+                </Link>
+              </div>
+            )}
+            <div className='group/item grid grid-cols-6 gap-y-2 w-full h-full col-span-2 '>
+              {categoryPilihan?.data?.map((category) => (
+                <div
+                  key={category.id}
+                  className='KartuInti h-48 w-60 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-end h-48 w-60  flex-col group-hover/item:visible'>
+                      <div className=' h-36 flex justify-end items-end'>
+                        <Image
+                          className='group-hover:scale-105 transition-transform duration-300 '
+                          src={
+                            category?.image
+                              ? category?.image
+                              : '/images/noimage.jpeg'
+                          }
+                          width={120}
+                          height={120}
+                          alt={category?.name}
+                        />
+                      </div>
+                      <h2 className='text-gray-700 content-center h-12 border-t-[1px] px-1 w-60 border-gray-200 font-normal text-sm text-center'>
+                        {category?.industries}
+                      </h2>
                     </div>
+                  </div>
+                  <div className='KartuA relative inset-0  flex h-36 w-60   items-center justify-center opacity-0 group-hover:opacity-75 group-hover:bg-[#E20613] transition-opacity '>
+                    <Link
+                      href={createSlug(
+                        '/shop/lob/',
+                        category?.industries,
+                        category?.id
+                      )}
+                      className='category-mega-box__parent text-white   rounded-lg'
+                    >
+                      Lihat semua
+                    </Link>
+                  </div>
                 </div>
-            )}
-            {isMobile && (
-                <div className='p-4'>
-                    <div className='flex flex-row items-center mb-4'>
-                        <div className='font-semibold sm:text-h-md mr-2'>LOB Kategori Pilihan</div>
-                        {/* <p className='text-gray_r-10 text-sm'>200 Rb+ Produk Unggulan & 800+ Brand Rekomendasi tersedia!</p> */}
+              ))}
+            </div>
+          </div>
+        )}
+        {isMobile && (
+          <div className='p-4'>
+            <div className='flex flex-row items-center mb-4'>
+              <div className='font-semibold sm:text-h-md mr-2'>
+                LOB Kategori Pilihan
+              </div>
+              {/* <p className='text-gray_r-10 text-sm'>200 Rb+ Produk Unggulan & 800+ Brand Rekomendasi tersedia!</p> */}
+            </div>
+            <div className='flex'>
+              {heroBanner.data && heroBanner.data?.length > 0 && (
+                <div className=' object-fill '>
+                  <Link
+                    key={heroBanner.data[0].id}
+                    href={heroBanner.data[0].url}
+                  >
+                    <Image
+                      width={439}
+                      height={150}
+                      quality={85}
+                      src={heroBanner.data[0].image}
+                      alt={heroBanner.data[0].name}
+                      className='object-cover'
+                    />
+                  </Link>
+                </div>
+              )}
+            </div>
+            <Swiper slidesPerView={2.1} spaceBetween={10}>
+              {categoryPilihan?.data?.map((category) => (
+                <SwiperSlide key={category.id}>
+                  <div
+                    key={category.id}
+                    className='KartuInti mt-2 h-48 w-48 max-w-sm   lg:max-w-full flex flex-col   border-[1px] border-gray-200  relative group'
+                  >
+                    <div className='KartuB absolute h-48 w-48 inset-0 flex items-center justify-center '>
+                      <div className='group/edit flex items-center justify-end h-48 w-48  flex-col group-hover/item:visible'>
+                        <div className=' h-36 flex justify-end items-end'>
+                          <Image
+                            className='group-hover:scale-105 transition-transform duration-300 '
+                            src={
+                              category?.image
+                                ? category?.image
+                                : '/images/noimage.jpeg'
+                            }
+                            width={120}
+                            height={120}
+                            alt={category?.name}
+                          />
+                        </div>
+                        <h2 className='text-gray-700 content-center h-12 border-t-[1px] px-1 w-48 border-gray-200 font-normal text-sm text-center'>
+                          {category?.industries}
+                        </h2>
+                      </div>
                     </div>
-                    <div className='flex'>
-                        {heroBanner.data &&
-                            heroBanner.data?.length > 0 && (
-                                <div className=' object-fill '>
-                                        <Link key={heroBanner.data[0].id} href={heroBanner.data[0].url}>
-                                            <Image
-                                            width={439}
-                                            height={150}
-                                            quality={100}
-                                            src={heroBanner.data[0].image}
-                                            alt={heroBanner.data[0].name}
-                                            className='object-cover'
-                                            />
-                                        </Link>
-                                </div>
-                            )}
+                    <div className='KartuA relative inset-0  flex h-36 w-48   items-center justify-center opacity-0 group-hover:opacity-75 group-hover:bg-[#E20613] transition-opacity '>
+                      <Link
+                        href={createSlug(
+                          '/shop/lob/',
+                          category?.industries,
+                          category?.id
+                        )}
+                        className='category-mega-box__parent text-white   rounded-lg'
+                      >
+                        Lihat semua
+                      </Link>
                     </div>
-                        <Swiper slidesPerView={2.1} spaceBetween={10}>
-                            {categoryPilihan?.data?.map((category) => (
-                                <SwiperSlide key={category.id}>
-                                    <div key={category.id} className="KartuInti mt-2 h-48 w-48 max-w-sm   lg:max-w-full flex flex-col   border-[1px] border-gray-200  relative group">
-                                        <div className='KartuB absolute h-48 w-48 inset-0 flex items-center justify-center '>
-                                            <div className="group/edit flex items-center justify-end h-48 w-48  flex-col group-hover/item:visible">
-                                                <div className=' h-36 flex justify-end items-end'>
-                                                    <Image className='group-hover:scale-105 transition-transform duration-300 ' src={category?.image? category?.image : '/images/noimage.jpeg'}  width={120} height={120} alt={category?.name} />
-                                                </div>
-                                                <h2 className="text-gray-700 content-center h-12 border-t-[1px] px-1 w-48 border-gray-200 font-normal text-sm text-center">{category?.industries}</h2>
-                                            </div>
-                                        </div>
-                                        <div className='KartuA relative inset-0  flex h-36 w-48   items-center justify-center opacity-0 group-hover:opacity-75 group-hover:bg-[#E20613] transition-opacity '>
-                                            <Link
-                                                href={createSlug('/shop/lob/', category?.industries, category?.id)}
-                                                className='category-mega-box__parent text-white   rounded-lg'
-                                            >
-                                                Lihat semua
-                                            </Link>
-                                        </div>
-                                    </div>
-                                </SwiperSlide>
-                            ))}
-
-                        </Swiper>
-                    
-                </div>
-            )}
-            </section>
-
-        )
-  )
-}
+                  </div>
+                </SwiperSlide>
+              ))}
+            </Swiper>
+          </div>
+        )}
+      </section>
+    )
+  );
+};
 
-export default CategoryPilihan
+export default CategoryPilihan;
diff --git a/src/lib/home/components/PromotionProgram.jsx b/src/lib/home/components/PromotionProgram.jsx
index ae8d5d6f..ae06bd4d 100644
--- a/src/lib/home/components/PromotionProgram.jsx
+++ b/src/lib/home/components/PromotionProgram.jsx
@@ -1,13 +1,16 @@
-import Link from '@/core/components/elements/Link/Link'
-import Image from 'next/image'
+import Link from '@/core/components/elements/Link/Link';
+import Image from 'next/image';
 import { bannerApi } from '@/api/bannerApi';
-import useDevice from '@/core/hooks/useDevice'
+import useDevice from '@/core/hooks/useDevice';
 import { Swiper, SwiperSlide } from 'swiper/react';
-import  BannerPromoSkeleton from '../components/Skeleton/BannerPromoSkeleton';
-const { useQuery } = require('react-query')
+import BannerPromoSkeleton from '../components/Skeleton/BannerPromoSkeleton';
+const { useQuery } = require('react-query');
 const BannerSection = () => {
-  const promotionProgram = useQuery('promotionProgram', bannerApi({ type: 'banner-promotion' }));
-  const { isMobile, isDesktop } = useDevice()
+  const promotionProgram = useQuery(
+    'promotionProgram',
+    bannerApi({ type: 'banner-promotion' })
+  );
+  const { isMobile, isDesktop } = useDevice();
 
   if (promotionProgram.isLoading) {
     return <BannerPromoSkeleton />;
@@ -16,60 +19,65 @@ const BannerSection = () => {
   return (
     <div className='px-4 sm:px-0'>
       <div className='flex justify-between items-center mb-4 '>
-        <h1 className='font-semibold text-[14px] sm:text-h-lg'> <Link href='/shop/promo' className='!text-black font-semibold' >Promo Tersedia</Link></h1>
+        <h1 className='font-semibold text-[14px] sm:text-h-lg'>
+          {' '}
+          <Link href='/shop/promo' className='!text-black font-semibold'>
+            Promo Tersedia
+          </Link>
+        </h1>
         {isDesktop && (
           <Link href='/shop/promo' className='!text-red-500 font-semibold'>
-          Lihat Semua
-        </Link>
+            Lihat Semua
+          </Link>
         )}
         {isMobile && (
-          <Link href='/shop/promo' className='!text-red-500 font-semibold sm:text-h-sm'>
-          Lihat Semua
-        </Link>
-        )}
-      </div>
-      {isDesktop && (promotionProgram.data &&
-    promotionProgram.data?.length > 0 && (
-      <div className='grid grid-cols-3 sm:grid-cols-3 gap-4   rounded-md'>
-        {promotionProgram.data?.map((banner) => (
-          <Link key={banner.id} href={banner.url}>
-            <Image
-              width={439}
-              height={150}
-              quality={100}
-              src={banner.image}
-              alt={banner.name}
-              className='h-auto  w-full rounded hover:scale-105 transition duration-500 ease-in-out'
-            />
+          <Link
+            href='/shop/promo'
+            className='!text-red-500 font-semibold sm:text-h-sm'
+          >
+            Lihat Semua
           </Link>
-        ))}
+        )}
       </div>
-      
-    ))}
+      {isDesktop &&
+        promotionProgram.data &&
+        promotionProgram.data?.length > 0 && (
+          <div className='grid grid-cols-3 sm:grid-cols-3 gap-4   rounded-md'>
+            {promotionProgram.data?.map((banner) => (
+              <Link key={banner.id} href={banner.url}>
+                <Image
+                  width={439}
+                  height={150}
+                  quality={85}
+                  src={banner.image}
+                  alt={banner.name}
+                  className='h-auto  w-full rounded hover:scale-105 transition duration-500 ease-in-out'
+                />
+              </Link>
+            ))}
+          </div>
+        )}
 
-{isMobile && (
-     
-     <Swiper slidesPerView={1.1} spaceBetween={8} freeMode>
-     {promotionProgram.data?.map((banner) => (
-       <SwiperSlide key={banner.id}>
-         <Link key={banner.id} href={banner.url}>
-            <Image
-              width={439}
-              height={150}
-              quality={100}
-              src={banner.image}
-              alt={banner.name}
-              className='h-auto  w-full rounded '
-            />
-          </Link>
-       </SwiperSlide>
-     ))}
-   </Swiper>
-  
-  )}  
+      {isMobile && (
+        <Swiper slidesPerView={1.1} spaceBetween={8} freeMode>
+          {promotionProgram.data?.map((banner) => (
+            <SwiperSlide key={banner.id}>
+              <Link key={banner.id} href={banner.url}>
+                <Image
+                  width={439}
+                  height={150}
+                  quality={85}
+                  src={banner.image}
+                  alt={banner.name}
+                  className='h-auto  w-full rounded '
+                />
+              </Link>
+            </SwiperSlide>
+          ))}
+        </Swiper>
+      )}
     </div>
-    
-  )
-}
+  );
+};
 
-export default BannerSection
+export default BannerSection;
diff --git a/src/lib/home/components/ServiceList.jsx b/src/lib/home/components/ServiceList.jsx
index b8799d7d..5b16915d 100644
--- a/src/lib/home/components/ServiceList.jsx
+++ b/src/lib/home/components/ServiceList.jsx
@@ -1,5 +1,5 @@
-import Image from 'next/image'
-import Link from '@/core/components/elements/Link/Link'
+import Image from 'next/image';
+import Link from '@/core/components/elements/Link/Link';
 
 const ServiceList = () => {
   return (
@@ -14,14 +14,16 @@ const ServiceList = () => {
               <Image
                 width={24}
                 height={24}
-                quality={100}
+                quality={85}
                 src='/images/icon_service/ONE-STOP-SOLUTIONS.svg'
                 alt=''
                 className='h-20 w-20 rounded'
               />
             </div>
             <div className=''>
-              <h1 className='text-gray-900 font-semibold text-base'>One Stop Solution</h1>
+              <h1 className='text-gray-900 font-semibold text-base'>
+                One Stop Solution
+              </h1>
               <p className='text-xs md:text-sm text-gray-500'>
                 Temukan Solusi Lengkap Anda dalam Satu Tempat.
               </p>
@@ -37,14 +39,16 @@ const ServiceList = () => {
               <Image
                 width={24}
                 height={24}
-                quality={100}
+                quality={85}
                 src='/images/icon_service/WARRANTY.svg'
                 alt=''
                 className='h-20 w-20 rounded'
               />
             </div>
             <div>
-              <h1 className='text-gray-900 font-semibold text-base'>Garansi Resmi</h1>
+              <h1 className='text-gray-900 font-semibold text-base'>
+                Garansi Resmi
+              </h1>
               <p className='text-xs md:text-sm text-gray-500'>
                 Garansi Keaslian Barang dan Jaminan Purna Jual.
               </p>
@@ -60,14 +64,16 @@ const ServiceList = () => {
               <Image
                 width={24}
                 height={24}
-                quality={100}
+                quality={85}
                 src='/images/icon_service/DUE-PAYMENT.svg'
                 alt=''
                 className='h-20 w-20 rounded'
               />
             </div>
             <div>
-              <h1 className='text-gray-900 font-semibold text-base'>Pembayaran Tempo</h1>
+              <h1 className='text-gray-900 font-semibold text-base'>
+                Pembayaran Tempo
+              </h1>
               <p className='text-xs md:text-sm text-gray-500'>
                 Lebih mudah mengatur pembelian dengan pembayaran tempo.
               </p>
@@ -83,14 +89,16 @@ const ServiceList = () => {
               <Image
                 width={24}
                 height={24}
-                quality={100}
+                quality={85}
                 src='/images/icon_service/TAX.svg'
                 alt=''
                 className='h-20 w-20 rounded'
               />
             </div>
             <div>
-              <h1 className='text-gray-900 font-semibold text-base'>Faktur Pajak</h1>
+              <h1 className='text-gray-900 font-semibold text-base'>
+                Faktur Pajak
+              </h1>
               <p className='text-xs md:text-sm text-gray-500'>
                 Dapat Faktur pajak untuk setiap transaksi dengan indoteknik.com
               </p>
@@ -99,7 +107,7 @@ const ServiceList = () => {
         </div>
       </div>
     </div>
-  )
-}
+  );
+};
 
-export default ServiceList
+export default ServiceList;
diff --git a/src/lib/quotation/components/Quotationheader.jsx b/src/lib/quotation/components/Quotationheader.jsx
index 4529c977..cb7684ed 100644
--- a/src/lib/quotation/components/Quotationheader.jsx
+++ b/src/lib/quotation/components/Quotationheader.jsx
@@ -19,14 +19,22 @@ const Quotationheader = (quotationCount) => {
     context: 'quotation',
     site: auth?.webRole === null && auth?.site ? auth.site : null,
   };
-  
+
   const router = useRouter();
   const [subTotal, setSubTotal] = useState(null);
   const [buttonLoading, SetButtonTerapkan] = useState(false);
   const itemLoading = [1, 2, 3];
   const [countQuotation, setCountQuotation] = useState(null);
-  const { productCart, setProductCart, refreshCart, setRefreshCart, isLoading, setIsloading, productQuotation, setProductQuotation } =
-  useProductCartContext();
+  const {
+    productCart,
+    setProductCart,
+    refreshCart,
+    setRefreshCart,
+    isLoading,
+    setIsloading,
+    productQuotation,
+    setProductQuotation,
+  } = useProductCartContext();
 
   const [isHovered, setIsHovered] = useState(false);
   const [isTop, setIsTop] = useState(true);
@@ -49,34 +57,44 @@ const Quotationheader = (quotationCount) => {
       refreshCartf();
     }
   };
-  let { transactions } = useTransactions({ query });
+  let transactions = null;
+
+  if (auth) {
+    transactions = useTransactions({ query });
+  }
 
   const refreshCartf = useCallback(async () => {
     setIsloading(true);
-    let pendingTransactions = transactions?.data?.saleOrders.filter(transaction => transaction.status === 'draft');
+    let pendingTransactions = transactions?.data?.saleOrders.filter(
+      (transaction) => transaction.status === 'draft'
+    );
     setProductQuotation(pendingTransactions);
-    setCountQuotation(pendingTransactions?.length ? pendingTransactions?.length : pendingTransactions?.length);
+    setCountQuotation(
+      pendingTransactions?.length
+        ? pendingTransactions?.length
+        : pendingTransactions?.length
+    );
     setIsloading(false);
   }, [setProductQuotation, setIsloading]);
 
   useEffect(() => {
-    if (!qotation) return
+    if (!qotation) return;
 
-    let calculateTotalDiscountAmount = 0
+    let calculateTotalDiscountAmount = 0;
     for (const product of qotation) {
-      // if (qotation.quantity == '') continue  
-      calculateTotalDiscountAmount += product.amountUntaxed
+      // if (qotation.quantity == '') continue
+      calculateTotalDiscountAmount += product.amountUntaxed;
     }
-    let subTotal = calculateTotalDiscountAmount
-    setSubTotal(subTotal)
-  }, [qotation])
+    let subTotal = calculateTotalDiscountAmount;
+    setSubTotal(subTotal);
+  }, [qotation]);
 
   useEffect(() => {
     if (refreshCart) {
       refreshCartf();
     }
     setRefreshCart(false);
-  }, [ refreshCartf, setRefreshCart]);
+  }, [refreshCartf, setRefreshCart]);
 
   useEffect(() => {
     setCountQuotation(quotationCount.quotationCount);
@@ -95,7 +113,10 @@ const Quotationheader = (quotationCount) => {
 
   const handleCheckout = async () => {
     SetButtonTerapkan(true);
-    let checkoutAll = await odooApi('POST', `/api/v1/user/${auth.id}/cart/select-all`);
+    let checkoutAll = await odooApi(
+      'POST',
+      `/api/v1/user/${auth.id}/cart/select-all`
+    );
     router.push('/my/quotations');
   };
 
@@ -150,7 +171,9 @@ const Quotationheader = (quotationCount) => {
                 className='w-full max-w-md p-2 bg-white border border-gray-200 rounded-lg shadow overflow-hidden'
               >
                 <div className='p-2 flex justify-between items-center'>
-                  <h5 className='text-base font-semibold leading-none'>Daftar Quotation</h5>
+                  <h5 className='text-base font-semibold leading-none'>
+                    Daftar Quotation
+                  </h5>
                 </div>
                 <hr className='mt-3 mb-3 border border-gray-100' />
                 <div className='flow-root max-h-[250px] overflow-y-auto'>
@@ -158,7 +181,10 @@ const Quotationheader = (quotationCount) => {
                     <div className='justify-center p-4'>
                       <p className='text-gray-500 text-center '>
                         Silahkan{' '}
-                        <Link href='/login' className='text-red-600 underline leading-6'>
+                        <Link
+                          href='/login'
+                          className='text-red-600 underline leading-6'
+                        >
                           Login
                         </Link>{' '}
                         Untuk Melihat Daftar Quotation Anda
@@ -167,7 +193,11 @@ const Quotationheader = (quotationCount) => {
                   )}
                   {isLoading &&
                     itemLoading.map((item) => (
-                      <div key={item} role='status' className='max-w-sm animate-pulse'>
+                      <div
+                        key={item}
+                        role='status'
+                        className='max-w-sm animate-pulse'
+                      >
                         <div className='flex items-center space-x-4 mb- 2'>
                           <div className='flex-shrink-0'>
                             <PhotoIcon className='h-16 w-16 text-gray-500' />
@@ -189,43 +219,70 @@ const Quotationheader = (quotationCount) => {
                   )}
                   {auth && qotation.length > 0 && !isLoading && (
                     <>
-                      <ul role='list' className='divide-y divide-gray-200 dark:divide-gray-700'>
+                      <ul
+                        role='list'
+                        className='divide-y divide-gray-200 dark:divide-gray-700'
+                      >
                         {qotation &&
                           qotation?.map((product, index) => (
                             <>
                               <li className='py-1 sm:py-2'>
                                 <div className='flex justify-between border p-2 flex-col gap-y-2 hover:border-red-500'>
-                                <Link 
+                                  <Link
                                     href={`/my/quotations/${product?.id}`}
-                                    className='hover:border-red-500' 
-                                     >
+                                    className='hover:border-red-500'
+                                  >
                                     <div className='flex justify-between mb-2'>
                                       <div className='flex flex-row items-center'>
-                                      <p className='tanggal text-xs opacity-80 mr-[2px]'>Sales : </p>
-                                      <p className='tanggal text-xs text-red-500 font-semibold'>{product.sales}</p>
+                                        <p className='tanggal text-xs opacity-80 mr-[2px]'>
+                                          Sales :{' '}
+                                        </p>
+                                        <p className='tanggal text-xs text-red-500 font-semibold'>
+                                          {product.sales}
+                                        </p>
                                       </div>
                                       <div className='flex flex-row items-center'>
-                                      <p className='text-xs opacity-80 mr-[2px]'>Status :</p>
-                                      <p className='badge-red h-fit text-xs whitespace-nowrap'>Pending Quotation</p>
+                                        <p className='text-xs opacity-80 mr-[2px]'>
+                                          Status :
+                                        </p>
+                                        <p className='badge-red h-fit text-xs whitespace-nowrap'>
+                                          Pending Quotation
+                                        </p>
                                       </div>
                                     </div>
                                     <div className='flex justify-between mb-2'>
                                       <div className='flex flex-col items-start'>
-                                        <p className=' text-xs opacity-80 mr-[2px]'>No. Transaksi</p>
-                                        <p className=' text-sm text-red-500 font-semibold'> {product.name}</p>
+                                        <p className=' text-xs opacity-80 mr-[2px]'>
+                                          No. Transaksi
+                                        </p>
+                                        <p className=' text-sm text-red-500 font-semibold'>
+                                          {' '}
+                                          {product.name}
+                                        </p>
                                       </div>
                                       <div className='flex flex-col items-end'>
-                                        <p className='text-xs opacity-80 mr-[2px]'>No. Purchase Order</p>
-                                        <p className='font-semibold text-sm text-red-500'> {product.purchaseOrderName ? product.purchaseOrderName : '-'}</p>
+                                        <p className='text-xs opacity-80 mr-[2px]'>
+                                          No. Purchase Order
+                                        </p>
+                                        <p className='font-semibold text-sm text-red-500'>
+                                          {' '}
+                                          {product.purchaseOrderName
+                                            ? product.purchaseOrderName
+                                            : '-'}
+                                        </p>
                                       </div>
                                     </div>
                                     {/* <div className='my-0.5 h-0.5 bg-gray-200'></div> */}
                                     <hr className='mt-3 mb-3 border border-gray-100' />
                                     <div className='bagian bawah flex justify-between mt-2'>
-                                      <p className='font-semibold text-sm'>Total</p>
-                                      <p className='font-semibold text-sm'>{currencyFormat(product.amountUntaxed)}</p>
+                                      <p className='font-semibold text-sm'>
+                                        Total
+                                      </p>
+                                      <p className='font-semibold text-sm'>
+                                        {currencyFormat(product.amountUntaxed)}
+                                      </p>
                                     </div>
-                                </Link>
+                                  </Link>
                                 </div>
                               </li>
                             </>
@@ -238,8 +295,12 @@ const Quotationheader = (quotationCount) => {
                 {auth && qotation.length > 0 && !isLoading && (
                   <>
                     <div className='mt-3 ml-1'>
-                      <span className='text-gray-400 text-caption-2'>Subtotal Sebelum PPN : </span>
-                      <span className='font-semibold text-red-600'>{currencyFormat(subTotal)}</span>
+                      <span className='text-gray-400 text-caption-2'>
+                        Subtotal Sebelum PPN :{' '}
+                      </span>
+                      <span className='font-semibold text-red-600'>
+                        {currencyFormat(subTotal)}
+                      </span>
                     </div>
                     <div className='mt-5 mb-2'>
                       <button
diff --git a/src/lib/review/components/CustomerReviews.jsx b/src/lib/review/components/CustomerReviews.jsx
index 7cad52fb..a6e697f0 100644
--- a/src/lib/review/components/CustomerReviews.jsx
+++ b/src/lib/review/components/CustomerReviews.jsx
@@ -1,18 +1,23 @@
-import DesktopView from '@/core/components/views/DesktopView'
-import MobileView from '@/core/components/views/MobileView'
-import Image from 'next/image'
-import { Swiper, SwiperSlide } from 'swiper/react'
-import { Autoplay } from 'swiper'
+import DesktopView from '@/core/components/views/DesktopView';
+import MobileView from '@/core/components/views/MobileView';
+import Image from 'next/image';
+import { Swiper, SwiperSlide } from 'swiper/react';
+import { Autoplay } from 'swiper';
 
-const { useQuery } = require('react-query')
-const { getCustomerReviews } = require('../api/customerReviewsApi')
+const { useQuery } = require('react-query');
+const { getCustomerReviews } = require('../api/customerReviewsApi');
 
 const CustomerReviews = () => {
-  const { data: customerReviews } = useQuery('customerReviews', getCustomerReviews)
+  const { data: customerReviews } = useQuery(
+    'customerReviews',
+    getCustomerReviews
+  );
 
   return (
     <div className='px-4 sm:px-0'>
-      <div className='font-semibold sm:text-h-lg mb-4'>Ulasan Konsumen Kami</div>
+      <h1 className='font-semibold text-[14px] sm:text-h-lg mb-4'>
+        Ulasan Konsumen Kami
+      </h1>
 
       <DesktopView>
         <Swiper slidesPerView={3.2} spaceBetween={16} {...swiperProps}>
@@ -36,17 +41,17 @@ const CustomerReviews = () => {
         </Swiper>
       </MobileView>
     </div>
-  )
-}
+  );
+};
 
 const swiperProps = {
   autoplay: {
     delay: 6000,
-    disableOnInteraction: false
+    disableOnInteraction: false,
   },
   loop: true,
-  modules: [Autoplay]
-}
+  modules: [Autoplay],
+};
 
 const Card = ({ customerReview }) => (
   <div className='bg-gray-200 rounded-md px-5 py-6 shadow-md shadow-gray-500/20 h-full'>
@@ -67,6 +72,6 @@ const Card = ({ customerReview }) => (
       dangerouslySetInnerHTML={{ __html: customerReview.ulasan }}
     />
   </div>
-)
+);
 
-export default CustomerReviews
+export default CustomerReviews;
diff --git a/src/lib/tracking-order/component/TrackingOrder.jsx b/src/lib/tracking-order/component/TrackingOrder.jsx
index 394979c1..8a7b2579 100644
--- a/src/lib/tracking-order/component/TrackingOrder.jsx
+++ b/src/lib/tracking-order/component/TrackingOrder.jsx
@@ -1,139 +1,161 @@
-import { yupResolver } from '@hookform/resolvers/yup'
-import React, { useEffect, useState } from 'react' 
-import { useForm } from 'react-hook-form'
-import * as Yup from 'yup'
-import Manifest from '@/lib/treckingAwb/component/Manifest'
-import { trackingOrder } from '../api/trackingOrder'
-import { useQuery } from 'react-query'
+import { yupResolver } from '@hookform/resolvers/yup';
+import React, { useEffect, useState } from 'react';
+import { useForm } from 'react-hook-form';
+import * as Yup from 'yup';
+import Manifest from '@/lib/treckingAwb/component/Manifest';
+import { trackingOrder } from '../api/trackingOrder';
+import { useQuery } from 'react-query';
 import { Spinner } from '@chakra-ui/react';
 import { Search } from 'lucide-react';
-import whatsappUrl from '@/core/utils/whatsappUrl';
-import Link from 'next/link'
+import Link from 'next/link';
 
 const TrackingOrder = () => {
-    const [idAWB, setIdAWB] = useState(null)
-    const [inputQuery, setInputQuery] = useState(null)
-    const [buttonClick, setButtonClick] = useState(false)
-    const [apiError, setApiError] = useState(null) // State to store API error message
-    
-    const closePopup = () => {
-        setIdAWB(null)
-        setButtonClick(false)
-        setInputQuery(null)
-        setApiError(null) // Reset error message on close
-    }
-    
-    const {
-        register,
-        handleSubmit,
-        formState: { errors },
-        control,
-        reset
-    } = useForm({
-        resolver: yupResolver(validationSchema),
-        defaultValues
-    })
-    
-    const query = {
-        email: inputQuery?.email,
-        so: inputQuery?.id
-    }
-    
-    const { data: tracking, isLoading, isError, error } = useQuery(
-        ['tracking', query],
-        () => trackingOrder({ query: query }),
-        {
-            enabled: !!query.email && !!query.so,
-            onSuccess: (data) => {
-                if (buttonClick) {
-                    if (data?.code === 403 || data?.code === 400 || data?.code === 404) {
-                        setApiError(data?.description);
-                    } else if (data?.pickings?.length > 0) {
-                        setIdAWB(data.pickings[0]?.id);
-                    } else {
-                        setApiError('No pickings data available');
-                    }
-                    setButtonClick(false);
-                    setInputQuery(null);
-                }
-            },
+  const [idAWB, setIdAWB] = useState(null);
+  const [inputQuery, setInputQuery] = useState(null);
+  const [buttonClick, setButtonClick] = useState(false);
+  const [apiError, setApiError] = useState(null); // State to store API error message
+
+  const closePopup = () => {
+    setIdAWB(null);
+    setButtonClick(false);
+    setInputQuery(null);
+    setApiError(null); // Reset error message on close
+  };
+
+  const {
+    register,
+    handleSubmit,
+    formState: { errors },
+    control,
+    reset,
+  } = useForm({
+    resolver: yupResolver(validationSchema),
+    defaultValues,
+  });
+
+  const query = {
+    email: inputQuery?.email,
+    so: inputQuery?.id,
+  };
+
+  const {
+    data: tracking,
+    isLoading,
+    isError,
+    error,
+  } = useQuery(['tracking', query], () => trackingOrder({ query: query }), {
+    enabled: !!query.email && !!query.so,
+    onSuccess: (data) => {
+      if (buttonClick) {
+        if (data?.code === 403 || data?.code === 400 || data?.code === 404) {
+          setApiError(data?.description);
+        } else if (data?.pickings?.length > 0) {
+          setIdAWB(data.pickings[0]?.id);
+        } else {
+          setApiError('No pickings data available');
         }
-    );
+        setButtonClick(false);
+        setInputQuery(null);
+      }
+    },
+  });
 
-    const onSubmitHandler = async (values) => {
-        setInputQuery(values)
-        setButtonClick(true)
-    }
+  const onSubmitHandler = async (values) => {
+    setInputQuery(values);
+    setButtonClick(true);
+  };
 
-    return (
-        <div className='container mx-auto flex py-10 flex-col'>
-            <h1 className='text-h-sm md:text-title-sm font-semibold mb-6'>Tracking Order</h1>
-            <div className='flex justify-start items-start'>
-            <span className='text-base w-full'>
-                {`Untuk melacak pesanan Anda, masukkan Nomor Transaksi di kotak bawah ini dan masukkan Email login anda lalu tekan tombol "Lacak". Nomor Transaksi ini dapat Anda lihat dalam menu `}
-                <Link href='/my/transactions' className='text-red-500'>
-                    Daftar Transaksi
-                </Link>
-                {`. Jika mengalami kesulitan `}
-                <Link href='https://wa.me/6281717181922' target='_blank' rel='noreferrer' className='text-red-500'>
-                    hubungi kami
-                </Link>
-                {`.`}
-            </span>
+  return (
+    <div className='container mx-auto flex py-10 flex-col'>
+      <h1 className='text-h-sm md:text-title-sm font-semibold mb-6'>
+        Tracking Order
+      </h1>
+      <div className='flex justify-start items-start'>
+        <p className='text-base w-full'>
+          {`Untuk melacak pesanan Anda, masukkan Nomor Transaksi di kotak bawah ini dan masukkan Email login anda lalu tekan tombol "Lacak". Nomor Transaksi ini dapat Anda lihat dalam menu `}
+          <Link href='/my/transactions' className='text-red-500'>
+            Daftar Transaksi
+          </Link>
+          {`. Jika mengalami kesulitan `}
+          <Link
+            href='https://wa.me/6281717181922'
+            target='_blank'
+            rel='noreferrer'
+            className='text-red-500'
+          >
+            hubungi kami
+          </Link>
+          {`.`}
+        </p>
+      </div>
+      <div>
+        <form
+          onSubmit={handleSubmit(onSubmitHandler)}
+          className='flex mt-4 flex-row w-full '
+        >
+          <div className='w-[90%] grid grid-cols-2 gap-4'>
+            <div className='flex flex-col '>
+              <label className='form-label mb-2'>ID Pesanan*</label>
+              <input
+                {...register('id')}
+                placeholder='dapat dilihat pada email konfirmasi anda'
+                type='text'
+                className='form-input mb-2'
+                aria-invalid={errors.id?.message}
+              />
+              <div className='text-caption-2 text-danger-500 mt-1'>
+                {errors.id?.message}
+              </div>
             </div>
-            <div>
-                <form onSubmit={handleSubmit(onSubmitHandler)} className='flex mt-4 flex-row w-full '>
-                    <div className='w-[90%] grid grid-cols-2 gap-4'>
-                        <div className='flex flex-col '>
-                            <label className='form-label mb-2'>ID Pesanan*</label>
-                            <input
-                                {...register('id')}
-                                placeholder='dapat dilihat pada email konfirmasi anda'
-                                type='text'
-                                className='form-input mb-2'
-                                aria-invalid={errors.id?.message}
-                            />
-                            <div className='text-caption-2 text-danger-500 mt-1'>{errors.id?.message}</div>
-                        </div>
-                        <div className='flex flex-col '>
-                            <label className='form-label mb-2'>Email Penagihan*</label>
-                            <input
-                                {...register('email')}
-                                placeholder='Email yang anda gunakan saat pembayaran'
-                                type='text'
-                                className='form-input'
-                                aria-invalid={errors.email?.message}
-                            />
-                            <div className='text-caption-2 text-danger-500 mt-1'>{errors.email?.message}</div>
-                        </div>
-                    </div>
-                    <div className={` ${errors.id?.message ? 'mt-2' : 'mt-5'} flex items-center ml-4`}>
-                        <button
-                            type='submit'
-                            className='bg-red-600 border border-red-600 rounded-md text-sm text-white w-24 h-11 mb-1 content-center flex flex-row justify-center items-center'
-                        >
-                            {isLoading && <Spinner size='xs' className='mr-2'/>}
-                            {!isLoading && <Search size={16} strokeWidth={1} className='mr-2'/>} 
-                            <p>Lacak</p>
-                        </button>
-                    </div>
-                </form>
-                {/* Display the API error message */}
-                {apiError && <div className='text-danger-500 mt-4'>{apiError}</div>}
-                <Manifest idAWB={idAWB} closePopup={closePopup} />
+            <div className='flex flex-col '>
+              <label className='form-label mb-2'>Email Penagihan*</label>
+              <input
+                {...register('email')}
+                placeholder='Email yang anda gunakan saat pembayaran'
+                type='text'
+                className='form-input'
+                aria-invalid={errors.email?.message}
+              />
+              <div className='text-caption-2 text-danger-500 mt-1'>
+                {errors.email?.message}
+              </div>
             </div>
-        </div>
-    )
-}
+          </div>
+          <div
+            className={` ${
+              errors.id?.message ? 'mt-2' : 'mt-5'
+            } flex items-center ml-4`}
+          >
+            <button
+              type='submit'
+              className='bg-red-600 border border-red-600 rounded-md text-sm text-white w-24 h-11 mb-1 content-center flex flex-row justify-center items-center'
+            >
+              {isLoading && <Spinner size='xs' className='mr-2' />}
+              {!isLoading && (
+                <Search size={16} strokeWidth={1} className='mr-2' />
+              )}
+              <p>Lacak</p>
+            </button>
+          </div>
+        </form>
+        {/* Display the API error message */}
+        {apiError && <div className='text-danger-500 mt-4'>{apiError}</div>}
+        <Manifest idAWB={idAWB} closePopup={closePopup} />
+      </div>
+    </div>
+  );
+};
 
 const validationSchema = Yup.object().shape({
-    email: Yup.string().email('Format harus seperti contoh@email.com').required('Harus di-isi'),
-    id: Yup.string().required('Harus di-isi'),
-})
+  email: Yup.string()
+    .email('Format harus seperti contoh@email.com')
+    .required('Harus di-isi'),
+  id: Yup.string().required('Harus di-isi'),
+});
 
 const defaultValues = {
-    email: '',
-    id: ''
-}
+  email: '',
+  id: '',
+};
 
-export default TrackingOrder
+export default TrackingOrder;
diff --git a/src/pages/my/profile.jsx b/src/pages/my/profile.jsx
index 25c3a608..7cf1bcbb 100644
--- a/src/pages/my/profile.jsx
+++ b/src/pages/my/profile.jsx
@@ -1,41 +1,44 @@
-import Divider from '@/core/components/elements/Divider/Divider'
-import AppLayout from '@/core/components/layouts/AppLayout'
-import BasicLayout from '@/core/components/layouts/BasicLayout'
-import DesktopView from '@/core/components/views/DesktopView'
-import MobileView from '@/core/components/views/MobileView'
-import useAuth from '@/core/hooks/useAuth'
-import CompanyProfile from '@/lib/auth/components/CompanyProfile'
-import IsAuth from '@/lib/auth/components/IsAuth'
-import Menu from '@/lib/auth/components/Menu'
-import PersonalProfile from '@/lib/auth/components/PersonalProfile'
+import Divider from '@/core/components/elements/Divider/Divider';
+import AppLayout from '@/core/components/layouts/AppLayout';
+import BasicLayout from '@/core/components/layouts/BasicLayout';
+import DesktopView from '@/core/components/views/DesktopView';
+import MobileView from '@/core/components/views/MobileView';
+import useAuth from '@/core/hooks/useAuth';
+import CompanyProfile from '@/lib/auth/components/CompanyProfile';
+import IsAuth from '@/lib/auth/components/IsAuth';
+import Menu from '@/lib/auth/components/Menu';
+import PersonalProfile from '@/lib/auth/components/PersonalProfile';
+import Seo from '@/core/components/Seo';
 
 export default function Profile() {
-  const auth = useAuth()
+  const auth = useAuth();
   return (
-    <IsAuth>
-      <MobileView>
-        <AppLayout title='Akun Saya'>
-          <PersonalProfile />
-          <Divider />
-          {auth?.parentId && <CompanyProfile />}
-        </AppLayout>
-      </MobileView>
-
-      <DesktopView>
-        <BasicLayout>
-        <div className='container mx-auto flex py-10'>
-          <div className='w-3/12 pr-4'>
-            <Menu />
-          </div>
-          <div className='w-9/12 bg-white border border-gray_r-6 rounded'>
+    <>
+      <Seo title='Profile - Indoteknik.com' />
+      <IsAuth>
+        <MobileView>
+          <AppLayout title='Akun Saya'>
             <PersonalProfile />
             <Divider />
             {auth?.parentId && <CompanyProfile />}
+          </AppLayout>
+        </MobileView>
 
-          </div>
-          </div>
-        </BasicLayout>
-      </DesktopView>
-    </IsAuth>
-  )
+        <DesktopView>
+          <BasicLayout>
+            <div className='container mx-auto flex py-10'>
+              <div className='w-3/12 pr-4'>
+                <Menu />
+              </div>
+              <div className='w-9/12 bg-white border border-gray_r-6 rounded'>
+                <PersonalProfile />
+                <Divider />
+                {auth?.parentId && <CompanyProfile />}
+              </div>
+            </div>
+          </BasicLayout>
+        </DesktopView>
+      </IsAuth>
+    </>
+  );
 }
-- 
cgit v1.2.3


From 6448a83e088b68195e9b94036d3e8e2184ae701c Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 24 Sep 2024 16:54:37 +0700
Subject: <iman> update code

---
 src/lib/brand/components/BrandCard.jsx | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/lib/brand/components/BrandCard.jsx b/src/lib/brand/components/BrandCard.jsx
index 2d78d956..ebd41a67 100644
--- a/src/lib/brand/components/BrandCard.jsx
+++ b/src/lib/brand/components/BrandCard.jsx
@@ -1,10 +1,10 @@
-import Image from '~/components/ui/image'
-import Link from '@/core/components/elements/Link/Link'
-import useDevice from '@/core/hooks/useDevice'
-import { createSlug } from '@/core/utils/slug'
+import NextImage from 'next/image';
+import Link from '@/core/components/elements/Link/Link';
+import useDevice from '@/core/hooks/useDevice';
+import { createSlug } from '@/core/utils/slug';
 
 const BrandCard = ({ brand }) => {
-  const { isMobile } = useDevice()
+  const { isMobile } = useDevice();
   return (
     <Link
       href={createSlug('/shop/brands/', brand.name, brand.id)}
@@ -13,21 +13,25 @@ const BrandCard = ({ brand }) => {
       }`}
     >
       {brand.logo && (
-        <Image
+        <NextImage
           src={brand.logo}
           alt={brand.name}
-          width={50}
-          height={50}
+          width={500}
+          height={500}
+          quality={85}
           className='h-full w-[122px] object-contain object-center'
         />
       )}
       {!brand.logo && (
-        <span className='text-center' style={{ fontSize: `${16 - brand.name.length * 0.5}px` }}>
+        <span
+          className='text-center'
+          style={{ fontSize: `${16 - brand.name.length * 0.5}px` }}
+        >
           {brand.name}
         </span>
       )}
     </Link>
-  )
-}
+  );
+};
 
-export default BrandCard
+export default BrandCard;
-- 
cgit v1.2.3


From 2e7b5789f013c121b48edcb3589d094a2b636c59 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 25 Sep 2024 09:14:54 +0700
Subject: <iman> back to code

---
 src/core/components/elements/Navbar/NavbarDesktop.jsx | 12 ++++--------
 src/lib/quotation/components/Quotationheader.jsx      |  6 +-----
 2 files changed, 5 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx
index d480aa8d..eebfbcd5 100644
--- a/src/core/components/elements/Navbar/NavbarDesktop.jsx
+++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx
@@ -57,12 +57,8 @@ const NavbarDesktop = () => {
     context: 'quotation',
     site: auth?.webRole === null && auth?.site ? auth.site : null,
   };
-  let transactions = null;
-
-  if (auth) {
-    transactions = useTransactions({ query });
-  }
 
+  const { transactions } = useTransactions({ query });
   const data = transactions?.data?.saleOrders.filter(
     (transaction) => transaction.status === 'draft'
   );
@@ -109,7 +105,7 @@ const NavbarDesktop = () => {
 
   useEffect(() => {
     setPendingTransactions(data);
-  }, [transactions?.data]);
+  }, [transactions.data]);
 
   useEffect(() => {
     if (router.pathname === '/shop/product/[slug]') {
@@ -139,7 +135,7 @@ const NavbarDesktop = () => {
     return () => {
       window.removeEventListener('localStorageChange', handleCartChange);
     };
-  }, [transactions?.data, cart]);
+  }, [transactions.data, cart]);
 
   useEffect(() => {
     const handleQuotationChange = () => {
@@ -291,7 +287,7 @@ const NavbarDesktop = () => {
                       alt='penawaran terbatas'
                       width={1440}
                       height={160}
-                      quality={85}
+                      quality={100}
                       // className={`fixed ${isTop ? 'md:top-[145px] lg:top-[160px] ' : 'lg:top-[85px] top-[80px]'} rounded-3xl md:left-1/4 lg:left-1/4 xl:left-1/4 left-2/3 w-40 h-12  p-2 z-50 transition-all duration-300 animate-pulse`}
                       className={`inline-block relative -top-8 transition-all duration-300 z-20 animate-pulse`}
                     />
diff --git a/src/lib/quotation/components/Quotationheader.jsx b/src/lib/quotation/components/Quotationheader.jsx
index cb7684ed..d94a55de 100644
--- a/src/lib/quotation/components/Quotationheader.jsx
+++ b/src/lib/quotation/components/Quotationheader.jsx
@@ -57,11 +57,7 @@ const Quotationheader = (quotationCount) => {
       refreshCartf();
     }
   };
-  let transactions = null;
-
-  if (auth) {
-    transactions = useTransactions({ query });
-  }
+  let { transactions } = useTransactions({ query });
 
   const refreshCartf = useCallback(async () => {
     setIsloading(true);
-- 
cgit v1.2.3