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
6,887 Commits 1 Branch 0 Tags
Commit Graph

6887 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
elweyn
af3c8a4e36 Resolve merge conflicts. 2022-03-11 08:16:01 +01:00
Hannes Heine
797d270b73
Merge pull request #1586 from gradido/query-transaction-link 
Query-transaction-link
 2022-03-11 00:03:14 +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
280de3df9e Add Args for the queryTransactionLink. 2022-03-10 21:36:53 +01:00
elweyn
ade691426e Add logic for user that redeem the link. 2022-03-10 21:24:42 +01:00
elweyn
701f0549b8 Merge branch 'query-transaction-link' of https://github.com/gradido/gradido into query-transaction-link 2022-03-10 18:15:47 +01:00
Hannes Heine
92f02f9f39
Merge branch 'master' into query-transaction-link 2022-03-10 18:14:27 +01:00
elweyn
def310fa3b Add QUERY_TRANSACTION_LINK to inalienable rights. 2022-03-10 18:10:03 +01:00
Moriz Wahl
cd0287e030
Merge pull request #1585 from gradido/create-transaction-link-mutation 
feat: Create Transaction Link Mutation
 2022-03-10 18:09:54 +01:00
Moriz Wahl
47e491db84 update entity 2022-03-10 18:01:13 +01:00
Moriz Wahl
80650e60b8 remove apollo log plugin hack, improve model 2022-03-10 18:00:47 +01:00
Moriz Wahl
fae9d91004 add comment to explain why set to null in constructor 2022-03-10 16:00:15 +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
Moriz Wahl
9143990535 turn of logger when NODE_ENV === '"development"' 2022-03-10 15:05:32 +01:00
Moriz Wahl
91fe38fe8f use db values instead of null 2022-03-10 14:28:42 +01:00
Hannes Heine
70780878f5
Merge branch 'master' into query-transaction-link 2022-03-10 01:49:12 +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
8211538d6f
Merge pull request #1584 from gradido/model-transaction-link 
feat: Model Transaction Link
 2022-03-09 17:23:26 +01:00
Moriz Wahl
96dcdf0170 add deletedAt to constructor 2022-03-09 17:09:57 +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
f961772854 add soft delete to transaction link model 2022-03-09 16:51:56 +01:00
Moriz Wahl
01648aaa0d add soft delete for transaction links 2022-03-09 16:51:17 +01:00
Moriz Wahl
d4ce46b271 update db version 2022-03-09 16:34:54 +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
0bc070b784
Merge branch 'master' into model-transaction-link 2022-03-09 15:51:52 +01:00
Moriz Wahl
a84a1f0d4b
Merge pull request #1538 from gradido/test-login-user-resolver 
feat: Test Login in User Resolver
 2022-03-09 15:51:38 +01:00
Moriz Wahl
d7d232f2f4
Merge branch 'master' into test-login-user-resolver 2022-03-09 15:44:06 +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
0f3d2719d5 Merge branch 'model-transaction-link' into create-transaction-link-mutation 2022-03-09 15:15:05 +01:00
Moriz Wahl
55e50b10c7 reduce length of code in migration 2022-03-09 15:14:15 +01:00
Moriz Wahl
54dee861dd reduce length of code 2022-03-09 15:12:25 +01:00
Moriz Wahl
8bdd25cd01 add hold available amount to model 2022-03-09 15:09:01 +01:00
Moriz Wahl
14a0a4344d Add hold_available_amount column 2022-03-09 15:07:55 +01:00
Moriz Wahl
f78f2d5977 remove default dates 2022-03-09 15:01:34 +01:00
Moriz Wahl
91c7b05185 remove default dates 2022-03-09 15:00:34 +01:00
Moriz Wahl
dee6fd9d0a fix createdAt is now 2022-03-09 14:59:21 +01:00
Moriz Wahl
9550c31cac set type for redeemed by, change order 2022-03-09 14:34:29 +01:00
Moriz Wahl
ea38251c0e
Merge branch 'master' into model-transaction-link 2022-03-09 14:30:53 +01:00
Moriz Wahl
1a715f8b71 simple resolver for createTransactionLink 2022-03-09 14:30:25 +01:00
Moriz Wahl
e88f561003 rights for createTransactionLink 2022-03-09 14:29:57 +01:00
Moriz Wahl
c9d24c3b61 add constructor 2022-03-09 14:29:20 +01:00
Moriz Wahl
e8e86d6351 set DB version 2022-03-09 14:28:28 +01:00