Merge branch 'release' into CR/search_enggine

24 files changed, 1463 insertions, 704 deletions

diff --git a/src/contexts/ProductCartContext.js b/src/contexts/ProductCartContext.js
index 06e97563..3a21d2e0 100644
--- a/src/contexts/ProductCartContext.js
+++ b/src/contexts/ProductCartContext.js
@@ -6,10 +6,11 @@ export const ProductCartProvider = ({ children }) => {
   const [productCart, setProductCart] = useState(null)
   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 }}
+      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 6c308f11..ebbcf857 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 "../../../../../src/lib/quotation/components/Quotationheader.jsx"
 import Category from '@/lib/category/components/Category';
+import { useProductCartContext } from '@/contexts/ProductCartContext';
 import {
   ChevronDownIcon,
   DocumentCheckIcon,
@@ -29,6 +31,8 @@ import {
   useDisclosure,
 } 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 });
@@ -38,15 +42,27 @@ const NavbarDesktop = () => {
   const auth = useAuth();
 
   const [cartCount, setCartCount] = useState(0);
-
+  const [quotationCount, setQuotationCount] = useState(0);
+  const [pendingTransactions, setPendingTransactions] = useState([])
   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();
   const { isOpen, onOpen, onClose } = useDisclosure();
+  
+  const query = {
+    context: 'quotation',
+    site:
+    (auth?.webRole === null && auth?.site ? auth.site : null),
+  };
+  
+  const { transactions } = useTransactions({ query });
+  const data = transactions?.data?.saleOrders.filter(
+    (transaction) => transaction.status === 'draft'
+  );
 
   const [showPopup, setShowPopup] = useState(false);
   const [isTop, setIsTop] = useState(true);
@@ -89,6 +105,11 @@ const NavbarDesktop = () => {
   }, []);
 
   useEffect(() => {
+    setPendingTransactions(data);
+  }, [transactions.data]);
+  
+  
+  useEffect(() => {
     if (router.pathname === '/shop/product/[slug]') {
       setPayloadWa({
         name: product?.name,
@@ -96,11 +117,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 () => {
@@ -109,15 +130,31 @@ const NavbarDesktop = () => {
       };
       cart();
     };
-    handleCartChange();
-
+    handleCartChange(); 
+    
     window.addEventListener('localStorageChange', handleCartChange);
-
+    
     return () => {
       window.removeEventListener('localStorageChange', handleCartChange);
     };
-  }, []);
+  }, [transactions.data, cart]);
 
+  useEffect(() => {
+    const handleQuotationChange = () => {
+      const quotation = async () => {
+        setQuotationCount(pendingTransactions?.length);
+      };
+      quotation();
+    };
+    handleQuotationChange();
+
+    window.addEventListener('localStorageChange', handleQuotationChange);
+
+    return () => {
+      window.removeEventListener('localStorageChange', handleQuotationChange);
+    };
+  }, [pendingTransactions]);
+  
   return (
     <DesktopView>
       <TopBanner onLoad={handleTopBannerLoad} />
@@ -180,17 +217,7 @@ 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} data={pendingTransactions} />
 
             <Cardheader cartCount={cartCount} />
 
@@ -225,8 +252,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 +269,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/cart/components/Cartheader.jsx b/src/lib/cart/components/Cartheader.jsx
index 19f79bc9..ddb77c1f 100644
--- a/src/lib/cart/components/Cartheader.jsx
+++ b/src/lib/cart/components/Cartheader.jsx
@@ -1,14 +1,20 @@
 import { useCallback, useEffect, useMemo, useState } from 'react'
 import { getCartApi } from '../api/CartApi'
+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 { 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'
 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)
@@ -19,7 +25,7 @@ const Cardheader = (cartCount) => {
     useProductCartContext()
 
   const [isHovered, setIsHovered] = useState(false)
-
+  const [isTop, setIsTop] = useState(true)
   const products = useMemo(() => {
     return productCart?.products || []
   }, [productCart])
@@ -42,7 +48,7 @@ const Cardheader = (cartCount) => {
     setIsloading(true)
     let cart = await getCartApi()
     setProductCart(cart)
-    setCountCart(cart.productTotal)
+    setCountCart(cart?.productTotal)
     setIsloading(false)
   }, [setProductCart, setIsloading])
 
@@ -75,14 +81,26 @@ const Cardheader = (cartCount) => {
 
   useEffect(() => {
     setCountCart(cartCount.cartCount)
+    setRefreshCart(false)
   }, [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>
@@ -109,6 +127,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>
   )
 }
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
diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index 54acdf7c..f63ef457 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);
+        }
       }
     });
 
