diff --git a/src/pages/Payment/FPS/AckPage.js b/src/pages/Payment/FPS/AckPage.js index 3075cde..210b16e 100644 --- a/src/pages/Payment/FPS/AckPage.js +++ b/src/pages/Payment/FPS/AckPage.js @@ -298,29 +298,39 @@ const AckPage = () => {
- - 付款失敗訊息： +

- 親愛的用戶，很遺憾地告訴您，您的付款操作未成功。我們在處理您的付款時遇到了問題。請您仔細檢查以下事項： +

- 您的支付帳戶餘額是否足夠。 -
- 您提供的付款資訊是否準確無誤。 -
- 請檢查您的網路連線是否正常。 +
    +
  • + +
    • +
  • + +
    • +
  • + +
    • +


- 如果您已確認以上問題無誤，但付款失敗，請您嘗試以下解決方法： +

- 嘗試使用其他付款方式進行付款。 -
- 檢查您的支付帳戶是否有異常或限制。 -
- 聯絡我們的客服人員尋求協助。 +
    +
  • + +
    • +
  • + +
    • +
  • + +
    • +


- 如果您需要進一步的協助或有任何疑問，請隨時與我們聯繫。非常抱歉給您帶來不便，我們將盡快解決您的付款問題。謝謝！ + -
diff --git a/src/pages/Payment/FPS/FPS.js b/src/pages/Payment/FPS/FPS.js index c77ceb2..9810cec 100644 --- a/src/pages/Payment/FPS/FPS.js +++ b/src/pages/Payment/FPS/FPS.js @@ -371,17 +371,19 @@ const Index = () => { : - 請掃描以下二維碼 +
QR Code
{"["+paymentId+"]"}
- 二維碼有效期限3分鐘 +
- 請在規定時間內完成付款流程 +
- {"剩餘時間: "+timeDownCount+ "秒"} + + {timeDownCount} + } diff --git a/src/pages/Payment/FPS/fpscallback.js b/src/pages/Payment/FPS/fpscallback.js index 661d12a..4a87e7c 100644 --- a/src/pages/Payment/FPS/fpscallback.js +++ b/src/pages/Payment/FPS/fpscallback.js @@ -285,29 +285,39 @@ const Fpscallback = () => {
- - 付款失敗訊息： +

- 親愛的用戶，很遺憾地告訴您，您的付款操作未成功。我們在處理您的付款時遇到了問題。請您仔細檢查以下事項： +

- 您的支付帳戶餘額是否足夠。 -
- 您提供的付款資訊是否準確無誤。 -
- 請檢查您的網路連線是否正常。 +
    +
  • + +
    • +
  • + +
    • +
  • + +
    • +


- 如果您已確認以上問題無誤，但付款失敗，請您嘗試以下解決方法： +

- 嘗試使用其他付款方式進行付款。 -
- 檢查您的支付帳戶是否有異常或限制。 -
- 聯絡我們的客服人員尋求協助。 +
    +
  • + +
    • +
  • + +
    • +
  • + +
    • +


- 如果您需要進一步的協助或有任何疑問，請隨時與我們聯繫。非常抱歉給您帶來不便，我們將盡快解決您的付款問題。謝謝！ + -
diff --git a/src/pages/Payment/MultiPaymentWindow.js b/src/pages/Payment/MultiPaymentWindow.js index cabe46a..3136b0c 100644 --- a/src/pages/Payment/MultiPaymentWindow.js +++ b/src/pages/Payment/MultiPaymentWindow.js @@ -292,7 +292,7 @@ const MultiPaymentWindow = (props) => { - 。 + @@ -381,12 +381,12 @@ const MultiPaymentWindow = (props) => { - - (HK$):  + +  (HK$):  - + {" HK$ " + FormatUtils.currencyFormat(props.totalAmount)} diff --git a/src/pages/Payment/PaymentCallback.js b/src/pages/Payment/PaymentCallback.js index d06928f..5ff3a27 100644 --- a/src/pages/Payment/PaymentCallback.js +++ b/src/pages/Payment/PaymentCallback.js @@ -294,29 +294,39 @@ const Index = () => {
-



- -
- -
- +
    +
  • + +
    • +
  • + +
    • +
  • + +
    • +




- -
- -
- +
    +
  • + +
    • +
  • + +
    • +
  • + +
    • +


- - +
diff --git a/src/pages/Proof/Reply_Public/ApplicationDetails.js b/src/pages/Proof/Reply_Public/ApplicationDetails.js index 4d64ca8..5693401 100644 --- a/src/pages/Proof/Reply_Public/ApplicationDetails.js +++ b/src/pages/Proof/Reply_Public/ApplicationDetails.js @@ -205,9 +205,11 @@ const ApplicationDetailCard = ({ formData, }) => { - - ： - + + + ： + + { - - : + + + : + @@ -274,11 +278,16 @@ const ApplicationDetailCard = ({ formData, }) => { { formik.values.groupType === "Private Bill" ? - ( {data.noOfPages} {intl.formatMessage({ id: 'page' })} x $6,552 ) + + ( {data.noOfPages} {intl.formatMessage({ id: 'page' })} x $6,552 ) + : - ( {data.length} cm x {data.colCount === 2 ? - "$364 " + intl.formatMessage({ id: 'doubleCol' }) : - "$182 " + intl.formatMessage({ id: 'singleCol' })} ) + + ( {data.length} cm x {data.colCount === 2 ? + "$364 " + intl.formatMessage({ id: 'doubleCol' }) : + "$182 " + intl.formatMessage({ id: 'singleCol' })} ) + + } diff --git a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js index 080d843..ef76b56 100644 --- a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js +++ b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js @@ -215,8 +215,8 @@ export default function SubmittedTab({ setCount, url }) { id: 'paymentMethodAndDeadLine', field: 'paymentMethodAndDeadLine', headerName: intl.formatMessage({ id: 'paymentMethodAndDeadLine' }), - width: isMdOrLg ? 'auto' : 160, - flex: isMdOrLg ? 1 : undefined, + width: isMdOrLg ? 'auto' : 250, + flex: isMdOrLg ? 2 : undefined, renderCell: (params) => (

diff --git a/src/translations/en.json b/src/translations/en.json index ebaec92..7d37f30 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -58,7 +58,7 @@ "MSG.paymentFailMsg1": "Payment failure message:", - "MSG.paymentFailMsg2": "Dear user, we regret to inform you that your payment transaction was unsuccessful. We encountered issues while processing your payment. Please carefully check the following:", + "MSG.paymentFailMsg2": "We regret to inform you that your payment transaction was unsuccessful. We encountered issues while processing your payment. Please carefully check the following:", "MSG.paymentFailMsg3": "Ensure that your payment account has sufficient balance.", "MSG.paymentFailMsg4": "Verify that the payment information you provided is accurate.", "MSG.paymentFailMsg5": "Please check if your internet connection is working properly.", @@ -395,7 +395,7 @@ "paymentLimitPrice2":" is only applicable when minimum amount is 0.10 and maximum amount is 9,999,999.99", "paymentLimitPPS":" is not available via mobile device browsers, please access the service via desktop computers.", "paymentMethod": "Payment Method", - "paymentProcessLimited":"Payment process must be completed within 30 minutes and return to this system", + "paymentProcessLimited":"Payment process must be completed within 30 minutes and return to this system.", "publicNoticeDetailTitle": "Public Notice Application Information", "applyPerson": "Applicant", @@ -450,6 +450,11 @@ "payDnMethod":"Demand Note", "payNPGOMethod":"NPGO Collection Office", "payOnlineBtn":"Online Pay", + "fpsQrcodeTitle1":"Please scan the following QR code", + "fpsQrcodeTitle2":"QR code is valid for 3 minutes", + "fpsQrcodeTitle3":"Please complete the payment process within the specified time", + "fpsQrcodeTitle4":"Remaining time:", + "fpsQrcodeTitle5":"Second", "payDnRemark": "Payment proof (e.g. ATM receipt, internet banking record) to be sent to gld_acct@gld.gov.hk by {date}", "payNPGORemark" :"Payment to be completed at Collection Office by {date}", diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json index 7e01a6d..4b13139 100644 --- a/src/translations/zh-CN.json +++ b/src/translations/zh-CN.json @@ -63,9 +63,12 @@ "payDnMethod":"缴款单支付", "payNPGOMethod":"收款办公室付款", "payOnlineBtn":"网上付款", - "paymentMethod":"付款方式", - "paymentProcessLimited":"付款过程必须在 30 分钟内完成及返回本系统", - + "fpsQrcodeTitle1":"请扫描以下二维码", + "fpsQrcodeTitle2":"二维码有效期限3分钟", + "fpsQrcodeTitle3":"请在规定时间内完成付款流程", + "fpsQrcodeTitle4":"剩余时间:", + "fpsQrcodeTitle5":"秒", + "payDnRemark": "在{date}之前将付款证明（如自动柜员机收据、网路银行记录）寄至 gld_acct@gld.gov.hk ", "payNPGORemark" :"在{date}之前在收款办公室完成付款", @@ -87,7 +90,7 @@ "MSG.paymentCancelMsg8": "如果需要进一步的协助或有任何疑问，请随时与我们联系，我们将尽快解决你的付款问题。谢谢！", "MSG.paymentFailMsg1": "付款失败讯息：", - "MSG.paymentFailMsg2": "亲爱的用户，很遗憾你的付款操作未成功。我们在处理你的付款时遇到了问题。请仔细检查以下事项：", + "MSG.paymentFailMsg2": "很遗憾你的付款操作未成功。我们在处理你的付款时遇到了问题。请仔细检查以下事项：", "MSG.paymentFailMsg3": "支付帐户余额是否足够。", "MSG.paymentFailMsg4": "你提供的付款资讯是否准确无误。", "MSG.paymentFailMsg5": "请检查网路连线是否正常。", @@ -414,7 +417,9 @@ "paymentLimitPrice1":"只适用于最小金额为 1.00 及最高金额为 9,999,999.99", "paymentLimitPrice2":"只适用于最小金额为 0.10 及最高金额为 9,999,999.99", "paymentLimitPPS":"付款不适用于流动装置的浏览器，请使用桌面电脑。", - + "paymentMethod": "付款方式", + "paymentProcessLimited":"付款过程必须在 30 分钟内完成及返回本系统。", + "publicNoticeDetailTitle": "公共启事申请资料", "applyPerson": "申请人", "applyStatus": "申请状态", diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json index 40ebbb6..c9e31b2 100644 --- a/src/translations/zh-HK.json +++ b/src/translations/zh-HK.json @@ -63,7 +63,12 @@ "payDnMethod":"繳款單支付", "payNPGOMethod":"收款辦公室付款", "payOnlineBtn":"網上付款", - + "fpsQrcodeTitle1":"請掃描以下二維碼", + "fpsQrcodeTitle2":"二維碼有效期限3分鐘", + "fpsQrcodeTitle3":"請在規定時間內完成付款流程", + "fpsQrcodeTitle4":"剩餘時間:", + "fpsQrcodeTitle5":"秒", + "payDnRemark": "在{date}之前將付款證明（如自動櫃員機收據、網路銀行記錄）寄至 gld_acct@gld.gov.hk ", "payNPGORemark" :"在{date}之前在收款辦公室完成付款", @@ -85,7 +90,7 @@ "MSG.paymentCancelMsg8": "如果需要進一步的協助或有任何疑問，請隨時與我們聯繫，我們將盡快解決你的付款問題。謝謝！", "MSG.paymentFailMsg1": "付款失敗訊息：", - "MSG.paymentFailMsg2": "親愛的用戶，很遺憾你的付款操作未成功。我們在處理你的付款時遇到了問題。請仔細檢查以下事項：", + "MSG.paymentFailMsg2": "很遺憾你的付款操作未成功。我們在處理你的付款時遇到了問題。請仔細檢查以下事項：", "MSG.paymentFailMsg3": "支付帳戶餘額是否足夠。", "MSG.paymentFailMsg4": "你提供的付款資訊是否準確無誤。", "MSG.paymentFailMsg5": "請檢查網路連線是否正常。", @@ -418,7 +423,7 @@ "paymentLimitPrice2":"只適用於最小金額為 0.10 及最高金額為 9,999,999.99", "paymentLimitPPS":"付款不適用於流動裝置的瀏覽器，請使用桌面電腦。", "paymentMethod": "付款方法", - "paymentProcessLimited":"付款程序必須在 30 分鐘內完成及返回本系统", + "paymentProcessLimited":"付款程序必須在 30 分鐘內完成及返回本系统。", "publicNoticeDetailTitle": "公共啟事申請資料", "applyPerson": "申請人",