update payment record with user feedback

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 }) {
             <Grid container direction="row"  justifyContent="flex-end" sx={{backgroundColor: '#fff' }}>
                 <Grid item>
                     <Typography align="right" variant="h4" sx={{mr:2,mt:1}}>
-                        <FormattedMessage id="payTotal"/>:
+                        <FormattedMessage id="payTotal"/>&nbsp;:&nbsp;
                         <span style={{ color: "blue", fontWeight: "bold", }}>
-                            (HK$) {FormatUtils.currencyFormat(total)}
+                            $&nbsp;{FormatUtils.currencyFormat(total)}
                         </span>
                     </Typography>
                 </Grid>

src/pages/Payment/Details_Public/PaymentDetails.js

@@ -136,7 +136,7 @@ const PaymentDetails = ({ formData,doPrint,onDownload }) => {
                                     <Grid container >
                                         <Grid item xs={6} md={6} sx={{ml:-5, textAlign: "right" }}>
                                             <FormLabel sx={{ fontSize: "16px", color: "#000000" }}>
-                                                <FormattedMessage id="payTotal"/>:
+                                                <FormattedMessage id="payTotalDeatail"/>:
                                             </FormLabel>
                                         </Grid>
                                         <Grid xs={6} md={5} sx={{ml:5,textAlign: "left" }}>

src/pages/Payment/FPS/FPS.js

@@ -299,7 +299,7 @@ const Index = () => {
                                     <Typography variant="h3" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "center" }}>
                                         <img src={FpsIcon} width="80" height="80" alt="FPS"></img>
                                         <br />
-                                        <FormattedMessage id="payTotal"/>
+                                        <FormattedMessage id="payTotalDeatail"/>
                                         <br />
                                         {"HK$ " + currencyFormat(paymentData.amount)}
                                     </Typography>

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);
             }
         },
         {

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) : "";

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",

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":"付款功能現在不可用",

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":"付款功能現在不可用",