Merge branch 'new-release' into CR/form-merchant

# Conflicts:
#	src/lib/form/components/Merchant.jsx

4 files changed, 13 insertions, 7 deletions

diff --git a/src/core/components/elements/Footer/BasicFooter.jsx b/src/core/components/elements/Footer/BasicFooter.jsx
index 6434c928..427157d7 100644
--- a/src/core/components/elements/Footer/BasicFooter.jsx
+++ b/src/core/components/elements/Footer/BasicFooter.jsx
@@ -239,8 +239,8 @@ const Form = () => (
         </InternalItemLink>
       </li>
       <li>
-        <InternalItemLink href='/pembayaran-tempo'>
-          Pembayaran Tempo
+        <InternalItemLink href='/pengajuan-tempo'>
+          Pengajuan Tempo
         </InternalItemLink>
       </li>
       <li>
diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx
index 2776c1f3..d6b1bdea 100644
--- a/src/core/components/elements/Navbar/NavbarDesktop.jsx
+++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx
@@ -172,8 +172,8 @@ const NavbarDesktop = () => {
                 <MenuItem as='a' href='/tentang-kami'>
                   Tentang Indoteknik
                 </MenuItem>
-                <MenuItem as='a' href='/pembayaran-tempo'>
-                  Pembayaran Tempo
+                <MenuItem as='a' href='/pengajuan-tempo'>
+                  Pengajuan Tempo
                 </MenuItem>
               </MenuList>
             </Menu>
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,