From 3663276cb135a7ef1433f5870a2541d74b757e1a Mon Sep 17 00:00:00 2001 From: CCHooo Date: Mon, 8 Sep 2025 04:35:17 +0800 Subject: [PATCH] add login public check, message check, demand note no --- src/pages/Proof/Payment/Pay_Online.js | 4 +- src/pages/Proof/Payment/index.js | 11 +++- src/pages/Proof/Reply_Public/ProofForm.js | 4 +- .../Details_GLD/ApplicationDetailCard.js | 28 +++++----- .../ListPanel/PendingPaymentTab.js | 12 ++-- .../Search_Mark_As_Paid_GLD/DataGrid.js | 55 ++++++++++++------- src/pages/authentication/AuthWrapper.js | 10 +--- .../auth-forms/PasswordAlertDialog.js | 4 ++ src/pages/dashboard/Public/index.js | 16 ++---- src/translations/en.json | 1 + src/translations/zh-CN.json | 1 + src/translations/zh-HK.json | 1 + src/utils/Utils.js | 7 +-- 13 files changed, 87 insertions(+), 67 deletions(-) diff --git a/src/pages/Proof/Payment/Pay_Online.js b/src/pages/Proof/Payment/Pay_Online.js index b710b2c..dc5d283 100644 --- a/src/pages/Proof/Payment/Pay_Online.js +++ b/src/pages/Proof/Payment/Pay_Online.js @@ -176,8 +176,8 @@ const Index = () => {
{checkPaymentSuspention()?
- -
+ +

:null diff --git a/src/pages/Proof/Payment/index.js b/src/pages/Proof/Payment/index.js index 57834d8..fd8ad91 100644 --- a/src/pages/Proof/Payment/index.js +++ b/src/pages/Proof/Payment/index.js @@ -12,12 +12,14 @@ const Pay_Creditor = Loadable(lazy(() => import('./Pay_Creditor'))); const Pay_Dn = Loadable(lazy(() => import('./Pay_DN'))); const Pay_Office = Loadable(lazy(() => import('./Pay_Office'))); const Pay_Online = Loadable(lazy(() => import('./Pay_Online'))); +import { checkPaymentSuspention } from "utils/Utils"; const Index = () => { const params = useParams(); const [onReady, setOnReady] = useState(false); const [record, setRecord] = useState({}); + const [paymentMethod, setPaymentMethod] = useState(); const navigate = useNavigate() useEffect(() => { @@ -33,6 +35,11 @@ const Index = () => { navigate("/proof/search"); } setRecord(responseData.data); + if(checkPaymentSuspention()){ + setPaymentMethod("online") + }else{ + setPaymentMethod(responseData.data.paymentMethod) + } }, onError: () => { @@ -56,12 +63,12 @@ const Index = () => { record={record} /> : ( - record.paymentMethod == "demandNote" ? + paymentMethod == "demandNote" ? : ( - record.paymentMethod == "online" ? + paymentMethod == "online" ? diff --git a/src/pages/Proof/Reply_Public/ProofForm.js b/src/pages/Proof/Reply_Public/ProofForm.js index 19b3f47..69a74c1 100644 --- a/src/pages/Proof/Reply_Public/ProofForm.js +++ b/src/pages/Proof/Reply_Public/ProofForm.js @@ -436,8 +436,8 @@ const FormPanel = ({ formData }) => { {checkPaymentSuspention()? - -
+ +
:null }
{ diff --git a/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js b/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js index 2075e68..42836b9 100644 --- a/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js +++ b/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js @@ -746,7 +746,7 @@ const ApplicationDetailCard = ( - + - - - + {currentApplicationDetailData.paymentMethod!=null? + + + :null + } diff --git a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js index 831a2c2..8c0881e 100644 --- a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js +++ b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js @@ -240,19 +240,19 @@ export default function SubmittedTab({ setCount, url }) { { params.row.paymentMethod=="online"? locale === 'en' ? - `${DateUtils.dateFormatWithFix(params.row.closingDate, intl.formatMessage({ id: "datetimeFormate" }), 14, 30)?.replace("am", "a.m.")?.replace("pm", "p.m.")}` + `${DateUtils.dateFormatWithFix(params.row.expiryDate, intl.formatMessage({ id: "datetimeFormate" }), 14, 30)?.replace("am", "a.m.")?.replace("pm", "p.m.")}` : - `${DateUtils.dateFormatWithFix(params.row.closingDate, intl.formatMessage({ id: "datetimeFormate" }), 14, 30)?.replace("am", "上午")?.replace("pm", "下午").replace("00分", "")}` + `${DateUtils.dateFormatWithFix(params.row.expiryDate, intl.formatMessage({ id: "datetimeFormate" }), 14, 30)?.replace("am", "上午")?.replace("pm", "下午").replace("00分", "")}` :params.row.paymentMethod=="demandNote" ? locale === 'en' ? - `${DateUtils.dateFormatWithFix(params.row.closingDate, intl.formatMessage({ id: "datetimeFormate" }), 12, 0)?.replace("am", "a.m.")?.replace("pm", "p.m.")}` + `${DateUtils.dateFormatWithFix(params.row.expiryDate, intl.formatMessage({ id: "datetimeFormate" }), 12, 0)?.replace("am", "a.m.")?.replace("pm", "p.m.")}` : - `${DateUtils.dateFormatWithFix(params.row.closingDate, intl.formatMessage({ id: "datetimeFormate" }), 12, 0)?.replace("am", "上午")?.replace("pm", "下午").replace("00分", "")}` + `${DateUtils.dateFormatWithFix(params.row.expiryDate, intl.formatMessage({ id: "datetimeFormate" }), 12, 0)?.replace("am", "上午")?.replace("pm", "下午").replace("00分", "")}` : locale === 'en' ? - `${DateUtils.dateFormatWithFix(params.row.closingDate, intl.formatMessage({ id: "datetimeFormate" }), 12, 30)?.replace("am", "a.m.")?.replace("pm", "p.m.")}` + `${DateUtils.dateFormatWithFix(params.row.expiryDate, intl.formatMessage({ id: "datetimeFormate" }), 12, 30)?.replace("am", "a.m.")?.replace("pm", "p.m.")}` : - `${DateUtils.dateFormatWithFix(params.row.closingDate, intl.formatMessage({ id: "datetimeFormate" }), 12, 30)?.replace("am", "上午")?.replace("pm", "下午").replace("00分", "")}` + `${DateUtils.dateFormatWithFix(params.row.expiryDate, intl.formatMessage({ id: "datetimeFormate" }), 12, 30)?.replace("am", "上午")?.replace("pm", "下午").replace("00分", "")}` } {/* { locale === 'en' ? diff --git a/src/pages/PublicNotice/Search_Mark_As_Paid_GLD/DataGrid.js b/src/pages/PublicNotice/Search_Mark_As_Paid_GLD/DataGrid.js index 2c72b1f..ac43d16 100644 --- a/src/pages/PublicNotice/Search_Mark_As_Paid_GLD/DataGrid.js +++ b/src/pages/PublicNotice/Search_Mark_As_Paid_GLD/DataGrid.js @@ -36,7 +36,7 @@ export default function SearchPublicNoticeTable({ searchCriteria, applyGridOnRea const [isConfirmPopUp, setIsConfirmPopUp] = React.useState(false); const [isWarningPopUp, setIsWarningPopUp] = React.useState(false); const [demandNoteNoPopUp, setDemandNoteNoPopUp] = React.useState(false); - const [confirmDemandNoteNoPopUp, setConfirmDemandNoteNoPopUp] = React.useState(false); + // const [confirmDemandNoteNoPopUp, setConfirmDemandNoteNoPopUp] = React.useState(false); const [demandNoteNo, setDemandNoteNo] = React.useState(); const [demandNoteNoId, setDemandNoteNoId] = React.useState(); @@ -71,7 +71,8 @@ export default function SearchPublicNoticeTable({ searchCriteria, applyGridOnRea function updateDemandNoteNo(id, remark) { setDemandNoteNoId(id) setDemandNoteNo(remark) - setConfirmDemandNoteNoPopUp(true) + doDemandNoteNo() + // setConfirmDemandNoteNoPopUp(true) } function editDemandNoteNo(id, remark) { @@ -81,7 +82,7 @@ export default function SearchPublicNoticeTable({ searchCriteria, applyGridOnRea } const doDemandNoteNo = () => { - setConfirmDemandNoteNoPopUp(false); + // setConfirmDemandNoteNoPopUp(false); console.log(refreshTrigger) HttpUtils.post({ url: APPLICATION_UPDATE_DEMAND_NOTE_NO + "/" + demandNoteNoId, @@ -213,21 +214,35 @@ export default function SearchPublicNoticeTable({ searchCriteria, applyGridOnRea : - + + + + }
); @@ -360,7 +375,7 @@ export default function SearchPublicNoticeTable({ searchCriteria, applyGridOnRea
-
+ {/*
setConfirmDemandNoteNoPopUp(false)} @@ -381,7 +396,7 @@ export default function SearchPublicNoticeTable({ searchCriteria, applyGridOnRea -
+
*/}
import('./AuthCardCustom'))); @@ -21,7 +20,6 @@ const BackgroundHead = { const AuthWrapper = ({ children }) => { // Move useIntl inside component const intl = useIntl(); - const { sysSetting } = useContext(SysContext); return ( @@ -45,7 +43,7 @@ const AuthWrapper = ({ children }) => { {checkPaymentSuspention()? -
+
: @@ -81,7 +79,6 @@ const AuthWrapper = ({ children }) => { - {sysSetting?.publicLogin? { {children} - :null - } +
diff --git a/src/pages/authentication/auth-forms/PasswordAlertDialog.js b/src/pages/authentication/auth-forms/PasswordAlertDialog.js index 305a139..f6a3835 100644 --- a/src/pages/authentication/auth-forms/PasswordAlertDialog.js +++ b/src/pages/authentication/auth-forms/PasswordAlertDialog.js @@ -47,6 +47,10 @@ const PasswordAlertDialog = (props) => { : + props.errorMassage === 'PUBLIC_LOGIN_DISABLE' ? + + + : diff --git a/src/pages/dashboard/Public/index.js b/src/pages/dashboard/Public/index.js index 590796e..c81ef91 100644 --- a/src/pages/dashboard/Public/index.js +++ b/src/pages/dashboard/Public/index.js @@ -51,13 +51,12 @@ const DashboardDefault = () => { const [isLoading, setLoding] = useState(true); const [itemList, setItemList] = React.useState([]); const [listData, setListData] = React.useState([]); - const [paymentSuspention, setPaymentSuspention] = useState(false); const [isPopUp, setIsPopUp] = React.useState(false); React.useEffect(() => { loadMessageData() loadNoticeData() - checkPaymentSuspention()?setPaymentSuspention(true):setPaymentSuspention(false) + localStorage.setItem('searchCriteria',"") }, []); @@ -75,19 +74,14 @@ const DashboardDefault = () => { } } - React.useEffect(() => { - // console.log(messageOnReady) - // console.log(onNoticeReady) - if(paymentSuspention){ - setIsPopUp(true); - } - }, [paymentSuspention]); - React.useEffect(() => { // console.log(messageOnReady) // console.log(onNoticeReady) if(messageOnReady&&onNoticeReady){ setLoding(false) + if(checkPaymentSuspention()){ + setIsPopUp(true); + } // console.log(123) } }, [messageOnReady,onNoticeReady]); @@ -246,7 +240,7 @@ const DashboardDefault = () => { -
+
diff --git a/src/translations/en.json b/src/translations/en.json index 40b4b04..22cd82d 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -165,6 +165,7 @@ "loginErrorMessage4":"System Connection Failed", "loginErrorMessage5":"Incorrect Username or Password", "loginErrorMessage6":"User account not found", + "loginErrorMessage7":"System is under maintenance, please check back later", "pleaseLloginMessage1":"User account already created", "pleaseLloginMessage2":"You are our existing user, please login to your account.", diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json index f3acb4b..64126a2 100644 --- a/src/translations/zh-CN.json +++ b/src/translations/zh-CN.json @@ -202,6 +202,7 @@ "loginErrorMessage4":"系统连接失败", "loginErrorMessage5":"用户登入名称或密码错误", "loginErrorMessage6":"找不到用户帐户", + "loginErrorMessage7":"系统正在维护中，请稍后再查看", "pleaseLloginMessage1":"帐户已建立", "pleaseLloginMessage2":"你是我们的现有用户，请登入你的帐户。", diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json index 28e1c21..56864ca 100644 --- a/src/translations/zh-HK.json +++ b/src/translations/zh-HK.json @@ -203,6 +203,7 @@ "loginErrorMessage4":"系統連接失敗", "loginErrorMessage5":"用戶名或密碼錯誤", "loginErrorMessage6":"找不到用戶帳戶", + "loginErrorMessage7":"系統正在維護中，請稍後再查看", "pleaseLloginMessage1":"帳戶已建立", "pleaseLloginMessage2":"你是我們的現有用戶，請登入你的帳戶。", diff --git a/src/utils/Utils.js b/src/utils/Utils.js index 5c5d529..9f7e467 100644 --- a/src/utils/Utils.js +++ b/src/utils/Utils.js @@ -110,13 +110,12 @@ export const checkSysEnv = () =>{ // console.log(localStorage.getItem('sysEnv')) return localStorage.getItem('sysEnv') } -} +} export const checkPaymentSuspention = () =>{ if (localStorage.getItem('paymentSuspention') != null){ - // console.log(localStorage.getItem('sysEnv')) - return localStorage.getItem('paymentSuspention') + return JSON.parse(localStorage.getItem('paymentSuspention')) } -} +} /** ** This function is used for demo purpose route navigation ** In real app you won't need this function because your app will navigate to same route for each users regardless of ability