diff --git a/src/layout/MainLayout/Header/index.js b/src/layout/MainLayout/Header/index.js index 2ee52f6..b5370a7 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/FPS/FPS.js b/src/pages/Payment/FPS/FPS.js index ed8b6d0..5b89877 100644 --- a/src/pages/Payment/FPS/FPS.js +++ b/src/pages/Payment/FPS/FPS.js @@ -81,20 +81,14 @@ const Index = () => { setLocationData(location.state) setBrowserType(desktopBrowser) - if (localStorage.getItem('userData') != null){ - const userId = JSON.parse(localStorage.getItem('userData')).id - if (userId === 13){ - if (/Android|webOS|iPhone|iPad|iPod|Opera Mini/i.test(navigator.userAgent)) { - // console.log('Mobile web browser'); - setBrowserType(mobileBrowser) - // setFpsqrcodeurl(openPASGUrl) - } else { - // console.log('Desktop web browser'); - setBrowserType(desktopBrowser) - } - } + if (/Android|webOS|iPhone|iPad|iPod|Opera Mini/i.test(navigator.userAgent)) { + // console.log('Mobile web browser'); + setBrowserType(mobileBrowser) + // setFpsqrcodeurl(openPASGUrl) + } else { + // console.log('Desktop web browser'); + setBrowserType(desktopBrowser) } - } }, []); diff --git a/src/pages/Payment/Search_GLD/DataGrid.js b/src/pages/Payment/Search_GLD/DataGrid.js index 714243e..913becd 100644 --- a/src/pages/Payment/Search_GLD/DataGrid.js +++ b/src/pages/Payment/Search_GLD/DataGrid.js @@ -7,10 +7,6 @@ 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}) { @@ -63,16 +59,6 @@ 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', @@ -83,14 +69,6 @@ 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 8c215ab..d095f35 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,14 @@ const LoginRoutes = { path: 'userGuide', element: }, - // { - // path: 'userGuidePub', - // element: - // }, + { + path: 'userGuidePub', + element: + }, + { + path: 'databaseHealthCheck', + element: + }, { path: 'databaseHealthCheck', element: