update label

src/pages/DemandNote/Search_Public/DataGrid.js

@@ -52,7 +52,7 @@ export default function SearchDemandNote({ searchCriteria }) {
         {
             id: 'issueDate',
             field: 'issueDate',
-            headerName: intl.formatMessage({id: 'receiptDate'}),
+            headerName: intl.formatMessage({id: 'sendDate'}),
             width: isMdOrLg ? 'auto' : 175,
             flex: isMdOrLg ? 1 : undefined,
             valueGetter: (params) => {
@@ -70,7 +70,7 @@ export default function SearchDemandNote({ searchCriteria }) {
         },
         {
             field: 'sentDate',
-            headerName: intl.formatMessage({id: 'sendDate'}),
+            headerName: intl.formatMessage({id: 'sendDateTime'}),
             width: isMdOrLg ? 'auto' : 200,
             flex: isMdOrLg ? 1 : undefined,
             valueGetter: (params) => {

src/translations/en.json

@@ -483,8 +483,8 @@
 
   "paymentInfoRecord": "Payment Notice Record",
   "paymentRecordId": "Payment Record No.",
-  "receiptDate": "Issuance Date",
   "sendDate": "Send Date",
+  "sendDateTime": "Send Date",
   "sendDateFrom": "Send Date (From)",
   "sendDateTo": "Send Date (To)",
   "files": "File(s)",

src/translations/zh-CN.json

@@ -380,7 +380,7 @@
   "viewDetail": "查看详细",
   "price": "金额 ($)",
   "pay": "付款",
-  "toBePaid": "待支付",
+  "toBePaid": "待付款",
   "paid": "已付款",
   "payDate": "付款日期",
   "payDateFrom": "付款日期 (从)",
@@ -473,10 +473,10 @@
 
   "paymentInfoRecord": "缴款通知记录",
   "paymentRecordId": "缴款单号",
-  "receiptDate": "签发日期",
-  "sendDate": "发送日期",
-  "sendDateFrom": "发送日期 (从)",
-  "sendDateTo": "发送日期 (到)",
+  "sendDate": "发出日期",
+  "sendDateTime": "发出时间",
+  "sendDateFrom": "发出日期 (从)",
+  "sendDateTo": "发出日期 (到)",
   "files": "档案",
   "loginName": "登录名称",
   "lastLoginDate": "最后登入日期",

src/translations/zh-HK.json

@@ -112,7 +112,7 @@
   "MSG.actionFail": "行動失敗",
   "MSG.paymentHolded": "申請編號 {appNo} 已正在付款的流程中，如相關付款沒有成功，請於30分鐘後再嘗試付款，不便之處，請見諒！",
   "MSG.pay_credity1": "我們已收到你已確定申請編號: {appNo} 的稿件校對確定及可付印的指示，並將安排刊登於憲報 期數 {year} 年 {issueVolume} 卷 第 {issueNo} 期內。",
-  "MSG.pay_credity2": "此公共啟事申請的費用將於下期發出的繳費發票時收取，請依時繳費。",
+  "MSG.pay_credity2": "此公共啟事申請的費用將於憲報刊登後第十四個曆日，發出「一般繳款單」通知繳款。請按照繳款單上的指示，依時繳費。",
   "MSG.plzonlinePayment": "只能選擇付款方式是網上支付的申請。",
 
   "registerTitle1": "立即成為",
@@ -385,8 +385,8 @@
   "viewDetail": "查看詳細",
   "price": "金額 ($)",
   "pay": "付款",
-  "toBePaid": "待支付",
-  "paid": "已付費",
+  "toBePaid": "待付款",
+  "paid": "已付款",
   "payDate": "付款日期",
   "payDateFrom": "付款日期 (從)",
   "payDateTo": "付款日期 (到)",
@@ -478,10 +478,10 @@
 
   "paymentInfoRecord": "繳款通知記錄",
   "paymentRecordId": "繳款單號",
-  "receiptDate": "簽發日期",
-  "sendDate": "發送日期",
-  "sendDateFrom": "發送日期 (從)",
-  "sendDateTo": "發送日期 (到)",
+  "sendDate": "發出日期",
+  "sendDateTime": "發出時間",
+  "sendDateFrom": "發出日期 (從)",
+  "sendDateTo": "發出日期 (到)",
   "files": "檔案",
   "loginName": "登錄名稱",
   "lastLoginDate": "最後登入日期",

src/utils/ComboData.js

@@ -122,14 +122,14 @@ export const paymentStatus = [
 export const denmandNoteStatus = [
     { key: 0, labelCht: '全部', label: 'All',  type: 'all' }, 
     { key: 1, labelCht: '待辦', label:'Pending',  type: 'pending' },
-    { key: 2, labelCht: '待支付', label:'To be Paid', type: 'to be paid' }, 
-    { key: 3, labelCht: '已付費', label:'Paid', type: 'paid' }, 
+    { key: 2, labelCht: '待付款', label:'To be Paid', type: 'to be paid' }, 
+    { key: 3, labelCht: '已付款', label:'Paid', type: 'paid' }, 
 ];
 
 export const denmandNoteStatus_Public = [
     { key: 0, i18nLabel: 'all', labelCht: '全部', label: 'All',  type: 'all' }, 
-    { key: 2, i18nLabel: 'toBePaid', labelCht: '待支付', label:'To be Paid', type: 'to be paid' }, 
-    { key: 3, i18nLabel: 'paid', labelCht: '已付費', label:'Paid', type: 'paid' }, 
+    { key: 2, i18nLabel: 'toBePaid', labelCht: '待付款', label:'To be Paid', type: 'to be paid' }, 
+    { key: 3, i18nLabel: 'paid', labelCht: '已付款', label:'Paid', type: 'paid' }, 
 
 ];
 

src/utils/statusUtils/DnStatus.js

@@ -1,8 +1,8 @@
 import {getStatusTag} from "utils/statusUtils/Base";
 
 const pending = {color:"#f5a83d", eng:"Pending", cht:"待辦"}
-const toBePaid = {color:"#f5a83d", eng:"To be Paid", cht:"待支付"}
-const paid = {color:"#22a13f", eng:"Paid", cht:"已付費"}
+const toBePaid = {color:"#f5a83d", eng:"To be Paid", cht:"待付款"}
+const paid = {color:"#22a13f", eng:"Paid", cht:"已付款"}
 
 export function getStatus_Cht(params) {
     let status = getStatus(params);