From cdb9062c90e26cce76214d1547335406bde9f018 Mon Sep 17 00:00:00 2001
From: Jason Chuang <jchuang@2fi-solutions.com.hk>
Date: Fri, 12 Jun 2026 22:11:57 +0800
Subject: [PATCH] CR-022 Item 2

---
 src/pages/Payment/Search_Public/DataGrid.js | 19 +++++++++++++++++++
 src/translations/en.json                    |  2 +-
 src/translations/zh-CN.json                 |  2 +-
 src/translations/zh-HK.json                 |  2 +-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/pages/Payment/Search_Public/DataGrid.js b/src/pages/Payment/Search_Public/DataGrid.js
index 1e16572..e912e0d 100644
--- a/src/pages/Payment/Search_Public/DataGrid.js
+++ b/src/pages/Payment/Search_Public/DataGrid.js
@@ -47,6 +47,12 @@ export default function SearchPublicNoticeTable({ searchCriteria, applyGridOnRea
         navigate('/paymentPage/details/' + params.row.id);
     };
 
+    const formatPayMethod = (value) => {
+        if (!value) return "";
+        const lastCommaIndex = value.lastIndexOf(',');
+        return lastCommaIndex >= 0 ? value.substring(lastCommaIndex + 1) : value;
+    };
+
     const columns = [
         {
             field: 'actions',
@@ -58,6 +64,12 @@ export default function SearchPublicNoticeTable({ searchCriteria, applyGridOnRea
                 return clickableLink('/paymentPage/details/' + params.row.id, params.row.transNo);
             },
         },
+        {
+            field: 'egisRefNo',
+            headerName: intl.formatMessage({id: 'paymentRefCode'}),
+            width: isMdOrLg ? 'auto' : 160,
+            flex: isMdOrLg ? 1 : undefined,
+        },
         {
             id: 'appNos',
             field: 'appNos',
@@ -69,6 +81,13 @@ export default function SearchPublicNoticeTable({ searchCriteria, applyGridOnRea
                 return <div style={{ margin: 4 }}>{appNo}</div>
             },
         },
+        {
+            field: 'payMethod',
+            headerName: intl.formatMessage({id: 'paymentMethod'}),
+            width: isMdOrLg ? 'auto' : 160,
+            flex: isMdOrLg ? 1 : undefined,
+            valueGetter: (params) => formatPayMethod(params?.value ?? params.row?.payMethod),
+        },
         {
             id: 'transDateTime',
             field: 'transDateTime',
diff --git a/src/translations/en.json b/src/translations/en.json
index 01c5420..2acb995 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -421,7 +421,7 @@
   "payTotal": "Total Payment Amount",
   "payDetail": "Payment Details",
   "payMethod": "Payment methods",
-  "epayMethod": " e-Payment Method",
+  "epayMethod": " Payment Method",
   "selectPaymentMethod": "Please select a payment method",
   "payReceipt": "Payment Receipt",
   "contactPerson": "Contact Person",
diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json
index 45316d1..cf8135e 100644
--- a/src/translations/zh-CN.json
+++ b/src/translations/zh-CN.json
@@ -454,7 +454,7 @@
   "payTotal": "付款总额",
   "payDetail": "付款详情",
   "payMethod": "付款方式",
-  "epayMethod": "电子付款方法",
+  "epayMethod": "付款方法",
   "selectPaymentMethod": "请选择付款方法",
   "payReceipt": "付款收据",
   "contactPerson": "联络人",
diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json
index 339603b..6425bef 100644
--- a/src/translations/zh-HK.json
+++ b/src/translations/zh-HK.json
@@ -455,7 +455,7 @@
   "payTotal": "付款總額",
   "payDetail": "付款詳情",
   "payMethod": "付款方式",
-  "epayMethod": "電子付款方法",
+  "epayMethod": "付款方法",
   "selectPaymentMethod": "請選擇付款方法",
   "payReceipt": "付款收據",
   "contactPerson": "聯絡人",