@@ -407,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];
@@ -494,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(
@@ -510,7 +513,7 @@ const Checkout = () => {
           '-'
         )}`;
       }
-    };
+    };*/
   };
 
   const handlingActivateCode = async () => {
@@ -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
@@ -1028,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>
@@ -1184,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'>
@@ -1236,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
@@ -1485,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'>
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 b7798a24..11a15d6d 100644
--- a/src/lib/home/components/CategoryDynamic.jsx
+++ b/src/lib/home/components/CategoryDynamic.jsx
@@ -1,105 +1,149 @@
-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';
 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 [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({});
+  // 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, ],
+    classNames:'mySwiper',
+    slidesPerView: 3,
+    spaceBetween:10, 
+    pagination: {
+      dynamicBullets: true,
+      clickable: true,
+    }
+  };
  
   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}>
-                  <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 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>
+                                {/* <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>
diff --git a/src/lib/home/components/CategoryDynamicMobile.jsx b/src/lib/home/components/CategoryDynamicMobile.jsx
index c1433a2d..2877a5a7 100644
--- a/src/lib/home/components/CategoryDynamicMobile.jsx
+++ b/src/lib/home/components/CategoryDynamicMobile.jsx
@@ -59,11 +59,10 @@ 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>
-                        <p className='text-gray_r-10 text-[10px]'>999 rb+ Produk</p>
                       </div>
                     </div>
                   </div>
@@ -82,6 +81,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>
diff --git a/src/lib/home/components/PreferredBrand.jsx b/src/lib/home/components/PreferredBrand.jsx
index 56268db7..b30fa5c9 100644
--- a/src/lib/home/components/PreferredBrand.jsx
+++ b/src/lib/home/components/PreferredBrand.jsx
@@ -65,11 +65,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=''>
         {manufactures.isLoading && <PreferredBrandSkeleton />}
diff --git a/src/lib/product/api/productSearchApi.js b/src/lib/product/api/productSearchApi.js
index 1626b7b7..8ff8e57d 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/search?${query}&operation=${operation}`
   )
diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index d6e649a8..1edc31c9 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;
   };
-  
   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..2f792fd4
--- /dev/null
+++ b/src/lib/promo/api/productSearchApi.js
@@ -0,0 +1,11 @@
+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}`
+  )
+  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/lib/quotation/components/Quotation.jsx b/src/lib/quotation/components/Quotation.jsx
index df234dc2..0ad042de 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 {  setRefreshCart } = 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}`);
+      setRefreshCart(true);
       return;
     }
     
