From 1ceebfdb87a8a3daeac9d8d32027406db4964112 Mon Sep 17 00:00:00 2001 From: Alex Cheung Date: Mon, 19 Aug 2024 12:34:19 +0800 Subject: [PATCH] update wordings --- .../Payment/Details_GLD/PaymentDetails.js | 3 +- src/pages/Payment/Details_GLD/index.js | 2 +- .../Payment/Details_Public/PaymentDetails.js | 45 +++++++++++++++---- src/pages/Payment/Details_Public/index.js | 12 ++--- src/pages/Payment/FPS/AckPage.js | 2 +- src/pages/Payment/FPS/fpscallback.js | 2 +- src/pages/Payment/PaymentCallback.js | 2 +- src/pages/Proof/Reply_Public/ProofForm.js | 4 +- .../ApplyForm/PublicNoticeApplyForm.js | 4 +- 9 files changed, 52 insertions(+), 24 deletions(-) diff --git a/src/pages/Payment/Details_GLD/PaymentDetails.js b/src/pages/Payment/Details_GLD/PaymentDetails.js index 1262bb5..36138b2 100644 --- a/src/pages/Payment/Details_GLD/PaymentDetails.js +++ b/src/pages/Payment/Details_GLD/PaymentDetails.js @@ -9,6 +9,7 @@ import { import * as React from "react"; import * as FormatUtils from "utils/FormatUtils"; import * as PaymentStatus from "utils/statusUtils/PaymentStatus"; +import * as DateUtils from "utils/DateUtils"; import Loadable from 'components/Loadable'; const MainCard = Loadable(React.lazy(() => import('components/MainCard'))); const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/LoadingComponent'))); @@ -89,7 +90,7 @@ const PaymentDetails = ({ formData,doPrint,onDownload }) => { - {data.transDateStr + " (DD/MM/YYYY)"} + {DateUtils.dateFormat(data.transDateStr, intl.formatMessage({id: "dateStrFormat"})) +" ("+intl.formatMessage({id: "dateStrFormat"})+")"} diff --git a/src/pages/Payment/Details_GLD/index.js b/src/pages/Payment/Details_GLD/index.js index 68a1764..2b1e579 100644 --- a/src/pages/Payment/Details_GLD/index.js +++ b/src/pages/Payment/Details_GLD/index.js @@ -77,7 +77,7 @@ const Index = () => { if (!responseData.data?.id) { navigate("/paymentPage/search"); } - responseData.data["transDateStr"] = DateUtils.dateFormat(responseData.data.transDateTime, "DD/MM/YYYY"); + responseData.data["transDateStr"] = DateUtils.dateFormat(responseData.data.transDateTime, intl.formatMessage({id: "dateStrFormat"})); responseData.data["transTimeStr"] = DateUtils.dateFormat(responseData.data.transDateTime, "HH:mm:ss"); setItemList(responseData.paymentItemList) setRecord(responseData.data); diff --git a/src/pages/Payment/Details_Public/PaymentDetails.js b/src/pages/Payment/Details_Public/PaymentDetails.js index 219d537..f8dc436 100644 --- a/src/pages/Payment/Details_Public/PaymentDetails.js +++ b/src/pages/Payment/Details_Public/PaymentDetails.js @@ -9,6 +9,7 @@ import { import * as React from "react"; import * as FormatUtils from "utils/FormatUtils"; import * as PaymentStatus from "utils/statusUtils/PaymentStatus"; +import * as DateUtils from "utils/DateUtils"; import Loadable from 'components/Loadable'; const MainCard = Loadable(React.lazy(() => import('components/MainCard'))); const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/LoadingComponent'))); @@ -24,30 +25,56 @@ const PaymentDetails = ({ formData,doPrint,onDownload }) => { React.useEffect(() => { if (formData != null && formData != undefined && Object.keys(formData).length > 0) { - console.log(formData) + // console.log(formData) setData(formData); } }, [formData]); React.useEffect(() => { if (data != null && data != undefined && Object.keys(data).length > 0) { - console.log(data) + // console.log(data) setOnReady(data != {}); } }, [data]); const getPaymentMethod=()=>{ let paymentmethod = "" + // console.log(locale) if (data?.payload!=null) { paymentmethod = data.payload?.paymentdetail.paymentmethod; - if("01" == paymentmethod) return "PPS"; - if("02" == paymentmethod || "03" == paymentmethod) return "Credit Card"; - if("04" == paymentmethod) return "FPS"; + if (locale == "zh-HK"){ + if("01" == paymentmethod) return "PPS"; + if("02" == paymentmethod || "03" == paymentmethod) return "信用卡"; + if("04" == paymentmethod) return "FPS"; + } + else if (locale == "zh-CN"){ + if("01" == paymentmethod) return "PPS"; + if("02" == paymentmethod || "03" == paymentmethod) return "信用卡"; + if("04" == paymentmethod) return "FPS"; + } + else { + if("01" == paymentmethod) return "PPS"; + if("02" == paymentmethod || "03" == paymentmethod) return "Credit Card"; + if("04" == paymentmethod) return "FPS"; + } } else { paymentmethod = data.payMethod; - if("01,PPSB,PPS" == paymentmethod) return "PPS"; - if("02,BCMP,CreditCard" == paymentmethod || "03,BCMP,CreditCard" == paymentmethod) return "Credit Card"; - if("04,BCFP,FPS" == paymentmethod) return "FPS"; + if (locale == "zh-HK"){ + if("01,PPSB,PPS" == paymentmethod) return "PPS"; + if("02,BCMP,CreditCard" == paymentmethod || "03,BCMP,CreditCard" == paymentmethod) return "信用卡"; + if("04,BCFP,FPS" == paymentmethod) return "FPS"; + } + else if (locale == "zh-CN"){ + if("01,PPSB,PPS" == paymentmethod) return "PPS"; + if("02,BCMP,CreditCard" == paymentmethod || "03,BCMP,CreditCard" == paymentmethod) return "信用卡"; + if("04,BCFP,FPS" == paymentmethod) return "FPS"; + } + else { + if("01,PPSB,PPS" == paymentmethod) return "PPS"; + if("02,BCMP,CreditCard" == paymentmethod || "03,BCMP,CreditCard" == paymentmethod) return "Credit Card"; + if("04,BCFP,FPS" == paymentmethod) return "FPS"; + } + } return paymentmethod; } @@ -109,7 +136,7 @@ const PaymentDetails = ({ formData,doPrint,onDownload }) => { - {data.transDateStr + " (DD/MM/YYYY)"} + {DateUtils.dateFormat(data.transDateStr, intl.formatMessage({id: "dateStrFormat"})) +" ("+intl.formatMessage({id: "dateStrFormat"})+")"} diff --git a/src/pages/Payment/Details_Public/index.js b/src/pages/Payment/Details_Public/index.js index 68c1cae..7365474 100644 --- a/src/pages/Payment/Details_Public/index.js +++ b/src/pages/Payment/Details_Public/index.js @@ -59,9 +59,9 @@ const Index = () => { React.useEffect(() => { if (Object.keys(transactionData).length > 0) { - console.log(transactionData) - console.log(itemList) - console.log(record) + // console.log(transactionData) + // console.log(itemList) + // console.log(record) setOnReady(true); } }, [transactionData]); @@ -102,21 +102,21 @@ const Index = () => { "paymentId": params.id }, onSuccess: function(responseData2){ - responseData2.data["transDateStr"] = DateUtils.dateFormat(responseData2.data.transDateTime, "DD/MM/YYYY"); + responseData2.data["transDateStr"] = DateUtils.dateFormat(responseData2.data.transDateTime, intl.formatMessage({id: "dateStrFormat"})); responseData2.data["transTimeStr"] = DateUtils.dateFormat(responseData2.data.transDateTime, "HH:mm:ss"); setResponeData(responseData2.transactionData) setItemList(responseData2.paymentItemList) setRecord(responseData2.data); }, onError: function(){ - responseData.data["transDateStr"] = DateUtils.dateFormat(responseData.data.transDateTime, "DD/MM/YYYY"); + responseData.data["transDateStr"] = DateUtils.dateFormat(responseData.data.transDateTime, intl.formatMessage({id: "dateStrFormat"})); responseData.data["transTimeStr"] = DateUtils.dateFormat(responseData.data.transDateTime, "HH:mm:ss"); setResponeData(responseData) } }); }else{ - responseData.data["transDateStr"] = DateUtils.dateFormat(responseData.data.transDateTime, "DD/MM/YYYY"); + responseData.data["transDateStr"] = DateUtils.dateFormat(responseData.data.transDateTime, intl.formatMessage({id: "dateStrFormat"})); responseData.data["transTimeStr"] = DateUtils.dateFormat(responseData.data.transDateTime, "HH:mm:ss"); setResponeData(responseData) setItemList(responseData.paymentItemList) diff --git a/src/pages/Payment/FPS/AckPage.js b/src/pages/Payment/FPS/AckPage.js index 210b16e..7e455ed 100644 --- a/src/pages/Payment/FPS/AckPage.js +++ b/src/pages/Payment/FPS/AckPage.js @@ -104,7 +104,7 @@ const AckPage = () => { onSuccess: function(responseData){ localStorage.removeItem("webtoken"); localStorage.removeItem("transactionid"); - responseData.data["transDateStr"] = DateUtils.dateFormat(responseData.data.transDateTime, "DD/MM/YYYY"); + responseData.data["transDateStr"] = DateUtils.dateFormat(responseData.data.transDateTime, intl.formatMessage({id: "dateStrFormat"})); responseData.data["transTimeStr"] = DateUtils.dateFormat(responseData.data.transDateTime, "HH:mm:ss"); setResponeDataData(responseData.transactionData) setItemList(responseData.paymentItemList) diff --git a/src/pages/Payment/FPS/fpscallback.js b/src/pages/Payment/FPS/fpscallback.js index 4a87e7c..1306513 100644 --- a/src/pages/Payment/FPS/fpscallback.js +++ b/src/pages/Payment/FPS/fpscallback.js @@ -99,7 +99,7 @@ const Fpscallback = () => { localStorage.removeItem("webtoken"); localStorage.removeItem("transactionid"); } - responseData.data["transDateStr"] = DateUtils.dateFormat(responseData.data.transDateTime, "DD/MM/YYYY"); + responseData.data["transDateStr"] = DateUtils.dateFormat(responseData.data.transDateTime, intl.formatMessage({id: "dateStrFormat"})); responseData.data["transTimeStr"] = DateUtils.dateFormat(responseData.data.transDateTime, "HH:mm:ss"); setResponeDataData(responseData.transactionData) setItemList(responseData.paymentItemList) diff --git a/src/pages/Payment/PaymentCallback.js b/src/pages/Payment/PaymentCallback.js index 5ff3a27..42092b8 100644 --- a/src/pages/Payment/PaymentCallback.js +++ b/src/pages/Payment/PaymentCallback.js @@ -123,7 +123,7 @@ const Index = () => { localStorage.removeItem("webtoken"); localStorage.removeItem("transactionid"); } - responseData.data["transDateStr"] = DateUtils.dateFormat(responseData.data.transDateTime, "DD/MM/YYYY"); + responseData.data["transDateStr"] = DateUtils.dateFormat(responseData.data.transDateTime, intl.formatMessage({id: "dateStrFormat"})); responseData.data["transTimeStr"] = DateUtils.dateFormat(responseData.data.transDateTime, "HH:mm:ss"); setResponeDataData(responseData.transactionData) setItemList(responseData.paymentItemList) diff --git a/src/pages/Proof/Reply_Public/ProofForm.js b/src/pages/Proof/Reply_Public/ProofForm.js index 9c5c599..5d9d299 100644 --- a/src/pages/Proof/Reply_Public/ProofForm.js +++ b/src/pages/Proof/Reply_Public/ProofForm.js @@ -696,10 +696,10 @@ const FormPanel = ({ formData }) => { diff --git a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js index 8b915a8..506207b 100644 --- a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js +++ b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js @@ -623,7 +623,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) =>