alex
/
PNSPS-frontend-MaterialUI
1
0
複製 0
程式碼 問題 0 合併請求 0 版本發佈 0 Wiki 活動
瀏覽代碼

update layout

CR003
Alex Cheung 1 年之前
父節點
e3cdffa2f5
當前提交
39b150a58c
共有 10 個檔案被更改，包括 130 行新增 和 74 行删除
分割檢視
Diff Options
Show Stats Download Patch File Download Diff File
  1. +26
    -16
      src/pages/Payment/FPS/AckPage.js
  2. +6
    -4
      src/pages/Payment/FPS/FPS.js
  3. +26
    -16
      src/pages/Payment/FPS/fpscallback.js
  4. +4
    -4
      src/pages/Payment/MultiPaymentWindow.js
  5. +23
    -13
      src/pages/Payment/PaymentCallback.js
  6. +18
    -9
      src/pages/Proof/Reply_Public/ApplicationDetails.js
  7. +2
    -2
      src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
  8. +7
    -2
      src/translations/en.json
  9. +10
    -5
      src/translations/zh-CN.json
  10. +8
    -3
      src/translations/zh-HK.json

+ 26
- 16
src/pages/Payment/FPS/AckPage.js 查看文件

@@ -298,29 +298,39 @@ const AckPage = () => {
<Grid container justifyContent="flex-start" alignItems="center" >
<center>
<Grid item xs={12} md={8} >

<Typography variant="h5" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "left" }}>
付款失敗訊息：
<FormattedMessage id="MSG.paymentFailMsg1"/>
<br /><br />
親愛的用戶，很遺憾地告訴您，您的付款操作未成功。我們在處理您的付款時遇到了問題。請您仔細檢查以下事項：
<FormattedMessage id="MSG.paymentFailMsg2"/>
<br /><br />
您的支付帳戶餘額是否足夠。
<br />
您提供的付款資訊是否準確無誤。
<br />
請檢查您的網路連線是否正常。
<ul>
<li>
<FormattedMessage id="MSG.paymentFailMsg3"/>
</li>
<li>
<FormattedMessage id="MSG.paymentFailMsg4"/>
</li>
<li>
<FormattedMessage id="MSG.paymentFailMsg5"/>
</li>
</ul>
<br /><br />
如果您已確認以上問題無誤，但付款失敗，請您嘗試以下解決方法：
<FormattedMessage id="MSG.paymentFailMsg6"/>
<br /><br />
嘗試使用其他付款方式進行付款。
<br />
檢查您的支付帳戶是否有異常或限制。
<br />
聯絡我們的客服人員尋求協助。
<ul>
<li>
<FormattedMessage id="MSG.paymentFailMsg7"/>
</li>
<li>
<FormattedMessage id="MSG.paymentFailMsg8"/>
</li>
<li>
<FormattedMessage id="MSG.paymentFailMsg9"/>
</li>
</ul>
<br /><br />
如果您需要進一步的協助或有任何疑問，請隨時與我們聯繫。非常抱歉給您帶來不便，我們將盡快解決您的付款問題。謝謝！
<FormattedMessage id="MSG.paymentFailMsg10"/>
</Typography>

</Grid>
</center>
</Grid>


+ 6
- 4
src/pages/Payment/FPS/FPS.js 查看文件

@@ -371,17 +371,19 @@ const Index = () => {
</Typography>
:
<Typography variant="h3" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "center" }}>
請掃描以下二維碼
<FormattedMessage id="fpsQrcodeTitle1"/>
<br />
<img src={fpsTransctionData.fpsqrcodeimgbase64} alt="QR Code"/>
<br />
{"["+paymentId+"]"}
<br/>
二維碼有效期限3分鐘
<FormattedMessage id="fpsQrcodeTitle2"/>
<br />
請在規定時間內完成付款流程
<FormattedMessage id="fpsQrcodeTitle3"/>
<br />
{"剩餘時間: "+timeDownCount+ "秒"}
<FormattedMessage id="fpsQrcodeTitle4"/>
{timeDownCount}
<FormattedMessage id="fpsQrcodeTitle5"/>
</Typography>
}
<Typography variant="h3" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "center" }}>


+ 26
- 16
src/pages/Payment/FPS/fpscallback.js 查看文件