diff --git a/src/lib/quotation/components/Quotationheader.jsx b/src/lib/quotation/components/Quotationheader.jsx
new file mode 100644
index 00000000..4529c977
--- /dev/null
+++ b/src/lib/quotation/components/Quotationheader.jsx
@@ -0,0 +1,265 @@
+import { useCallback, useEffect, useMemo, useState } from 'react';
+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 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');
+
+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 { productCart, setProductCart, refreshCart, setRefreshCart, isLoading, setIsloading, productQuotation, setProductQuotation } =
+  useProductCartContext();
+
+  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();
+    }
+  };
+  let { transactions } = useTransactions({ query });
+
+  const refreshCartf = useCallback(async () => {
+    setIsloading(true);
+    let pendingTransactions = transactions?.data?.saleOrders.filter(transaction => transaction.status === 'draft');
+    setProductQuotation(pendingTransactions);
+    setCountQuotation(pendingTransactions?.length ? pendingTransactions?.length : pendingTransactions?.length);
+    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 (refreshCart) {
+      refreshCartf();
+    }
+    setRefreshCart(false);
+  }, [ refreshCartf, setRefreshCart]);
+
+  useEffect(() => {
+    setCountQuotation(quotationCount.quotationCount);
+    setProductQuotation(quotationCount.data);
+  }, [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('/my/quotations');
+  };
+
+  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>
+            List
+            <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>
+                </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 Quotation 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>
+                  )}
+                  {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-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='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 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>
+                                    </div>
+                                </Link>
+                                </div>
+                              </li>
+                            </>
+                          ))}
+                      </ul>
+                      <hr />
+                    </>
+                  )}
+                </div>
+                {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>
+                    </div>
+                    <div className='mt-5 mb-2'>
+                      <button
+                        type='button'
+                        className='btn-solid-red rounded-lg w-full'
+                        onClick={handleCheckout}
+                        disabled={buttonLoading}
+                      >
+                        {buttonLoading ? 'Loading...' : 'Lihat Semua'}
+                      </button>
+                    </div>
+                  </>
+                )}
+              </motion.div>
+            </motion.div>
+          </>
+        )}
+      </AnimatePresence>
+    </div>
+  );
+};
+
+export default Quotationheader;
diff --git a/src/pages/api/shop/promo.js b/src/pages/api/shop/promo.js
new file mode 100644
index 00000000..221a9adb
--- /dev/null
+++ b/src/pages/api/shop/promo.js
@@ -0,0 +1,202 @@
+import { productMappingSolr, promoMappingSolr } from '@/utils/solrMapping';
+import axios from 'axios';
+import camelcaseObjectDeep from 'camelcase-object-deep';
+
+export default async function handler(req, res) {
+  const {
+    q = '*',
+    page = 1,
+    brand = '',
+    category = '',
+    priceFrom = 0,
+    priceTo = 0,
+    orderBy = 'if(exists(sequence_i),0,1) asc, sequence_i asc,',
+    operation = 'AND',
+    fq = '',
+    limit = 30,
+  } = req.query;
+
+  let { stock = '' } = req.query;
+
+  let paramOrderBy = 'if(exists(sequence_i),0,1) asc, sequence_i asc,';
+  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=${q}`,
+    // 'qf=name_s',
+    `start=${parseInt(offset)}`,
+    `rows=${limit}`,
+    `sort=${paramOrderBy}`,
+    `fq=product_ids:[* 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_s:"${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}`));
+  
+  let result = await axios(
+    process.env.SOLR_HOST + '/solr/promotion_program_lines/select?' + parameter.join('&')
+  );
+  try {
+    result.data.response.products = promoMappingSolr(
+      result.data.response.docs
+    );
+    
+    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);
+    result.data = 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/index.jsx b/src/pages/index.jsx
index 4d6e59e0..613950a6 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -66,7 +66,7 @@ const CategoryDynamic = dynamic(() =>
 );
 
 const CategoryDynamicMobile = dynamic(() =>
-  import('@/lib/home/components/CategoryDynamicMobile')
+import('@/lib/home/components/CategoryDynamicMobile')
 );
 
 const CustomerReviews = dynamic(() =>
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: [
diff --git a/src/pages/shop/promo/[slug].jsx b/src/pages/shop/promo/[slug].jsx
new file mode 100644
index 00000000..cfb2c841
--- /dev/null
+++ b/src/pages/shop/promo/[slug].jsx
@@ -0,0 +1,394 @@
+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 LogoSpinner from '../../../core/components/elements/Spinner/LogoSpinner.jsx'
+import ProductPromoCard from '../../../../src-migrate/modules/product-promo/components/Card.tsx'
+import React from 'react'
+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 whatsappUrl from '../../../core/utils/whatsappUrl.js';
+import _ from 'lodash';
+import useActive from '../../../core/hooks/useActive.js';
+import useProductSearch from '../../../lib/promo/hooks/usePromotionSearch.js';
+
+const BasicLayout = dynamic(() => import('../../../core/components/layouts/BasicLayout.jsx'))
+
+export default function PromoDetail() {
+  const router = useRouter()
+  const { slug = '', brand ='', category='', page = '1' } = router.query
+  const [currentPage, setCurrentPage] = useState(parseInt(10) || 1);
+  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 [q, setQ] = useState('*');
+  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(() => {
+    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, finalQuery]);
+
+  const { productSearch } = useProductSearch({
+    query: queryFinal,
+    operation: 'OR',
+  });
+
+
+  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]);
+
+  const brands = [];
+  for (
+    let i = 0;
+    i < productSearch.data?.facet_counts?.facet_fields?.manufacture_name_s.length;
+    i += 2
+  ) {
+    const brand =
+      productSearch.data?.facet_counts?.facet_fields?.manufacture_name_s[i];
+    const qty =
+      productSearch.data?.facet_counts?.facet_fields?.manufacture_name_s[i + 1];
+    if (qty > 0) {
+      brands.push({ brand, qty });
+    }
+  }
+
+  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 });
+    }
+  }
+
+  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 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'])
+  
+  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}
+                />
+            {products?.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>
+          )}
+          {productSearch.isLoading && <div className='container flex justify-center my-4'>
+                  <LogoSpinner width={48} height={48} />
+                </div>}
+          {products && (
+                <>
+                <div className='grid grid-cols-1 gap-x-1 gap-y-1'>
+                  {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>
+                  ))}
+                </div>
+              </>
+              ) }
+
+              <Pagination
+                  pageCount={pageCount}
+                  currentPage={parseInt(page)}
+                  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>
+              {productSearch.isLoading ? (
+                <div className='container flex justify-center my-4'>
+                  <LogoSpinner width={48} height={48} />
+                </div>
+              ) : 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) => (
+                    <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={pageCount}
+                  currentPage={parseInt(page)}
+                  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 aaee1249..00000000
--- a/src/pages/shop/promo/[slug].tsx
+++ /dev/null
@@ -1,523 +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'
-import Promocrumb from '../../../lib/promo/components/Promocrumb'
-import { fetchPromoItemsSolr, fetchVariantSolr } from '../../../api/promoApi'
-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 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 '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 { 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 { cons, toQuery } from 'lodash-contrib';
-import _ from 'lodash';
-import useActive from '../../../core/hooks/useActive';
-
-const BasicLayout = dynamic(() => import('../../../core/components/layouts/BasicLayout'))
-
-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 || 'popular');
-  const popup = useActive();
-  const prefixUrl = `/shop/promo/${slug}`
-
-  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,100);
-        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/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')
   })
 
diff --git a/src/utils/solrMapping.js b/src/utils/solrMapping.js
index fee474be..0d50b99b 100644
--- a/src/utils/solrMapping.js
+++ b/src/utils/solrMapping.js
@@ -1,3 +1,29 @@
+export const promoMappingSolr = (promotions) => {
+  return promotions.map((promotion) =>{
+    let productMapped = {
+      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)
+    };
+    return productMapped;
+  })
+};
+
+
 export const productMappingSolr = (products, pricelist) => {
   return products.map((product) => {
     let price = product.price_tier1_v2_f || 0;
@@ -123,3 +149,4 @@ const flashsaleTime = (endDate) => {
     isFlashSale: flashsaleEndDate > currentTime,
   };
 };
+