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

src/pages/Organization/DetailPage/OrganizationCard.js

@@ -17,7 +17,7 @@ const LoadingComponent = Loadable(lazy(() => import('../../extra-pages/LoadingCo
 import Loadable from 'components/Loadable';
 import { lazy } from 'react';
 import { notifySaveSuccess } from 'utils/CommonFunction';
-import {useIntl} from "react-intl";
+import { useIntl } from "react-intl";
 
 // ==============================|| DASHBOARD - DEFAULT ||============================== //
 
@@ -48,17 +48,17 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
         enableReinitialize: true,
         initialValues: currentUserData,
         validationSchema: yup.object().shape({
-            enCompanyName: yup.string().max(255).required(displayErrorMsg(intl.formatMessage({id: 'userRequireEnglishName'}))),
-            chCompanyName: yup.string().max(255, displayErrorMsg(intl.formatMessage({id: 'userRequireChineseName'}))).nullable(),
-            addressLine1: yup.string().max(255).required(displayErrorMsg(intl.formatMessage({id: 'validateAddressLine1'}))),
-            addressLine2: yup.string().max(255, displayErrorMsg(intl.formatMessage({id: 'noMoreThen255Words'}))),
-            addressLine3: yup.string().max(255, displayErrorMsg(intl.formatMessage({id: 'noMoreThen255Words'}))),
-            fax_countryCode: yup.string().min(3, displayErrorMsg(intl.formatMessage({id: 'requireDialingCode'}))).nullable(),
-            tel_countryCode: yup.string().min(3, displayErrorMsg(intl.formatMessage({id: 'requireDialingCode'}))),
-            phoneNumber: yup.string().min(8, displayErrorMsg(intl.formatMessage({id: 'requiredValidNumber'}))).required(displayErrorMsg(intl.formatMessage({id: 'requireContactNumber'}))),
-            faxNumber: yup.string().min(8, displayErrorMsg(intl.formatMessage({id: 'require8Number'}))).nullable(),
-            brExpiryDate: yup.string().min(8).required(displayErrorMsg(intl.formatMessage({id: 'pleaseFillInBusinessRegCertValidityDate'}))),
-            brNo: yup.string().required(displayErrorMsg(intl.formatMessage({id: 'pleaseFillInBusinessRegCertNumber'}))).test('checkBrNoFormat', displayErrorMsg(displayErrorMsg(intl.formatMessage({id: 'pleaseFillInValidBusinessRegCertNumber'}))), function (value) {
+            enCompanyName: yup.string().max(255).required(displayErrorMsg(intl.formatMessage({ id: 'userRequireEnglishName' }))),
+            chCompanyName: yup.string().max(255, displayErrorMsg(intl.formatMessage({ id: 'userRequireChineseName' }))).nullable(),
+            addressLine1: yup.string().max(255).required(displayErrorMsg(intl.formatMessage({ id: 'validateAddressLine1' }))),
+            addressLine2: yup.string().max(255, displayErrorMsg(intl.formatMessage({ id: 'noMoreThen255Words' }))),
+            addressLine3: yup.string().max(255, displayErrorMsg(intl.formatMessage({ id: 'noMoreThen255Words' }))),
+            fax_countryCode: yup.string().min(3, displayErrorMsg(intl.formatMessage({ id: 'requireDialingCode' }))).nullable(),
+            tel_countryCode: yup.string().min(3, displayErrorMsg(intl.formatMessage({ id: 'requireDialingCode' }))),
+            phoneNumber: yup.string().min(8, displayErrorMsg(intl.formatMessage({ id: 'requiredValidNumber' }))).required(displayErrorMsg(intl.formatMessage({ id: 'requireContactNumber' }))),
+            faxNumber: yup.string().min(8, displayErrorMsg(intl.formatMessage({ id: 'require8Number' }))).nullable(),
+            brExpiryDate: yup.string().min(8).required(displayErrorMsg(intl.formatMessage({ id: 'pleaseFillInBusinessRegCertValidityDate' }))),
+            brNo: yup.string().required(displayErrorMsg(intl.formatMessage({ id: 'pleaseFillInBusinessRegCertNumber' }))).test('checkBrNoFormat', displayErrorMsg(displayErrorMsg(intl.formatMessage({ id: 'pleaseFillInValidBusinessRegCertNumber' }))), function (value) {
                 var brNo_pattern = /[0-9]{8}/
                 if (value !== undefined) {
                     if (value.match(brNo_pattern)) {
@@ -109,9 +109,9 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
         }
     });
 
-    useEffect(()=>{
+    useEffect(() => {
         setEditModeFun(editMode);
-    },[editMode]);
+    }, [editMode]);
 
     useEffect(() => {
         if (Object.keys(userData).length > 0) {
@@ -230,34 +230,39 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                                         <Typography variant="h5">Edit</Typography>
                                     </Button>
                                 </Grid>
-                                <Grid item sx={{ ml: 3, mr: 3 }}>
-                                    <Button
-                                        size="large"
-                                        variant="contained"
-                                        color="orange"
-                                        onClick={()=>setCreditorConfirmPopUp(true)}
-                                        sx={{
-                                            textTransform: 'capitalize',
-                                            alignItems: 'end'
-                                        }}
-                                    >
-                                        <Typography variant="h5">Mark as Creditor</Typography>
-                                    </Button>
-                                </Grid>
-                                <Grid item sx={{ ml: 3, mr: 3 }}>
-                                    <Button
-                                        size="large"
-                                        variant="contained"
-                                        color="error"
-                                        onClick={()=>setNonCreditorConfirmPopUp(true)}
-                                        sx={{
-                                            textTransform: 'capitalize',
-                                            alignItems: 'end'
-                                        }}
-                                    >
-                                        <Typography variant="h5">Mark as Non-Creditor</Typography>
-                                    </Button>
-                                </Grid>
+
+                                {
+                                    currentUserData.creditor ?
+                                        <Grid item sx={{ ml: 3, mr: 3 }}>
+                                            <Button
+                                                size="large"
+                                                variant="contained"
+                                                color="error"
+                                                onClick={() => setNonCreditorConfirmPopUp(true)}
+                                                sx={{
+                                                    textTransform: 'capitalize',
+                                                    alignItems: 'end'
+                                                }}
+                                            >
+                                                <Typography variant="h5">Mark as Non-Creditor</Typography>
+                                            </Button>
+                                        </Grid>
+                                        :
+                                        <Grid item sx={{ ml: 3, mr: 3 }}>
+                                            <Button
+                                                size="large"
+                                                variant="contained"
+                                                color="orange"
+                                                onClick={() => setCreditorConfirmPopUp(true)}
+                                                sx={{
+                                                    textTransform: 'capitalize',
+                                                    alignItems: 'end'
+                                                }}
+                                            >
+                                                <Typography variant="h5">Mark as Creditor</Typography>
+                                            </Button>
+                                        </Grid>
+                                }
                             </>
                         }
                     </Grid>
@@ -363,7 +368,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                                 valueName: "country",
                                 disabled: (!editMode && !createMode),
                                 dataList: ComboData.country,
-                                getOptionLabel: (option) => option.type? intl.formatMessage({ id: option.type }) : "",
+                                getOptionLabel: (option) => option.type ? intl.formatMessage({ id: option.type }) : "",
                                 form: formik
                             })}
                         </Grid>
@@ -374,7 +379,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                                 valueName: "district",
                                 disabled: (!editMode && !createMode),
                                 dataList: ComboData.district,
-                                getOptionLabel: (option) => option.type? intl.formatMessage({ id: option.type }) : "",
+                                getOptionLabel: (option) => option.type ? intl.formatMessage({ id: option.type }) : "",
                                 form: formik
                             })}
                         </Grid>
@@ -401,7 +406,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                         <Typography variant="h4" style={{ padding: '16px' }}>Are you sure mark as Creditor?</Typography>
                     </DialogContent>
                     <DialogActions>
-                    <Button onClick={() => setCreditorConfirmPopUp(false)}><Typography variant="h5">Cancel</Typography></Button>
+                        <Button onClick={() => setCreditorConfirmPopUp(false)}><Typography variant="h5">Cancel</Typography></Button>
                         <Button onClick={() => markAsCreditor()}><Typography variant="h5">Confirm</Typography></Button>
                     </DialogActions>
                 </Dialog>
@@ -413,7 +418,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                         <Typography variant="h4" style={{ padding: '16px' }}>Are you sure mark as Non-Creditor?</Typography>
                     </DialogContent>
                     <DialogActions>
-                    <Button onClick={() => setNonCreditorConfirmPopUp(false)}><Typography variant="h5">Cancel</Typography></Button>
+                        <Button onClick={() => setNonCreditorConfirmPopUp(false)}><Typography variant="h5">Cancel</Typography></Button>
                         <Button onClick={() => markAsNonCreditor()}><Typography variant="h5">Confirm</Typography></Button>
                     </DialogActions>
                 </Dialog>

src/themes/themeConst.js

@@ -182,7 +182,7 @@ export const PNSPS_THEME = createTheme({
                 input: {
                     padding: '10.5px 14px 10.5px 12px',
                     '&.MuiOutlinedInput-input.Mui-disabled': {
-                        WebkitTextFillColor: '#888888',
+                        WebkitTextFillColor: 'rgba(0, 0, 0, 1)',
                     },
                     color: 'rgba(0, 0, 0, 0.85)'
                 },
@@ -239,7 +239,8 @@ export const PNSPS_THEME = createTheme({
                         //padding: '1px', // Adjust the padding as needed
                     },
                     '& .MuiInputBase-input:disabled': {
-                        color: 'rgba(0, 0, 0, 0.8)',
+                        color: 'rgba(0, 0, 0, 1)',
+                        backgroundColor: "#f8f8f8",
                         //backgroundColor: '#777777', // Set background color to #777777 for disabled state
                         //color: '#010101', // Set text color to #111111 for disabled state
                     },

src/translations/zh-HK.json

@@ -332,7 +332,7 @@
   "unlock": "解鎖",
   "pendingFor": "待批核",
   "active": "生效中",
-  "primary": "源自",
+  "primary": "主要帳戶",
 
   "submitApplication": "提交公共啟事申請",
   "applicationSubheading": "提供你的啟事內容作排版，校對及計價。",

src/utils/FieldUtils.js

@@ -191,10 +191,6 @@ export const initField = ({ type, valueName, form, disabled, multiline, handleCh
         value={form.values[valueName]}
         disabled={disabled}
         sx={{
-            "& .MuiInputBase-input.Mui-disabled": {
-                WebkitTextFillColor: "#000000",
-                background: "#f8f8f8",
-            },
             width: width ? width : '100%'
         }}
         {...props}