alex
/
PNSPS-frontend-MaterialUI
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Merge branch 'CR013B1' into CR013B2 

# Conflicts:
#	src/pages/Payment/Search_GLD/DataGrid.js
#	src/pages/Payment/Search_GLD/SearchForm.js
#	src/routes/LoginRoutes.js
CR013B2
Alex Cheung 1 day ago
parent
9e03c0472e 612ea34da6
commit
2fb6afbe14
25 changed files with 192 additions and 132 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3
    -0
      src/components/FiDataGrid.js
  2. +45
    -6
      src/layout/MainLayout/Header/index.js
  3. +2
    -0
      src/pages/Announcement/Search/SearchForm.js
  4. +2
    -0
      src/pages/Announcement/Search_Public/SearchForm.js
  5. +2
    -0
      src/pages/AuditLog/AuditLogSearchForm.js
  6. +2
    -0
      src/pages/DemandNote/Create/SearchForm.js
  7. +2
    -0
      src/pages/DemandNote/Export/SearchForm.js
  8. +2
    -0
      src/pages/DemandNote/Search/SearchForm.js
  9. +2
    -0
      src/pages/Message/Search/SearchForm.js
  10. +7
    -13
      src/pages/Payment/FPS/FPS.js
  11. +0
    -10
      src/pages/Payment/Search_GLD/DataGrid.js
  12. +3
    -0
      src/pages/Payment/Search_GLD/SearchForm.js
  13. +2
    -0
      src/pages/Payment/Search_Public/SearchForm.js
  14. +96
    -103
      src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
  15. +2
    -0
      src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js
  16. +3
    -0
      src/pages/PublicNotice/Search_GLD/SearchForm.js
  17. +2
    -0
      src/pages/PublicNotice/Search_Mark_As_Paid_GLD/SearchForm.js
  18. +2
    -0
      src/pages/User/SearchPage/UserSearchForm.js
  19. +1
    -0
      src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js
  20. +3
    -0
      src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js
  21. +1
    -0
      src/pages/authentication/auth-forms/AuthLogin.js
  22. +1
    -0
      src/pages/authentication/auth-forms/AuthLoginCustom.js
  23. +1
    -0
      src/pages/iAmSmart/AuthCallback/index.js
  24. +1
    -0
      src/pages/iAmSmart/DirectLoginCallback/index.js
  25. +5
    -0
      src/utils/Utils.js

+ 3
- 0
src/components/FiDataGrid.js View File

