Merge branch 'master' of https://git.2fi-solutions.com/alex/PNSPS-frontend-MaterialUI

src/pages/Payment/MultiPaymentWindow.js

@@ -387,7 +387,7 @@ const MultiPaymentWindow = (props) => {
         </DialogActions>
         <DialogActions>
           <Button variant="contained" color="success" onClick={confirmPaymentHandle()} disabled={paymentMethod === "" || isLimit || isPPSLimit}>
-            <FormattedMessage id="confirm"/>
+            <FormattedMessage id="pay"/>
           </Button>
         </DialogActions>
       </Stack>

src/pages/authentication/auth-forms/CustomFormWizard.js

@@ -303,13 +303,13 @@ const CustomFormWizard = (props) => {
         selectedAddress4, selectedAddress5,
         termsAndConAccept, termsAndConNotAccept, fileList])
 
-    useEffect(()=>{
+    useEffect(() => {
         setDistrictErrStr("");
-        if(selectedAddress5?.type === "hongKong"){
-            if(selectedAddress4 ==null || selectedAddress4 == ""|| selectedAddress4 == {})
+        if (selectedAddress5?.type === "hongKong") {
+            if (selectedAddress4 == null || selectedAddress4 == "" || selectedAddress4 == {})
                 setDistrictErrStr(getRequiredErrStr("district"))
         }
-    },[selectedAddress4, selectedAddress5])
+    }, [selectedAddress4, selectedAddress5])
 
     useEffect(() => {
         props.step == 2 ? _onSubmit() : null;
@@ -541,11 +541,11 @@ const CustomFormWizard = (props) => {
         return <Typography variant="errorMessage1">{errorMsg}</Typography>
     }
 
-    function getMaxErrStr(num, fieldname){
-        return displayErrorMsg(intl.formatMessage({ id: 'noMoreThenNWords' },{num:num, fieldname:fieldname?intl.formatMessage({ id: fieldname})+": ":""}));
+    function getMaxErrStr(num, fieldname) {
+        return displayErrorMsg(intl.formatMessage({ id: 'noMoreThenNWords' }, { num: num, fieldname: fieldname ? intl.formatMessage({ id: fieldname }) + ": " : "" }));
     }
-    function getRequiredErrStr(fieldname){
-        return displayErrorMsg(intl.formatMessage({ id: 'require'},{fieldname:fieldname?intl.formatMessage({ id: fieldname}):""}));
+    function getRequiredErrStr(fieldname) {
+        return displayErrorMsg(intl.formatMessage({ id: 'require' }, { fieldname: fieldname ? intl.formatMessage({ id: fieldname }) : "" }));
     }
 
     const formik = useFormik({
@@ -581,14 +581,17 @@ const CustomFormWizard = (props) => {
                 .matches(/^(?=.*[0-9])/, { message: displayErrorMsg(intl.formatMessage({ id: 'atLeast1Number' })) })
                 .matches(/^(?=.*[!@#%&])/, { 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' }))),
-            chName: yup.string().max(6, getMaxErrStr(6)).required(displayErrorMsg(intl.formatMessage({ id: 'userRequireChineseName' }))),
+            enName: yup.string().max(40, getMaxErrStr(40)),
+            chName: yup.string().max(6, getMaxErrStr(6)).when('enName', {
+                is: (enName) => enName?false:true,
+                then: yup.string().required(displayErrorMsg(intl.formatMessage({ id: 'userRequireChineseName' })))
+              }),
             address1: yup.string().max(40, getMaxErrStr(40, "addressLine1")).required(displayErrorMsg(intl.formatMessage({ id: 'validateAddressLine1' }))),
             address2: yup.string().max(40, getMaxErrStr(40, "addressLine2")),
             address3: yup.string().max(40, getMaxErrStr(40, "addressLine3")),
             email: yup.string().email(displayErrorMsg(intl.formatMessage({ id: 'validEmailFormat' }))).max(128, getMaxErrStr(128)).required(displayErrorMsg(intl.formatMessage({ id: 'requireEmail' }))),
             emailConfirm: yup.string().email(displayErrorMsg(intl.formatMessage({ id: 'validEmailFormat' }))).max(128, getMaxErrStr(128)).required(displayErrorMsg(intl.formatMessage({ id: 'requireEmail' }))).oneOf([yup.ref('email'), null], displayErrorMsg(intl.formatMessage({ id: 'validSameEmail' }))),
-            idNo: yup.string().required(displayErrorMsg(`${intl.formatMessage({ id: 'require' })}${selectedIdDocInputType}${intl.formatMessage({ id: 'number' })}`))
+            idNo: yup.string().required(getRequiredErrStr('number'))
                 .matches(/^[aA-zZ0-9\s]+$/, { message: displayErrorMsg(`${selectedIdDocInputType}${intl.formatMessage({ id: 'noSpecialCharacter' })}`) })
                 .matches(/^\S*$/, { message: displayErrorMsg(`${selectedIdDocInputType}${intl.formatMessage({ id: 'noSpace' })}`) })
                 .test('checkIDCardFormat', displayErrorMsg(`${intl.formatMessage({ id: 'requiredValid' })}${selectedIdDocInputType}${intl.formatMessage({ id: 'number' })}`), function (value) {
@@ -648,7 +651,7 @@ const CustomFormWizard = (props) => {
             // faxCountryCode: yup.string().min(3,'請輸入3位數字'),
             phone: yup.string().min(8, displayErrorMsg(intl.formatMessage({ id: 'requireAtLeast8Number' }))).required(displayErrorMsg(intl.formatMessage({ id: 'requireContactNumber' }))),
             // fax: yup.string().min(8,'請輸入8位數字'),
-            captchaField: yup.string().max(5,  getMaxErrStr(5)).required(displayErrorMsg(intl.formatMessage({ id: 'requireVerify' }))),//.oneOf([captcha], displayErrorMsg('請輸入有效驗證')),
+            captchaField: yup.string().max(5, getMaxErrStr(5)).required(displayErrorMsg(intl.formatMessage({ id: 'requireVerify' }))),//.oneOf([captcha], displayErrorMsg('請輸入有效驗證')),
         }),
     });
 
@@ -934,7 +937,7 @@ const CustomFormWizard = (props) => {
                                                 />
                                                 {formik.touched.idDocType && (
                                                     selectedIdDocType === null || selectedIdDocType?.type == null ?
-                                                        <FormHelperText error id="helper-text-idDocType-signup" sx={{fontSize:16,fontWeight: 'bold',}}>
+                                                        <FormHelperText error id="helper-text-idDocType-signup" sx={{ fontSize: 16, fontWeight: 'bold', }}>
                                                             <FormattedMessage id="requireIdDocType" />
                                                         </FormHelperText> : ''
                                                 )}
@@ -1067,12 +1070,17 @@ const CustomFormWizard = (props) => {
                                         }
                                     </Grid>
                                 </Grid>
+                                <Grid item xs={12} md={12}>
+                                    <Typography variant="subtitle1">
+                                        <FormattedMessage id="registerNameLabel" />
+                                    </Typography>
+                                </Grid>
                                 <Grid item xs={12} md={6}>
                                     <Stack spacing={1}>
                                         <InputLabel htmlFor="enName-signup">
                                             <Typography variant="pnspsFormHeader">
                                                 <FormattedMessage id="userEnglishName" />
-                                                {selectedIdDocType.type === "CNID" ? "" : <span style={{ color: '#f10000' }}>*</span>}
+                                                {selectedIdDocType.type === "CNID" ? "" : <span style={{ color: '#f10000' }}></span>}
                                             </Typography>
                                         </InputLabel>
                                         <OutlinedInput
@@ -1105,7 +1113,7 @@ const CustomFormWizard = (props) => {
                                         <InputLabel htmlFor="chName-signup">
                                             <Typography variant="pnspsFormHeader">
                                                 <FormattedMessage id="userChineseName" />
-                                                <span style={{ color: '#f10000' }}>*</span>
+                                                <span style={{ color: '#f10000' }}></span>
                                             </Typography>
                                         </InputLabel>
                                         <OutlinedInput
@@ -1199,7 +1207,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) => {
@@ -1252,7 +1260,7 @@ const CustomFormWizard = (props) => {
                                                 {formik.errors.address3}
                                             </FormHelperText>
                                         )}
-                                         {districtErrStr!= "" && (
+                                        {districtErrStr != "" && (
                                             <FormHelperText error >
                                                 {districtErrStr}
                                             </FormHelperText>
@@ -1685,8 +1693,8 @@ const CustomFormWizard = (props) => {
                                             <FormattedMessage id="idDocType" />:
                                         </Typography>
                                         <Typography variant="pnspsFormHeader" name="preview-idDocType">
-                                            {intl.formatMessage({ id: selectedIdDocType?.label??" " })}
-                                           
+                                            {intl.formatMessage({ id: selectedIdDocType?.label ?? " " })}
+
                                         </Typography>
                                     </Stack>
                                 </Grid>

src/pages/dashboard/GLD/index.js

@@ -20,13 +20,26 @@ const DashboardDefault = () => {
     backgroundColor: '#0C489E',
     backgroundPosition: 'right'
   }
+  const getWelcomeMsg=()=>{
+    var current = new Date()
+    var curHr = current.getHours()
+
+    if (curHr < 12) {
+      return "Good Morning"
+    } else if (curHr < 18) {
+      return "Good Afternoon"
+    } else {
+      //evening
+      return "Good Evening"
+    }
+  }
   return (
     <Grid container sx={{minHeight: '87vh', backgroundColor: "backgroundColor.default"}} direction="column">
       <Grid item xs={12}>
         <div style={BackgroundHead}>
           <Stack direction="row"  height='70px' justifyContent="flex-start" alignItems="center">
             <Typography ml={15} color='#FFF' variant="h4" sx={{display: { xs: 'none', sm: 'none', md: 'block' }}}>
-              Morning, {userData.fullenName}
+              {getWelcomeMsg()}, {userData.fullenName}
             </Typography>
           </Stack>
         </div>

src/pages/dashboard/Public/index.js

@@ -35,6 +35,20 @@ const DashboardDefault = () => {
     backgroundColor: '#0C489E',
     backgroundPosition: 'right'
   }
+
+  const getWelcomeMsg=()=>{
+    var current = new Date()
+    var curHr = current.getHours()
+
+    if (curHr < 12) {
+      return <FormattedMessage id="welcomeMsg_am" />
+    } else if (curHr < 18) {
+      return <FormattedMessage id="welcomeMsg_pm" />
+    } else {
+      return <FormattedMessage id="welcomeMsg_night" />
+    }
+  }
+
   return (
     <Grid container sx={{ minHeight: '87vh' }} direction="column">
       <Grid item xs={12} >
@@ -42,7 +56,7 @@ const DashboardDefault = () => {
           <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">
             {/* <Typography variant="h5">我的公共啟事</Typography> */}
             <Typography color='#FFF' variant="h5" sx={{ ml: 10, display: { xs: 'none', sm: 'none', md: 'block' } }}>
-              {isORGLoggedIn() ? userData.fullenName : userData.fullchName}, <FormattedMessage id="welcomeMsg" />
+              {isORGLoggedIn() ? userData.fullenName : userData.fullchName}, {getWelcomeMsg()}
             </Typography>
           </Stack>
         </div>

src/translations/en.json

@@ -97,7 +97,10 @@
   "onlinePaymentHistory": "Online Payment History",
   "setting": "Settings",
   "companyOrUserRecord": "Company/Institutional User Records",
-  "welcomeMsg": "Good afternoon! Please select the required service.",
+  "welcomeMsg_am": "Good morning! Please select the required service.",
+  "welcomeMsg_pm": "Good afternoon! Please select the required service.",
+  "welcomeMsg_night": "Good evening! Please select the required service.",
+
 
   "login": "Login",
   "logout": "Logout",
@@ -148,6 +151,7 @@
   "registerNewBusinessUser": "Apply as organisation/company user",
   "becomeNewBusinessUser": "Become New Organisation/Company user",
   "userName": "Username",
+  "registerNameLabel": "Please provide either an English name or a Chinese name, at a minimum.",
   "userChineseName": "Chinese Name",
   "userEnglishName": "English Name",
   "userContactName": "Name",
@@ -257,7 +261,7 @@
   "mainlandIDCard": "Mainland ID card",
   "proCert": "Professional Practice Certificate",
   "idDocType": "Document Category",
-  "requireIdDocType": "Please enter the document type",
+  "requireIdDocType": "Please select the document type",
   "idDocNumber": "ID number",
   "requireIdDocNumber": "Please enter the document ID",
   "requiredNumberInQuote": "Please enter the numbers or letters in brackets",
@@ -437,7 +441,7 @@
   "noRecordFound": "No record found",
   "rowsPerPage": "Rows Per Page",
   "date" : "Date",
-  "keyword": "Key word",
+  "keyword": "Keyword",
   "dateFrom": "Date(From)",
   "dateTo": "Date(To)",
   "of": "of",

src/translations/zh-CN.json

@@ -96,7 +96,9 @@
   "onlinePaymentHistory": "网上付款记录",
   "setting": "设置",
   "companyOrUserRecord": "公司/机构用户记录",
-  "welcomeMsg": "午安! 请选择所需服务。",
+  "welcomeMsg_am": "早安! 请选择所需服务。",
+  "welcomeMsg_pm": "午安! 请选择所需服务。",
+  "welcomeMsg_night": "晚安! 请选择所需服务。",
 
   "login": "登录",
   "logout": "登出",
@@ -143,6 +145,7 @@
   "registerNewBusinessUser": "申请机构／公司用户",
   "becomeNewBusinessUser": "成为新的机构／公司用户",
   "userName": "用户名称",
+  "registerNameLabel": "请至少输入英文姓名或中文姓名。",
   "userChineseName": "中文姓名",
   "userEnglishName": "英文姓名",
   "userContactName": "姓名",
@@ -252,7 +255,7 @@
   "mainlandIDCard": "内地身份证",
   "proCert": "专业执业证书",
   "idDocType": "证件类别",
-  "requireIdDocType": "请输入证件类别",
+  "requireIdDocType": "请选择证件类别",
   "idDocNumber": "证件号码",
   "requireIdDocNumber": "请输入证件号码",
   "requiredNumberInQuote": "请输入括号内的数字或字母",

src/translations/zh-HK.json

@@ -96,7 +96,9 @@
   "onlinePaymentHistory": "網上付款記錄",
   "setting": "設定",
   "companyOrUserRecord": "公司/機構用戶記錄",
-  "welcomeMsg": "午安! 請選擇所需服務。",
+  "welcomeMsg_am": "早安! 請選擇所需服務。",
+  "welcomeMsga_pm": "午安! 請選擇所需服務。",
+  "welcomeMsg_night": "晚安! 請選擇所需服務。",
 
   "login": "登入",
   "logout": "登出",
@@ -146,6 +148,7 @@
   "registerNewBusinessUser": "申請機構／公司用戶",
   "becomeNewBusinessUser": "成為新的機構／公司用戶",
   "userName": "用戶名稱",
+  "registerNameLabel": "請至少輸入英文姓名或中文姓名。",
   "userChineseName": "中文姓名",
   "userEnglishName": "英文姓名",
   "userContactName": "姓名",
@@ -255,7 +258,7 @@
   "mainlandIDCard": "內地身份證",
   "proCert": "專業執業證書",
   "idDocType": "證件類別",
-  "requireIdDocType": "請輸入證件類別",
+  "requireIdDocType": "請選擇證件類別",
   "idDocNumber": "證件號碼",
   "requireIdDocNumber": "請輸入證件號碼",
   "requiredNumberInQuote": "請輸入括號內的數字或字母",