Merge branch 'New_Enhancement' into CR013B1

# Conflicts:
#	src/routes/LoginRoutes.js

src/layout/MainLayout/Header/index.js

@@ -532,13 +532,13 @@ function Header(props) {
           </Typography>
         </Link>
       </li>
-      {/* <li>
+      <li>
         <Link className="login" to={'/userGuidePub'}>
           <Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2 }}>
             <FormattedMessage id="userGuide" />
           </Typography>
         </Link>
-      </li> */}
+      </li>
       <li>
         <Link className="login" to='/login'>
           <Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2 }}>

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)
             }
-
         }
     }, []);
 

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 <div style={{ marginTop: 2, marginBottom: 2 }}>{params.row.payMethod}</div>
-            }
-        },
         {
             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 <Checkbox checked={params.row.bib} onChange={() => {set_paymentMethod("demandNote")}}/>;
-            }
-        },
         {
             field: 'action',
             headerName: 'Status',

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: <UserMenuPage/>
     },
-    // {
-    //   path: 'userGuidePub',
-    //   element: <UserMenuPubPage/>
-    // },
+    {
+      path: 'userGuidePub',
+      element: <UserMenuPubPage/>
+    },
+    {
+      path: 'databaseHealthCheck',
+      element: <DatabaseHealthCheckPage/>
+    },
     {
       path: 'databaseHealthCheck',
       element: <DatabaseHealthCheckPage/>