@@ -57,12 +57,15 @@ export function FiDataGrid({ rows, columns, sx, autoHeight,
if(applySearch!=undefined){ if(applySearch!=undefined){
if (Object.keys(getSearchCriteria(window.location.pathname)).length>0){ if (Object.keys(getSearchCriteria(window.location.pathname)).length>0){
const localStorageSearchCriteria = getSearchCriteria(window.location.pathname) const localStorageSearchCriteria = getSearchCriteria(window.location.pathname)
console.log(localStorageSearchCriteria)
if(localStorageSearchCriteria.start!=undefined){ if(localStorageSearchCriteria.start!=undefined){
console.log(localStorageSearchCriteria)
setPage(localStorageSearchCriteria.start/pageSize); setPage(localStorageSearchCriteria.start/pageSize);
} }
} }
}else{ }else{
setPage(0); setPage(0);
setPageSize(parseInt(event.target.value, 10));
} }
set_doLoad(doLoad); set_doLoad(doLoad);
setLoading(true) setLoading(true)


+ 45
- 6
src/layout/MainLayout/Header/index.js View File

@@ -50,6 +50,7 @@ import {
isINDLoggedIn, isINDLoggedIn,
isPasswordExpiry, isPasswordExpiry,
haveOrgPaymentRecord, haveOrgPaymentRecord,
haveOrgDnRecord,
isORGLoggedIn, isORGLoggedIn,
checkSysEnv checkSysEnv
// getUserId // getUserId
@@ -401,17 +402,55 @@ function Header(props) {
: :
isORGLoggedIn() ? isORGLoggedIn() ?
haveOrgPaymentRecord() ? haveOrgPaymentRecord() ?
<Link className="manageOrgUser" to='/paymentPage/search'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 1 }}>
<FormattedMessage id="onlinePaymentHistory" />
</Typography></Link>
<>
<Link className="paymentRecord">
<Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 1 }}>
<FormattedMessage id="paymentHistory" />
</Typography>
<KeyboardArrowDownIcon sx={{ fontSize: '1.0rem' }} />
</Link>
<ul className='dropdown'>
<li>
<Link className="manageOrgUser" to='/paymentPage/search'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 1 }}>
<FormattedMessage id="onlinePaymentHistory" />
</Typography></Link>
</li>
{haveOrgDnRecord()?
<li>
<Link className="manageOrgUser" to='/paymentPage/demandNote'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 1 }}>
<FormattedMessage id="paymentInfoRecord" />
</Typography></Link>
</li>:null
}
</ul>
</>
: :
<Link className="manageOrgUser" to='/paymentPage/demandNote'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 1 }}> <Link className="manageOrgUser" to='/paymentPage/demandNote'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 1 }}>
<FormattedMessage id="paymentInfoRecord" /> <FormattedMessage id="paymentInfoRecord" />
</Typography></Link> </Typography></Link>
: :
<Link className="manageOrgUser" to='/paymentPage/search'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 1 }}>
<FormattedMessage id="onlinePaymentHistory" />
</Typography></Link>
<>
<Link className="paymentRecord">
<Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 1 }}>
<FormattedMessage id="paymentHistory" />
</Typography>
<KeyboardArrowDownIcon sx={{ fontSize: '1.0rem' }} />
</Link>
<ul className='dropdown'>
<li>
<Link className="manageOrgUser" to='/paymentPage/search'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 1 }}>
<FormattedMessage id="onlinePaymentHistory" />
</Typography></Link>
</li>
{haveOrgDnRecord()?
<li>
<Link className="manageOrgUser" to='/paymentPage/demandNote'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 1 }}>
<FormattedMessage id="paymentInfoRecord" />
</Typography></Link>
</li>:null
}
</ul>
</>
} }
</li> </li>
<li> <li>


+ 2
- 0
src/pages/Announcement/Search/SearchForm.js View File

@@ -51,6 +51,8 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, onGridReady}) =>
key: data.key, key: data.key,
dateFrom: sentDateFrom, dateFrom: sentDateFrom,
dateTo: sentDateTo, dateTo: sentDateTo,
start:0,
limit:10
}; };
applySearch(temp); applySearch(temp);
}; };


+ 2
- 0
src/pages/Announcement/Search_Public/SearchForm.js View File

@@ -68,6 +68,8 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, onGridReady }) =>
key: data.key, key: data.key,
dateFrom: sentDateFrom, dateFrom: sentDateFrom,
dateTo: sentDateTo, dateTo: sentDateTo,
start:0,
limit:10
}; };
applySearch(temp); applySearch(temp);
}; };


+ 2
- 0
src/pages/AuditLog/AuditLogSearchForm.js View File

@@ -66,6 +66,8 @@ const AuditLogSearchForm = ({ applySearch, searchCriteria, onGridReady}) => {
username: data.userName, username: data.userName,
modifiedTo: sentDateTo, modifiedTo: sentDateTo,
modifiedFrom: sentDateFrom, modifiedFrom: sentDateFrom,
start:0,
limit:10
}; };
applySearch(temp); applySearch(temp);
}; };


+ 2
- 0
src/pages/DemandNote/Create/SearchForm.js View File

@@ -136,6 +136,8 @@ const SearchPublicNoticeForm = ({ applySearch, issueComboData, _paymentCount, _p
} }
const temp = { const temp = {
issueId: issueSelected.id, issueId: issueSelected.id,
start:0,
limit:10
}; };
applySearch(temp); applySearch(temp);
}; };


