diff --git a/public/media/file-templates/upload-batch-template.xlsx b/public/media/file-templates/upload-batch-template.xlsx
index 2af339b..e31ef5a 100644
Binary files a/public/media/file-templates/upload-batch-template.xlsx and b/public/media/file-templates/upload-batch-template.xlsx differ
diff --git a/src/pages/disbursement/history-transaction/HistoryTransaction.tsx b/src/pages/disbursement/history-transaction/HistoryTransaction.tsx
index 61b9d2d..792a69f 100644
--- a/src/pages/disbursement/history-transaction/HistoryTransaction.tsx
+++ b/src/pages/disbursement/history-transaction/HistoryTransaction.tsx
@@ -23,7 +23,7 @@ const HistoryTransactionDisbursement = () => {
- History Disbursement
+ Disbursement
diff --git a/src/pages/disbursement/history-transaction/hooks/TransactionContext.tsx b/src/pages/disbursement/history-transaction/hooks/TransactionContext.tsx
index 50829d6..861dcea 100644
--- a/src/pages/disbursement/history-transaction/hooks/TransactionContext.tsx
+++ b/src/pages/disbursement/history-transaction/hooks/TransactionContext.tsx
@@ -285,7 +285,7 @@ const TransactionProvider = ({ children }: { children: React.ReactNode }) => {
pagination={{ size: 10 }}
toolbar={
}
layout={{ card: true }}
- sorting={[{ id: 'execution_date', desc: false }]}
+ sorting={[{ id: 'execution_date', desc: true }]}
serverSide={true}
onFetchData={({ pageIndex, pageSize, sorting, columnFilters }) =>
getTransactionLists(pageIndex, pageSize, sorting, columnFilters)
diff --git a/src/pages/members/manage-members/blocks/ListToolBar.tsx b/src/pages/members/manage-members/blocks/ListToolBar.tsx
index 265d15e..951cfd7 100644
--- a/src/pages/members/manage-members/blocks/ListToolBar.tsx
+++ b/src/pages/members/manage-members/blocks/ListToolBar.tsx
@@ -29,25 +29,26 @@ const ListToolbar = ({ createMember, onReload, isReloading, groups }: ListToolba
const [typeSearchValue, setSearchTypeValue] = useState
();
const handleSearch = (e: React.ChangeEvent) => {
- setSearchValue(e.target.value)
+ e.preventDefault()
+ // setSearchValue(e.target.value)
if (typeSearchValue === 'username') {
- table.getColumn('username')?.setFilterValue(e.target.value);
+ table.getColumn('username')?.setFilterValue(searchValue);
table.getColumn('msisdn')?.setFilterValue('');
}
if (typeSearchValue === 'msisdn') {
- table.getColumn('msisdn')?.setFilterValue(e.target.value);
+ table.getColumn('msisdn')?.setFilterValue(searchValue);
table.getColumn('username')?.setFilterValue('');
}
- if (groupFilter) table.getColumn('group_name')?.setFilterValue(groupFilter);
+ table.getColumn('group_name')?.setFilterValue(groupFilter);
};
const handleGroupChange = (e: any) => {
let value = e.target.value;
if (value === '__all__') value = '';
setGroupFilter(value);
- if (typeSearchValue === 'username') table.getColumn('username')?.setFilterValue(searchValue);
- if (typeSearchValue === 'msisdn') table.getColumn('msisdn')?.setFilterValue(searchValue);
- table.getColumn('group_name')?.setFilterValue(value);
+ // if (typeSearchValue === 'username') table.getColumn('username')?.setFilterValue(searchValue);
+ // if (typeSearchValue === 'msisdn') table.getColumn('msisdn')?.setFilterValue(searchValue);
+ // table.getColumn('group_name')?.setFilterValue(value);
};
const generateExportFilters = (groupFilter: string, typeSearchValue: any, searchValue: any): { id: string; value: string }[] => {
@@ -83,43 +84,48 @@ const ListToolbar = ({ createMember, onReload, isReloading, groups }: ListToolba
-
-
+
-