Merge branch 'new-release' into feature/integrasi_biteship

7 files changed, 50 insertions, 24 deletions

diff --git a/src/pages/_app.jsx b/src/pages/_app.jsx
index bcb41dd6..f52aa5f7 100644
--- a/src/pages/_app.jsx
+++ b/src/pages/_app.jsx
@@ -85,7 +85,7 @@ function MyApp({ Component, pageProps: { session, ...pageProps } }) {
   return (
     <SessionProvider session={session}>
       <ScrollToTop />
-      
+
       <AnimatePresence>
         {animateLoader && (
           <motion.div
diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js
index bc1c014b..ace281f7 100644
--- a/src/pages/api/shop/search.js
+++ b/src/pages/api/shop/search.js
@@ -88,7 +88,7 @@ export default async function handler(req, res) {
     'price_tier1_v2_f:[1 TO *]',
   ];
 
-  if(fq){
+  if (fq && source != 'similar') {
     filterQueries.push(fq);
   }
   const fq_ = filterQueries.join(' AND ');
diff --git a/src/pages/api/shop/variant-detail.js b/src/pages/api/shop/variant-detail.js
index 08ce75b8..af3525b3 100644
--- a/src/pages/api/shop/variant-detail.js
+++ b/src/pages/api/shop/variant-detail.js
@@ -1,21 +1,28 @@
-import { productMappingSolr, variantsMappingSolr } from '@/utils/solrMapping'
-import axios from 'axios'
+import { productMappingSolr, variantsMappingSolr } from '@/utils/solrMapping';
+import axios from 'axios';
 
 export default async function handler(req, res) {
   try {
     let productVariants = await axios(
       process.env.SOLR_HOST +
         `/solr/variants/select?q=id:${req.query.id}&q.op=OR&indent=true`
-    )
-    let auth  = req.query.auth === 'false' ? JSON.parse(req.query.auth) : req.query.auth
+    );
+    let template_id = productVariants.data.response.docs[0].template_id_i;
+    let auth =
+      req.query.auth === 'false' ? JSON.parse(req.query.auth) : req.query.auth;
     let productTemplate = await axios(
-      process.env.SOLR_HOST + `/solr/product/select?q=id:${req.query.id}&q.op=OR&indent=true`
-    )
-    let result = variantsMappingSolr(productTemplate.data.response.docs, productVariants.data.response.docs, auth || false)
-    
-    res.status(200).json(result)
+      process.env.SOLR_HOST +
+        `/solr/product/select?q=id:${template_id}&q.op=OR&indent=true`
+    );
+    let result = variantsMappingSolr(
+      productTemplate.data.response.docs,
+      productVariants.data.response.docs,
+      auth || false
+    );
+
+    res.status(200).json(result);
   } catch (error) {
-    console.error('Error fetching data from Solr:', error)
-    res.status(500).json({ error: 'Internal Server Error' })
+    console.error('Error fetching data from Solr:', error);
+    res.status(500).json({ error: 'Internal Server Error' });
   }
-}
\ No newline at end of file
+}
diff --git a/src/pages/garansi-resmi.jsx b/src/pages/garansi-resmi.jsx
new file mode 100644
index 00000000..7384a89d
--- /dev/null
+++ b/src/pages/garansi-resmi.jsx
@@ -0,0 +1,13 @@
+import Seo from '@/core/components/Seo'
+import BasicLayout from '@/core/components/layouts/BasicLayout'
+import IframeContent from '@/lib/iframe/components/IframeContent'
+
+export default function GaransiResmi() {
+  return (
+    <BasicLayout>
+      <Seo title='Garansi Resmi - Indoteknik.com' />
+
+      <IframeContent url={`${process.env.NEXT_PUBLIC_ODOO_HOST}/content?url=garansi-resmi`} />
+    </BasicLayout>
+  )
+}
diff --git a/src/pages/pembayaran-tempo.jsx b/src/pages/pembayaran-tempo.jsx
new file mode 100644
index 00000000..363e3099
--- /dev/null
+++ b/src/pages/pembayaran-tempo.jsx
@@ -0,0 +1,13 @@
+import Seo from '@/core/components/Seo'
+import BasicLayout from '@/core/components/layouts/BasicLayout'
+import IframeContent from '@/lib/iframe/components/IframeContent'
+
+export default function PembnayaranTempo() {
+  return (
+    <BasicLayout>
+      <Seo title='Pambayaran Tempo - Indoteknik.com' />
+
+      <IframeContent url={`${process.env.NEXT_PUBLIC_ODOO_HOST}/content?url=pembayaran-tempo`} />
+    </BasicLayout>
+  )
+}
diff --git a/src/pages/shop/find/[slug].jsx b/src/pages/shop/find/[slug].jsx
index 7174a9fb..268b1e56 100644
--- a/src/pages/shop/find/[slug].jsx
+++ b/src/pages/shop/find/[slug].jsx
@@ -53,12 +53,12 @@ export default function FindPage() {
   return (
     <BasicLayout>
       <Seo
-        title={`Jual ${slug} Original - indoteknik.com`}
-        description={`Jual ${slug} Kirim Jakarta Surabaya Semarang Makassar Manado Denpasar Balikpapan Medan Palembang Lampung Bali Bandung Makassar Manado.`}
+        title={`Beli ${slug} Original &  Harga Terjangkau - indoteknik.com`}
+        description={`Beli ${slug} Kirim Jakarta Surabaya Semarang Makassar Manado Denpasar Balikpapan Medan Palembang Lampung Bali Bandung Makassar Manado.`}
         additionalMetaTags={[
           {
             property: 'keywords',
-            content: `Jual ${slug}, harga ${slug}, ${slug} murah, toko ${slug}, ${slug} jakarta, ${slug} surabaya`,
+            content: `Beli  ${slug}, harga ${slug}, ${slug} murah, toko ${slug}, ${slug} jakarta, ${slug} surabaya`,
 
           },
         ]}
diff --git a/src/pages/shop/product/variant/[slug].jsx b/src/pages/shop/product/variant/[slug].jsx
index 42f38774..2c0dd64b 100644
--- a/src/pages/shop/product/variant/[slug].jsx
+++ b/src/pages/shop/product/variant/[slug].jsx
@@ -32,16 +32,9 @@ export async function getServerSideProps(context) {
       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 regexHtmlTagsExceptP = /<\/?(?!p\b)[^>]*>/g
-    product.description = product.description
-      .replace(regexHtmlTagsExceptP, ' ')
-      .replace(regexHtmlTags, ' ')
-      .trim()*/
   } else {
     product = null;
   }