diff --git a/src/pages/Payment/PaymentCallback.js b/src/pages/Payment/PaymentCallback.js index 86de794..e261213 100644 --- a/src/pages/Payment/PaymentCallback.js +++ b/src/pages/Payment/PaymentCallback.js @@ -280,25 +280,25 @@ const Index = () => { - 付款失敗訊息： +

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

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

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

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

- 如果您需要進一步的協助或有任何疑問，請隨時與我們聯繫。非常抱歉給您帶來不便，我們將盡快解決您的付款問題。謝謝！ + diff --git a/src/pages/Proof/Payment/Pay.js b/src/pages/Proof/Payment/Pay.js index 9d483d1..5f88e61 100644 --- a/src/pages/Proof/Payment/Pay.js +++ b/src/pages/Proof/Payment/Pay.js @@ -32,9 +32,9 @@ import { // useEffect, useState } from "react"; -import {PNSPS_BUTTON_THEME, PNSPS_LONG_BUTTON_THEME} from "../../../themes/buttonConst"; -import {ThemeProvider} from "@emotion/react"; -import {FormattedMessage} from "react-intl"; +import { PNSPS_BUTTON_THEME, PNSPS_LONG_BUTTON_THEME } from "../../../themes/buttonConst"; +import { ThemeProvider } from "@emotion/react"; +import { FormattedMessage, useIntl } from "react-intl"; // ==============================|| DASHBOARD - DEFAULT ||============================== // const Index = () => { @@ -46,6 +46,8 @@ const Index = () => { const [onReady, setOnReady] = React.useState(false); const [isPopUp, setIsPopUp] = useState(false); + const intl = useIntl(); + React.useEffect(() => { loadForm(); }, []); @@ -66,7 +68,7 @@ const Index = () => { setRecord(responseData.data); setFee(responseData.data.fee); }, - onError:()=>{ + onError: () => { } }); @@ -91,8 +93,8 @@ const Index = () => {
- - + +
@@ -103,41 +105,53 @@ const Index = () => {
- + - 我們已收到申請編號: {record?.appNo} 的稿件校對確定及可付印的指示。 -

- 請於 {DateUtils.datetimeStr(record?.proofPaymentDeadline)} 前 完成繳費，我們將於收到繳費確認後處理刊出事宜。 -

- 如你在憲報期數 {record?.issueYear} 年 {record?.issueVolume} 卷, 第 {record?.issueNo} 期內有多於一個公共啟事的申請，你可選擇完成所有此期所有稿件校對確定後，於繳費期限前在「我的公共啟事」內合併付款。 +
+
+ + + {DateUtils.datetimeStr(record?.proofPaymentDeadline)} + + +
+
+
： - + - + diff --git a/src/pages/authentication/auth-forms/AuthLoginCustom.js b/src/pages/authentication/auth-forms/AuthLoginCustom.js index 5b9bd00..c5c226e 100644 --- a/src/pages/authentication/auth-forms/AuthLoginCustom.js +++ b/src/pages/authentication/auth-forms/AuthLoginCustom.js @@ -53,6 +53,7 @@ const AuthLoginCustom = () => { const dispatch = useDispatch() const navigate = useNavigate() const intl = useIntl(); + const { locale } = intl; // const { setLocaleFromLogin } = useContext(LocaleContext); const [showPassword, setShowPassword] = useState(false); diff --git a/src/translations/en.json b/src/translations/en.json index 73f7a15..3532445 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -34,16 +34,31 @@ "MSG.registerOrg": "You need to upload the proof documents for the online application.
e.g. Business Registration Certificate, Professional Practicing Certificate, etc.", "MSG.paymentMsg": "Your application and payment have been received", - "MSG.paymentCancelMsg1": "付款取消訊息：", - "MSG.paymentCancelMsg2": "你的付款已被取消。我們收到了你的付款請求，但由於某些原因，付款無法完成。請注意以下事項：", - "MSG.paymentCancelMsg3": "如果你主動取消了支付，請確認並確保取消是你的意願。", - "MSG.paymentCancelMsg4": "如果付款被取消是由於系統問題或其他原因，請你嘗試以下解決方法：", - "MSG.paymentCancelMsg5": "檢查你的支付帳戶是否有任何異常或限制。", - "MSG.paymentCancelMsg6": "確保你的付款資訊準確無誤。", - "MSG.paymentCancelMsg7": "檢查你的網路連線是否正常。", - "MSG.paymentCancelMsg8": "如果你需要進一步的協助或有任何疑問，請隨時與我們聯繫，我們將盡快解決你的付款問題。謝謝！", + "MSG.paymentCancelMsg1": "Payment cancellation message:", + "MSG.paymentCancelMsg2": "Your payment has been cancelled. We have received your payment request, but due to certain reasons, the payment could not be processed. Please take note of the following:", + "MSG.paymentCancelMsg3": "If you have voluntarily cancelled the payment, please confirm and ensure that the cancellation is your intention.", + "MSG.paymentCancelMsg4": "If the payment has been cancelled due to system issues or other reasons, please try the following troubleshooting steps:", + "MSG.paymentCancelMsg5": "Check if there are any abnormalities or restrictions in your payment account.", + "MSG.paymentCancelMsg6": "Ensure that your payment information is accurate.", + "MSG.paymentCancelMsg7": "Check if your internet connection is working properly.", + "MSG.paymentCancelMsg8": "If you need further assistance or have any questions, please feel free to contact us, and we will resolve your payment issue as soon as possible. Thank you.", + "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.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.", + "MSG.paymentFailMsg6": "If you have confirmed that the above issues are not the cause of the payment failure, please try the following troubleshooting steps:", + "MSG.paymentFailMsg7": "Attempt to make the payment using an alternative payment method.", + "MSG.paymentFailMsg8": "Check if there are any abnormalities or restrictions in your payment account.", + "MSG.paymentFailMsg9": "Contact our customer service representatives for assistance.", + "MSG.paymentFailMsg10": "If you need further assistance or have any questions, please feel free to contact us. We apologize for any inconvenience caused and will resolve your payment issue as soon as possible. Thank you.", + + "MSG.payMsg1": "We have received the manuscript proofreading confirmation and printing instructions for application number: {appNo}.", + "MSG.payMsg2_1": "Please complete the payment before ", + "MSG.payMsg2_2": " and we will process the publication after receiving payment confirmation.", + "MSG.payMsg3": "If you have multiple public notice applications within the Year {issueYear}, Volume {issueVolume}, Issue {issueNo} of the Official Gazette, you can choose to merge the payment for all the approved manuscripts within this issue in 'My Public Notice' before the payment deadline.", "registerTitle1": "Become", diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json index d58388b..92a1a2d 100644 --- a/src/translations/zh-CN.json +++ b/src/translations/zh-CN.json @@ -38,10 +38,26 @@ "MSG.paymentCancelMsg2": "你的付款已被取消。我们收到了你的付款请求，但由于某些原因，付款无法完成。请注意以下事项：", "MSG.paymentCancelMsg3": "如果你主动取消了支付，请确认并确保取消是你的意愿。", "MSG.paymentCancelMsg4": "如果付款被取消是由于系统问题或其他原因，请你尝试以下解决方法：", - "MSG.paymentCancelMsg5": "检查你的支付帐户是否有任何异常或限制。", - "MSG.paymentCancelMsg6": "确保你的付款资讯准确无误。", - "MSG.paymentCancelMsg7": "检查你的网路连线是否正常。", - "MSG.paymentCancelMsg8": "如果你需要进一步的协助或有任何疑问，请随时与我们联系，我们将尽快解决你的付款问题。谢谢！", + "MSG.paymentCancelMsg5": "检查支付帐户是否有任何异常或限制。", + "MSG.paymentCancelMsg6": "确保付款资讯准确无误。", + "MSG.paymentCancelMsg7": "检查网路连线是否正常。", + "MSG.paymentCancelMsg8": "如果需要进一步的协助或有任何疑问，请随时与我们联系，我们将尽快解决你的付款问题。谢谢！", + + "MSG.paymentFailMsg1": "付款失败讯息：", + "MSG.paymentFailMsg2": "亲爱的用户，很遗憾你的付款操作未成功。我们在处理你的付款时遇到了问题。请仔细检查以下事项：", + "MSG.paymentFailMsg3": "支付帐户余额是否足够。", + "MSG.paymentFailMsg4": "你提供的付款资讯是否准确无误。", + "MSG.paymentFailMsg5": "请检查网路连线是否正常。", + "MSG.paymentFailMsg6": "如果已确认以上问题无误，但付款失败，请尝试以下解决方法：", + "MSG.paymentFailMsg7": "尝试使用其他付款方式进行付款。", + "MSG.paymentFailMsg8": "检查支付帐户是否有异常或限制。", + "MSG.paymentFailMsg9": "联络我们的客服人员寻求协助。", + "MSG.paymentFailMsg10": "如果需要进一步的协助或有任何疑问，请随时与我们联系。非常抱歉给你带来不便，我们将尽快解决你的付款问题。谢谢！", + + "MSG.payMsg1": "我们已收到申请编号: {appNo} 的稿件校对确定及可付印的指示。", + "MSG.payMsg2_1": "请于 " , + "MSG.payMsg2_2": " 前 完成缴费，我们将于收到缴费确认后处理刊出事宜。" , + "MSG.payMsg3": "如你在宪报期数{issueYear} 年{issueVolume} 卷, 第{issueNo} 期内有多于一个公共启事的申请，你可选择完成所有此期所有稿件校对确定后，于缴费期限前在「我的公共启事」内合并付款。 ", "registerTitle1": "立即成为", diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json index 3d91b10..917a121 100644 --- a/src/translations/zh-HK.json +++ b/src/translations/zh-HK.json @@ -37,11 +37,27 @@ "MSG.paymentCancelMsg1": "付款取消訊息：", "MSG.paymentCancelMsg2": "你的付款已被取消。我們收到了你的付款請求，但由於某些原因，付款無法完成。請注意以下事項：", "MSG.paymentCancelMsg3": "如果你主動取消了支付，請確認並確保取消是你的意願。", - "MSG.paymentCancelMsg4": "如果付款被取消是由於系統問題或其他原因，請你嘗試以下解決方法：", - "MSG.paymentCancelMsg5": "檢查你的支付帳戶是否有任何異常或限制。", - "MSG.paymentCancelMsg6": "確保你的付款資訊準確無誤。", - "MSG.paymentCancelMsg7": "檢查你的網路連線是否正常。", - "MSG.paymentCancelMsg8": "如果你需要進一步的協助或有任何疑問，請隨時與我們聯繫，我們將盡快解決你的付款問題。謝謝！", + "MSG.paymentCancelMsg4": "如果付款被取消是由於系統問題或其他原因，請嘗試以下解決方法：", + "MSG.paymentCancelMsg5": "檢查支付帳戶是否有任何異常或限制。", + "MSG.paymentCancelMsg6": "確保付款資訊準確無誤。", + "MSG.paymentCancelMsg7": "檢查網路連線是否正常。", + "MSG.paymentCancelMsg8": "如果需要進一步的協助或有任何疑問，請隨時與我們聯繫，我們將盡快解決你的付款問題。謝謝！", + + "MSG.paymentFailMsg1": "付款失敗訊息：", + "MSG.paymentFailMsg2": "親愛的用戶，很遺憾你的付款操作未成功。我們在處理你的付款時遇到了問題。請仔細檢查以下事項：", + "MSG.paymentFailMsg3": "支付帳戶餘額是否足夠。", + "MSG.paymentFailMsg4": "你提供的付款資訊是否準確無誤。", + "MSG.paymentFailMsg5": "請檢查網路連線是否正常。", + "MSG.paymentFailMsg6": "如果已確認以上問題無誤，但付款失敗，請嘗試以下解決方法：", + "MSG.paymentFailMsg7": "嘗試使用其他付款方式進行付款。", + "MSG.paymentFailMsg8": "檢查支付帳戶是否有異常或限制。", + "MSG.paymentFailMsg9": "聯絡我們的客服人員尋求協助。", + "MSG.paymentFailMsg10": "如果需要進一步的協助或有任何疑問，請隨時與我們聯繫。非常抱歉給你帶來不便，我們將盡快解決你的付款問題。謝謝！", + + "MSG.payMsg1": "我們已收到申請編號: {appNo} 的稿件校對確定及可付印的指示。", + "MSG.payMsg2_1": "請於 ", + "MSG.payMsg2_2": " 前 完成繳費，我們將於收到繳費確認後處理刊出事宜。", + "MSG.payMsg3": "如你在憲報期數 {issueYear} 年 {issueVolume} 卷, 第 {issueNo} 期內有多於一個公共啟事的申請，你可選擇完成所有此期所有稿件校對確定後，於繳費期限前在「我的公共啟事」內合併付款。", "registerTitle1": "立即成為",