Merge branch 'new-release' into Feature/pengajuan-tempo

# Conflicts:
#	src/core/components/elements/Navbar/NavbarDesktop.jsx

12 files changed, 48 insertions, 40 deletions

diff --git a/src/pages/api/flashsale-header.js b/src/pages/api/flashsale-header.js
index 21cb9c9d..578801ae 100644
--- a/src/pages/api/flashsale-header.js
+++ b/src/pages/api/flashsale-header.js
@@ -20,13 +20,19 @@ export default async function handler(req, res) {
     let cachedData = await client.get(cacheKey);
 
     if (cachedData) {
-      const data = JSON.parse(cachedData); 
+      const data = JSON.parse(cachedData);
 
       // Periksa apakah data adalah array dan panjangnya 0
       if (!data || (Array.isArray(data) && data.length === 0)) {
         await client.del(cacheKey); // Hapus kunci jika data kosong
         return res.status(200).json({ data: [] });
       }
+      // Periksa apakah end_date lebih besar dari waktu saat ini
+      const currentTime = new Date();
+      if (data[0].endDate && new Date(data[0].endDate) < currentTime) {
+        await client.del(cacheKey); // Hapus kunci jika end_date lebih kecil dari waktu saat ini
+        return res.status(200).json({ data: [] });
+      }
       return res.status(200).json({ data });
     } else {
       const flashSale = await odooApi('GET', `/api/v1/flashsale/header`);
@@ -37,11 +43,11 @@ export default async function handler(req, res) {
           cacheKey,
           JSON.stringify(flashSale),
           'EX',
-          flashSale.duration 
+          flashSale.duration
         );
 
         cachedData = await client.get(cacheKey);
-        const data = JSON.parse(cachedData); 
+        const data = JSON.parse(cachedData);
         return res.status(200).json({ data });
       }
     }
