diff --git a/src/assets/style/navbarStyles.css b/src/assets/style/navbarStyles.css index 9c64452..a85e592 100644 --- a/src/assets/style/navbarStyles.css +++ b/src/assets/style/navbarStyles.css @@ -19,7 +19,7 @@ } #navbar div li{ list-style: none; - padding: 0 20px; + padding: 0 1vw; position: relative; } #navbar div li a{ @@ -30,6 +30,15 @@ color: black; transition: 0.3s ease-in-out; } + +#navbar div li a span{ + font-size: 1vw !important; +} + +#navbar div li a svg{ + font-size: 1vw !important; +} + #navbar div li a:hover{ color: #0C489E; } diff --git a/src/layout/MainLayout/Header/index.js b/src/layout/MainLayout/Header/index.js index 7061f0e..258b808 100644 --- a/src/layout/MainLayout/Header/index.js +++ b/src/layout/MainLayout/Header/index.js @@ -97,7 +97,7 @@ function Header(props) { Proof
  • - Payment + Payment
    • Online Payment Record @@ -117,7 +117,7 @@ function Header(props) {
  • - Client + Client
    • Users (GLD) @@ -138,7 +138,7 @@ function Header(props) {
  • - Settings + Settings
    • My Profile diff --git a/src/pages/Proof/Reply_Public/ApplicationDetails.js b/src/pages/Proof/Reply_Public/ApplicationDetails.js index b55938a..12fda75 100644 --- a/src/pages/Proof/Reply_Public/ApplicationDetails.js +++ b/src/pages/Proof/Reply_Public/ApplicationDetails.js @@ -89,7 +89,7 @@ const ApplicationDetailCard = ({ formData, }) => { - + diff --git a/src/pages/PublicNotice/Details_GLD/ClientDetailCard.js b/src/pages/PublicNotice/Details_GLD/ClientDetailCard.js index 913d7f9..21f868e 100644 --- a/src/pages/PublicNotice/Details_GLD/ClientDetailCard.js +++ b/src/pages/PublicNotice/Details_GLD/ClientDetailCard.js @@ -36,7 +36,6 @@ const ClientDetailCard = ( ) => { // const params = useParams(); const [currentApplicationDetailData, setCurrentApplicationDetailData] = useState({}); - const [orgDetailData, setOrgDetailData] = useState({}); const [brExpiryDate,setBrExpiryDate] = useState(""); const [brNo,setBrNo] = useState(""); const [onReady, setOnReady] = useState(false); @@ -50,40 +49,48 @@ const ClientDetailCard = ( //if user data from parent are not null if (Object.keys(applicationDetailData).length > 0 && applicationDetailData !== undefined) { setCurrentApplicationDetailData(applicationDetailData.userData); - if (!applicationDetailData.orgDetail == null){ - setOrgDetailData(applicationDetailData.orgDetail.data); - } - if (!applicationDetailData.companyName1 == null) { - setCompanyName(applicationDetailData.companyName); - } else { + if (applicationDetailData.orgDetail != null){ + var orgDetail = applicationDetailData.orgDetail?.data; + setBrExpiryDate(DateUtils.dateValue(orgDetail?.brExpiryDate)); + setBrNo(orgDetail?.brNo); const companyNameData = { - enCompanyName: applicationDetailData.userData.enCompanyName, - chCompanyName: applicationDetailData.userData.chCompanyName + enCompanyName: orgDetail?.enCompanyName, + chCompanyName: orgDetail?.chCompanyName + } + setCompanyName(companyNameData) + }else{ + var userData = applicationDetailData.userData; + setBrExpiryDate(DateUtils.dateValue(userData?.brExpiryDate)); + setBrNo(userData?.brNo); + const companyNameData = { + enCompanyName: userData?.enCompanyName, + chCompanyName: userData?.chCompanyName } setCompanyName(companyNameData) } + setOnReady(true); } }, [applicationDetailData]); - useEffect(() => { - //if state data are ready and assign to different field - // console.log(currentApplicationDetailData) - if (Object.keys(currentApplicationDetailData).length > 0) { - if( currentApplicationDetailData.orgId!=null){ - if (Object.keys(orgDetailData).length > 0) { - setBrExpiryDate(DateUtils.dateValue(orgDetailData.brExpiryDate)); - setBrNo(orgDetailData.brNo); - setOnReady(true); - }else{ - setBrExpiryDate(DateUtils.dateValue(currentApplicationDetailData.brExpiryDate)); - setBrNo(currentApplicationDetailData.brNo); - setOnReady(true); - } - }else{ - setOnReady(true); - } - } - }, [currentApplicationDetailData]); + // useEffect(() => { + // //if state data are ready and assign to different field + // // console.log(currentApplicationDetailData) + // if (Object.keys(currentApplicationDetailData).length > 0) { + // if( currentApplicationDetailData.orgId!=null){ + // if (Object.keys(orgDetailData).length > 0) { + // setBrExpiryDate(DateUtils.dateValue(orgDetailData.brExpiryDate)); + // setBrNo(orgDetailData.brNo); + // setOnReady(true); + // }else{ + // setBrExpiryDate(DateUtils.dateValue(currentApplicationDetailData.brExpiryDate)); + // setBrNo(currentApplicationDetailData.brNo); + // setOnReady(true); + // } + // }else{ + // setOnReady(true); + // } + // } + // }, [currentApplicationDetailData, orgDetailData]); useEffect(() => { if (brNo != undefined && brNo.length > 0) { diff --git a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js index bb832cc..28222f0 100644 --- a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js +++ b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js @@ -142,24 +142,24 @@ const ApplicationDetailCard = ( const latestData = {}; responseData.forEach(item => { - const { appId, timeDiff } = item; - if (latestData[appId] === undefined || timeDiff < latestData[appId].timeDiff) { - latestData[appId] = item; - } + const { appId, timeDiff } = item; + if (latestData[appId] === undefined || timeDiff < latestData[appId].timeDiff) { + latestData[appId] = item; + } }); const latestDataObjects = Object.values(latestData); - + const filteredData = latestDataObjects.filter(item => item.timeDiff > 20 || item.status !== "APPR"); const filteredAppIds = filteredData.map(item => item.appId); - + const appIdsNotInData = appIdList.filter(appId => !latestDataObjects.some(item => item.appId === appId)); const combinedAppIdsArray = [...appIdsNotInData, ...filteredAppIds]; - + const readyToPayment = appIdList.every(appId => combinedAppIdsArray.includes(appId)); - if (readyToPayment){ + if (readyToPayment) { setIsPopUp(true); return; - }else{ + } else { const appIdsInData = appIdList.filter(appId => !combinedAppIdsArray.some(item => item === appId)); const HoldingApplication = latestDataObjects.filter(item => appIdsInData.includes(item.appId)); const resultString = HoldingApplication.map(item => item.appNo).join(' , '); @@ -211,11 +211,11 @@ const ApplicationDetailCard = ( onClick={cancelledClick()} color="edit" disabled={currentApplicationDetailData.status == "rejected" - || currentApplicationDetailData.status == "cancelled" - || (!currentApplicationDetailData.creditor - && currentApplicationDetailData.status == "paid") - || (currentApplicationDetailData.creditor - && currentApplicationDetailData.status == "confirmed") + || currentApplicationDetailData.status == "cancelled" + || (!currentApplicationDetailData.creditor + && currentApplicationDetailData.status == "paid") + || (currentApplicationDetailData.creditor + && currentApplicationDetailData.status == "confirmed") } title={intl.formatMessage({ id: 'cancel' })} startIcon={} @@ -265,7 +265,7 @@ const ApplicationDetailCard = ( - + @@ -274,7 +274,7 @@ const ApplicationDetailCard = ( - + {currentApplicationDetailData.status ? StatusUtils.getStatusByTextIntl(currentApplicationDetailData.status, false, intl) : ""} @@ -505,12 +505,23 @@ const ApplicationDetailCard = ( - (HK$): + (HK$): - {FormatUtils.currencyFormat(fee)} + + + @@ -618,7 +629,18 @@ const ApplicationDetailCard = ( : - {currentApplicationDetailData.careOf} + + + : null @@ -632,7 +654,18 @@ const ApplicationDetailCard = ( - {currentApplicationDetailData.remarks} + + + diff --git a/src/pages/iAmSmart/AuthCallback/index.js b/src/pages/iAmSmart/AuthCallback/index.js index c10758c..39772ce 100644 --- a/src/pages/iAmSmart/AuthCallback/index.js +++ b/src/pages/iAmSmart/AuthCallback/index.js @@ -45,27 +45,27 @@ const Index = () => { role: responseData.role, abilities: responseData.abilities, creditor: responseData.creditor, - locale: responseData.preferLocale, + //locale: responseData.preferLocale, //avatar: require('src/assets/images/users/avatar-3.png').default, } - const data = { ...userData, accessToken: responseData.accessToken, refreshToken: responseData.refreshToken } - if(responseData.type === "GLD"){ - // setLocale("en"); - localStorage.setItem('locale','en'); - }else{ - if (responseData.preferLocale ==="zh_HK"){ - // setLocale("zh-HK"); - localStorage.setItem('locale','zh-HK'); - } - if (responseData.preferLocale ==="zh-CN"){ - // setLocale("zh-CN"); - localStorage.setItem('locale','zh-CN'); - } - if (response.data.preferLocale ==="en"){ - // setLocale("zh-CN"); - localStorage.setItem('locale','en'); - } - } + const data = { ...userData, accessToken: responseData.accessToken, refreshToken: responseData.refreshToken } + // if(responseData.type === "GLD"){ + // // setLocale("en"); + // localStorage.setItem('locale','en'); + // }else{ + // if (responseData.preferLocale ==="zh_HK"){ + // // setLocale("zh-HK"); + // localStorage.setItem('locale','zh-HK'); + // } + // if (responseData.preferLocale ==="zh-CN"){ + // // setLocale("zh-CN"); + // localStorage.setItem('locale','zh-CN'); + // } + // if (response.data.preferLocale ==="en"){ + // // setLocale("zh-CN"); + // localStorage.setItem('locale','en'); + // } + // } dispatch(handleLogin(data)) navigate('/dashboard'); },