+ 2
- 0
src/pages/DemandNote/Export/SearchForm.js View File

@@ -137,6 +137,8 @@ const SearchPublicNoticeForm = ({ applySearch, issueComboData }) => {
} }
const temp = { const temp = {
issueId: issueSelected.id, issueId: issueSelected.id,
start:0,
limit:10
}; };
applySearch(temp); applySearch(temp);
}; };


+ 2
- 0
src/pages/DemandNote/Search/SearchForm.js View File

@@ -115,6 +115,8 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
dueDateFrom: sentDueDateFrom, dueDateFrom: sentDueDateFrom,
dueDateTo: sentDueDateTo, dueDateTo: sentDueDateTo,
status: (data?.status === '' || data?.status?.includes("all")) ? "" : data.status, status: (data?.status === '' || data?.status?.includes("all")) ? "" : data.status,
start:0,
limit:10
}; };
applySearch(temp); applySearch(temp);
}; };


+ 2
- 0
src/pages/Message/Search/SearchForm.js View File

@@ -67,6 +67,8 @@ const SearchForm = ({ applySearch, searchCriteria, onGridReady }) => {
keyword: data.keyword, keyword: data.keyword,
dateFrom: sentDateFrom, dateFrom: sentDateFrom,
dateTo: sentDateTo, dateTo: sentDateTo,
start:0,
limit:10
}; };
applySearch(temp); applySearch(temp);
}; };


+ 7
- 13
src/pages/Payment/FPS/FPS.js View File

@@ -81,20 +81,14 @@ const Index = () => {
setLocationData(location.state) setLocationData(location.state)
setBrowserType(desktopBrowser) 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)
} }

} }
}, []); }, []);




+ 0
- 10
src/pages/Payment/Search_GLD/DataGrid.js View File

@@ -91,16 +91,6 @@ 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',


+ 3
- 0
src/pages/Payment/Search_GLD/SearchForm.js View File

@@ -68,6 +68,8 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, onGridReady }) =>
dateTo: sentDateTo, dateTo: sentDateTo,
status : (status?.type && status?.type != 'all') ? status?.type : "", status : (status?.type && status?.type != 'all') ? status?.type : "",
payMethod : (payMethod?.type && payMethod?.type != 'all') ? payMethod?.type : "", payMethod : (payMethod?.type && payMethod?.type != 'all') ? payMethod?.type : "",
start:0,
limit:10
}; };
applySearch(temp); applySearch(temp);
}; };
@@ -80,6 +82,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, onGridReady }) =>
code:"", code:"",
transNo:"" transNo:""
}); });
localStorage.setItem('searchCriteria',"")
} }






+ 2
- 0
src/pages/Payment/Search_Public/SearchForm.js View File

@@ -70,6 +70,8 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, onGridReady }) =>
dateFrom: sentDateFrom, dateFrom: sentDateFrom,
dateTo: sentDateTo, dateTo: sentDateTo,
status : (status?.type && status?.type != 'all') ? status?.type : "", status : (status?.type && status?.type != 'all') ? status?.type : "",
start:0,
limit:10
}; };
applySearch(temp); applySearch(temp);
}; };


+ 96
- 103
src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js View File

@@ -19,7 +19,7 @@ import ForwardIcon from '@mui/icons-material/Forward';
import { import {
isORGLoggedIn, isORGLoggedIn,
isDummyLoggedIn, isDummyLoggedIn,
isCreditorLoggedIn,
// isCreditorLoggedIn,
checkIsOnlyOnlinePaymentByIssueDate checkIsOnlyOnlinePaymentByIssueDate
} from "utils/Utils"; } from "utils/Utils";


@@ -353,106 +353,101 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) =>
</Grid> </Grid>
</Grid> </Grid>
</Grid> </Grid>

