Merge branch 'new-release' into Feature/switch-account

# Conflicts:
#	src-migrate/modules/register/components/FormBisnis.tsx
#	src/lib/auth/components/Menu.jsx

14 files changed, 180 insertions, 87 deletions

diff --git a/src/pages/api/flashsale-header.js b/src/pages/api/flashsale-header.js
index 31f8efdd..578801ae 100644
--- a/src/pages/api/flashsale-header.js
+++ b/src/pages/api/flashsale-header.js
@@ -15,23 +15,41 @@ export default async function handler(req, res) {
   try {
     await connectRedis();
     const cacheKey = `flashsale_header`;
-    // await client.del(cacheKey);
+
+    // Cek data yang ada di Redis
     let cachedData = await client.get(cacheKey);
 
     if (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`);
+      if (flashSale.length === 0) {
+        return res.status(200).json({ data: [] });
+      } else {
+        await client.set(
+          cacheKey,
+          JSON.stringify(flashSale),
+          'EX',
+          flashSale.duration
+        );
 
-      await client.set(
-        cacheKey,
-        JSON.stringify(flashSale),
-        'EX',
-        flashSale.duration
-      );
-      cachedData = await client.get(cacheKey);
-      return res.status(200).json({ data: cachedData });
+        cachedData = await client.get(cacheKey);
+        const data = JSON.parse(cachedData);
+        return res.status(200).json({ data });
+      }
     }
   } catch (error) {
     console.error('Error interacting with Redis or fetching data:', error);
diff --git a/src/pages/api/hero-banner.js b/src/pages/api/hero-banner.js
index 7a348cfa..b7f3c1c5 100644
--- a/src/pages/api/hero-banner.js
+++ b/src/pages/api/hero-banner.js
@@ -28,6 +28,8 @@ export default async function handler(req, res) {
         `/api/v1/banner?type=${type}`
       );
 
+      if(!dataBannerSections) return res.status(200).json({ data: [] });
+
       // Simpan hasil fetch ke Redis dengan masa kadaluarsa 3 hari (259200 detik)
       await client.set(
         cacheKey,
diff --git a/src/pages/api/search-flashsale.js b/src/pages/api/search-flashsale.js
index d9e56c83..c00f6c64 100644
--- a/src/pages/api/search-flashsale.js
+++ b/src/pages/api/search-flashsale.js
@@ -23,20 +23,28 @@ export default async function handler(req, res) {
 
     if (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: [] });
+      }
       return res.status(200).json({ data });
     } else {
       const dataProductSearch = await axios(
         `${process.env.NEXT_PUBLIC_SELF_HOST}/api/shop/search?${query}&operation=${operation}]`
       );
-
-      await client.set(
-        cacheKey,
-        JSON.stringify(dataProductSearch.data),
-        'EX',
-        duration
-      );
-      cachedData = await client.get(cacheKey);
-      return res.status(200).json({ data: cachedData });
+      if (dataProductSearch.data.length === 0) {
+        return res.status(200).json({ data: [] });
+      } else {
+        await client.set(
+          cacheKey,
+          JSON.stringify(dataProductSearch.data),
+          'EX',
+          duration
+        );
+        cachedData = await client.get(cacheKey);
+        return res.status(200).json({ data: cachedData });
+      }
     }
   } catch (error) {
     console.error('Error interacting with Redis or fetching data:', error);
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/index.jsx b/src/pages/index.jsx
index 2ec1231a..fce2202a 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -1,22 +1,26 @@
 import { HeroBannerSkeleton } from '@/components/skeleton/BannerSkeleton';
 import { PopularProductSkeleton } from '@/components/skeleton/PopularProductSkeleton';
-import odooApi from '@/core/api/odooApi';
 import Seo from '@/core/components/Seo';
 import DelayRender from '@/core/components/elements/DelayRender/DelayRender';
 import DesktopView from '@/core/components/views/DesktopView';
 import MobileView from '@/core/components/views/MobileView';
-import { FlashSaleSkeleton } from '@/lib/flashSale/skeleton/FlashSaleSkeleton';
-import BannerPromoSkeleton from '@/lib/home/components/Skeleton/BannerPromoSkeleton';
 import PreferredBrandSkeleton from '@/lib/home/components/Skeleton/PreferredBrandSkeleton';
 import dynamic from 'next/dynamic';
-import { useEffect, useRef, useState } from 'react';
+import { useRef } from 'react';
 import { getAuth } from '~/libs/auth';
-import PagePopupIformation from '~/modules/popup-information'; // need change to dynamic and ssr : false
-import CategoryPilihan from '../lib/home/components/CategoryPilihan';
-// import { getAuth } from '~/libs/auth';
 
 const BasicLayout = dynamic(() =>
-  import('@/core/components/layouts/BasicLayout'),{ssr: false}
+  import('@/core/components/layouts/BasicLayout')
+);
+
+const PagePopupIformation = dynamic(() =>
+  import('~/modules/popup-information'), {
+    ssr: false
+  }
+);
+
+const CategoryPilihan = dynamic(() =>
+  import('../lib/home/components/CategoryPilihan')
 );
 const HeroBanner = dynamic(() => import('@/components/ui/HeroBanner'), {
   loading: () => <HeroBannerSkeleton />,
@@ -40,24 +44,17 @@ const PreferredBrand = dynamic(
 
 const FlashSale = dynamic(
   () => import('@/lib/flashSale/components/FlashSale'),
-  {
-    loading: () => <FlashSaleSkeleton />,
-  }
 );
 
 const ProgramPromotion = dynamic(
-  () => import('@/lib/home/components/PromotionProgram'),
-  {
-    loading: () => <BannerPromoSkeleton />,
-  }
+  () => import('@/lib/home/components/PromotionProgram')
 );
 
 const BannerSection = dynamic(() =>
   import('@/lib/home/components/BannerSection')
 );
 const CategoryHomeId = dynamic(
-  () => import('@/lib/home/components/CategoryHomeId'),
-  { ssr: false }
+  () => import('@/lib/home/components/CategoryHomeId')
 );
 
 const CategoryDynamic = dynamic(() =>
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/menu.jsx b/src/pages/my/menu.jsx
index a0ce223e..1b35d6ba 100644
--- a/src/pages/my/menu.jsx
+++ b/src/pages/my/menu.jsx
@@ -1,24 +1,24 @@
-import Divider from '@/core/components/elements/Divider/Divider'
-import Link from '@/core/components/elements/Link/Link'
-import AppLayout from '@/core/components/layouts/AppLayout'
-import useAuth from '@/core/hooks/useAuth'
-import { deleteAuth } from '@/core/utils/auth'
-import IsAuth from '@/lib/auth/components/IsAuth'
-import { ChevronRightIcon, UserIcon } from '@heroicons/react/24/solid'
-import { signOut, useSession } from 'next-auth/react'
-import { useRouter } from 'next/router'
-import ImageNext from 'next/image'
-
+import Divider from '@/core/components/elements/Divider/Divider';
+import Link from '@/core/components/elements/Link/Link';
+import AppLayout from '@/core/components/layouts/AppLayout';
+import useAuth from '@/core/hooks/useAuth';
+import { deleteAuth } from '@/core/utils/auth';
+import IsAuth from '@/lib/auth/components/IsAuth';
+import { ChevronRightIcon, UserIcon } from '@heroicons/react/24/solid';
+import { signOut, useSession } from 'next-auth/react';
+import { useRouter } from 'next/router';
+import ImageNext from 'next/image';
+import whatsappUrl from '@/core/utils/whatsappUrl';
 export default function Menu() {
-  const auth = useAuth()
-  const router = useRouter()
-  const { data: session } = useSession()
+  const auth = useAuth();
+  const router = useRouter();
+  const { data: session } = useSession();
 
   const logout = () => {
     deleteAuth().then(() => {
-      router.push('/login')
-    })
-  }
+      router.push('/login');
+    });
+  };
 
   return (
     <IsAuth>
@@ -29,8 +29,12 @@ export default function Menu() {
           </div>
           <div className='ml-4'>
             <div className='font-semibold text-gray_r-12'>{auth?.name}</div>
-            {auth?.company && <div className='badge-solid-red mt-1'>Akun Bisnis</div>}
-            {!auth?.company && <div className='badge-gray mt-1'>Akun Individu</div>}
+            {auth?.company && (
+              <div className='badge-solid-red mt-1'>Akun Bisnis</div>
+            )}
+            {!auth?.company && (
+              <div className='badge-gray mt-1'>Akun Individu</div>
+            )}
           </div>
           <div className='ml-auto !text-gray_r-12'>
             <ChevronRightIcon className='w-6' />
@@ -47,32 +51,52 @@ export default function Menu() {
               <LinkItem href='/my/quotations'>
                 {' '}
                 <div className='flex gap-x-3 items-center'>
-                  <ImageNext src='/images/icon/icon_daftar_quotation.svg' width={18} height={20} />
+                  <ImageNext
+                    src='/images/icon/icon_daftar_quotation.svg'
+                    width={18}
+                    height={20}
+                  />
                   <p>Daftar Quotation</p>
                 </div>
               </LinkItem>
               <LinkItem href='/my/transactions'>
                 <div className='flex gap-x-3 items-center'>
-                  <ImageNext src='/images/icon/icon_daftar_transaksi.svg' width={18} height={20} />
+                  <ImageNext
+                    src='/images/icon/icon_daftar_transaksi.svg'
+                    width={18}
+                    height={20}
+                  />
                   <p>Daftar Transaksi</p>
                 </div>
               </LinkItem>
               <LinkItem href='/my/shipments'>
                 <div className='flex gap-x-3 items-center'>
-                  <ImageNext src='/images/icon/icon_pengiriman.svg' width={18} height={20} />
+                  <ImageNext
+                    src='/images/icon/icon_pengiriman.svg'
+                    width={18}
+                    height={20}
+                  />
                   <p>Daftar Pengiriman</p>
                 </div>
               </LinkItem>
               <LinkItem href='/my/invoices'>
                 {' '}
                 <div className='flex gap-x-3 items-center'>
-                  <ImageNext src='/images/icon/icon_invoice.svg' width={18} height={20} />
+                  <ImageNext
+                    src='/images/icon/icon_invoice.svg'
+                    width={18}
+                    height={20}
+                  />
                   <p>Invoice & Faktur Pajak</p>
                 </div>
               </LinkItem>
               <LinkItem href='/my/wishlist'>
                 <div className='flex gap-x-3 items-center'>
-                  <ImageNext src='/images/icon/icon_wishlist.svg' width={18} height={20} />
+                  <ImageNext
+                    src='/images/icon/icon_wishlist.svg'
+                    width={18}
+                    height={20}
+                  />
                   <p>Wishlist</p>
                 </div>
               </LinkItem>
@@ -83,10 +107,14 @@ export default function Menu() {
             <MenuHeader>Pusat Bantuan</MenuHeader>
 
             <div className='divide-y divide-gray_r-6 border-y border-gray_r-6 mt-4'>
-              <LinkItem href='/'>
+              <LinkItem href={whatsappUrl('', '', '')}>
                 {' '}
                 <div className='flex gap-x-3 items-center'>
-                  <ImageNext src='/images/icon/icon_layanan_pelanggan.svg' width={18} height={20} />
+                  <ImageNext
+                    src='/images/icon/icon_layanan_pelanggan.svg'
+                    width={18}
+                    height={20}
+                  />
                   <p>Layanan Pelanggan</p>
                 </div>
               </LinkItem>
@@ -99,7 +127,11 @@ export default function Menu() {
             <div className='divide-y divide-gray_r-6 border-y border-gray_r-6 mt-4'>
               <LinkItem href='/my/address'>
                 <div className='flex gap-x-3 items-center'>
-                  <ImageNext src='/images/icon/icon_daftar_alamat.svg' width={18} height={20} />
+                  <ImageNext
+                    src='/images/icon/icon_daftar_alamat.svg'
+                    width={18}
+                    height={20}
+                  />
                   <p>Daftar Alamat</p>
                 </div>
               </LinkItem>
@@ -112,20 +144,23 @@ export default function Menu() {
         </div>
       </AppLayout>
     </IsAuth>
-  )
+  );
 }
 
 const MenuHeader = ({ children, ...props }) => (
   <div {...props} className='font-medium px-4 flex'>
     {children}
   </div>
-)
+);
 
 const LinkItem = ({ children, ...props }) => (
-  <Link {...props} className='!text-gray_r-12/70 !font-normal p-4 flex items-center'>
+  <Link
+    {...props}
+    className='!text-gray_r-12/70 !font-normal p-4 flex items-center'
+  >
     {children}
     <div className='ml-auto !text-gray_r-11'>
       <ChevronRightIcon className='w-5' />
     </div>
   </Link>
-)
+);
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
new file mode 100644
index 00000000..fa622d5c
--- /dev/null
+++ b/src/pages/sitemap/homepage.xml.js
@@ -0,0 +1,33 @@
+import { create } from 'xmlbuilder';
+
+export async function getServerSideProps({ res }) {
+  const links = [
+    { 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/pembayaran-tempo' },
+  ];
+  const sitemap = create('urlset', { encoding: 'utf-8' }).att(
+    'xmlns',
+    'http://www.sitemaps.org/schemas/sitemap/0.9'
+  );
+
+  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');
+  });
+
+  res.setHeader('Content-Type', 'text/xml');
+  res.write(sitemap.end());
+  res.end();
+
+  return { props: {} };
+}
+
+export default function SitemapProducts() {
+  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