diff --git a/src/pages/transaction/history-transaction/blocks/ListToolbar.tsx b/src/pages/transaction/history-transaction/blocks/ListToolbar.tsx index 031d62e..beec019 100644 --- a/src/pages/transaction/history-transaction/blocks/ListToolbar.tsx +++ b/src/pages/transaction/history-transaction/blocks/ListToolbar.tsx @@ -23,6 +23,10 @@ const ListToolbar = () => { (table.getState().columnFilters.find(f => f.id === 'kind')?.value as string) ?? '' ); + const [status, setStatus] = useState( + (table.getState().columnFilters.find(f => f.id === 'status')?.value as string) ?? '' + ); + const { GetData } = useCallApi(); const API_URL = apiConfig.transaction; @@ -50,24 +54,25 @@ const ListToolbar = () => { table.getColumn('transaction_date')?.setFilterValue(trxDate); table.setColumnFilters((prev) => { - const others = prev.filter(f => f.id !== 'kind' && f.id !== 'searchtype' && f.id !== 'code'); + const others = prev.filter(f => f.id !== 'kind' && f.id !== 'searchtype' && f.id !== 'code' && f.id !== 'status'); const filters: any[] = [...others]; if (typeValue) filters.push({ id: 'kind', value: typeValue }); if (typeSearchValue) filters.push({ id: 'searchtype', value: typeSearchValue }); if (searchValue) filters.push({ id: 'code', value: searchValue }); - + if (status) filters.push({ id: 'status', value: status }); return filters; }); table.setPageIndex(0); - }, [trxDate, typeValue, typeSearchValue, searchValue, table]); + }, [trxDate, typeValue, typeSearchValue, searchValue, status, table]); const exporDataToExcel = async ( typeSearchValue: string, searchValue: string, trxDate: any, - typeValue: string + typeValue: string, + status: string ) => { try { const formattedFilter: any = { @@ -172,6 +177,19 @@ const ListToolbar = () => { + +