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

src/pages/Proof/Search_Public/DataGrid.js

@@ -155,7 +155,7 @@ export default function SearchPublicNoticeTable({ searchCriteria }) {
             width: isMdOrLg ? 'auto' : 160,
             flex: isMdOrLg ? 1 : undefined,
             renderCell: (params) => {
-                return locale === 'en' ? ProofStatus.getStatus_Eng(params) : ProofStatus.getStatus_Cht(params);
+                return locale === 'en' ? ProofStatus.getStatus_Eng(params) : locale === 'zh-HK' ?ProofStatus.getStatus_Cht(params):ProofStatus.getStatus_Cn(params);
             },
         },
         {

src/pages/authentication/BusRegister.js

@@ -22,7 +22,6 @@ const CustomFormWizard = Loadable(lazy(() => import('./auth-forms/BusCustomFormW
 const AuthWrapper = Loadable(lazy(() => import('./AuthWrapperCustom')));
 import axios from "axios";
 import { GET_USERNAME, POST_VERIFY_CAPTCHA } from "utils/ApiPathConst";
-import {useTheme} from "@emotion/react";
 import {FormattedMessage, useIntl} from "react-intl";
 // import CustomFormWizard from './auth-forms/BusCustomFormWizard';
 // import AuthWrapper from './AuthWrapperCustom';
@@ -35,7 +34,6 @@ const BusRegister = () => {
   const [username, setUsername] = useState("")
   const [base64Url, setBase64Url] = useState("")
   const [checkCode, setCheckCode] = useState("")
-  const theme = useTheme();
   const intl = useIntl();
   const steps = [
     intl.formatMessage({id: 'personalInformation'}),
@@ -44,15 +42,7 @@ const BusRegister = () => {
   ];
 
   const stepStyle = {
-    [theme.breakpoints.up('lg')]: {
-      width: '40%',
-    },
-    [theme.breakpoints.up('md')]: {
-      width: '70%',
-    },
-    [theme.breakpoints.up('xs')]: {
-      width: '95%',
-    },
+    width: {lg:"40%", md:"70%", xs:"100%"},
     boxShadow: 1,
     backgroundColor: "#FFFFFF",
     padding: 2,

src/pages/authentication/IAmSmartRegister.js

@@ -27,7 +27,7 @@ const CustomFormWizard = Loadable(lazy(() => import('./auth-forms/IAmSmartFormWi
 const AuthWrapper = Loadable(lazy(() => import('./AuthWrapperCustom')));
 // ================================|| REGISTER ||================================ //
 const stepStyle = {
-  width: "40%",
+  width: {lg:"40%", md:"70%", xs:"100%"},
   boxShadow: 1,
   backgroundColor: "#FFFFFF",
   padding: 2,
@@ -173,9 +173,10 @@ const Register = () => {
           </Stack>
         </React.Fragment>
       ) : (
-        <React.Fragment>
-          <AuthWrapper>
+        <React.Fragment id={"fragment"}  sx={{width: {lg:"1000px", md:"600px", xs:"95%"}}}>
+          <AuthWrapper id={"authWrapper"}>
             <CustomFormWizard
+              id={"CustomFormWizard"}
               setUpdateValid={setUpdateValid}
               step={activeStep}
               setIdNo={setIdNo}

src/pages/authentication/Register.js

@@ -22,7 +22,6 @@ import Loadable from 'components/Loadable';
 import { lazy } from 'react';
 import { notifyActionError } from 'utils/CommonFunction';
 import axios from "axios";
-import {useTheme} from "@emotion/react";
 import {FormattedMessage, useIntl} from "react-intl";
 const CustomFormWizard = Loadable(lazy(() => import('./auth-forms/CustomFormWizard')));
 const AuthWrapper = Loadable(lazy(() => import('./AuthWrapperCustom')));
@@ -35,7 +34,6 @@ const Register = () => {
   const [username, setUsername] = useState("");
   const [base64Url, setBase64Url] = useState("")
   const [checkCode, setCheckCode] = useState("")
-  const theme = useTheme();
   const intl = useIntl();
   const steps = [
     intl.formatMessage({id: 'personalInformation'}),
@@ -44,15 +42,7 @@ const Register = () => {
   ];
 
   const stepStyle = {
-    [theme.breakpoints.up('lg')]: {
-      width: '40%',
-    },
-    [theme.breakpoints.up('md')]: {
-      width: '70%',
-    },
-    [theme.breakpoints.up('xs')]: {
-      width: '95%',
-    },
+    width: {lg:"40%", md:"70%", xs:"100%"},
     boxShadow: 1,
     backgroundColor: "#FFFFFF",
     padding: 2,

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

@@ -1402,7 +1402,7 @@ const BusCustomFormWizard = (props) => {
                                                     </Grid>
                                                 </Grid>
                                                 <Grid item xs={6} s={6} md={3} lg={3}>
-                                                    <Grid container>
+                                                    <Grid container style={{ display: "none" }}>
                                                         <Grid item sx={{ display: 'flex', alignItems: 'center' }}>
                                                             <Checkbox
                                                                 checked={termsAndConNotAccept}

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

@@ -1614,7 +1614,7 @@ const CustomFormWizard = (props) => {
                                                     </Grid>
                                                 </Grid>
                                                 <Grid item xs={6} s={6} md={3} lg={3}>
-                                                    <Grid container>
+                                                    <Grid container style={{ display: "none" }}>
                                                         <Grid item sx={{ display: 'flex', alignItems: 'center' }}>
                                                             <Checkbox
                                                                 checked={termsAndConNotAccept}

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

@@ -533,7 +533,7 @@ const CustomFormWizard = (props) => {
                                             {iAmSmartData.address1 != "" && iAmSmartData.address1 == formik.values.address1 ? <img src={iAmSmartICon} alt="iAM Smart" width="25" /> : null}
                                         </Stack>
 
-                                        <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}>
+                                        <Stack direction="row" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}>
                                             <OutlinedInput
                                                 fullWidth
                                                 error={Boolean(formik.touched.address2 && formik.errors.address2)}
@@ -555,7 +555,7 @@ const CustomFormWizard = (props) => {
                                         </Stack>
 
 
-                                        <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}>
+                                        <Stack direction="row" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}>
                                             <OutlinedInput
                                                 fullWidth
                                                 error={Boolean(formik.touched.address3 && formik.errors.address3)}
@@ -632,7 +632,7 @@ const CustomFormWizard = (props) => {
                                                 {formik.errors.address3}
                                             </FormHelperText>
                                         )}
-{/* 
+                                        {/* 
                                         {districtErrStr != "" && (
                                             <FormHelperText error >
                                                 {districtErrStr}
@@ -655,27 +655,32 @@ const CustomFormWizard = (props) => {
                                                     <Typography variant="h5">
                                                         <FormattedMessage id="userContactEmail" />
                                                         <span style={{ color: '#f10000' }}>*</span>
-                                                        {iAmSmartData.email && iAmSmartData.email == formik.values.email ? <img src={iAmSmartICon} alt="iAM Smart" width="25" /> : null}
+
                                                     </Typography>
                                                 </InputLabel>
-                                                <OutlinedInput
-                                                    fullWidth
-                                                    error={Boolean((formik.touched.email && formik.errors.email) || checkEmail)}
-                                                    id="email-login"
-                                                    type="email"
-                                                    value={formik.values.email.trim()}
-                                                    name="email"
-                                                    onChange={formik.handleChange}
-                                                    placeholder={intl.formatMessage({ id: 'userContactEmail' })}
-                                                    onBlur={formik.handleBlur}
-                                                    inputProps={{
-                                                        onKeyDown: (e) => {
-                                                            if (e.key === 'Enter') {
-                                                                e.preventDefault();
-                                                            }
-                                                        },
-                                                    }}
-                                                />
+
+                                                <Stack direction="row" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}>
+                                                    <OutlinedInput
+                                                        fullWidth
+                                                        error={Boolean((formik.touched.email && formik.errors.email) || checkEmail)}
+                                                        id="email-login"
+                                                        type="email"
+                                                        value={formik.values.email.trim()}
+                                                        name="email"
+                                                        onChange={formik.handleChange}
+                                                        placeholder={intl.formatMessage({ id: 'userContactEmail' })}
+                                                        onBlur={formik.handleBlur}
+                                                        inputProps={{
+                                                            onKeyDown: (e) => {
+                                                                if (e.key === 'Enter') {
+                                                                    e.preventDefault();
+                                                                }
+                                                            },
+                                                        }}
+                                                    />
+                                                    {iAmSmartData.email && iAmSmartData.email == formik.values.email ? <img src={iAmSmartICon} alt="iAM Smart" width="25" /> : null}
+                                                </Stack>
+
                                                 {formik.touched.email && formik.errors.email && (
                                                     <FormHelperText error id="helper-text-email-signup">
                                                         {formik.errors.email}
@@ -696,28 +701,32 @@ const CustomFormWizard = (props) => {
                                                         <span style={{ color: '#f10000' }}>*</span>
                                                     </Typography>
                                                 </InputLabel>
-                                                <OutlinedInput
-                                                    fullWidth
-                                                    error={Boolean(formik.touched.emailConfirm && formik.errors.emailConfirm)}
-                                                    id="emailConfirm-login"
-                                                    type="email"
-                                                    value={formik.values.emailConfirm}
-                                                    name="emailConfirm"
-                                                    // onBlur={formik.handleBlur}
-                                                    onChange={formik.handleChange}
-                                                    placeholder={intl.formatMessage({ id: 'confirmEmail' })}
-                                                    onBlur={formik.handleBlur}
-                                                    onCut={handleCCPChange}
-                                                    onCopy={handleCCPChange}
-                                                    onPaste={handleCCPChange}
-                                                    inputProps={{
-                                                        onKeyDown: (e) => {
-                                                            if (e.key === 'Enter') {
-                                                                e.preventDefault();
-                                                            }
-                                                        },
-                                                    }}
-                                                />
+                                                <Stack direction="row" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}>
+                                                    <OutlinedInput
+                                                        fullWidth
+                                                        error={Boolean(formik.touched.emailConfirm && formik.errors.emailConfirm)}
+                                                        id="emailConfirm-login"
+                                                        type="email"
+                                                        value={formik.values.emailConfirm}
+                                                        name="emailConfirm"
+                                                        // onBlur={formik.handleBlur}
+                                                        onChange={formik.handleChange}
+                                                        placeholder={intl.formatMessage({ id: 'confirmEmail' })}
+                                                        onBlur={formik.handleBlur}
+                                                        onCut={handleCCPChange}
+                                                        onCopy={handleCCPChange}
+                                                        onPaste={handleCCPChange}
+                                                        inputProps={{
+                                                            onKeyDown: (e) => {
+                                                                if (e.key === 'Enter') {
+                                                                    e.preventDefault();
+                                                                }
+                                                            },
+                                                        }}
+                                                    />
+                                                    {iAmSmartData.email && iAmSmartData.email == formik.values.emailConfirm ? <img src={iAmSmartICon} alt="iAM Smart" width="25" /> : null}
+                                                </Stack>
+
                                                 {formik.touched.emailConfirm && formik.errors.emailConfirm && (
                                                     <FormHelperText error id="helper-text-emailConfirm-signup">
                                                         {formik.errors.emailConfirm}
@@ -737,10 +746,10 @@ const CustomFormWizard = (props) => {
                                                             <Typography variant="h5">
                                                                 <FormattedMessage id="userContactNumber" />
                                                                 <span style={{ color: '#f10000' }}>*</span>
-                                                                {iAmSmartData.phone && iAmSmartData.phone == formik.values.phone && iAmSmartData.phoneCountryCode == formik.values.phoneCountryCode ? <img src={iAmSmartICon} alt="iAM Smart" width="25" /> : null}
+                                                                
                                                             </Typography>
                                                         </InputLabel>
-                                                        <Stack direction="row">
+                                                        <Stack direction="row" ustifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}>
                                                             <OutlinedInput
                                                                 id="phoneCountryCode-login"
                                                                 type="phoneCountryCode"
@@ -793,8 +802,9 @@ const CustomFormWizard = (props) => {
                                                                         }
                                                                     },
                                                                 }}
-                                                                sx={{ width: '75%' }}
+                                                                fullWidth
                                                             />
+                                                            {iAmSmartData.phone && iAmSmartData.phone == formik.values.phone && iAmSmartData.phoneCountryCode == formik.values.phoneCountryCode ? <img src={iAmSmartICon} alt="iAM Smart" width="25" /> : null}
                                                         </Stack>
                                                         {formik.touched.phone && formik.errors.phone && (
                                                             <FormHelperText error id="helper-text-phone-signup">
@@ -814,7 +824,7 @@ const CustomFormWizard = (props) => {
                                                                 <FormattedMessage id="userFaxNumber" />
                                                             </Typography>
                                                         </InputLabel>
-                                                        <Stack direction="row">
+                                                        <Stack direction="row" ustifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}>
                                                             <OutlinedInput
                                                                 error={Boolean(formik.touched.fax && formik.errors.fax)}
                                                                 id="faxCountryCode-login"
@@ -910,7 +920,7 @@ const CustomFormWizard = (props) => {
                                                     </Grid>
                                                 </Grid>
                                                 <Grid item xs={6} s={6} md={3} lg={3}>
-                                                    <Grid container>
+                                                    <Grid container style={{ display: "none" }}>
                                                         <Grid item sx={{ display: 'flex', alignItems: 'center' }}>
                                                             <Checkbox
                                                                 checked={termsAndConNotAccept}
@@ -918,6 +928,7 @@ const CustomFormWizard = (props) => {
                                                                 name="termsAndConNotAccept"
                                                                 color="primary"
                                                                 size="small"
+                                                                
                                                             />
                                                             <Typography variant="h5">
                                                                 <FormattedMessage id="rejectTerms" />

src/translations/en.json

@@ -552,6 +552,11 @@
   "subject": "Subject",
   "other":"Other",
 
+  "proofConfirmed":"Confirmed",
+  "proofReProofing":"Re-proofing",
+  "proofNoReply":"No Reply",
+  "proofPendingReply":"Pending Reply",
+
   "Dashboard": "Dashboard",
   "event": "Event"
 }

src/translations/zh-CN.json

@@ -543,6 +543,11 @@
   "subject": "主题",
   "other":"其他",
 
+  "proofConfirmed":"可以付印",
+  "proofReProofing":"未能付印",
+  "proofNoReply":"回复逾时",
+  "proofPendingReply":"未回复",
+
   "Dashboard": "仪表板",
   "event": "活动"
 }

src/translations/zh-HK.json

@@ -548,6 +548,11 @@
   "subject": "主題",
   "other":"其他",
 
+  "proofConfirmed":"可以付印",
+  "proofReProofing":"未能付印",
+  "proofNoReply":"回覆逾時",
+  "proofPendingReply":"未回覆",
+
   "Dashboard": "儀表板",
   "event": "活動"
 }

src/utils/ComboData.js

@@ -112,10 +112,10 @@ export const proofStatus = [
 
 export const proofStatusFull = [
     { key: 0, i18nLabel: 'all', labelCht: '全部', label: 'All',  type: 'all' },
-    { key: 1, i18nLabel: 'Confirmed', labelCht: '可以付印', label:'Confirmed',  type: 'Confirmed' },
-    { key: 2, i18nLabel: 'Re-proofing', labelCht: '未能付印', label:'Re-proofing',  type: 'Re-proofing' }, // submitted and reviewed
-    { key: 3, i18nLabel: 'No Reply', labelCht: '回覆逾時', label:'No Reply', type: 'No Reply' },
-    { key: 4, i18nLabel: 'Pending Reply', labelCht: '未回覆', label:'Pending Reply', type: 'Pending Reply' },
+    { key: 1, i18nLabel: 'proofConfirmed', labelCht: '可以付印', label:'Confirmed',  type: 'Confirmed' },
+    { key: 2, i18nLabel: 'proofReProofing', labelCht: '未能付印', label:'Re-proofing',  type: 'Re-proofing' }, // submitted and reviewed
+    { key: 3, i18nLabel: 'proofNoReply', labelCht: '回覆逾時', label:'No Reply', type: 'No Reply' },
+    { key: 4, i18nLabel: 'proofPendingReply', labelCht: '未回覆', label:'Pending Reply', type: 'Pending Reply' },
     //{ key: 5, i18nLabel: 'Cancelled', labelCht: '已取消', label:'Cancelled', type: 'Cancelled' },
 ];
 

src/utils/statusUtils/ProofStatus.js

@@ -1,11 +1,11 @@
 import {getStatusTag} from "utils/statusUtils/Base";
 import * as DateUtils from "utils/DateUtils";
 
-const confirm = {color:"#22a13f", eng:"Confirmed", cht:"可以付印"}
-const unable = {color:"#d9372b", eng:"Re-proofing", cht:"未能付印"}
-const timeOut = {color:"#8a8784", eng:"No Reply", cht:"回覆逾時"}
-const pendingReply = {color:"#f5a83d", eng:"Pending Reply", cht:"未回覆"}
-const cancel = {color:"#000", textColor:"#fff", eng:"Cancelled", cht:"已取消"}
+const confirm = {color:"#22a13f", eng:"Confirmed", cht:"可以付印", cn:"可以付印"}
+const unable = {color:"#d9372b", eng:"Re-proofing", cht:"未能付印", cn:"未能付印"}
+const timeOut = {color:"#8a8784", eng:"No Reply", cht:"回覆逾時", cn:"回复逾时"}
+const pendingReply = {color:"#f5a83d", eng:"Pending Reply", cht:"未回覆", cn:"未回复"}
+const cancel = {color:"#000", textColor:"#fff", eng:"Cancelled", cht:"已取消", cn:"已取消"}
 
 export function getStatus_Cht(params) {
     let status = getStatus(params);
@@ -17,6 +17,12 @@ export function getStatus_Eng(params) {
     return getStatusTag({color: status.color, textColor:status.textColor, text:status.eng })
 }
 
+export function getStatus_Cn(params) {
+    let status = getStatus(params);
+    return getStatusTag({color: status.color, textColor:status.textColor, text:status.cn })
+}
+
+
 export function getStatusText_Cht(params) {
     let status = getStatus(params);
     return {text:status.cht,status:status.eng}