TIMOR-TELECOM/revenue-fe
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
wayanrivan
2025-04-21 16:18:02 +07:00
parent bbe1433984
commit 507b76a540
3 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pages/transaction/approval-transaction/blocks/ApprovalDialog.tsx
View File

@ -26,7 +26,7 @@ const API_URL = apiConfig.transaction;
const ApprovalDialog = () => {
const { GetData, PostData } = useCallApi();
const { table, reload } = useDataGrid();
// const { table, reload } = useDataGrid();
const {
showApprovalDialog,
@ -85,7 +85,7 @@ const ApprovalDialog = () => {
};
doSaveLogActivity(createActivity);
setShowApprovalDialog(false);
reload();
// reload();
} else {
setAlert({ show: true, message: response?.message });
}

28
src/pages/transaction/history-transaction/blocks/ListToolbar.tsx
View File

@ -19,9 +19,9 @@ const ListToolbar = () => {
(table.getColumn('code')?.getFilterValue() as string) ?? ''
);
const [statusValue, setStatusValue] = useState<string>(
(table.getColumn('status')?.getFilterValue() as string) ?? ''
);
// const [statusValue, setStatusValue] = useState<string>(
// (table.getColumn('status')?.getFilterValue() as string) ?? ''
// );
const [typeValue, setTypeValue] = useState<string>(
(table.getState().columnFilters.find(f => f.id === 'kind')?.value as string) ?? ''
@ -40,13 +40,13 @@ const ListToolbar = () => {
return () => clearTimeout(timer);
}, [searchValue, table]);
useEffect(() => {
const timer = setTimeout(() => {
table.getColumn('status')?.setFilterValue(statusValue);
table.setPageIndex(0);
}, 200);
return () => clearTimeout(timer);
}, [statusValue, table]);
// useEffect(() => {
// const timer = setTimeout(() => {
// table.getColumn('status')?.setFilterValue(statusValue);
// table.setPageIndex(0);
// }, 200);
// return () => clearTimeout(timer);
// }, [statusValue, table]);
useEffect(() => {
const timer = setTimeout(() => {
@ -113,7 +113,7 @@ const ListToolbar = () => {
/>
</label>
<Select
{/* <Select
value={statusValue}
onValueChange={(value) => {
setStatusValue(value);
@ -127,7 +127,7 @@ const ListToolbar = () => {
<SelectItem value="F">FAILED</SelectItem>
<SelectItem value="O">ON PROCESS</SelectItem>
</SelectContent>
</Select>
</Select> */}
<Select
value={typeValue}
@ -170,7 +170,7 @@ const ListToolbar = () => {
// Only reset filters excluding from and to
setSearchValue('');
setStatusValue('');
// setStatusValue('');
setTypeValue('');
settrxDate({
from: formatDate(firstDayOfMonth),
@ -180,7 +180,7 @@ const ListToolbar = () => {
// Reset other filters except for date range
table.setColumnFilters([
{ id: 'code', value: '' },
{ id: 'status', value: '' },
// { id: 'status', value: '' },
{ id: 'kind', value: '' },
]);

14
src/pages/transaction/history-transaction/hooks/TransactionContext.tsx
View File

@ -268,7 +268,7 @@ const TransactionProvider = ({ children }: { children: React.ReactNode }) => {
let startdate = firstDayOfMonth.toISOString().split('T')[0];
let enddate = today.toISOString().split('T')[0];
let transactioncode = '';
let transactionstatus = '';
// let transactionstatus = '';
let type = ''
if (Array.isArray(filter)) {
@ -283,9 +283,9 @@ const TransactionProvider = ({ children }: { children: React.ReactNode }) => {
transactioncode = f.value;
}
if (f.id === 'status' && f.value) {
transactionstatus = f.value;
}
// if (f.id === 'status' && f.value) {
// transactionstatus = f.value;
// }
if (f.id === 'kind' && f.value) {
type = f.value;
@ -307,9 +307,9 @@ const TransactionProvider = ({ children }: { children: React.ReactNode }) => {
};
}
if (transactionstatus) {
formattedFilter["Transactions.status"] = transactionstatus;
}
// if (transactionstatus) {
// formattedFilter["Transactions.status"] = transactionstatus;
// }
if (type) {
formattedFilter["Transactions.kind"] = type;