From 691b17db074a5432058c4029e09a59ef95c8f0ee Mon Sep 17 00:00:00 2001 From: Alex Cheung Date: Thu, 29 Feb 2024 15:09:53 +0800 Subject: [PATCH] update payment record with user feedback --- src/pages/Payment/Details_Public/DataGrid.js | 8 ++++---- .../Payment/Details_Public/PaymentDetails.js | 2 +- src/pages/Payment/FPS/FPS.js | 2 +- src/pages/Payment/Search_GLD/DataGrid.js | 4 ++-- src/pages/Payment/Search_Public/DataGrid.js | 4 ++-- src/translations/en.json | 16 +++++++++------- src/translations/zh-CN.json | 4 +++- src/translations/zh-HK.json | 4 +++- 8 files changed, 25 insertions(+), 19 deletions(-) diff --git a/src/pages/Payment/Details_Public/DataGrid.js b/src/pages/Payment/Details_Public/DataGrid.js index 7549c85..157a8ab 100644 --- a/src/pages/Payment/Details_Public/DataGrid.js +++ b/src/pages/Payment/Details_Public/DataGrid.js @@ -64,7 +64,7 @@ export default function SearchPublicNoticeTable({ recordList }) { { id: 'appNo', field: 'appNo', - headerName: intl.formatMessage({id: 'terms'}), + headerName: intl.formatMessage({id: 'particulars'}), width: isMdOrLg ? 'auto' : 300, flex: isMdOrLg ? 1 : undefined, renderCell: (params) => { @@ -81,7 +81,7 @@ export default function SearchPublicNoticeTable({ recordList }) { { id: 'fee', field: 'fee', - headerName: intl.formatMessage({id: 'currencyPrice'}) + ' (HK$)', + headerName: intl.formatMessage({id: 'currencyAmount'}) + ' ($)', width: 200, valueGetter: (params) => { return (params?.value) ? "$ " + FormatUtils.currencyFormat(params?.value) : ""; @@ -102,9 +102,9 @@ export default function SearchPublicNoticeTable({ recordList }) { - : +  :  - (HK$) {FormatUtils.currencyFormat(total)} + $ {FormatUtils.currencyFormat(total)} diff --git a/src/pages/Payment/Details_Public/PaymentDetails.js b/src/pages/Payment/Details_Public/PaymentDetails.js index 8de776c..64f02cd 100644 --- a/src/pages/Payment/Details_Public/PaymentDetails.js +++ b/src/pages/Payment/Details_Public/PaymentDetails.js @@ -136,7 +136,7 @@ const PaymentDetails = ({ formData,doPrint,onDownload }) => { - : + : diff --git a/src/pages/Payment/FPS/FPS.js b/src/pages/Payment/FPS/FPS.js index 692ee73..d7864d8 100644 --- a/src/pages/Payment/FPS/FPS.js +++ b/src/pages/Payment/FPS/FPS.js @@ -299,7 +299,7 @@ const Index = () => { FPS
- +
{"HK$ " + currencyFormat(paymentData.amount)} diff --git a/src/pages/Payment/Search_GLD/DataGrid.js b/src/pages/Payment/Search_GLD/DataGrid.js index f8e4e46..6051a59 100644 --- a/src/pages/Payment/Search_GLD/DataGrid.js +++ b/src/pages/Payment/Search_GLD/DataGrid.js @@ -64,7 +64,7 @@ export default function SearchPublicNoticeTable({ recordList }) { headerName: 'Trans. Date', flex: 1, valueGetter: (params) => { - return DateUtils.datetimeStr(params?.value); + return DateUtils.dateStr(params?.value); } }, { @@ -72,7 +72,7 @@ export default function SearchPublicNoticeTable({ recordList }) { headerName: 'Status', width: 150, renderCell: (params) => { - return PaymentStatus.getStatus_Cht(params); + return PaymentStatus.getStatus_Eng(params); } }, { diff --git a/src/pages/Payment/Search_Public/DataGrid.js b/src/pages/Payment/Search_Public/DataGrid.js index fa58b16..5d96649 100644 --- a/src/pages/Payment/Search_Public/DataGrid.js +++ b/src/pages/Payment/Search_Public/DataGrid.js @@ -77,7 +77,7 @@ export default function SearchPublicNoticeTable({ recordList }) { width: isMdOrLg ? 'auto' : 160, flex: isMdOrLg ? 1 : undefined, valueGetter: (params) => { - return DateUtils.datetimeStr(params?.value); + return DateUtils.dateStr(params?.value); } }, { @@ -94,7 +94,7 @@ export default function SearchPublicNoticeTable({ recordList }) { { id: 'payAmount', field: 'payAmount', - headerName: intl.formatMessage({id: 'fee'}), + headerName: intl.formatMessage({id: 'currencyAmount'}) + ' ($)', width: 150, valueGetter: (params) => { return (params?.value) ? "$ " + FormatUtils.currencyFormat(params?.value) : ""; diff --git a/src/translations/en.json b/src/translations/en.json index e8afbbb..696c70e 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -9,8 +9,8 @@ "importantNotice": "Important Notice", "privacyPolicy": "Privacy Policy", "Gazette": "Gazette", - "gazetteDate": "GazetteDate", - "gazetteLength": "length", + "gazetteDate": "Gazette Date", + "gazetteLength": "Length", "gazetteSampleName": "Gazette Supplement No. 6", "reason": "Reason", @@ -80,7 +80,7 @@ "registerFail": "Application failed, please try again later", "mainPage": "Main Page", - "myPublicNotice": "My Public Notice", + "myPublicNotice": "My Public Notices", "publicNotice": "Public Notice", "publicNoticePayment": "Public Notice: Payment", "publicNoticePaymentFail": "Public Notice: Payment Failed", @@ -321,12 +321,13 @@ "price": "Price", "pay": "Pay", "payDate": "Payment Date", - "payDateFrom": "Payment date (from)", + "payDateFrom": "Payment Date (from)", "payStatus": "Payment Status", "payId": "Payment Code", "payConfirm": "Confirm payment", "payCancel": "Cancel payment", - "payTotal": "Payment total", + "payTotalDeatail": "Total Payment Amount", + "payTotal": "Total", "payDetail": "Payment Details", "payMethod": "Payment method", "selectPaymentMethod": "Please select a payment method", @@ -340,8 +341,9 @@ "totalAmount": "Total Amount", "close": "Close", "confirm": "Confirm", - "terms": "Terms", + "particulars": "Particulars", "currencyPrice": "Price", + "currencyAmount": "Amount", "transactionRefNo": "Transaction Reference Number", "selectedPaymentMethod": "Selected payment method", "paymentMethodNotAvailable":"The payment function is currently not available", @@ -392,7 +394,7 @@ "transactionNo": "Transaction number", "transactionDate": "Transaction date", "transactionTime": "Transaction time", - "paymentRefCode": "Payment Reference Number", + "paymentRefCode": "Payment reference number", "paymentInfoRecord": "Payment Notice Record", "paymentRecordId": "Payment record number", diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json index c393d75..1e39359 100644 --- a/src/translations/zh-CN.json +++ b/src/translations/zh-CN.json @@ -321,6 +321,7 @@ "payId": "付款编号", "payConfirm": "确认付款", "payCancel": "取消付款", + "payTotalDeatail": "付款总额", "payTotal": "付款总额", "payDetail": "付款详情", "payMethod": "付款方式", @@ -335,8 +336,9 @@ "totalAmount": "总额", "close": "关闭", "confirm": "确认", - "terms": "项目", + "particulars": "项目", "currencyPrice": "金额", + "currencyAmount": "金额", "transactionRefNo": "交易參考編號", "selectedPaymentMethod": "已選擇付款方法", "paymentMethodNotAvailable":"付款功能現在不可用", diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json index d9a89a6..4f40505 100644 --- a/src/translations/zh-HK.json +++ b/src/translations/zh-HK.json @@ -324,6 +324,7 @@ "payId": "付款編號", "payConfirm": "確認付款", "payCancel": "取消付款", + "payTotalDeatail": "付款總額", "payTotal": "付款總額", "payDetail": "付款詳情", "payMethod": "付款方式", @@ -338,8 +339,9 @@ "totalAmount": "總額", "close": "關閉", "confirm": "確認", - "terms": "項目", + "particulars": "項目", "currencyPrice": "金額", + "currencyAmount": "金額", "transactionRefNo": "交易參考編號", "selectedPaymentMethod": "已選擇付款方法", "paymentMethodNotAvailable":"付款功能現在不可用",