Merge branch 'CR013B2' of http://svn.2fi-solutions.com:8300/alex/PNSPS-frontend-MaterialUI into CR013B2

src/pages/GFMIS/DataGrid.js

@@ -4,6 +4,7 @@ import * as FormatUtils from "utils/FormatUtils"
 import {GFIMIS_LIST} from "utils/ApiPathConst";
 import { useNavigate } from "react-router-dom";
 import { FiDataGrid } from "components/FiDataGrid";
+
 // ==============================|| EVENT TABLE ||============================== //
 
 export default function SearchTable({ previewSearchCriteria, onPreviewGridOnReady,selectedIds = []}) {
@@ -39,7 +40,7 @@ export default function SearchTable({ previewSearchCriteria, onPreviewGridOnRead
         {
             id: 'paymentMethod',
             field: 'paymentMethod',
-            headerName: 'Payment Means',
+            headerName: 'GFMIS Payment Method',
             flex: 4,
             renderCell: (params) => {
                 let paymentMethod = params.row.paymentMethod;

src/pages/GFMIS/TransactionDataGrid.js

@@ -7,6 +7,8 @@ import * as FormatUtils from "utils/FormatUtils"
 // import { useNavigate } from "react-router-dom";
 import { FiDataGrid } from "components/FiDataGrid";
 import { clickableLink } from 'utils/CommonFunction';
+import { getPaymentMethodByCode} from "auth/utils";
+
 import {
     // Checkbox,
     // Dialog, DialogTitle, DialogContent, DialogActions,
@@ -78,7 +80,7 @@ export default function SearchPaymentTable({ searchCriteria, applyGridOnReady, a
             flex: 1,
             width: 150,
             renderCell: (params) => {
-                return params?.value
+                return getPaymentMethodByCode(params?.value);
             }
         },
         {

src/pages/GFMIS/index.js

@@ -259,7 +259,6 @@ const Index = () => {
                                     format="DD/MM/YYYY"
                                     // label="Credit Date"
                                     value={inputDate === null ? null : dayjs(inputDate)}
-                                    maxDate={searchCriteria.dateTo === null ? null : dayjs(searchCriteria.dateTo)}
                                     minDate={searchCriteria.dateFrom === null ? null : dayjs(searchCriteria.dateFrom)}
                                     onChange={(newValue) => {
                                         // console.log(newValue)

src/pages/Report/FullList/FullListForm.js

@@ -213,7 +213,7 @@ const FullListForm = ({ searchCriteria, issueComboData}) => {
                                 }}
                                 disabled={waitDownload}
                             >
-                                Export Full List
+                                Export
                             </Button>
                         </Grid>
                         <Grid item sx={{ ml: 3 }}>

src/pages/Report/Summary/SummaryForm.js

@@ -231,7 +231,7 @@ const SummaryForm = ({ searchCriteria, issueComboData}) => {
                                 type="submit"
                                 disabled={waitDownload}
                             >
-                                Export Summary List
+                                Export
                             </Button>
                         </Grid>
                         <Grid item sx={{ ml: 3 }}>

src/translations/en.json

@@ -12,7 +12,7 @@
   "PNSPS": "PNSPS",
   "PNSPS_fullname": "Public Notice Submission and Payment System",
   "HKSARGOV": "The Government of the Hong Kong Special Administrative Region",
-  "homePageHeaderMessage": "<p>The <a target='_brank' href='https://pnsps.gld.gov.hk/'>Gazette Public Notice Submission and Payment System (PNSPS)</a> has been smoothly rolled out in August 2024 and will be fully implemented on 28 January 2026.  Starting from 28 January 2026, applications for publication of public notice in the Government Gazette and payment of gazette fee must be made online via the PNSPS.  FPS (轉數快), PPS (繳費靈) and credit card are available in the PNSPS for payment of gazette fee.  We would like to invite all applicants for publishing public notices in the Gazette to get well prepared for the change early, <a target='_brank' href='https://pnsps.gld.gov.hk/register'>register as PNSPS user</a> now and submit online applications to experience the benefits of the new online platform.</p><p>If you have any enquiries on the set-up of the above online payment methods, please contact your bank (for FPS and credit card) or the PPS (PPS hotline: 2311 9876).</p>",
+  "homePageHeaderMessage": "<p>The <a target='_brank' href='https://pnsps.gld.gov.hk/'>Gazette Public Notice Submission and Payment System (PNSPS)</a> has been rolled out in August 2024 and fully implemented on 28 January 2026. Starting from 28 January 2026, applications for publication of public notice in the Government Gazette and payment of gazette fee must be made online via the PNSPS. FPS (轉數快), PPS (繳費靈) and credit card are available in the PNSPS for payment of gazette fee. We would like to invite all applicants for publishing public notices in the Gazette to <a target='_brank' href='https://pnsps.gld.gov.hk/register'>register as PNSPS user</a> early.</p><p>If you have any enquiries on the set-up of the above online payment methods, please contact your bank (for FPS and credit card) or the PPS (PPS hotline: 2311 9876).</p>",
   "HKGLD": "Government Logistics Department",
   "importantNotice": "Important Notice",
   "privacyPolicy": "Privacy Policy",

src/translations/zh-CN.json

@@ -12,7 +12,7 @@
   "PNSPS": "宪报公共启事提交及缴费系统",
   "PNSPS_fullname": "公共启事提交及缴费系统",
   "HKSARGOV": "香港特别行政区政府",
-  "homePageHeaderMessage": "<p>「<a target='_brank' href='https://pnsps.gld.gov.hk/'>宪报公共启事提交及缴费系统</a>」已于2024年8月顺利启用，并将于2026年1月28日全面推行。由<b>2026年1月28日</b>开始，所有申请人必须使用网上「宪报公共启事提交及缴费系统」提交公共启事申请及缴交相关费用，申请人可以选择转数快（FPS）、 缴费灵（PPS）和信用卡缴交费用。现诚邀所有刊登宪报公共启事申请人及早为新安排做好准备，立即<a target='_brank' href='https://pnsps.gld.gov.hk/register'>登记成为系统用户</a>，使用系统提交申请，以体验新平台的便捷。 </p><p>如果你对上述网上付款方式的设定有任何查询，请联络你的银行（转数快及信用卡）或缴费灵（缴费灵热线：2311 9876）。</p>",
+  "homePageHeaderMessage": "<p>「<a target='_brank' href='https://pnsps.gld.gov.hk/'>宪报公共启事提交及缴费系统</a>」已于2024年8月启用，并于2026年1月28日全面推行。由2026年1月28日开始，所有申请人必须使用网上「宪报公共启事提交及缴费系统」提交公共启事申请及缴交相关费用，申请人可以选择转数快（FPS）、缴费灵（PPS）和信用卡缴交费用。现诚邀所有刊登宪报公共启事申请人及早<a target='_brank' href='https://pnsps.gld.gov.hk/register'>登记成为系统用户</a>。 </p><p>如果你对上述网上付款方式的设定有任何查询，请联络你的银行（转数快及信用卡）或缴费灵（缴费灵热线：2311 9876）。</p>",
   "HKGLD": "政府物流服务署",
   "importantNotice": "重要告示",
   "privacyPolicy": "私隐政策",

src/translations/zh-HK.json

@@ -12,7 +12,7 @@
   "PNSPS": "憲報公共啟事提交及繳費系統",
   "PNSPS_fullname": "公共啟事提交及繳費系統",
   "HKSARGOV": "香港特別行政區政府",
-  "homePageHeaderMessage": "<p>「<a target='_brank' href='https://pnsps.gld.gov.hk/'>憲報公共啟事提交及繳費系統</a>」已於2024年8月順利啟用，並將於2026年1月28日全面推行。由<b>2026年1月28日</b>開始，所有申請人必須使用網上「憲報公共啟事提交及繳費系統」提交公共啟事申請及繳交相關費用，申請人可以選擇轉數快（FPS）、 繳費靈（PPS）和信用卡繳交費用。現誠邀所有刊登憲報公共啟事申請人及早為新安排做好準備，立即<a target='_brank' href='https://pnsps.gld.gov.hk/register'>登記成為系統用戶</a>，使用系統提交申請，以體驗新平台的便捷。</p><p>如果你對上述網上付款方式的設定有任何查詢，請聯絡你的銀行（轉數快及信用卡）或繳費靈（繳費靈熱線：2311 9876）。</p>",
+  "homePageHeaderMessage": "<p>「<a target='_brank' href='https://pnsps.gld.gov.hk/'>憲報公共啟事提交及繳費系統</a>」已於2024年8月啟用，並於2026年1月28日全面推行。由2026年1月28日開始，所有申請人必須使用網上「憲報公共啟事提交及繳費系統」提交公共啟事申請及繳交相關費用，申請人可以選擇轉數快（FPS）、繳費靈（PPS）和信用卡繳交費用。現誠邀所有刊登憲報公共啟事申請人及早<a target='_brank' href='https://pnsps.gld.gov.hk/register'>登記成為系統用戶</a>。</p><p>如果你對上述網上付款方式的設定有任何查詢，請聯絡你的銀行（轉數快及信用卡）或繳費靈（繳費靈熱線：2311 9876）。</p>",
   "HKGLD": "政府物流服務署",
   "importantNotice": "重要告示",
   "privacyPolicy": "私隱政策",

src/utils/Utils.js

@@ -246,7 +246,7 @@ export const checkIsOnlyOnlinePaymentApply = (tickAccept) => {
 }
 
 export const checkMarkAsCreditClient = () => {
-    const targetDate = new Date(2025, 9, 17, 8, 0, 0) // hardcode
+    const targetDate = new Date(2025, 9, 8, 0, 0, 0) // hardcode
     const checkDate = DateUtils.convertToDate(new Date())
     // console.log(targetDate)
     // console.log(checkDate >= targetDate)