diff --git a/src/pages/Payment/Details_GLD/DataGrid.js b/src/pages/Payment/Details_GLD/DataGrid.js index 92aab12..3e6e0d9 100644 --- a/src/pages/Payment/Details_GLD/DataGrid.js +++ b/src/pages/Payment/Details_GLD/DataGrid.js @@ -4,6 +4,7 @@ import { } from '@mui/material'; import { isORGLoggedIn, + formatPaymentParticularsLength, } from "utils/Utils"; import * as React from 'react'; import * as FormatUtils from "utils/FormatUtils" @@ -48,7 +49,7 @@ export default function SearchPublicNoticeTable({ recordList }) { {isORGLoggedIn()&¶ms.row.careOf!=null&¶ms.row.careOf!=""?<>{params.row.careOf}
:null} App No: {appNo}
Issue Date: {DateUtils.dateValue(params.row.issueDate)}
- Length: {params.row.length+ " cm"} + Length: {formatPaymentParticularsLength(params.row)} }, }, { diff --git a/src/pages/Payment/Details_Public/DataGrid.js b/src/pages/Payment/Details_Public/DataGrid.js index f75d5ec..d2c178d 100644 --- a/src/pages/Payment/Details_Public/DataGrid.js +++ b/src/pages/Payment/Details_Public/DataGrid.js @@ -4,6 +4,7 @@ import { } from '@mui/material'; import { isORGLoggedIn, + formatPaymentParticularsLength, } from "utils/Utils"; import * as React from 'react'; import * as FormatUtils from "utils/FormatUtils" @@ -75,7 +76,7 @@ export default function SearchPublicNoticeTable({ recordList }) { {isORGLoggedIn()&¶ms.row.careOf!=null&¶ms.row.careOf!=""?<>{params.row.careOf}
:null} : {appNo}
: {locale === 'en' ? DateUtils.dateValue(params.row.issueDate) : DateUtils.dateStr_Cht(params.row.issueDate)}
- : {params.row.length+ " cm"} + : {formatPaymentParticularsLength(params.row, intl)} }, }, { diff --git a/src/pages/Proof/Reply_GLD/ApplicationDetails.js b/src/pages/Proof/Reply_GLD/ApplicationDetails.js index 04325b1..dbc53bf 100644 --- a/src/pages/Proof/Reply_GLD/ApplicationDetails.js +++ b/src/pages/Proof/Reply_GLD/ApplicationDetails.js @@ -350,7 +350,7 @@ const ApplicationDetailCard = ({ { formik.values.groupType == "Private Bill" ? - ( {data.noOfPages} page x $6,552 ) + ( {data.noOfPages} {data.noOfPages === 1 ? 'page' : 'pages'} x $6,552 ) : ( {data.length} cm x {data.colCount == 2 ? "$364 Double Column" : "$182 Single Column"} ) } diff --git a/src/pages/Proof/Reply_Public/ApplicationDetails.js b/src/pages/Proof/Reply_Public/ApplicationDetails.js index 7c798e8..41e964d 100644 --- a/src/pages/Proof/Reply_Public/ApplicationDetails.js +++ b/src/pages/Proof/Reply_Public/ApplicationDetails.js @@ -311,7 +311,7 @@ const ApplicationDetailCard = ({ formData, }) => { formik.values.groupType === "Private Bill" ? - ( {data.noOfPages} {intl.formatMessage({ id: 'page' })} x $6,552 ) + ( {data.noOfPages} {intl.formatMessage({ id: data.noOfPages === 1 ? 'page' : 'pages' })} x $6,552 ) : diff --git a/src/translations/en.json b/src/translations/en.json index 561a242..39de9ad 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -519,6 +519,7 @@ "before": "Before", "page": "Page", + "pages": "pages", "proofReplyDate": "Proof Reply Date", "proofReply": "Proof Reply", "proofErrorFree": "Pass for printing (without correction)", diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json index 8d719e5..440a701 100644 --- a/src/translations/zh-CN.json +++ b/src/translations/zh-CN.json @@ -515,6 +515,7 @@ "paymentDeadline": "网上确定付印最后限期", "before": "前", "page": "页", + "pages": "页", "proofReplyDate": "校对回复日期", "proofReply": "校对回复", "proofErrorFree": "可以付印(稿件正确)", diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json index c210abe..b7c39b3 100644 --- a/src/translations/zh-HK.json +++ b/src/translations/zh-HK.json @@ -516,6 +516,7 @@ "paymentDeadline": "網上確定付印最後限期", "before": "前", "page": "頁", + "pages": "頁", "proofReplyDate": "校對回覆日期", "proofReply": "校對回覆", "proofErrorFree": "可以付印(稿件正確)", diff --git a/src/utils/Utils.js b/src/utils/Utils.js index f70443e..467c148 100644 --- a/src/utils/Utils.js +++ b/src/utils/Utils.js @@ -165,6 +165,21 @@ export const gazetteLength = (length,noOfPages) => { return countLength+" cm" } +export const formatPaymentParticularsLength = (row, intl) => { + if (row.groupTitle === 'Private Bill') { + const pages = row.noOfPages ?? 1; + if (intl) { + if (intl.locale === 'en') { + return pages === 1 ? '1 page' : `${pages} pages`; + } + const pageLabel = intl.formatMessage({ id: 'pages' }); + return `${pages} ${pageLabel}`; + } + return pages === 1 ? '1 page' : `${pages} pages`; + } + return `${row.length ?? 0} cm`; +} + export const getUserId = () =>{ if (localStorage.getItem('userData') != null){ return JSON.parse(localStorage.getItem('userData')).id