From 5e32d98379f4269d32123b8156b3f955300fcc6c Mon Sep 17 00:00:00 2001
From: Rafi Zadanly <zadanlyr@gmail.com>
Date: Fri, 6 Oct 2023 08:54:54 +0700
Subject: Add label on merchant xml

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

(limited to 'src')

diff --git a/src/pages/google_merchant/products/[page].js b/src/pages/google_merchant/products/[page].js
index eeda4347..352b2989 100644
--- a/src/pages/google_merchant/products/[page].js
+++ b/src/pages/google_merchant/products/[page].js
@@ -45,7 +45,10 @@ export async function getServerSideProps({ res, query }) {
       'g:condition': { '#text': 'new' },
       'g:availability': { '#text': availability },
       'g:brand': { '#text': product.manufacture?.name || '' },
-      'g:price': { '#text': `${Math.round(product.lowestPrice.price * 1.11)} IDR` }
+      'g:price': { '#text': `${Math.round(product.lowestPrice.price * 1.11)} IDR` },
+      'g:custom_label_0': {
+        '#text': product.stockTotal > 0 ? 'Stok Tersedia' : 'Stok Tidak Tersedia'
+      }
     }
     if (product.lowestPrice.discountPercentage > 0) {
       item['g:sale_price'] = {
-- 
cgit v1.2.3


From 39078f7b6978daaf062d1911b08d0207205526ad Mon Sep 17 00:00:00 2001
From: "HATEC\\SPVDEV001" <tri.susilo@altama.co.id>
Date: Mon, 9 Oct 2023 11:32:36 +0700
Subject: change rounded

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

(limited to 'src')

diff --git a/src/lib/product/components/ProductCard.jsx b/src/lib/product/components/ProductCard.jsx
index 91c1f40e..3b96ac32 100644
--- a/src/lib/product/components/ProductCard.jsx
+++ b/src/lib/product/components/ProductCard.jsx
@@ -38,7 +38,7 @@ const ProductCard = ({ product, simpleTitle, variant = 'vertical' }) => {
               </div>
               <div className='relative'>
                 <div className='flex gap-x-1 items-center p-2 justify-center'>
-                  <div className='bg-yellow-400 rounded-full p-1 h-6 w-19 flex items-center justify-center '>
+                  <div className='bg-yellow-400 rounded-lg p-1 h-6 w-19 flex items-center justify-center '>
                     <span className='text-sm font-bold text-black'>
                       {product?.lowestPrice.discountPercentage}%
                     </span>
-- 
cgit v1.2.3


From 4e3d9f20b7106f12c576eeb402da2b29c660a414 Mon Sep 17 00:00:00 2001
From: "HATEC\\SPVDEV001" <tri.susilo@altama.co.id>
Date: Tue, 3 Oct 2023 15:37:59 +0700
Subject: bugfix widget wa di page variant detail

---
 src/core/components/layouts/BasicLayout.jsx |  5 ++---
 src/pages/shop/product/variant/[slug].jsx   | 20 ++++++++++++++++----
 2 files changed, 18 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/core/components/layouts/BasicLayout.jsx b/src/core/components/layouts/BasicLayout.jsx
index e6bd4de0..9441dbd7 100644
--- a/src/core/components/layouts/BasicLayout.jsx
+++ b/src/core/components/layouts/BasicLayout.jsx
@@ -24,13 +24,12 @@ const BasicLayout = ({ children }) => {
   const router = useRouter()
 
   const { product } = useProductContext()
-
   useEffect(() => {
-    if (router.pathname === '/shop/product/[slug]') {
+    if (router.pathname === '/shop/product/[slug]' || router.pathname === '/shop/product/variant/[slug]') {
       setPayloadWa({
         name: product?.name,
         manufacture: product?.manufacture.name,
-        url: createSlug('/shop/product/', product?.name, product?.id, true)
+        url: process.env.NEXT_PUBLIC_SELF_HOST + router.asPath
       })
       setTemplateWA('product')
 
diff --git a/src/pages/shop/product/variant/[slug].jsx b/src/pages/shop/product/variant/[slug].jsx
index d0790249..401bce82 100644
--- a/src/pages/shop/product/variant/[slug].jsx
+++ b/src/pages/shop/product/variant/[slug].jsx
@@ -7,6 +7,8 @@ import { useRouter } from 'next/router'
 import cookie from 'cookie'
 import variantApi from '@/lib/product/api/variantApi'
 import axios from 'axios'
+import { useProductContext } from '@/contexts/ProductContext'
+import { useEffect } from 'react'
 
 const BasicLayout = dynamic(() => import('@/core/components/layouts/BasicLayout'))
 const Product = dynamic(() => import('@/lib/product/components/Product/Product'))
@@ -19,16 +21,18 @@ export async function getServerSideProps(context) {
   const tier = auth.pricelist ? auth.pricelist : false
   const authToken = auth?.token || ''
 
-
   let response = await axios(
-    `${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/variant-detail?id=` + getIdFromSlug(slug) +'&auth=' + tier
+    `${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/variant-detail?id=` +
+      getIdFromSlug(slug) +
+      '&auth=' +
+      tier
   )
   let product = response.data
   // let product = await variantApi({ id: getIdFromSlug(slug), headers: { Token: authToken } })
-  
+
   if (product?.length == 1) {
     product = product[0]
-   /* const regexHtmlTags = /(<([^>]+)>)/gi
+    /* const regexHtmlTags = /(<([^>]+)>)/gi
     const regexHtmlTagsExceptP = /<\/?(?!p\b)[^>]*>/g
     product.description = product.description
       .replace(regexHtmlTagsExceptP, ' ')
@@ -46,6 +50,14 @@ export async function getServerSideProps(context) {
 export default function ProductDetail({ product }) {
   const router = useRouter()
 
+  const { setProduct } = useProductContext()
+
+  useEffect(() => {
+    if (product) {
+      setProduct(product)
+    }
+  }, [product, setProduct])
+
   if (!product) return <PageNotFound />
 
   return (
-- 
cgit v1.2.3


From e12eb243d2efb9f18a5a963fbdf5e456ce3cd249 Mon Sep 17 00:00:00 2001
From: Rafi Zadanly <zadanlyr@gmail.com>
Date: Fri, 6 Oct 2023 09:14:33 +0700
Subject: Update label on google merchant xml

---
 src/pages/google_merchant/products/[page].js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/pages/google_merchant/products/[page].js b/src/pages/google_merchant/products/[page].js
index 352b2989..d6309090 100644
--- a/src/pages/google_merchant/products/[page].js
+++ b/src/pages/google_merchant/products/[page].js
@@ -45,11 +45,15 @@ export async function getServerSideProps({ res, query }) {
       'g:condition': { '#text': 'new' },
       'g:availability': { '#text': availability },
       'g:brand': { '#text': product.manufacture?.name || '' },
-      'g:price': { '#text': `${Math.round(product.lowestPrice.price * 1.11)} IDR` },
-      'g:custom_label_0': {
-        '#text': product.stockTotal > 0 ? 'Stok Tersedia' : 'Stok Tidak Tersedia'
-      }
+      'g:price': { '#text': `${Math.round(product.lowestPrice.price * 1.11)} IDR` }
+    }
+    
+    if (product.stockTotal == 0) {
+      item['g:custom_label_0'] = { '#text': 'Stok Tidak Tersedia' }
+    } else {
+      item['g:custom_label_1'] = { '#text': 'Stok Tersedia' }
     }
+
     if (product.lowestPrice.discountPercentage > 0) {
       item['g:sale_price'] = {
         '#text': `${Math.round(product.lowestPrice.priceDiscount * 1.11)} IDR`
-- 
cgit v1.2.3


From 5726dd5375454e8c168ca159023381ad9e3648b8 Mon Sep 17 00:00:00 2001
From: Rafi Zadanly <zadanlyr@gmail.com>
Date: Mon, 9 Oct 2023 10:30:10 +0700
Subject: Add local font

---
 src/pages/_document.jsx |  3 ++-
 src/styles/globals.css  | 44 ++++++++++++++++++++++++++++++--------------
 2 files changed, 32 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/pages/_document.jsx b/src/pages/_document.jsx
index 5f3d2367..7db088d8 100644
--- a/src/pages/_document.jsx
+++ b/src/pages/_document.jsx
@@ -19,6 +19,7 @@ export default function MyDocument() {
         <meta name='theme-color' content='#fff' />
 
         <link rel='prefetch' href='/images/logo-indoteknik-gear.png' />
+        <link rel='preload' href='/fonts/Inter/inter.css' as='style' />
 
         <meta name='facebook-domain-verification' content='328wmjs7hcnz74rwsqzxvq50rmbtm2' />
         <Script
@@ -77,7 +78,7 @@ export default function MyDocument() {
           strategy='beforeInteractive'
           src='https://www.googletagmanager.com/gtag/js?id=AW-954540379'
         />
-        
+
         <Script
           id='google-ads'
           strategy='afterInteractive'
diff --git a/src/styles/globals.css b/src/styles/globals.css
index 06ae7ca2..e3e0e48e 100644
--- a/src/styles/globals.css
+++ b/src/styles/globals.css
@@ -1,5 +1,3 @@
-@import url('https://fonts.googleapis.com/css2?family=Inter:wght@100;200;300;400;500;600;700;800;900&display=swap');
-
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
@@ -14,7 +12,8 @@ body {
         text-body-2
         text-gray_r-12
         bg-gray_r-1
-        overflow-x-clip;
+        overflow-x-clip
+        antialiased;
 }
 
 #__next main {
@@ -114,8 +113,8 @@ button {
             focus:border-danger-500;
     }
 
-    .form-input[type=file] {
-        @apply py-2
+    .form-input[type='file'] {
+        @apply py-2;
     }
 
     .btn-yellow,
@@ -401,7 +400,7 @@ button {
         w-full;
 }
 
-.table-specification > table > thead > tr > th:last-child{
+.table-specification > table > thead > tr > th:last-child {
     @apply w-3/12;
 }
 
@@ -463,7 +462,7 @@ button {
 .table-data {
     @apply w-full
     table-auto
-    border-collapse;;
+    border-collapse;
 }
 
 .table-data thead tr {
@@ -632,12 +631,29 @@ button {
 }
 
 @keyframes shake {
-    0% { transform: translateX(0); }
-    10%, 90% { transform: translateX(-10px); }
-    20%, 80% { transform: translateX(10px); }
-    30%, 50%, 70% { transform: translateX(-10px); }
-    40%, 60% { transform: translateX(10px); }
-    100% { transform: translateX(0); }
+    0% {
+        transform: translateX(0);
+    }
+    10%,
+    90% {
+        transform: translateX(-10px);
+    }
+    20%,
+    80% {
+        transform: translateX(10px);
+    }
+    30%,
+    50%,
+    70% {
+        transform: translateX(-10px);
+    }
+    40%,
+    60% {
+        transform: translateX(10px);
+    }
+    100% {
+        transform: translateX(0);
+    }
 }
 
 .blink-color-flash-sale {
@@ -656,4 +672,4 @@ button {
     to {
         @apply text-warning-500;
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3


From d57b7bbbfe3872316b6248df39d58065da643be6 Mon Sep 17 00:00:00 2001
From: Rafi Zadanly <zadanlyr@gmail.com>
Date: Mon, 9 Oct 2023 10:46:12 +0700
Subject: Update default html font

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

(limited to 'src')

diff --git a/src/pages/_document.jsx b/src/pages/_document.jsx
index 7db088d8..6cd99b08 100644
--- a/src/pages/_document.jsx
+++ b/src/pages/_document.jsx
@@ -5,7 +5,7 @@ export default function MyDocument() {
   const env = process.env.NODE_ENV
 
   return (
-    <Html>
+    <Html style={{ fontFamily: `'Inter', sans-serif` }}>
       <Head>
         <link rel='icon' href='/favicon.ico' />
         <link rel='manifest' href='/manifest.json' />
-- 
cgit v1.2.3


From d47446d97b052f8298bb948ad070fdcbeaaa61a3 Mon Sep 17 00:00:00 2001
From: "HATEC\\SPVDEV001" <tri.susilo@altama.co.id>
Date: Mon, 9 Oct 2023 11:48:28 +0700
Subject: call for price

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

(limited to 'src')

diff --git a/src/lib/product/api/productSimilarApi.js b/src/lib/product/api/productSimilarApi.js
index a008ce5d..ecd6724a 100644
--- a/src/lib/product/api/productSimilarApi.js
+++ b/src/lib/product/api/productSimilarApi.js
@@ -19,7 +19,7 @@ const productSimilarApi = async ({ query, source }) => {
     }
   }
   const dataProductSimilar = await axios(
-    `${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/search?q=${query}&page=1&orderBy=popular-weekly&operation=OR`
+    `${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/search?q=${query}&page=1&orderBy=popular-weekly&operation=OR&priceFrom=1`
   )
   if (dataflashSale) {
     dataProductSimilar.data.response.products = [
diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index 2120a442..b5161365 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -56,7 +56,7 @@ export default async function handler(req, res) {
 
   if (priceFrom > 0 || priceTo > 0) {
     parameter.push(
-      `fq=price_discount_f:[${priceFrom == '' ? '*' : priceFrom} TO ${
+      `fq=price_tier1_v2_f:[${priceFrom == '' ? '*' : priceFrom} TO ${
         priceTo == '' ? '*' : priceTo
       }]`
     )
-- 
cgit v1.2.3


From 5b45d6ac182fcbe9d6e235a227688e0ae60869d9 Mon Sep 17 00:00:00 2001
From: Rafi Zadanly <zadanlyr@gmail.com>
Date: Tue, 10 Oct 2023 08:58:52 +0700
Subject: Move font location and implement on app

---
 src/fonts/Inter/Inter-Black.woff             | Bin 0 -> 138764 bytes
 src/fonts/Inter/Inter-Black.woff2            | Bin 0 -> 102868 bytes
 src/fonts/Inter/Inter-BlackItalic.woff       | Bin 0 -> 146824 bytes
 src/fonts/Inter/Inter-BlackItalic.woff2      | Bin 0 -> 108752 bytes
 src/fonts/Inter/Inter-Bold.woff              | Bin 0 -> 143208 bytes
 src/fonts/Inter/Inter-Bold.woff2             | Bin 0 -> 106140 bytes
 src/fonts/Inter/Inter-BoldItalic.woff        | Bin 0 -> 151052 bytes
 src/fonts/Inter/Inter-BoldItalic.woff2       | Bin 0 -> 111808 bytes
 src/fonts/Inter/Inter-ExtraBold.woff         | Bin 0 -> 142920 bytes
 src/fonts/Inter/Inter-ExtraBold.woff2        | Bin 0 -> 106108 bytes
 src/fonts/Inter/Inter-ExtraBoldItalic.woff   | Bin 0 -> 150628 bytes
 src/fonts/Inter/Inter-ExtraBoldItalic.woff2  | Bin 0 -> 111708 bytes
 src/fonts/Inter/Inter-ExtraLight.woff        | Bin 0 -> 140724 bytes
 src/fonts/Inter/Inter-ExtraLight.woff2       | Bin 0 -> 104232 bytes
 src/fonts/Inter/Inter-ExtraLightItalic.woff  | Bin 0 -> 149996 bytes
 src/fonts/Inter/Inter-ExtraLightItalic.woff2 | Bin 0 -> 111392 bytes
 src/fonts/Inter/Inter-Italic.woff            | Bin 0 -> 144372 bytes
 src/fonts/Inter/Inter-Italic.woff2           | Bin 0 -> 106876 bytes
 src/fonts/Inter/Inter-Light.woff             | Bin 0 -> 140632 bytes
 src/fonts/Inter/Inter-Light.woff2            | Bin 0 -> 104332 bytes
 src/fonts/Inter/Inter-LightItalic.woff       | Bin 0 -> 150092 bytes
 src/fonts/Inter/Inter-LightItalic.woff2      | Bin 0 -> 111332 bytes
 src/fonts/Inter/Inter-Medium.woff            | Bin 0 -> 142552 bytes
 src/fonts/Inter/Inter-Medium.woff2           | Bin 0 -> 105924 bytes
 src/fonts/Inter/Inter-MediumItalic.woff      | Bin 0 -> 150988 bytes
 src/fonts/Inter/Inter-MediumItalic.woff2     | Bin 0 -> 112184 bytes
 src/fonts/Inter/Inter-Regular.woff           | Bin 0 -> 133844 bytes
 src/fonts/Inter/Inter-Regular.woff2          | Bin 0 -> 98868 bytes
 src/fonts/Inter/Inter-SemiBold.woff          | Bin 0 -> 142932 bytes
 src/fonts/Inter/Inter-SemiBold.woff2         | Bin 0 -> 105804 bytes
 src/fonts/Inter/Inter-SemiBoldItalic.woff    | Bin 0 -> 151180 bytes
 src/fonts/Inter/Inter-SemiBoldItalic.woff2   | Bin 0 -> 112048 bytes
 src/fonts/Inter/Inter-Thin.woff              | Bin 0 -> 135920 bytes
 src/fonts/Inter/Inter-Thin.woff2             | Bin 0 -> 99632 bytes
 src/fonts/Inter/Inter-ThinItalic.woff        | Bin 0 -> 145480 bytes
 src/fonts/Inter/Inter-ThinItalic.woff2       | Bin 0 -> 106496 bytes
 src/fonts/Inter/Inter-italic.var.woff2       | Bin 0 -> 245036 bytes
 src/fonts/Inter/Inter-roman.var.woff2        | Bin 0 -> 227180 bytes
 src/fonts/Inter/Inter.var.woff2              | Bin 0 -> 324864 bytes
 src/fonts/Inter/inter.css                    | 199 +++++++++++++++++++++++++++
 src/pages/_app.jsx                           |   3 +-
 src/pages/_document.jsx                      |   3 +-
 src/styles/globals.css                       |   3 +-
 43 files changed, 203 insertions(+), 5 deletions(-)
 create mode 100644 src/fonts/Inter/Inter-Black.woff
 create mode 100644 src/fonts/Inter/Inter-Black.woff2
 create mode 100644 src/fonts/Inter/Inter-BlackItalic.woff
 create mode 100644 src/fonts/Inter/Inter-BlackItalic.woff2
 create mode 100644 src/fonts/Inter/Inter-Bold.woff
 create mode 100644 src/fonts/Inter/Inter-Bold.woff2
 create mode 100644 src/fonts/Inter/Inter-BoldItalic.woff
 create mode 100644 src/fonts/Inter/Inter-BoldItalic.woff2
 create mode 100644 src/fonts/Inter/Inter-ExtraBold.woff
 create mode 100644 src/fonts/Inter/Inter-ExtraBold.woff2
 create mode 100644 src/fonts/Inter/Inter-ExtraBoldItalic.woff
 create mode 100644 src/fonts/Inter/Inter-ExtraBoldItalic.woff2
 create mode 100644 src/fonts/Inter/Inter-ExtraLight.woff
 create mode 100644 src/fonts/Inter/Inter-ExtraLight.woff2
 create mode 100644 src/fonts/Inter/Inter-ExtraLightItalic.woff
 create mode 100644 src/fonts/Inter/Inter-ExtraLightItalic.woff2
 create mode 100644 src/fonts/Inter/Inter-Italic.woff
 create mode 100644 src/fonts/Inter/Inter-Italic.woff2
 create mode 100644 src/fonts/Inter/Inter-Light.woff
 create mode 100644 src/fonts/Inter/Inter-Light.woff2
 create mode 100644 src/fonts/Inter/Inter-LightItalic.woff
 create mode 100644 src/fonts/Inter/Inter-LightItalic.woff2
 create mode 100644 src/fonts/Inter/Inter-Medium.woff
 create mode 100644 src/fonts/Inter/Inter-Medium.woff2
 create mode 100644 src/fonts/Inter/Inter-MediumItalic.woff
 create mode 100644 src/fonts/Inter/Inter-MediumItalic.woff2
 create mode 100644 src/fonts/Inter/Inter-Regular.woff
 create mode 100644 src/fonts/Inter/Inter-Regular.woff2
 create mode 100644 src/fonts/Inter/Inter-SemiBold.woff
 create mode 100644 src/fonts/Inter/Inter-SemiBold.woff2
 create mode 100644 src/fonts/Inter/Inter-SemiBoldItalic.woff
 create mode 100644 src/fonts/Inter/Inter-SemiBoldItalic.woff2
 create mode 100644 src/fonts/Inter/Inter-Thin.woff
 create mode 100644 src/fonts/Inter/Inter-Thin.woff2
 create mode 100644 src/fonts/Inter/Inter-ThinItalic.woff
 create mode 100644 src/fonts/Inter/Inter-ThinItalic.woff2
 create mode 100644 src/fonts/Inter/Inter-italic.var.woff2
 create mode 100644 src/fonts/Inter/Inter-roman.var.woff2
 create mode 100644 src/fonts/Inter/Inter.var.woff2
 create mode 100644 src/fonts/Inter/inter.css

(limited to 'src')

diff --git a/src/fonts/Inter/Inter-Black.woff b/src/fonts/Inter/Inter-Black.woff
new file mode 100644
index 00000000..a18593a0
Binary files /dev/null and b/src/fonts/Inter/Inter-Black.woff differ
diff --git a/src/fonts/Inter/Inter-Black.woff2 b/src/fonts/Inter/Inter-Black.woff2
new file mode 100644
index 00000000..68f64c9e
Binary files /dev/null and b/src/fonts/Inter/Inter-Black.woff2 differ
diff --git a/src/fonts/Inter/Inter-BlackItalic.woff b/src/fonts/Inter/Inter-BlackItalic.woff
new file mode 100644
index 00000000..b6b01943
Binary files /dev/null and b/src/fonts/Inter/Inter-BlackItalic.woff differ
diff --git a/src/fonts/Inter/Inter-BlackItalic.woff2 b/src/fonts/Inter/Inter-BlackItalic.woff2
new file mode 100644
index 00000000..1c9c7ca8
Binary files /dev/null and b/src/fonts/Inter/Inter-BlackItalic.woff2 differ
diff --git a/src/fonts/Inter/Inter-Bold.woff b/src/fonts/Inter/Inter-Bold.woff
new file mode 100644
index 00000000..eaf3d4bf
Binary files /dev/null and b/src/fonts/Inter/Inter-Bold.woff differ
diff --git a/src/fonts/Inter/Inter-Bold.woff2 b/src/fonts/Inter/Inter-Bold.woff2
new file mode 100644
index 00000000..2846f29c
Binary files /dev/null and b/src/fonts/Inter/Inter-Bold.woff2 differ
diff --git a/src/fonts/Inter/Inter-BoldItalic.woff b/src/fonts/Inter/Inter-BoldItalic.woff
new file mode 100644
index 00000000..32750761
Binary files /dev/null and b/src/fonts/Inter/Inter-BoldItalic.woff differ
diff --git a/src/fonts/Inter/Inter-BoldItalic.woff2 b/src/fonts/Inter/Inter-BoldItalic.woff2
new file mode 100644
index 00000000..0b1fe8e1
Binary files /dev/null and b/src/fonts/Inter/Inter-BoldItalic.woff2 differ
diff --git a/src/fonts/Inter/Inter-ExtraBold.woff b/src/fonts/Inter/Inter-ExtraBold.woff
new file mode 100644
index 00000000..c2c17ede
Binary files /dev/null and b/src/fonts/Inter/Inter-ExtraBold.woff differ
diff --git a/src/fonts/Inter/Inter-ExtraBold.woff2 b/src/fonts/Inter/Inter-ExtraBold.woff2
new file mode 100644
index 00000000..c24c2bdc
Binary files /dev/null and b/src/fonts/Inter/Inter-ExtraBold.woff2 differ
diff --git a/src/fonts/Inter/Inter-ExtraBoldItalic.woff b/src/fonts/Inter/Inter-ExtraBoldItalic.woff
new file mode 100644
index 00000000..c42f7052
Binary files /dev/null and b/src/fonts/Inter/Inter-ExtraBoldItalic.woff differ
diff --git a/src/fonts/Inter/Inter-ExtraBoldItalic.woff2 b/src/fonts/Inter/Inter-ExtraBoldItalic.woff2
new file mode 100644
index 00000000..4a81dc79
Binary files /dev/null and b/src/fonts/Inter/Inter-ExtraBoldItalic.woff2 differ
diff --git a/src/fonts/Inter/Inter-ExtraLight.woff b/src/fonts/Inter/Inter-ExtraLight.woff
new file mode 100644
index 00000000..d0de5f39
Binary files /dev/null and b/src/fonts/Inter/Inter-ExtraLight.woff differ
diff --git a/src/fonts/Inter/Inter-ExtraLight.woff2 b/src/fonts/Inter/Inter-ExtraLight.woff2
new file mode 100644
index 00000000..f2ea706f
Binary files /dev/null and b/src/fonts/Inter/Inter-ExtraLight.woff2 differ
diff --git a/src/fonts/Inter/Inter-ExtraLightItalic.woff b/src/fonts/Inter/Inter-ExtraLightItalic.woff
new file mode 100644
index 00000000..81f1a28e
Binary files /dev/null and b/src/fonts/Inter/Inter-ExtraLightItalic.woff differ
diff --git a/src/fonts/Inter/Inter-ExtraLightItalic.woff2 b/src/fonts/Inter/Inter-ExtraLightItalic.woff2
new file mode 100644
index 00000000..9af717ba
Binary files /dev/null and b/src/fonts/Inter/Inter-ExtraLightItalic.woff2 differ
diff --git a/src/fonts/Inter/Inter-Italic.woff b/src/fonts/Inter/Inter-Italic.woff
new file mode 100644
index 00000000..a806b382
Binary files /dev/null and b/src/fonts/Inter/Inter-Italic.woff differ
diff --git a/src/fonts/Inter/Inter-Italic.woff2 b/src/fonts/Inter/Inter-Italic.woff2
new file mode 100644
index 00000000..a619fc54
Binary files /dev/null and b/src/fonts/Inter/Inter-Italic.woff2 differ
diff --git a/src/fonts/Inter/Inter-Light.woff b/src/fonts/Inter/Inter-Light.woff
new file mode 100644
index 00000000..c496464d
Binary files /dev/null and b/src/fonts/Inter/Inter-Light.woff differ
diff --git a/src/fonts/Inter/Inter-Light.woff2 b/src/fonts/Inter/Inter-Light.woff2
new file mode 100644
index 00000000..bc4be665
Binary files /dev/null and b/src/fonts/Inter/Inter-Light.woff2 differ
diff --git a/src/fonts/Inter/Inter-LightItalic.woff b/src/fonts/Inter/Inter-LightItalic.woff
new file mode 100644
index 00000000..f84a9de3
Binary files /dev/null and b/src/fonts/Inter/Inter-LightItalic.woff differ
diff --git a/src/fonts/Inter/Inter-LightItalic.woff2 b/src/fonts/Inter/Inter-LightItalic.woff2
new file mode 100644
index 00000000..842b2dfc
Binary files /dev/null and b/src/fonts/Inter/Inter-LightItalic.woff2 differ
diff --git a/src/fonts/Inter/Inter-Medium.woff b/src/fonts/Inter/Inter-Medium.woff
new file mode 100644
index 00000000..d546843f
Binary files /dev/null and b/src/fonts/Inter/Inter-Medium.woff differ
diff --git a/src/fonts/Inter/Inter-Medium.woff2 b/src/fonts/Inter/Inter-Medium.woff2
new file mode 100644
index 00000000..f92498a2
Binary files /dev/null and b/src/fonts/Inter/Inter-Medium.woff2 differ
diff --git a/src/fonts/Inter/Inter-MediumItalic.woff b/src/fonts/Inter/Inter-MediumItalic.woff
new file mode 100644
index 00000000..459a6568
Binary files /dev/null and b/src/fonts/Inter/Inter-MediumItalic.woff differ
diff --git a/src/fonts/Inter/Inter-MediumItalic.woff2 b/src/fonts/Inter/Inter-MediumItalic.woff2
new file mode 100644
index 00000000..0e3019f4
Binary files /dev/null and b/src/fonts/Inter/Inter-MediumItalic.woff2 differ
diff --git a/src/fonts/Inter/Inter-Regular.woff b/src/fonts/Inter/Inter-Regular.woff
new file mode 100644
index 00000000..62d3a618
Binary files /dev/null and b/src/fonts/Inter/Inter-Regular.woff differ
diff --git a/src/fonts/Inter/Inter-Regular.woff2 b/src/fonts/Inter/Inter-Regular.woff2
new file mode 100644
index 00000000..6c2b6893
Binary files /dev/null and b/src/fonts/Inter/Inter-Regular.woff2 differ
diff --git a/src/fonts/Inter/Inter-SemiBold.woff b/src/fonts/Inter/Inter-SemiBold.woff
new file mode 100644
index 00000000..a815f43a
Binary files /dev/null and b/src/fonts/Inter/Inter-SemiBold.woff differ
diff --git a/src/fonts/Inter/Inter-SemiBold.woff2 b/src/fonts/Inter/Inter-SemiBold.woff2
new file mode 100644
index 00000000..611e90c9
Binary files /dev/null and b/src/fonts/Inter/Inter-SemiBold.woff2 differ
diff --git a/src/fonts/Inter/Inter-SemiBoldItalic.woff b/src/fonts/Inter/Inter-SemiBoldItalic.woff
new file mode 100644
index 00000000..909e43a9
Binary files /dev/null and b/src/fonts/Inter/Inter-SemiBoldItalic.woff differ
diff --git a/src/fonts/Inter/Inter-SemiBoldItalic.woff2 b/src/fonts/Inter/Inter-SemiBoldItalic.woff2
new file mode 100644
index 00000000..545685bd
Binary files /dev/null and b/src/fonts/Inter/Inter-SemiBoldItalic.woff2 differ
diff --git a/src/fonts/Inter/Inter-Thin.woff b/src/fonts/Inter/Inter-Thin.woff
new file mode 100644
index 00000000..62bc58cd
Binary files /dev/null and b/src/fonts/Inter/Inter-Thin.woff differ
diff --git a/src/fonts/Inter/Inter-Thin.woff2 b/src/fonts/Inter/Inter-Thin.woff2
new file mode 100644
index 00000000..abbc3a5c
Binary files /dev/null and b/src/fonts/Inter/Inter-Thin.woff2 differ
diff --git a/src/fonts/Inter/Inter-ThinItalic.woff b/src/fonts/Inter/Inter-ThinItalic.woff
new file mode 100644
index 00000000..700a7f06
Binary files /dev/null and b/src/fonts/Inter/Inter-ThinItalic.woff differ
diff --git a/src/fonts/Inter/Inter-ThinItalic.woff2 b/src/fonts/Inter/Inter-ThinItalic.woff2
new file mode 100644
index 00000000..ab0b2002
Binary files /dev/null and b/src/fonts/Inter/Inter-ThinItalic.woff2 differ
diff --git a/src/fonts/Inter/Inter-italic.var.woff2 b/src/fonts/Inter/Inter-italic.var.woff2
new file mode 100644
index 00000000..b826d5af
Binary files /dev/null and b/src/fonts/Inter/Inter-italic.var.woff2 differ
diff --git a/src/fonts/Inter/Inter-roman.var.woff2 b/src/fonts/Inter/Inter-roman.var.woff2
new file mode 100644
index 00000000..6a256a06
Binary files /dev/null and b/src/fonts/Inter/Inter-roman.var.woff2 differ
diff --git a/src/fonts/Inter/Inter.var.woff2 b/src/fonts/Inter/Inter.var.woff2
new file mode 100644
index 00000000..365eedc5
Binary files /dev/null and b/src/fonts/Inter/Inter.var.woff2 differ
diff --git a/src/fonts/Inter/inter.css b/src/fonts/Inter/inter.css
new file mode 100644
index 00000000..de6ce273
--- /dev/null
+++ b/src/fonts/Inter/inter.css
@@ -0,0 +1,199 @@
+@font-face {
+    font-family: 'Inter';
+    font-style: normal;
+    font-weight: 100;
+    font-display: swap;
+    src: url('Inter-Thin.woff2?v=3.19') format('woff2'),
+        url('Inter-Thin.woff?v=3.19') format('woff');
+}
+@font-face {
+    font-family: 'Inter';
+    font-style: italic;
+    font-weight: 100;
+    font-display: swap;
+    src: url('Inter-ThinItalic.woff2?v=3.19') format('woff2'),
+        url('Inter-ThinItalic.woff?v=3.19') format('woff');
+}
+
+@font-face {
+    font-family: 'Inter';
+    font-style: normal;
+    font-weight: 200;
+    font-display: swap;
+    src: url('Inter-ExtraLight.woff2?v=3.19') format('woff2'),
+        url('Inter-ExtraLight.woff?v=3.19') format('woff');
+}
+@font-face {
+    font-family: 'Inter';
+    font-style: italic;
+    font-weight: 200;
+    font-display: swap;
+    src: url('Inter-ExtraLightItalic.woff2?v=3.19') format('woff2'),
+        url('Inter-ExtraLightItalic.woff?v=3.19') format('woff');
+}
+
+@font-face {
+    font-family: 'Inter';
+    font-style: normal;
+    font-weight: 300;
+    font-display: swap;
+    src: url('Inter-Light.woff2?v=3.19') format('woff2'),
+        url('Inter-Light.woff?v=3.19') format('woff');
+}
+@font-face {
+    font-family: 'Inter';
+    font-style: italic;
+    font-weight: 300;
+    font-display: swap;
+    src: url('Inter-LightItalic.woff2?v=3.19') format('woff2'),
+        url('Inter-LightItalic.woff?v=3.19') format('woff');
+}
+
+@font-face {
+    font-family: 'Inter';
+    font-style: normal;
+    font-weight: 400;
+    font-display: swap;
+    src: url('Inter-Regular.woff2?v=3.19') format('woff2'),
+        url('Inter-Regular.woff?v=3.19') format('woff');
+}
+@font-face {
+    font-family: 'Inter';
+    font-style: italic;
+    font-weight: 400;
+    font-display: swap;
+    src: url('Inter-Italic.woff2?v=3.19') format('woff2'),
+        url('Inter-Italic.woff?v=3.19') format('woff');
+}
+
+@font-face {
+    font-family: 'Inter';
+    font-style: normal;
+    font-weight: 500;
+    font-display: swap;
+    src: url('Inter-Medium.woff2?v=3.19') format('woff2'),
+        url('Inter-Medium.woff?v=3.19') format('woff');
+}
+@font-face {
+    font-family: 'Inter';
+    font-style: italic;
+    font-weight: 500;
+    font-display: swap;
+    src: url('Inter-MediumItalic.woff2?v=3.19') format('woff2'),
+        url('Inter-MediumItalic.woff?v=3.19') format('woff');
+}
+
+@font-face {
+    font-family: 'Inter';
+    font-style: normal;
+    font-weight: 600;
+    font-display: swap;
+    src: url('Inter-SemiBold.woff2?v=3.19') format('woff2'),
+        url('Inter-SemiBold.woff?v=3.19') format('woff');
+}
+@font-face {
+    font-family: 'Inter';
+    font-style: italic;
+    font-weight: 600;
+    font-display: swap;
+    src: url('Inter-SemiBoldItalic.woff2?v=3.19') format('woff2'),
+        url('Inter-SemiBoldItalic.woff?v=3.19') format('woff');
+}
+
+@font-face {
+    font-family: 'Inter';
+    font-style: normal;
+    font-weight: 700;
+    font-display: swap;
+    src: url('Inter-Bold.woff2?v=3.19') format('woff2'),
+        url('Inter-Bold.woff?v=3.19') format('woff');
+}
+@font-face {
+    font-family: 'Inter';
+    font-style: italic;
+    font-weight: 700;
+    font-display: swap;
+    src: url('Inter-BoldItalic.woff2?v=3.19') format('woff2'),
+        url('Inter-BoldItalic.woff?v=3.19') format('woff');
+}
+
+@font-face {
+    font-family: 'Inter';
+    font-style: normal;
+    font-weight: 800;
+    font-display: swap;
+    src: url('Inter-ExtraBold.woff2?v=3.19') format('woff2'),
+        url('Inter-ExtraBold.woff?v=3.19') format('woff');
+}
+@font-face {
+    font-family: 'Inter';
+    font-style: italic;
+    font-weight: 800;
+    font-display: swap;
+    src: url('Inter-ExtraBoldItalic.woff2?v=3.19') format('woff2'),
+        url('Inter-ExtraBoldItalic.woff?v=3.19') format('woff');
+}
+
+@font-face {
+    font-family: 'Inter';
+    font-style: normal;
+    font-weight: 900;
+    font-display: swap;
+    src: url('Inter-Black.woff2?v=3.19') format('woff2'),
+        url('Inter-Black.woff?v=3.19') format('woff');
+}
+@font-face {
+    font-family: 'Inter';
+    font-style: italic;
+    font-weight: 900;
+    font-display: swap;
+    src: url('Inter-BlackItalic.woff2?v=3.19') format('woff2'),
+        url('Inter-BlackItalic.woff?v=3.19') format('woff');
+}
+
+/* -------------------------------------------------------
+Variable font.
+Usage:
+
+  html { font-family: 'Inter', sans-serif; }
+  @supports (font-variation-settings: normal) {
+    html { font-family: 'Inter var', sans-serif; }
+  }
+*/
+@font-face {
+    font-family: 'Inter var';
+    font-weight: 100 900;
+    font-display: swap;
+    font-style: normal;
+    font-named-instance: 'Regular';
+    src: url('Inter-roman.var.woff2?v=3.19') format('woff2');
+}
+@font-face {
+    font-family: 'Inter var';
+    font-weight: 100 900;
+    font-display: swap;
+    font-style: italic;
+    font-named-instance: 'Italic';
+    src: url('Inter-italic.var.woff2?v=3.19') format('woff2');
+}
+
+/* --------------------------------------------------------------------------
+[EXPERIMENTAL] Multi-axis, single variable font.
+
+Slant axis is not yet widely supported (as of February 2019) and thus this
+multi-axis single variable font is opt-in rather than the default.
+
+When using this, you will probably need to set font-variation-settings
+explicitly, e.g.
+
+  * { font-variation-settings: "slnt" 0deg }
+  .italic { font-variation-settings: "slnt" 10deg }
+
+*/
+@font-face {
+    font-family: 'Inter var experimental';
+    font-weight: 100 900;
+    font-display: swap;
+    font-style: oblique 0deg 10deg;
+    src: url('Inter.var.woff2?v=3.19') format('woff2');
+}
diff --git a/src/pages/_app.jsx b/src/pages/_app.jsx
index afebc293..3fe1d3cf 100644
--- a/src/pages/_app.jsx
+++ b/src/pages/_app.jsx
@@ -1,4 +1,5 @@
-import '../styles/globals.css'
+import '@/fonts/Inter/inter.css'
+import '@/styles/globals.css'
 import 'react-loading-skeleton/dist/skeleton.css'
 
 import NextProgress from 'next-progress'
diff --git a/src/pages/_document.jsx b/src/pages/_document.jsx
index 6cd99b08..3762c63b 100644
--- a/src/pages/_document.jsx
+++ b/src/pages/_document.jsx
@@ -5,7 +5,7 @@ export default function MyDocument() {
   const env = process.env.NODE_ENV
 
   return (
-    <Html style={{ fontFamily: `'Inter', sans-serif` }}>
+    <Html>
       <Head>
         <link rel='icon' href='/favicon.ico' />
         <link rel='manifest' href='/manifest.json' />
@@ -19,7 +19,6 @@ export default function MyDocument() {
         <meta name='theme-color' content='#fff' />
 
         <link rel='prefetch' href='/images/logo-indoteknik-gear.png' />
-        <link rel='preload' href='/fonts/Inter/inter.css' as='style' />
 
         <meta name='facebook-domain-verification' content='328wmjs7hcnz74rwsqzxvq50rmbtm2' />
         <Script
diff --git a/src/styles/globals.css b/src/styles/globals.css
index e3e0e48e..ea20b247 100644
--- a/src/styles/globals.css
+++ b/src/styles/globals.css
@@ -12,8 +12,7 @@ body {
         text-body-2
         text-gray_r-12
         bg-gray_r-1
-        overflow-x-clip
-        antialiased;
+        overflow-x-clip;
 }
 
 #__next main {
-- 
cgit v1.2.3


From 23f67959168cd0126582c44f2a5b1bfdc45b268a 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/lib/brand/components/Brand.jsx                 |  4 +-
 src/lib/brand/components/Breadcrumb.jsx            | 40 ++++++++++++
 src/lib/category/components/Breadcrumb.jsx         | 56 +++++++++++++++++
 src/lib/category/components/Category.jsx           |  2 +-
 src/lib/product/components/Product/Breadcrumb.jsx  | 69 +++++++++++++++++++++
 src/lib/product/components/Product/Product.jsx     | 38 +++++-------
 .../product/components/Product/ProductDesktop.jsx  | 71 +++++++++++-----------
 .../product/components/Product/ProductMobile.jsx   |  2 +
 src/lib/product/components/ProductSearch.jsx       |  4 +-
 .../promotinProgram/components/PromotionType.jsx   |  2 +-
 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 ++++++
 14 files changed, 267 insertions(+), 63 deletions(-)
 create mode 100644 src/lib/brand/components/Breadcrumb.jsx
 create mode 100644 src/lib/category/components/Breadcrumb.jsx
 create mode 100644 src/lib/product/components/Product/Breadcrumb.jsx

(limited to 'src')

diff --git a/src/lib/brand/components/Brand.jsx b/src/lib/brand/components/Brand.jsx
index 3c411969..3985b888 100644
--- a/src/lib/brand/components/Brand.jsx
+++ b/src/lib/brand/components/Brand.jsx
@@ -84,7 +84,7 @@ const Brand = ({ id }) => {
       </MobileView>
 
       <DesktopView>
-        <div className='container mx-auto mt-10 mb-3'>
+        <div className='container mx-auto'>
           <div className='min-h-[150px]'>
             {brand.isLoading && <ImageSkeleton />}
             {brand.data?.banners?.length == 0 && (
@@ -117,6 +117,7 @@ const Brand = ({ id }) => {
                     </SwiperSlide>
                   ))}
                 </Swiper>
+
                 <div className='p-4'>
                   <div className='text-caption-1 text-gray_r-11 mb-2'>Produk dari brand:</div>
                   {brand?.data?.logo && (
@@ -137,7 +138,6 @@ const Brand = ({ id }) => {
               </>
             )}
           </div>
-          <Divider />
         </div>
       </DesktopView>
     </>
diff --git a/src/lib/brand/components/Breadcrumb.jsx b/src/lib/brand/components/Breadcrumb.jsx
new file mode 100644
index 00000000..0fec2dad
--- /dev/null
+++ b/src/lib/brand/components/Breadcrumb.jsx
@@ -0,0 +1,40 @@
+import { Breadcrumb as ChakraBreadcrumb, BreadcrumbItem, BreadcrumbLink } from '@chakra-ui/react'
+import Link from 'next/link'
+import React from 'react'
+
+/**
+ * Renders a breadcrumb component with links to navigate through different pages.
+ *
+ * @param {Object} props - The props object containing the brand name.
+ * @param {string} props.brandName - The name of the brand to display in the breadcrumb.
+ * @return {JSX.Element} The rendered breadcrumb component.
+ */
+const Breadcrumb = ({ brandName }) => {
+  return (
+    <div className='container mx-auto py-4 md:py-6'>
+      <ChakraBreadcrumb>
+        <BreadcrumbItem>
+          <BreadcrumbLink as={Link} href='/' className='!text-danger-500 whitespace-nowrap'>
+            Home
+          </BreadcrumbLink>
+        </BreadcrumbItem>
+
+        <BreadcrumbItem>
+          <BreadcrumbLink
+            as={Link}
+            href='/shop/brands'
+            className='!text-danger-500 whitespace-nowrap'
+          >
+            Brands
+          </BreadcrumbLink>
+        </BreadcrumbItem>
+
+        <BreadcrumbItem isCurrentPage>
+          <BreadcrumbLink className='whitespace-nowrap'>{brandName}</BreadcrumbLink>
+        </BreadcrumbItem>
+      </ChakraBreadcrumb>
+    </div>
+  )
+}
+
+export default Breadcrumb
diff --git a/src/lib/category/components/Breadcrumb.jsx b/src/lib/category/components/Breadcrumb.jsx
new file mode 100644
index 00000000..127904ee
--- /dev/null
+++ b/src/lib/category/components/Breadcrumb.jsx
@@ -0,0 +1,56 @@
+import odooApi from '@/core/api/odooApi'
+import { createSlug } from '@/core/utils/slug'
+import {
+  Breadcrumb as ChakraBreadcrumb,
+  BreadcrumbItem,
+  BreadcrumbLink,
+  Skeleton
+} from '@chakra-ui/react'
+import Link from 'next/link'
+import React from 'react'
+import { useQuery } from 'react-query'
+
+/**
+ * Render a breadcrumb component.
+ *
+ * @param {object} categoryId - The ID of the category.
+ * @return {JSX.Element} The breadcrumb component.
+ */
+const Breadcrumb = ({ categoryId }) => {
+  const breadcrumbs = useQuery(
+    `category-breadcrumbs/${categoryId}`,
+    async () => await odooApi('GET', `/api/v1/category/${categoryId}/category-breadcrumb`)
+  )
+
+  return (
+    <div className='container mx-auto py-4 md:py-6'>
+      <Skeleton isLoaded={!breadcrumbs.isLoading} className='w-2/3'>
+        <ChakraBreadcrumb>
+          <BreadcrumbItem>
+            <BreadcrumbLink as={Link} href='/' className='!text-danger-500 whitespace-nowrap'>
+              Home
+            </BreadcrumbLink>
+          </BreadcrumbItem>
+
+          {breadcrumbs.data?.map((category, index) => (
+            <BreadcrumbItem key={index} isCurrentPage={index === breadcrumbs.data.length - 1}>
+              {index === breadcrumbs.data.length - 1 ? (
+                <BreadcrumbLink className='whitespace-nowrap'>{category.name}</BreadcrumbLink>
+              ) : (
+                <BreadcrumbLink
+                  as={Link}
+                  href={createSlug('/shop/category/', category.name, category.id)}
+                  className='!text-danger-500 whitespace-nowrap'
+                >
+                  {category.name}
+                </BreadcrumbLink>
+              )}
+            </BreadcrumbItem>
+          ))}
+        </ChakraBreadcrumb>
+      </Skeleton>
+    </div>
+  )
+}
+
+export default Breadcrumb
diff --git a/src/lib/category/components/Category.jsx b/src/lib/category/components/Category.jsx
index af696d42..e6ea5acf 100644
--- a/src/lib/category/components/Category.jsx
+++ b/src/lib/category/components/Category.jsx
@@ -30,7 +30,7 @@ const Category = () => {
   return (
     <DesktopView>
       <div className='category-mega-box'>
-        {categories.map((category) => (
+        {categories?.map((category) => (
           <div key={category.id}>
             <Link
               href={createSlug('/shop/category/', category.name, category.id)}
diff --git a/src/lib/product/components/Product/Breadcrumb.jsx b/src/lib/product/components/Product/Breadcrumb.jsx
new file mode 100644
index 00000000..0554dba5
--- /dev/null
+++ b/src/lib/product/components/Product/Breadcrumb.jsx
@@ -0,0 +1,69 @@
+import odooApi from '@/core/api/odooApi'
+import { createSlug } from '@/core/utils/slug'
+import {
+  Breadcrumb as ChakraBreadcrumb,
+  BreadcrumbItem,
+  BreadcrumbLink,
+  Skeleton
+} from '@chakra-ui/react'
+import classNames from 'classnames'
+import Link from 'next/link'
+import { useQuery } from 'react-query'
+
+/**
+ * Renders a breadcrumb component based on the provided `productId`.
+ *
+ * @param {Object} props - The properties passed to the component.
+ * @param {number} props.productId - The ID of the product.
+ * @param {string} props.productName - The ID of the product.
+ * @return {ReactElement} The rendered breadcrumb component.
+ */
+const Breadcrumb = ({ productId, productName }) => {
+  const categories = useQuery(
+    `detail/categories/${productId}`,
+    async () => await odooApi('GET', `/api/v1/product/${productId}/category-breadcrumb`),
+    {
+      enabled: !!productId
+    }
+  )
+
+  return (
+    <Skeleton
+      isLoaded={!categories.isLoading}
+      className={classNames({
+        'w-2/3': categories.isLoading,
+        'w-full': !categories.isLoading
+      })}
+    >
+      <ChakraBreadcrumb
+        mb={10}
+        overflowX={'auto'}
+        className='text-caption-2 md:text-body-2 p-4 md:p-0'
+      >
+        <BreadcrumbItem>
+          <BreadcrumbLink as={Link} href='/' className='!text-danger-500 whitespace-nowrap'>
+            Home
+          </BreadcrumbLink>
+        </BreadcrumbItem>
+
+        {categories.data?.map((category) => (
+          <BreadcrumbItem key={category.id}>
+            <BreadcrumbLink
+              as={Link}
+              href={createSlug('/shop/category/', category.name, category.id)}
+              className='!text-danger-500 whitespace-nowrap'
+            >
+              {category.name}
+            </BreadcrumbLink>
+          </BreadcrumbItem>
+        ))}
+
+        <BreadcrumbItem isCurrentPage>
+          <BreadcrumbLink className='whitespace-nowrap'>{productName}</BreadcrumbLink>
+        </BreadcrumbItem>
+      </ChakraBreadcrumb>
+    </Skeleton>
+  )
+}
+
+export default Breadcrumb
diff --git a/src/lib/product/components/Product/Product.jsx b/src/lib/product/components/Product/Product.jsx
index 54490c26..6e983c2e 100644
--- a/src/lib/product/components/Product/Product.jsx
+++ b/src/lib/product/components/Product/Product.jsx
@@ -36,29 +36,21 @@ const Product = ({ product, isVariant = false }) => {
     }
   }, [product, isVariant])
 
-  if (isVariant == true) {
-    return (
-      <>
-        <ProductDesktopVariant
-          product={product}
-          wishlist={wishlist}
-          toggleWishlist={toggleWishlist}
-        />
-        <ProductMobileVariant
-          product={product}
-          wishlist={wishlist}
-          toggleWishlist={toggleWishlist}
-        />
-      </>
-    )
-  } else {
-    return (
-      <>
-        <ProductMobile product={product} wishlist={wishlist} toggleWishlist={toggleWishlist} />
-        <ProductDesktop products={product} wishlist={wishlist} toggleWishlist={toggleWishlist} />
-      </>
-    )
-  }
+  return isVariant == true ? (
+    <>
+      <ProductDesktopVariant
+        product={product}
+        wishlist={wishlist}
+        toggleWishlist={toggleWishlist}
+      />
+      <ProductMobileVariant product={product} wishlist={wishlist} toggleWishlist={toggleWishlist} />
+    </>
+  ) : (
+    <>
+      <ProductMobile product={product} wishlist={wishlist} toggleWishlist={toggleWishlist} />
+      <ProductDesktop products={product} wishlist={wishlist} toggleWishlist={toggleWishlist} />
+    </>
+  )
 }
 
 export default Product
diff --git a/src/lib/product/components/Product/ProductDesktop.jsx b/src/lib/product/components/Product/ProductDesktop.jsx
index 47e98c1a..ceb0cad7 100644
--- a/src/lib/product/components/Product/ProductDesktop.jsx
+++ b/src/lib/product/components/Product/ProductDesktop.jsx
@@ -24,6 +24,7 @@ import ColumnsSLA from './ColumnsSLA'
 import { useProductCartContext } from '@/contexts/ProductCartContext'
 import { Box, Skeleton, Tooltip } from '@chakra-ui/react'
 import { Info } from 'lucide-react'
+import Breadcrumb from './Breadcrumb'
 
 const ProductDesktop = ({ products, wishlist, toggleWishlist }) => {
   const router = useRouter()
@@ -199,47 +200,49 @@ const ProductDesktop = ({ products, wishlist, toggleWishlist }) => {
   return (
     <DesktopView>
       <div className='container mx-auto pt-10'>
+        <Breadcrumb productId={product.id} productName={product.name} />
         <div className='flex'>
           <div className='w-full flex flex-wrap'>
             <div className='w-5/12'>
               <div className='relative mb-2'>
-                {product?.flashSale?.remainingTime > 0 && lowestPrice?.price.discountPercentage > 0 && (
-                  <div className={`absolute bottom-0 w-full`}>
-                    <div className='absolute bottom-0 w-full h-full'>
-                      <ImageNext
-                        src={backgorundFlashSale || '/images/GAMBAR-BG-FLASH-SALE.jpg'}
-                        width={1000}
-                        height={100}
-                      />
-                    </div>
-                    <div className='relative'>
-                      <div className='flex gap-x-2 items-center p-2'>
-                        <div className='bg-yellow-400 rounded-full p-1 h-9 w-20 flex items-center justify-center '>
-                          <span className='text-lg font-bold'>
-                            {Math.floor(product.lowestPrice.discountPercentage)}%
-                          </span>
-                        </div>
-                        <div
-                          className={`bg-red-600 border border-solid border-yellow-400 rounded-full h-9 p-2 flex w-[50%] items-center justify-center gap-x-4`}
-                        >
-                          <ImageNext
-                            src='/images/ICON_FLASH_SALE_WEBSITE_INDOTEKNIK.svg'
-                            width={17}
-                            height={10}
-                          />
-                          <span className='text-white text-lg font-semibold'>
-                            {product?.flashSale?.tag != 'false' || product?.flashSale?.tag
-                              ? product?.flashSale?.tag
-                              : 'FLASH SALE'}
-                          </span>
-                        </div>
-                        <div>
-                          <CountDown2 initialTime={product.flashSale.remainingTime} />
+                {product?.flashSale?.remainingTime > 0 &&
+                  lowestPrice?.price.discountPercentage > 0 && (
+                    <div className={`absolute bottom-0 w-full`}>
+                      <div className='absolute bottom-0 w-full h-full'>
+                        <ImageNext
+                          src={backgorundFlashSale || '/images/GAMBAR-BG-FLASH-SALE.jpg'}
+                          width={1000}
+                          height={100}
+                        />
+                      </div>
+                      <div className='relative'>
+                        <div className='flex gap-x-2 items-center p-2'>
+                          <div className='bg-yellow-400 rounded-full p-1 h-9 w-20 flex items-center justify-center '>
+                            <span className='text-lg font-bold'>
+                              {Math.floor(product.lowestPrice.discountPercentage)}%
+                            </span>
+                          </div>
+                          <div
+                            className={`bg-red-600 border border-solid border-yellow-400 rounded-full h-9 p-2 flex w-[50%] items-center justify-center gap-x-4`}
+                          >
+                            <ImageNext
+                              src='/images/ICON_FLASH_SALE_WEBSITE_INDOTEKNIK.svg'
+                              width={17}
+                              height={10}
+                            />
+                            <span className='text-white text-lg font-semibold'>
+                              {product?.flashSale?.tag != 'false' || product?.flashSale?.tag
+                                ? product?.flashSale?.tag
+                                : 'FLASH SALE'}
+                            </span>
+                          </div>
+                          <div>
+                            <CountDown2 initialTime={product.flashSale.remainingTime} />
+                          </div>
                         </div>
                       </div>
                     </div>
-                  </div>
-                )}
+                  )}
                 <Image
                   src={product.image}
                   alt={product.name}
diff --git a/src/lib/product/components/Product/ProductMobile.jsx b/src/lib/product/components/Product/ProductMobile.jsx
index ffa75f72..402490f7 100644
--- a/src/lib/product/components/Product/ProductMobile.jsx
+++ b/src/lib/product/components/Product/ProductMobile.jsx
@@ -19,6 +19,7 @@ import { gtagAddToCart } from '@/core/utils/googleTag'
 import odooApi from '@/core/api/odooApi'
 import ImageNext from 'next/image'
 import CountDown2 from '@/core/components/elements/CountDown/CountDown2'
+import Breadcrumb from './Breadcrumb'
 
 const ProductMobile = ({ product, wishlist, toggleWishlist }) => {
   const router = useRouter()
@@ -160,6 +161,7 @@ const ProductMobile = ({ product, wishlist, toggleWishlist }) => {
 
   return (
     <MobileView>
+      <Breadcrumb productId={product.id} productName={product.name} />
       <div className='relative'>
         {product?.flashSale?.remainingTime > 0 && activeVariant?.price.discountPercentage > 0 && (
           <div className={`absolute bottom-0 w-full`}>
diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index df9aa91b..f6987051 100644
--- a/src/lib/product/components/ProductSearch.jsx
+++ b/src/lib/product/components/ProductSearch.jsx
@@ -117,7 +117,7 @@ const ProductSearch = ({ query, prefixUrl, defaultBrand = null }) => {
     <>
       <MobileView>
         {productSearch.isLoading && <ProductSearchSkeleton />}
-        <div className='p-4'>
+        <div className='p-4 pt-0'>
           <h1 className='mb-2 font-semibold text-h-sm'>Produk</h1>
 
           <div className='mb-2 leading-6 text-gray_r-11'>
@@ -178,7 +178,7 @@ const ProductSearch = ({ query, prefixUrl, defaultBrand = null }) => {
       </MobileView>
 
       <DesktopView>
-        <div className='container mx-auto mt-10 flex mb-3'>
+        <div className='container mx-auto flex mb-3'>
           <div className='w-3/12'>
             <ProductFilterDesktop
               brands={brands || []}
diff --git a/src/lib/promotinProgram/components/PromotionType.jsx b/src/lib/promotinProgram/components/PromotionType.jsx
index ad7185e3..51f2622a 100644
--- a/src/lib/promotinProgram/components/PromotionType.jsx
+++ b/src/lib/promotinProgram/components/PromotionType.jsx
@@ -24,7 +24,7 @@ const PromotionType = ({
     const id = variantId
     const listProgram = async () => {
       const programs = await getPromotionProgram({ id })
-      if (programs.length > 0) {
+      if (programs?.length > 0) {
         setPromotionList(programs)
         setActiveTitle(programs?.[0].type.value)
       }
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 5a2cc16003e1fbd6a31e24388f6471c9dd7e062d 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/lib/brand/components/Brand.jsx                 | 121 ++++++++++++---------
 .../product/components/Product/ProductDesktop.jsx  |   2 +-
 src/pages/shop/product/[slug].jsx                  |   7 +-
 3 files changed, 69 insertions(+), 61 deletions(-)

(limited to 'src')

diff --git a/src/lib/brand/components/Brand.jsx b/src/lib/brand/components/Brand.jsx
index 3985b888..4afbcb3e 100644
--- a/src/lib/brand/components/Brand.jsx
+++ b/src/lib/brand/components/Brand.jsx
@@ -6,10 +6,10 @@ import { Pagination, Autoplay } from 'swiper'
 import 'swiper/css'
 import 'swiper/css/pagination'
 import 'swiper/css/autoplay'
-import Divider from '@/core/components/elements/Divider/Divider'
-import ImageSkeleton from '@/core/components/elements/Skeleton/ImageSkeleton'
 import MobileView from '@/core/components/views/MobileView'
 import DesktopView from '@/core/components/views/DesktopView'
+import { Skeleton } from '@chakra-ui/react'
+import classNames from 'classnames'
 
 const swiperBanner = {
   pagination: { dynamicBullets: true },
@@ -28,65 +28,77 @@ const Brand = ({ id }) => {
       <MobileView>
         <>
           <div>
-            {brand.isLoading && <ImageSkeleton />}
-            {brand.data?.banners?.length == 0 && (
-              <Image
-                src='/images/default-banner-brand.jpg'
-                alt='Brand - Indoteknik'
-                width={1024}
-                height={512}
-                className='w-full h-auto'
-              />
-            )}
-            {brand.data && (
-              <>
-                <Swiper
-                  slidesPerView={1}
-                  pagination={swiperBanner.pagination}
-                  modules={swiperBanner.modules}
-                  autoplay={swiperBanner.autoplay}
-                  className='border-b border-gray_r-6'
-                >
-                  {brand.data?.banners?.map((banner, index) => (
-                    <SwiperSlide key={index}>
+            <Skeleton
+              isLoaded={!brand.isLoading}
+              aspectRatio='4/2'
+              className={classNames({
+                'mb-6': brand.isLoading
+              })}
+            >
+              {brand.data?.banners?.length == 0 && (
+                <Image
+                  src='/images/default-banner-brand.jpg'
+                  alt='Brand - Indoteknik'
+                  width={1024}
+                  height={512}
+                  className='w-full h-auto'
+                />
+              )}
+
+              {brand.data && (
+                <>
+                  <Swiper
+                    slidesPerView={1}
+                    pagination={swiperBanner.pagination}
+                    modules={swiperBanner.modules}
+                    autoplay={swiperBanner.autoplay}
+                    className='border-b border-gray_r-6'
+                  >
+                    {brand.data?.banners?.map((banner, index) => (
+                      <SwiperSlide key={index}>
+                        <Image
+                          src={banner}
+                          alt={`Brand ${brand.data?.name} - Indoteknik`}
+                          width={1024}
+                          height={512}
+                          className='w-full h-auto'
+                        />
+                      </SwiperSlide>
+                    ))}
+                  </Swiper>
+                  <div className='p-4'>
+                    <div className='text-caption-1 text-gray_r-11 mb-2'>Produk dari brand:</div>
+                    {brand?.data?.logo && (
                       <Image
-                        src={banner}
-                        alt={`Brand ${brand.data?.name} - Indoteknik`}
-                        width={1024}
-                        height={512}
-                        className='w-full h-auto'
+                        src={brand?.data?.logo}
+                        alt={brand?.data?.name}
+                        className='w-32 p-2 border borde-gray_r-6 rounded'
+                        width={256}
+                        height={128}
                       />
-                    </SwiperSlide>
-                  ))}
-                </Swiper>
-                <div className='p-4'>
-                  <div className='text-caption-1 text-gray_r-11 mb-2'>Produk dari brand:</div>
-                  {brand?.data?.logo && (
-                    <Image
-                      src={brand?.data?.logo}
-                      alt={brand?.data?.name}
-                      className='w-32 p-2 border borde-gray_r-6 rounded'
-                      width={256}
-                      height={128}
-                    />
-                  )}
-                  {!brand?.data?.logo && (
-                    <div className='bg-danger-500 text-white text-center text-caption-1 py-2 px-4 rounded w-fit'>
-                      {brand?.data?.name}
-                    </div>
-                  )}
-                </div>
-              </>
-            )}
+                    )}
+                    {!brand?.data?.logo && (
+                      <div className='bg-danger-500 text-white text-center text-caption-1 py-2 px-4 rounded w-fit'>
+                        {brand?.data?.name}
+                      </div>
+                    )}
+                  </div>
+                </>
+              )}
+            </Skeleton>
           </div>
-          <Divider />
         </>
       </MobileView>
 
       <DesktopView>
         <div className='container mx-auto'>
-          <div className='min-h-[150px]'>
-            {brand.isLoading && <ImageSkeleton />}
+          <Skeleton
+            isLoaded={!brand.isLoading}
+            aspectRatio='4/1'
+            className={classNames({
+              'mb-6': brand.isLoading
+            })}
+          >
             {brand.data?.banners?.length == 0 && (
               <Image
                 src='/images/default-banner-brand.jpg'
@@ -96,6 +108,7 @@ const Brand = ({ id }) => {
                 className='w-full h-auto'
               />
             )}
+
             {brand.data && (
               <>
                 <Swiper
@@ -137,7 +150,7 @@ const Brand = ({ id }) => {
                 </div>
               </>
             )}
-          </div>
+          </Skeleton>
         </div>
       </DesktopView>
     </>
diff --git a/src/lib/product/components/Product/ProductDesktop.jsx b/src/lib/product/components/Product/ProductDesktop.jsx
index ceb0cad7..855c9f75 100644
--- a/src/lib/product/components/Product/ProductDesktop.jsx
+++ b/src/lib/product/components/Product/ProductDesktop.jsx
@@ -393,7 +393,7 @@ const ProductDesktop = ({ products, wishlist, toggleWishlist }) => {
                   ))}
                 </div>
                 <div className='flex'>
-                  <div className='w-3/4 leading-7 product__description'>
+                  <div className='w-3/4 leading-8 product__description'>
                     <TabContent active={informationTab == 'description'}>
                       <span
                         dangerouslySetInnerHTML={{
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 3f849355048e5c280a35a5747577e5296b90e9fd Mon Sep 17 00:00:00 2001
From: Rafi Zadanly <zadanlyr@gmail.com>
Date: Thu, 25 Jan 2024 15:27:27 +0700
Subject: Add all promo page

---
 .../components/elements/Navbar/NavbarDesktop.jsx   | 18 +++++-----
 src/pages/shop/promo/index.jsx                     | 38 ++++++++++++++++++++++
 2 files changed, 47 insertions(+), 9 deletions(-)
 create mode 100644 src/pages/shop/promo/index.jsx

(limited to 'src')

diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx
index 9bcd4df2..2605acbb 100644
--- a/src/core/components/elements/Navbar/NavbarDesktop.jsx
+++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx
@@ -167,6 +167,14 @@ const NavbarDesktop = () => {
               </div>
             </button>
             <div className='w-6/12 flex px-1 divide-x divide-gray_r-6'>
+              <Link
+                href='/shop/promo'
+                className='p-4 flex-1 flex justify-center items-center !text-gray_r-12/80 hover:bg-gray_r-3 idt-transition'
+                target='_blank'
+                rel='noreferrer'
+              >
+                Semua Promo
+              </Link>
               <Link
                 href='/shop/brands'
                 className='p-4 flex-1 flex justify-center items-center !text-gray_r-12/80 hover:bg-gray_r-3 idt-transition'
@@ -189,15 +197,7 @@ const NavbarDesktop = () => {
                 target='_blank'
                 rel='noreferrer noopener'
               >
-                Blog Indoteknik
-              </Link>
-              <Link
-                href='/video'
-                className='p-4 flex-1 flex justify-center items-center !text-gray_r-12/80 hover:bg-gray_r-3 idt-transition'
-                target='_blank'
-                rel='noreferrer'
-              >
-                Indoteknik TV
+                Blog
               </Link>
             </div>
 
diff --git a/src/pages/shop/promo/index.jsx b/src/pages/shop/promo/index.jsx
new file mode 100644
index 00000000..0d831c21
--- /dev/null
+++ b/src/pages/shop/promo/index.jsx
@@ -0,0 +1,38 @@
+import BasicLayout from '@/core/components/layouts/BasicLayout';
+import { Breadcrumb, BreadcrumbItem, BreadcrumbLink } from '@chakra-ui/react';
+import Link from 'next/link';
+import Promo from '~/pages/shop/promo';
+
+import React from 'react';
+
+const PromoPage = () => {
+  return (
+    <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'>
+              Semua Promo
+            </BreadcrumbLink>
+          </BreadcrumbItem>
+        </Breadcrumb>
+
+        <div className='h-10' />
+
+        <Promo />
+      </div>
+    </BasicLayout>
+  );
+};
+
+export default PromoPage;
-- 
cgit v1.2.3


From 50425ea134852897bf125aae0f68a1642eb3b3b8 Mon Sep 17 00:00:00 2001
From: Rafi Zadanly <zadanlyr@gmail.com>
Date: Wed, 3 Apr 2024 10:31:14 +0700
Subject: Add voucher shipping feature

---
 src/lib/checkout/api/checkoutApi.js      |  34 ++---
 src/lib/checkout/api/getVoucher.js       |  37 ++---
 src/lib/checkout/components/Checkout.jsx | 224 ++++++++++++++++++++++++++-----
 3 files changed, 224 insertions(+), 71 deletions(-)

(limited to 'src')

diff --git a/src/lib/checkout/api/checkoutApi.js b/src/lib/checkout/api/checkoutApi.js
index 24f1868a..fd982fff 100644
--- a/src/lib/checkout/api/checkoutApi.js
+++ b/src/lib/checkout/api/checkoutApi.js
@@ -1,28 +1,20 @@
-import odooApi from '@/core/api/odooApi'
-import { getAuth } from '@/core/utils/auth'
+import odooApi from '@/core/api/odooApi';
+import { getAuth } from '@/core/utils/auth';
 
 export const checkoutApi = async ({ data }) => {
-  const auth = getAuth()
+  const auth = getAuth();
   const dataCheckout = await odooApi(
     'POST',
     `/api/v1/partner/${auth.partnerId}/sale_order/checkout`,
     data
-  )
-  return dataCheckout
-}
+  );
+  return dataCheckout;
+};
 
-export const getProductsCheckout = async (voucher, query) => {
-  const id = getAuth()?.id
-  let products 
-  if(voucher && query){
-    products = await odooApi('GET',`/api/v1/user/${id}/sale_order/checkout?voucher=${voucher}&source=buy`)
-  }else if (voucher){
-    products = await odooApi('GET',`/api/v1/user/${id}/sale_order/checkout?voucher=${voucher}`)
-  }else if (query) {
-    products = await odooApi('GET',`/api/v1/user/${id}/sale_order/checkout?source=buy`)
-  }else{
-    products = await odooApi('GET',`/api/v1/user/${id}/sale_order/checkout`)
-  }
-
-  return products
-}
+export const getProductsCheckout = async (query) => {
+  const queryParam = new URLSearchParams(query);
+  const userId = getAuth()?.id;
+  const url = `/api/v1/user/${userId}/sale_order/checkout?${queryParam.toString()}`;
+  const result = await odooApi('GET', url);
+  return result;
+};
diff --git a/src/lib/checkout/api/getVoucher.js b/src/lib/checkout/api/getVoucher.js
index 07cf376e..54c8cce5 100644
--- a/src/lib/checkout/api/getVoucher.js
+++ b/src/lib/checkout/api/getVoucher.js
@@ -1,21 +1,24 @@
-import odooApi from '@/core/api/odooApi'
+import odooApi from '@/core/api/odooApi';
 
-export  const getVoucher = async (id, source) => {
-  let dataVoucher = null
-  if(source){
-    dataVoucher = await odooApi('GET', `/api/v1/user/${id}/voucher?source=${source}`)
-  }else {
-    dataVoucher = await odooApi('GET', `/api/v1/user/${id}/voucher`)
-  }
-  return dataVoucher
-}
+export const getVoucher = async (id, query) => {
+  const queryParam = new URLSearchParams(query);
+  const url = `/api/v1/user/${id}/voucher?${queryParam.toString()}`;
+  const dataVoucher = await odooApi('GET', url);
+  return dataVoucher;
+};
 
 export const findVoucher = async (code, id, source) => {
-  let dataVoucher = null
-  if(source){
-    dataVoucher = await odooApi('GET', `/api/v1/user/${id}/voucher?code=${code}&source=${source}`)
-  }else{
-    dataVoucher = await odooApi('GET', `/api/v1/user/${id}/voucher?code=${code}`)
+  let dataVoucher = null;
+  if (source) {
+    dataVoucher = await odooApi(
+      'GET',
+      `/api/v1/user/${id}/voucher?code=${code}&source=${source}`
+    );
+  } else {
+    dataVoucher = await odooApi(
+      'GET',
+      `/api/v1/user/${id}/voucher?code=${code}`
+    );
   }
-  return dataVoucher
-}
+  return dataVoucher;
+};
diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index 52edbd05..042fc258 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -43,9 +43,16 @@ const Checkout = () => {
   const auth = useAuth();
 
   const [activeVoucher, SetActiveVoucher] = useState(null);
-
-  const { data: cartCheckout } = useQuery('cartCheckout-' + activeVoucher, () =>
-    getProductsCheckout(activeVoucher, query)
+  const [activeVoucherShipping, setActiveVoucherShipping] = useState(null);
+
+  const { data: cartCheckout } = useQuery(
+    ['cartCheckout', activeVoucher, activeVoucherShipping],
+    () =>
+      getProductsCheckout({
+        source: query,
+        voucher: activeVoucher,
+        voucher_shipping: activeVoucherShipping,
+      })
   );
 
   const [selectedAddress, setSelectedAddress] = useState({
@@ -103,6 +110,7 @@ const Checkout = () => {
   const [bottomPopupTnC, SetBottomPopupTnC] = useState(null);
   const [itemTnC, setItemTnC] = useState(null);
   const [listVouchers, SetListVoucher] = useState(null);
+  const [listVoucherShippings, SetListVoucherShipping] = useState(null);
   const [discountVoucher, SetDiscountVoucher] = useState(0);
   const [codeVoucher, SetCodeVoucher] = useState(null);
   const [findCodeVoucher, SetFindVoucher] = useState(null);
@@ -117,13 +125,23 @@ const Checkout = () => {
   const voucher = async () => {
     if (!listVouchers) {
       try {
-        let dataVoucher = await getVoucher(auth?.id, query);
+        setLoadingVoucher(true);
+        let dataVoucher = await getVoucher(auth?.id, {
+          source: query,
+        });
         SetListVoucher(dataVoucher);
+
+        let dataVoucherShipping = await getVoucher(auth?.id, {
+          source: query,
+          type: 'shipping',
+        });
+        SetListVoucherShipping(dataVoucherShipping);
       } finally {
         setLoadingVoucher(false);
       }
     }
   };
+
   const VoucherCode = async (code) => {
     let dataVoucher = await findVoucher(code, auth.id, query);
     if (dataVoucher.length <= 0) {
@@ -333,6 +351,7 @@ const Checkout = () => {
       estimated_arrival_days: splitDuration(etd),
       delivery_service_type: selectedExpedisiService,
       voucher: activeVoucher,
+      voucher_shipping: activeVoucherShipping,
       type: 'sale_order',
     };
 
@@ -419,6 +438,11 @@ const Checkout = () => {
     return false;
   }, [products]);
 
+  const voucherShippingAmt = cartCheckout?.discountVoucherShipping || 0;
+  const discShippingAmt = Math.min(biayaKirim, voucherShippingAmt);
+
+  const finalShippingAmt = biayaKirim - discShippingAmt;
+
   return (
     <>
       <BottomPopup
@@ -528,8 +552,145 @@ const Checkout = () => {
             </div>
           )}
 
-          <hr className='mt-10 my-4 border-gray_r-10' />
-          <div className=''>
+          <hr className='mt-8 mb-4 border-gray_r-8' />
+
+          {listVoucherShippings && listVoucherShippings?.length > 0 && (
+            <div>
+              <h3 className='font-semibold mb-4'>Promo Gratis Ongkir</h3>
+              {listVoucherShippings?.map((item) => (
+                <div key={item.id} className='relative'>
+                  <div
+                    className={`border border-solid mb-5 w-full hover:cursor-pointer  p-2 pl-4 pr-4 `}
+                  >
+                    {item.canApply && (
+                      <div
+                        class='p-2 mb-4 text-sm text-green-800 rounded-lg bg-green-50 dark:text-green-400'
+                        role='alert'
+                      >
+                        <p>
+                          Potensi potongan sebesar{' '}
+                          <span className='text-green font-bold'>
+                            {currencyFormat(item.discountVoucher)}
+                          </span>
+                        </p>
+                      </div>
+                    )}
+                    {!item.canApply && (
+                      <div
+                        class='p-2 mb-4 text-sm text-red-800 rounded-lg bg-red-50'
+                        role='alert'
+                        onClick={() => handlingTnC(item)}
+                      >
+                        <p>
+                          Voucher tidak bisa di gunakan,{' '}
+                          <span className='text-red font-bold'>
+                            Baca Selengkapnya !
+                          </span>
+                        </p>
+                      </div>
+                    )}
+
+                    <div className={`flex gap-x-3 relative`}>
+                      {item.canApply === false && (
+                        <div className='absolute w-full h-full bg-gray_r-3/40 top-0 left-0 z-50' />
+                      )}
+                      <div className='hidden md:w-[250px] md:block'>
+                        <Image
+                          src={item.image}
+                          alt={item.name}
+                          className={`object-cover`}
+                        />
+                      </div>
+                      <div className='w-full'>
+                        <div className='flex justify-between gap-x-2 mb-1 items-center'>
+                          <div className=''>
+                            <h3 className='font-semibold'>{item.name}</h3>
+                            <div className='mt-1'>
+                              <span className='text-sm line-clamp-3'>
+                                {item.description}{' '}
+                              </span>
+                            </div>
+                          </div>
+                          <div className='flex justify-end'>
+                            <label class='relative inline-flex items-center cursor-pointer'>
+                              <input
+                                type='checkbox'
+                                value=''
+                                class='sr-only peer'
+                                checked={activeVoucherShipping === item.code}
+                                onChange={() =>
+                                  setActiveVoucherShipping(
+                                    activeVoucherShipping === item.code
+                                      ? null
+                                      : item.code
+                                  )
+                                }
+                              />
+                              <div class="w-11 h-6 bg-gray-200 rounded-full peer dark:bg-gray-700 peer-focus:ring-4 peer-focus:ring-green-300 dark:peer-focus:ring-green-800 peer-checked:after:translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-0.5 after:left-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all dark:border-gray-600 peer-checked:bg-green-600"></div>
+                            </label>
+                          </div>
+                        </div>
+                        <hr className='mt-2 my-2 border-gray_r-8' />
+                        <div className='flex justify-between items-center'>
+                          <p className='text-justify text-sm md:text-xs'>
+                            Kode Voucher :{' '}
+                            <span className='text-red-500 font-semibold'>
+                              {item.code}
+                            </span>
+                          </p>
+                          <p className='text-sm md:text-xs'>
+                            {activeVoucher === item.code && (
+                              <span className=' text-green-600'>
+                                Voucher digunakan{' '}
+                              </span>
+                            )}
+                          </p>
+                        </div>
+                        <div className='flex items-center mt-3'>
+                          <svg
+                            aria-hidden='true'
+                            fill='none'
+                            stroke='currentColor'
+                            stroke-width='1.5'
+                            viewBox='0 0 24 24'
+                            className='w-5 text-black'
+                          >
+                            <path
+                              d='M12 6v6h4.5m4.5 0a9 9 0 11-18 0 9 9 0 0118 0z'
+                              stroke-linecap='round'
+                              stroke-linejoin='round'
+                            ></path>
+                          </svg>
+                          <div className='flex justify-between items-center'>
+                            <div className='text-left ml-3 text-sm '>
+                              Berakhir dalam{' '}
+                              <span className='text-red-600'>
+                                {item.remainingTime}
+                              </span>{' '}
+                              lagi,{' '}
+                            </div>
+                            <div
+                              className='text-sm ml-2 text-red-600'
+                              onClick={() => handlingTnC(item)}
+                            >
+                              Baca S&K
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                    <div className='mt-3'>
+                      <p className='text-justify text-sm '></p>
+                    </div>
+                  </div>
+                </div>
+              ))}
+            </div>
+          )}
+
+          <hr className='mt-8 mb-4 border-gray_r-8' />
+
+          <div>
             {!loadingVoucher && listVouchers?.length === 0 ? (
               <div className='flex items-center justify-center mt-4 mb-4'>
                 <div className='text-center'>
@@ -714,14 +875,7 @@ const Checkout = () => {
                       </div>
                     </div>
                     <div className='mt-3'>
-                      <p className='text-justify text-sm '>
-                        {/* {item.canApply === false
-                          ? 'Tambah ' +
-                            currencyFormat(item.differenceToApply) +
-                            ' untuk pakai promo ini'
-                          : 'Potensi potongan sebesar ' +
-                            currencyFormat(hitungDiscountVoucher(item.code))} */}
-                      </p>
+                      <p className='text-justify text-sm '></p>
                     </div>
                   </div>
                 </div>
@@ -887,14 +1041,18 @@ const Checkout = () => {
               </div>
               <div className='flex gap-x-2 justify-between'>
                 <div className='text-gray_r-11'>
-                  Biaya Kirim <p className='text-xs mt-3'>{etdFix}</p>
-                </div>
-                <div>
-                  {currencyFormat(
-                    Math.round(parseInt(biayaKirim * 1.1) / 1000) * 1000
-                  )}
+                  Biaya Kirim <p className='text-xs mt-1'>{etdFix}</p>
                 </div>
+                <div>{currencyFormat(biayaKirim)}</div>
               </div>
+              {activeVoucherShipping && voucherShippingAmt && (
+                <div className='flex gap-x-2 justify-between'>
+                  <div className='text-gray_r-11'>Diskon Kirim</div>
+                  <div className='text-danger-500'>
+                    - {currencyFormat(discShippingAmt)}
+                  </div>
+                </div>
+              )}
             </div>
           )}
 
@@ -913,10 +1071,7 @@ const Checkout = () => {
             <div className='flex gap-x-2 justify-between mb-4'>
               <div>Grand Total</div>
               <div className='font-semibold text-gray_r-12'>
-                {currencyFormat(
-                  cartCheckout?.grandTotal +
-                    Math.round(parseInt(biayaKirim * 1.1) / 1000) * 1000
-                )}
+                {currencyFormat(cartCheckout?.grandTotal + finalShippingAmt)}
               </div>
             </div>
           )}
@@ -926,7 +1081,7 @@ const Checkout = () => {
           <div className='mt-4 mb-4'>
             <button
               type='button'
-              onClick={() => {
+              onClick={async () => {
                 SetBottomPopup(true);
                 voucher();
               }}
@@ -1182,14 +1337,18 @@ const Checkout = () => {
                     <div className='flex gap-x-2 justify-between'>
                       <div className='text-gray_r-11'>
                         Biaya Kirim
-                        <p className='text-xs mt-3'>{etdFix}</p>
-                      </div>
-                      <div>
-                        {currencyFormat(
-                          Math.round(parseInt(biayaKirim * 1.1) / 1000) * 1000
-                        )}
+                        <p className='text-xs mt-1'>{etdFix}</p>
                       </div>
+                      <div>{currencyFormat(biayaKirim)}</div>
                     </div>
+                    {activeVoucherShipping && voucherShippingAmt && (
+                      <div className='flex gap-x-2 justify-between'>
+                        <div className='text-gray_r-11'>Diskon Kirim</div>
+                        <div className='text-danger-500'>
+                          - {currencyFormat(discShippingAmt)}
+                        </div>
+                      </div>
+                    )}
                   </div>
                 )}
 
@@ -1209,8 +1368,7 @@ const Checkout = () => {
                     <div>Grand Total</div>
                     <div className='font-semibold text-gray_r-12'>
                       {currencyFormat(
-                        cartCheckout?.grandTotal +
-                          Math.round(parseInt(biayaKirim * 1.1) / 1000) * 1000
+                        cartCheckout?.grandTotal + finalShippingAmt
                       )}
                     </div>
                   </div>
-- 
cgit v1.2.3


From 7b08c9358888148bf6f6c2c7145d75e466550298 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 21 Jun 2024 11:04:57 +0700
Subject: <iman> update after marge

---
 src/pages/shop/promo/index.tsx | 186 -----------------------------------------
 1 file changed, 186 deletions(-)
 delete mode 100644 src/pages/shop/promo/index.tsx

(limited to 'src')

diff --git a/src/pages/shop/promo/index.tsx b/src/pages/shop/promo/index.tsx
deleted file mode 100644
index 89e88e29..00000000
--- a/src/pages/shop/promo/index.tsx
+++ /dev/null
@@ -1,186 +0,0 @@
-import dynamic from 'next/dynamic'
-import { useEffect, useState } from 'react'
-import { useRouter } from 'next/router'
-import Seo from '../../../core/components/Seo.jsx'
-import Promocrumb from '../../../lib/promo/components/Promocrumb.jsx'
-import { fetchPromoItemsSolr } from '../../../api/promoApi.js'
-import LogoSpinner from '../../../core/components/elements/Spinner/LogoSpinner.jsx'
-import ProductPromoCard from '../../../../src-migrate/modules/product-promo/components/Card.tsx'
-import { IPromotion } from '../../../../src-migrate/types/promotion.ts'
-import React from 'react'
-import { SolrResponse } from "../../../../src-migrate/types/solr.ts";
-
-const BasicLayout = dynamic(() => import('../../../core/components/layouts/BasicLayout.jsx'))
-
-export default function Promo() {
-  const router = useRouter()
-  const { slug = '' } = router.query
-  const [promoItems, setPromoItems] = useState<any[]>([])
-  const [promoData, setPromoData] = useState<IPromotion[] | null>(null)
-  const [loading, setLoading] = useState(true)
-  const [currentPage, setCurrentPage] = useState(1)
-  const [fetchingData, setFetchingData] = useState(false)
-
-  useEffect(() => {
-    const loadPromo = async () => {
-      try {
-        const items = await fetchPromoItemsSolr(`*:*`)
-        console.log("slug sekarang ", slug)
-        
-        setPromoItems(items)
-        console.log("data dari promotion pakai SOLR", items)
-
-        if (items.length === 0) {
-          setPromoData([])
-          setLoading(false);
-          return;
-        }
-
-        const promoDataPromises = items.map(async (item) => {
-          const queryParams = new URLSearchParams({ q: `id:${item.id}` })
-          console.log("Constructed URL:", `/solr/promotion_program_lines/select?${queryParams.toString()}`)
-
-          try {
-            const response = await fetch(`/solr/promotion_program_lines/select?${queryParams.toString()}`)
-            console.log("respon data ", response)
-            if (!response.ok) {
-              throw new Error(`HTTP error! status: ${response.status}`)
-            }
-
-            const data: SolrResponse<any[]> = await response.json()
-            console.log("data promo IPromotion[]", data)
-            
-            const promotions = await map(data.response.docs)
-            return promotions;
-          } catch (fetchError) {
-            console.error("Error fetching promotion data:", fetchError)
-            return [];
-          }
-        });
-
-        const promoDataArray = await Promise.all(promoDataPromises);
-        const mergedPromoData = promoDataArray.reduce((accumulator, currentValue) => accumulator.concat(currentValue), []);
-        setPromoData(mergedPromoData);
-        setTimeout(() => setLoading(false), 120); // Menambahkan delay 200ms sebelum mengubah status loading
-      } catch (loadError) {
-        console.error("Error loading promo items:", loadError)
-        setLoading(false);
-      }
-    }
-
-    if (slug) {
-      loadPromo()
-    }
-  }, [slug])
-
-  const map = async (promotions: any[]): Promise<IPromotion[]> => {
-    const result: IPromotion[] = []
-  
-    for (const promotion of promotions) {
-      const data: IPromotion = {
-        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,
-        total_qty: promotion.total_qty_i,
-        products: JSON.parse(promotion.products_s),
-        free_products: JSON.parse(promotion.free_products_s),
-      }
-  
-      result.push(data)
-    }
-  
-    return result
-  }
-
-  console.log("data yg dikirim ke ProductPromoCard", promoData)
-  
-
-  useEffect(() => {
-    const handleScroll = () => {
-      if (
-        !fetchingData &&
-        window.innerHeight + document.documentElement.scrollTop >= 0.95 * document.documentElement.offsetHeight
-      ) {
-        // User has scrolled to 95% of page height
-        
-        setTimeout(() => setFetchingData(true), 120);
-        setCurrentPage((prevPage) => prevPage + 1)
-      }
-    }
-
-    window.addEventListener('scroll', handleScroll)
-    return () => window.removeEventListener('scroll', handleScroll)
-  }, [fetchingData])
-
-  useEffect(() => {
-    if (fetchingData) {
-      // Fetch more data
-      // You may need to adjust this logic according to your API
-      fetchMoreData()
-    }
-  }, [fetchingData])
-
-  const fetchMoreData = async () => {
-    try {
-      // Add a delay of approximately 150ms
-      setTimeout(async () => {
-        // Fetch more data
-        // Update promoData state with the new data
-      }, 150)
-    } catch (error) {
-      console.error('Error fetching more data:', error)
-    } finally {
-      setTimeout(() => setFetchingData(false), 120);
-      
-    }
-  }
-
-  const visiblePromotions = promoData?.slice(0, currentPage * 12)
-
-  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={capitalizeFirstLetter(Array.isArray(slug) ? slug[0] : slug)} />  */}
-      <div className='container mx-auto mt-1 flex mb-1'>
-        <div className=''>
-          <h1 className='font-semibold'>Semua Promo di Indoteknik</h1>
-        </div>
-      </div>
-      {loading ? (
-        <div className='container flex justify-center my-4'>
-          <LogoSpinner width={48} height={48} />
-        </div>
-      ) : promoData && promoItems.length >= 1 ? (
-        <>
-          <div className='flex flex-wrap justify-center'>
-            {visiblePromotions?.map((promotion) => (
-              <div key={promotion.id} className="min-w-[40px] max-w-[400px] mr-[20px] mb-[20px] sm:w-full md:w-1/2 lg:w-1/3 xl:w-1/4">
-                <ProductPromoCard promotion={promotion}  />
-              </div>
-            ))}
-          </div>
-          {fetchingData && (
-            <div className='container flex justify-center my-4'>
-              <LogoSpinner width={48} height={48} />
-            </div>
-          )}
-        </>
-      ) : (
-        <div className="text-center my-8">
-          <p>Belum ada promo pada kategori ini</p>
-        </div>
-      )}
-    </BasicLayout>
-  )
-}
-- 
cgit v1.2.3


From 3ada88f0faf901e05bd56ecff8c4bcb209c06787 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 21 Jun 2024 15:31:12 +0700
Subject: <iman> update all-promotion

---
 src/api/promoApi.js             | 7 ++++---
 src/pages/shop/promo/[slug].tsx | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/api/promoApi.js b/src/api/promoApi.js
index 4c386fba..95a27fd3 100644
--- a/src/api/promoApi.js
+++ b/src/api/promoApi.js
@@ -13,13 +13,14 @@ export const fetchPromoItems = async (type) => {
   }
 };
 
-export const fetchPromoItemsSolr = async (type) => {
+export const fetchPromoItemsSolr = async (type, start, rows) => {
   // let query = type ? `type_value_s:${type}` : '*:*';
-  let start = 0
-  let rows = 100
+  // let start = 0
+  // let rows = 10
   try {
     const queryParams = new URLSearchParams({ q: type });
     const response = await fetch(`/solr/promotion_program_lines/select?${queryParams.toString()}&rows=${rows}&start=${start}`);
+    console.log("URL",`/solr/promotion_program_lines/select?${queryParams.toString()}&rows=${rows}&start=${start}`)
     if (!response.ok) {
       throw new Error(`HTTP error! status: ${response.status}`);
     }
diff --git a/src/pages/shop/promo/[slug].tsx b/src/pages/shop/promo/[slug].tsx
index bd69c071..aaee1249 100644
--- a/src/pages/shop/promo/[slug].tsx
+++ b/src/pages/shop/promo/[slug].tsx
@@ -91,7 +91,7 @@ export default function PromoDetail() {
       setCurrentPage(pageNumber)
       
       try {
-        const items = await fetchPromoItemsSolr(`type_value_s:${Array.isArray(slug) ? slug[0] : slug}`);
+        const items = await fetchPromoItemsSolr(`type_value_s:${Array.isArray(slug) ? slug[0] : slug}`,0,100);
         setPromoItems(items);
         
         if (items.length === 0) {
@@ -147,16 +147,16 @@ export default function PromoDetail() {
                 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}`);  
+                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} `); 
+                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}`);
+                const response = await fetchPromoItemsSolr(`id:${item.id}`,0,100);
                 return response;
               }
             } catch (fetchError) {
-- 
cgit v1.2.3


From 7afd73bde637528e9427124b6e9842a026f823f6 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 21 Jun 2024 16:46:24 +0700
Subject: <iman> remove console log

---
 src/api/promoApi.js                                 | 1 -
 src/lib/product/components/ProductFilterDesktop.jsx | 1 -
 src/lib/product/components/ProductSearch.jsx        | 2 --
 3 files changed, 4 deletions(-)

(limited to 'src')

diff --git a/src/api/promoApi.js b/src/api/promoApi.js
index 95a27fd3..2c7f80a1 100644
--- a/src/api/promoApi.js
+++ b/src/api/promoApi.js
@@ -20,7 +20,6 @@ export const fetchPromoItemsSolr = async (type, start, rows) => {
   try {
     const queryParams = new URLSearchParams({ q: type });
     const response = await fetch(`/solr/promotion_program_lines/select?${queryParams.toString()}&rows=${rows}&start=${start}`);
-    console.log("URL",`/solr/promotion_program_lines/select?${queryParams.toString()}&rows=${rows}&start=${start}`)
     if (!response.ok) {
       throw new Error(`HTTP error! status: ${response.status}`);
     }
diff --git a/src/lib/product/components/ProductFilterDesktop.jsx b/src/lib/product/components/ProductFilterDesktop.jsx
index b4afebc2..b9be7c15 100644
--- a/src/lib/product/components/ProductFilterDesktop.jsx
+++ b/src/lib/product/components/ProductFilterDesktop.jsx
@@ -21,7 +21,6 @@ import Image from '@/core/components/elements/Image/Image'
 import { formatCurrency } from '@/core/utils/formatValue'
 
 const ProductFilterDesktop = ({ brands, categories, prefixUrl, defaultBrand = null }) => {
-  console.log("prefixUrl",prefixUrl)
   const router = useRouter()
   const { query } = router
   const [order, setOrder] = useState(query?.orderBy)
diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index ec0077c2..08b64c13 100644
--- a/src/lib/product/components/ProductSearch.jsx
+++ b/src/lib/product/components/ProductSearch.jsx
@@ -130,7 +130,6 @@ const ProductSearch = ({
       brands.push({ brand, qty });
     }
   }
-  console.log("daftar brand",brands)
 
   const categories = [];
   for (
@@ -145,7 +144,6 @@ const ProductSearch = ({
       categories.push({ name, qty });
     }
   }
-  console.log("daftar kategori",categories)
 
   const orderOptions = [
     { value: 'price-asc', label: 'Harga Terendah' },
-- 
cgit v1.2.3


From 8456bd17207e349c717d062fcc6fe4d032da1334 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Sat, 22 Jun 2024 12:39:22 +0700
Subject: <iman> update bagian footer untuk penawaran(baru tampilan saja) all
 promotion

---
 .../components/elements/Footer/BasicFooter.jsx     |   3 +
 src/core/components/elements/Footer/PromoOffer.tsx | 112 +++++++++++++++++++++
 .../elements/Footer/style/promoOffer.module.css    |  39 +++++++
 3 files changed, 154 insertions(+)
 create mode 100644 src/core/components/elements/Footer/PromoOffer.tsx
 create mode 100644 src/core/components/elements/Footer/style/promoOffer.module.css

(limited to 'src')

diff --git a/src/core/components/elements/Footer/BasicFooter.jsx b/src/core/components/elements/Footer/BasicFooter.jsx
index 6129143d..e1f95d6b 100644
--- a/src/core/components/elements/Footer/BasicFooter.jsx
+++ b/src/core/components/elements/Footer/BasicFooter.jsx
@@ -9,12 +9,14 @@ import Link from '../Link/Link';
 import MobileView from '../../views/MobileView';
 import DesktopView from '../../views/DesktopView';
 import whatsappUrl from '@/core/utils/whatsappUrl';
+import PromoOffer from '../Footer/PromoOffer'
 
 const BasicFooter = () => {
   return (
     <>
       <MobileView>
         <footer className='flex flex-wrap p-4 bg-gray_r-3 text-caption-1'>
+          <PromoOffer/>
           <div className='w-1/2 flex flex-col gap-y-8 pr-2'>
             <div>
               <NextImage
@@ -54,6 +56,7 @@ const BasicFooter = () => {
 
       <DesktopView>
         <footer className='bg-gray_r-3 py-6'>
+          <PromoOffer/>
           <div className='container mx-auto flex flex-wrap justify-between'>
             <div className='w-4/12'>
               <NextImage
diff --git a/src/core/components/elements/Footer/PromoOffer.tsx b/src/core/components/elements/Footer/PromoOffer.tsx
new file mode 100644
index 00000000..a5432b6a
--- /dev/null
+++ b/src/core/components/elements/Footer/PromoOffer.tsx
@@ -0,0 +1,112 @@
+
+import React from "react";
+// import { useGeneralSetting } from "@/common/state-management/general-setting";
+import { FormEvent, useEffect, useState } from "react";
+import toast from "react-hot-toast";
+import style from "../Footer/style/promoOffer.module.css"
+const PromoOffer = ()=>{
+    // const { data, isLoading, fetchData } = useGeneralSetting();
+    const [formData, setFormData] = useState<FormData>({
+        email: "",
+        name: "",
+        telephone: "",
+        message: "",
+      });
+
+      useEffect(() => {
+        // fetchData();
+      }, []);
+
+      type FormData = {
+        email: string;
+        name: string;
+        telephone: string;
+        message: string;
+      };
+
+      const [errors, setErrors] = useState({
+        email: false,
+        name: false,
+        message: false,
+      });
+
+
+const handleGetOffer = async (e: FormEvent) => {
+    e.preventDefault();
+    let loadingToast;
+    try {
+      loadingToast = toast.loading("Mengirimkan formulir...");
+      const response = await fetch("/api/contactus", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({ ...formData, from: "newsletter" }),
+      });
+  
+      if (response.ok) {
+        toast.dismiss(loadingToast);
+        toast.success("Terima kasih telah menghubungi kami");
+        setFormData({
+          email: "",
+          name: "",
+          telephone: "",
+          message: "",
+        });
+      } else {
+        toast.dismiss(loadingToast);
+        toast.error("Gagal mengirimkan formulir. Silakan coba lagi nanti.");
+      }
+    } catch (error) {
+      toast.dismiss(loadingToast);
+      console.error("Gagal mengirimkan formulir", error);
+      toast.error("Terjadi kesalahan. Silakan coba lagi nanti.");
+    }
+  };
+
+  
+
+
+    return(
+        <div className=" py-3 mb-3">
+              <div className="md:flex container mx-auto md:justify-between md:items-center md:gap-x-20">
+                <div className="">
+                  <span className="text-black font-semibold text-sm md:text-lg">
+                    Dapatkan Promo Menarik Setiap Bulan{" "}
+                  </span>
+                  <p>
+                    Promo produk dengan penawaran terbatas setiap bulannya!
+                  </p>
+                </div>
+                <div className=" flex-1 flex items-center h-full  justify-end text-sm text-slate-950">
+                <form  onSubmit={handleGetOffer} className={style['form-input']}>
+                    <div className="flex justify-start  w-full">
+                        <div className="flex justify-end">
+                            <input  
+                                type="email"
+                                value={formData.email}
+                                onChange={(e) =>
+                                    setFormData({ ...formData, email: e.target.value })
+                                }
+                                className={style['input']}
+                                placeholder="Masukkan email anda disini"
+                            />
+                            <button
+                                type="submit"
+                                className={style['button']}
+                            >
+                                Dapatkan
+                            </button>
+                        </div>
+                        
+
+                    </div>
+                  </form>
+
+                </div>
+              </div>
+          </div>
+    )
+  };
+
+  export default PromoOffer;
diff --git a/src/core/components/elements/Footer/style/promoOffer.module.css b/src/core/components/elements/Footer/style/promoOffer.module.css
new file mode 100644
index 00000000..3184182d
--- /dev/null
+++ b/src/core/components/elements/Footer/style/promoOffer.module.css
@@ -0,0 +1,39 @@
+.form-input {
+    @apply 
+    h-full
+    w-[514px] 
+    text-slate-950 
+    flex
+    justify-center;
+}
+
+.input{
+    @apply w-[320px] 
+    sm:w-[320px]
+    md:w-[500px]
+    xl:w-[514px]
+    lg:w-[514px]
+    2xl:w-[514px]
+    text-black 
+    py-2
+    h-11
+    md:py-3 
+    px-4 
+    bg-[#FDF1C7]
+    rounded-3xl
+    focus:outline-none
+    ;
+}
+
+.button{
+    @apply bg-[#FAD147] 
+    absolute
+    py-1.5 
+    rounded-3xl
+    text-black 
+    md:py-2.5 
+    px-4
+    h-11
+    z-0
+    ;
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 138206777970e2a2659d4de0a1a9722038851a14 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Sat, 22 Jun 2024 12:40:16 +0700
Subject: <iman> update bagian navbar dan judul halaman all promotion

---
 src/core/components/elements/Navbar/NavbarDesktop.jsx | 5 ++++-
 src/pages/shop/promo/index.jsx                        | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx
index 8cb4239c..e73a35ee 100644
--- a/src/core/components/elements/Navbar/NavbarDesktop.jsx
+++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx
@@ -172,7 +172,10 @@ const NavbarDesktop = () => {
             <div className='w-6/12 flex px-1 divide-x divide-gray_r-6'>
               <Link
                 href='/shop/promo'
-                className='p-4 flex-1 flex justify-center items-center !text-gray_r-12/80 hover:bg-gray_r-3 idt-transition'
+                className={`${
+                  router.asPath === '/shop/promo' && 'bg-gray_r-3'
+                } p-4 flex-1 flex justify-center items-center !text-gray_r-12/80 hover:bg-gray_r-3 idt-transition`}
+                // className='p-4 flex-1 flex justify-center items-center !text-gray_r-12/80 hover:bg-gray_r-3 idt-transition'
                 target='_blank'
                 rel='noreferrer'
               >
diff --git a/src/pages/shop/promo/index.jsx b/src/pages/shop/promo/index.jsx
index 0d831c21..442da742 100644
--- a/src/pages/shop/promo/index.jsx
+++ b/src/pages/shop/promo/index.jsx
@@ -1,3 +1,4 @@
+import Seo from '@/core/components/Seo'
 import BasicLayout from '@/core/components/layouts/BasicLayout';
 import { Breadcrumb, BreadcrumbItem, BreadcrumbLink } from '@chakra-ui/react';
 import Link from 'next/link';
@@ -8,6 +9,7 @@ import React from 'react';
 const PromoPage = () => {
   return (
     <BasicLayout>
+      <Seo title='Promo Indoteknik.com' />
       <div className='container mx-auto py-4 md:py-6 pb-0'>
         <Breadcrumb>
           <BreadcrumbItem>
-- 
cgit v1.2.3


From 01bea5fe1b68fee2d673274b44295db6fc665e29 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 24 Jun 2024 14:36:56 +0700
Subject: <iman> ubah button lihat semua

---
 src/lib/home/components/PromotionProgram.jsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/lib/home/components/PromotionProgram.jsx b/src/lib/home/components/PromotionProgram.jsx
index 98bc7c7f..66216d19 100644
--- a/src/lib/home/components/PromotionProgram.jsx
+++ b/src/lib/home/components/PromotionProgram.jsx
@@ -12,9 +12,7 @@ const BannerSection = () => {
       <div className='flex justify-between items-center mb-4 '>
         <div className='font-semibold sm:text-h-lg'>Promo Tersedia</div>
         {isDesktop && (
-          <Link href='/shop/promo'
-          className="rounded-md bg-[#FAD147]  px-3.5 py-2.5 text-sm font-semibold text-neutral-950 shadow-sm hover:bg-yellow-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-yellow-600"
-        >
+          <Link href='/shop/promo' className='!text-red-500 font-semibold'>
           Lihat Semua
         </Link>
         )}
-- 
cgit v1.2.3


From eec3440fe52db85b325c600fdd393590dee906fe Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 26 Jun 2024 15:30:48 +0700
Subject: <iman> update all promotion

---
 src/core/components/elements/Footer/BasicFooter.jsx | 3 ---
 src/pages/shop/promo/index.jsx                      | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/core/components/elements/Footer/BasicFooter.jsx b/src/core/components/elements/Footer/BasicFooter.jsx
index e1f95d6b..6129143d 100644
--- a/src/core/components/elements/Footer/BasicFooter.jsx
+++ b/src/core/components/elements/Footer/BasicFooter.jsx
@@ -9,14 +9,12 @@ import Link from '../Link/Link';
 import MobileView from '../../views/MobileView';
 import DesktopView from '../../views/DesktopView';
 import whatsappUrl from '@/core/utils/whatsappUrl';
-import PromoOffer from '../Footer/PromoOffer'
 
 const BasicFooter = () => {
   return (
     <>
       <MobileView>
         <footer className='flex flex-wrap p-4 bg-gray_r-3 text-caption-1'>
-          <PromoOffer/>
           <div className='w-1/2 flex flex-col gap-y-8 pr-2'>
             <div>
               <NextImage
@@ -56,7 +54,6 @@ const BasicFooter = () => {
 
       <DesktopView>
         <footer className='bg-gray_r-3 py-6'>
-          <PromoOffer/>
           <div className='container mx-auto flex flex-wrap justify-between'>
             <div className='w-4/12'>
               <NextImage
diff --git a/src/pages/shop/promo/index.jsx b/src/pages/shop/promo/index.jsx
index 442da742..01a11aad 100644
--- a/src/pages/shop/promo/index.jsx
+++ b/src/pages/shop/promo/index.jsx
@@ -24,7 +24,7 @@ const PromoPage = () => {
 
           <BreadcrumbItem isCurrentPage>
             <BreadcrumbLink className='whitespace-nowrap'>
-              Semua Promo
+              Promo
             </BreadcrumbLink>
           </BreadcrumbItem>
         </Breadcrumb>
-- 
cgit v1.2.3


From 367bf6f382392774680abcf4a5ca4b4d03915650 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 8 Jul 2024 14:31:45 +0700
Subject: <iman> update mobile view

---
 src/core/components/elements/Sidebar/Sidebar.jsx | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/core/components/elements/Sidebar/Sidebar.jsx b/src/core/components/elements/Sidebar/Sidebar.jsx
index 38fcdef8..cde68515 100644
--- a/src/core/components/elements/Sidebar/Sidebar.jsx
+++ b/src/core/components/elements/Sidebar/Sidebar.jsx
@@ -117,6 +117,9 @@ const Sidebar = ({ active, close }) => {
                     </>
                   )}
                 </div>
+                <SidebarLink className={itemClassName} href='/shop/promo'>
+                  Semua Promo
+                </SidebarLink>
                 <SidebarLink className={itemClassName} href='/shop/brands'>
                   Semua Brand
                 </SidebarLink>
-- 
cgit v1.2.3


From dc204e9cdbcf7faf81dba825db608be2c918589d Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 9 Jul 2024 16:31:30 +0700
Subject: <iman? add button reject & logic

---
 src/lib/transaction/api/rejectProductApi.js    |   9 +++
 src/lib/transaction/components/Transaction.jsx |  92 ++++++++++++++++++++-
 src/lib/variant/components/VariantCard.jsx     | 107 ++++++++++++++++++++++---
 3 files changed, 195 insertions(+), 13 deletions(-)
 create mode 100644 src/lib/transaction/api/rejectProductApi.js

(limited to 'src')

diff --git a/src/lib/transaction/api/rejectProductApi.js b/src/lib/transaction/api/rejectProductApi.js
new file mode 100644
index 00000000..e03c7975
--- /dev/null
+++ b/src/lib/transaction/api/rejectProductApi.js
@@ -0,0 +1,9 @@
+import odooApi from '@/core/api/odooApi'
+
+const rejectProductApi = async ({ idSo, idProduct, reason }) => {
+  const dataCheckout = await odooApi('POST', `/api/v1/sale_order/${idSo}/reject/${idProduct}`, {
+    reason_reject: reason
+  });
+  return dataCheckout
+}
+export default rejectProductApi
\ No newline at end of file
diff --git a/src/lib/transaction/components/Transaction.jsx b/src/lib/transaction/components/Transaction.jsx
index 9b11f5bb..03c94ded 100644
--- a/src/lib/transaction/components/Transaction.jsx
+++ b/src/lib/transaction/components/Transaction.jsx
@@ -33,13 +33,17 @@ import useAuth from '@/core/hooks/useAuth';
 import StepApproval from './stepper';
 import aprpoveApi from '../api/approveApi';
 import rejectApi from '../api/rejectApi';
+import rejectProductApi from '../api/rejectProductApi';
+import { useRouter } from 'next/router';
 
 const Transaction = ({ id }) => {
+  const router = useRouter()
+  const [isModalOpen, setIsModalOpen] = useState(false);
+  const [selectedProduct, setSelectedProduct] = useState(null);
+  const [reason, setReason] = useState('');
   const auth = useAuth();
   const { transaction } = useTransaction({ id });
-  
   const statusApprovalWeb = transaction.data?.approvalStep
-
   const { queryAirwayBill } = useAirwayBill({ orderId: id });
   const [airwayBillPopup, setAirwayBillPopup] = useState(null);
 
@@ -151,6 +155,38 @@ const Transaction = ({ id }) => {
     setIdAWB(null);
   };
 
+  const openModal = (product) => {
+    setSelectedProduct(product);
+    setIsModalOpen(true);
+  };
+
+  const closeModal = () => {
+    setIsModalOpen(false);
+    setSelectedProduct(null);
+    setReason('');
+  };
+
+  const handleRejectProduct = async () => {
+    try{
+      if (!reason.trim()) {
+        toast.error('Masukkan alasan terlebih dahulu');
+        return;
+      }else{
+        let idSo = transaction?.data.id
+        let idProduct = selectedProduct?.id
+        await rejectProductApi({ idSo, idProduct, reason}); 
+        closeModal();
+        toast.success("Produk berhasil di reaject")
+        setTimeout(() => {
+          window.location.reload();
+        }, 1500); 
+      }
+    }catch(error){
+      toast.error('Gagal reject produk. Silakan coba lagi.');
+    }
+  };
+
+
   return (
     transaction.data?.name && (
       <>
@@ -566,6 +602,7 @@ const Transaction = ({ id }) => {
                     <th>Jumlah</th>
                     <th>Harga</th>
                     <th>Subtotal</th>
+                    <th></th>
                   </tr>
                 </thead>
                 <tbody>
@@ -620,10 +657,61 @@ const Transaction = ({ id }) => {
                         <div>{currencyFormat(product.price.priceDiscount)}</div>
                       </td>
                       <td>{currencyFormat(product.price.subtotal)}</td>
+                      {/* {auth?.feature.soApproval && (auth.webRole == 2 || auth.webRole == 3) && (transaction.data.isReaject == false) && ( */}
+                      {auth?.feature.soApproval && (auth.webRole == 2 || auth.webRole == 3) && (router.asPath.includes("/my/quotations/"))  && (
+                        <td>
+                          <button
+                            className="bg-red-500 text-white py-1 px-3 rounded"
+                            onClick={() => openModal(product)}
+                          >
+                            Reject
+                          </button>
+                        </td>
+                      )}
+                      {/* {transaction.data.isReaject && (
+                        <td>
+                          <button
+                            className="bg-gray-400 text-white py-1 px-3 rounded"
+                            onClick={() => openModal(product)}
+                            disabled
+                          >
+                            Direject
+                          </button>
+                        </td>
+                      )} */}
                     </tr>
                   ))}
                 </tbody>
               </table>
+              {isModalOpen && (
+                <div className='fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center'>
+                  <div className='bg-white p-4 rounded w-96
+                     ease-in-out opacity-100
+                    transform transition-transform duration-300  scale-100'>
+                    <h2 className='text-lg mb-2'>Berikan Alasan</h2>
+                    <textarea
+                      value={reason}
+                      onChange={(e) => setReason(e.target.value)}
+                      className='w-full p-2 border rounded'
+                      rows='4'
+                    ></textarea>
+                    <div className='mt-4 flex justify-end'>
+                      <button
+                        className='bg-gray-300 text-black py-1 px-3 rounded mr-2'
+                        onClick={closeModal}
+                      >
+                        Batal
+                      </button>
+                      <button
+                        className='bg-red-500 text-white py-1 px-3 rounded'
+                        onClick={handleRejectProduct}
+                      >
+                        Reject
+                      </button>
+                    </div>
+                  </div>
+                </div>
+              )}
 
               <div className='flex justify-end mt-4'>
                 <div className='w-1/4 grid grid-cols-2 gap-y-3 text-gray_r-12/80'>
diff --git a/src/lib/variant/components/VariantCard.jsx b/src/lib/variant/components/VariantCard.jsx
index 9f1b5733..c629c987 100644
--- a/src/lib/variant/components/VariantCard.jsx
+++ b/src/lib/variant/components/VariantCard.jsx
@@ -1,16 +1,25 @@
 import { useRouter } from 'next/router'
 import { toast } from 'react-hot-toast'
-
+import useAuth from '@/core/hooks/useAuth';
 import Image from '@/core/components/elements/Image/Image'
 import Link from '@/core/components/elements/Link/Link'
 import { createSlug } from '@/core/utils/slug'
 import currencyFormat from '@/core/utils/currencyFormat'
 import { updateItemCart } from '@/core/utils/cart'
 import whatsappUrl from '@/core/utils/whatsappUrl'
+import {useState } from 'react';
+import rejectProductApi from '../../../lib/transaction/api/rejectProductApi'
+// import {useTransaction} from 'C:\Users\Indoteknik\next-indoteknik\src\lib\transaction\hooks\useTransaction.js'
+import useTransaction from '../../../lib/transaction/hooks/useTransaction';
 
 const VariantCard = ({ product, openOnClick = true, buyMore = false }) => {
   const router = useRouter()
-
+  const id = router.query.id
+  const auth = useAuth();
+  const { transaction } = useTransaction({id});
+  const [isModalOpen, setIsModalOpen] = useState(false);
+  const [selectedProduct, setSelectedProduct] = useState(null);
+  const [reason, setReason] = useState('');
   const addItemToCart = () => {
     toast.success('Berhasil menambahkan ke keranjang', { duration: 1500 })
     updateItemCart({
@@ -19,11 +28,42 @@ const VariantCard = ({ product, openOnClick = true, buyMore = false }) => {
     })
     return
   }
-
+  
   const checkoutItem = () => {
     router.push(`/shop/checkout?product_id=${product.id}&qty=${product.quantity}`)
   }
-
+  
+  const openModal = (product) => {
+    setSelectedProduct(product);
+    setIsModalOpen(true);
+  };
+  
+  const closeModal = () => {
+    setIsModalOpen(false);
+    setSelectedProduct(null);
+    setReason('');
+  };
+  
+  const handleRejectProduct = async () => {
+    try {
+      if (!reason.trim()) {
+        toast.error('Masukkan alasan terlebih dahulu');
+        return;
+      }else{
+        let idSo = transaction?.data.id
+        let idProduct = selectedProduct.id
+        await rejectProductApi({ idSo, idProduct, reason}); 
+        closeModal();
+        toast.success("Produk berhasil di reject")
+        setTimeout(() => {
+          window.location.reload();
+        }, 1500);
+      }
+    } catch (error) {
+      toast.error('Gagal reject produk. Silakan coba lagi.');
+    }
+  };
+  
   const Card = () => (
     <div className='flex gap-x-3'>
       <div className='w-4/12 flex items-center gap-x-2'>
@@ -91,14 +131,59 @@ const VariantCard = ({ product, openOnClick = true, buyMore = false }) => {
             >
               Tambah Keranjang
             </button>
-            <button
-              type='button'
-              onClick={checkoutItem}
-              className='btn-solid-red py-2 px-3 text-caption-1'
-            >
-              Beli Lagi
-            </button>
+            {/* {auth?.feature.soApproval && (auth.webRole == 2 || auth.webRole == 3) && (transaction.data.isReaject == false) && ( */}
+            {auth?.feature.soApproval && (auth.webRole == 2 || auth.webRole == 3) && (router.asPath.includes("/my/quotations/")) && (
+                      
+                          <button
+                            className="bg-red-500 text-white py-1 px-3 rounded"
+                            onClick={() => openModal(product)}
+                          >
+                            Reject
+                          </button>
+                      
+                      )}
+                      {/* {transaction.data.isReaject && (
+                  
+                          <button
+                            className="bg-gray-400 text-white py-1 px-3 rounded"
+                            onClick={() => openModal(product)}
+                            disabled
+                          >
+                            Direject
+                          </button>
+                     
+                      )} */}
+                      {isModalOpen && (
+                        <div className='fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center'>
+                          <div className='bg-white p-4 rounded w-96
+                            ease-in-out opacity-100
+                            transform transition-transform duration-300  scale-100'>
+                            <h2 className='text-lg mb-2'>Berikan Alasan</h2>
+                            <textarea
+                              value={reason}
+                              onChange={(e) => setReason(e.target.value)}
+                              className='w-full p-2 border rounded'
+                              rows='4'
+                            ></textarea>
+                            <div className='mt-4 flex justify-end'>
+                              <button
+                                className='bg-gray-300 text-black py-1 px-3 rounded mr-2'
+                                onClick={closeModal}
+                              >
+                                Batal
+                              </button>
+                              <button
+                                className='bg-red-500 text-white py-1 px-3 rounded'
+                                onClick={handleRejectProduct}
+                              >
+                                Reject
+                              </button>
+                            </div>
+                          </div>
+                        </div>
+                      )}
           </div>
+          
         )}
       </>
     )
-- 
cgit v1.2.3


From e3d0de0ba20eee9d53e95c5525907b099d2b5b04 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 10 Jul 2024 14:20:29 +0700
Subject: <iman> update reaject button & component position

---
 src/lib/transaction/components/Transaction.jsx | 316 ++++++++++++++++---------
 src/lib/variant/components/VariantCard.jsx     |  31 +--
 2 files changed, 217 insertions(+), 130 deletions(-)

(limited to 'src')

diff --git a/src/lib/transaction/components/Transaction.jsx b/src/lib/transaction/components/Transaction.jsx
index 03c94ded..8e7cede0 100644
--- a/src/lib/transaction/components/Transaction.jsx
+++ b/src/lib/transaction/components/Transaction.jsx
@@ -143,6 +143,15 @@ const Transaction = ({ id }) => {
     [transaction.data]
   );
 
+  const memoizeVariantGroupCardReject = useMemo(
+    () => (
+      <div className='p-4 pt-0 flex flex-col gap-y-3'>
+        <VariantGroupCard variants={transaction.data?.productsRejectLine} buyMore />
+      </div>
+    ),
+    [transaction.data]
+  );
+
   if (transaction.isLoading) {
     return (
       <div className='flex justify-center my-6'>
@@ -176,7 +185,7 @@ const Transaction = ({ id }) => {
         let idProduct = selectedProduct?.id
         await rejectProductApi({ idSo, idProduct, reason}); 
         closeModal();
-        toast.success("Produk berhasil di reaject")
+        toast.success("Produk berhasil di reject")
         setTimeout(() => {
           window.location.reload();
         }, 1500); 
@@ -329,6 +338,37 @@ const Transaction = ({ id }) => {
 
           <Divider />
 
+          <div className='p-4'>
+            <p className='font-medium'>Invoice</p>
+            <div className='flex flex-col gap-y-3 mt-4'>
+              {transaction.data?.invoices?.map((invoice, index) => (
+                <Link href={`/my/invoices/${invoice.id}`} key={index}>
+                  <div className='shadow rounded-md p-4 text-gray_r-12 font-normal flex justify-between'>
+                    <div>
+                      <p className='mb-2'>{invoice?.name}</p>
+                      <div className='flex items-center gap-x-1'>
+                        {invoice.amountResidual > 0 ? (
+                          <div className='badge-red'>Belum Lunas</div>
+                        ) : (
+                          <div className='badge-green'>Lunas</div>
+                        )}
+                        <p className='text-caption-2 text-gray_r-11'>
+                          {currencyFormat(invoice.amountTotal)}
+                        </p>
+                      </div>
+                    </div>
+                    <ChevronRightIcon className='w-5 stroke-2' />
+                  </div>
+                </Link>
+              ))}
+              {transaction.data?.invoices?.length === 0 && (
+                <div className='badge-red text-sm px-2'>Belum ada invoice</div>
+              )}
+            </div>
+          </div>
+
+          <Divider />
+
           {!auth?.feature.soApproval && (
             <div className='p-4 flex flex-col gap-y-4'>
               <DescriptionRow label='Purchase Order'>
@@ -354,8 +394,20 @@ const Transaction = ({ id }) => {
           <Divider />
 
           <div className='font-medium p-4'>Detail Produk</div>
+          {transaction?.data?.products.length > 0? (
+            <div>
+              {memoizeVariantGroupCard}
+            </div>
+          ) : (
+            <div className='badge-red text-sm px-2 ml-4'>Semua produk telah di reject</div>
+            )}
 
-          {memoizeVariantGroupCard}
+          {transaction?.data?.productsRejectLine.length > 0 && (
+            <div>
+              <div className='font-medium p-4'>Detail Produk Reject</div>
+              {memoizeVariantGroupCardReject}
+            </div>
+          )}
 
           <Divider />
 
@@ -363,37 +415,6 @@ const Transaction = ({ id }) => {
 
           <Divider />
 
-          <div className='p-4'>
-            <p className='font-medium'>Invoice</p>
-            <div className='flex flex-col gap-y-3 mt-4'>
-              {transaction.data?.invoices?.map((invoice, index) => (
-                <Link href={`/my/invoices/${invoice.id}`} key={index}>
-                  <div className='shadow rounded-md p-4 text-gray_r-12 font-normal flex justify-between'>
-                    <div>
-                      <p className='mb-2'>{invoice?.name}</p>
-                      <div className='flex items-center gap-x-1'>
-                        {invoice.amountResidual > 0 ? (
-                          <div className='badge-red'>Belum Lunas</div>
-                        ) : (
-                          <div className='badge-green'>Lunas</div>
-                        )}
-                        <p className='text-caption-2 text-gray_r-11'>
-                          {currencyFormat(invoice.amountTotal)}
-                        </p>
-                      </div>
-                    </div>
-                    <ChevronRightIcon className='w-5 stroke-2' />
-                  </div>
-                </Link>
-              ))}
-              {transaction.data?.invoices?.length === 0 && (
-                <div className='badge-red text-sm px-2'>Belum ada invoice</div>
-              )}
-            </div>
-          </div>
-
-          <Divider />
-
           <div className='p-4 pt-0'>
             {transaction.data?.status == 'draft' && auth?.feature.soApproval && (
               <div className='flex gap-x-2'>
@@ -561,51 +582,83 @@ const Transaction = ({ id }) => {
                   />
                 </div>
               </div>
-
-              <div className='text-h-sm font-semibold mt-10 mb-4'>
-                Pengiriman
-              </div>
-              <div className='grid grid-cols-3 gap-1'>
-                {transaction?.data?.pickings?.map((airway) => (
-                  <button
-                    className='shadow rounded-md p-3 text-gray_r-12 font-normal flex justify-between items-center text-left'
-                    key={airway?.id}
-                    onClick={() => setIdAWB(airway?.id)}
-                  >
-                    <div>
-                      <span className='text-sm text-gray_r-11'>
-                        No Resi : {airway?.trackingNumber || '-'}{' '}
-                      </span>
-                      <p className='mt-1 font-medium'>{airway?.name}</p>
-                    </div>
-                    <div className='flex gap-x-2'>
-                      <div className='text-sm text-gray-600 badge-green leading-[1.5] mt-1'>
-                        {airway?.delivered ? 'Pesanan Tiba' : 'Sedang Dikirim'}
-                      </div>
-                      <ChevronRightIcon className='w-5 stroke-2' />
+              <div className='flex '>
+                <div className='w-1/2'>
+                  <div className='text-h-sm font-semibold mt-10 mb-4'>
+                    Pengiriman
+                  </div>
+                    {transaction?.data?.pickings.length == 0 && (
+                      <div className='badge-red text-sm'>Belum ada pengiriman</div>
+                    )}
+                  <div className='grid grid-cols-1 gap-1 w-2/3'>
+                    {transaction?.data?.pickings?.map((airway) => (
+                      <button
+                        className='shadow rounded-md p-3 text-gray_r-12 font-normal flex justify-between items-center text-left h-20'
+                        key={airway?.id}
+                        onClick={() => setIdAWB(airway?.id)}
+                      >
+                        <div>
+                          <span className='text-sm text-gray_r-11'>
+                            No Resi : {airway?.trackingNumber || '-'}{' '}
+                          </span>
+                          <p className='mt-1 font-medium'>{airway?.name}</p>
+                        </div>
+                        <div className='flex gap-x-2'>
+                          <div className='text-sm text-gray-600 badge-green leading-[1.5] mt-1'>
+                            {airway?.delivered ? 'Pesanan Tiba' : 'Sedang Dikirim'}
+                          </div>
+                          <ChevronRightIcon className='w-5 stroke-2' />
+                        </div>
+                      </button>
+                    ))}
+                  </div>
+                </div>
+                <div className='invoice w-1/2 '>
+                  <div className='text-h-sm font-semibold mt-10 mb-4 '>Invoice</div>
+                      {transaction.data?.invoices?.length === 0 && (
+                        <div className='badge-red text-sm'>Belum ada invoice</div>
+                      )}
+                    <div className='grid grid-cols-1 gap-1 w-2/3 '>
+                      {transaction.data?.invoices?.map((invoice, index) => (
+                        <Link href={`/my/invoices/${invoice.id}`} key={index}>
+                          <div className='shadow rounded-md p-4 text-gray_r-12 font-normal flex justify-between'>
+                            <div>
+                              <p className='mb-1'>{invoice?.name}</p>
+                              <div className='flex items-center gap-x-1'>
+                                {invoice.amountResidual > 0 ? (
+                                  <div className='badge-red'>Belum Lunas</div>
+                                ) : (
+                                  <div className='badge-green'>Lunas</div>
+                                )}
+                                <p className='text-caption-2 text-gray_r-11'>
+                                  {currencyFormat(invoice.amountTotal)}
+                                </p>
+                              </div>
+                            </div>
+                            <ChevronRightIcon className='w-5 stroke-2' />
+                          </div>
+                        </Link>
+                      ))}
                     </div>
-                  </button>
-                ))}
+                </div>
               </div>
-              {transaction?.data?.pickings.length == 0 && (
-                <div className='badge-red text-sm'>Belum ada pengiriman</div>
-              )}
 
-              <div className='text-h-sm font-semibold mt-10 mb-4'>
+              <div className='text-h-sm font-semibold mt-4 mb-4'>
                 Rincian Pembelian
               </div>
-              <table className='table-data'>
-                <thead>
-                  <tr>
-                    <th>Nama Produk</th>
-                    {/* <th>Diskon</th> */}
-                    <th>Jumlah</th>
-                    <th>Harga</th>
-                    <th>Subtotal</th>
-                    <th></th>
-                  </tr>
-                </thead>
-                <tbody>
+              {transaction?.data?.products?.length > 0? (
+                <table className='table-data'>
+                  <thead>
+                    <tr>
+                      <th>Nama Produk</th>
+                      {/* <th>Diskon</th> */}
+                      <th>Jumlah</th>
+                      <th>Harga</th>
+                      <th>Subtotal</th>
+                      <th></th>
+                    </tr>
+                  </thead>
+                  <tbody>
                   {transaction?.data?.products?.map((product) => (
                     <tr key={product.id}>
                       <td className='flex'>
@@ -668,21 +721,14 @@ const Transaction = ({ id }) => {
                           </button>
                         </td>
                       )}
-                      {/* {transaction.data.isReaject && (
-                        <td>
-                          <button
-                            className="bg-gray-400 text-white py-1 px-3 rounded"
-                            onClick={() => openModal(product)}
-                            disabled
-                          >
-                            Direject
-                          </button>
-                        </td>
-                      )} */}
                     </tr>
                   ))}
                 </tbody>
               </table>
+              ) : (
+                <div className='badge-red text-sm'>Semua produk telah di reject</div>
+              )}
+              
               {isModalOpen && (
                 <div className='fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center'>
                   <div className='bg-white p-4 rounded w-96
@@ -713,6 +759,7 @@ const Transaction = ({ id }) => {
                 </div>
               )}
 
+            {transaction?.data?.products?.map((product) => (
               <div className='flex justify-end mt-4'>
                 <div className='w-1/4 grid grid-cols-2 gap-y-3 text-gray_r-12/80'>
                   <div className='text-right'>Subtotal</div>
@@ -738,33 +785,84 @@ const Transaction = ({ id }) => {
                   </div>
                 </div>
               </div>
+            ))}
 
-              <div className='text-h-sm font-semibold mt-10 mb-4'>Invoice</div>
-              <div className='grid grid-cols-3 gap-4'>
-                {transaction.data?.invoices?.map((invoice, index) => (
-                  <Link href={`/my/invoices/${invoice.id}`} key={index}>
-                    <div className='shadow rounded-md p-4 text-gray_r-12 font-normal flex justify-between'>
-                      <div>
-                        <p className='mb-2'>{invoice?.name}</p>
-                        <div className='flex items-center gap-x-1'>
-                          {invoice.amountResidual > 0 ? (
-                            <div className='badge-red'>Belum Lunas</div>
-                          ) : (
-                            <div className='badge-green'>Lunas</div>
-                          )}
-                          <p className='text-caption-2 text-gray_r-11'>
-                            {currencyFormat(invoice.amountTotal)}
-                          </p>
-                        </div>
-                      </div>
-                      <ChevronRightIcon className='w-5 stroke-2' />
-                    </div>
-                  </Link>
-                ))}
-              </div>
-              {transaction.data?.invoices?.length === 0 && (
-                <div className='badge-red text-sm'>Belum ada invoice</div>
+
+
+              {transaction?.data?.productsRejectLine.length > 0 && (
+                  <div className='text-h-sm font-semibold mt-10 mb-4'>
+                    Rincian Produk Reject
+                  </div>
+              )}
+              {transaction?.data?.productsRejectLine.length > 0 && (
+                  <table className='table-data'>
+                    <thead>
+                      <tr>
+                        <th>Nama Produk</th>
+                        {/* <th>Diskon</th> */}
+                        <th>Jumlah</th>
+                        <th>Harga</th>
+                        <th>Subtotal</th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      {transaction?.data?.productsRejectLine?.map((product) => (
+                        <tr key={product.id}>
+                          <td className='flex'>
+                            <Link
+                              href={createSlug(
+                                '/shop/product/',
+                                product?.parent.name,
+                                product?.parent.id
+                              )}
+                              className='w-[20%] flex-shrink-0'
+                            >
+                              <Image
+                                src={product?.parent?.image}
+                                alt={product?.name}
+                                className='object-contain object-center border border-gray_r-6 h-32 w-full rounded-md'
+                              />
+                            </Link>
+                            <div className='px-2 text-left'>
+                              <Link
+                                href={createSlug(
+                                  '/shop/product/',
+                                  product?.parent.name,
+                                  product?.parent.id
+                                )}
+                                className='line-clamp-2 leading-6 !text-gray_r-12 font-normal'
+                              >
+                                {product?.parent?.name}
+                              </Link>
+                              <div className='text-gray_r-11 mt-2'>
+                                {product?.code}{' '}
+                                {product?.attributes.length > 0
+                                  ? `| ${product?.attributes.join(', ')}`
+                                  : ''}
+                              </div>
+                            </div>
+                          </td>
+                          {/* <td>
+                            {product.price.discountPercentage > 0
+                              ? `${product.price.discountPercentage}%`
+                              : ''}
+                          </td> */}
+                          <td>{product.quantity}</td>
+                          <td>
+                            {/* {product.price.discountPercentage > 0 && (
+                              <div className='line-through mb-1 text-caption-1 text-gray_r-12/70'>
+                                {currencyFormat(product.price.price)}
+                              </div>
+                            )} */}
+                            <div>{currencyFormat(product.price.priceDiscount)}</div>
+                          </td>
+                          <td>{currencyFormat(product.quantity * product.price.priceDiscount)}</td>
+                        </tr>
+                      ))}
+                    </tbody>
+                  </table>
               )}
+              
             </div>
           </div>
         </DesktopView>
diff --git a/src/lib/variant/components/VariantCard.jsx b/src/lib/variant/components/VariantCard.jsx
index c629c987..5d95ee70 100644
--- a/src/lib/variant/components/VariantCard.jsx
+++ b/src/lib/variant/components/VariantCard.jsx
@@ -122,7 +122,7 @@ const VariantCard = ({ product, openOnClick = true, buyMore = false }) => {
         <Link href={createSlug('/shop/product/', product.parent.name, product.parent.id)}>
           <Card />
         </Link>
-        {buyMore && (
+        {buyMore  && (!transaction?.data?.productsRejectLine.some(pr => pr.id === product.id)) && (
           <div className='flex justify-end gap-x-2 mb-2'>
             <button
               type='button'
@@ -133,26 +133,15 @@ const VariantCard = ({ product, openOnClick = true, buyMore = false }) => {
             </button>
             {/* {auth?.feature.soApproval && (auth.webRole == 2 || auth.webRole == 3) && (transaction.data.isReaject == false) && ( */}
             {auth?.feature.soApproval && (auth.webRole == 2 || auth.webRole == 3) && (router.asPath.includes("/my/quotations/")) && (
-                      
-                          <button
-                            className="bg-red-500 text-white py-1 px-3 rounded"
-                            onClick={() => openModal(product)}
-                          >
-                            Reject
-                          </button>
-                      
-                      )}
-                      {/* {transaction.data.isReaject && (
-                  
-                          <button
-                            className="bg-gray-400 text-white py-1 px-3 rounded"
-                            onClick={() => openModal(product)}
-                            disabled
-                          >
-                            Direject
-                          </button>
-                     
-                      )} */}
+                      !transaction?.data?.productsRejectLine.some(pr => pr.id === product.id) && (
+                        <button
+                          className="bg-red-500 text-white py-1 px-3 rounded"
+                          onClick={() => openModal(product)}
+                        >
+                          Reject
+                        </button>
+                      )
+                    )}
                       {isModalOpen && (
                         <div className='fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center'>
                           <div className='bg-white p-4 rounded w-96
-- 
cgit v1.2.3


From 32423bdb47714ebbc99a43a3152c011684d5d70a Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 10 Jul 2024 16:40:01 +0700
Subject: <iman> update error code

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

(limited to 'src')

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


From 2ca49fd61eadf2664ba587ef74522f81f8c9702b Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 10 Jul 2024 16:56:16 +0700
Subject: <iman> update error code

---
 src/lib/variant/components/VariantCard.jsx | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src')

diff --git a/src/lib/variant/components/VariantCard.jsx b/src/lib/variant/components/VariantCard.jsx
index dd87ba1b..68cdf54f 100644
--- a/src/lib/variant/components/VariantCard.jsx
+++ b/src/lib/variant/components/VariantCard.jsx
@@ -12,7 +12,6 @@ import rejectProductApi from '../../../lib/transaction/api/rejectProductApi'
 // import {useTransaction} from 'C:\Users\Indoteknik\next-indoteknik\src\lib\transaction\hooks\useTransaction.js'
 import useTransaction from '../../../lib/transaction/hooks/useTransaction';
 import ImageNext from 'next/image';
-import { useMemo, useEffect, useState } from 'react';
 
 const VariantCard = ({ product, openOnClick = true, buyMore = false }) => {
   const router = useRouter()
-- 
cgit v1.2.3


From 91fae67a9fdece78f0d0fbf4230472577b6260c6 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 11 Jul 2024 14:58:55 +0700
Subject: <iman> add key && update reject button by status quotation && add
 image reject

---
 src/lib/transaction/components/Transaction.jsx | 149 +++++++++++++------------
 1 file changed, 79 insertions(+), 70 deletions(-)

(limited to 'src')

diff --git a/src/lib/transaction/components/Transaction.jsx b/src/lib/transaction/components/Transaction.jsx
index 8e7cede0..b099ffa7 100644
--- a/src/lib/transaction/components/Transaction.jsx
+++ b/src/lib/transaction/components/Transaction.jsx
@@ -1,4 +1,6 @@
 import Spinner from '@/core/components/elements/Spinner/Spinner';
+import NextImage from 'next/image';
+import rejectImage from "../../../../public/images/reject.png"
 import useTransaction from '../hooks/useTransaction';
 import TransactionStatusBadge from './TransactionStatusBadge';
 import Divider from '@/core/components/elements/Divider/Divider';
@@ -646,85 +648,85 @@ const Transaction = ({ id }) => {
               <div className='text-h-sm font-semibold mt-4 mb-4'>
                 Rincian Pembelian
               </div>
-              {transaction?.data?.products?.length > 0? (
-                <table className='table-data'>
-                  <thead>
-                    <tr>
-                      <th>Nama Produk</th>
-                      {/* <th>Diskon</th> */}
-                      <th>Jumlah</th>
-                      <th>Harga</th>
-                      <th>Subtotal</th>
-                      <th></th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                  {transaction?.data?.products?.map((product) => (
-                    <tr key={product.id}>
-                      <td className='flex'>
-                        <Link
-                          href={createSlug(
-                            '/shop/product/',
-                            product?.parent.name,
-                            product?.parent.id
-                          )}
-                          className='w-[20%] flex-shrink-0'
-                        >
-                          <Image
-                            src={product?.parent?.image}
-                            alt={product?.name}
-                            className='object-contain object-center border border-gray_r-6 h-32 w-full rounded-md'
-                          />
-                        </Link>
-                        <div className='px-2 text-left'>
+                {transaction?.data?.products?.length > 0? (
+                  <table className='table-data'>
+                    <thead>
+                      <tr>
+                        <th>Nama Produk</th>
+                        {/* <th>Diskon</th> */}
+                        <th>Jumlah</th>
+                        <th>Harga</th>
+                        <th>Subtotal</th>
+                        <th></th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                    {transaction?.data?.products?.map((product) => (
+                      <tr key={product.id}>
+                        <td className='flex'>
                           <Link
                             href={createSlug(
                               '/shop/product/',
                               product?.parent.name,
                               product?.parent.id
                             )}
-                            className='line-clamp-2 leading-6 !text-gray_r-12 font-normal'
+                            className='w-[20%] flex-shrink-0'
                           >
-                            {product?.parent?.name}
+                            <Image
+                              src={product?.parent?.image}
+                              alt={product?.name}
+                              className='object-contain object-center border border-gray_r-6 h-32 w-full rounded-md'
+                            />
                           </Link>
-                          <div className='text-gray_r-11 mt-2'>
-                            {product?.code}{' '}
-                            {product?.attributes.length > 0
-                              ? `| ${product?.attributes.join(', ')}`
-                              : ''}
-                          </div>
-                        </div>
-                      </td>
-                      {/* <td>
-                        {product.price.discountPercentage > 0
-                          ? `${product.price.discountPercentage}%`
-                          : ''}
-                      </td> */}
-                      <td>{product.quantity}</td>
-                      <td>
-                        {/* {product.price.discountPercentage > 0 && (
-                          <div className='line-through mb-1 text-caption-1 text-gray_r-12/70'>
-                            {currencyFormat(product.price.price)}
+                          <div className='px-2 text-left'>
+                            <Link
+                              href={createSlug(
+                                '/shop/product/',
+                                product?.parent.name,
+                                product?.parent.id
+                              )}
+                              className='line-clamp-2 leading-6 !text-gray_r-12 font-normal'
+                            >
+                              {product?.parent?.name}
+                            </Link>
+                            <div className='text-gray_r-11 mt-2'>
+                              {product?.code}{' '}
+                              {product?.attributes.length > 0
+                                ? `| ${product?.attributes.join(', ')}`
+                                : ''}
+                            </div>
                           </div>
-                        )} */}
-                        <div>{currencyFormat(product.price.priceDiscount)}</div>
-                      </td>
-                      <td>{currencyFormat(product.price.subtotal)}</td>
-                      {/* {auth?.feature.soApproval && (auth.webRole == 2 || auth.webRole == 3) && (transaction.data.isReaject == false) && ( */}
-                      {auth?.feature.soApproval && (auth.webRole == 2 || auth.webRole == 3) && (router.asPath.includes("/my/quotations/"))  && (
+                        </td>
+                        {/* <td>
+                          {product.price.discountPercentage > 0
+                            ? `${product.price.discountPercentage}%`
+                            : ''}
+                        </td> */}
+                        <td>{product.quantity}</td>
                         <td>
-                          <button
-                            className="bg-red-500 text-white py-1 px-3 rounded"
-                            onClick={() => openModal(product)}
-                          >
-                            Reject
-                          </button>
+                          {/* {product.price.discountPercentage > 0 && (
+                            <div className='line-through mb-1 text-caption-1 text-gray_r-12/70'>
+                              {currencyFormat(product.price.price)}
+                            </div>
+                          )} */}
+                          <div>{currencyFormat(product.price.priceDiscount)}</div>
                         </td>
-                      )}
-                    </tr>
-                  ))}
-                </tbody>
-              </table>
+                        <td>{currencyFormat(product.price.subtotal)}</td>
+                        {/* {auth?.feature.soApproval && (auth.webRole == 2 || auth.webRole == 3) && (transaction.data.isReaject == false) && ( */}
+                        {auth?.feature.soApproval && (auth.webRole == 2 || auth.webRole == 3) &&  (router.asPath.includes("/my/quotations/"))  && transaction.data?.status == 'draft' && (
+                          <td>
+                            <button
+                              className="bg-red-500 text-white py-1 px-3 rounded"
+                              onClick={() => openModal(product)}
+                            >
+                              Reject
+                            </button>
+                          </td>
+                        )}
+                      </tr>
+                    ))}
+                  </tbody>
+                </table>
               ) : (
                 <div className='badge-red text-sm'>Semua produk telah di reject</div>
               )}
@@ -856,13 +858,20 @@ const Transaction = ({ id }) => {
                             )} */}
                             <div>{currencyFormat(product.price.priceDiscount)}</div>
                           </td>
-                          <td>{currencyFormat(product.quantity * product.price.priceDiscount)}</td>
+                          <td className='flex justify-center'>
+                            <NextImage
+                              src={rejectImage}
+                              alt='Reject'
+                              width={90}
+                              height={30}
+                            /> 
+                          </td>
                         </tr>
                       ))}
                     </tbody>
                   </table>
               )}
-              
+                           
             </div>
           </div>
         </DesktopView>
-- 
cgit v1.2.3


From 44895db5a27a87e6f6f91d4d3fda33ff444f82f0 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 11 Jul 2024 15:21:10 +0700
Subject: <iman> marge conflik

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

(limited to 'src')

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index 4355c7bd..3c2b8a09 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -1391,13 +1391,10 @@ const Checkout = () => {
                   <div className='flex gap-x-2 justify-between mb-4'>
                     <div>Grand Total</div>
                     <div className='font-semibold text-gray_r-12'>
-<<<<<<< HEAD
                       {currencyFormat(grandTotal)}
-=======
                       {currencyFormat(
                         cartCheckout?.grandTotal + finalShippingAmt
                       )}
->>>>>>> dev/voucher-shipment
                     </div>
                   </div>
                 )}
-- 
cgit v1.2.3


From 1b9aeada3b663128f7c221342143cdb687b6e71f Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 11 Jul 2024 15:26:16 +0700
Subject: <iman> add key on map

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

(limited to 'src')

diff --git a/src/lib/transaction/components/Transaction.jsx b/src/lib/transaction/components/Transaction.jsx
index b099ffa7..97b8a507 100644
--- a/src/lib/transaction/components/Transaction.jsx
+++ b/src/lib/transaction/components/Transaction.jsx
@@ -762,7 +762,7 @@ const Transaction = ({ id }) => {
               )}
 
             {transaction?.data?.products?.map((product) => (
-              <div className='flex justify-end mt-4'>
+              <div className='flex justify-end mt-4' key={product.id}>
                 <div className='w-1/4 grid grid-cols-2 gap-y-3 text-gray_r-12/80'>
                   <div className='text-right'>Subtotal</div>
                   <div className='text-right font-medium'>
-- 
cgit v1.2.3


From 721067120c2756554829070b3fa10de7f04ae705 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 12 Jul 2024 11:34:23 +0700
Subject: <iman>  update input note

---
 src/lib/quotation/components/Quotation.jsx | 35 ++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/lib/quotation/components/Quotation.jsx b/src/lib/quotation/components/Quotation.jsx
index 8855c6c4..19419f61 100644
--- a/src/lib/quotation/components/Quotation.jsx
+++ b/src/lib/quotation/components/Quotation.jsx
@@ -67,17 +67,19 @@ const Quotation = () => {
   const [selectedExpedisiService, setselectedExpedisiService] = useState(null);
   const [etd, setEtd] = useState(null);
   const [etdFix, setEtdFix] = useState(null);
-
+  
   const [isApproval, setIsApproval] = useState(false);
-
+  
   const expedisiValidation = useRef(null);
-
+  
   const [selectedAddress, setSelectedAddress] = useState({
     shipping: null,
     invoicing: null,
   });
-
+  
   const [addresses, setAddresses] = useState(null);
+  
+  const [note_websiteText, setselectedNote_websiteText] = useState(null);
 
   useEffect(() => {
     if (!auth) return;
@@ -262,6 +264,12 @@ const Quotation = () => {
     }
 
     if (!products || products.length == 0) return;
+
+    if (auth?.feature?.soApproval && !note_websiteText.trim()) {
+      toast.error('Note harus diisi karena fitur soApproval aktif.');
+      return;
+    }
+    
     setIsLoading(true);
     const productOrder = products.map((product) => ({
       product_id: product.id,
@@ -276,6 +284,7 @@ const Quotation = () => {
       carrier_id: selectedCarrierId,
       estimated_arrival_days: splitDuration(etd),
       delivery_service_type: selectedExpedisiService,
+      note_website : note_websiteText,
     };
     console.log('data checkout', data);
     const isSuccess = await checkoutApi({ data });
@@ -291,6 +300,8 @@ const Quotation = () => {
 
   const taxTotal = (totalAmount - totalDiscountAmount) * 0.11;
 
+  console.log("note_websiteText",note_websiteText)
+
   return (
     <>
       <MobileView>
@@ -576,6 +587,22 @@ const Quotation = () => {
                 yang berlaku
               </p>
 
+                <div>
+                  <hr className='my-4 border-gray_r-6' />
+
+                  <div className='flex gap-x-1 flex-col mb-4'>
+                    <div className='mb-2'>Note</div>
+                    <div className='font-semibold text-gray_r-12'>
+                      <textarea
+                        rows="4"
+                        cols="50"
+                        className={`w-full p-1 rounded border  border-gray_r-6`}
+                        onChange={(e) => setselectedNote_websiteText(e.target.value)}
+                      />
+                    </div>
+                  </div>
+                </div>
+        
               <hr className='my-4 border-gray_r-6' />
 
               <button
-- 
cgit v1.2.3


From 8625a9ddf959c131c293254015b59d5cb3b00f55 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 12 Jul 2024 13:28:15 +0700
Subject: <iman? update flash sale

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

(limited to 'src')

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index 3c2b8a09..f640299a 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -243,7 +243,8 @@ const Checkout = () => {
     setProducts(cartCheckout?.products);
     setCheckWeight(cartCheckout?.hasProductWithoutWeight);
     setTotalWeight(cartCheckout?.totalWeight.g);
-    setHasFlashSale(cartCheckout?.products[0]?.hasFlashsale ? cartCheckout.products[0].hasFlashsale : false);
+    const hasFlashSale = cartCheckout?.products.some(product => product.hasFlashsale);
+    setHasFlashSale(hasFlashSale);
   }, [cartCheckout]);
   
 
-- 
cgit v1.2.3


From ccb5ea650de36e537802893d0abb351739b480b8 Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Fri, 12 Jul 2024 13:31:24 +0700
Subject: bug

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

(limited to 'src')

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index 3c2b8a09..73040425 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -245,7 +245,6 @@ const Checkout = () => {
     setTotalWeight(cartCheckout?.totalWeight.g);
     setHasFlashSale(cartCheckout?.products[0]?.hasFlashsale ? cartCheckout.products[0].hasFlashsale : false);
   }, [cartCheckout]);
-  
 
   useEffect(() => {
     setCheckoutValidation(false);
@@ -1392,9 +1391,6 @@ const Checkout = () => {
                     <div>Grand Total</div>
                     <div className='font-semibold text-gray_r-12'>
                       {currencyFormat(grandTotal)}
-                      {currencyFormat(
-                        cartCheckout?.grandTotal + finalShippingAmt
-                      )}
                     </div>
                   </div>
                 )}
-- 
cgit v1.2.3


From 8c2c97c064e39983755f5789244a032702363944 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 12 Jul 2024 14:37:06 +0700
Subject: <iman> add note

---
 src/lib/quotation/components/Quotation.jsx | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/lib/quotation/components/Quotation.jsx b/src/lib/quotation/components/Quotation.jsx
index 19419f61..d6cc4866 100644
--- a/src/lib/quotation/components/Quotation.jsx
+++ b/src/lib/quotation/components/Quotation.jsx
@@ -79,7 +79,7 @@ const Quotation = () => {
   
   const [addresses, setAddresses] = useState(null);
   
-  const [note_websiteText, setselectedNote_websiteText] = useState(null);
+  const [note_websiteText, setselectedNote_websiteText] = useState('');
 
   useEffect(() => {
     if (!auth) return;
@@ -265,8 +265,8 @@ const Quotation = () => {
 
     if (!products || products.length == 0) return;
 
-    if (auth?.feature?.soApproval && !note_websiteText.trim()) {
-      toast.error('Note harus diisi karena fitur soApproval aktif.');
+    if (isApproval && note_websiteText == '') {
+      toast.error('Maaf, Note wajib dimasukkan.');
       return;
     }
     
@@ -286,22 +286,21 @@ const Quotation = () => {
       delivery_service_type: selectedExpedisiService,
       note_website : note_websiteText,
     };
-    console.log('data checkout', data);
+    
     const isSuccess = await checkoutApi({ data });
-    console.log('isSuccess', isSuccess);
+    ;
     setIsLoading(false);
     if (isSuccess?.id) {
       for (const product of products) deleteItemCart({ productId: product.id });
       router.push(`/shop/quotation/finish?id=${isSuccess.id}`);
       return;
     }
+    
     toast.error('Gagal melakukan transaksi, terjadi kesalahan internal');
   };
 
   const taxTotal = (totalAmount - totalDiscountAmount) * 0.11;
 
-  console.log("note_websiteText",note_websiteText)
-
   return (
     <>
       <MobileView>
@@ -592,7 +591,7 @@ const Quotation = () => {
 
                   <div className='flex gap-x-1 flex-col mb-4'>
                     <div className='mb-2'>Note</div>
-                    <div className='font-semibold text-gray_r-12'>
+                    <div className='text-caption-2 text-gray_r-11'>
                       <textarea
                         rows="4"
                         cols="50"
-- 
cgit v1.2.3


From 87f4b126a5d487aef2170a1f2147618bbcb0ad70 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 15 Jul 2024 10:05:47 +0700
Subject: <iman> add harus diisi

---
 src/lib/quotation/components/Quotation.jsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/lib/quotation/components/Quotation.jsx b/src/lib/quotation/components/Quotation.jsx
index d6cc4866..86b0664d 100644
--- a/src/lib/quotation/components/Quotation.jsx
+++ b/src/lib/quotation/components/Quotation.jsx
@@ -590,7 +590,12 @@ const Quotation = () => {
                   <hr className='my-4 border-gray_r-6' />
 
                   <div className='flex gap-x-1 flex-col mb-4'>
-                    <div className='mb-2'>Note</div>
+                    <div className='flex flex-row gap-x-1'>
+                      <div className=''>Note</div>
+                      {isApproval && (
+                        <div className='text-caption-1 text-red-500 items-center flex'>*harus diisi</div>
+                      )}
+                    </div>
                     <div className='text-caption-2 text-gray_r-11'>
                       <textarea
                         rows="4"
-- 
cgit v1.2.3


From c81465a639ae63e93f7f42e4c345e83db720bf68 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 15 Jul 2024 10:10:43 +0700
Subject: <iman> delete Indoteknik TV

---
 src/core/components/elements/Navbar/NavbarDesktop.jsx | 4 ++--
 src/core/components/elements/Sidebar/Sidebar.jsx      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx
index e73a35ee..181eef0d 100644
--- a/src/core/components/elements/Navbar/NavbarDesktop.jsx
+++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx
@@ -210,14 +210,14 @@ const NavbarDesktop = () => {
               >
                 Blog Indoteknik
               </Link>
-              <Link
+              {/* <Link
                 href='/video'
                 className='p-4 flex-1 flex justify-center items-center !text-gray_r-12/80 hover:bg-gray_r-3 idt-transition'
                 target='_blank'
                 rel='noreferrer'
               >
                 Indoteknik TV
-              </Link>
+              </Link> */}
             </div>
 
             <div className='w-3/12 flex gap-x-1 relative'>
diff --git a/src/core/components/elements/Sidebar/Sidebar.jsx b/src/core/components/elements/Sidebar/Sidebar.jsx
index cde68515..55838890 100644
--- a/src/core/components/elements/Sidebar/Sidebar.jsx
+++ b/src/core/components/elements/Sidebar/Sidebar.jsx
@@ -131,9 +131,9 @@ const Sidebar = ({ active, close }) => {
                 >
                   Blog Indoteknik
                 </SidebarLink>
-                <SidebarLink className={itemClassName} href='/video'>
+                {/* <SidebarLink className={itemClassName} href='/video'>
                   Indoteknik TV
-                </SidebarLink>
+                </SidebarLink> */}
                 <SidebarLink className={itemClassName} href='/tentang-kami'>
                   Tentang Indoteknik
                 </SidebarLink>
-- 
cgit v1.2.3


From 60d0eda46a7a09a70285350cf19e09c40da05887 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 16 Jul 2024 15:44:23 +0700
Subject: <iman> add mobile note

---
 src/lib/quotation/components/Quotation.jsx | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/lib/quotation/components/Quotation.jsx b/src/lib/quotation/components/Quotation.jsx
index 86b0664d..df234dc2 100644
--- a/src/lib/quotation/components/Quotation.jsx
+++ b/src/lib/quotation/components/Quotation.jsx
@@ -452,8 +452,25 @@ const Quotation = () => {
             </Link>{' '}
             yang berlaku
           </p>
+            <hr className='my-4 border-gray_r-6' />
+             
+                  <div className='flex gap-x-2 justify-start mb-4'>
+                    <div className=''>Note</div>
+                      {isApproval && (
+                        <div className='text-caption-1 text-red-500 items-center flex'>*harus diisi</div>
+                      )}
+                    </div>
+                    <div className='text-caption-2 text-gray_r-11'>
+                      <textarea
+                        rows="4"
+                        cols="50"
+                        className={`w-full p-1 rounded border  border-gray_r-6`}
+                        onChange={(e) => setselectedNote_websiteText(e.target.value)}
+                      />
+                  </div>
         </div>
-
+      
+            
         <Divider />
 
         <div className='flex gap-x-3 p-4'>
-- 
cgit v1.2.3


From 937013e8bf9f176c18a31d94205b9116d2a02224 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 16 Jul 2024 15:52:08 +0700
Subject: <iman> update button lihat semua mobile

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

(limited to 'src')

diff --git a/src/lib/home/components/PreferredBrand.jsx b/src/lib/home/components/PreferredBrand.jsx
index 571c4745..ef5e743e 100644
--- a/src/lib/home/components/PreferredBrand.jsx
+++ b/src/lib/home/components/PreferredBrand.jsx
@@ -20,6 +20,11 @@ const PreferredBrand = () => {
             Lihat Semua
           </Link>
         )}
+        {isMobile && (
+          <Link href='/shop/brands' className='!text-red-500 font-semibold sm:text-h-sm'>
+            Lihat Semua
+          </Link>
+        )}
       </div>
       {preferredBrands.isLoading && <PreferredBrandSkeleton />}
       {!preferredBrands.isLoading && (
diff --git a/src/lib/home/components/PromotionProgram.jsx b/src/lib/home/components/PromotionProgram.jsx
index 66216d19..fabaf307 100644
--- a/src/lib/home/components/PromotionProgram.jsx
+++ b/src/lib/home/components/PromotionProgram.jsx
@@ -16,6 +16,11 @@ const BannerSection = () => {
           Lihat Semua
         </Link>
         )}
+        {isMobile && (
+          <Link href='/shop/promo' className='!text-red-500 font-semibold sm:text-h-sm'>
+          Lihat Semua
+        </Link>
+        )}
       </div>
       {promotionProgram.data &&
     promotionProgram.data?.length > 0 && (
-- 
cgit v1.2.3


From 60060b517651e1122a638a3f592017879a0e9e63 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 17 Jul 2024 11:07:00 +0700
Subject: <iman> update all promotion

---
 .../components/elements/Navbar/NavbarDesktop.jsx   | 37 +++++++++++-----------
 1 file changed, 19 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx
index 181eef0d..66dc730c 100644
--- a/src/core/components/elements/Navbar/NavbarDesktop.jsx
+++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx
@@ -170,45 +170,46 @@ const NavbarDesktop = () => {
               </div>
             </button>
             <div className='w-6/12 flex px-1 divide-x divide-gray_r-6'>
-              <Link
-                href='/shop/promo'
-                className={`${
-                  router.asPath === '/shop/promo' && 'bg-gray_r-3'
-                } p-4 flex-1 flex justify-center items-center !text-gray_r-12/80 hover:bg-gray_r-3 idt-transition`}
-                // className='p-4 flex-1 flex justify-center items-center !text-gray_r-12/80 hover:bg-gray_r-3 idt-transition'
-                target='_blank'
-                rel='noreferrer'
-              >
-                Semua Promo
-              </Link>
+            <Link
+              href="/shop/promo"
+              className={`${
+                router.asPath === '/shop/promo' && 'bg-gray_r-3'
+              } p-4 flex-1 flex justify-between items-center !text-gray_r-12/80 hover:bg-gray_r-3 idt-transition group`}
+              target="_blank"
+              rel="noreferrer"
+            >
+              <p className="group-hover:scale-105 group-hover:text-red-500 transition-transform duration-200">Semua Promo</p>
+              <p className="rounded bg-red-500 font-bold text-white text-[10px] w-auto inline-block p-[2px] rotate-12 -translate-y-2 group-hover:scale-105 transition-transform duration-200">NEW!</p>
+            </Link>
+
               <Link
                 href='/shop/brands'
-                className={`${
+                className={`${  
                   router.asPath === '/shop/brands' && 'bg-gray_r-3'
-                } p-4 flex-1 flex justify-center items-center !text-gray_r-12/80 hover:bg-gray_r-3 idt-transition`}
+                } p-4 flex-1 flex justify-center items-center !text-gray_r-12/80 hover:bg-gray_r-3 idt-transition group`}
                 target='_blank'
                 rel='noreferrer'
               >
-                Semua Brand
+               <p className="group-hover:scale-105 group-hover:text-red-500 transition-transform duration-200">Semua Brand</p>
               </Link>
               <Link
                 href='/shop/search?orderBy=stock'
                 className={`${
                   router.asPath === '/shop/search?orderBy=stock' &&
                   'bg-gray_r-3'
-                } p-4 flex-1 flex justify-center items-center !text-gray_r-12/80 hover:bg-gray_r-3 idt-transition`}
+                } p-4 flex-1 flex justify-center items-center !text-gray_r-12/80 hover:bg-gray_r-3 idt-transition group`}
                 target='_blank'
                 rel='noreferrer'
               >
-                Ready Stock
+                <p className="group-hover:scale-105 group-hover:text-red-500 transition-transform duration-200">Ready Stock</p>
               </Link>
               <Link
                 href='https://blog.indoteknik.com/'
-                className='p-4 flex-1 flex justify-center items-center !text-gray_r-12/80 hover:bg-gray_r-3 idt-transition'
+                className='p-4 flex-1 flex justify-center items-center !text-gray_r-12/80 hover:bg-gray_r-3 idt-transition group'
                 target='_blank'
                 rel='noreferrer noopener'
               >
-                Blog Indoteknik
+                <p className="group-hover:scale-105 group-hover:text-red-500 transition-transform duration-200">Blog Indoteknik</p>
               </Link>
               {/* <Link
                 href='/video'
-- 
cgit v1.2.3


From a42272ae50a5e8661db5ae534f08f475efb05665 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 17 Jul 2024 14:09:51 +0700
Subject: <iman> update all promotion

---
 src/core/components/elements/Navbar/NavbarDesktop.jsx      |  3 ++-
 .../elements/Navbar/style/NavbarDesktop.module.css         | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 src/core/components/elements/Navbar/style/NavbarDesktop.module.css

(limited to 'src')

diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx
index 66dc730c..3fd6dfc3 100644
--- a/src/core/components/elements/Navbar/NavbarDesktop.jsx
+++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx
@@ -19,6 +19,7 @@ import DesktopView from '../../views/DesktopView';
 import Link from '../Link/Link';
 import NavbarUserDropdown from './NavbarUserDropdown';
 import NextImage from 'next/image';
+import style from "./style/NavbarDesktop.module.css";
 
 const Search = dynamic(() => import('./Search'), { ssr: false });
 const TopBanner = dynamic(() => import('./TopBanner'), { ssr: false });
@@ -179,7 +180,7 @@ const NavbarDesktop = () => {
               rel="noreferrer"
             >
               <p className="group-hover:scale-105 group-hover:text-red-500 transition-transform duration-200">Semua Promo</p>
-              <p className="rounded bg-red-500 font-bold text-white text-[10px] w-auto inline-block p-[2px] rotate-12 -translate-y-2 group-hover:scale-105 transition-transform duration-200">NEW!</p>
+              <p className={`rounded bg-red-500 font-bold text-white text-[10px] w-auto inline-block p-[2px] group-hover:scale-105 transition-transform duration-200 ${style.blink}`}>NEW!</p>
             </Link>
 
               <Link
diff --git a/src/core/components/elements/Navbar/style/NavbarDesktop.module.css b/src/core/components/elements/Navbar/style/NavbarDesktop.module.css
new file mode 100644
index 00000000..9cddb127
--- /dev/null
+++ b/src/core/components/elements/Navbar/style/NavbarDesktop.module.css
@@ -0,0 +1,14 @@
+/* navbarDesktop.module.css */
+@keyframes blink {
+  0%, 100% {
+    opacity: 1;
+  }
+  50% {
+    opacity: 0;
+  }
+}
+
+.blink {
+  animation: blink 0.8s infinite;
+}
+
-- 
cgit v1.2.3


From 8451ecd350f8138925b6e1deba71733f038cd757 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 23 Jul 2024 10:26:48 +0700
Subject: <iman> update icon all promo navbar

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

(limited to 'src')

diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx
index 3fd6dfc3..967b6f62 100644
--- a/src/core/components/elements/Navbar/NavbarDesktop.jsx
+++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx
@@ -175,12 +175,18 @@ const NavbarDesktop = () => {
               href="/shop/promo"
               className={`${
                 router.asPath === '/shop/promo' && 'bg-gray_r-3'
-              } p-4 flex-1 flex justify-between items-center !text-gray_r-12/80 hover:bg-gray_r-3 idt-transition group`}
+              }  flex-1 flex justify-center items-center !text-gray_r-12/80 hover:bg-gray_r-3 idt-transition group`}
               target="_blank"
               rel="noreferrer"
             >
               <p className="group-hover:scale-105 group-hover:text-red-500 transition-transform duration-200">Semua Promo</p>
-              <p className={`rounded bg-red-500 font-bold text-white text-[10px] w-auto inline-block p-[2px] group-hover:scale-105 transition-transform duration-200 ${style.blink}`}>NEW!</p>
+                <Image
+                src='/images/ICON PROMO DISKON.svg'
+                alt='promo'
+                width={40}
+                height={40}
+                className={` inline-block group-hover:scale-105 transition-transform duration-200 ${style.blink}`}
+                />
             </Link>
 
               <Link
-- 
cgit v1.2.3


From d528fce32aca0c69ef61a5e7428215237d642eea Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 25 Jul 2024 09:13:51 +0700
Subject: <iman> upade icon navbar semua promo

---
 .../components/elements/Navbar/NavbarDesktop.jsx   | 36 ++++++++++++----------
 1 file changed, 20 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx
index 967b6f62..8a84f6e8 100644
--- a/src/core/components/elements/Navbar/NavbarDesktop.jsx
+++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx
@@ -172,22 +172,26 @@ const NavbarDesktop = () => {
             </button>
             <div className='w-6/12 flex px-1 divide-x divide-gray_r-6'>
             <Link
-              href="/shop/promo"
-              className={`${
-                router.asPath === '/shop/promo' && 'bg-gray_r-3'
-              }  flex-1 flex justify-center items-center !text-gray_r-12/80 hover:bg-gray_r-3 idt-transition group`}
-              target="_blank"
-              rel="noreferrer"
-            >
-              <p className="group-hover:scale-105 group-hover:text-red-500 transition-transform duration-200">Semua Promo</p>
-                <Image
-                src='/images/ICON PROMO DISKON.svg'
-                alt='promo'
-                width={40}
-                height={40}
-                className={` inline-block group-hover:scale-105 transition-transform duration-200 ${style.blink}`}
-                />
-            </Link>
+                href="/shop/promo"
+                className={`${
+                  router.asPath === '/shop/promo' && 'bg-gray_r-3'
+                }  flex-1 flex justify-center items-center !text-gray_r-12/80 hover:bg-gray_r-3 idt-transition group relative`} // Added relative position
+                target="_blank"
+                rel="noreferrer"
+              >
+                <p className="absolute inset-0 flex justify-center items-center group-hover:scale-105 group-hover:text-red-500 transition-transform duration-200 z-10">Semua Promo</p>
+                <div className='w-full h-full flex justify-end items-start'> 
+                  <Image
+                    src='/images/ICON PROMO DISKON.svg'
+                    alt='promo'
+                    width={100}
+                    height={100}
+                    quality={100}
+                    className={`inline-block  z-20`}
+                  />
+                </div>
+              </Link>
+
 
               <Link
                 href='/shop/brands'
-- 
cgit v1.2.3


From 58a1dd973af0edef6961d217f1939d228bb8d787 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 1 Aug 2024 15:50:02 +0700
Subject: <iman> delete image promo

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

(limited to 'src')

diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx
index 8a84f6e8..328bc0c9 100644
--- a/src/core/components/elements/Navbar/NavbarDesktop.jsx
+++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx
@@ -180,7 +180,7 @@ const NavbarDesktop = () => {
                 rel="noreferrer"
               >
                 <p className="absolute inset-0 flex justify-center items-center group-hover:scale-105 group-hover:text-red-500 transition-transform duration-200 z-10">Semua Promo</p>
-                <div className='w-full h-full flex justify-end items-start'> 
+                {/* <div className='w-full h-full flex justify-end items-start'> 
                   <Image
                     src='/images/ICON PROMO DISKON.svg'
                     alt='promo'
@@ -189,7 +189,7 @@ const NavbarDesktop = () => {
                     quality={100}
                     className={`inline-block  z-20`}
                   />
-                </div>
+                </div> */}
               </Link>
 
 
-- 
cgit v1.2.3


From 622b27a302ba0736984d95beb761bf6a5f48614b Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 2 Aug 2024 08:58:03 +0700
Subject: <iman> delete console log

---
 .../my/recomendation/components/products-recomendatison.jsx    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/pages/my/recomendation/components/products-recomendatison.jsx b/src/pages/my/recomendation/components/products-recomendatison.jsx
index d39d2a99..7da2fab1 100644
--- a/src/pages/my/recomendation/components/products-recomendatison.jsx
+++ b/src/pages/my/recomendation/components/products-recomendatison.jsx
@@ -80,7 +80,7 @@ const ProductsRecomendation = ({ id }) => {
         }
       });
 
-      console.log('ini result', searchProduct.data.response);
+      // console.log('ini result', searchProduct.data.response);
     }
 
     return resultMapping;
@@ -112,7 +112,7 @@ const ProductsRecomendation = ({ id }) => {
       setIsLoading(false);
     } else {
       setIsLoading(false);
-      console.log('No excel data available');
+      // console.log('No excel data available');
     }
   };
 
@@ -129,7 +129,7 @@ const ProductsRecomendation = ({ id }) => {
       const jsonData = XLSX.utils.sheet_to_json(worksheet);
 
       setExcelData(jsonData);
-      console.log('ini json data', jsonData);
+      // console.log('ini json data', jsonData);
 
       setIsLoading(false);
     };
@@ -146,13 +146,13 @@ const ProductsRecomendation = ({ id }) => {
       products[foundIndex].result.code = variant?.code;
       products[foundIndex].result.name = variant?.name;
     } else {
-      console.log('Data not found.');
+      // console.log('Data not found.');
     }
     setIsOpen(false);
   };
 
   const handlingOtherRec = ({ product }) => {
-    console.log('ini product', product);
+    // console.log('ini product', product);
     const result = async () =>
       await searchRecomendation({ product, index: 0, operator: 'OR' });
 
-- 
cgit v1.2.3


From 2376bb4ab8f791ce6b99e70478f792b525d4d5fe Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 2 Aug 2024 09:23:13 +0700
Subject: <iman> update fetch data promo

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

(limited to 'src')

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