{!isCreditorLoggedIn() ?
<Grid item xs={12} alignItems={"center"} sx={{ p: 2 }}>
<table style={tabelStyle}>
<tbody>
<tr style={tabelStyle}>
<th style={tabelStyle} width="400" align="left"><FormattedMessage id="paymentMeans" /></th>
<th style={tabelStyle} width="300" align="left"><FormattedMessage id="confirmingDealine" /></th>
<th style={tabelStyle} width="300" align="left"><FormattedMessage id="PaymentCoonpletDealine" /></th>
</tr>
<tr>
<td style={tabelStyle}>
<FormattedMessage id="payOnline" />
<br /><a href="#payOnlineDetails" color='#fff' onClick={() => {
setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payOnline" }))
setWarningText(
<><FormattedMessage id="paymentMethodMeans" />:
<ul>
<li><FormattedMessage id="fps" /></li>
<li><FormattedMessage id="card" /></li>
<li><FormattedMessage id="pps" /></li>
</ul>
</>
);
setIsWarningPopUp(true);
}}><u><FormattedMessage id="viewDetail" /></u></a>
</td>
<td style={tabelStyle}>{DateUtils.dateFormat(closeDate, dft)} {locale==='en'?"2:00 p.m.":"下午2時"}</td>
<td style={tabelStyle}>
<FormattedMessage id="payOnlineRemark" values={{
date: DateUtils.dateFormat(closeDate, dft)
}} />
</td>
</tr>
{!isOnlyOnlinePayment?
<>
<tr>
<td style={tabelStyle}><FormattedMessage id="payDn" />
<br /><a href="#payDnDetails" onClick={() => {
setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payDn" }))
setWarningText(
<><FormattedMessage id="paymentMethodMeans" />:
<ul>
<li><FormattedMessage id="atm" /></li>
<li><FormattedMessage id="pps" /></li>
<li><FormattedMessage id="eBank" /></li>
<li><FormattedMessage id="phoneBank" /></li>
<li><FormattedMessage id="eCheque" /></li>
<li><FormattedMessage id="fps" /></li>
<li><FormattedMessage id="hkpo" /></li>
<li><FormattedMessage id="store" /></li>
<li><FormattedMessage id="post" /></li>
</ul>
<Typography variant="h6">
<div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "proofNote" }) }} />
</Typography>
</>
);
setIsWarningPopUp(true);
}}><u><FormattedMessage id="viewDetail" /></u></a>
</td>
<td style={tabelStyle}>{DateUtils.dateFormat(closingDateOff, dft)} {locale==='en'?"5:00 p.m.":"下午5時"}</td>
<td style={tabelStyle}>
<FormattedMessage id="payDnRemark" values={{
date: DateUtils.dateFormat(closeDate, dft)
}} />
</td>
</tr>
<tr>
<td style={tabelStyle}><FormattedMessage id="payNPGO" />
<br /><a href="#payNPGODetails" onClick={() => {
setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payNPGOPopUpTitle" }))
setWarningText(
<><FormattedMessage id="paymentMethodMeans" />:
<ul>
<li><FormattedMessage id="cheque" /></li>
<li><FormattedMessage id="drafts" /></li>
<li><FormattedMessage id="cashierOrders" /></li>
<li><FormattedMessage id="cash" /></li>
</ul>
</>
);
setIsWarningPopUp(true);
}}><u><FormattedMessage id="viewDetail" /></u></a>
</td>
<td style={tabelStyle}>{DateUtils.dateFormat(closeDate, dft)} {locale==='en'?"12:00 p.m.":"下午12時"}</td>
<td style={tabelStyle}>
<FormattedMessage id="payNPGORemark" values={{
date: DateUtils.dateFormat(closeDate, dft)
}} />
</td>
</tr>
</>:null
}
</tbody>
</table>

</Grid> : null
}

