QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-20 14:50:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #902 from bigcapitalhq/fix-bank-transactions-unexclude2

Browse Source 
fix(webapp): unexclude bank transactions
This commit is contained in:
Ahmed Bouhuolia
2026-01-16 18:54:36 +02:00
committed by GitHub
parent 8726b4b3b0 769eaebc76
commit abacb543c7
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/server/src/modules/BankingTransactionsExclude/commands/UnexcludeBankTransaction.service.ts
View File

@@ -4,8 +4,8 @@ import {
validateTransactionShouldBeExcluded, validateTransactionShouldBeExcluded,
} from './utils'; } from './utils';
import { import {
IBankTransactionExcludedEventPayload, IBankTransactionUnexcludedEventPayload,
IBankTransactionExcludingEventPayload, IBankTransactionUnexcludingEventPayload,
} from '../types/BankTransactionsExclude.types'; } from '../types/BankTransactionsExclude.types';
import { EventEmitter2 } from '@nestjs/event-emitter'; import { EventEmitter2 } from '@nestjs/event-emitter';
import { Inject, Injectable } from '@nestjs/common'; import { Inject, Injectable } from '@nestjs/common';
@@ -50,7 +50,8 @@ export class UnexcludeBankTransactionService {
return this.uow.withTransaction(async (trx: Knex.Transaction) => { return this.uow.withTransaction(async (trx: Knex.Transaction) => {
await this.eventEmitter.emitAsync(events.bankTransactions.onUnexcluding, { await this.eventEmitter.emitAsync(events.bankTransactions.onUnexcluding, {
uncategorizedTransactionId, uncategorizedTransactionId,
} as IBankTransactionExcludingEventPayload); trx,
} as IBankTransactionUnexcludingEventPayload);
await this.uncategorizedBankTransactionModel() await this.uncategorizedBankTransactionModel()
.query(trx) .query(trx)
@@ -61,7 +62,8 @@ export class UnexcludeBankTransactionService {
await this.eventEmitter.emitAsync(events.bankTransactions.onUnexcluded, { await this.eventEmitter.emitAsync(events.bankTransactions.onUnexcluded, {
uncategorizedTransactionId, uncategorizedTransactionId,
} as IBankTransactionExcludedEventPayload); trx,
} as IBankTransactionUnexcludedEventPayload);
}); });
} }
} }

2
packages/server/src/modules/BankingTransactionsExclude/subscribers/DecrementUncategorizedTransactionOnExclude.ts
View File

@@ -50,7 +50,7 @@ export class DecrementUncategorizedTransactionOnExclude {
trx, trx,
}: IBankTransactionUnexcludedEventPayload) { }: IBankTransactionUnexcludedEventPayload) {
const transaction = await this.uncategorizedBankTransaction() const transaction = await this.uncategorizedBankTransaction()
.query() .query(trx)
.findById(uncategorizedTransactionId); .findById(uncategorizedTransactionId);
// //
await this.account() await this.account()

2
packages/webapp/src/hooks/query/bank-rules.ts
View File

@@ -424,7 +424,7 @@ export function useUnexcludeUncategorizedTransactions(
UnexcludeBankTransactionsValue UnexcludeBankTransactionsValue
>( >(
(value: { ids: Array<number | string> }) => (value: { ids: Array<number | string> }) =>
apiRequest.delete(`/banking/exclude/bulk`, { ids: value.ids }), apiRequest.delete(`/banking/exclude/bulk`, { data: { ids: value.ids } }),
{ {
onSuccess: (res, id) => { onSuccess: (res, id) => {
onValidateExcludeUncategorizedTransaction(queryClient); onValidateExcludeUncategorizedTransaction(queryClient);