diff --git a/src/pages/api/shop/midtrans-payment.js b/src/pages/api/shop/midtrans-payment.js
index 12aaa51f..f90e9e81 100644
--- a/src/pages/api/shop/midtrans-payment.js
+++ b/src/pages/api/shop/midtrans-payment.js
@@ -3,6 +3,7 @@ import camelcaseObjectDeep from 'camelcase-object-deep'
 import midtransClient from 'midtrans-client'
 
 export default async function handler(req, res) {
+  const PPN = process.env.NEXT_PUBLIC_PPN
   const { transactionId = null } = req.query
 
   if (!transactionId) {
diff --git a/src/pages/my/daftar-merchant.jsx b/src/pages/daftar-merchant.jsx
index e1fa9bcb..e1fa9bcb 100644
--- a/src/pages/my/daftar-merchant.jsx
+++ b/src/pages/daftar-merchant.jsx
diff --git a/src/pages/google_merchant/products/[page].js b/src/pages/google_merchant/products/[page].js
index 0c2cf3c5..8395f839 100644
--- a/src/pages/google_merchant/products/[page].js
+++ b/src/pages/google_merchant/products/[page].js
@@ -6,6 +6,7 @@ import _ from 'lodash-contrib';
 import { create } from 'xmlbuilder';
 
 export async function getServerSideProps({ res, query }) {
+  const PPN = process.env.NEXT_PUBLIC_PPN
   const titleContent = 'Indoteknik.com: B2B Industrial Supply & Solution';
   const descriptionContent =
     'Temukan pilihan produk B2B Industri & Alat Teknik untuk Perusahaan, UMKM & Pemerintah dengan lengkap, mudah dan transparan.';
@@ -77,7 +78,7 @@ export async function getServerSideProps({ res, query }) {
       'g:availability': { '#text': availability },
       'g:brand': { '#text': product.manufacture?.name || '' },
       'g:price': {
-        '#text': `${Math.round(product.lowestPrice.price * 1.11)} IDR`,
+        '#text': `${Math.round(product.lowestPrice.price * PPN)} IDR`,
       },
     };
 
@@ -93,7 +94,7 @@ export async function getServerSideProps({ res, query }) {
 
     if (product.lowestPrice.discountPercentage > 0) {
       item['g:sale_price'] = {
-        '#text': `${Math.round(product.lowestPrice.priceDiscount * 1.11)} IDR`,
+        '#text': `${Math.round(product.lowestPrice.priceDiscount * PPN)} IDR`,
       };
     }
     productItems.push(item);
diff --git a/src/pages/my/kunjungan-sales.jsx b/src/pages/kunjungan-sales.jsx
index 052991d9..052991d9 100644
--- a/src/pages/my/kunjungan-sales.jsx
+++ b/src/pages/kunjungan-sales.jsx
diff --git a/src/pages/my/kunjungan-service.jsx b/src/pages/kunjungan-service.jsx
index 37de5a0b..37de5a0b 100644
--- a/src/pages/my/kunjungan-service.jsx
+++ b/src/pages/kunjungan-service.jsx
diff --git a/src/pages/my/pembayaran-tempo.jsx b/src/pages/my/pembayaran-tempo.jsx
deleted file mode 100644
index 8947bdd9..00000000
--- a/src/pages/my/pembayaran-tempo.jsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import Seo from '@/core/components/Seo'
-import BasicLayout from '@/core/components/layouts/BasicLayout'
-import PembayaranTempo from '@/lib/form/components/PembayaranTempo'
-
-export default function pembayaranTempo() {
-  return (
-    <>
-      <Seo title='Pembayaran Tempo - Indoteknik.com' />
-
-      <BasicLayout>
-        <PembayaranTempo />
-      </BasicLayout>
-    </>
-  )
-}
diff --git a/src/pages/pembayaran-tempo-detail.jsx b/src/pages/pembayaran-tempo-detail.jsx
new file mode 100644
index 00000000..363e3099
--- /dev/null
+++ b/src/pages/pembayaran-tempo-detail.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/pembayaran-tempo.jsx b/src/pages/pembayaran-tempo.jsx
index 363e3099..8947bdd9 100644
--- a/src/pages/pembayaran-tempo.jsx
+++ b/src/pages/pembayaran-tempo.jsx
@@ -1,13 +1,15 @@
 import Seo from '@/core/components/Seo'
 import BasicLayout from '@/core/components/layouts/BasicLayout'
-import IframeContent from '@/lib/iframe/components/IframeContent'
+import PembayaranTempo from '@/lib/form/components/PembayaranTempo'
 
-export default function PembnayaranTempo() {
+export default function pembayaranTempo() {
   return (
-    <BasicLayout>
-      <Seo title='Pambayaran Tempo - Indoteknik.com' />
+    <>
+      <Seo title='Pembayaran Tempo - Indoteknik.com' />
 
-      <IframeContent url={`${process.env.NEXT_PUBLIC_ODOO_HOST}/content?url=pembayaran-tempo`} />
-    </BasicLayout>
+      <BasicLayout>
+        <PembayaranTempo />
+      </BasicLayout>
+    </>
   )
 }
diff --git a/src/pages/my/request-for-quotation.jsx b/src/pages/request-for-quotation.jsx
index 40fda009..40fda009 100644
--- a/src/pages/my/request-for-quotation.jsx
+++ b/src/pages/request-for-quotation.jsx
diff --git a/src/pages/sitemap/homepage.xml.js b/src/pages/sitemap/homepage.xml.js
index 08c52112..fa622d5c 100644
--- a/src/pages/sitemap/homepage.xml.js
+++ b/src/pages/sitemap/homepage.xml.js
@@ -5,29 +5,29 @@ export async function getServerSideProps({ res }) {
     { label: 'Hubungi Kami', url: 'https://indoteknik.com/hubungi-kami' },
     { label: 'Tentang Kami', url: 'https://indoteknik.com/tentang-kami' },
     { label: 'Karir', url: 'https://indoteknik.com/karir' },
-    { label: 'Daftar Tempo', url: 'https://indoteknik.com/my/pembayaran-tempo' },
+    { label: 'Daftar Tempo', url: 'https://indoteknik.com/pembayaran-tempo' },
   ];
   const sitemap = create('urlset', { encoding: 'utf-8' }).att(
     'xmlns',
     'http://www.sitemaps.org/schemas/sitemap/0.9'
-  )
+  );
 
-  const date = new Date()
+  const date = new Date();
   links.forEach((link) => {
-    const url = sitemap.ele('url')
-    url.ele('loc', link.url)
-    url.ele('lastmod', date.toISOString().slice(0, 10))
-    url.ele('changefreq', 'daily')
-    url.ele('priority', '1.0')
-  })
+    const url = sitemap.ele('url');
+    url.ele('loc', link.url);
+    url.ele('lastmod', date.toISOString().slice(0, 10));
+    url.ele('changefreq', 'daily');
+    url.ele('priority', '1.0');
+  });
 
-  res.setHeader('Content-Type', 'text/xml')
-  res.write(sitemap.end())
-  res.end()
+  res.setHeader('Content-Type', 'text/xml');
+  res.write(sitemap.end());
+  res.end();
 
-  return { props: {} }
+  return { props: {} };
 }
 
 export default function SitemapProducts() {
-  return null
+  return null;
 }
diff --git a/src/pages/my/surat-dukungan.jsx b/src/pages/surat-dukungan.jsx
index 8058f34d..8058f34d 100644
--- a/src/pages/my/surat-dukungan.jsx
+++ b/src/pages/surat-dukungan.jsx