<Grid item xs={12} alignItems={"center"} sx={{ p: 2 }}>
<table style={tabelStyle}>
<tbody>
<tr style={tabelStyle}>
<th style={tabelStyle} width="400" align="left"><FormattedMessage id="paymentMeans" /></th>
<th style={tabelStyle} width="300" align="left"><FormattedMessage id="confirmingDealine" /></th>
<th style={tabelStyle} width="300" align="left"><FormattedMessage id="PaymentCoonpletDealine" /></th>
</tr>
<tr>
<td style={tabelStyle}>
<FormattedMessage id="payOnline" />
<br /><a href="#payOnlineDetails" color='#fff' onClick={() => {
setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payOnline" }))
setWarningText(
<><FormattedMessage id="paymentMethodMeans" />:
<ul>
<li><FormattedMessage id="fps" /></li>
<li><FormattedMessage id="card" /></li>
<li><FormattedMessage id="pps" /></li>
</ul>
</>
);
setIsWarningPopUp(true);
}}><u><FormattedMessage id="viewDetail" /></u></a>
</td>
<td style={tabelStyle}>{DateUtils.dateFormat(closeDate, dft)} {locale==='en'?"2:00 p.m.":"下午2時"}</td>
<td style={tabelStyle}>
<FormattedMessage id="payOnlineRemark" values={{
date: DateUtils.dateFormat(closeDate, dft)
}} />
</td>
</tr>
{!isOnlyOnlinePayment?
<>
<tr>
<td style={tabelStyle}><FormattedMessage id="payDn" />
<br /><a href="#payDnDetails" onClick={() => {
setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payDn" }))
setWarningText(
<><FormattedMessage id="paymentMethodMeans" />:
<ul>
<li><FormattedMessage id="atm" /></li>
<li><FormattedMessage id="pps" /></li>
<li><FormattedMessage id="eBank" /></li>
<li><FormattedMessage id="phoneBank" /></li>
<li><FormattedMessage id="eCheque" /></li>
<li><FormattedMessage id="fps" /></li>
<li><FormattedMessage id="hkpo" /></li>
<li><FormattedMessage id="store" /></li>
<li><FormattedMessage id="post" /></li>
</ul>
<Typography variant="h6">
<div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "proofNote" }) }} />
</Typography>
</>
);
setIsWarningPopUp(true);
}}><u><FormattedMessage id="viewDetail" /></u></a>
</td>
<td style={tabelStyle}>{DateUtils.dateFormat(closingDateOff, dft)} {locale==='en'?"5:00 p.m.":"下午5時"}</td>
<td style={tabelStyle}>
<FormattedMessage id="payDnRemark" values={{
date: DateUtils.dateFormat(closeDate, dft)
}} />
</td>
</tr>
<tr>
<td style={tabelStyle}><FormattedMessage id="payNPGO" />
<br /><a href="#payNPGODetails" onClick={() => {
setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payNPGOPopUpTitle" }))
setWarningText(
<><FormattedMessage id="paymentMethodMeans" />:
<ul>
<li><FormattedMessage id="cheque" /></li>
<li><FormattedMessage id="drafts" /></li>
<li><FormattedMessage id="cashierOrders" /></li>
<li><FormattedMessage id="cash" /></li>
</ul>
</>
);
setIsWarningPopUp(true);
}}><u><FormattedMessage id="viewDetail" /></u></a>
</td>
<td style={tabelStyle}>{DateUtils.dateFormat(closeDate, dft)} {locale==='en'?"12:00 p.m.":"下午12時"}</td>
<td style={tabelStyle}>
<FormattedMessage id="payNPGORemark" values={{
date: DateUtils.dateFormat(closeDate, dft)
}} />
</td>
</tr>
</>:null
}
</tbody>
</table>
</Grid>
<Grid item xs={12} md={12} lg={12}> <Grid item xs={12} md={12} lg={12}>
<Grid container direction="row" justifyContent="flex-start" alignItems="center"> <Grid container direction="row" justifyContent="flex-start" alignItems="center">
<Grid item xs={12} md={3} lg={3} <Grid item xs={12} md={3} lg={3}
@@ -528,9 +523,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) =>
</> </>
: :
null null

} }

