621 Commits

Author	SHA1	Message	Date
Moriz Wahl	b54278a080	Merge branch 'master' into virtual-link-transaction	2022-03-11 14:01:42 +01:00
Moriz Wahl	4affd35a44	Update backend/src/graphql/resolver/TransactionResolver.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-03-11 14:01:35 +01:00
Ulf Gebhardt	c042df8714	remove one unnecessary conditional check	2022-03-11 13:12:44 +01:00
Moriz Wahl	d62862fab8	Merge branch 'master' into virtual-link-transaction	2022-03-11 11:59:43 +01:00
Moriz Wahl	428e29f5d9	refactor: Transaction Link Query	2022-03-11 11:55:06 +01:00
Moriz Wahl	7f9745c7a4	Merge branch 'master' into remove-showEmail	2022-03-11 11:22:32 +01:00
Moriz Wahl	5300f5db12	Merge branch 'master' into remove-showEmail	2022-03-11 11:15:33 +01:00
Moriz Wahl	50092b0f15	Merge branch 'master' into delete-transaction-link-mutation	2022-03-11 11:14:23 +01:00
Moriz Wahl	e42c91f6e0	rename summary query	2022-03-11 11:07:15 +01:00
Moriz Wahl	80944978ac	only one file for virtual transactions	2022-03-11 10:58:14 +01:00
Moriz Wahl	24a0c2d1e4	no calculation in virtual link transaction	2022-03-11 10:46:24 +01:00
Moriz Wahl	120ce948cd	Update backend/src/graphql/resolver/TransactionResolver.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-03-11 10:38:37 +01:00
Moriz Wahl	762ad9fe9e	Merge branch 'master' into virtual-link-transaction	2022-03-11 10:36:41 +01:00
Moriz Wahl	df94fa8e37	improved query	2022-03-11 10:21:07 +01:00
elweyn	7e3f86f60e	Remove unused import.	2022-03-10 23:49:28 +01:00
elweyn	bfba633b78	Change the logic to store the redeemer in transactionLink table.	2022-03-10 21:52:49 +01:00
elweyn	a805f65920	Change the logic to a better argument name for redeemUserId.	2022-03-10 21:37:23 +01:00
elweyn	ade691426e	Add logic for user that redeem the link.	2022-03-10 21:24:42 +01:00
Moriz Wahl	3aa3ead86e	refactor transaction link sum query, add virtual transaction for transaction links to transaction list	2022-03-10 21:06:09 +01:00
Moriz Wahl	55455d0236	remove showEmail form model, args and resolver	2022-03-10 18:31:15 +01:00
Moriz Wahl	cb4e6da317	deleteTransactionLink mutation returns boolean, no more to does	2022-03-10 18:25:54 +01:00
Hannes Heine	92f02f9f39	Merge branch 'master' into query-transaction-link	2022-03-10 18:14:27 +01:00
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