| @@ -278,7 +278,9 @@ const ApplicationDetailCard = ({ formData, }) => { | |||||
| ? | ? | ||||
| <Typography variant="pnspsFormParagraph">( {data.noOfPages} {intl.formatMessage({id: 'page'})} x $6,552 )</Typography> | <Typography variant="pnspsFormParagraph">( {data.noOfPages} {intl.formatMessage({id: 'page'})} x $6,552 )</Typography> | ||||
| : | : | ||||
| <Typography variant="pnspsFormParagraph">( {data.length} cm x {data.colCount === 2 ? "$364 二格位" : "$182 一格位"} )</Typography> | |||||
| <Typography variant="pnspsFormParagraph">( {data.length} cm x {data.colCount === 2 ? | |||||
| "$364 "+intl.formatMessage({id: 'doubleCol'}) : | |||||
| "$182 "+intl.formatMessage({id: 'singleCol'})} )</Typography> | |||||
| } | } | ||||
| </Grid> | </Grid> | ||||
| </Grid> | </Grid> | ||||
| @@ -19,6 +19,8 @@ export default function SubmittedTab({ rows }) { | |||||
| const theme = useTheme(); | const theme = useTheme(); | ||||
| const isMdOrLg = useMediaQuery(theme.breakpoints.up('md')); | const isMdOrLg = useMediaQuery(theme.breakpoints.up('md')); | ||||
| const intl = useIntl(); | const intl = useIntl(); | ||||
| const { locale } = intl; | |||||
| const handleEditClick = (params) => () => { | const handleEditClick = (params) => () => { | ||||
| navigate('/paymentPage/details/' + params.row.id); | navigate('/paymentPage/details/' + params.row.id); | ||||
| @@ -52,7 +54,7 @@ export default function SubmittedTab({ rows }) { | |||||
| width: isMdOrLg ? 'auto' : 160, | width: isMdOrLg ? 'auto' : 160, | ||||
| flex: isMdOrLg ? 1 : undefined, | flex: isMdOrLg ? 1 : undefined, | ||||
| renderCell: (params) => { | renderCell: (params) => { | ||||
| return PaymentStatus.getStatus_Cht(params); | |||||
| return locale === 'en' ? PaymentStatus.getStatus_Eng(params):PaymentStatus.getStatus_Cht(params); | |||||
| } | } | ||||
| }, | }, | ||||
| { | { | ||||
| @@ -396,6 +396,8 @@ | |||||
| "upload": "Upload", | "upload": "Upload", | ||||
| "actionFail": "Action failed: Please check the content and submit the reply again", | "actionFail": "Action failed: Please check the content and submit the reply again", | ||||
| "issueInvalidMsg": "Action failed: The Gazette Issue invalid, please apply again", | "issueInvalidMsg": "Action failed: The Gazette Issue invalid, please apply again", | ||||
| "singleCol":"Single Column", | |||||
| "doubleCol":"Double Column", | |||||
| "transactionNo": "Transaction number", | "transactionNo": "Transaction number", | ||||
| "transactionDate": "Transaction date", | "transactionDate": "Transaction date", | ||||
| @@ -390,6 +390,8 @@ | |||||
| "upload": "上载", | "upload": "上载", | ||||
| "actionFail": "行动失败: 请检查内容并再次提交回覆", | "actionFail": "行动失败: 请检查内容并再次提交回覆", | ||||
| "issueInvalidMsg": "行动失败: 无效宪报期数,请重新申请", | "issueInvalidMsg": "行动失败: 无效宪报期数,请重新申请", | ||||
| "singleCol":"一格位", | |||||
| "doubleCol":"二格位", | |||||
| "transactionNo": "交易号码", | "transactionNo": "交易号码", | ||||
| "transactionDate": "交易日期", | "transactionDate": "交易日期", | ||||
| @@ -393,6 +393,8 @@ | |||||
| "upload": "上載", | "upload": "上載", | ||||
| "actionFail": "行動失敗: 請檢查內容並再次提交回覆", | "actionFail": "行動失敗: 請檢查內容並再次提交回覆", | ||||
| "issueInvalidMsg": "行動失敗: 無效憲報期數,請重新申請", | "issueInvalidMsg": "行動失敗: 無效憲報期數,請重新申請", | ||||
| "singleCol":"一格位", | |||||
| "doubleCol":"二格位", | |||||
| "transactionNo": "交易號碼", | "transactionNo": "交易號碼", | ||||
| "transactionDate": "交易日期", | "transactionDate": "交易日期", | ||||