From 9836f109c38d7f02c587329795e80e15ff33aafa Mon Sep 17 00:00:00 2001
From: "HATEC\\SPVDEV001" <tri.susilo@altama.co.id>
Date: Tue, 10 Oct 2023 17:09:23 +0700
Subject: add qty di nenu brang , filter ready stock, filter haga fix di page
 search

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

(limited to 'src/pages')

diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index b5161365..0c79831b 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -13,7 +13,8 @@ export default async function handler(req, res) {
     orderBy = '',
     operation = 'AND',
     fq = '',
-    limit = 30
+    limit = 30,
+    stock = ''
   } = req.query
 
   let paramOrderBy = ''
@@ -62,8 +63,9 @@ export default async function handler(req, res) {
     )
   }
 
-  if (brand) parameter.push(`fq=manufacture_name:${brand}`)
+  if (brand) parameter.push(`fq=manufacture_name:${brand.replace(/,/g, ' OR ')}`)
   if (category) parameter.push(`fq=category_name:${category}`)
+  if (stock) parameter.push(`fq=stock_total_f:{1 TO *}`)
 
   // Single fq in url params
   if (typeof fq === 'string') parameter.push(`fq=${fq}`)
-- 
cgit v1.2.3


From f1d9a308f61e67f4c896608e73ac8413f61fa8af Mon Sep 17 00:00:00 2001
From: Rafi Zadanly <zadanlyr@gmail.com>
Date: Wed, 11 Oct 2023 10:22:11 +0700
Subject: Add breadcrumb on detail product, search, brand, category page

---
 src/pages/shop/brands/[slug].jsx   |  3 +++
 src/pages/shop/cart.jsx            | 15 +++++++++++++++
 src/pages/shop/category/[slug].jsx |  4 ++++
 src/pages/shop/search.jsx          | 20 ++++++++++++++++++++
 4 files changed, 42 insertions(+)

(limited to 'src/pages')

diff --git a/src/pages/shop/brands/[slug].jsx b/src/pages/shop/brands/[slug].jsx
index 88f19bc0..d75475b7 100644
--- a/src/pages/shop/brands/[slug].jsx
+++ b/src/pages/shop/brands/[slug].jsx
@@ -3,6 +3,7 @@ import { getIdFromSlug, getNameFromSlug } from '@/core/utils/slug'
 import { useRouter } from 'next/router'
 import _ from 'lodash'
 import Seo from '@/core/components/Seo'
+import Breadcrumb from '@/lib/brand/components/Breadcrumb'
 
 const BasicLayout = dynamic(() => import('@/core/components/layouts/BasicLayout'))
 const ProductSearch = dynamic(() => import('@/lib/product/components/ProductSearch'))
@@ -26,6 +27,8 @@ export default function BrandDetail() {
         ]}
       />
 
