update payment notice record i18n

src/assets/style/navbarStyles.css

@@ -127,7 +127,7 @@
     visibility: hidden;
     opacity: 0;
     min-width: 16rem;
-    position: absolute;
+    position: relative;
     /* transition: all 0.5s ease; */
     left: 0;
     display: none;

src/layout/MainLayout/Header/index.js

@@ -59,7 +59,7 @@ import { Link } from "react-router-dom";
 import LocaleSelector from "./HeaderContent/LocaleSelector";
 import { FormattedMessage } from "react-intl";
 
-const drawerWidth = 240;
+const drawerWidth = 300;
 
 // const navItems = ['Home', 'About', 'Contact'];
 // ==============================|| MAIN LAYOUT - HEADER ||============================== //
@@ -135,7 +135,7 @@ function Header(props) {
           </ul>
         </li>
         <li>
-          <Link className="emailTemplate" to='/emailTemplate'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 0 }}>Email Template</Typography></Link>
+          <Link className="emailTemplate" to='/emailTemplate'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 1 }}>Email Template</Typography></Link>
         </li>
         {/* <li>
           <Link className="logout" onClick={handleLogout}><Typography variant={"pnspsHeaderTitle"} sx={{ ml: 2 }}>Logout</Typography></Link>
@@ -174,7 +174,9 @@ function Header(props) {
                   </Typography></Link>
                 </li>
                 <li>
-                  <Link className="manageOrgUser" to='/paymentPage/demandNote'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 1 }}>繳款通知記錄</Typography></Link>
+                  <Link className="manageOrgUser" to='/paymentPage/demandNote'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 1 }}>
+                    <FormattedMessage id="paymentInfoRecord" />
+                  </Typography></Link>
                 </li>
               </ul>
             </>
@@ -268,7 +270,7 @@ function Header(props) {
 
   const drawer = (
     isUserLoggedIn() ?
-      <Stack id="sidebar" direction="column" justifyContent="center" alignItems="center" /*onClick={handleDrawerToggle}*/ sx={{ textAlign: 'center' }}>
+      <Stack id="sidebar" direction="column" justifyContent="center" alignItems="center" /*onClick={handleDrawerToggle}*/ sx={{ textAlign: 'center', width: '300px' }}>
         <Typography variant="h6" sx={{ my: 2 }}>
           PNSPS
         </Typography>

src/pages/DemandNote/Search_Public/DataGrid.js

@@ -31,7 +31,7 @@ export default function SearchDemandNote({ recordList }) {
     const columns = [
         {
             field: 'dnNo',
-            headerName: '繳款單號',
+            headerName: intl.formatMessage({id: 'paymentRecordId'}),
             width: 200,
         },
         {
@@ -42,7 +42,7 @@ export default function SearchDemandNote({ recordList }) {
         {
             id: 'issueDate',
             field: 'issueDate',
-            headerName: '簽發日期',
+            headerName: intl.formatMessage({id: 'receiptDate'}),
             width: 175,
             valueGetter: (params) => {
                 return DateUtils.dateStr(params?.value);
@@ -58,7 +58,7 @@ export default function SearchDemandNote({ recordList }) {
         },
         {
             field: 'sentDate',
-            headerName: '發送日期',
+            headerName: intl.formatMessage({id: 'sendDate'}),
             flex: 1,
             valueGetter: (params) => {
                 return params?.value ? DateUtils.datetimeStr(params?.value) + " - " + params.row.sentBy : "";
@@ -66,7 +66,7 @@ export default function SearchDemandNote({ recordList }) {
         },
         {
             field: 'filename',
-            headerName: '檔案',
+            headerName: intl.formatMessage({id: 'files'}),
             flex: 1,
             renderCell: (params) => {
                 return <Button onClick={onDownloadClick(params)}><u>{params.row.filename}</u></Button>;

src/pages/DemandNote/Search_Public/SearchForm.js

@@ -133,7 +133,7 @@ const SearchDemandNoteForm = ({ applySearch, searchCriteria, issueComboData
                                 fullWidth
                                 {...register("dnNo")}
                                 id='dnNo'
-                                label="繳款單號"
+                                label={intl.formatMessage({id: 'paymentRecordId'})}
                                 defaultValue={searchCriteria.dnNo}
                                 InputLabelProps={{
                                     shrink: true
@@ -147,7 +147,7 @@ const SearchDemandNoteForm = ({ applySearch, searchCriteria, issueComboData
                                 {...register("dateFrom")}
                                 id="dateFrom"
                                 type="date"
-                                label={"發送日期(從)"}
+                                label={intl.formatMessage({id: 'sendDateFrom'})}
                                 defaultValue={searchCriteria.dateFrom}
                                 InputProps={{ inputProps: { max: maxDate } }}
                                 onChange={(newValue) => {
@@ -172,7 +172,7 @@ const SearchDemandNoteForm = ({ applySearch, searchCriteria, issueComboData
                                 }}
                                 id="dateTo"
                                 type="date"
-                                label={"發送日期(到)"}
+                                label={intl.formatMessage({id: 'sendDateTo'})}
                                 defaultValue={searchCriteria.dateTo}
                             />
                         </Grid>
@@ -182,6 +182,7 @@ const SearchDemandNoteForm = ({ applySearch, searchCriteria, issueComboData
                             <Autocomplete
                                 {...register("status")}
                                 id="status"
+                                size="small"
                                 options={ComboData.denmandNoteStatus_Public}
                                 getOptionLabel={(option) => option.labelCht}
                                 inputValue={selectedStatus?.labelCht ? selectedStatus?.labelCht : ""}
@@ -233,7 +234,9 @@ const SearchDemandNoteForm = ({ applySearch, searchCriteria, issueComboData
                                     textTransform: 'capitalize',
                                     alignItems: 'end'
                                 }}>
-                                <Typography variant="h5">提交</Typography>
+                                <Typography variant="h5">
+                                    <FormattedMessage id="submit" />
+                                </Typography>
                             </Button>
                         </Grid>
                     </Grid>

src/pages/DemandNote/Search_Public/index.js

@@ -16,6 +16,7 @@ const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/Loa
 const SearchForm = Loadable(React.lazy(() => import('./SearchForm')));
 const EventTable = Loadable(React.lazy(() => import('./DataGrid')));
 import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png'
+import {FormattedMessage} from "react-intl";
 
 const BackgroundHead = {
     backgroundImage: `url(${titleBackgroundImg})`,
@@ -97,7 +98,9 @@ const UserSearchPage_Individual = () => {
                 <Grid item xs={12}>
                     <div style={BackgroundHead}>
                         <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">
-                            <Typography ml={15} color='#FFF' variant="h4">繳款通知記錄</Typography>
+                            <Typography ml={15} color='#FFF' variant="h4">
+                                <FormattedMessage id="paymentInfoRecord" />
+                            </Typography>
                         </Stack>
                     </div>
                 </Grid>

src/pages/dashboard/Public/index.js

@@ -31,7 +31,7 @@ const DashboardDefault = () => {
         <div style={BackgroundHead}>
           <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">
             {/* <Typography variant="h5">我的公共啟事</Typography> */}
-            <Typography ml={10} color='#FFF' variant="h5">
+            <Typography color='#FFF' variant="h5" sx={{ ml:10, display:{ xs: 'none', sm:'none', md:'block'}}}>
               {isORGLoggedIn() ?userData.fullenName:userData.fullchName}, <FormattedMessage id="welcomeMsg"/>
             </Typography>
           </Stack>

src/translations/en.json

@@ -242,7 +242,7 @@
   "cancelled": "Cancelled",
   "withdrawn": "Withdrawn",
   "searchApplyRecord": "Search application record",
-  "applicationId": "Application number",
+  "applicationId": "Application ID",
   "submitDate": "Submit date",
   "submitDateFrom": "Submit date (from)",
   "submitDateTo": "Submit date (to)",
@@ -318,6 +318,14 @@
   "transactionTime": "Transaction time",
   "paymentRefCode": "Payment Reference Number",
 
+  "paymentInfoRecord": "Payment Notice Record",
+  "paymentRecordId": "Payment record number",
+  "receiptDate": "Issuance date",
+  "sendDate": "Send date",
+  "sendDateFrom": "Send date (from)",
+  "sendDateTo": "Send date (to)",
+  "files": "File(s)",
+
   "Dashboard": "Dashboard",
   "event": "Event"
 }

src/translations/zh-CN.json

@@ -317,6 +317,14 @@
   "transactionTime": "交易时间",
   "paymentRefCode": "付款参考号码",
 
+  "paymentInfoRecord": "缴款通知记录",
+  "paymentRecordId": "缴款单号",
+  "receiptDate": "签发日期",
+  "sendDate": "发送日期",
+  "sendDateFrom": "发送日期(从)",
+  "sendDateTo": "发送日期(到)",
+  "files": "档案",
+
   "Dashboard": "仪表板",
   "event": "活动"
 }

src/translations/zh-HK.json

@@ -317,6 +317,14 @@
   "transactionTime": "交易時間",
   "paymentRefCode": "付款參考號碼",
 
+  "paymentInfoRecord": "繳款通知記錄",
+  "paymentRecordId": "繳款單號",
+  "receiptDate": "簽發日期",
+  "sendDate": "發送日期",
+  "sendDateFrom": "發送日期(從)",
+  "sendDateTo": "發送日期(到)",
+  "files": "檔案",
+
   "Dashboard": "儀表板",
   "event": "活動"
 }