From cd687d6cb9fa5370e1aa086671a528d9f96760eb Mon Sep 17 00:00:00 2001 From: Alex Cheung Date: Wed, 3 Jul 2024 18:07:29 +0800 Subject: [PATCH] update hidle payment table for credit user --- .../ApplyForm/PublicNoticeApplyForm.js | 189 +++++++++--------- 1 file changed, 96 insertions(+), 93 deletions(-) diff --git a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js index 31f7f21..0f1aaff 100644 --- a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js +++ b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js @@ -18,7 +18,8 @@ import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png' import ForwardIcon from '@mui/icons-material/Forward'; import { isORGLoggedIn, - isDummyLoggedIn + isDummyLoggedIn, + isCreditorLoggedIn } from "utils/Utils"; import { useNavigate } from "react-router-dom"; @@ -326,98 +327,100 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) => - - - - - - - - - - - - - - - - - - - - - - - - -
- -
{ - setWarningTitle(intl.formatMessage({ id: "payOnline" })) - setWarningText( - <> -
    -
    • -
    • -
    • -
- - ); - setIsWarningPopUp(true); - }}> - 		{DateUtils.dateFormat(closeDate, dft)} 2:00 p.m. - -
-
{ - setWarningTitle(intl.formatMessage({ id: "payDn" })) - setWarningText( - <> -
    -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
- - 		{DateUtils.dateFormat(closingDateOff, dft)} 5:00 p.m. - -
-
{ - setWarningTitle(intl.formatMessage({ id: "payNPGOPopUpTitle" })) - setWarningText( - <> -
    -
    • -
    • -
    • -
    • -
- - ); - setIsWarningPopUp(true); - }}> - 		{DateUtils.dateFormat(closeDate, dft)} 12:00 p.m. - -
- - + {!isCreditorLoggedIn()? + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
{ + setWarningTitle(intl.formatMessage({ id: "payOnline" })) + setWarningText( + <> +
    +
    • +
    • +
    • +
+ + ); + setIsWarningPopUp(true); + }}> + 		{DateUtils.dateFormat(closeDate, dft)} 2:00 p.m. + +
+
{ + setWarningTitle(intl.formatMessage({ id: "payDn" })) + setWarningText( + <> +
    +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
+ + 		{DateUtils.dateFormat(closingDateOff, dft)} 5:00 p.m. + +
+
{ + setWarningTitle(intl.formatMessage({ id: "payNPGOPopUpTitle" })) + setWarningText( + <> +
    +
    • +
    • +
    • +
    • +
+ + ); + setIsWarningPopUp(true); + }}> + 		{DateUtils.dateFormat(closeDate, dft)} 12:00 p.m. + +
+ + : null + }