From 5139209d706f70be67b1793c823ebffc808a0a71 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 8 May 2023 09:03:37 +0200
Subject: [PATCH] apply layout to transaction related email templates

---
 .../transactionLinkRedeemed/html.pug          | 31 ++++++++++---------
 .../templates/transactionReceived/html.pug    | 31 ++++++++++---------
 backend/src/locales/de.json                   |  5 +--
 backend/src/locales/en.json                   |  1 +
 4 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/backend/src/emails/templates/transactionLinkRedeemed/html.pug b/backend/src/emails/templates/transactionLinkRedeemed/html.pug
index 30146e27f..1602a0072 100644
--- a/backend/src/emails/templates/transactionLinkRedeemed/html.pug
+++ b/backend/src/emails/templates/transactionLinkRedeemed/html.pug
@@ -1,19 +1,20 @@
-doctype html
-html(lang=locale)
-  head
-    title= t('emails.transactionLinkRedeemed.subject', { senderFirstName, senderLastName })
-  body
-    h1(style='margin-bottom: 24px;')= t('emails.transactionLinkRedeemed.subject', { senderFirstName, senderLastName })
-    #container.col
-      include ../hello.pug
-      p= t('emails.transactionLinkRedeemed.hasRedeemedYourLink', { senderFirstName, senderLastName, senderEmail })
-      p
+extend ../layout.pug
+
+block content
+  .wrapper.wf-section
+    .w-container(class="wrapper_head")
+      h1.headline.h1=  t('emails.transactionLinkRedeemed.hasRedeemedYourLink', { senderFirstName, senderLastName, senderEmail })
+      .text-block
+        include ../includes/salutation.pug
+        p= t('emails.transactionLinkRedeemed.hasRedeemedYourLink', { senderFirstName, senderLastName, senderEmail })
+    .content.w-container
+      h2.heading= t('emails.general.transactionDetails')
+      div(class="p_content")
         = t('emails.general.amountGDD', { amountGDD: transactionAmount })
         br
         = t('emails.transactionLinkRedeemed.memo', { transactionMemo })
-      p
+        br
         = t('emails.general.detailsYouFindOnLinkToYourAccount')
-        = " "
-        a(href=overviewURL) #{overviewURL}
-      p= t('emails.general.pleaseDoNotReply')
-      include ../greatingFormularImprint.pug
+      a.button-3.w-button(href="https://gdd.gradido.net/transactions") #{t('emails.toAccount.toAccount')}
+
+      include ../includes/doNotReply.pug
diff --git a/backend/src/emails/templates/transactionReceived/html.pug b/backend/src/emails/templates/transactionReceived/html.pug
index e6807f539..d7e358547 100644
--- a/backend/src/emails/templates/transactionReceived/html.pug
+++ b/backend/src/emails/templates/transactionReceived/html.pug
@@ -1,15 +1,16 @@
-doctype html
-html(lang=locale)
-  head
-    title= t('emails.transactionReceived.subject', { senderFirstName, senderLastName, transactionAmount })
-  body
-    h1(style='margin-bottom: 24px;')= t('emails.transactionReceived.subject', { senderFirstName, senderLastName, transactionAmount })
-    #container.col
-      include ../hello.pug
-      p= t('emails.transactionReceived.haveReceivedAmountGDDFrom', { transactionAmount, senderFirstName, senderLastName, senderEmail })
-      p
-        = t('emails.general.detailsYouFindOnLinkToYourAccount')
-        = " "
-        a(href=overviewURL) #{overviewURL}
-      p= t('emails.general.pleaseDoNotReply')
-      include ../greatingFormularImprint.pug
+extend ../layout.pug
+
+block content
+  .wrapper.wf-section
+    .w-container(class="wrapper_head")
+      h1.headline.h1= t('emails.transactionReceived.title', { senderFirstName, senderLastName, transactionAmount })
+      .text-block
+        include ../includes/salutation.pug
+        p= t('emails.transactionReceived.haveReceivedAmountGDDFrom', { transactionAmount, senderFirstName, senderLastName, senderEmail })
+    .content.w-container
+      h2.heading= t('emails.general.transactionDetails')
+      div(class="p_content") = t('emails.general.detailsYouFindOnLinkToYourAccount')
+      a.button-3.w-button(href="https://gdd.gradido.net/transactions") #{t('emails.toAccount.toAccount')}
+
+      include ../includes/doNotReply.pug
+
diff --git a/backend/src/locales/de.json b/backend/src/locales/de.json
index c7e689d78..c32614ae1 100644
--- a/backend/src/locales/de.json
+++ b/backend/src/locales/de.json
@@ -36,12 +36,12 @@
     "contributionDeleted": {
       "commonGoodContributionDeleted": "dein Gemeinwohl-Beitrag „{contributionMemo}“ wurde von {senderFirstName} {senderLastName} gelöscht.",
       "subject": "Gradido: Dein Gemeinwohl-Beitrag wurde gelöscht",
-      "title": "Dein Gemeinwohl-Beitrag wurde gelöscht",
+      "title": "Dein Gemeinwohl-Beitrag wurde gelöscht"
     },
     "contributionDenied": {
       "commonGoodContributionDenied": "dein Gemeinwohl-Beitrag „{contributionMemo}“ wurde von {senderFirstName} {senderLastName} abgelehnt.",
       "subject": "Gradido: Dein Gemeinwohl-Beitrag wurde abgelehnt",
-      "title": "Dein Gemeinwohl-Beitrag wurde abgelehnt",
+      "title": "Dein Gemeinwohl-Beitrag wurde abgelehnt"
     },
     "footer": {
       "contactOurSupport": "Bei weiteren fragen kontaktiere bitte unseren Support.",
@@ -64,6 +64,7 @@
       "reset": "zurücksetzen",
       "sincerelyYours": "Liebe Grüße",
       "toAccount": "Zum Konto",
+      "transactionDetails": "Transaktionsdetails",
       "yourGradidoTeam": "dein Gradido-Team"
     },
     "resetPassword": {
diff --git a/backend/src/locales/en.json b/backend/src/locales/en.json
index 637f47715..1c32f0480 100644
--- a/backend/src/locales/en.json
+++ b/backend/src/locales/en.json
@@ -64,6 +64,7 @@
       "reset": "reset",
       "sincerelyYours": "Kind regards,",
       "toAccount": "To account",
+      "transactionDetails": "Transaction details",
       "yourGradidoTeam": "your Gradido team"
     },
     "resetPassword": {