Merge pull request #1255 from gradido/1230-Details-für-wiederholte-Email-bestaetigen-versenden

1230 details für wiederholte email bestaetigen versenden

admin/src/components/ConfirmRegisterMailFormular.spec.js

@@ -19,6 +19,7 @@ const mocks = {
 }
 
 const propsData = {
+  checked: false,
   email: 'bob@baumeister.de',
   dateLastSend: '',
 }

admin/src/components/ConfirmRegisterMailFormular.vue

@@ -1,19 +1,20 @@
 <template>
   <div class="component-confirm-register-mail">
     <div class="shadow p-3 mb-5 bg-white rounded">
-      <div class="h5">
-        {{ $t('unregister_mail.text', { date: dateLastSend, mail: email }) }}
-      </div>
+      <div v-if="checked">{{ $t('unregister_mail.text_true', { date: dateLastSend }) }}</div>
+      <div v-else>
+        {{ $t('unregister_mail.text_false', { date: dateLastSend, mail: email }) }}
 
-      <!-- Using components -->
-      <b-input-group :prepend="$t('unregister_mail.info')" class="mt-3">
-        <b-form-input readonly :value="email"></b-form-input>
-        <b-input-group-append>
-          <b-button variant="outline-success" class="test-button" @click="sendRegisterMail">
-            {{ $t('unregister_mail.button') }}
-          </b-button>
-        </b-input-group-append>
-      </b-input-group>
+        <!-- Using components -->
+        <b-input-group :prepend="$t('unregister_mail.info')" class="mt-3">
+          <b-form-input readonly :value="email"></b-form-input>
+          <b-input-group-append>
+            <b-button variant="outline-success" class="test-button" @click="sendRegisterMail">
+              {{ $t('unregister_mail.button') }}
+            </b-button>
+          </b-input-group-append>
+        </b-input-group>
+      </div>
     </div>
   </div>
 </template>
@@ -23,6 +24,9 @@ import { sendActivationEmail } from '../graphql/sendActivationEmail'
 export default {
   name: 'ConfirmRegisterMail',
   props: {
+    checked: {
+      type: Boolean,
+    },
     email: {
       type: String,
     },

admin/src/components/UserTable.vue

@@ -107,6 +107,7 @@
           </template>
           <template #show-register-mail>
             <confirm-register-mail-formular
+              :checked="row.item.emailChecked"
               :email="row.item.email"
               :dateLastSend="$moment().subtract(1, 'month').format('dddd, DD.MMMM.YYYY HH:mm'),"
             />

admin/src/locales/de.json

@@ -59,7 +59,8 @@
     "error": "Fehler beim Senden des Bestätigungs-Links an den Benutzer: {message}",
     "info": "Email bestätigen, wiederholt senden an:",
     "success": "Erfolgreiches Senden des Bestätigungs-Links an die E-Mail des Nutzers! ({email})",
-    "text": " Die letzte Email wurde am <b>{date} Uhr</b> an das Mitglied ({mail}) gesendet."
+    "text_false": " Die letzte Email wurde am {date} Uhr an das Mitglied ({mail}) gesendet.",
+    "text_true": " Die Email wurde am {date} Uhr bestätigt."
   },
   "user_search": "Nutzer-Suche"
 }

admin/src/locales/en.json

@@ -59,7 +59,8 @@
     "error": "Error sending the confirmation link to the user: {message}",
     "info": "Confirm email, send repeatedly to:",
     "success": "Successfully send the confirmation link to the user's email! ({email})",
-    "text": " The last email was sent to the member ({mail}) on <b>{date} clock</b>."
+    "text_false": "The last email was sent to the member ({mail}) on {date} clock.",
+    "text_true": "The email was confirmed on {date} clock."
   },
   "user_search": "User search"
 }