| @@ -68,11 +68,15 @@ export default function SearchTable({ previewSearchCriteria, onPreviewGridOnRead | |||||
| customPageSize={10} | customPageSize={10} | ||||
| onRowDoubleClick={handleEditClick} | onRowDoubleClick={handleEditClick} | ||||
| applyGridOnReady={onPreviewGridOnReady} | applyGridOnReady={onPreviewGridOnReady} | ||||
| doLoad={React.useMemo(() => ({ | |||||
| doLoad={React.useMemo(() => { | |||||
| if (!selectedIds?.length) { | |||||
| return undefined; // ⬅️ will keep grid empty | |||||
| } | |||||
| return { | |||||
| url: GFIMIS_LIST, | url: GFIMIS_LIST, | ||||
| params: { ..._searchCriteria, paymentId: selectedIds.join(',') } | |||||
| }), [_searchCriteria])} | |||||
| params: { ..._searchCriteria, paymentId: selectedIds.join(',') }, | |||||
| }; | |||||
| }, [_searchCriteria, selectedIds])} | |||||
| /> | /> | ||||
| </div> | </div> | ||||
| ); | ); | ||||
| @@ -66,6 +66,12 @@ const Index = () => { | |||||
| setOnReady(true); | setOnReady(true); | ||||
| }, [searchCriteria]); | }, [searchCriteria]); | ||||
| React.useEffect(() => { | |||||
| if (selectedIds.length > 0) { | |||||
| const withToken = { ...searchCriteria, __ts: Date.now() }; | |||||
| setPreviewSearchCriteria(withToken); | |||||
| } | |||||
| }, [selectedIds, searchCriteria]); | |||||
| function downloadXML() { | function downloadXML() { | ||||
| console.log(selectedIds.join(',')) | console.log(selectedIds.join(',')) | ||||
| @@ -131,9 +137,11 @@ const Index = () => { | |||||
| function applySearch(input) { | function applySearch(input) { | ||||
| setGridOnReady(true) | |||||
| setGridOnReady(true); | |||||
| setSelectedIds([]); | |||||
| setPreviewSearchCriteria({}); | |||||
| setSearchCriteria(input); | setSearchCriteria(input); | ||||
| setInputDate(input.dateFrom) | |||||
| setInputDate(input.dateFrom); | |||||
| } | } | ||||
| function previewSearch() { | function previewSearch() { | ||||
| @@ -194,8 +194,8 @@ export const isPasswordExpiry = () =>{ | |||||
| } | } | ||||
| export const checkIsOnlyOnlinePaymentByIssueDate = (date) => { | export const checkIsOnlyOnlinePaymentByIssueDate = (date) => { | ||||
| const targetDate = new Date(2026, 1, 6, 0, 0, 0); // 6 Feb 2026, 00:00:00 | |||||
| // const targetDate = new Date(2025, 6, 13, 8, 0, 0); //2025-07-13T08:00:00.000Z | |||||
| // const targetDate = new Date(2025, 7, 1, 0, 0, 0) //2026-01-28T08:00:00.000Z hardcode | |||||
| const targetDate = new Date(2025, 9, 17, 8, 0, 0) //2025-10-17T08:00:00.000Z | |||||
| const checkDate = DateUtils.convertToDate(date) | const checkDate = DateUtils.convertToDate(date) | ||||
| if (isDummyLoggedIn()){ | if (isDummyLoggedIn()){ | ||||
| return false; | return false; | ||||
| @@ -210,7 +210,7 @@ export const checkIsOnlyOnlinePaymentByIssueDate = (date) => { | |||||
| } | } | ||||
| export const checkIsOnlyOnlinePayment = () => { | export const checkIsOnlyOnlinePayment = () => { | ||||
| const targetDate = new Date(2025, 7, 1, 0, 0, 0) // hardcode | |||||
| const targetDate = new Date(2025, 9, 17, 8, 0, 0) // hardcode | |||||
| const checkDate = DateUtils.convertToDate(new Date()) | const checkDate = DateUtils.convertToDate(new Date()) | ||||
| if (isDummyLoggedIn()){ | if (isDummyLoggedIn()){ | ||||
| return false; | return false; | ||||
| @@ -225,7 +225,7 @@ export const checkIsOnlyOnlinePayment = () => { | |||||
| } | } | ||||
| export const checkMarkAsCreditClient = () => { | export const checkMarkAsCreditClient = () => { | ||||
| const targetDate = new Date(2025, 6, 15, 0, 0, 0) // hardcode | |||||
| const targetDate = new Date(2025, 9, 17, 8, 0, 0) // hardcode | |||||
| const checkDate = DateUtils.convertToDate(new Date()) | const checkDate = DateUtils.convertToDate(new Date()) | ||||
| // console.log(targetDate) | // console.log(targetDate) | ||||
| // console.log(checkDate >= targetDate) | // console.log(checkDate >= targetDate) | ||||
| @@ -124,8 +124,6 @@ export function getModeByTextIntl(mode, intl) { | |||||
| switch (mode) { | switch (mode) { | ||||
| case "offline": | case "offline": | ||||
| return intl.formatMessage({id: 'applicationModeOffline'}) | return intl.formatMessage({id: 'applicationModeOffline'}) | ||||
| case "online": | |||||
| return intl.formatMessage({id: 'applicationModeOnline'}) | |||||
| default: | default: | ||||
| return "" | return "" | ||||
| } | } | ||||