313 Commits

Author SHA1 Message Date
elweyn
e440bb10b7 Adding right to search pending creation. 2021-12-30 13:59:39 +01:00
elweyn
56021489f8 Adding right to update pending creation. 2021-12-30 13:58:47 +01:00
elweyn
6e27c31d3c Adding right to create pending creation. 2021-12-30 13:57:28 +01:00
Hannes Heine
b9efa4b048
Merge branch 'master' into remove_self_creation_confirmation 2021-12-30 13:50:50 +01:00
Moriz Wahl
6a666edc9f test account activation email is sent 2021-12-27 20:48:39 +01:00
elweyn
dae95c7f65 Authorized function for each AdminResolver funktions, adding a check that pendingCreation userId different from moderator id. 2021-12-27 10:19:11 +01:00
Hannes Heine
634d2278b2
Merge branch 'master' into adminCreateMultiplePendingCreations 2021-12-22 15:38:18 +01:00
Hannes Heine
69ffa165d5
Update backend/src/graphql/resolver/AdminResolver.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2021-12-21 16:38:16 +01:00
elweyn
967e47908a Remove the console.log, remove unused Int. 2021-12-21 15:39:53 +01:00
elweyn
84b81f6dc4 Remove console.log and commented code. 2021-12-21 14:38:18 +01:00
Hannes Heine
003c534f47
Merge branch 'master' into adminCreateMultiplePendingCreations 2021-12-21 13:17:11 +01:00
elweyn
51168b9ab0 Merge changes on the UserResolver with the changes in master. 2021-12-21 12:32:46 +01:00
elweyn
75cbea2321 Change the transactionList query so we can get only creation and get the list for specific users. 2021-12-20 15:15:51 +01:00
ogerly
8e974bbc22 Check for emailChecked in the user search and giving the value to the UserTable 2021-12-20 10:01:53 +01:00
Hannes Heine
04bea42261
Merge branch 'master' into adminCreateMultiplePendingCreations 2021-12-20 09:11:47 +01:00
Hannes Heine
fedd1d626d
Merge branch 'master' into 1165-refactor-admin-interface 2021-12-17 08:47:59 +01:00
Hannes Heine
07d4bcf258
Merge branch 'master' into 1145-refactor-admin-resolver-from-master 2021-12-14 08:06:30 +01:00
Hannes Heine
eee0964158
Merge branch 'master' into 1165-refactor-admin-interface 2021-12-14 05:39:24 +01:00
elweyn
f787a7470f Moved reverse of the getPendingCreations to the AdminResolver instead to do it in the CreationConfirm page. 2021-12-13 12:33:36 +01:00
Hannes Heine
f58225df4f
Merge branch 'master' into fix-coin-creation-balanceDate-entry 2021-12-13 11:27:46 +01:00
elweyn
fb001b8886 Change emplacement of receivedDate after possible errors so we don't create the object when we don't need it. 2021-12-13 11:26:30 +01:00
elweyn
284984c296 When creating coins we store the receivedDate at the start of the call and write this value in each date field. 2021-12-13 11:24:09 +01:00
elweyn
a0f6ec65d8 Merge master resolve merge conflict. 2021-12-13 11:19:06 +01:00
Hannes Heine
610d9cf039
Merge branch 'master' into 1145-refactor-admin-resolver-from-master 2021-12-11 11:11:53 +01:00
fba757228c
renamed pendingCreations into loginPendingTasksAdmin as to our naming conventions 2021-12-10 17:03:34 +01:00
elweyn
cb3c600216 Adding decay calculation to the creation. 2021-12-10 12:10:38 +01:00
elweyn
40dff50364 state-balance balanceDate can't get the date of the last transaction cause creation is a new transaction. 2021-12-10 11:54:00 +01:00
elweyn
56dd218ee2 Fix updatePendingCreation amount that is send back. 2021-12-10 09:14:22 +01:00
elweyn
9eb4e8603a Withdrew * 10000 and / 10000 since we need to store the full value. 2021-12-10 09:08:54 +01:00
ogerly
79fb25d51e Finalizing the mass creation. 2021-12-09 14:14:49 +01:00
ogerly
5ca221a0c0 Added the new mutation to the admin, Implemented the send massCreation in admin, changed the log entries for not created pendingcreation. 2021-12-09 11:53:21 +01:00
elweyn
9237f139f2 Error in UpdatePendingCreationArgs changed export name, Added an InputType over the ArgsType for the CreatePendingCreationArgs, added a createPendingCreations mutation that creates multiple PendingCreation. 2021-12-09 11:13:07 +01:00
elweyn
bb6a260ab2 Clean-up code. 2021-12-08 14:56:01 +01:00
elweyn
b77766b04d Adding the pending and confirmed creation in a map and return old array. 2021-12-08 14:51:10 +01:00
elweyn
6451d75a6e Changed queries so that we get groupBy sum and orderBy date. 2021-12-08 14:02:56 +01:00
elweyn
f9c8a6861c Get's every creation of last 3 month. 2021-12-08 13:40:07 +01:00
elweyn
a6443317a9 Getting sum of last 3 month, not ordered by month. 2021-12-08 13:16:17 +01:00
elweyn
77754760d5 WIP: Adding login_pending_tasks_admin query. 2021-12-08 12:48:02 +01:00
elweyn
4d959470ce WIP: Change the getUserCreations function. 2021-12-08 12:48:02 +01:00
elweyn
e84f30c1fc Merge changes to deletePendingCreation branch. 2021-12-06 14:11:13 +01:00
elweyn
48b7c9a0af Delete button sends call to Adminresolver deletePendingCreation. 2021-12-06 13:45:50 +01:00
elweyn
2c2e56024d Merge branch 'adminDeletePendingCreationQuery' into adminConfirmPendingCreation 2021-12-03 17:17:41 +01:00
ogerly
688ae36d8f Remove unused import and console log. 2021-12-03 17:00:40 +01:00
ogerly
6e250cb63b Remove console.log. 2021-12-03 16:49:03 +01:00
ogerly
df393c4ea8 Fixe calculation of the new balance. 2021-12-03 16:46:14 +01:00
ogerly
0da5c3d2c8 Store the right amount in the database. 2021-12-03 16:27:01 +01:00
elweyn
a07d34d827 Added a state_user_transaction row. withdrew / 10000 from frontend. 2021-12-03 14:25:00 +01:00
elweyn
7b3096a88b Change mutation id from int to float and changed the findOrFail parameter to simply id. 2021-12-03 12:41:24 +01:00
ogerly
a93792cab8 Mutation for confirmPendingCreation. 2021-12-02 10:55:39 +01:00
elweyn
2192863377 --author=ogerly <fridolin@tutanota.com>
creation store prepared
2021-12-02 09:06:54 +01:00