@@ -285,29 +285,39 @@ const Fpscallback = () => {
<Grid container justifyContent="flex-start" alignItems="center" >
<center>
<Grid item xs={12} md={8} >

<Typography variant="h5" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "left" }}>
付款失敗訊息：
<FormattedMessage id="MSG.paymentFailMsg1"/>
<br /><br />
親愛的用戶，很遺憾地告訴您，您的付款操作未成功。我們在處理您的付款時遇到了問題。請您仔細檢查以下事項：
<FormattedMessage id="MSG.paymentFailMsg2"/>
<br /><br />
您的支付帳戶餘額是否足夠。
<br />
您提供的付款資訊是否準確無誤。
<br />
請檢查您的網路連線是否正常。
<ul>
<li>
<FormattedMessage id="MSG.paymentFailMsg3"/>
</li>
<li>
<FormattedMessage id="MSG.paymentFailMsg4"/>
</li>
<li>
<FormattedMessage id="MSG.paymentFailMsg5"/>
</li>
</ul>
<br /><br />
如果您已確認以上問題無誤，但付款失敗，請您嘗試以下解決方法：
<FormattedMessage id="MSG.paymentFailMsg6"/>
<br /><br />
嘗試使用其他付款方式進行付款。
<br />
檢查您的支付帳戶是否有異常或限制。
<br />
聯絡我們的客服人員尋求協助。
<ul>
<li>
<FormattedMessage id="MSG.paymentFailMsg7"/>
</li>
<li>
<FormattedMessage id="MSG.paymentFailMsg8"/>
</li>
<li>
<FormattedMessage id="MSG.paymentFailMsg9"/>
</li>
</ul>
<br /><br />
如果您需要進一步的協助或有任何疑問，請隨時與我們聯繫。非常抱歉給您帶來不便，我們將盡快解決您的付款問題。謝謝！
<FormattedMessage id="MSG.paymentFailMsg10"/>
</Typography>

</Grid>
</center>
</Grid>


+ 4
- 4
src/pages/Payment/MultiPaymentWindow.js 查看文件

