From da44e90efe705239ac7419da1874161acb88299a Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Tue, 15 Oct 2024 15:23:29 +0700 Subject: add feature pengajuan tempo --- src/pages/pengajuan-tempo.jsx | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 src/pages/pengajuan-tempo.jsx (limited to 'src/pages') diff --git a/src/pages/pengajuan-tempo.jsx b/src/pages/pengajuan-tempo.jsx new file mode 100644 index 00000000..f27fb907 --- /dev/null +++ b/src/pages/pengajuan-tempo.jsx @@ -0,0 +1,29 @@ +import Seo from '@/core/components/Seo'; +import dynamic from 'next/dynamic'; +import SimpleFooter from '@/core/components/elements/Footer/SimpleFooter'; +import BasicLayout from '@/core/components/layouts/BasicLayout'; +import DesktopView from '@/core/components/views/DesktopView'; +import MobileView from '@/core/components/views/MobileView'; +const PagePengajuanTempo = dynamic(() => + import('@/lib/pengajuan-tempo/component/PengajuanTempo') +); + +export default function TrackingOrder() { + return ( + <> + + + + + + + + + + + + + + + ); +} -- cgit v1.2.3 From abcce110895d767a16fb961a65e7c78f9213ca0d Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Thu, 24 Oct 2024 17:11:32 +0700 Subject: update pengajuan tempo --- src/pages/pengajuan-tempo.jsx | 29 ----------------------------- src/pages/pengajuan-tempo/[status].jsx | 32 ++++++++++++++++++++++++++++++++ src/pages/pengajuan-tempo/index.jsx | 29 +++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 29 deletions(-) delete mode 100644 src/pages/pengajuan-tempo.jsx create mode 100644 src/pages/pengajuan-tempo/[status].jsx create mode 100644 src/pages/pengajuan-tempo/index.jsx (limited to 'src/pages') diff --git a/src/pages/pengajuan-tempo.jsx b/src/pages/pengajuan-tempo.jsx deleted file mode 100644 index f27fb907..00000000 --- a/src/pages/pengajuan-tempo.jsx +++ /dev/null @@ -1,29 +0,0 @@ -import Seo from '@/core/components/Seo'; -import dynamic from 'next/dynamic'; -import SimpleFooter from '@/core/components/elements/Footer/SimpleFooter'; -import BasicLayout from '@/core/components/layouts/BasicLayout'; -import DesktopView from '@/core/components/views/DesktopView'; -import MobileView from '@/core/components/views/MobileView'; -const PagePengajuanTempo = dynamic(() => - import('@/lib/pengajuan-tempo/component/PengajuanTempo') -); - -export default function TrackingOrder() { - return ( - <> - - - - - - - - - - - - - - - ); -} diff --git a/src/pages/pengajuan-tempo/[status].jsx b/src/pages/pengajuan-tempo/[status].jsx new file mode 100644 index 00000000..8476d08a --- /dev/null +++ b/src/pages/pengajuan-tempo/[status].jsx @@ -0,0 +1,32 @@ +import BasicLayout from '@/core/components/layouts/BasicLayout'; +import IsAuth from '@/lib/auth/components/IsAuth'; +import FinishTempoComponent from '@/lib/pengajuan-tempo/component/FinishTempo'; +import { useRouter } from 'next/router'; +import axios from 'axios'; +import Seo from '@/core/components/Seo'; + +export async function getServerSideProps(context) { + const { tempo_id } = context.query; + await axios.post( + `${process.env.NEXT_PUBLIC_SELF_HOST}/api/pengajuan-tempo?formId=${tempo_id}`, + {}, + { headers: context.req.headers } + ); + return { props: {} }; +} + +export default function Finish() { + const router = useRouter(); + + return ( + <> + + + + + + + + + ); +} diff --git a/src/pages/pengajuan-tempo/index.jsx b/src/pages/pengajuan-tempo/index.jsx new file mode 100644 index 00000000..23d7aaba --- /dev/null +++ b/src/pages/pengajuan-tempo/index.jsx @@ -0,0 +1,29 @@ +import Seo from '@/core/components/Seo'; +import dynamic from 'next/dynamic'; +import SimpleFooter from '@/core/components/elements/Footer/SimpleFooter'; +import BasicLayout from '@/core/components/layouts/BasicLayout'; +import DesktopView from '@/core/components/views/DesktopView'; +import MobileView from '@/core/components/views/MobileView'; +const PagePengajuanTempo = dynamic(() => + import('@/lib/pengajuan-tempo/component/PengajuanTempo') +); + +export default function TrackingOrder() { + return ( + <> + + + + + + + + + + + + + + + ); +} -- cgit v1.2.3 From 9054afb2c842a1177dbcf0842aadf2ad14403cde Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Fri, 25 Oct 2024 09:04:25 +0700 Subject: update pengajuan tempo finsish --- src/pages/pengajuan-tempo/[status].jsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/pages') diff --git a/src/pages/pengajuan-tempo/[status].jsx b/src/pages/pengajuan-tempo/[status].jsx index 8476d08a..a5c630da 100644 --- a/src/pages/pengajuan-tempo/[status].jsx +++ b/src/pages/pengajuan-tempo/[status].jsx @@ -7,11 +7,11 @@ import Seo from '@/core/components/Seo'; export async function getServerSideProps(context) { const { tempo_id } = context.query; - await axios.post( - `${process.env.NEXT_PUBLIC_SELF_HOST}/api/pengajuan-tempo?formId=${tempo_id}`, - {}, - { headers: context.req.headers } - ); + // await axios.post( + // `${process.env.NEXT_PUBLIC_SELF_HOST}/api/pengajuan-tempo?formId=${tempo_id}`, + // {}, + // { headers: context.req.headers } + // ); return { props: {} }; } -- cgit v1.2.3 From 803d93cd36abdf5de5882ba9e9cda24e9a32ab80 Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Thu, 31 Oct 2024 16:07:18 +0700 Subject: update pengajuan tempo fix suplier ids --- src/pages/pengajuan-tempo/[status].jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/pages') diff --git a/src/pages/pengajuan-tempo/[status].jsx b/src/pages/pengajuan-tempo/[status].jsx index a5c630da..1ebf167b 100644 --- a/src/pages/pengajuan-tempo/[status].jsx +++ b/src/pages/pengajuan-tempo/[status].jsx @@ -20,7 +20,7 @@ export default function Finish() { return ( <> - + -- cgit v1.2.3 From 9622bff4d4902fcef81214236cc7ff035163e5e7 Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Wed, 13 Nov 2024 16:46:14 +0700 Subject: pengajuan tempo --- src/pages/my/menu.jsx | 104 +++++++++++++++++++++++++++++++------------ src/pages/my/tempo/index.jsx | 27 +++++++++++ 2 files changed, 102 insertions(+), 29 deletions(-) create mode 100644 src/pages/my/tempo/index.jsx (limited to 'src/pages') diff --git a/src/pages/my/menu.jsx b/src/pages/my/menu.jsx index a0ce223e..63b4d35c 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'; 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 ( @@ -29,8 +29,12 @@ export default function Menu() {
{auth?.name}
- {auth?.company &&
Akun Bisnis
} - {!auth?.company &&
Akun Individu
} + {auth?.company && ( +
Akun Bisnis
+ )} + {!auth?.company && ( +
Akun Individu
+ )}
@@ -47,32 +51,63 @@ export default function Menu() { {' '}
- +

Daftar Quotation
- +

Daftar Transaksi
- +

Daftar Pengiriman

 {' '}
- +

Invoice & Faktur Pajak

 + + {' '} +
+ +

Pembayaran Tempo

+
+
- +

Wishlist

 @@ -86,7 +121,11 @@ export default function Menu() { {' '}
- +

Layanan Pelanggan

 @@ -99,7 +138,11 @@ export default function Menu() {
- +

Daftar Alamat

 @@ -112,20 +155,23 @@ export default function Menu() {
- ) + ); } const MenuHeader = ({ children, ...props }) => (
{children}
-) +); const LinkItem = ({ children, ...props }) => ( - + {children}
-) +); diff --git a/src/pages/my/tempo/index.jsx b/src/pages/my/tempo/index.jsx new file mode 100644 index 00000000..e540fbda --- /dev/null +++ b/src/pages/my/tempo/index.jsx @@ -0,0 +1,27 @@ +import Seo from '@/core/components/Seo'; +import AppLayout from '@/core/components/layouts/AppLayout'; +import BasicLayout from '@/core/components/layouts/BasicLayout'; +import DesktopView from '@/core/components/views/DesktopView'; +import MobileView from '@/core/components/views/MobileView'; +import IsAuth from '@/lib/auth/components/IsAuth'; +import InvoicesComponent from '@/lib/invoice/components/Invoices'; + +export default function MyTempo() { + return ( + + + + + + + + + + + + + + + + ); +} -- cgit v1.2.3 From f481bae4d28b770d85ca2340cff60acbec70d0ee Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Thu, 14 Nov 2024 09:45:15 +0700 Subject: --- src/pages/my/tempo/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/pages') diff --git a/src/pages/my/tempo/index.jsx b/src/pages/my/tempo/index.jsx index e540fbda..365986f4 100644 --- a/src/pages/my/tempo/index.jsx +++ b/src/pages/my/tempo/index.jsx @@ -4,7 +4,7 @@ import BasicLayout from '@/core/components/layouts/BasicLayout'; import DesktopView from '@/core/components/views/DesktopView'; import MobileView from '@/core/components/views/MobileView'; import IsAuth from '@/lib/auth/components/IsAuth'; -import InvoicesComponent from '@/lib/invoice/components/Invoices'; +import InvoicesComponent from '@/lib/tempo/components/Tempo'; export default function MyTempo() { return ( -- cgit v1.2.3 From 6bbf1dbd94355f34f58f4b72f134f3dbeac776aa Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Sat, 23 Nov 2024 11:55:59 +0700 Subject: update tempo --- src/pages/pengajuan-tempo/index.jsx | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'src/pages') diff --git a/src/pages/pengajuan-tempo/index.jsx b/src/pages/pengajuan-tempo/index.jsx index 23d7aaba..9f772ddd 100644 --- a/src/pages/pengajuan-tempo/index.jsx +++ b/src/pages/pengajuan-tempo/index.jsx @@ -4,11 +4,31 @@ import SimpleFooter from '@/core/components/elements/Footer/SimpleFooter'; import BasicLayout from '@/core/components/layouts/BasicLayout'; import DesktopView from '@/core/components/views/DesktopView'; import MobileView from '@/core/components/views/MobileView'; +import { getAuth } from '~/libs/auth'; +import { useRouter } from 'next/router'; +import { useEffect } from 'react'; + const PagePengajuanTempo = dynamic(() => import('@/lib/pengajuan-tempo/component/PengajuanTempo') ); export default function TrackingOrder() { + const auth = getAuth(); + const router = useRouter(); + + useEffect(() => { + if (!auth) { + const nextUrl = encodeURIComponent(router.asPath); + router.push(`/login?next=${nextUrl}`); + } else if (!auth?.parentId) { + router.push('/pengajuan-tempo/switch-account'); + } + }, [auth, router]); + + if (!auth?.parentId) { + return null; + } + return ( <> -- cgit v1.2.3 From 77f9843ad5072583cb1797d7ecf5ac80394bad3f Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Mon, 2 Dec 2024 09:31:44 +0700 Subject: pengajuan tempo --- src/pages/my/menu.jsx | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'src/pages') diff --git a/src/pages/my/menu.jsx b/src/pages/my/menu.jsx index 407e400f..4099a935 100644 --- a/src/pages/my/menu.jsx +++ b/src/pages/my/menu.jsx @@ -90,17 +90,20 @@ export default function Menu() {

Invoice & Faktur Pajak

- - {' '} -
- -

Pembayaran Tempo

-
- + {(atuh?.partnerTempo.toLowerCase().includes('tempo') || + atuh.tempoProgres == 'review') && ( + + {' '} +
+ +

Pembayaran Tempo

+
+ + )}
Date: Wed, 4 Dec 2024 10:59:21 +0700 Subject: update pengajuan tempo --- src/pages/pengajuan-tempo/index.jsx | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'src/pages') diff --git a/src/pages/pengajuan-tempo/index.jsx b/src/pages/pengajuan-tempo/index.jsx index 9f772ddd..25db0c4b 100644 --- a/src/pages/pengajuan-tempo/index.jsx +++ b/src/pages/pengajuan-tempo/index.jsx @@ -6,7 +6,7 @@ import DesktopView from '@/core/components/views/DesktopView'; import MobileView from '@/core/components/views/MobileView'; import { getAuth } from '~/libs/auth'; import { useRouter } from 'next/router'; -import { useEffect } from 'react'; +import { useEffect, useState } from 'react'; const PagePengajuanTempo = dynamic(() => import('@/lib/pengajuan-tempo/component/PengajuanTempo') @@ -15,30 +15,35 @@ const PagePengajuanTempo = dynamic(() => export default function TrackingOrder() { const auth = getAuth(); const router = useRouter(); + const [isLoading, setIsLoading] = useState(true); // Set default isLoading to true useEffect(() => { - if (!auth) { + if (!auth) return; // Prevent unnecessary processing if auth is not ready + + if (auth.tempoProgres === 'review') { + router.push('/pengajuan-tempo/review'); + } else if (!auth.parentId) { + router.push('/pengajuan-tempo/switch-account'); + } else if (!auth) { const nextUrl = encodeURIComponent(router.asPath); router.push(`/login?next=${nextUrl}`); - } else if (!auth?.parentId) { - router.push('/pengajuan-tempo/switch-account'); + } else { + setIsLoading(false); // Set isLoading to false only when routing is not required } }, [auth, router]); - if (!auth?.parentId) { - return null; + if (isLoading || !auth) { + return null; // Show nothing while loading or if auth is not ready } return ( <> - - -- cgit v1.2.3 From e9cd13307f0095dc4edc5048752675d80c551564 Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Fri, 6 Dec 2024 17:06:26 +0700 Subject: pengajuan tempo --- src/pages/pengajuan-tempo/index.jsx | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'src/pages') diff --git a/src/pages/pengajuan-tempo/index.jsx b/src/pages/pengajuan-tempo/index.jsx index 25db0c4b..271914c3 100644 --- a/src/pages/pengajuan-tempo/index.jsx +++ b/src/pages/pengajuan-tempo/index.jsx @@ -14,19 +14,24 @@ const PagePengajuanTempo = dynamic(() => export default function TrackingOrder() { const auth = getAuth(); + console.log('auth', auth); const router = useRouter(); const [isLoading, setIsLoading] = useState(true); // Set default isLoading to true useEffect(() => { - if (!auth) return; // Prevent unnecessary processing if auth is not ready + // if (!auth) return; // Prevent unnecessary processing if auth is not ready - if (auth.tempoProgres === 'review') { - router.push('/pengajuan-tempo/review'); - } else if (!auth.parentId) { - router.push('/pengajuan-tempo/switch-account'); - } else if (!auth) { + if (!auth) { const nextUrl = encodeURIComponent(router.asPath); router.push(`/login?next=${nextUrl}`); + } else if (!auth.parentId) { + router.push('/pengajuan-tempo/switch-account'); + } else if (auth.tempoProgres === 'review') { + router.push('/pengajuan-tempo/review'); + } else if (auth.tempoProgres === 'approve') { + router.push('/pengajuan-tempo/approve'); + } else if (auth.tempoProgres === 'rejected') { + router.push('/pengajuan-tempo/rejected'); } else { setIsLoading(false); // Set isLoading to false only when routing is not required } -- cgit v1.2.3 From f2451beed670dc697aa2026b2df6ad1ad1e90da2 Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Mon, 9 Dec 2024 15:00:45 +0700 Subject: update pengajuan tempo --- src/pages/pengajuan-tempo/index.jsx | 44 ++++++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 10 deletions(-) (limited to 'src/pages') diff --git a/src/pages/pengajuan-tempo/index.jsx b/src/pages/pengajuan-tempo/index.jsx index 271914c3..f0681663 100644 --- a/src/pages/pengajuan-tempo/index.jsx +++ b/src/pages/pengajuan-tempo/index.jsx @@ -7,38 +7,62 @@ import MobileView from '@/core/components/views/MobileView'; import { getAuth } from '~/libs/auth'; import { useRouter } from 'next/router'; import { useEffect, useState } from 'react'; +import odooApi from '@/core/api/odooApi'; const PagePengajuanTempo = dynamic(() => import('@/lib/pengajuan-tempo/component/PengajuanTempo') ); export default function TrackingOrder() { + const [tempo, setTempo] = useState(null); + const [isLoading, setIsLoading] = useState(true); const auth = getAuth(); - console.log('auth', auth); const router = useRouter(); - const [isLoading, setIsLoading] = useState(true); // Set default isLoading to true useEffect(() => { - // if (!auth) return; // Prevent unnecessary processing if auth is not ready + const loadTempo = async () => { + try { + if (auth?.partnerId) { + const dataTempo = await odooApi( + 'GET', + `/api/v1/check/${auth.partnerId}/tempo` + ); + setTempo(dataTempo); + } + } catch (error) { + console.error('Error fetching tempo data:', error); + } finally { + setIsLoading(false); + } + }; + if (auth) { + loadTempo(); + } else { + setIsLoading(false); + } + }, [auth]); + + useEffect(() => { if (!auth) { const nextUrl = encodeURIComponent(router.asPath); router.push(`/login?next=${nextUrl}`); } else if (!auth.parentId) { router.push('/pengajuan-tempo/switch-account'); - } else if (auth.tempoProgres === 'review') { + } else if (auth.tempoProgres === 'review' && !tempo?.paymentTerm) { router.push('/pengajuan-tempo/review'); - } else if (auth.tempoProgres === 'approve') { + } else if ( + auth.tempoProgres === 'approve' && + tempo?.paymentTerm?.toLowerCase().includes('tempo') + ) { router.push('/pengajuan-tempo/approve'); } else if (auth.tempoProgres === 'rejected') { router.push('/pengajuan-tempo/rejected'); - } else { - setIsLoading(false); // Set isLoading to false only when routing is not required } - }, [auth, router]); + }, [auth, router, tempo]); - if (isLoading || !auth) { - return null; // Show nothing while loading or if auth is not ready + if (isLoading || !auth || !tempo) { + return null; // Tidak render apa pun selama loading atau auth/tempo belum tersedia } return ( -- cgit v1.2.3 From 0f84963214ee6dc5b5a44d945540826a66bec9e0 Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Wed, 11 Dec 2024 11:51:45 +0700 Subject: update pengajuan tempo --- src/pages/pengajuan-tempo/[status].jsx | 20 ++++++++++++++++++++ src/pages/pengajuan-tempo/index.jsx | 15 ++++++++------- 2 files changed, 28 insertions(+), 7 deletions(-) (limited to 'src/pages') diff --git a/src/pages/pengajuan-tempo/[status].jsx b/src/pages/pengajuan-tempo/[status].jsx index 1ebf167b..c97b5897 100644 --- a/src/pages/pengajuan-tempo/[status].jsx +++ b/src/pages/pengajuan-tempo/[status].jsx @@ -3,7 +3,9 @@ import IsAuth from '@/lib/auth/components/IsAuth'; import FinishTempoComponent from '@/lib/pengajuan-tempo/component/FinishTempo'; import { useRouter } from 'next/router'; import axios from 'axios'; +import { useState, useEffect } from 'react'; import Seo from '@/core/components/Seo'; +import { getAuth } from '~/libs/auth'; export async function getServerSideProps(context) { const { tempo_id } = context.query; @@ -16,8 +18,26 @@ export async function getServerSideProps(context) { } export default function Finish() { + const [isLoading, setIsLoading] = useState(true); const router = useRouter(); + const auth = getAuth(); + useEffect(() => { + if (!auth) { + const nextUrl = encodeURIComponent(router.asPath); + router.push(`/login?next=${nextUrl}`); + } else if ( + (router.query.status == 'approve' || router.query.status == 'review') && + auth.tempoProgres === '' + ) { + router.push('/pengajuan-tempo'); + } else { + setIsLoading(false); + } + }, [auth]); + if (isLoading || !auth) { + return null; // Tidak render apa pun selama loading atau auth/tempo belum tersedia + } return ( <> diff --git a/src/pages/pengajuan-tempo/index.jsx b/src/pages/pengajuan-tempo/index.jsx index f0681663..d485c721 100644 --- a/src/pages/pengajuan-tempo/index.jsx +++ b/src/pages/pengajuan-tempo/index.jsx @@ -41,25 +41,26 @@ export default function TrackingOrder() { } else { setIsLoading(false); } - }, [auth]); - + }, []); useEffect(() => { if (!auth) { const nextUrl = encodeURIComponent(router.asPath); router.push(`/login?next=${nextUrl}`); - } else if (!auth.parentId) { - router.push('/pengajuan-tempo/switch-account'); - } else if (auth.tempoProgres === 'review' && !tempo?.paymentTerm) { - router.push('/pengajuan-tempo/review'); } else if ( auth.tempoProgres === 'approve' && tempo?.paymentTerm?.toLowerCase().includes('tempo') ) { router.push('/pengajuan-tempo/approve'); + } else if (!auth.parentId) { + router.push('/pengajuan-tempo/switch-account'); + } else if (auth.tempoProgres === 'review' && !tempo?.paymentTerm) { + router.push('/pengajuan-tempo/review'); } else if (auth.tempoProgres === 'rejected') { router.push('/pengajuan-tempo/rejected'); + } else { + setIsLoading(false); } - }, [auth, router, tempo]); + }, [tempo]); if (isLoading || !auth || !tempo) { return null; // Tidak render apa pun selama loading atau auth/tempo belum tersedia -- cgit v1.2.3 From 0178a1f88d7d34824562e1413be073c0795a47cf Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Mon, 16 Dec 2024 17:42:31 +0700 Subject: update code --- src/pages/my/menu.jsx | 4 ++-- src/pages/my/tempo/index.jsx | 21 ++++++++++++++++++++- 2 files changed, 22 insertions(+), 3 deletions(-) (limited to 'src/pages') diff --git a/src/pages/my/menu.jsx b/src/pages/my/menu.jsx index 4099a935..b626be30 100644 --- a/src/pages/my/menu.jsx +++ b/src/pages/my/menu.jsx @@ -90,8 +90,8 @@ export default function Menu() {

Invoice & Faktur Pajak

 - {(atuh?.partnerTempo.toLowerCase().includes('tempo') || - atuh.tempoProgres == 'review') && ( + {(auth?.partnerTempo?.toLowerCase().includes('tempo') || + auth?.tempoProgres == 'review') && ( {' '}
diff --git a/src/pages/my/tempo/index.jsx b/src/pages/my/tempo/index.jsx index 365986f4..f52fe960 100644 --- a/src/pages/my/tempo/index.jsx +++ b/src/pages/my/tempo/index.jsx @@ -5,8 +5,27 @@ import DesktopView from '@/core/components/views/DesktopView'; import MobileView from '@/core/components/views/MobileView'; import IsAuth from '@/lib/auth/components/IsAuth'; import InvoicesComponent from '@/lib/tempo/components/Tempo'; - +import { getAuth } from '~/libs/auth'; +import { useRouter } from 'next/router'; +import { useEffect, useState } from 'react'; export default function MyTempo() { + const auth = getAuth(); + const router = useRouter(); + const [isLoading, setIsLoading] = useState(true); + useEffect(() => { + if (!auth) { + const nextUrl = encodeURIComponent(router.asPath); + router.push(`/login?next=${nextUrl}`); + } else if (auth.tempoProgres === '' || auth.tempoProgres === 'rejected') { + router.push('/pengajuan-tempo'); + } else { + setIsLoading(false); + } + }, [auth]); + + if (isLoading || !auth) { + return null; // Tidak render apa pun selama loading atau auth/tempo belum tersedia + } return ( -- cgit v1.2.3 From 21999682d2d6193d1033015c4e45f436a958f643 Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Tue, 7 Jan 2025 15:56:56 +0700 Subject: update --- src/pages/my/tempo/index.jsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/pages') diff --git a/src/pages/my/tempo/index.jsx b/src/pages/my/tempo/index.jsx index f52fe960..a1897e51 100644 --- a/src/pages/my/tempo/index.jsx +++ b/src/pages/my/tempo/index.jsx @@ -16,7 +16,10 @@ export default function MyTempo() { if (!auth) { const nextUrl = encodeURIComponent(router.asPath); router.push(`/login?next=${nextUrl}`); - } else if (auth.tempoProgres === '' || auth.tempoProgres === 'rejected') { + } else if ( + (auth.tempoProgres === '' || auth.tempoProgres === 'rejected') && + !auth.company + ) { router.push('/pengajuan-tempo'); } else { setIsLoading(false); -- cgit v1.2.3 From fedaceac3e41741c198c94fd20917c9572fa7ec1 Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Fri, 10 Jan 2025 15:26:44 +0700 Subject: update tempo page mobile view --- src/pages/my/menu.jsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/pages') diff --git a/src/pages/my/menu.jsx b/src/pages/my/menu.jsx index b626be30..2a46d866 100644 --- a/src/pages/my/menu.jsx +++ b/src/pages/my/menu.jsx @@ -90,8 +90,7 @@ export default function Menu() {

Invoice & Faktur Pajak

 - {(auth?.partnerTempo?.toLowerCase().includes('tempo') || - auth?.tempoProgres == 'review') && ( + {(auth?.partnerTempo || auth?.tempoProgres == 'review') && ( {' '}
-- cgit v1.2.3 From 40f762589601de0fe1d5b06164b2553ebdbf5ecd Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Sat, 11 Jan 2025 09:27:46 +0700 Subject: update code --- src/pages/pengajuan-tempo/[status].jsx | 9 ++------- src/pages/pengajuan-tempo/index.jsx | 5 +---- 2 files changed, 3 insertions(+), 11 deletions(-) (limited to 'src/pages') diff --git a/src/pages/pengajuan-tempo/[status].jsx b/src/pages/pengajuan-tempo/[status].jsx index c97b5897..fa0a1749 100644 --- a/src/pages/pengajuan-tempo/[status].jsx +++ b/src/pages/pengajuan-tempo/[status].jsx @@ -8,9 +8,9 @@ import Seo from '@/core/components/Seo'; import { getAuth } from '~/libs/auth'; export async function getServerSideProps(context) { - const { tempo_id } = context.query; + const { status } = context.query; // await axios.post( - // `${process.env.NEXT_PUBLIC_SELF_HOST}/api/pengajuan-tempo?formId=${tempo_id}`, + // `${process.env.NEXT_PUBLIC_SELF_HOST}/api/pengajuan-tempo/${status}`, // {}, // { headers: context.req.headers } // ); @@ -25,11 +25,6 @@ export default function Finish() { if (!auth) { const nextUrl = encodeURIComponent(router.asPath); router.push(`/login?next=${nextUrl}`); - } else if ( - (router.query.status == 'approve' || router.query.status == 'review') && - auth.tempoProgres === '' - ) { - router.push('/pengajuan-tempo'); } else { setIsLoading(false); } diff --git a/src/pages/pengajuan-tempo/index.jsx b/src/pages/pengajuan-tempo/index.jsx index d485c721..6987bd29 100644 --- a/src/pages/pengajuan-tempo/index.jsx +++ b/src/pages/pengajuan-tempo/index.jsx @@ -46,10 +46,7 @@ export default function TrackingOrder() { if (!auth) { const nextUrl = encodeURIComponent(router.asPath); router.push(`/login?next=${nextUrl}`); - } else if ( - auth.tempoProgres === 'approve' && - tempo?.paymentTerm?.toLowerCase().includes('tempo') - ) { + } else if (auth.tempoProgres === 'approve' || auth?.partnerTempo) { router.push('/pengajuan-tempo/approve'); } else if (!auth.parentId) { router.push('/pengajuan-tempo/switch-account'); -- cgit v1.2.3 From 76afb8aaa5d2aaaf68529e11e9ed4d003d953f76 Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Tue, 14 Jan 2025 09:09:05 +0700 Subject: update pengajuan tempo --- src/pages/pengajuan-tempo/[status].jsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/pages') diff --git a/src/pages/pengajuan-tempo/[status].jsx b/src/pages/pengajuan-tempo/[status].jsx index fa0a1749..29886892 100644 --- a/src/pages/pengajuan-tempo/[status].jsx +++ b/src/pages/pengajuan-tempo/[status].jsx @@ -9,11 +9,11 @@ import { getAuth } from '~/libs/auth'; export async function getServerSideProps(context) { const { status } = context.query; - // await axios.post( - // `${process.env.NEXT_PUBLIC_SELF_HOST}/api/pengajuan-tempo/${status}`, - // {}, - // { headers: context.req.headers } - // ); + await axios.post( + `${process.env.NEXT_PUBLIC_SELF_HOST}/api/pengajuan-tempo/${status}`, + {}, + { headers: context.req.headers } + ); return { props: {} }; } -- cgit v1.2.3