2999 Commits

Author SHA1 Message Date
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
elweyn
ffe3cdf700 Config of resendTime to resendPassword logic 2021-12-17 11:12:52 +01:00
elweyn
da527dd162 Database logics when resending activation link 2021-12-17 11:04:12 +01:00
elweyn
7f650b9755 Adding a configurable resend_time in minutes. 2021-12-17 11:01:23 +01:00
elweyn
8c5fff73ef Refactoring of the sendActivationEmail so that we can send another email with a new activation link. 2021-12-17 09:49:45 +01:00
Hannes Heine
fedd1d626d
Merge branch 'master' into 1165-refactor-admin-interface 2021-12-17 08:47:59 +01:00
8edd750912
fixed optIn Code generation - a new Code is now generated when the 10 min delay is expired 2021-12-16 12:30:04 +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
67a9f2d0e0 Change the amount argument type to float for updatePendingCreation. 2021-12-13 13:17:04 +01:00
elweyn
4c9ebea6b6 Change the amount argument to float for creation of pending creation 2021-12-13 13:16:27 +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
c7fbb9b0bf Changed the Login error handling so that we get the no-account message in case of a specific error, else we send the user to /reset/login 2021-12-07 10:19:29 +01:00
Hannes Heine
963d7de628
Merge branch 'master' into login_call_resetPassword 2021-12-07 10:15:21 +01:00
452beec07c
Merge branch 'master' into login_call_resetPassword 2021-12-07 00:26:23 +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
bbd54ef607
Merge branch 'master' into login_call_resetPassword 2021-12-06 13:42:48 +01:00
ogerly
b8854f9365 Change the lastUserTransaction.balance and multiplied it by 10000 2021-12-04 10:38:25 +01:00
elweyn
2c2e56024d Merge branch 'adminDeletePendingCreationQuery' into adminConfirmPendingCreation 2021-12-03 17:17:41 +01:00
elweyn
63ebbf2eda Merge branch 'adminEditPendingCreationQueries' into adminDeletePendingCreationQuery 2021-12-03 17:16:21 +01:00
ogerly
180dea4caf Merge adminPendingCreationQueries 2021-12-03 17:15:59 +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
f6d42e7236 add eslint-disable,@typescript-eslint/no-explicit-any @typescript-eslint/explicit-module-boundary-types 2021-12-02 12:51:07 +01:00