Merge branch 'new-release' into feature/integrasi_biteship

# Conflicts:
#	src/lib/address/components/CreateAddress.jsx
#	src/lib/address/components/EditAddress.jsx

4 files changed, 24 insertions, 14 deletions

diff --git a/src/core/components/elements/Footer/BasicFooter.jsx b/src/core/components/elements/Footer/BasicFooter.jsx
index 05dc4d8c..427157d7 100644
--- a/src/core/components/elements/Footer/BasicFooter.jsx
+++ b/src/core/components/elements/Footer/BasicFooter.jsx
@@ -224,32 +224,32 @@ const Form = () => (
     <div className={headerClassName}>Formulir</div>
     <ul className='flex flex-col gap-y-3'>
       <li>
-        <InternalItemLink href='/my/request-for-quotation'>
+        <InternalItemLink href='/request-for-quotation'>
           Request for Quotation
         </InternalItemLink>
       </li>
       <li>
-        <InternalItemLink href='/my/kunjungan-sales'>
+        <InternalItemLink href='/kunjungan-sales'>
           Kunjungan Sales
         </InternalItemLink>
       </li>
       <li>
-        <InternalItemLink href='/my/kunjungan-service'>
+        <InternalItemLink href='/kunjungan-service'>
           Kunjungan Service
         </InternalItemLink>
       </li>
       <li>
-        <InternalItemLink href='/my/pembayaran-tempo'>
-          Pembayaran Tempo
+        <InternalItemLink href='/pengajuan-tempo'>
+          Pengajuan Tempo
         </InternalItemLink>
       </li>
       <li>
-        <InternalItemLink href='/my/surat-dukungan'>
+        <InternalItemLink href='/surat-dukungan'>
           Surat Dukungan
         </InternalItemLink>
       </li>
       <li>
-        <InternalItemLink href='/my/daftar-merchant'>
+        <InternalItemLink href='/daftar-merchant'>
           Daftar Merchant
         </InternalItemLink>
       </li>
diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx
index 253a2b03..d6b1bdea 100644
--- a/src/core/components/elements/Navbar/NavbarDesktop.jsx
+++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx
@@ -117,7 +117,7 @@ const NavbarDesktop = () => {
     // };
     // handleCartChange();
 
-    setCartCount(cart?.products?.length)
+    setCartCount(cart?.products?.length);
 
     // window.addEventListener('localStorageChange', handleCartChange);
 
@@ -172,8 +172,8 @@ const NavbarDesktop = () => {
                 <MenuItem as='a' href='/tentang-kami'>
                   Tentang Indoteknik
                 </MenuItem>
-                <MenuItem as='a' href='/my/pembayaran-tempo'>
-                  Pembayaran Tempo
+                <MenuItem as='a' href='/pengajuan-tempo'>
+                  Pengajuan Tempo
                 </MenuItem>
               </MenuList>
             </Menu>
@@ -370,7 +370,11 @@ const NavbarDesktop = () => {
               )}
               {auth && (
                 <>
-                  <div href='/' className='navbar-user-dropdown-button' aria-label='User'>
+                  <div
+                    href='/'
+                    className='navbar-user-dropdown-button'
+                    aria-label='User'
+                  >
                     <span>Halo, {auth?.name}</span>
                     <div className='ml-auto'>
                       <ChevronDownIcon className='w-6' />
diff --git a/src/core/components/elements/Navbar/NavbarUserDropdown.jsx b/src/core/components/elements/Navbar/NavbarUserDropdown.jsx
index c0698b6e..b2ad6309 100644
--- a/src/core/components/elements/Navbar/NavbarUserDropdown.jsx
+++ b/src/core/components/elements/Navbar/NavbarUserDropdown.jsx
@@ -7,13 +7,11 @@ import useAuth from '@/core/hooks/useAuth';
 const NavbarUserDropdown = () => {
   const router = useRouter();
   const atuh = useAuth();
-
   const logout = async () => {
     deleteAuth().then(() => {
       router.push('/login');
     });
   };
-
   return (
     <div className='navbar-user-dropdown-wrapper'>
       <div className='navbar-user-dropdown'>
@@ -22,6 +20,12 @@ const NavbarUserDropdown = () => {
         <Link href='/my/transactions'>Daftar Transaksi</Link>
         <Link href='/my/shipments'>Daftar Pengiriman</Link>
         <Link href='/my/invoices'>Invoice & Faktur Pajak</Link>
+        {atuh &&
+          atuh.partnerTempo &&
+          (atuh.partnerTempo || atuh.tempoProgres === 'review') && (
+            <Link href='/my/tempo'>Pembayaran Tempo</Link>
+          )}
+
         <Link href='/my/wishlist'>Wishlist</Link>
         <Link href='/my/address'>Daftar Alamat</Link>
         {!atuh?.external && (
diff --git a/src/core/utils/googleTag.js b/src/core/utils/googleTag.js
index 96a6bd2e..f1550071 100644
--- a/src/core/utils/googleTag.js
+++ b/src/core/utils/googleTag.js
@@ -1,3 +1,5 @@
+const PPN = process.env.NEXT_PUBLIC_PPN
+
 const mapVariants = (variants) => {
   return variants.map((variant) => {
     const res = {
@@ -22,7 +24,7 @@ const sumTotal = (variants) => {
     0
   )
   let subtotal = totalPurchase - totalDiscount
-  let tax = Math.round(subtotal * 0.11)
+  let tax = Math.round(subtotal * (PPN - 1))
   let grandTotal = subtotal + tax
   return {
     totalPurchase: totalPurchase,