{ {
isDummyLoggedIn() ? isDummyLoggedIn() ?
<Grid item xs={12} md={12} lg={12}> <Grid item xs={12} md={12} lg={12}>


+ 2
- 0
src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js View File

@@ -92,6 +92,8 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, onGridReady }) =>
contact: data.contact, contact: data.contact,
careOf: data.careOf?data.careOf:"", careOf: data.careOf?data.careOf:"",
status: (data.status === "" || data.status.includes('all')) ? "" : data.status, status: (data.status === "" || data.status.includes('all')) ? "" : data.status,
start:0,
limit:10
}; };
applySearch(temp); applySearch(temp);
}; };


+ 3
- 0
src/pages/PublicNotice/Search_GLD/SearchForm.js View File

@@ -64,6 +64,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
const marginBottom = 2.5; const marginBottom = 2.5;
const { reset, register, handleSubmit } = useForm() const { reset, register, handleSubmit } = useForm()
const onSubmit = (data) => { const onSubmit = (data) => {
// localStorage.setItem('searchCriteria',"")
data.status = selectedStatus?.type data.status = selectedStatus?.type
let typeArray = []; let typeArray = [];
let sentDateFrom = ""; let sentDateFrom = "";
@@ -88,6 +89,8 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
issueId: issueSelected?.id, issueId: issueSelected?.id,
groupNo: data.groupNo, groupNo: data.groupNo,
gazettGroup: groupSelected?.code, gazettGroup: groupSelected?.code,
start:0,
limit:10
}; };
applySearch(temp); applySearch(temp);
// setSearchReady(true) // setSearchReady(true)


+ 2
- 0
src/pages/PublicNotice/Search_Mark_As_Paid_GLD/SearchForm.js View File

@@ -86,6 +86,8 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
orgId: (orgSelected?.key && orgSelected?.key > 0) ? orgSelected?.key : "", orgId: (orgSelected?.key && orgSelected?.key > 0) ? orgSelected?.key : "",
issueId: issueSelected?.id, issueId: issueSelected?.id,
groupNo: data.groupNo, groupNo: data.groupNo,
start:0,
limit:10
}; };
applySearch(temp); applySearch(temp);
}; };


+ 2
- 0
src/pages/User/SearchPage/UserSearchForm.js View File

@@ -42,6 +42,8 @@ const UserSearchForm = ({ applySearch, onGridReady, searchCriteria }) => {
post: data.post, post: data.post,
email: data.email, email: data.email,
locked: locked, locked: locked,
start:0,
limit:10
}; };
applySearch(temp); applySearch(temp);
}; };


+ 1
- 0
src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js View File

@@ -61,6 +61,7 @@ const UserSearchForm_Individual = ({ applySearch, onGridReady, searchCriteria })
email:"", email:"",
phone:"", phone:"",
}); });
localStorage.setItem('searchCriteria',"")
} }


return ( return (


+ 3
- 0
src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js View File

@@ -52,6 +52,8 @@ const UserSearchForm_Organization = ({applySearch, orgComboData, onGridReady, se
brNoStr: data.brNoStr, brNoStr: data.brNoStr,
orgName: orgSelected?.name ? orgSelected?.name : "", orgName: orgSelected?.name ? orgSelected?.name : "",
accountFilter: accountFilter=="All"?null:accountFilter, accountFilter: accountFilter=="All"?null:accountFilter,
start:0,
limit:10
}; };
applySearch(temp); applySearch(temp);
}; };
@@ -77,6 +79,7 @@ const UserSearchForm_Organization = ({applySearch, orgComboData, onGridReady, se
contactPerson:"", contactPerson:"",
brNoStr:"", brNoStr:"",
}); });
localStorage.setItem('searchCriteria',"")
} }


