From c69b71c16ff7cc7a347394710d069ef711db08bb Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Fri, 15 Nov 2024 14:55:36 +0700
Subject: cr logic generate keywords

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

diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index 1f0ff504..a789b469 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -73,8 +73,9 @@ export default async function handler(req, res) {
 
   const formattedQuery = `(${newQ
     .split(' ')
-    .map((term) => `${term}*`)
+    .map((term) => (term.length < 2 ? term : `${term}*`)) // Tambahkan '*' hanya jika panjang kata >= 2
     .join(' ')})`;
+
   const mm =
     checkQ.length > 2
       ? checkQ.length > 5
@@ -94,6 +95,17 @@ export default async function handler(req, res) {
   }
   const fq_ = filterQueries.join(' AND ');
 
+  let keywords = newQ;
+  if (source === 'similar' || checkQ.length < 3) {
+    if (checkQ.length < 2 || checkQ[1].length < 2) {
+      keywords = newQ ;
+    } else {
+      keywords = newQ + '*';
+    }
+  } else {
+    keywords = formattedQuery;
+  }
+
   let offset = (page - 1) * limit;
   let parameter = [
     'facet.field=manufacture_name_s',
@@ -102,13 +114,7 @@ export default async function handler(req, res) {
     'indent=true',
     `facet.query=${escapeSolrQuery(q)}`,
     `q.op=OR`,
-    `q=${
-      source == 'similar' || checkQ.length < 3
-        ? checkQ.length < 2
-          ? newQ
-          : newQ + '*'
-        : formattedQuery
-    }`,
+    `q=${keywords}`,
     `defType=edismax`,
     'qf=name_s description_clean_t category_name manufacture_name_s variants_code_t variants_name_t category_id_ids default_code_s manufacture_id_i category_id_i  ',
     `start=${parseInt(offset)}`,
-- 
cgit v1.2.3


From d47c3be772016dfcc2906ff024d53e9a2b27876e Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Sat, 16 Nov 2024 11:07:24 +0700
Subject: <iman> add tag google

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

diff --git a/src/pages/_document.jsx b/src/pages/_document.jsx
index 6af6294f..4b67c3f9 100644
--- a/src/pages/_document.jsx
+++ b/src/pages/_document.jsx
@@ -115,6 +115,19 @@ export default function MyDocument() {
           }}
         />
 
+        <Script
+          async
+          id='gtag-config'
+          strategy='afterInteractive'
+          dangerouslySetInnerHTML={{
+            __html: `
+            gtag('config', 'AW-954540379/fCU8CI3Y8OoZENvClMcD', {
+              'phone_conversion_number': '(021) 29338828'
+            });
+          `,
+          }}
+        />
+
         {/* <Script
           id='tawk-script-tag'
           strategy='afterInteractive'
-- 
cgit v1.2.3


From 652c0f30dfeac7f6881193336c85257f02373586 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Sat, 16 Nov 2024 11:27:50 +0700
Subject: <iman> update number telp

---
 src/core/components/elements/Footer/BasicFooter.jsx  | 2 +-
 src/core/components/elements/Footer/SimpleFooter.jsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/components/elements/Footer/BasicFooter.jsx b/src/core/components/elements/Footer/BasicFooter.jsx
index 4688b15b..05dc4d8c 100644
--- a/src/core/components/elements/Footer/BasicFooter.jsx
+++ b/src/core/components/elements/Footer/BasicFooter.jsx
@@ -264,7 +264,7 @@ const InformationCenter = () => (
       <li className='text-gray_r-12/80 flex items-center'>
         <PhoneArrowUpRightIcon className='w-[18px] mr-2' />
         <a href='tel:02129338828' target='_blank' rel='noreferrer'>
-          (021) 2933-8828
+          (021) 29338828
         </a>
       </li>
       <li className='text-gray_r-12/80 flex items-center'>
diff --git a/src/core/components/elements/Footer/SimpleFooter.jsx b/src/core/components/elements/Footer/SimpleFooter.jsx
index 371b1652..1f5e13e7 100644
--- a/src/core/components/elements/Footer/SimpleFooter.jsx
+++ b/src/core/components/elements/Footer/SimpleFooter.jsx
@@ -13,7 +13,7 @@ const SimpleFooter = () => (
       <ul className='flex flex-col gap-y-2'>
         <li className='text-gray_r-12/80 flex items-center'>
           <PhoneArrowUpRightIcon className='w-[18px] mr-2' />
-          <a href='tel:02129338828'>(021) 2933-8828 / 29</a>
+          <a href='tel:02129338828'>(021) 29338828</a>
         </li>
         <li className='text-gray_r-12/80 flex items-center'>
           <EnvelopeIcon className='w-[18px] mr-2' />
-- 
cgit v1.2.3


From 22a13e2a115dc76fda0f72efbec57f39055af2a3 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 18 Nov 2024 08:27:26 +0700
Subject: <iman> fix code no data search

---
 src/lib/flashSale/components/FlashSale.jsx           | 2 +-
 src/lib/flashSale/components/FlashSaleNonDisplay.jsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/flashSale/components/FlashSale.jsx b/src/lib/flashSale/components/FlashSale.jsx
index 89c46de4..8be1d7a6 100644
--- a/src/lib/flashSale/components/FlashSale.jsx
+++ b/src/lib/flashSale/components/FlashSale.jsx
@@ -69,7 +69,7 @@ const FlashSaleProduct = ({ flashSaleId }) => {
   useEffect(() => {
     const loadProducts = async () => {
       const dataProducts = await productSearchApi({
-        query: `fq=flashsale_id_i:${flashSaleId}&fq=flashsale_price_f:[1 TO *]&limit=500&orderBy=flashsale-price-asc`,
+        query: `fq=flashsale_id_i:${flashSaleId}&fq=flashsale_price_f:[1 TO *]&limit=500&orderBy=flashsale-price-asc&source=similar`,
         operation: 'AND',
       });
       setProducts(dataProducts.response);
diff --git a/src/lib/flashSale/components/FlashSaleNonDisplay.jsx b/src/lib/flashSale/components/FlashSaleNonDisplay.jsx
index c91de2be..4b420fac 100644
--- a/src/lib/flashSale/components/FlashSaleNonDisplay.jsx
+++ b/src/lib/flashSale/components/FlashSaleNonDisplay.jsx
@@ -56,7 +56,7 @@ const FlashSaleProduct = ({ flashSaleId }) => {
   useEffect(() => {
     const loadProducts = async () => {
       const dataProducts = await productSearchApi({
-        query: `fq=-flashsale_id_i:${flashSaleId}&fq=flashsale_price_f:[1 TO *]&limit=25&orderBy=flashsale-discount-desc`,
+        query: `fq=-flashsale_id_i:${flashSaleId}&fq=flashsale_price_f:[1 TO *]&limit=25&orderBy=flashsale-discount-desc&source=similar`,
         operation: 'AND',
       });
       setProducts(dataProducts.response);
-- 
cgit v1.2.3


From c3ff9d2b35efd260bf7bfa7cc924ed05b8f9418f Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 18 Nov 2024 08:29:50 +0700
Subject: <iman> fix bug

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

diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index 1f0ff504..4b59f741 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -89,8 +89,8 @@ export default async function handler(req, res) {
   ];
 
   if (fq && source != 'similar') {
-    // filterQueries.push(fq);
-    fq.push(...filterQueries);
+    filterQueries.push(fq);
+    // fq.push(...filterQueries);
   }
   const fq_ = filterQueries.join(' AND ');
 
-- 
cgit v1.2.3


From ee02e383573a901f2da1206c4b59307a8d0c597e Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Mon, 18 Nov 2024 10:35:52 +0700
Subject: bugs fix search category dinamis

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

diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index f7b044aa..a6d8a7d6 100644
--- a/src/lib/product/components/ProductSearch.jsx
+++ b/src/lib/product/components/ProductSearch.jsx
@@ -114,7 +114,7 @@ const ProductSearch = ({
     if (prefixUrl.includes('category')) {
       const ids = collectIds(dataCategoriesProduct);
       const newQuery = {
-        fq: `category_id_ids:(${ids.join(' OR ')})`,
+        fq: [`category_id_ids:(${ids.join(' OR ')})`],
         page: router.query.page ? router.query.page : 1,
         brand: router.query.brand ? router.query.brand : '',
         category: router.query.category ? router.query.category : '',
-- 
cgit v1.2.3


From 986e2e47037c6d99b184ec0edc1fbf591f0582a8 Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Mon, 18 Nov 2024 10:51:34 +0700
Subject: bug fix search category dinanmis

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

diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index 4fc2ab2b..65927bbc 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -19,6 +19,10 @@ export default async function handler(req, res) {
     source = '',
   } = req.query;
 
+  
+  
+  console.log('fq new', fq);
+
   let { stock = '' } = req.query;
 
   let paramOrderBy = '';
@@ -89,9 +93,10 @@ export default async function handler(req, res) {
     'price_tier1_v2_f:[1 TO *]',
   ];
 
-  if (fq && source != 'similar') {
-    filterQueries.push(fq);
-    // fq.push(...filterQueries);
+
+  if (fq && source != 'similar' && typeof fq != 'string') {
+    // filterQueries.push(fq);
+    fq.push(...filterQueries);
   }
   const fq_ = filterQueries.join(' AND ');
 
@@ -159,7 +164,7 @@ export default async function handler(req, res) {
   if (stock) parameter.push(`fq=stock_total_f:{1 TO *}`);
 
   // Single fq in url params
-  // if (typeof fq === 'string') parameter.push(`fq=${encodeURIComponent(fq)}`);
+  if (typeof fq === 'string') parameter.push(`fq=${encodeURIComponent(fq)}`);
   // Multi fq in url params
   if (Array.isArray(fq))
     parameter = parameter.concat(
-- 
cgit v1.2.3


From 31b0c79103bc32e7c7aa30c6d96c896b094c2bb2 Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Mon, 18 Nov 2024 10:56:27 +0700
Subject: ketinggalan

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

diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index a6d8a7d6..f7b044aa 100644
--- a/src/lib/product/components/ProductSearch.jsx
+++ b/src/lib/product/components/ProductSearch.jsx
@@ -114,7 +114,7 @@ const ProductSearch = ({
     if (prefixUrl.includes('category')) {
       const ids = collectIds(dataCategoriesProduct);
       const newQuery = {
-        fq: [`category_id_ids:(${ids.join(' OR ')})`],
+        fq: `category_id_ids:(${ids.join(' OR ')})`,
         page: router.query.page ? router.query.page : 1,
         brand: router.query.brand ? router.query.brand : '',
         category: router.query.category ? router.query.category : '',
-- 
cgit v1.2.3


From ab35d72d65501251f579adf210051e2847cad41b Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Mon, 18 Nov 2024 10:59:40 +0700
Subject: CR gtag user_data on page checkout

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

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index afbf1e6c..4c5cca62 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -37,6 +37,18 @@ const SELF_PICKUP_ID = 32;
 const { checkoutApi } = require('../api/checkoutApi');
 const { getProductsCheckout } = require('../api/checkoutApi');
 
+function convertToInternational(number) {
+  if (typeof number !== 'string') {
+      throw new Error("Input harus berupa string");
+  }
+
+  if (number.startsWith('08')) {
+      return '+62' + number.slice(2);
+  }
+
+  return number;
+}
+
 const Checkout = () => {
   const router = useRouter();
   const query = router.query.source ?? null;
@@ -491,7 +503,7 @@ const Checkout = () => {
 
       gtag('set', 'user_data', {
         email: auth.email,
-        phone_number: auth.mobile ?? auth.phone,
+        phone_number: convertToInternational(auth.mobile) ?? convertToInternational(auth.phone),
       });
 
       for (const product of products) deleteItemCart({ productId: product.id });
-- 
cgit v1.2.3


From bde516b6b39cccfe8ac3248cd7f85592e6298d7a Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Mon, 18 Nov 2024 11:24:56 +0700
Subject: add google tag allow_enhanced_conversions

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

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index 4c5cca62..6fb5cdb4 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -506,6 +506,8 @@ const Checkout = () => {
         phone_number: convertToInternational(auth.mobile) ?? convertToInternational(auth.phone),
       });
 
+      gtag('config', 'AW-954540379', { ' allow_enhanced_conversions':true } ) ;
+
       for (const product of products) deleteItemCart({ productId: product.id });
       if (grandTotal > 0) {
         const payment = await axios.post(
-- 
cgit v1.2.3