@@ -292,7 +292,7 @@ const MultiPaymentWindow = (props) => {
<DialogContent>
<DialogContentText>
<FormLabel sx={{ fontSize: "20px", color: "#000000", textAlign: "left", ml:1}}>
<FormattedMessage id="paymentProcessLimited"/>。
<FormattedMessage id="paymentProcessLimited"/>
</FormLabel>
<Grid item xs={12} md={12} sx={{ pt: 2 }} style={{ height: '100%' }} width="100%">
<Box xs={12} md={12} sx={{ p: 4, border: '3px solid #eee', borderRadius: '10px' }} >
@@ -381,12 +381,12 @@ const MultiPaymentWindow = (props) => {
<Grid item xs={12} md={12}>
<Grid container >
<Grid item>
<Typography variant="pnspsFormParagraphBold" sx={{ color: "#000000", textAlign: "left" }}>
<FormattedMessage id="payTotal"/>(HK$):&nbsp;
<Typography variant="h5" sx={{ color: "#000000", textAlign: "left" }}>
<FormattedMessage id="payTotal"/>&nbsp;(HK$):&nbsp;
</Typography>
</Grid>
<Grid item>
<Typography variant="pnspsFormParagraphBold" sx={{color: "#000000", textAlign: "left" }}>
<Typography variant="h5" sx={{color: "#000000", textAlign: "left" }}>
{" HK$ " + FormatUtils.currencyFormat(props.totalAmount)}
</Typography>
</Grid>


+ 23
- 13
src/pages/Payment/PaymentCallback.js 查看文件

@@ -294,29 +294,39 @@ const Index = () => {
<Grid container justifyContent="flex-start" alignItems="center" >
<center>
<Grid item xs={12} md={8} >

<Typography variant="h5" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "left" }}>
<FormattedMessage id="MSG.paymentFailMsg1"/>
<br /><br />
<FormattedMessage id="MSG.paymentFailMsg2"/>
<br /><br />
<FormattedMessage id="MSG.paymentFailMsg3"/>
<br />
<FormattedMessage id="MSG.paymentFailMsg4"/>
<br />
<FormattedMessage id="MSG.paymentFailMsg5"/>
<ul>
<li>
<FormattedMessage id="MSG.paymentFailMsg3"/>
</li>
<li>
<FormattedMessage id="MSG.paymentFailMsg4"/>
</li>
<li>
<FormattedMessage id="MSG.paymentFailMsg5"/>
</li>
</ul>
<br /><br />
<FormattedMessage id="MSG.paymentFailMsg6"/>
<br /><br />
<FormattedMessage id="MSG.paymentFailMsg7"/>
<br />
<FormattedMessage id="MSG.paymentFailMsg8"/>
<br />
<FormattedMessage id="MSG.paymentFailMsg9"/>
<ul>
<li>
<FormattedMessage id="MSG.paymentFailMsg7"/>
</li>
<li>
<FormattedMessage id="MSG.paymentFailMsg8"/>
</li>
<li>
<FormattedMessage id="MSG.paymentFailMsg9"/>
</li>
</ul>
<br /><br />
<FormattedMessage id="MSG.paymentFailMsg10"/>
</Typography>

</Typography>
</Grid>
</center>
</Grid>


+ 18
- 9
src/pages/Proof/Reply_Public/ApplicationDetails.js 查看文件

@@ -205,9 +205,11 @@ const ApplicationDetailCard = ({ formData, }) => {
<Grid item xs={12} sm={12} md={6} lg={6} sx={{ mb: 1 }}>
<Grid container alignItems={"center"}>
<Grid item xs={12} sm={12} md={12} lg={12} sx={{ alignItems: 'center', wordBreak: 'break-word' }}>
<Typography><Typography variant="pnspsFormParagraph">
<FormattedMessage id="pleaseCheckReminder" />：
</Typography></Typography>
<Typography>
<Typography variant="pnspsFormParagraph">
<FormattedMessage id="pleaseCheckReminder" />：
</Typography>
</Typography>
</Grid>
<Grid item xs={12} sm={12} md={12} lg={12} sx={{ width: '95%', maxWidth: { xs: '70vw', sm: '72vw', md: '75vw', lg: '80vw' } }}>
<FileList
@@ -263,8 +265,10 @@ const ApplicationDetailCard = ({ formData, }) => {

<Grid item xs={12} sm={3} md={3} lg={3}
sx={{ mb: 1, display: 'flex', alignItems: 'center' }}>
<Typography variant="pnspsFormParagraph">
<FormattedMessage id="payFeeFor" />:
<Typography>
<Typography variant="pnspsFormParagraph">
<FormattedMessage id="payFeeFor" />:
</Typography>
</Typography>
</Grid>
<Grid item xs={12} sm={9} md={9} lg={9} sx={{ mb: 1, display: 'flex', alignItems: 'center' }}>
@@ -274,11 +278,16 @@ const ApplicationDetailCard = ({ formData, }) => {
{
formik.values.groupType === "Private Bill"
?
<Typography variant="pnspsFormParagraph">( {data.noOfPages} {intl.formatMessage({ id: 'page' })} x $6,552 )</Typography>
<Typography>
<Typography variant="pnspsFormParagraph">( {data.noOfPages} {intl.formatMessage({ id: 'page' })} x $6,552 )</Typography>
</Typography>
:
<Typography variant="pnspsFormParagraph">( {data.length} cm x {data.colCount === 2 ?
"$364 " + intl.formatMessage({ id: 'doubleCol' }) :
"$182 " + intl.formatMessage({ id: 'singleCol' })} )</Typography>
<Typography>
<Typography variant="pnspsFormParagraph">( {data.length} cm x {data.colCount === 2 ?
"$364 " + intl.formatMessage({ id: 'doubleCol' }) :
"$182 " + intl.formatMessage({ id: 'singleCol' })} )
</Typography>
</Typography>
}
</Grid>
</Grid>


+ 2
- 2
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) => (
<div>
<FormattedMessage id={utils.getPaymentMethod(params.row.paymentMethod)} /><br />


+ 7
- 2
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 [email protected] by {date}",
"payNPGORemark" :"Payment to be completed at Collection Office by {date}",


+ 10
- 5
src/translations/zh-CN.json 查看文件

@@ -63,9 +63,12 @@
"payDnMethod":"缴款单支付",
"payNPGOMethod":"收款办公室付款",
"payOnlineBtn":"网上付款",
"paymentMethod":"付款方式",
"paymentProcessLimited":"付款过程必须在 30 分钟内完成及返回本系统",

"fpsQrcodeTitle1":"请扫描以下二维码",
"fpsQrcodeTitle2":"二维码有效期限3分钟",
"fpsQrcodeTitle3":"请在规定时间内完成付款流程",
"fpsQrcodeTitle4":"剩余时间:",
"fpsQrcodeTitle5":"秒",
"payDnRemark": "在{date}之前将付款证明（如自动柜员机收据、网路银行记录）寄至 [email protected] ",
"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": "申请状态",


+ 8
- 3
src/translations/zh-HK.json 查看文件

@@ -63,7 +63,12 @@
"payDnMethod":"繳款單支付",
"payNPGOMethod":"收款辦公室付款",
"payOnlineBtn":"網上付款",
"fpsQrcodeTitle1":"請掃描以下二維碼",
"fpsQrcodeTitle2":"二維碼有效期限3分鐘",
"fpsQrcodeTitle3":"請在規定時間內完成付款流程",
"fpsQrcodeTitle4":"剩餘時間:",
"fpsQrcodeTitle5":"秒",

"payDnRemark": "在{date}之前將付款證明（如自動櫃員機收據、網路銀行記錄）寄至 [email protected] ",
"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": "申請人",


Write Preview
Loading…
取消
儲存