diff --git a/src/pages/DemandNote/Search/DataGrid.js b/src/pages/DemandNote/Search/DataGrid.js index 078c416..b8fb94a 100644 --- a/src/pages/DemandNote/Search/DataGrid.js +++ b/src/pages/DemandNote/Search/DataGrid.js @@ -369,7 +369,7 @@ export default function SearchDemandNote({ applySearch, searchCriteria }) { variant="contained" onClick={() => setRevokePopUp(true)} > - Revoke as To be Paid + Revoke payment diff --git a/src/pages/Message/Search/DataGrid.js b/src/pages/Message/Search/DataGrid.js index 30892df..6c03fde 100644 --- a/src/pages/Message/Search/DataGrid.js +++ b/src/pages/Message/Search/DataGrid.js @@ -41,7 +41,7 @@ export default function MsgTable({ recordList }) { id: 'sentDate', field: 'sentDate', headerName: intl.formatMessage({id: 'date'}), - width: 160, + width: 170, renderCell: (params) => { return DateUtils.datetimeStr(params.row.sentDate); }, diff --git a/src/pages/Proof/Payment/Pay_DN.js b/src/pages/Proof/Payment/Pay_DN.js index 4010d02..0a70e3b 100644 --- a/src/pages/Proof/Payment/Pay_DN.js +++ b/src/pages/Proof/Payment/Pay_DN.js @@ -44,12 +44,12 @@ const Index = ({ record }) => {
- + - +
{
- + - +
{
- + - +
{ }if (props.getStatus == "paid") { setDialogTitle("Action Confirm"); setPrositiveBtnText("Confirm"); - return getConfirmContent("Do you want to mark as paid."); + return getConfirmContent("Are you sure to mark this application as paid?"); } else { setDialogTitle("Action Confirm"); setPrositiveBtnText("Confirm"); diff --git a/src/pages/dashboard/Public/index.js b/src/pages/dashboard/Public/index.js index ec33f38..2d9a292 100644 --- a/src/pages/dashboard/Public/index.js +++ b/src/pages/dashboard/Public/index.js @@ -87,7 +87,7 @@ const DashboardDefault = () => { list.push( @@ -205,7 +205,7 @@ const DashboardDefault = () => { - + diff --git a/src/translations/en.json b/src/translations/en.json index 7d37f30..77d5bf4 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -428,7 +428,7 @@ "paymentDeadline": "Deadline for online confirm proof", "confirmingDealine": "Deadline for Confirming Proof", "PaymentCoonpletDealine": "Deadline for Payment Completion", - "payOnline":"GPNSPS", + "payOnline":"Online Payment", "payDn":"Pay by issuance of General Demand Note", "payNPGO":"Pay at NPGO Collection Office", "paymentMeans":"Payment Means", diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json index 4b13139..0d83de3 100644 --- a/src/translations/zh-CN.json +++ b/src/translations/zh-CN.json @@ -41,7 +41,7 @@ "confirmingDealine": "确认校对的截止日期", "PaymentCoonpletDealine": "付款截止日期", - "payOnline":"透过此系统 GPNSPS 网上支付", + "payOnline":"透过此系统网上支付", "payDn":"透过发出一般缴款单付款", "payNPGO":"在 NPGO 收款办公室付款", "paymentMeans":"付款方式", diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json index c9e31b2..b32537a 100644 --- a/src/translations/zh-HK.json +++ b/src/translations/zh-HK.json @@ -41,7 +41,7 @@ "confirmingDealine": "確認校對的截止日期", "PaymentCoonpletDealine": "付款截止日期", - "payOnline":"透過此系統 GPNSPS 網上支付", + "payOnline":"透過此系統網上支付", "payDn":"透過發出一般繳款單付款", "payNPGO":"在 NPGO 收款辦公室付款", "paymentMeans":"付款方式",