diff --git a/src/layout/MainLayout/Header/index.js b/src/layout/MainLayout/Header/index.js index b5370a7..2ee52f6 100644 --- a/src/layout/MainLayout/Header/index.js +++ b/src/layout/MainLayout/Header/index.js @@ -532,13 +532,13 @@ function Header(props) { -
  • + {/*
  • -
  • + */}
  • diff --git a/src/pages/Payment/Search_GLD/DataGrid.js b/src/pages/Payment/Search_GLD/DataGrid.js index 913becd..714243e 100644 --- a/src/pages/Payment/Search_GLD/DataGrid.js +++ b/src/pages/Payment/Search_GLD/DataGrid.js @@ -7,6 +7,10 @@ import * as PaymentStatus from "utils/statusUtils/PaymentStatus" import { useNavigate } from "react-router-dom"; import { FiDataGrid } from "components/FiDataGrid"; import { clickableLink } from 'utils/CommonFunction'; +import { + Checkbox + // MenuItem +} from '@mui/material'; // ==============================|| EVENT TABLE ||============================== // export default function SearchPaymentTable({ searchCriteria, applyGridOnReady, applySearch}) { @@ -59,6 +63,16 @@ export default function SearchPaymentTable({ searchCriteria, applyGridOnReady, a return clickableLink('/paymentPage/details/' + params.row.id, params.row.transNo); }, }, + { + id: 'payMethod', + field: 'payMethod', + headerName: 'Payment means', + flex: 1, + minWidth: 150, + renderCell: (params) => { + return
    {params.row.payMethod}
    + } + }, { id: 'transDateTime', field: 'transDateTime', @@ -69,6 +83,14 @@ export default function SearchPaymentTable({ searchCriteria, applyGridOnReady, a return DateUtils.dateStr(params?.value); } }, + { + field: 'bib', + headerName: 'BIB', + width: 150, + renderCell: (params) => { + return {set_paymentMethod("demandNote")}}/>; + } + }, { field: 'action', headerName: 'Status', diff --git a/src/routes/LoginRoutes.js b/src/routes/LoginRoutes.js index 790a421..8c215ab 100644 --- a/src/routes/LoginRoutes.js +++ b/src/routes/LoginRoutes.js @@ -16,7 +16,7 @@ const PrivacyPolicyPage = Loadable(lazy(() => import('pages/extra-pages/PrivacyP const ImportantNoticePage = Loadable(lazy(() => import('pages/extra-pages/ImportantNoticePage'))); const AboutUsPage = Loadable(lazy(() => import('pages/extra-pages/AboutUs'))); const UserMenuPage = Loadable(lazy(() => import('pages/extra-pages/UserMenu'))); -const UserMenuPubPage = Loadable(lazy(() => import('pages/extra-pages/UserMenuPub'))); +// const UserMenuPubPage = Loadable(lazy(() => import('pages/extra-pages/UserMenuPub'))); const DatabaseHealthCheckPage = Loadable(lazy(() => import('pages/extra-pages/DatabaseHealthCheck'))); @@ -88,10 +88,10 @@ const LoginRoutes = { path: 'userGuide', element: }, - { - path: 'userGuidePub', - element: - }, + // { + // path: 'userGuidePub', + // element: + // }, { path: 'databaseHealthCheck', element: