364 Commits

Author SHA1 Message Date
Moriz Wahl
ef79580387 required argument client time zone offset for utils in creation 2022-11-15 14:20:33 +01:00
Moriz Wahl
d36fee0302 change order off arguements, implement changes for admin and contribution resolver 2022-11-15 14:10:18 +01:00
Moriz Wahl
2b27e6aaa8 test for valid date string for creation date 2022-11-10 19:18:01 +01:00
Hannes Heine
7d26669f99
Update backend/src/graphql/resolver/AdminResolver.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2022-11-09 09:28:07 +01:00
elweyn
c2fc4feb6a Call method to send Email if contribution is rejected. 2022-11-07 10:11:14 +01:00
joseji
7662d281f7 fixed test with new info 2022-10-25 12:37:08 +02:00
joseji
2bf1bd6d36 fixed collisions 2022-10-25 12:01:30 +02:00
elweyn
c9f8b70201 Resolve merge conflict. 2022-10-13 17:17:39 +02:00
Moriz Wahl
795a16627c
Merge branch 'master' into do-not-list-expired-contribution-links 2022-10-13 15:55:03 +02:00
Moriz Wahl
bc2889a9f8 fix: Disable Change of Month for Update Contribution (wallet and admin) 2022-10-11 20:44:41 +02:00
Moriz Wahl
7286389b87 filter contribution link list by valid to 2022-10-11 20:03:00 +02:00
joseji
a50871185f new contribution related admin events implemented and working 2022-10-07 12:47:07 +02:00
joseji
0f1f9baa8d added tests for events 2022-09-28 11:57:49 +02:00
joseji
33eeab344f added missing error logs 2022-09-28 11:14:16 +02:00
joseji
2ca9945a1b added missing events 2022-09-28 11:09:14 +02:00
elweyn
186e6711f5 Remove unused import. 2022-09-26 09:10:58 +02:00
elweyn
fefdf9f0fa Merge master and resolve merge conflict. 2022-09-26 08:53:25 +02:00
elweyn
209c61e5d8 Change call from Contribution to DbContribution and use Contribution as model. 2022-09-26 08:48:04 +02:00
Hannes Heine
9bab013847
Merge branch 'master' into 2198-adminarea-more-dates-on-created-transaction 2022-09-26 08:27:22 +02:00
elweyn
8c69b94e8e Throw error if moderator tries to deleted own contribution created as user. Add deletedby value. 2022-09-23 16:25:22 +02:00
elweyn
00d0068efc Remove unused imports. 2022-09-21 13:44:42 +02:00
elweyn
5aa499a073 Change the result for the FE so that we get datas from the contribution table instead of the transaction table. 2022-09-21 13:31:19 +02:00
Claus-Peter Hübner
86b12f98ed set overall resolvers the isolationlevel to REPEATABLE READ 2022-09-16 15:20:51 +02:00
Claus-Peter Hübner
3fcc62539a changes after merge from master 2022-09-16 15:14:51 +02:00
clauspeterhuebner
d592c57024
Merge branch 'master' into 1798-feature-gradidoid-1-adapt-and-migrate-database-schema 2022-09-15 17:56:21 +02:00
Hannes Heine
e3c6918436
Merge branch 'master' into 2095-send-email-contribution-confirmed 2022-09-15 16:33:16 +02:00
Claus-Peter Hübner
411e03c843 rework PR comments 2022-09-15 02:40:59 +02:00
Claus-Peter Hübner
13d79fd8b7 remove multi-line comments 2022-09-14 23:00:47 +02:00
elweyn
d65bd827ca Change search to get the contribution.user instead of queriing it after wards. 2022-09-14 09:03:28 +02:00
Claus-Peter Hübner
7cd5ecb463 linting 2022-09-12 19:02:12 +02:00
Claus-Peter Hübner
e6155d52e1 solve error 2022-09-12 18:34:21 +02:00
Claus-Peter Hübner
94f15f7475 Merge remote-tracking branch 'origin/master' into
1798-feature-gradidoid-1-adapt-and-migrate-database-schema
2022-09-12 18:18:46 +02:00
elweyn
7ab7380f09 Call new method to send confirmedContribution EMail to the user. 2022-09-12 11:36:24 +02:00
elweyn
93e7684eda Change import to the new file. 2022-09-09 14:44:00 +02:00
elweyn
663097c378 Fix data with named contributionMemo instead. 2022-09-09 07:52:04 +02:00
elweyn
d73143cfdf Call method to send Email when an admin add a new contributionmessage. 2022-09-09 07:42:27 +02:00
Hannes Heine
4bb8ced489
Merge branch 'master' into add-is-moderator-to-contribution-message 2022-09-06 15:18:08 +02:00
elweyn
ecc42b49fa Add isModerator to the createContributionMessage calls. 2022-09-06 11:23:57 +02:00
elweyn
ced14bd752 Change error message Admin can not answer on own contribution. 2022-09-06 10:59:32 +02:00
elweyn
04b96bac2f Throw error if moderator tries to answer his own contribution in adminCreateContributionMessage. 2022-09-06 10:39:20 +02:00
Claus-Peter Hübner
eedaf9e6e3 unit tests of AdminResolver now with Users and UserContacts 2022-08-31 23:04:55 +02:00
Claus-Peter Hübner
faa0500f10 adapt seeding using User and UserContact 2022-08-31 15:44:41 +02:00
Claus-Peter Hübner
228451574d adapt backend on database migration of UserContacts 2022-08-26 02:28:04 +02:00
elweyn
ead31344f5 Remove leftJoin on user and remove messages from UnconfirmedContribution model added messageCount instead to the model. 2022-08-25 15:16:44 +02:00
elweyn
cdb306dc85 Change the query to get the messages and the user of a message. 2022-08-25 09:52:33 +02:00
elweyn
0271a42741 Use user entity instead of user model. 2022-08-24 10:56:19 +02:00
elweyn
2c459a8fae Changed the Contribution.find so that we can throw a specific error, added an GraphQL Model as return value instead of DbEntity. 2022-08-23 11:55:34 +02:00
elweyn
e70a18c6bb Change thrown error message. 2022-08-23 11:09:41 +02:00
elweyn
5ca422c6d3 Change import for enum and arg. 2022-08-22 12:27:06 +02:00
elweyn
710d47b594 Add adminCreateContributionMessage. 2022-08-22 12:21:38 +02:00