diff options
| author | it-fixcomart <it@fixcomart.co.id> | 2025-01-22 10:10:19 +0700 |
|---|---|---|
| committer | it-fixcomart <it@fixcomart.co.id> | 2025-01-22 10:10:19 +0700 |
| commit | 5cc3c938da3dfde636b918b8f2fdef33f3c61419 (patch) | |
| tree | 222177fe6dce70fc608698c700de17032105998a /src/core/components/elements | |
| parent | 238c675eecaf6f4f953d87c4b0a128bfa139cff4 (diff) | |
| parent | 6d9c1067b6e857eb95f12864cc88117350ae6cfb (diff) | |
Merge branch 'new-release' into CR/form-merchant
# Conflicts:
# src/lib/form/components/Merchant.jsx
Diffstat (limited to 'src/core/components/elements')
| -rw-r--r-- | src/core/components/elements/Footer/BasicFooter.jsx | 4 | ||||
| -rw-r--r-- | src/core/components/elements/Navbar/NavbarDesktop.jsx | 4 | ||||
| -rw-r--r-- | src/core/components/elements/Navbar/NavbarUserDropdown.jsx | 8 |
3 files changed, 10 insertions, 6 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 && ( |