return ( return (


+ 1
- 0
src/pages/authentication/auth-forms/AuthLogin.js View File

@@ -76,6 +76,7 @@ const AuthLogin = () => {
abilities: response.data.abilities, abilities: response.data.abilities,
passwordExpiryDate: response.data.passwordExpiryDate, passwordExpiryDate: response.data.passwordExpiryDate,
orgPaymentRecord: response.data.orgPaymentRecord, orgPaymentRecord: response.data.orgPaymentRecord,
orgDnRecord: response.data.orgDnRecord,
//avatar: require('src/assets/images/users/avatar-3.png').default, //avatar: require('src/assets/images/users/avatar-3.png').default,
} }
// const abilities = response.data.abilities // const abilities = response.data.abilities


+ 1
- 0
src/pages/authentication/auth-forms/AuthLoginCustom.js View File

@@ -92,6 +92,7 @@ const AuthLoginCustom = () => {
locale: response.data.preferLocale, locale: response.data.preferLocale,
passwordExpiryDate: response.data.passwordExpiryDate, passwordExpiryDate: response.data.passwordExpiryDate,
orgPaymentRecord: response.data.orgPaymentRecord, orgPaymentRecord: response.data.orgPaymentRecord,
orgDnRecord: response.data.orgDnRecord,
//avatar: require('src/assets/images/users/avatar-3.png').default, //avatar: require('src/assets/images/users/avatar-3.png').default,
} }
const data = { ...userData, accessToken: response.data.accessToken, refreshToken: response.data.refreshToken } const data = { ...userData, accessToken: response.data.accessToken, refreshToken: response.data.refreshToken }


+ 1
- 0
src/pages/iAmSmart/AuthCallback/index.js View File

@@ -47,6 +47,7 @@ const Index = () => {
creditor: responseData.creditor, creditor: responseData.creditor,
passwordExpiryDate: responseData.passwordExpiryDate, passwordExpiryDate: responseData.passwordExpiryDate,
orgPaymentRecord: responseData.orgPaymentRecord, orgPaymentRecord: responseData.orgPaymentRecord,
orgDnRecord: responseData.orgDnRecord,
//locale: responseData.preferLocale, //locale: responseData.preferLocale,
//avatar: require('src/assets/images/users/avatar-3.png').default, //avatar: require('src/assets/images/users/avatar-3.png').default,
} }


+ 1
- 0
src/pages/iAmSmart/DirectLoginCallback/index.js View File

@@ -47,6 +47,7 @@ const Index = () => {
creditor: responseData.creditor, creditor: responseData.creditor,
passwordExpiryDate: responseData.passwordExpiryDate, passwordExpiryDate: responseData.passwordExpiryDate,
orgPaymentRecord: responseData.orgPaymentRecord, orgPaymentRecord: responseData.orgPaymentRecord,
orgDnRecord: responseData.orgDnRecord,
//avatar: require('src/assets/images/users/avatar-3.png').default, //avatar: require('src/assets/images/users/avatar-3.png').default,
} }
const data = { ...userData, accessToken: responseData.accessToken, refreshToken: responseData.refreshToken } const data = { ...userData, accessToken: responseData.accessToken, refreshToken: responseData.refreshToken }


+ 5
- 0
src/utils/Utils.js View File

@@ -100,6 +100,11 @@ export const haveOrgPaymentRecord = () =>{
return JSON.parse(localStorage.getItem('userData')).orgPaymentRecord return JSON.parse(localStorage.getItem('userData')).orgPaymentRecord
} }
} }
export const haveOrgDnRecord = () =>{
if (localStorage.getItem('userData') != null){
return JSON.parse(localStorage.getItem('userData')).orgDnRecord
}
}
export const checkSysEnv = () =>{ export const checkSysEnv = () =>{
if (localStorage.getItem('sysEnv') != null){ if (localStorage.getItem('sysEnv') != null){
// console.log(localStorage.getItem('sysEnv')) // console.log(localStorage.getItem('sysEnv'))


Write Preview
Loading…
Cancel
Save