@@ -532,13 +532,13 @@ function Header(props) { | |||||
</Typography> | </Typography> | ||||
</Link> | </Link> | ||||
</li> | </li> | ||||
<li> | |||||
{/* <li> | |||||
<Link className="login" to={'/userGuidePub'}> | <Link className="login" to={'/userGuidePub'}> | ||||
<Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2 }}> | <Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2 }}> | ||||
<FormattedMessage id="userGuide" /> | <FormattedMessage id="userGuide" /> | ||||
</Typography> | </Typography> | ||||
</Link> | </Link> | ||||
</li> | |||||
</li> */} | |||||
<li> | <li> | ||||
<Link className="login" to='/login'> | <Link className="login" to='/login'> | ||||
<Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2 }}> | <Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2 }}> | ||||
@@ -7,6 +7,10 @@ import * as PaymentStatus from "utils/statusUtils/PaymentStatus" | |||||
import { useNavigate } from "react-router-dom"; | import { useNavigate } from "react-router-dom"; | ||||
import { FiDataGrid } from "components/FiDataGrid"; | import { FiDataGrid } from "components/FiDataGrid"; | ||||
import { clickableLink } from 'utils/CommonFunction'; | import { clickableLink } from 'utils/CommonFunction'; | ||||
import { | |||||
Checkbox | |||||
// MenuItem | |||||
} from '@mui/material'; | |||||
// ==============================|| EVENT TABLE ||============================== // | // ==============================|| EVENT TABLE ||============================== // | ||||
export default function SearchPaymentTable({ searchCriteria, applyGridOnReady, applySearch}) { | 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); | 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', | id: 'transDateTime', | ||||
field: 'transDateTime', | field: 'transDateTime', | ||||
@@ -69,6 +83,14 @@ export default function SearchPaymentTable({ searchCriteria, applyGridOnReady, a | |||||
return DateUtils.dateStr(params?.value); | 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', | field: 'action', | ||||
headerName: 'Status', | headerName: 'Status', | ||||
@@ -16,7 +16,7 @@ const PrivacyPolicyPage = Loadable(lazy(() => import('pages/extra-pages/PrivacyP | |||||
const ImportantNoticePage = Loadable(lazy(() => import('pages/extra-pages/ImportantNoticePage'))); | const ImportantNoticePage = Loadable(lazy(() => import('pages/extra-pages/ImportantNoticePage'))); | ||||
const AboutUsPage = Loadable(lazy(() => import('pages/extra-pages/AboutUs'))); | const AboutUsPage = Loadable(lazy(() => import('pages/extra-pages/AboutUs'))); | ||||
const UserMenuPage = Loadable(lazy(() => import('pages/extra-pages/UserMenu'))); | 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'))); | const DatabaseHealthCheckPage = Loadable(lazy(() => import('pages/extra-pages/DatabaseHealthCheck'))); | ||||
@@ -88,10 +88,10 @@ const LoginRoutes = { | |||||
path: 'userGuide', | path: 'userGuide', | ||||
element: <UserMenuPage/> | element: <UserMenuPage/> | ||||
}, | }, | ||||
{ | |||||
path: 'userGuidePub', | |||||
element: <UserMenuPubPage/> | |||||
}, | |||||
// { | |||||
// path: 'userGuidePub', | |||||
// element: <UserMenuPubPage/> | |||||
// }, | |||||
{ | { | ||||
path: 'databaseHealthCheck', | path: 'databaseHealthCheck', | ||||
element: <DatabaseHealthCheckPage/> | element: <DatabaseHealthCheckPage/> | ||||