diff --git a/src/layout/MainLayout/Header/index.js b/src/layout/MainLayout/Header/index.js
index f3f776b..a1f27a9 100644
--- a/src/layout/MainLayout/Header/index.js
+++ b/src/layout/MainLayout/Header/index.js
@@ -154,7 +154,9 @@ function Header(props) {
{isCreditorLoggedIn() ?
<>
- 付款記錄
+
+
+
diff --git a/src/pages/DemandNote/Search_Public/SearchForm.js b/src/pages/DemandNote/Search_Public/SearchForm.js
index 843bf2e..d9e87cb 100644
--- a/src/pages/DemandNote/Search_Public/SearchForm.js
+++ b/src/pages/DemandNote/Search_Public/SearchForm.js
@@ -106,7 +106,7 @@ const SearchDemandNoteForm = ({ applySearch, searchCriteria, issueComboData
}}
renderInput={(params) => (
{
- 支付金額
+
{"$HK " + paymentData.amount}
diff --git a/src/pages/Payment/Details_Public/PaymentDetails.js b/src/pages/Payment/Details_Public/PaymentDetails.js
index 748f75b..363f456 100644
--- a/src/pages/Payment/Details_Public/PaymentDetails.js
+++ b/src/pages/Payment/Details_Public/PaymentDetails.js
@@ -163,7 +163,9 @@ const PaymentDetails = ({ formData,doPrint }) => {
diff --git a/src/pages/Payment/FPS/FPSTest.js b/src/pages/Payment/FPS/FPSTest.js
index c0866a4..531d255 100644
--- a/src/pages/Payment/FPS/FPSTest.js
+++ b/src/pages/Payment/FPS/FPSTest.js
@@ -284,7 +284,7 @@ const Index = () => {
- 支付金額
+
{"$HK " + paymentData.amount}
diff --git a/src/pages/Payment/Search_Public/DataGrid.js b/src/pages/Payment/Search_Public/DataGrid.js
index 61ef146..97a7f39 100644
--- a/src/pages/Payment/Search_Public/DataGrid.js
+++ b/src/pages/Payment/Search_Public/DataGrid.js
@@ -86,7 +86,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
{
id: 'payAmount',
field: 'payAmount',
- headerName: '費用',
+ headerName: intl.formatMessage({id: 'fee'}),
width: 150,
valueGetter: (params) => {
return (params?.value) ? "$ " + FormatUtils.currencyFormat(params?.value) : "";
diff --git a/src/pages/Payment/Search_Public/index.js b/src/pages/Payment/Search_Public/index.js
index faf7400..0930897 100644
--- a/src/pages/Payment/Search_Public/index.js
+++ b/src/pages/Payment/Search_Public/index.js
@@ -15,6 +15,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})`,
@@ -68,7 +69,9 @@ const Index = () => {
- 付款記錄
+
+
+
diff --git a/src/pages/Proof/Reply_Public/ApplicationDetails.js b/src/pages/Proof/Reply_Public/ApplicationDetails.js
index e7783d4..63b486a 100644
--- a/src/pages/Proof/Reply_Public/ApplicationDetails.js
+++ b/src/pages/Proof/Reply_Public/ApplicationDetails.js
@@ -17,11 +17,12 @@ import Loadable from 'components/Loadable';
const MainCard = Loadable(React.lazy(() => import('components/MainCard')));
import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils";
import FileList from "components/FileList"
-import {FormattedMessage} from "react-intl";
+import {FormattedMessage, useIntl} from "react-intl";
// ==============================|| DASHBOARD - DEFAULT ||============================== //
const ApplicationDetailCard = ({ formData, }) => {
const params = useParams();
+ const intl = useIntl();
const [data, setData] = React.useState({});
//const [proofId, setProofId] = React.useState();
@@ -91,12 +92,14 @@ const ApplicationDetailCard = ({ formData, }) => {
- 申請狀態:
+
+ :
+
- {StatusUtils.getStatusByText(data.appStatus)}
+ {StatusUtils.getStatusByTextIntl(data.appStatus, false, intl)}
@@ -108,7 +111,9 @@ const ApplicationDetailCard = ({ formData, }) => {
- 申請人:
+
+ :
+
@@ -126,7 +131,9 @@ const ApplicationDetailCard = ({ formData, }) => {
- 憲報期數:
+
+ :
+
@@ -225,7 +232,9 @@ const ApplicationDetailCard = ({ formData, }) => {
- 應繳費用:
+
+ :
+
{FormatUtils.currencyFormat(data.fee)}
diff --git a/src/pages/Proof/Search_Public/DataGrid.js b/src/pages/Proof/Search_Public/DataGrid.js
index 2441f71..47aaf71 100644
--- a/src/pages/Proof/Search_Public/DataGrid.js
+++ b/src/pages/Proof/Search_Public/DataGrid.js
@@ -67,7 +67,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
const columns = [
{
field: 'actions',
- headerName: '校對編號',
+ headerName: intl.formatMessage({id: 'proofId'}),
width: isMdOrLg ? 'auto' : 250,
flex: isMdOrLg ? 1.5 : undefined,
cellClassName: 'actions',
@@ -96,7 +96,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
{
id: 'created',
field: 'created',
- headerName: '校對日期',
+ headerName: intl.formatMessage({id: 'proofDate'}),
width: isMdOrLg ? 'auto' : 250,
flex: isMdOrLg ? 1.5 : undefined,
valueGetter: (params) => {
@@ -118,7 +118,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
{
id: 'replyDate',
field: 'replyDate',
- headerName: '回覆日期',
+ headerName: intl.formatMessage({id: 'replyDate'}),
width: isMdOrLg ? 'auto' : 250,
flex: isMdOrLg ? 1.5 : undefined,
valueGetter: (params) => {
@@ -137,7 +137,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
{
id: 'fee',
field: 'fee',
- headerName: '費用',
+ headerName: intl.formatMessage({id: 'fee'}),
width: isMdOrLg ? 'auto' : 250,
flex: isMdOrLg ? 1.5 : undefined,
valueGetter: (params) => {
diff --git a/src/pages/Proof/Search_Public/SearchForm.js b/src/pages/Proof/Search_Public/SearchForm.js
index b5a3338..a939936 100644
--- a/src/pages/Proof/Search_Public/SearchForm.js
+++ b/src/pages/Proof/Search_Public/SearchForm.js
@@ -115,7 +115,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData
fullWidth
{...register("refNo")}
id='refNo'
- label="校對編號:"
+ label={intl.formatMessage({id: 'proofId'}) + ":"}
defaultValue={searchCriteria.refNo}
InputLabelProps={{
shrink: true
@@ -150,7 +150,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData
}}
renderInput={(params) => (
{
diff --git a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
index 5a3e0a7..e3e448a 100644
--- a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
+++ b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
@@ -208,7 +208,9 @@ const PublicNoticeApplyForm = ({ loadedData, selections }) => {
- 稿件檔案 ({"檔案大小應<10MB"}):
+
+ ({"檔案大小應<10MB"}):
+
}
>
- 支付
+
: null
}
@@ -177,7 +177,7 @@ const ApplicationDetailCard = (
- 公共啟事申請資料
+