From 960172162a17454f8cc20663f6d4f39ffa8903da Mon Sep 17 00:00:00 2001
From: "jason.lam" <jason.lam@2fi-solutions.com.hk>
Date: Fri, 26 Jan 2024 12:50:17 +0800
Subject: [PATCH] update organization profile

---
 src/layout/MainLayout/Header/index.js         |  2 +-
 .../DetailPage/OrganizationPubCard.js         | 56 +++++++++----------
 src/pages/Organization/DetailPage/index.js    |  7 ++-
 src/translations/en.json                      |  9 +++
 src/translations/zh-CN.json                   |  9 +++
 src/translations/zh-HK.json                   |  9 +++
 6 files changed, 58 insertions(+), 34 deletions(-)

diff --git a/src/layout/MainLayout/Header/index.js b/src/layout/MainLayout/Header/index.js
index f3994b0..14fcfa6 100644
--- a/src/layout/MainLayout/Header/index.js
+++ b/src/layout/MainLayout/Header/index.js
@@ -227,7 +227,7 @@ function Header(props) {
                   <Link className="manageUser" to={'/org'}>
                     <Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2 }}>
                       {/* <FormattedMessage id="companyOrUserRecord" /> */}
-                      Organization Profile
+                      <FormattedMessage id="organizationProfile" />
                     </Typography>
                   </Link>
                 </li>
diff --git a/src/pages/Organization/DetailPage/OrganizationPubCard.js b/src/pages/Organization/DetailPage/OrganizationPubCard.js
index dc0a1ef..053a673 100644
--- a/src/pages/Organization/DetailPage/OrganizationPubCard.js
+++ b/src/pages/Organization/DetailPage/OrganizationPubCard.js
@@ -19,7 +19,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 {FormattedMessage, useIntl} from "react-intl";
 
 // ==============================|| DASHBOARD - DEFAULT ||============================== //
 
@@ -135,7 +135,9 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                                                     alignItems: 'end'
                                                 }}
                                             >
-                                                <Typography variant="h5">Create</Typography>
+                                                <Typography variant="h5">
+                                                    <FormattedMessage id="create" />
+                                                </Typography>
                                             </Button>
                                         </Grid>
                                     </> :
@@ -145,26 +147,21 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                                                 size="large"
                                                 variant="contained"
                                                 onClick={loadDataFun}
-                                                sx={{
-                                                    textTransform: 'capitalize',
-                                                    alignItems: 'end'
-                                                }}
                                             >
-                                                <Typography variant="h5">Reset & Back</Typography>
+                                                <Typography variant="h5">
+                                                    <FormattedMessage id="resetAndBack" />
+                                                </Typography>
                                             </Button>
                                         </Grid>
                                         <Grid item sx={{ ml: 3, mr: 3 }}>
                                             <Button
-                                                size="large"
                                                 variant="contained"
                                                 type="submit"
                                                 color="success"
-                                                sx={{
-                                                    textTransform: 'capitalize',
-                                                    alignItems: 'end'
-                                                }}
                                             >
-                                                <Typography variant="h5">Save</Typography>
+                                                <Typography variant="h5">
+                                                    <FormattedMessage id="save" />
+                                                </Typography>
                                             </Button>
                                         </Grid>
                                     </>
@@ -174,15 +171,12 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                             <>
                                 <Grid item sx={{ ml: 0, mr: 3 }}>
                                     <Button
-                                        size="large"
                                         variant="contained"
-                                        sx={{
-                                            textTransform: 'capitalize',
-                                            alignItems: 'end'
-                                        }}
                                         onClick={onEditClick}
                                     >
-                                        <Typography variant="h5">Edit</Typography>
+                                        <Typography variant="h5">
+                                            <FormattedMessage id="edit" />
+                                        </Typography>
                                     </Button>
                                 </Grid>
                             </>
@@ -197,12 +191,12 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                     <Grid container spacing={1}>
                         <Grid item xs={12}>
                             <Typography variant="h4" sx={{ mb: 2, mr: 3, borderBottom: "1px solid black" }}>
