From b8f5507cda2ede25ebc5433439168a8dadc71ddc Mon Sep 17 00:00:00 2001
From: "HATEC\\SPVDEV001" <tri.susilo@altama.co.id>
Date: Fri, 20 Oct 2023 10:26:15 +0700
Subject: fixing serach

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

(limited to 'src/pages')

diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index b4d67c5d..883bb8df 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -67,7 +67,7 @@ export default async function handler(req, res) {
   }
 
   if (brand) parameter.push(`fq=manufacture_name:${brand.replace(/,/g, ' OR ')}`)
-  if (category) parameter.push(`fq=category_name:${category}`)
+  if (category) parameter.push(`fq=category_name:${category.replace(/,/g, ' OR ')}`)
   if (stock) parameter.push(`fq=stock_total_f:{1 TO *}`)
 
   // Single fq in url params
-- 
cgit v1.2.3


From 85e0a7e47db518fb5fb2531b2ea7c6d50408875f Mon Sep 17 00:00:00 2001
From: "HATEC\\SPVDEV001" <tri.susilo@altama.co.id>
Date: Fri, 20 Oct 2023 14:02:51 +0700
Subject: logo brand di page brand

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

(limited to 'src/pages')

diff --git a/src/pages/shop/brands/[slug].jsx b/src/pages/shop/brands/[slug].jsx
index d75475b7..c3a7299f 100644
--- a/src/pages/shop/brands/[slug].jsx
+++ b/src/pages/shop/brands/[slug].jsx
@@ -4,6 +4,7 @@ import { useRouter } from 'next/router'
 import _ from 'lodash'
 import Seo from '@/core/components/Seo'
 import Breadcrumb from '@/lib/brand/components/Breadcrumb'
+import useBrand from '@/lib/brand/hooks/useBrand'
 
 const BasicLayout = dynamic(() => import('@/core/components/layouts/BasicLayout'))
 const ProductSearch = dynamic(() => import('@/lib/product/components/ProductSearch'))
@@ -14,6 +15,8 @@ export default function BrandDetail() {
   const { slug = '' } = router.query
 
   const brandName = getNameFromSlug(slug)
+  const id = getIdFromSlug(slug)
+  const {brand} = useBrand({id})
   return (
     <BasicLayout>
       <Seo
@@ -29,12 +32,13 @@ export default function BrandDetail() {
 
       <Breadcrumb brandName={brandName} />
 
-      <Brand id={getIdFromSlug(slug)} />
+      <Brand brand={brand} />
       {!_.isEmpty(router.query) && (
         <ProductSearch
           query={_.omit(router.query, 'slug')}
           prefixUrl={`/shop/brands/${slug}`}
           defaultBrand={getNameFromSlug(slug)}
+          brand={brand}
         />
       )}
     </BasicLayout>
-- 
cgit v1.2.3


From 8d2d384509cd21fb76aeec76d82f362995e4851e Mon Sep 17 00:00:00 2001
From: "HATEC\\SPVDEV001" <tri.susilo@altama.co.id>
Date: Mon, 23 Oct 2023 15:40:04 +0700
Subject: bugs fix query solr filter brand dan category

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

(limited to 'src/pages')

diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index 883bb8df..576d028a 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -66,8 +66,9 @@ export default async function handler(req, res) {
     )
   }
 
-  if (brand) parameter.push(`fq=manufacture_name:${brand.replace(/,/g, ' OR ')}`)
-  if (category) parameter.push(`fq=category_name:${category.replace(/,/g, ' OR ')}`)
+  if (brand) parameter.push(`fq=${brand.split(',').map(manufacturer => `manufacture_name:"${manufacturer}"`).join(" OR ")}`)
+  if (category) parameter.push(`fq=${category.split(',').map(cat => `category_name:"${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
-- 
cgit v1.2.3