IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into transaction-link-list-query

Browse Source
This commit is contained in:
Moriz Wahl 2022-03-11 14:13:46 +01:00
commit 7c104fc705
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/graphql/enum/TransactionTypeId.ts
View File

@ -6,7 +6,7 @@ export enum TransactionTypeId {
RECEIVE = 3,
// This is a virtual property, never occurring on the database
DECAY = 4,
TRANSACTION_LINK,
TRANSACTION_LINK = 5,
}
registerEnumType(TransactionTypeId, {

2
backend/src/graphql/resolver/TransactionResolver.ts
View File

@ -116,7 +116,7 @@ export class TransactionResolver {
const { sumHoldAvailableAmount, sumAmount, lastDate, firstDate } =
await transactionLinkRepository.summary(user.id, now)
// decay transaction
// decay & link transactions
if (!onlyCreations && currentPage === 1 && order === Order.DESC) {
transactions.push(
virtualDecayTransaction(lastTransaction.balance, lastTransaction.balanceDate, now, self),