699 Commits

Author	SHA1	Message	Date
Moriz Wahl	ff9dde8870	Merge branch 'master' into delete-transaction-link-mutation	2022-03-10 18:10:33 +01:00
Moriz Wahl	3436253bbe	transaction link repository, use raw query to get sum of hold available amount	2022-03-10 15:33:26 +01:00
Hannes Heine	70780878f5	Merge branch 'master' into query-transaction-link	2022-03-10 01:49:12 +01:00
Moriz Wahl	4784fc23ab	delete transaction link mutation	2022-03-09 19:30:31 +01:00
Moriz Wahl	dbc8382f33	Merge branch 'create-transaction-link-mutation' of github.com:gradido/gradido into create-transaction-link-mutation	2022-03-09 18:25:32 +01:00
Moriz Wahl	5f42748358	error message and constant for transaction link duration	2022-03-09 18:25:17 +01:00
Moriz Wahl	7edacb9c8f	Merge branch 'master' into create-transaction-link-mutation	2022-03-09 18:19:17 +01:00
Moriz Wahl	8107066d2b	balance includes transactions to hold available, calculateBalance checks for pending transaction links	2022-03-09 18:18:22 +01:00
Moriz Wahl	dbb42c30ec	increase timeout by factoe 100	2022-03-09 17:07:32 +01:00
Moriz Wahl	916fae91b3	Merge branch 'model-transaction-link' into create-transaction-link-mutation	2022-03-09 17:00:35 +01:00
Moriz Wahl	f4f63a9519	take pending transaction links into acount when testing for available balance	2022-03-09 16:26:23 +01:00
Hannes Heine	67eed2b0c8	Merge branch 'master' into query-transaction-link	2022-03-09 15:52:14 +01:00
Moriz Wahl	6d6f58a932	save hold available amount	2022-03-09 15:43:13 +01:00
elweyn	a0e241e6b0	Created Query that search for an TransactionLink with a given code	2022-03-09 15:16:13 +01:00
Moriz Wahl	dee6fd9d0a	fix createdAt is now	2022-03-09 14:59:21 +01:00
Moriz Wahl	1a715f8b71	simple resolver for createTransactionLink	2022-03-09 14:30:25 +01:00
Moriz Wahl	18318404eb	Merge branch 'master' into test-login-user-resolver	2022-03-08 18:06:16 +01:00
Moriz Wahl	c5ff18f461	use @paths	2022-03-08 18:04:55 +01:00
Moriz Wahl	82ebcc0ae9	Merge branch 'master' into test-login-user-resolver	2022-03-08 14:06:21 +01:00
Moriz Wahl	75a1feb7ee	no relative paths in tests	2022-03-07 22:03:54 +01:00
Moriz Wahl	0136a22f0c	resolve relative paths in resolvers	2022-03-07 21:35:50 +01:00
Alexander Friedland	187deba1a8	Merge branch 'master' into refactor_arithmetic_merge	2022-03-07 16:38:37 +01:00
Ulf Gebhardt	31721337ba	Merge branch 'master' into adminarea-creation-transactionlist-show	2022-03-07 16:24:29 +01:00
Alexander Friedland	5847f723c6	Merge branch 'master' into refactor_arithmetic_merge	2022-03-07 16:18:45 +01:00
Ulf Gebhardt	c8977ea749	Merge branch 'master' into fix_validate_password_update_user_infos	2022-03-07 16:09:24 +01:00
Alexander Friedland	651bb725d9	Merge branch 'master' into adminarea-creation-transactionlist-show	2022-03-07 16:09:09 +01:00
Ulf Gebhardt	cc596df22a	validate valitity of userpassword when updating it via updateUserInfos	2022-03-07 13:31:33 +01:00
ogerly	25b1a5a83e	admin area creation transaction list	2022-03-06 11:52:29 +01:00
Ulf Gebhardt	433000e536	allow sending to user without transactions	2022-03-06 10:50:14 +01:00
Ulf Gebhardt	103f727798	Merge branch 'master' into test-login-user-resolver	2022-03-04 15:50:23 +01:00
Ulf Gebhardt	22c65aa929	renamed TypeId to TransactiontypeId ... fixed admin creation (backend part)	2022-03-04 15:12:51 +01:00
Ulf Gebhardt	ae4ad937aa	fix transaction type id - too much change	2022-03-04 14:50:20 +01:00
Ulf Gebhardt	91fda4c097	Merge branch 'master' into refactor_arithmetic_transactionlist_adminarea	2022-03-04 14:43:39 +01:00
Ulf Gebhardt	1840878513	write negative values in database when sending GDD	2022-03-04 13:39:23 +01:00
Ulf Gebhardt	ca3c07b0d8	use forEach instead of for loop in transactions, ... simplified code	2022-03-04 12:51:30 +01:00
Ulf Gebhardt	e69437cb9f	include decay in balance	2022-03-04 12:48:38 +01:00
Ulf Gebhardt	2ef0fd18fc	fix involvedUserIds calculation	2022-03-04 12:44:09 +01:00
Ulf Gebhardt	29b1d44cdd	implement KISS on transaction list length - first page contains 26 instead of 25 transactions now due to virtual decay transaction	2022-03-04 12:41:10 +01:00
Ulf Gebhardt	3af5ee13b9	properly return a result when querying an empty transaction list	2022-03-04 12:38:17 +01:00
Ulf Gebhardt	008331d43f	renamed lastUserTransaction to lastTransaction	2022-03-04 12:32:05 +01:00
Alexander Friedland	2030da653e	Merge branch 'master' into test-login-user-resolver	2022-03-04 12:31:44 +01:00
Alexander Friedland	bb547a211e	Merge branch 'master' into refactor_arithmetic_transactionlist_adminarea	2022-03-04 10:09:45 +01:00
Ulf Gebhardt	850060d057	Merge branch 'master' into refactor_arithmetic	2022-03-03 17:25:57 +01:00
Moriz Wahl	c663843758	type_id in raw sql query	2022-03-03 16:54:34 +01:00
Ulf Gebhardt	b1e6f50f44	lint fix	2022-03-01 13:27:05 +01:00
ogerly	38d53e61c0	TransactionTypeId to TypeId changed, *10000 removed, graphql refactor	2022-03-01 09:32:16 +01:00
Ulf Gebhardt	50d13b10ab	Merge branch 'combine_transaction_tables2' into refactor_arithmetic ... # Conflicts: # backend/src/config/index.ts # backend/src/graphql/model/Transaction.ts # backend/src/graphql/resolver/AdminResolver.ts # backend/src/graphql/resolver/TransactionResolver.ts # database/entity/Transaction.ts # database/src/interface/TransactionContext.ts # database/src/seeds/helpers/user-helpers.ts	2022-02-28 12:58:23 +01:00
Ulf Gebhardt	c266d58358	fixed rounding error on send amount	2022-02-28 12:28:13 +01:00
Ulf Gebhardt	c9145d8ada	lint fix	2022-02-28 12:28:13 +01:00
Ulf Gebhardt	2f37cb6e0d	trunc balance before writing to db	2022-02-28 12:28:13 +01:00