{set_paymentMethod("demandNote")}}/>;
+ }
+ },
{
field: 'action',
headerName: 'Status',
diff --git a/src/pages/Proof/Reply_Public/ProofForm.js b/src/pages/Proof/Reply_Public/ProofForm.js
index b0ee8e0..df3919e 100644
--- a/src/pages/Proof/Reply_Public/ProofForm.js
+++ b/src/pages/Proof/Reply_Public/ProofForm.js
@@ -26,7 +26,10 @@ import { notifyActionSuccess } from 'utils/CommonFunction';
import { PNSPS_BUTTON_THEME } from "themes/buttonConst";
import { ThemeProvider } from "@emotion/react";
import { FormattedMessage, useIntl } from "react-intl";
-import { isDummyLoggedIn } from "utils/Utils"
+import {
+ isDummyLoggedIn,
+ checkIsOnlyOnlinePaymentByIssueDate
+ } from "utils/Utils"
const UploadFileTable = Loadable(React.lazy(() => import('./UploadFileTable')));
//import * as ProofStatus from "utils/statusUtils/ProofStatus";
@@ -46,6 +49,7 @@ const FormPanel = ({ formData }) => {
const [warningTitle, setWarningTitle] = React.useState("");
const [isWarningPopUp, setIsWarningPopUp] = React.useState(false);
const [warningText, setWarningText] = React.useState("");
+ const [isOnlyOnlinePayment, setOnlyOnlinePayment] = React.useState();
const navigate = useNavigate()
const params = useParams();
@@ -61,8 +65,11 @@ const FormPanel = ({ formData }) => {
React.useEffect(() => {
if (formData) {
setData(formData);
+ setOnlyOnlinePayment(checkIsOnlyOnlinePaymentByIssueDate(formData.issueDate))
if (isDummyLoggedIn()) {
set_paymentMethod("demandNote")
+ } else if (checkIsOnlyOnlinePaymentByIssueDate(formData.issueDate)){
+ set_paymentMethod("online")
}
}
}, [formData]);
@@ -461,90 +468,94 @@ const FormPanel = ({ formData }) => {
}} />
-
- |
- {isOverDnReviseDeadline() ?
- <> :
- {
- set_paymentMethod("demandNote")
- }}
- />
- }
- |
-
-
-
{
- setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payDn" }))
- setWarningText(
- <>:
-
-
-
-
-
- );
- setIsWarningPopUp(true);
- }}>
- |
- {DateUtils.dateFormat(formData.closingDateOff, intl.formatMessage({ id: "dateStrFormat" }))} {locale ==='en'?"5:00 p.m.":"下午5時"} |
- {DateUtils.dateFormat(formData.closingDateOff, intl.formatMessage({ id: "dateStrFormat" }))} {locale ==='en'?"5:00 p.m.":"下午5時"} |
-
-
- |
-
-
-
- |
- {
- isOverNpgoReviseDeadline() ?
- <> :
- {
- set_paymentMethod("office")
- }}
- />
- }
- |
-
-
-
{
- setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payNPGOPopUpTitle" }))
- setWarningText(
- <>:
-
-
- );
- setIsWarningPopUp(true);
- }}>
- |
- {DateUtils.dateFormat(formData.closingDate, intl.formatMessage({ id: "dateStrFormat" }))} {locale ==='en'?"11:30 a.m.":"上午11時30分"} |
- {DateUtils.dateFormat(formData.closingDate, intl.formatMessage({ id: "dateStrFormat" }))} {locale ==='en'?"12:00 p.m.":"下午12時"} |
-
-
- |
-
+ {!isOnlyOnlinePayment?
+ <>
+
+ |
+ {isOverDnReviseDeadline() ?
+ <> :
+ {
+ set_paymentMethod("demandNote")
+ }}
+ />
+ }
+ |
+
+
+
{
+ setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payDn" }))
+ setWarningText(
+ <>:
+
+
+
+
+
+ );
+ setIsWarningPopUp(true);
+ }}>
+ |
+ {DateUtils.dateFormat(formData.closingDateOff, intl.formatMessage({ id: "dateStrFormat" }))} {locale ==='en'?"5:00 p.m.":"下午5時"} |
+ {DateUtils.dateFormat(formData.closingDateOff, intl.formatMessage({ id: "dateStrFormat" }))} {locale ==='en'?"5:00 p.m.":"下午5時"} |
+
+
+ |
+
+
+
+ |
+ {
+ isOverNpgoReviseDeadline() ?
+ <> :
+ {
+ set_paymentMethod("office")
+ }}
+ />
+ }
+ |
+
+
+
{
+ setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payNPGOPopUpTitle" }))
+ setWarningText(
+ <>:
+
+
+ );
+ setIsWarningPopUp(true);
+ }}>
+ |
+ {DateUtils.dateFormat(formData.closingDate, intl.formatMessage({ id: "dateStrFormat" }))} {locale ==='en'?"11:30 a.m.":"上午11時30分"} |
+ {DateUtils.dateFormat(formData.closingDate, intl.formatMessage({ id: "dateStrFormat" }))} {locale ==='en'?"12:00 p.m.":"下午12時"} |
+
+
+ |
+
+ :null
+ }
diff --git a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
index 11e6021..fbe2860 100644
--- a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
+++ b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
@@ -19,7 +19,8 @@ import ForwardIcon from '@mui/icons-material/Forward';
import {
isORGLoggedIn,
isDummyLoggedIn,
- isCreditorLoggedIn
+ isCreditorLoggedIn,
+ checkIsOnlyOnlinePaymentByIssueDate
} from "utils/Utils";
import { useNavigate } from "react-router-dom";
@@ -51,6 +52,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) =>
const [issueId, setIssueId] = useState(loadedData.issueId);
const [closeDate, setCloseDate] = useState(null);
const [closingDateOff, setClosingDateOff] = useState(null);
+ const [isOnlyOnlinePayment, setOnlyOnlinePayment] = useState();
const navigate = useNavigate();
const BackgroundHead = {
@@ -83,6 +85,8 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) =>
if (data.id == issueId) {
setCloseDate(data.closingDate)
setClosingDateOff(data.closingDateOff)
+ setOnlyOnlinePayment(checkIsOnlyOnlinePaymentByIssueDate(data.issueDate))
+
break;
}
}
@@ -383,62 +387,66 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) =>
}} />
-
-
-
{
- setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payDn" }))
- setWarningText(
- <>:
-
-
-
-
-
- );
- setIsWarningPopUp(true);
- }}>
- |
- {DateUtils.dateFormat(closingDateOff, dft)} {locale==='en'?"5:00 p.m.":"下午5時"} |
-
-
- |
-
-
-
-
{
- setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payNPGOPopUpTitle" }))
- setWarningText(
- <>:
-
-
- );
- setIsWarningPopUp(true);
- }}>
- |
- {DateUtils.dateFormat(closeDate, dft)} {locale==='en'?"12:00 p.m.":"下午12時"} |
-
-
- |
-
+ {!isOnlyOnlinePayment?
+ <>
+
+
+
{
+ setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payDn" }))
+ setWarningText(
+ <>:
+
+
+
+
+
+ );
+ setIsWarningPopUp(true);
+ }}>
+ |
+ {DateUtils.dateFormat(closingDateOff, dft)} {locale==='en'?"5:00 p.m.":"下午5時"} |
+
+
+ |
+
+
+
+
{
+ setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payNPGOPopUpTitle" }))
+ setWarningText(
+ <>:
+
+
+ );
+ setIsWarningPopUp(true);
+ }}>
+ |
+ {DateUtils.dateFormat(closeDate, dft)} {locale==='en'?"12:00 p.m.":"下午12時"} |
+
+
+ |
+
+ :null
+ }
diff --git a/src/pages/PublicNotice/ApplyForm/index.js b/src/pages/PublicNotice/ApplyForm/index.js
index 74c581b..b445939 100644
--- a/src/pages/PublicNotice/ApplyForm/index.js
+++ b/src/pages/PublicNotice/ApplyForm/index.js
@@ -20,6 +20,7 @@ const PublicNoticeApplyForm = Loadable(lazy(() => import('./PublicNoticeApplyFor
import {
// isORGLoggedIn,
isDummyLoggedIn,
+ // checkIsOnlyOnlinePaymentByIssueDate
// isCreditorLoggedIn
} from "utils/Utils";
// ==============================|| DASHBOARD - DEFAULT ||============================== //
@@ -29,6 +30,7 @@ const ApplyForm = () => {
const [gazetteIssueList, setGazetteIssueList] = React.useState([]);
const [selections, setSelection] = React.useState([]);
+
const [isLoading, setLoding] = React.useState(true);
const intl = useIntl();
@@ -64,6 +66,7 @@ const ApplyForm = () => {
setGazetteIssueList(response?.gazetteIssueList);
setSelection(selection);
setUserData(response);
+ // setOnlyOnlinePayment(checkIsOnlyOnlinePayment())
}
});
};
@@ -106,7 +109,10 @@ const ApplyForm = () => {
React.useEffect(() => {
- if (userData !== null) setLoding(false);
+ if (userData !== null){
+ setLoding(false);
+ // console.log(isOnlyOnlinePayment)
+ }
}, [userData]);
return (
@@ -121,6 +127,7 @@ const ApplyForm = () => {
loadedData={userData}
_selections={selections}
gazetteIssueList = {gazetteIssueList}
+ // isOnlyOnlinePayment = {isOnlyOnlinePayment}
/>
);
};
diff --git a/src/pages/extra-pages/DatabaseHealthCheck/index.js b/src/pages/extra-pages/DatabaseHealthCheck/index.js
index dbd12ff..606c32b 100644
--- a/src/pages/extra-pages/DatabaseHealthCheck/index.js
+++ b/src/pages/extra-pages/DatabaseHealthCheck/index.js
@@ -1,31 +1,10 @@
-import { Grid, Typography, Stack, } from '@mui/material';
-import { useState, useEffect, lazy } from "react";
+import { useState, useEffect } from "react";
-import Loadable from 'components/Loadable';
-// import { useIntl, FormattedMessage } from "react-intl";
import { get } from "utils/HttpUtils"
-import {GET_SYS_SETTING} from "utils/ApiPathConst"
-
-import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png'
-const BackgroundHead = {
- backgroundImage: `url(${titleBackgroundImg})`,
- width: 'auto',
- height: 'auto',
- backgroundSize: 'contain',
- backgroundRepeat: 'no-repeat',
- backgroundColor: '#0C489E',
- backgroundPosition: 'right'
-}
-
-const LoadingComponent = Loadable(lazy(() => import('pages/extra-pages/LoadingComponent')));
-
-// import DownloadIcon from '@mui/icons-material/Download';
+import {GET_SYS_CHECKING} from "utils/ApiPathConst"
const DatabaseHealthCheck = () => {
- // const intl = useIntl();
- // const { locale } = intl;
- const [onReady, setOnReady] = useState(false);
- const [sysEnv, setSysEnv] = useState("");
+ const [sysEnv, setSysEnv] = useState("'N/A");
useEffect(() => {
loadSysSetting();
@@ -37,41 +16,16 @@ const DatabaseHealthCheck = () => {
const loadSysSetting = () => {
get({
- url: GET_SYS_SETTING,
+ url: GET_SYS_CHECKING,
onSuccess: (responseData) => {
// console.log(responseData)
setSysEnv(responseData.sysEnv);
- setOnReady(true);
}
});
}
return (
- !onReady ?
-
-
-
-
-
- :
- (
-
-
-
-
-
- Database Health Check
-
-
-
-
-
-
- {sysEnv}
Connection OK
-
-
-
- )
+ {sysEnv}
);
}
diff --git a/src/routes/LoginRoutes.js b/src/routes/LoginRoutes.js
index 790a421..76ead09 100644
--- a/src/routes/LoginRoutes.js
+++ b/src/routes/LoginRoutes.js
@@ -16,7 +16,7 @@ const PrivacyPolicyPage = Loadable(lazy(() => import('pages/extra-pages/PrivacyP
const ImportantNoticePage = Loadable(lazy(() => import('pages/extra-pages/ImportantNoticePage')));
const AboutUsPage = Loadable(lazy(() => import('pages/extra-pages/AboutUs')));
const UserMenuPage = Loadable(lazy(() => import('pages/extra-pages/UserMenu')));
-const UserMenuPubPage = Loadable(lazy(() => import('pages/extra-pages/UserMenuPub')));
+// const UserMenuPubPage = Loadable(lazy(() => import('pages/extra-pages/UserMenuPub')));
const DatabaseHealthCheckPage = Loadable(lazy(() => import('pages/extra-pages/DatabaseHealthCheck')));
@@ -88,9 +88,13 @@ const LoginRoutes = {
path: 'userGuide',
element:
},
+ // {
+ // path: 'userGuidePub',
+ // element:
+ // },
{
- path: 'userGuidePub',
- element:
+ path: 'databaseHealthCheck',
+ element:
},
{
path: 'databaseHealthCheck',
diff --git a/src/utils/ApiPathConst.js b/src/utils/ApiPathConst.js
index c9d6c7b..152b3b8 100644
--- a/src/utils/ApiPathConst.js
+++ b/src/utils/ApiPathConst.js
@@ -13,6 +13,7 @@ export const PRIVACY_POLICY_PATH = apiPath+'/privacyPolicy';
export const I_AM_SMART_PATH = apiPath+'/smart/call/iAmSmart';
export const I_AM_SMART_APP_PATH = apiPath+'/smart/call/app/iAmSmart';
export const GET_SYS_SETTING = apiPath+'/sys';
+export const GET_SYS_CHECKING = apiPath+'/sysCheck';
//Group Config
export const GET_GROUP_LIST_PATH = apiPath+'/group';
diff --git a/src/utils/Utils.js b/src/utils/Utils.js
index 4923a10..f42acea 100644
--- a/src/utils/Utils.js
+++ b/src/utils/Utils.js
@@ -181,4 +181,47 @@ export const isPasswordExpiry = () =>{
return false;
}
+}
+
+export const checkIsOnlyOnlinePaymentByIssueDate = (date) => {
+ const targetDate = new Date(2025, 7, 1, 0, 0, 0) //2026-01-28T08:00:00.000Z hardcode
+ // const targetDate = new Date(2025, 6, 13, 8, 0, 0); //2025-07-13T08:00:00.000Z
+ const checkDate = DateUtils.convertToDate(date)
+ if (isDummyLoggedIn()){
+ return false;
+ }
+ // console.log(checkDate)
+ // console.log(targetDate)
+ if (checkDate >= targetDate) {
+ return true
+ } else {
+ return false;
+ }
+}
+
+export const checkIsOnlyOnlinePayment = () => {
+ const targetDate = new Date(2025, 7, 1, 0, 0, 0) // hardcode
+ const checkDate = DateUtils.convertToDate(new Date())
+ if (isDummyLoggedIn()){
+ return false;
+ }
+ // console.log(checkDate)
+ // console.log(targetDate)
+ if (checkDate >= targetDate) {
+ return true
+ } else {
+ return false;
+ }
+}
+
+export const checkMarkAsCreditClient = () => {
+ const targetDate = new Date(2025, 6, 15, 0, 0, 0) // hardcode
+ const checkDate = DateUtils.convertToDate(new Date())
+ // console.log(targetDate)
+ // console.log(checkDate >= targetDate)
+ if (checkDate >= targetDate) {
+ return true
+ } else {
+ return false;
+ }
}
\ No newline at end of file