diff --git a/src/components/FiDataGrid.js b/src/components/FiDataGrid.js index 69165b7..664e352 100644 --- a/src/components/FiDataGrid.js +++ b/src/components/FiDataGrid.js @@ -57,12 +57,15 @@ export function FiDataGrid({ rows, columns, sx, autoHeight, if(applySearch!=undefined){ if (Object.keys(getSearchCriteria(window.location.pathname)).length>0){ const localStorageSearchCriteria = getSearchCriteria(window.location.pathname) + console.log(localStorageSearchCriteria) if(localStorageSearchCriteria.start!=undefined){ + console.log(localStorageSearchCriteria) setPage(localStorageSearchCriteria.start/pageSize); } } }else{ setPage(0); + setPageSize(parseInt(event.target.value, 10)); } set_doLoad(doLoad); setLoading(true) diff --git a/src/layout/MainLayout/Header/index.js b/src/layout/MainLayout/Header/index.js index 2ee52f6..8c859eb 100644 --- a/src/layout/MainLayout/Header/index.js +++ b/src/layout/MainLayout/Header/index.js @@ -50,6 +50,7 @@ import { isINDLoggedIn, isPasswordExpiry, haveOrgPaymentRecord, + haveOrgDnRecord, isORGLoggedIn, checkSysEnv // getUserId @@ -401,17 +402,55 @@ function Header(props) { : isORGLoggedIn() ? haveOrgPaymentRecord() ? - - - + <> + + + + + + + + : : - - - + <> + + + + + + + + }
  • diff --git a/src/pages/Announcement/Search/SearchForm.js b/src/pages/Announcement/Search/SearchForm.js index 77495cd..77eb69b 100644 --- a/src/pages/Announcement/Search/SearchForm.js +++ b/src/pages/Announcement/Search/SearchForm.js @@ -51,6 +51,8 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, onGridReady}) => key: data.key, dateFrom: sentDateFrom, dateTo: sentDateTo, + start:0, + limit:10 }; applySearch(temp); }; diff --git a/src/pages/Announcement/Search_Public/SearchForm.js b/src/pages/Announcement/Search_Public/SearchForm.js index df8ad0e..7d8f618 100644 --- a/src/pages/Announcement/Search_Public/SearchForm.js +++ b/src/pages/Announcement/Search_Public/SearchForm.js @@ -68,6 +68,8 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, onGridReady }) => key: data.key, dateFrom: sentDateFrom, dateTo: sentDateTo, + start:0, + limit:10 }; applySearch(temp); }; diff --git a/src/pages/AuditLog/AuditLogSearchForm.js b/src/pages/AuditLog/AuditLogSearchForm.js index 034e861..27fa580 100644 --- a/src/pages/AuditLog/AuditLogSearchForm.js +++ b/src/pages/AuditLog/AuditLogSearchForm.js @@ -66,6 +66,8 @@ const AuditLogSearchForm = ({ applySearch, searchCriteria, onGridReady}) => { username: data.userName, modifiedTo: sentDateTo, modifiedFrom: sentDateFrom, + start:0, + limit:10 }; applySearch(temp); }; diff --git a/src/pages/DemandNote/Create/SearchForm.js b/src/pages/DemandNote/Create/SearchForm.js index b6cc3d2..014eee0 100644 --- a/src/pages/DemandNote/Create/SearchForm.js +++ b/src/pages/DemandNote/Create/SearchForm.js @@ -136,6 +136,8 @@ const SearchPublicNoticeForm = ({ applySearch, issueComboData, _paymentCount, _p } const temp = { issueId: issueSelected.id, + start:0, + limit:10 }; applySearch(temp); }; diff --git a/src/pages/DemandNote/Export/SearchForm.js b/src/pages/DemandNote/Export/SearchForm.js index 841c4b6..c0a374d 100644 --- a/src/pages/DemandNote/Export/SearchForm.js +++ b/src/pages/DemandNote/Export/SearchForm.js @@ -137,6 +137,8 @@ const SearchPublicNoticeForm = ({ applySearch, issueComboData }) => { } const temp = { issueId: issueSelected.id, + start:0, + limit:10 }; applySearch(temp); }; diff --git a/src/pages/DemandNote/Search/SearchForm.js b/src/pages/DemandNote/Search/SearchForm.js index cdc7c33..bce5359 100644 --- a/src/pages/DemandNote/Search/SearchForm.js +++ b/src/pages/DemandNote/Search/SearchForm.js @@ -115,6 +115,8 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue dueDateFrom: sentDueDateFrom, dueDateTo: sentDueDateTo, status: (data?.status === '' || data?.status?.includes("all")) ? "" : data.status, + start:0, + limit:10 }; applySearch(temp); }; diff --git a/src/pages/Message/Search/SearchForm.js b/src/pages/Message/Search/SearchForm.js index 06123b9..78bdc4d 100644 --- a/src/pages/Message/Search/SearchForm.js +++ b/src/pages/Message/Search/SearchForm.js @@ -67,6 +67,8 @@ const SearchForm = ({ applySearch, searchCriteria, onGridReady }) => { keyword: data.keyword, dateFrom: sentDateFrom, dateTo: sentDateTo, + start:0, + limit:10 }; applySearch(temp); }; 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 9833354..1855297 100644 --- a/src/pages/Payment/Search_GLD/DataGrid.js +++ b/src/pages/Payment/Search_GLD/DataGrid.js @@ -91,16 +91,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', diff --git a/src/pages/Payment/Search_GLD/SearchForm.js b/src/pages/Payment/Search_GLD/SearchForm.js index b198248..20957ef 100644 --- a/src/pages/Payment/Search_GLD/SearchForm.js +++ b/src/pages/Payment/Search_GLD/SearchForm.js @@ -68,6 +68,8 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, onGridReady }) => dateTo: sentDateTo, status : (status?.type && status?.type != 'all') ? status?.type : "", payMethod : (payMethod?.type && payMethod?.type != 'all') ? payMethod?.type : "", + start:0, + limit:10 }; applySearch(temp); }; @@ -80,6 +82,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, onGridReady }) => code:"", transNo:"" }); + localStorage.setItem('searchCriteria',"") } diff --git a/src/pages/Payment/Search_Public/SearchForm.js b/src/pages/Payment/Search_Public/SearchForm.js index 2dc5623..17324ca 100644 --- a/src/pages/Payment/Search_Public/SearchForm.js +++ b/src/pages/Payment/Search_Public/SearchForm.js @@ -70,6 +70,8 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, onGridReady }) => dateFrom: sentDateFrom, dateTo: sentDateTo, status : (status?.type && status?.type != 'all') ? status?.type : "", + start:0, + limit:10 }; applySearch(temp); }; diff --git a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js index fbe2860..f2d5e63 100644 --- a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js +++ b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js @@ -19,7 +19,7 @@ import ForwardIcon from '@mui/icons-material/Forward'; import { isORGLoggedIn, isDummyLoggedIn, - isCreditorLoggedIn, + // isCreditorLoggedIn, checkIsOnlyOnlinePaymentByIssueDate } from "utils/Utils"; @@ -353,106 +353,101 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) => - - {!isCreditorLoggedIn() ? - - - - - - - - - - - - - - {!isOnlyOnlinePayment? - <> - - - - - - - - - - - :null - } - -
    - -
    { - setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payOnline" })) - setWarningText( - <>: -
      -
      • -
      • -
      • -
    - - ); - setIsWarningPopUp(true); - }}>     -     		{DateUtils.dateFormat(closeDate, dft)} {locale==='en'?"2:00 p.m.":"下午2時"} - -
    -
    { - setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payDn" })) - setWarningText( - <>: -
      -
      • -
      • -
      • -
      • -
      • -
      • -
      • -
      • -
      • -
    - -     		{DateUtils.dateFormat(closingDateOff, dft)} {locale==='en'?"5:00 p.m.":"下午5時"} - -
    -
    { - setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payNPGOPopUpTitle" })) - setWarningText( - <>: -
      -
      • -
      • -
      • -
      • -
    - - ); - setIsWarningPopUp(true); - }}>     -     		{DateUtils.dateFormat(closeDate, dft)} {locale==='en'?"12:00 p.m.":"下午12時"} - -
    - -     : null - } - + + + + + + + + + + + + + + {!isOnlyOnlinePayment? + <> + + + + + + + + + + + :null + } + +
    + +
    { + setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payOnline" })) + setWarningText( + <>: +
      +
      • +
      • +
      • +
    + + ); + setIsWarningPopUp(true); + }}>     +     		{DateUtils.dateFormat(closeDate, dft)} {locale==='en'?"2:00 p.m.":"下午2時"} + +
    +
    { + setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payDn" })) + setWarningText( + <>: +
      +
      • +
      • +
      • +
      • +
      • +
      • +
      • +
      • +
      • +
    + +     		{DateUtils.dateFormat(closingDateOff, dft)} {locale==='en'?"5:00 p.m.":"下午5時"} + +
    +
    { + setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payNPGOPopUpTitle" })) + setWarningText( + <>: +
      +
      • +
      • +
      • +
      • +
    + + ); + setIsWarningPopUp(true); + }}>     +     		{DateUtils.dateFormat(closeDate, dft)} {locale==='en'?"12:00 p.m.":"下午12時"} + +
    +     : null - } - { isDummyLoggedIn() ? diff --git a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js index ecdab0d..a568f4c 100644 --- a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js +++ b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js @@ -92,6 +92,8 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, onGridReady }) => contact: data.contact, careOf: data.careOf?data.careOf:"", status: (data.status === "" || data.status.includes('all')) ? "" : data.status, + start:0, + limit:10 }; applySearch(temp); }; diff --git a/src/pages/PublicNotice/Search_GLD/SearchForm.js b/src/pages/PublicNotice/Search_GLD/SearchForm.js index b999852..1c1bc0f 100644 --- a/src/pages/PublicNotice/Search_GLD/SearchForm.js +++ b/src/pages/PublicNotice/Search_GLD/SearchForm.js @@ -64,6 +64,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss const marginBottom = 2.5; const { reset, register, handleSubmit } = useForm() const onSubmit = (data) => { + // localStorage.setItem('searchCriteria',"") data.status = selectedStatus?.type let typeArray = []; let sentDateFrom = ""; @@ -88,6 +89,8 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss issueId: issueSelected?.id, groupNo: data.groupNo, gazettGroup: groupSelected?.code, + start:0, + limit:10 }; applySearch(temp); // setSearchReady(true) diff --git a/src/pages/PublicNotice/Search_Mark_As_Paid_GLD/SearchForm.js b/src/pages/PublicNotice/Search_Mark_As_Paid_GLD/SearchForm.js index 2d1d1b2..4c1c35b 100644 --- a/src/pages/PublicNotice/Search_Mark_As_Paid_GLD/SearchForm.js +++ b/src/pages/PublicNotice/Search_Mark_As_Paid_GLD/SearchForm.js @@ -86,6 +86,8 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss orgId: (orgSelected?.key && orgSelected?.key > 0) ? orgSelected?.key : "", issueId: issueSelected?.id, groupNo: data.groupNo, + start:0, + limit:10 }; applySearch(temp); }; diff --git a/src/pages/User/SearchPage/UserSearchForm.js b/src/pages/User/SearchPage/UserSearchForm.js index a266bff..73019d0 100644 --- a/src/pages/User/SearchPage/UserSearchForm.js +++ b/src/pages/User/SearchPage/UserSearchForm.js @@ -42,6 +42,8 @@ const UserSearchForm = ({ applySearch, onGridReady, searchCriteria }) => { post: data.post, email: data.email, locked: locked, + start:0, + limit:10 }; applySearch(temp); }; diff --git a/src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js b/src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js index 1b27b25..8828c52 100644 --- a/src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js +++ b/src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js @@ -61,6 +61,7 @@ const UserSearchForm_Individual = ({ applySearch, onGridReady, searchCriteria }) email:"", phone:"", }); + localStorage.setItem('searchCriteria',"") } return ( diff --git a/src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js b/src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js index 3cb8be0..ece3286 100644 --- a/src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js +++ b/src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js @@ -52,6 +52,8 @@ const UserSearchForm_Organization = ({applySearch, orgComboData, onGridReady, se brNoStr: data.brNoStr, orgName: orgSelected?.name ? orgSelected?.name : "", accountFilter: accountFilter=="All"?null:accountFilter, + start:0, + limit:10 }; applySearch(temp); }; @@ -77,6 +79,7 @@ const UserSearchForm_Organization = ({applySearch, orgComboData, onGridReady, se contactPerson:"", brNoStr:"", }); + localStorage.setItem('searchCriteria',"") } return ( diff --git a/src/pages/authentication/auth-forms/AuthLogin.js b/src/pages/authentication/auth-forms/AuthLogin.js index badf7a8..c0f6d9f 100644 --- a/src/pages/authentication/auth-forms/AuthLogin.js +++ b/src/pages/authentication/auth-forms/AuthLogin.js @@ -76,6 +76,7 @@ const AuthLogin = () => { abilities: response.data.abilities, passwordExpiryDate: response.data.passwordExpiryDate, orgPaymentRecord: response.data.orgPaymentRecord, + orgDnRecord: response.data.orgDnRecord, //avatar: require('src/assets/images/users/avatar-3.png').default, } // const abilities = response.data.abilities diff --git a/src/pages/authentication/auth-forms/AuthLoginCustom.js b/src/pages/authentication/auth-forms/AuthLoginCustom.js index 44f48cc..cd53a5e 100644 --- a/src/pages/authentication/auth-forms/AuthLoginCustom.js +++ b/src/pages/authentication/auth-forms/AuthLoginCustom.js @@ -92,6 +92,7 @@ const AuthLoginCustom = () => { locale: response.data.preferLocale, passwordExpiryDate: response.data.passwordExpiryDate, orgPaymentRecord: response.data.orgPaymentRecord, + orgDnRecord: response.data.orgDnRecord, //avatar: require('src/assets/images/users/avatar-3.png').default, } const data = { ...userData, accessToken: response.data.accessToken, refreshToken: response.data.refreshToken } diff --git a/src/pages/iAmSmart/AuthCallback/index.js b/src/pages/iAmSmart/AuthCallback/index.js index cb02712..9aefca1 100644 --- a/src/pages/iAmSmart/AuthCallback/index.js +++ b/src/pages/iAmSmart/AuthCallback/index.js @@ -47,6 +47,7 @@ const Index = () => { creditor: responseData.creditor, passwordExpiryDate: responseData.passwordExpiryDate, orgPaymentRecord: responseData.orgPaymentRecord, + orgDnRecord: responseData.orgDnRecord, //locale: responseData.preferLocale, //avatar: require('src/assets/images/users/avatar-3.png').default, } diff --git a/src/pages/iAmSmart/DirectLoginCallback/index.js b/src/pages/iAmSmart/DirectLoginCallback/index.js index 91a1974..2f59918 100644 --- a/src/pages/iAmSmart/DirectLoginCallback/index.js +++ b/src/pages/iAmSmart/DirectLoginCallback/index.js @@ -47,6 +47,7 @@ const Index = () => { creditor: responseData.creditor, passwordExpiryDate: responseData.passwordExpiryDate, orgPaymentRecord: responseData.orgPaymentRecord, + orgDnRecord: responseData.orgDnRecord, //avatar: require('src/assets/images/users/avatar-3.png').default, } const data = { ...userData, accessToken: responseData.accessToken, refreshToken: responseData.refreshToken } diff --git a/src/utils/Utils.js b/src/utils/Utils.js index f42acea..c979821 100644 --- a/src/utils/Utils.js +++ b/src/utils/Utils.js @@ -100,6 +100,11 @@ export const haveOrgPaymentRecord = () =>{ 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 = () =>{ if (localStorage.getItem('sysEnv') != null){ // console.log(localStorage.getItem('sysEnv'))