+      <Breadcrumb brandName={brandName} />
+
       <Brand id={getIdFromSlug(slug)} />
       {!_.isEmpty(router.query) && (
         <ProductSearch
diff --git a/src/pages/shop/cart.jsx b/src/pages/shop/cart.jsx
index a7f2037b..2da58c96 100644
--- a/src/pages/shop/cart.jsx
+++ b/src/pages/shop/cart.jsx
@@ -3,7 +3,9 @@ import BasicLayout from '@/core/components/layouts/BasicLayout'
 import DesktopView from '@/core/components/views/DesktopView'
 import MobileView from '@/core/components/views/MobileView'
 import IsAuth from '@/lib/auth/components/IsAuth'
+import { Breadcrumb, BreadcrumbItem, BreadcrumbLink } from '@chakra-ui/react'
 import dynamic from 'next/dynamic'
+import Link from 'next/link'
 
 const AppLayout = dynamic(() => import('@/core/components/layouts/AppLayout'))
 const CartComponent = dynamic(() => import('@/lib/cart/components/Cart'))
@@ -22,6 +24,19 @@ export default function Cart() {
 
         <DesktopView>
           <BasicLayout>
+            <div className='container mx-auto py-4 md:py-6 pb-0'>
+              <Breadcrumb>
+                <BreadcrumbItem>
+                  <BreadcrumbLink as={Link} href='/' className='!text-danger-500 whitespace-nowrap'>
+                    Home
+                  </BreadcrumbLink>
+                </BreadcrumbItem>
+
+                <BreadcrumbItem isCurrentPage>
+                  <BreadcrumbLink className='whitespace-nowrap'>Keranjang</BreadcrumbLink>
+                </BreadcrumbItem>
+              </Breadcrumb>
+            </div>
             <CartComponent />
           </BasicLayout>
         </DesktopView>
diff --git a/src/pages/shop/category/[slug].jsx b/src/pages/shop/category/[slug].jsx
index dbc17c06..e3650235 100644
--- a/src/pages/shop/category/[slug].jsx
+++ b/src/pages/shop/category/[slug].jsx
@@ -3,6 +3,7 @@ import { getIdFromSlug, getNameFromSlug } from '@/core/utils/slug'
 import { useRouter } from 'next/router'
 import _ from 'lodash'
 import Seo from '@/core/components/Seo'
+import Breadcrumb from '@/lib/category/components/Breadcrumb'
 
 const BasicLayout = dynamic(() => import('@/core/components/layouts/BasicLayout'))
 const ProductSearch = dynamic(() => import('@/lib/product/components/ProductSearch'))
@@ -16,6 +17,7 @@ export default function CategoryDetail() {
   const query = {
     fq: `manufacture_id_i:${categoryId}`
   }
+
   return (
     <BasicLayout>
       <Seo
@@ -29,6 +31,8 @@ export default function CategoryDetail() {
         ]}
       />
 
+      <Breadcrumb categoryId={categoryId} />
+
       {!_.isEmpty(router.query) && (
         <ProductSearch query={query} prefixUrl={`/shop/category/${slug}`} />
       )}
diff --git a/src/pages/shop/search.jsx b/src/pages/shop/search.jsx
index 907465b7..db3b449a 100644
--- a/src/pages/shop/search.jsx
+++ b/src/pages/shop/search.jsx
@@ -2,6 +2,8 @@ import dynamic from 'next/dynamic'
 import { useRouter } from 'next/router'
 import _ from 'lodash-contrib'
 import Seo from '@/core/components/Seo'
+import { Breadcrumb, BreadcrumbItem, BreadcrumbLink } from '@chakra-ui/react'
+import Link from 'next/link'
 
 const BasicLayout = dynamic(() => import('@/core/components/layouts/BasicLayout'))
 const ProductSearch = dynamic(() => import('@/lib/product/components/ProductSearch'))
@@ -13,6 +15,24 @@ export default function Search() {
     <BasicLayout>
       <Seo title={`Cari produk ${router.query.q || ''} di Indoteknik.com`} />
 
+      <div className='container mx-auto py-4 md:py-6'>
+        {router.query?.q && (
+          <Breadcrumb>
+            <BreadcrumbItem>
+              <BreadcrumbLink as={Link} href='/' className='!text-danger-500 whitespace-nowrap'>
+                Home
+              </BreadcrumbLink>
+            </BreadcrumbItem>
+
+            <BreadcrumbItem isCurrentPage>
+              <BreadcrumbLink className='whitespace-nowrap'>
+                Cari: {router.query.q || ''}
+              </BreadcrumbLink>
+            </BreadcrumbItem>
+          </Breadcrumb>
+        )}
+      </div>
+
       {!_.isEmpty(router.query) && <ProductSearch query={router.query} prefixUrl='/shop/search' />}
     </BasicLayout>
   )
-- 
cgit v1.2.3


From f4fb8d1f93024cfe907a5783215cf9c939dd59bc Mon Sep 17 00:00:00 2001
From: "HATEC\\SPVDEV001" <tri.susilo@altama.co.id>
Date: Wed, 11 Oct 2023 11:02:04 +0700
Subject: filter by limit rows

---
 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 0c79831b..874431e0 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -13,7 +13,7 @@ export default async function handler(req, res) {
     orderBy = '',
     operation = 'AND',
     fq = '',
-    limit = 30,
+    limit = '',
     stock = ''
   } = req.query
 
-- 
cgit v1.2.3


From cff358b2a7bb310e2b65cba5d843e9ffdda0f699 Mon Sep 17 00:00:00 2001
From: Rafi Zadanly <zadanlyr@gmail.com>
Date: Wed, 11 Oct 2023 14:07:58 +0700
Subject: Fix description and brand banner skeleton

---
 src/pages/shop/product/[slug].jsx | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/pages')

diff --git a/src/pages/shop/product/[slug].jsx b/src/pages/shop/product/[slug].jsx
index 63fb2e7e..4c17ab37 100644
--- a/src/pages/shop/product/[slug].jsx
+++ b/src/pages/shop/product/[slug].jsx
@@ -29,12 +29,6 @@ export async function getServerSideProps(context) {
   // let productSolr = null
   if (product?.length == 1) {
     product = product[0]
-    const regexHtmlTags = /(<([^>]+)>)/gi
-    const regexHtmlTagsExceptP = /<\/?(?!p\b)[^>]*>/g
-    product.description = product.description
-      .replace(regexHtmlTagsExceptP, ' ')
-      .replace(regexHtmlTags, ' ')
-      .trim()
   } else {
     product = null
   }
@@ -45,6 +39,7 @@ export async function getServerSideProps(context) {
 }
 
 export default function ProductDetail({ product }) {
+  console.log(product);
   const router = useRouter()
   const { setProduct } = useProductContext()
 
-- 
cgit v1.2.3


From 7ada2eab1773629a3f74fe1a16ba78227953f912 Mon Sep 17 00:00:00 2001
From: "HATEC\\SPVDEV001" <tri.susilo@altama.co.id>
Date: Sat, 14 Oct 2023 09:03:10 +0700
Subject: add fillterby brand di kolom pencarian

---
 src/pages/api/shop/search.js       | 2 +-
 src/pages/shop/category/[slug].jsx | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/pages')

diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index 874431e0..fd7a215a 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -13,7 +13,7 @@ export default async function handler(req, res) {
     orderBy = '',
     operation = 'AND',
     fq = '',
-    limit = '',
+    limit = 0,
     stock = ''
   } = req.query
 
diff --git a/src/pages/shop/category/[slug].jsx b/src/pages/shop/category/[slug].jsx
index e3650235..6d3985a8 100644
--- a/src/pages/shop/category/[slug].jsx
+++ b/src/pages/shop/category/[slug].jsx
@@ -14,8 +14,12 @@ export default function CategoryDetail() {
 
   const categoryName = getNameFromSlug(slug)
   const categoryId = getIdFromSlug(slug)
+  const q = router?.query.q || null
   const query = {
-    fq: `manufacture_id_i:${categoryId}`
+    fq: `category_id_i:${categoryId}`
+  }
+  if (q) {
+    query.q = q
   }
 
   return (
-- 
cgit v1.2.3


From 6aa5fa70cf5ccd2825e5657ec1a90e370dea3bcf Mon Sep 17 00:00:00 2001
From: Rafi Zadanly <zadanlyr@gmail.com>
Date: Mon, 16 Oct 2023 11:16:33 +0700
Subject: Fix buy action before and after login

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

(limited to 'src/pages')

diff --git a/src/pages/shop/product/[slug].jsx b/src/pages/shop/product/[slug].jsx
index 4c17ab37..d8366d3c 100644
--- a/src/pages/shop/product/[slug].jsx
+++ b/src/pages/shop/product/[slug].jsx
@@ -9,6 +9,7 @@ import cookie from 'cookie'
 import axios from 'axios'
 import { useProductContext } from '@/contexts/ProductContext'
 import { useEffect } from 'react'
+import { updateItemCart } from '@/core/utils/cart'
 
 const BasicLayout = dynamic(() => import('@/core/components/layouts/BasicLayout'))
 const Product = dynamic(() => import('@/lib/product/components/Product/Product'))
@@ -22,7 +23,10 @@ export async function getServerSideProps(context) {
   const authToken = auth?.token || ''
 
   let response = await axios(
-    `${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/product-detail?id=` + getIdFromSlug(slug) +'&auth=' + tier
+    `${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/product-detail?id=` +
+      getIdFromSlug(slug) +
+      '&auth=' +
+      tier
   )
   let product = response.data
   // let productSolr = await productApi({ id: getIdFromSlug(slug), headers: { Token: authToken } })
@@ -39,7 +43,6 @@ export async function getServerSideProps(context) {
 }
 
 export default function ProductDetail({ product }) {
-  console.log(product);
   const router = useRouter()
   const { setProduct } = useProductContext()
 
@@ -49,6 +52,27 @@ export default function ProductDetail({ product }) {
     }
   }, [product, setProduct])
 
+  useEffect(() => {
+    const { action, variantId, qty } = router.query
+    const addToCart = async () => {
+      const data = {
+        productId: variantId,
+        quantity: qty,
+        selected: true,
+        programLineId: null,
+        source: action
+      }
+      console.log('data dr test', data)
+      await updateItemCart(data)
+      const redirectURL = action === 'buy' ? '/shop/checkout?source=buy' : '/shop/cart'
+      router.push(redirectURL)
+    }
+
+    if (action && variantId && qty) {
+      addToCart()
+    }
+  }, [router])
+
   if (!product) return <PageNotFound />
 
   return (
-- 
cgit v1.2.3


From 6bd88bdb765c1ecc0518abeca77eca25bde2857b Mon Sep 17 00:00:00 2001
From: "HATEC\\SPVDEV001" <tri.susilo@altama.co.id>
Date: Tue, 17 Oct 2023 14:57:48 +0700
Subject: add lebel product terjual di product card dan product detail, bugfix
 queri solr untuk filter brand

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

(limited to 'src/pages')

diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index fd7a215a..31497c51 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -13,7 +13,7 @@ export default async function handler(req, res) {
     orderBy = '',
     operation = 'AND',
     fq = '',
-    limit = 0,
+    limit = 30,
     stock = ''
   } = req.query
 
@@ -41,7 +41,7 @@ export default async function handler(req, res) {
 
   let offset = (page - 1) * limit
   let parameter = [
-    'facet.field=manufacture_name',
+    'facet.field=manufacture_name_s',
     'facet.field=category_name',
     'facet=true',
     'indent=true',
@@ -49,7 +49,7 @@ export default async function handler(req, res) {
     `q.op=${operation}`,
     `q=${escapeSolrQuery(q)}`,
     'qf=name_s',
-    `start=${offset}`,
+    `start=${parseInt(offset)}`,
     `rows=${limit}`,
     `sort=${paramOrderBy}`,
     `fq=-publish_b:false`
-- 
cgit v1.2.3


From 38101ad7264905d0c45c333acd0a6bb3ee7d03ba Mon Sep 17 00:00:00 2001
From: Rafi Zadanly <zadanlyr@gmail.com>
Date: Wed, 18 Oct 2023 11:57:15 +0700
Subject: Fix flash sale sort on search api

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

(limited to 'src/pages')

diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index 31497c51..ce2f7e03 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -20,10 +20,10 @@ export default async function handler(req, res) {
   let paramOrderBy = ''
   switch (orderBy) {
     case 'price-asc':
-      paramOrderBy += 'price_discount_f ASC'
+      paramOrderBy += 'price_tier1_v2_f ASC'
       break
     case 'price-desc':
-      paramOrderBy += 'price_discount_f DESC'
+      paramOrderBy += 'price_tier1_v2_f DESC'
       break
     case 'popular':
       paramOrderBy += 'search_rank_i DESC'
@@ -34,6 +34,9 @@ export default async function handler(req, res) {
     case 'stock':
       paramOrderBy += 'stock_total_f DESC'
       break
+    case 'flashsale-price-asc':
+      paramOrderBy += 'flashsale_price_f ASC'
+      break
     default:
       paramOrderBy += 'product_rating_f DESC, price_discount_f DESC'
       break
-- 
cgit v1.2.3


From 95e29bc42afd5d4ce2edec877fec6005c40182d3 Mon Sep 17 00:00:00 2001
From: "HATEC\\SPVDEV001" <tri.susilo@altama.co.id>
Date: Wed, 18 Oct 2023 14:15:39 +0700
Subject: query default search

---
 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 ce2f7e03..b4d67c5d 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -26,7 +26,7 @@ export default async function handler(req, res) {
       paramOrderBy += 'price_tier1_v2_f DESC'
       break
     case 'popular':
-      paramOrderBy += 'search_rank_i DESC'
+      paramOrderBy += 'product_rating_f DESC, search_rank_i DESC,'
       break
     case 'popular-weekly':
       paramOrderBy += 'search_rank_weekly_i DESC'
-- 
cgit v1.2.3