Merge branch 'master' into development_tri/implementasi_raja_ongkir

# Conflicts:
#	src/lib/checkout/components/Checkout.jsx

2 files changed, 43 insertions, 29 deletions

diff --git a/src/core/components/elements/Footer/BasicFooter.jsx b/src/core/components/elements/Footer/BasicFooter.jsx
index 42698cb2..d340ff3e 100644
--- a/src/core/components/elements/Footer/BasicFooter.jsx
+++ b/src/core/components/elements/Footer/BasicFooter.jsx
@@ -8,6 +8,7 @@ import {
 import Link from '../Link/Link'
 import MobileView from '../../views/MobileView'
 import DesktopView from '../../views/DesktopView'
+import whatsappUrl from '@/core/utils/whatsappUrl'
 
 const BasicFooter = () => {
   return (
@@ -22,6 +23,7 @@ const BasicFooter = () => {
             </div>
 
             <OfficeLocation />
+            <AboutUs />
             {/* <WarehouseLocation /> */}
             <InformationCenter />
             <OpenHours />
@@ -29,7 +31,7 @@ const BasicFooter = () => {
           </div>
 
           <div className='w-1/2 flex flex-col gap-y-4 pl-1.5'>
-            <AboutUs />
+            <Form />
             <CustomerGuide />
             <Payments />
           </div>
@@ -49,6 +51,7 @@ const BasicFooter = () => {
               <InformationCenter />
             </div>
             <CustomerGuide />
+            <Form />
             <AboutUs />
             <div className='w-3/12'>
               <div className='grid grid-cols-1 gap-y-4'>
@@ -99,31 +102,22 @@ const AboutUs = () => (
     <div className={`${headerClassName} mb-3`}>Tentang Kami</div>
     <ul className='flex flex-col gap-y-2'>
       <li>
-        <InternalItemLink href='/'>Company Profile</InternalItemLink>
-      </li>
-      <li>
-        <InternalItemLink href='/'>Karir</InternalItemLink>
-      </li>
-      <li>
-        <InternalItemLink href='/'>Pelanggan Kami</InternalItemLink>
+        <InternalItemLink href='/tentang-kami'>Company Profile</InternalItemLink>
       </li>
       <li>
-        <InternalItemLink href='/'>Menjadi Supplier</InternalItemLink>
+        <InternalItemLink href='/pelanggan-kami'>Pelanggan Kami</InternalItemLink>
       </li>
       <li>
-        <InternalItemLink href='/'>Garansi dan Pengembalian</InternalItemLink>
+        <InternalItemLink href='/hubungi-kami'>Hubungi Kami</InternalItemLink>
       </li>
       <li>
-        <InternalItemLink href='/'>Metode Pembayaran</InternalItemLink>
+        <InternalItemLink href='/karir'>Karir</InternalItemLink>
       </li>
       <li>
-        <InternalItemLink href='/'>Metode Pengiriman</InternalItemLink>
+        <InternalItemLink href='/syarat-ketentuan'>Syarat & Ketentuan</InternalItemLink>
       </li>
       <li>
-        <InternalItemLink href='/'>Testimonial</InternalItemLink>
-      </li>
-      <li>
-        <InternalItemLink href='/'>Kebijakan Privacy</InternalItemLink>
+        <InternalItemLink href='/kebijakan-privasi'>Kebijakan Privasi</InternalItemLink>
       </li>
     </ul>
   </div>
@@ -131,34 +125,53 @@ const AboutUs = () => (
 
 const CustomerGuide = () => (
   <div>
-    <div className={`${headerClassName} mb-3`}>Panduan Pelanggan</div>
+    <div className={`${headerClassName} mb-3`}>Bantuan & Panduan</div>
     <ul className='flex flex-col gap-y-2'>
       <li>
-        <InternalItemLink href='/'>Panduan Belanja</InternalItemLink>
+        <InternalItemLink href='/metode-pembayaran'>Metode Pembayaran</InternalItemLink>
       </li>
       <li>
-        <InternalItemLink href='/'>F.A.Q</InternalItemLink>
+        <InternalItemLink href='/metode-pengiriman'>Metode Pengiriman</InternalItemLink>
       </li>
       <li>
-        <InternalItemLink href='/'>Kebijakan Privasi</InternalItemLink>
+        <InternalItemLink href='/panduan-belanja'>Panduan Belanja</InternalItemLink>
       </li>
       <li>
-        <InternalItemLink href='/'>Pengajuan Tempo</InternalItemLink>
+        <InternalItemLink href='/panduan-quotation'>Panduan Quotation</InternalItemLink>
       </li>
       <li>
-        <InternalItemLink href='/'>Garansi Produk</InternalItemLink>
+        <InternalItemLink href='/pengembalian-barang-dana'>
+          Pengembalian Barang & Dana
+        </InternalItemLink>
       </li>
       <li>
-        <InternalItemLink href='/'>Online Quotation</InternalItemLink>
+        <InternalItemLink href='/informasi-garansi'>Informasi Garansi</InternalItemLink>
       </li>
       <li>
-        <InternalItemLink href='/'>Pengiriman</InternalItemLink>
+        <InternalItemLink href='/panduan-pick-up-service'>Panduan Pick Up Service</InternalItemLink>
+      </li>
+    </ul>
+  </div>
+)
+
+const Form = () => (
+  <div>
+    <div className={`${headerClassName} mb-3`}>Formulir</div>
+    <ul className='flex flex-col gap-y-2'>
+      <li>
+        <InternalItemLink href='/my/kunjungan-sales'>Kunjungan Sales</InternalItemLink>
       </li>
       <li>
-        <InternalItemLink href='/'>Pembayaran</InternalItemLink>
+        <InternalItemLink href='/my/kunjungan-service'>Kunjungan Service</InternalItemLink>
       </li>
       <li>
-        <InternalItemLink href='/'>Syarat & Ketentuan</InternalItemLink>
+        <InternalItemLink href='/my/pembayaran-tempo'>Pembayaran Tempo</InternalItemLink>
+      </li>
+      <li>
+        <InternalItemLink href='/my/surat-dukungan'>Surat Dukungan</InternalItemLink>
+      </li>
+      <li>
+        <InternalItemLink href='/my/daftar-merchant'>Daftar Merchant</InternalItemLink>
       </li>
     </ul>
   </div>
@@ -178,7 +191,7 @@ const InformationCenter = () => (
       </li>
       <li className='text-gray_r-12/80 flex items-center'>
         <DevicePhoneMobileIcon className='w-[18px] mr-2' />
-        <a href='https://wa.me/628128080622' target='_blank' rel='noreferrer'>
+        <a href={whatsappUrl()} target='_blank' rel='noreferrer'>
           0812-8080-622
         </a>
       </li>
@@ -205,7 +218,7 @@ const OpenHours = () => (
 const SocialMedias = () => (
   <div>
     <div className={headerClassName + 'block md:hidden'}>Temukan Kami</div>
-    <div className='flex flex-wrap gap-2'>
+    <div className='flex flex-wrap gap-2 mt-2'>
       <NextImage src='/images/socials/Whatsapp.png' alt='Whatsapp Logo' width={24} height={24} />
       <NextImage src='/images/socials/Facebook.png' alt='Facebook Logo' width={24} height={24} />
       <NextImage src='/images/socials/Twitter.png' alt='Twitter Logo' width={24} height={24} />
diff --git a/src/core/components/elements/Footer/SimpleFooter.jsx b/src/core/components/elements/Footer/SimpleFooter.jsx
index 41ca6094..26f7f786 100644
--- a/src/core/components/elements/Footer/SimpleFooter.jsx
+++ b/src/core/components/elements/Footer/SimpleFooter.jsx
@@ -1,3 +1,4 @@
+import whatsappUrl from '@/core/utils/whatsappUrl'
 import {
   DevicePhoneMobileIcon,
   EnvelopeIcon,
@@ -20,7 +21,7 @@ const SimpleFooter = () => (
         </li>
         <li className='text-gray_r-12/80 flex items-center'>
           <DevicePhoneMobileIcon className='w-[18px] mr-2' />
-          <a href='https://wa.me/628128080622' target='_blank' rel='noreferrer'>
+          <a href={whatsappUrl()} target='_blank' rel='noreferrer'>
             0812-8080-622
           </a>
         </li>