-                                Organization Details
+                                <FormattedMessage id="organizationDetails" />
                             </Typography>
                         </Grid>
                         <Grid item lg={4} >
                             {FieldUtils.getTextField({
-                                label: FieldUtils.notNullFieldLabel("BR No.:"),
+                                label: intl.formatMessage({id: 'brNo'}) + ":",
                                 valueName: "brNo",
                                 disabled: true,
                                 form: formik
@@ -210,7 +204,7 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                         </Grid>
                         <Grid item lg={4} >
                             {FieldUtils.getTextField({
-                                    label: "Creditor Account" + ":",
+                                    label: intl.formatMessage({id: 'creditorAccount'}) + ":",
                                     valueName: "creditor",
                                     disabled: true,
                                     form: formik
@@ -231,7 +225,7 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
 
                         <Grid item lg={4} >
                             {FieldUtils.getTextField({
-                                label: FieldUtils.notNullFieldLabel("Name (Eng):"),
+                                label: FieldUtils.notNullFieldLabel(intl.formatMessage({id: 'nameEng'}) + ":"),
                                 valueName: "enCompanyName",
                                 disabled: true,
                                 form: formik
@@ -240,7 +234,7 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
 
                         <Grid item lg={4} >
                             {FieldUtils.getTextField({
-                                label: "Name (Ch):",
+                                label: intl.formatMessage({id: 'nameChi'}) + ":",
                                 valueName: "chCompanyName",
                                 disabled: true,
                                 form: formik
@@ -249,7 +243,7 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
 
                         <Grid item lg={4} >
                             {FieldUtils.getDateField({
-                                label: FieldUtils.notNullFieldLabel("Expiry Date:"),
+                                label: FieldUtils.notNullFieldLabel(intl.formatMessage({id: 'expiryDate'}) + ":"),
                                 valueName: "brExpiryDate",
                                 disabled: true,
                                 form: formik
@@ -258,7 +252,7 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
 
                         <Grid item lg={4} >
                             {FieldUtils.getTextField({
-                                label: FieldUtils.notNullFieldLabel("Contact Person:"),
+                                label: FieldUtils.notNullFieldLabel(intl.formatMessage({id: 'contactPerson'}) + ":"),
                                 valueName: "contactPerson",
                                 disabled: (!editMode && !createMode),
                                 form: formik
@@ -267,7 +261,7 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
 
                         <Grid item lg={4} >
                             {FieldUtils.getPhoneField({
-                                label: FieldUtils.notNullFieldLabel("Contact Tel:"),
+                                label: FieldUtils.notNullFieldLabel(intl.formatMessage({id: 'userContactNumber'}) + ":"),
                                 valueName: {
                                     code: "tel_countryCode",
                                     num: "phoneNumber"
@@ -279,7 +273,7 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
 
                         <Grid item lg={4} >
                             {FieldUtils.getPhoneField({
-                                label: "Fax No:",
+                                label: intl.formatMessage({id: 'contactFaxNumber'}) + ":",
                                 valueName: {
                                     code: "fax_countryCode",
                                     num: "faxNumber"
@@ -291,7 +285,7 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
 
                         <Grid item lg={4} >
                             {FieldUtils.getComboField({
-                                label: FieldUtils.notNullFieldLabel("Country:"),
+                                label: FieldUtils.notNullFieldLabel(intl.formatMessage({id: 'country'}) + ":"),
                                 valueName: "country",
                                 disabled: (!editMode && !createMode),
                                 dataList: ComboData.country,
@@ -302,7 +296,7 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
 
                         <Grid item lg={4} >
                             {FieldUtils.getComboField({
-                                label: FieldUtils.notNullFieldLabel("District:"),
+                                label: FieldUtils.notNullFieldLabel(intl.formatMessage({id: 'district'}) + ":"),
                                 valueName: "district",
                                 disabled: (!editMode && !createMode),
                                 dataList: ComboData.district,
@@ -314,7 +308,7 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
 
                         <Grid item lg={4} >
                             {FieldUtils.getAddressField({
-                                label: FieldUtils.notNullFieldLabel("Address:"),
+                                label: FieldUtils.notNullFieldLabel(intl.formatMessage({id: 'formAddress'}) + ":"),
                                 valueName: ["addressLine1", "addressLine2", "addressLine3"],
                                 disabled: (!editMode && !createMode),
                                 form: formik
diff --git a/src/pages/Organization/DetailPage/index.js b/src/pages/Organization/DetailPage/index.js
index c53350d..bfea72d 100644
--- a/src/pages/Organization/DetailPage/index.js
+++ b/src/pages/Organization/DetailPage/index.js
@@ -33,6 +33,7 @@ const BackgroundHead = {
     backgroundPosition: 'right'
 }
 import {
+    FormattedMessage,
     // FormattedMessage,
     useIntl
 } from "react-intl";
@@ -132,13 +133,15 @@ const OrganizationDetailPage = () => {
                         {isGLDLoggedIn()?
                             <Typography ml={15} color='#FFF' variant="h4">Maintain Organization</Typography>
                         :
-                            <Typography ml={15} color='#FFF' variant="h4">Organization Profile</Typography>
+                            <Typography ml={15} color='#FFF' variant="h4">
+                                <FormattedMessage id="organizationProfile" />
+                            </Typography>
                         }
                         </Stack>
                     </div>
                 </Grid>
                 <Grid item xs={12}>
-                    <Button title="Back" sx={{ ml: 3.5, mt: 2 }} style={{ border: '2px solid' }} variant="outlined" onClick={() => { navigate("/org") }}>
+                    <Button aria-label={intl.formatMessage({id: 'back'})} title="Back" sx={{ ml: 3.5, mt: 2 }} style={{ border: '2px solid' }} variant="outlined" onClick={() => { navigate("/org") }}>
                         <ForwardIcon style={{ height: 30, width: 50, transform: "rotate(180deg)" }} />
                     </Button>
                 </Grid>
diff --git a/src/translations/en.json b/src/translations/en.json
index 7ecafdb..b578b7d 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -363,6 +363,15 @@
   "loading": "Loading...",
   "ok": "Ok",
 
+  "organizationProfile": "Organization Profile",
+  "organizationDetails": "Organization Details",
+  "brNo": "BR No.",
+  "creditorAccount": "Creditor account",
+  "nameEng": "Name (Eng)",
+  "nameChi": "Name (Ch)",
+  "expiryDate": "Expiry date",
+  "create": "Create",
+
   "Dashboard": "Dashboard",
   "event": "Event"
 }
\ No newline at end of file
diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json
index 9a18efc..cd49995 100644
--- a/src/translations/zh-CN.json
+++ b/src/translations/zh-CN.json
@@ -363,6 +363,15 @@
   "loading": "加载中...",
   "ok": "好的",
 
+  "organizationProfile": "机构资料",
+  "organizationDetails": "机构详情",
+  "brNo": "商业登记证号码",
+  "creditorAccount": "债权人帐户",
+  "nameEng": "姓名(英文)",
+  "nameChi": "姓名(中文)",
+  "expiryDate": "过期日期",
+  "create": "创建",
+
   "Dashboard": "仪表板",
   "event": "活动"
 }
\ No newline at end of file
diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json
index 2ff637d..5a8c0d4 100644
--- a/src/translations/zh-HK.json
+++ b/src/translations/zh-HK.json
@@ -363,6 +363,15 @@
   "loading": "加載中...",
   "ok": "好的",
 
+  "organizationProfile": "機構資料",
+  "organizationDetails": "機構詳情",
+  "brNo": "商業登記證號碼",
+  "creditorAccount": "債權人帳戶",
+  "nameEng": "姓名(英文)",
+  "nameChi": "姓名(中文)",
+  "expiryDate": "過期日期",
+  "create": "創建",
+
   "Dashboard": "儀表板",
   "event": "活動"
 }
\ No newline at end of file