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

Merge branch 'master' into linked-user-email

Browse Source
This commit is contained in:
Moriz Wahl 2022-03-23 21:10:45 +01:00 committed by GitHub
commit 605806fdd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/graphql/resolver/TransactionResolver.ts
View File

@ -117,6 +117,7 @@ export const executeTransaction = async (
recipientFirstName: recipient.firstName, recipientFirstName: recipient.firstName,
recipientLastName: recipient.lastName, recipientLastName: recipient.lastName,
email: recipient.email, email: recipient.email,
senderEmail: sender.email,
amount, amount,
memo, memo,
}) })

2
backend/src/mailer/sendTransactionReceivedEmail.test.ts
View File

@ -17,6 +17,7 @@ describe('sendTransactionReceivedEmail', () => {
recipientFirstName: 'Peter', recipientFirstName: 'Peter',
recipientLastName: 'Lustig', recipientLastName: 'Lustig',
email: 'peter@lustig.de', email: 'peter@lustig.de',
senderEmail: 'bibi@bloxberg.de',
amount: new Decimal(42.0), amount: new Decimal(42.0),
memo: 'Vielen herzlichen Dank für den neuen Hexenbesen!', memo: 'Vielen herzlichen Dank für den neuen Hexenbesen!',
}) })
@ -30,6 +31,7 @@ describe('sendTransactionReceivedEmail', () => {
expect.stringContaining('Hallo Peter Lustig') && expect.stringContaining('Hallo Peter Lustig') &&
expect.stringContaining('42,00 GDD') && expect.stringContaining('42,00 GDD') &&
expect.stringContaining('Bibi Bloxberg') && expect.stringContaining('Bibi Bloxberg') &&
expect.stringContaining('(bibi@bloxberg.de)') &&
expect.stringContaining('Vielen herzlichen Dank für den neuen Hexenbesen!'), expect.stringContaining('Vielen herzlichen Dank für den neuen Hexenbesen!'),
}) })
}) })

1
backend/src/mailer/sendTransactionReceivedEmail.ts
View File

@ -8,6 +8,7 @@ export const sendTransactionReceivedEmail = (data: {
recipientFirstName: string recipientFirstName: string
recipientLastName: string recipientLastName: string
email: string email: string
senderEmail: string
amount: Decimal amount: Decimal
memo: string memo: string
}): Promise<boolean> => { }): Promise<boolean> => {

3
backend/src/mailer/text/transactionReceived.ts
View File

@ -9,6 +9,7 @@ export const transactionReceived = {
recipientFirstName: string recipientFirstName: string
recipientLastName: string recipientLastName: string
email: string email: string
senderEmail: string
amount: Decimal amount: Decimal
memo: string memo: string
}): string => }): string =>
@ -16,7 +17,7 @@ export const transactionReceived = {
Du hast soeben ${data.amount.toFixed(2).replace('.', ',')} GDD von ${data.senderFirstName} ${ Du hast soeben ${data.amount.toFixed(2).replace('.', ',')} GDD von ${data.senderFirstName} ${
data.senderLastName data.senderLastName
} erhalten. } (${data.senderEmail}) erhalten.
${data.senderFirstName} ${data.senderLastName} schreibt: ${data.senderFirstName} ${data.senderLastName} schreibt:
${data.memo} ${data.memo}