diff --git a/src/pages/Organization/DetailPage/OrganizationCard.js b/src/pages/Organization/DetailPage/OrganizationCard.js index 427b1b4..607943d 100644 --- a/src/pages/Organization/DetailPage/OrganizationCard.js +++ b/src/pages/Organization/DetailPage/OrganizationCard.js @@ -336,17 +336,19 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => { - - - - - + { isGrantedAny("MAINTAIN_DEMANDNOTE")? + + + + + : null + } } diff --git a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js index 980b111..b7eb04a 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: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payOnline" })) - setWarningText( - <> -
    -
    • -
    • -
    • -
- - ); - setIsWarningPopUp(true); - }}> - 		{DateUtils.dateFormat(closeDate, dft)} 2:00 p.m. - -
-
{ - setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payDn" })) - setWarningText( - <> -
    -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
- - 		{DateUtils.dateFormat(closingDateOff, dft)} 5:00 p.m. - -
-
{ - setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payNPGOPopUpTitle" })) - setWarningText( - <> -
    -
    • -
    • -
    • -
    • -
- - ); - setIsWarningPopUp(true); - }}> - 		{DateUtils.dateFormat(closeDate, dft)} 12:00 p.m. - -
- - + {!isCreditorLoggedIn()? + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
{ + setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payOnline" })) + setWarningText( + <> +
    +
    • +
    • +
    • +
+ + ); + setIsWarningPopUp(true); + }}> + 		{DateUtils.dateFormat(closeDate, dft)} 2:00 p.m. + +
+
{ + setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payDn" })) + setWarningText( + <> +
    +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
+ + 		{DateUtils.dateFormat(closingDateOff, dft)} 5:00 p.m. + +
+
{ + setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payNPGOPopUpTitle" })) + setWarningText( + <> +
    +
    • +
    • +
    • +
    • +
+ + ); + setIsWarningPopUp(true); + }}> + 		{DateUtils.dateFormat(closeDate, dft)} 12:00 p.m. + +
+ + : null + } diff --git a/src/pages/User/ChangePasswordPage/index.js b/src/pages/User/ChangePasswordPage/index.js index 5479011..0868bd0 100644 --- a/src/pages/User/ChangePasswordPage/index.js +++ b/src/pages/User/ChangePasswordPage/index.js @@ -136,14 +136,14 @@ const Index = () => { .matches(/^(?=.*[a-z])/, { message: intl.formatMessage({id: 'atLeastOneSmallLetter'})}) .matches(/^(?=.*[A-Z])/, { message: intl.formatMessage({id: 'atLeastOneCapLetter'})}) .matches(/^(?=.*[0-9])/, { message: intl.formatMessage({id: 'atLeast1Number'})}) - .matches(/^(?=.*[!@#%&])/, { message: intl.formatMessage({id: 'atLeast1SpecialChar'})}), + .matches(/^(?=.*\W)/, { message: intl.formatMessage({id: 'atLeast1SpecialChar'})}), newPassword: yup.string().min(8, intl.formatMessage({id: 'atLeast8CharPassword'})) .required(intl.formatMessage({id: 'requirePassword'})) .matches(/^\S*$/, { message: (intl.formatMessage({id: 'noSpacePassword'}))}) .matches(/^(?=.*[a-z])/, { message: intl.formatMessage({id: 'atLeastOneSmallLetter'})}) .matches(/^(?=.*[A-Z])/, { message: intl.formatMessage({id: 'atLeastOneCapLetter'})}) .matches(/^(?=.*[0-9])/, { message: intl.formatMessage({id: 'atLeast1Number'})}) - .matches(/^(?=.*[!@#%&])/, { message: intl.formatMessage({id: 'atLeast1SpecialChar'})}), + .matches(/^(?=.*\W)/, { message: intl.formatMessage({id: 'atLeast1SpecialChar'})}), confirmPassword: yup.string().min(8, intl.formatMessage({id: 'atLeast8CharPassword'})) .required(intl.formatMessage({id: 'pleaseConfirmPassword'})) .oneOf([yup.ref('newPassword'), null], intl.formatMessage({id: 'samePassword'})), diff --git a/src/pages/authentication/ForgotPassword/AuthCallback/index.js b/src/pages/authentication/ForgotPassword/AuthCallback/index.js index 354abd5..8d290cc 100644 --- a/src/pages/authentication/ForgotPassword/AuthCallback/index.js +++ b/src/pages/authentication/ForgotPassword/AuthCallback/index.js @@ -175,7 +175,7 @@ const Index = () => { .matches(/^(?=.*[a-z])/, { message: intl.formatMessage({id: 'atLeastOneSmallLetter'})}) .matches(/^(?=.*[A-Z])/, { message: intl.formatMessage({id: 'atLeastOneCapLetter'})}) .matches(/^(?=.*[0-9])/, { message: intl.formatMessage({id: 'atLeast1Number'})}) - .matches(/^(?=.*[!@#%&])/, { message: intl.formatMessage({id: 'atLeast1SpecialChar'})}), + .matches(/^(?=.*\W)/, { message: intl.formatMessage({id: 'atLeast1SpecialChar'})}), confirmPassword: yup.string().min(8, intl.formatMessage({id: 'atLeast8CharPassword'})) .required(intl.formatMessage({id: 'pleaseConfirmPassword'})) .oneOf([yup.ref('password'), null], intl.formatMessage({id: 'samePassword'})), diff --git a/src/pages/authentication/ForgotUsername/AuthCallback/index.js b/src/pages/authentication/ForgotUsername/AuthCallback/index.js index b56a1bc..02bbcce 100644 --- a/src/pages/authentication/ForgotUsername/AuthCallback/index.js +++ b/src/pages/authentication/ForgotUsername/AuthCallback/index.js @@ -181,7 +181,7 @@ const Index = () => { .matches(/^(?=.*[a-z])/, { message: intl.formatMessage({id: 'atLeastOneSmallLetter'})}) .matches(/^(?=.*[A-Z])/, { message: intl.formatMessage({id: 'atLeastOneCapLetter'})}) .matches(/^(?=.*[0-9])/, { message: intl.formatMessage({id: 'atLeast1Number'})}) - .matches(/^(?=.*[!@#%&])/, { message: intl.formatMessage({id: 'atLeast1SpecialChar'})}), + .matches(/^(?=.*\W)/, { message: intl.formatMessage({id: 'atLeast1SpecialChar'})}), confirmPassword: yup.string().min(8, intl.formatMessage({id: 'atLeast8CharPassword'})) .max(60, getMaxErrStr(60)) .required(intl.formatMessage({id: 'pleaseConfirmPassword'})) diff --git a/src/pages/authentication/RegisterCustom.js b/src/pages/authentication/RegisterCustom.js index d8b18ab..b3a7046 100644 --- a/src/pages/authentication/RegisterCustom.js +++ b/src/pages/authentication/RegisterCustom.js @@ -22,7 +22,8 @@ const RegisterCustom = () => { const { locale } = intl; const registerWithIAmSmart = () => { - setIsPopUp(true); + getQRWithIAmSmart(); + setIsPopUp(false); } const getQRWithIAmSmart = () => { diff --git a/src/pages/authentication/auth-forms/AuthLoginCustom.js b/src/pages/authentication/auth-forms/AuthLoginCustom.js index 4b97874..a903fe0 100644 --- a/src/pages/authentication/auth-forms/AuthLoginCustom.js +++ b/src/pages/authentication/auth-forms/AuthLoginCustom.js @@ -151,7 +151,7 @@ const AuthLoginCustom = () => { .matches(/^(?=.*[a-z])/, intl.formatMessage({ id: 'atLeastOneSmallLetter' })) .matches(/^(?=.*[A-Z])/, intl.formatMessage({ id: 'atLeastOneCapLetter' })) .matches(/^(?=.*[0-9])/, intl.formatMessage({ id: 'atLeast1Number' })) - .matches(/^(?=.*[!@#%&])/, intl.formatMessage({ id: 'atLeast1SpecialChar' })), + .matches(/^(?=.*\W)/, intl.formatMessage({ id: 'atLeast1SpecialChar' })), }), }); @@ -177,7 +177,7 @@ const AuthLoginCustom = () => { var lowerCase = /[a-z]/g; var upperCase = /[A-Z]/g; var numbers = /[0-9]/g; - var symbol = /^(?=.*[!@#%&])/; + var symbol = /^(?=.*\W)/; if (!new_pass.match(lowerCase)) { return false; } else if (!new_pass.match(upperCase)) { diff --git a/src/pages/authentication/auth-forms/BusCustomFormWizard.js b/src/pages/authentication/auth-forms/BusCustomFormWizard.js index 707c8a9..c696c4f 100644 --- a/src/pages/authentication/auth-forms/BusCustomFormWizard.js +++ b/src/pages/authentication/auth-forms/BusCustomFormWizard.js @@ -434,7 +434,7 @@ const BusCustomFormWizard = (props) => { } function handleUserName(username) { - var symbol = /^(?=.*[!@#%&])/; + var symbol = /^(?=.*\W)/; var space = /\s/; if (username.length < 6) { return false; @@ -461,7 +461,7 @@ const BusCustomFormWizard = (props) => { var lowerCase = /[a-z]/g; var upperCase = /[A-Z]/g; var numbers = /[0-9]/g; - var symbol = /^(?=.*[!@#%&])/; + var symbol = /^(?=.*\W)/; var space = /\s/; if (!new_pass.match(lowerCase)) { return false; @@ -527,7 +527,7 @@ const BusCustomFormWizard = (props) => { .matches(/^(?=.*[a-z])/, { message: displayErrorMsg(intl.formatMessage({id: 'atLeastOneSmallLetter'})) }) .matches(/^(?=.*[A-Z])/, { message: displayErrorMsg(intl.formatMessage({id: 'atLeastOneCapLetter'})) }) .matches(/^(?=.*[0-9])/, { message: displayErrorMsg(intl.formatMessage({id: 'atLeast1Number'})) }) - .matches(/^(?=.*[!@#%&])/, { message: displayErrorMsg(intl.formatMessage({id: 'atLeast1SpecialChar'})) }), + .matches(/^(?=.*\W)/, { message: displayErrorMsg(intl.formatMessage({id: 'atLeast1SpecialChar'})) }), confirmPassword: yup.string().min(8, displayErrorMsg(intl.formatMessage({id: 'atLeast8CharPassword'}))).required(displayErrorMsg(intl.formatMessage({id: 'pleaseConfirmPassword'}))).oneOf([yup.ref('password'), null], displayErrorMsg(intl.formatMessage({id: 'samePassword'}))), enName: yup.string().max(40,getMaxErrStr(40)).required(displayErrorMsg(intl.formatMessage({id: 'userRequireEnglishName'}))), enCompanyName: yup.string().matches(/^[^$^*()]+$/, { message: displayErrorMsg('No special characters $/^/*/(/)') }).when('chCompanyName', { @@ -743,6 +743,9 @@ const BusCustomFormWizard = (props) => { value={formik.values.confirmPassword.trim()} name="confirmPassword" onBlur={formik.handleBlur} + onCut={handleCCPChange} + onCopy={handleCCPChange} + onPaste={handleCCPChange} onChange={(e) => { formik.handleChange(e); // changePassword(e.target.value); @@ -1004,7 +1007,7 @@ const BusCustomFormWizard = (props) => { value={selectedAddress4} options={address4ComboList} disabled={checkCountry} - error={Boolean(districtErrStr!="")} + // error={Boolean(districtErrStr!="")} onBlur={formik.handleBlur} getOptionLabel={(option) => option.type? intl.formatMessage({ id: option.type }) : ""} onChange={(event, newValue) => { @@ -1013,7 +1016,7 @@ const BusCustomFormWizard = (props) => { sx={{ "& .MuiInputBase-root": { height: "41px" }, "#address4-combo": { padding: "0px 0px 0px 3px" }, "& .MuiAutocomplete-endAdornment": { top: "auto" }, }} - renderInput={(params) => } /> { {formik.errors.address3} )} - {/* {districtErrStr!= "" && ( + {districtErrStr!= "" && ( {districtErrStr} - )} */} + )} diff --git a/src/pages/authentication/auth-forms/CustomFormWizard.js b/src/pages/authentication/auth-forms/CustomFormWizard.js index 449f6e4..6fc258e 100644 --- a/src/pages/authentication/auth-forms/CustomFormWizard.js +++ b/src/pages/authentication/auth-forms/CustomFormWizard.js @@ -434,7 +434,7 @@ const CustomFormWizard = (props) => { } function handleUsername(username) { - var symbol = /^(?=.*[!@#%&])/; + var symbol = /^(?=.*\W)/; var space = /\s/; if (username.length < 6) { return false; @@ -538,7 +538,7 @@ const CustomFormWizard = (props) => { var lowerCase = /[a-z]/g; var upperCase = /[A-Z]/g; var numbers = /[0-9]/g; - var symbol = /^(?=.*[!@#%&])/; + var symbol = /^(?=.*\W)/; var space = /\s/; if (!new_pass.match(lowerCase)) { return false; @@ -610,7 +610,7 @@ const CustomFormWizard = (props) => { .matches(/^(?=.*[a-z])/, { message: displayErrorMsg(intl.formatMessage({ id: 'atLeastOneSmallLetter' })) }) .matches(/^(?=.*[A-Z])/, { message: displayErrorMsg(intl.formatMessage({ id: 'atLeastOneCapLetter' })) }) .matches(/^(?=.*[0-9])/, { message: displayErrorMsg(intl.formatMessage({ id: 'atLeast1Number' })) }) - .matches(/^(?=.*[!@#%&])/, { message: displayErrorMsg(intl.formatMessage({ id: 'atLeast1SpecialChar' })) }), + .matches(/^(?=.*\W)/, { message: displayErrorMsg(intl.formatMessage({ id: 'atLeast1SpecialChar' })) }), confirmPassword: yup.string().min(8, displayErrorMsg(intl.formatMessage({ id: 'atLeast8CharPassword' }))).required(displayErrorMsg(intl.formatMessage({ id: 'pleaseConfirmPassword' }))).oneOf([yup.ref('password'), null], displayErrorMsg(intl.formatMessage({ id: 'samePassword' }))), chName: yup.string().max(6, getMaxErrStr(6)), enName: yup.string().max(40, getMaxErrStr(40)).when('chName', { @@ -866,6 +866,9 @@ const CustomFormWizard = (props) => { value={formik.values.confirmPassword.trim()} name="confirmPassword" onBlur={formik.handleBlur} + onCut={handleCCPChange} + onCopy={handleCCPChange} + onPaste={handleCCPChange} onChange={(e) => { formik.handleChange(e); // changePassword(e.target.value); @@ -1245,7 +1248,7 @@ const CustomFormWizard = (props) => { value={selectedAddress4} options={ComboData.district} disabled={checkCountry} - error={Boolean(districtErrStr != "")} + // error={Boolean(districtErrStr != "")} onBlur={formik.handleBlur} getOptionLabel={(option) => option.type ? intl.formatMessage({ id: option.type }) : ""} onChange={(event, newValue) => { @@ -1256,7 +1259,7 @@ const CustomFormWizard = (props) => { "#address4-combo": { padding: "0px 0px 0px 3px" }, "& .MuiAutocomplete-endAdornment": { top: "auto" }, }} - renderInput={(params) => } /> { {formik.errors.address3} )} - {/* {districtErrStr != "" && ( + {districtErrStr != "" && ( {districtErrStr} - )} */} + )} diff --git a/src/pages/authentication/auth-forms/IAmSmartFormWizard.js b/src/pages/authentication/auth-forms/IAmSmartFormWizard.js index 12305e6..c306237 100644 --- a/src/pages/authentication/auth-forms/IAmSmartFormWizard.js +++ b/src/pages/authentication/auth-forms/IAmSmartFormWizard.js @@ -583,14 +583,14 @@ const CustomFormWizard = (props) => { value={selectedAddress4} options={address4ComboList} disabled={checkCountry} - error={Boolean(districtErrStr != "")} + // error={Boolean(districtErrStr != "")} onBlur={formik.handleBlur} getOptionLabel={(option) => option.type ? intl.formatMessage({ id: option.type }) : ""} onChange={(event, newValue) => { setSelectedAddress4(newValue); }} sx={{ "& .MuiInputBase-root": { height: "41px" }, "#address4-combo": { padding: "0px 0px 0px 0px" }, "& .MuiAutocomplete-endAdornment": { top: "auto" }, }} - renderInput={(params) => } /> { {formik.errors.address3} )} - {/* {districtErrStr != "" && ( {districtErrStr} - )} */} + )} diff --git a/src/translations/en.json b/src/translations/en.json index 45812b7..a394584 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -48,7 +48,7 @@ "MSG.paymentMsg": "Your application and payment have been received", "MSG.expiredApp": "Public Notice application has expired", - "MSG.providedByIAmSmart": "Indicates that the item is provided by \"iAM Smart\".", + "MSG.providedByIAmSmart": "Data is provided by \"iAM Smart\".", "MSG.paymentCancelMsg1": "Payment cancellation message:", "MSG.paymentCancelMsg2": "Your payment has been cancelled. We have received your payment request, but due to certain reasons, the payment could not be processed. Please take note of the following:", @@ -145,11 +145,11 @@ "login": "Login", "logout": "Logout", - "iAmSmartLogin": "Login with \"iAM Smart\"", - "continueWithIAmSmart": "Continue with \"iAM Smart\"", + "iAmSmartLogin": "Continue with iAM Smart", + "continueWithIAmSmart": "Continue with iAM Smart", "authorizeIAmSmartForInfo": "Authorize \"iAM Smart\" to provide personal information", "iAmSmartSubTitle": "In order to complete the account opening and establish a connection with \"iAM Smart\", please authorize \"iAM Smart\" to provide the following personal information:", - "iAmSmartAutoFillIn": "Continue with \"iAM Smart\"", + "iAmSmartAutoFillIn": "Continue with iAM Smart", "register": "Register", "userLoginName": "Username", "userPassword": "Password", @@ -191,7 +191,7 @@ "userRegistered": "This user has already registered. Please return to the login page and proceed with the login process.", "user": "User", - "personalUser": "Personal user", + "personalUser": "Personal User", "becomeNewPersonalUser": "Become New Personal User", "registerNewPersonalUser": "Apply as personal user", "businessUser": "Organisation/Company User", @@ -351,7 +351,7 @@ "cancelled": "Cancelled", "withdrawn": "Withdrawn", "searchApplyRecord": "Search application records", - "applicationId": "Application ID", + "applicationId": "Application No", "submitDate": "Submit Date", "submitDateFrom": "Submit Date (From)", "submitDateTo": "Submit Date (To)", diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json index 3ea93b3..5389fd1 100644 --- a/src/translations/zh-CN.json +++ b/src/translations/zh-CN.json @@ -85,7 +85,7 @@ "MSG.paymentMsg": "你的申请和付款已收到", "MSG.expiredApp": "公共启事申请已过期", - "MSG.providedByIAmSmart": "表示该项由「智方便」提供。", + "MSG.providedByIAmSmart": "该项资料由「智方便」提供。", "MSG.paymentCancelMsg1": "付款取消讯息：", "MSG.paymentCancelMsg2": "你的付款已被取消。我们收到了你的付款请求，但由于某些原因，付款无法完成。请注意以下事项：", @@ -179,11 +179,11 @@ "login": "登录", "logout": "登出", - "iAmSmartLogin": "「智方便」登录", - "continueWithIAmSmart": "以「智方便」继续", + "iAmSmartLogin": "以智方便继续", + "continueWithIAmSmart": "以智方便继续", "authorizeIAmSmartForInfo": "授权「智方便」提供个人资料", "iAmSmartSubTitle": "为完成开户并建立与「智方便」的连接，请授权「智方便」提供以下个人资料：", - "iAmSmartAutoFillIn": "开启「智方便」", + "iAmSmartAutoFillIn": "以智方便继续", "register": "申请", "userLoginName": "用户登入名称", "userPassword": "密码", @@ -408,7 +408,7 @@ "payReceipt": "付款收据", "contactPerson": "联络人", "requireContactPerson": "请输入联络人", - "requireCareOf": "请输入客戶備註", + "requireCareOf": "请输入客户备注", "search": "搜寻", "searchForm": "搜寻表格", "cancel": "取消", @@ -436,9 +436,9 @@ "applyStatus": "申请状态", "gazetteCount": "宪报期数", "gazetteCount2" :"宪报期数/ 其他备注", - "gazetteCount2_1" :"客戶備註/ 其他备注", - "gazetteCount3" :"宪报期数/ 客戶備註/ 其他备注", - "careOf":"客戶備註", + "gazetteCount2_1" :"客户备注/ 其他备注", + "gazetteCount3" :"宪报期数/ 客户备注/ 其他备注", + "careOf":"客户备注", "careOfWarning":"您已选择了不同的客户备注申请。您要付款吗？", "warning":"警告", "publishDate": "发布日期", diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json index ca43bb5..fe9576b 100644 --- a/src/translations/zh-HK.json +++ b/src/translations/zh-HK.json @@ -85,7 +85,7 @@ "MSG.paymentMsg": "你的申請和付款已收到", "MSG.expiredApp": "公共啟事申請已過期", - "MSG.providedByIAmSmart": "表示該項由「智方便」提供。", + "MSG.providedByIAmSmart": "該項資料由「智方便」提供。", "MSG.paymentCancelMsg1": "付款取消訊息：", "MSG.paymentCancelMsg2": "你的付款已被取消。我們收到了你的付款請求，但由於某些原因，付款無法完成。請注意以下事項：", @@ -181,11 +181,11 @@ "login": "登入", "logout": "登出", - "iAmSmartLogin": "「智方便」登入", - "continueWithIAmSmart": "以「智方便」繼續", + "iAmSmartLogin": "以智方便繼續", + "continueWithIAmSmart": "以智方便繼續", "authorizeIAmSmartForInfo": "授權「智方便」提供個人資料", "iAmSmartSubTitle": "為完成開戶並建立與「智方便」的連接，請授權「智方便」提供以下個人資料：", - "iAmSmartAutoFillIn": "開啟「智方便」", + "iAmSmartAutoFillIn": "以智方便繼續", "register": "申請", "userLoginName": "用戶登入名稱", "userPassword": "密碼",