From d2eafa69b85a0da3285b5402a488af8d481acfea Mon Sep 17 00:00:00 2001 From: Alex Cheung Date: Mon, 25 Aug 2025 02:09:10 +0800 Subject: [PATCH] fix case 1-5 --- src/layout/MainLayout/Header/index.js | 27 ++- .../ApplyForm/PublicNoticeApplyForm.js | 199 +++++++++--------- .../UserSearchForm_Individual.js | 1 + .../UserSearchForm_Organization.js | 1 + .../authentication/auth-forms/AuthLogin.js | 1 + .../auth-forms/AuthLoginCustom.js | 1 + src/pages/iAmSmart/AuthCallback/index.js | 1 + .../iAmSmart/DirectLoginCallback/index.js | 1 + src/utils/Utils.js | 5 + 9 files changed, 128 insertions(+), 109 deletions(-) diff --git a/src/layout/MainLayout/Header/index.js b/src/layout/MainLayout/Header/index.js index b5370a7..fa6572f 100644 --- a/src/layout/MainLayout/Header/index.js +++ b/src/layout/MainLayout/Header/index.js @@ -50,6 +50,7 @@ import { isINDLoggedIn, isPasswordExpiry, haveOrgPaymentRecord, + haveOrgDnRecord, isORGLoggedIn, checkSysEnv // getUserId @@ -401,17 +402,31 @@ function Header(props) { : isORGLoggedIn() ? haveOrgPaymentRecord() ? - - - + <> + + + + {haveOrgDnRecord()? + + + :null + } + : : - - - + <> + + + + {haveOrgDnRecord()? + + + :null + } + }
  • diff --git a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js index fbe2860..f2d5e63 100644 --- a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js +++ b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js @@ -19,7 +19,7 @@ import ForwardIcon from '@mui/icons-material/Forward'; import { isORGLoggedIn, isDummyLoggedIn, - isCreditorLoggedIn, + // isCreditorLoggedIn, checkIsOnlyOnlinePaymentByIssueDate } from "utils/Utils"; @@ -353,106 +353,101 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) => - - {!isCreditorLoggedIn() ? - - - - - - - - - - - - - - {!isOnlyOnlinePayment? - <> - - - - - - - - - - - :null - } - -
    - -
    { - setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payOnline" })) - setWarningText( - <>: -
      -
      • -
      • -
      • -
    - - ); - setIsWarningPopUp(true); - }}>     -     		{DateUtils.dateFormat(closeDate, dft)} {locale==='en'?"2:00 p.m.":"下午2時"} - -
    -
    { - setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payDn" })) - setWarningText( - <>: -
      -
      • -
      • -
      • -
      • -
      • -
      • -
      • -
      • -
      • -
    - -     		{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 - } - + + + + + + + + + + + + + + {!isOnlyOnlinePayment? + <> + + + + + + + + + + + :null + } + +
    + +
    { + setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payOnline" })) + setWarningText( + <>: +
      +
      • +
      • +
      • +
    + + ); + setIsWarningPopUp(true); + }}>     +     		{DateUtils.dateFormat(closeDate, dft)} {locale==='en'?"2:00 p.m.":"下午2時"} + +
    +
    { + setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payDn" })) + setWarningText( + <>: +
      +
      • +
      • +
      • +
      • +
      • +
      • +
      • +
      • +
      • +
    + +     		{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 - } - { isDummyLoggedIn() ? diff --git a/src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js b/src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js index 1b27b25..8828c52 100644 --- a/src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js +++ b/src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js @@ -61,6 +61,7 @@ const UserSearchForm_Individual = ({ applySearch, onGridReady, searchCriteria }) email:"", phone:"", }); + localStorage.setItem('searchCriteria',"") } return ( diff --git a/src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js b/src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js index 3cb8be0..f2c5144 100644 --- a/src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js +++ b/src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js @@ -77,6 +77,7 @@ const UserSearchForm_Organization = ({applySearch, orgComboData, onGridReady, se contactPerson:"", brNoStr:"", }); + localStorage.setItem('searchCriteria',"") } return ( diff --git a/src/pages/authentication/auth-forms/AuthLogin.js b/src/pages/authentication/auth-forms/AuthLogin.js index badf7a8..c0f6d9f 100644 --- a/src/pages/authentication/auth-forms/AuthLogin.js +++ b/src/pages/authentication/auth-forms/AuthLogin.js @@ -76,6 +76,7 @@ const AuthLogin = () => { abilities: response.data.abilities, passwordExpiryDate: response.data.passwordExpiryDate, orgPaymentRecord: response.data.orgPaymentRecord, + orgDnRecord: response.data.orgDnRecord, //avatar: require('src/assets/images/users/avatar-3.png').default, } // const abilities = response.data.abilities diff --git a/src/pages/authentication/auth-forms/AuthLoginCustom.js b/src/pages/authentication/auth-forms/AuthLoginCustom.js index 44f48cc..cd53a5e 100644 --- a/src/pages/authentication/auth-forms/AuthLoginCustom.js +++ b/src/pages/authentication/auth-forms/AuthLoginCustom.js @@ -92,6 +92,7 @@ const AuthLoginCustom = () => { locale: response.data.preferLocale, passwordExpiryDate: response.data.passwordExpiryDate, orgPaymentRecord: response.data.orgPaymentRecord, + orgDnRecord: response.data.orgDnRecord, //avatar: require('src/assets/images/users/avatar-3.png').default, } const data = { ...userData, accessToken: response.data.accessToken, refreshToken: response.data.refreshToken } diff --git a/src/pages/iAmSmart/AuthCallback/index.js b/src/pages/iAmSmart/AuthCallback/index.js index cb02712..9aefca1 100644 --- a/src/pages/iAmSmart/AuthCallback/index.js +++ b/src/pages/iAmSmart/AuthCallback/index.js @@ -47,6 +47,7 @@ const Index = () => { creditor: responseData.creditor, passwordExpiryDate: responseData.passwordExpiryDate, orgPaymentRecord: responseData.orgPaymentRecord, + orgDnRecord: responseData.orgDnRecord, //locale: responseData.preferLocale, //avatar: require('src/assets/images/users/avatar-3.png').default, } diff --git a/src/pages/iAmSmart/DirectLoginCallback/index.js b/src/pages/iAmSmart/DirectLoginCallback/index.js index 91a1974..2f59918 100644 --- a/src/pages/iAmSmart/DirectLoginCallback/index.js +++ b/src/pages/iAmSmart/DirectLoginCallback/index.js @@ -47,6 +47,7 @@ const Index = () => { creditor: responseData.creditor, passwordExpiryDate: responseData.passwordExpiryDate, orgPaymentRecord: responseData.orgPaymentRecord, + orgDnRecord: responseData.orgDnRecord, //avatar: require('src/assets/images/users/avatar-3.png').default, } const data = { ...userData, accessToken: responseData.accessToken, refreshToken: responseData.refreshToken } diff --git a/src/utils/Utils.js b/src/utils/Utils.js index f42acea..c979821 100644 --- a/src/utils/Utils.js +++ b/src/utils/Utils.js @@ -100,6 +100,11 @@ export const haveOrgPaymentRecord = () =>{ return JSON.parse(localStorage.getItem('userData')).orgPaymentRecord } } +export const haveOrgDnRecord = () =>{ + if (localStorage.getItem('userData') != null){ + return JSON.parse(localStorage.getItem('userData')).orgDnRecord + } +} export const checkSysEnv = () =>{ if (localStorage.getItem('sysEnv') != null){ // console.log(localStorage.getItem('sysEnv'))