Merge branch 'master' into 2285-mark-creation-via-link

admin/src/components/ContributionLink/ContributionLink.spec.js

@@ -46,5 +46,10 @@ describe('ContributionLink', () => {
       wrapper.vm.editContributionLinkData()
       expect(wrapper.vm.$root.$emit('bv::toggle::collapse', 'newContribution')).toBeTruthy()
     })
+
+    it('emits toggle::collapse close Contribution-Form ', async () => {
+      wrapper.vm.closeContributionForm()
+      expect(wrapper.vm.$root.$emit('bv::toggle::collapse', 'newContribution')).toBeTruthy()
+    })
   })
 })

admin/src/components/ContributionLink/ContributionLink.vue

@@ -8,7 +8,11 @@
       header-class="text-center"
       class="mt-5"
     >
-      <b-button v-b-toggle.newContribution class="my-3 d-flex justify-content-left">
+      <b-button
+        v-if="!editContributionLink"
+        v-b-toggle.newContribution
+        class="my-3 d-flex justify-content-left"
+      >
         {{ $t('math.plus') }} {{ $t('contributionLink.newContributionLink') }}
       </b-button>
 
@@ -19,6 +23,7 @@
             :contributionLinkData="contributionLinkData"
             :editContributionLink="editContributionLink"
             @get-contribution-links="$emit('get-contribution-links')"
+            @closeContributionForm="closeContributionForm"
           />
         </b-card>
       </b-collapse>
@@ -29,6 +34,7 @@
           :items="items"
           @editContributionLinkData="editContributionLinkData"
           @get-contribution-links="$emit('get-contribution-links')"
+          @closeContributionForm="closeContributionForm"
         />
         <div v-else>{{ $t('contributionLink.noContributionLinks') }}</div>
       </b-card-text>
@@ -63,8 +69,17 @@ export default {
     }
   },
   methods: {
+    closeContributionForm() {
+      if (this.visible) {
+        this.$root.$emit('bv::toggle::collapse', 'newContribution')
+        this.editContributionLink = false
+        this.contributionLinkData = {}
+      }
+    },
     editContributionLinkData(data) {
-      if (!this.visible) this.$root.$emit('bv::toggle::collapse', 'newContribution')
+      if (!this.visible) {
+        this.$root.$emit('bv::toggle::collapse', 'newContribution')
+      }
       this.contributionLinkData = data
       this.editContributionLink = true
     },

admin/src/components/ContributionLink/ContributionLinkForm.vue

@@ -6,6 +6,7 @@
         <b-col>
           <b-form-group :label="$t('contributionLink.validFrom')">
             <b-form-datepicker
+              reset-button
               v-model="form.validFrom"
               size="lg"
               :min="min"
@@ -19,6 +20,7 @@
         <b-col>
           <b-form-group :label="$t('contributionLink.validTo')">
             <b-form-datepicker
+              reset-button
               v-model="form.validTo"
               size="lg"
               :min="form.validFrom ? form.validFrom : min"
@@ -110,6 +112,9 @@
         <b-button type="reset" variant="danger" @click.prevent="onReset">
           {{ $t('contributionLink.clear') }}
         </b-button>
+        <b-button @click.prevent="$emit('closeContributionForm')">
+          {{ $t('contributionLink.close') }}
+        </b-button>
       </div>
     </b-form>
   </div>
@@ -192,6 +197,7 @@ export default {
     },
     onReset() {
       this.$refs.contributionLinkForm.reset()
+      this.form = {}
       this.form.validFrom = null
       this.form.validTo = null
     },
@@ -203,14 +209,7 @@ export default {
   },
   watch: {
     contributionLinkData() {
-      this.form.name = this.contributionLinkData.name
-      this.form.memo = this.contributionLinkData.memo
-      this.form.amount = this.contributionLinkData.amount
-      this.form.validFrom = this.contributionLinkData.validFrom
-      this.form.validTo = this.contributionLinkData.validTo
-      this.form.cycle = this.contributionLinkData.cycle
-      this.form.maxPerCycle = this.contributionLinkData.maxPerCycle
-      this.form.maxAmountPerMonth = this.contributionLinkData.maxAmountPerMonth
+      this.form = this.contributionLinkData
     },
   },
 }

admin/src/components/ContributionLink/ContributionLinkList.vue

@@ -108,6 +108,7 @@ export default {
               })
               .then(() => {
                 this.toastSuccess(this.$t('contributionLink.deleted'))
+                this.$emit('closeContributionForm')
                 this.$emit('get-contribution-links')
               })
               .catch((err) => {

admin/src/locales/de.json

@@ -5,6 +5,7 @@
     "amount": "Betrag",
     "changeSaved": "Änderungen gespeichert",
     "clear": "Löschen",
+    "close": "Schließen",
     "contributionLinks": "Beitragslinks",
     "create": "Anlegen",
     "cycle": "Zyklus",
@@ -97,7 +98,7 @@
   "multiple_creation_text": "Bitte wähle ein oder mehrere Mitglieder aus für die du Schöpfen möchtest.",
   "name": "Name",
   "navbar": {
-    "automaticContributions": "automatische Beiträge",
+    "automaticContributions": "Automatische Beiträge",
     "logout": "Abmelden",
     "multi_creation": "Mehrfachschöpfung",
     "my-account": "Mein Konto",

admin/src/locales/en.json

@@ -5,6 +5,7 @@
     "amount": "Amount",
     "changeSaved": "Changes saved",
     "clear": "Clear",
+    "close": "Close",
     "contributionLinks": "Contribution Links",
     "create": "Create",
     "cycle": "Cycle",

frontend/src/components/LinkInformations/RedeemLoggedOut.vue

@@ -13,7 +13,6 @@
           <b-button variant="primary" :to="register">
             {{ $t('gdd_per_link.to-register') }}
           </b-button>
-          <p class="mt-3">{{ $t('gdd_per_link.isFree') }}</p>
         </b-col>
         <b-col sm="12" md="6" class="mt-xs-6 mt-sm-6 mt-md-0">
           <p>{{ $t('gdd_per_link.has-account') }}</p>

frontend/src/locales/de.json

@@ -288,16 +288,12 @@
     "forgotPassword": {
       "heading": "Bitte gib deine E-Mail an mit der du bei Gradido angemeldet bist."
     },
-    "login": {
-      "heading": "Melde dich mit deinen Zugangsdaten an. Bewahre sie stets sicher auf!"
-    },
     "resetPassword": {
       "heading": "Trage bitte dein Passwort ein und wiederhole es."
     },
     "signup": {
       "agree": "Ich stimme der <a href='https://gradido.net/de/datenschutz/' target='_blank' >Datenschutzerklärung</a> zu.",
       "dont_match": "Die Passwörter stimmen nicht überein.",
-      "heading": "Registriere dich indem du alle Daten vollständig und in die richtigen Felder eingibst.",
       "lowercase": "Ein Kleinbuchstabe erforderlich.",
       "minimum": "Mindestens 8 Zeichen.",
       "no-whitespace": "Keine Leerzeichen und Tabulatoren",

frontend/src/locales/en.json

@@ -288,16 +288,12 @@
     "forgotPassword": {
       "heading": "Please enter the email address by which you're registered here."
     },
-    "login": {
-      "heading": "Sign in with your access data. Keep them safe!"
-    },
     "resetPassword": {
       "heading": "Please enter your password and repeat it."
     },
     "signup": {
       "agree": "I agree to the <a href='https://gradido.net/en/datenschutz/' target='_blank' > privacy policy</a>.",
       "dont_match": "Passwords don't match.",
-      "heading": "Register by entering all data completely and in the correct fields.",
       "lowercase": "One lowercase letter required.",
       "minimum": "8 characters minimum.",
       "no-whitespace": "No white spaces and tabs",

frontend/src/locales/es.json

@@ -288,16 +288,12 @@
     "forgotPassword": {
       "heading": "Por favor, introduce la dirección de correo electrónico con la que estas registrado en Gradido."
     },
-    "login": {
-      "heading": "Inicia sesión con tus datos de acceso. Manténlos seguros en todo momento!"
-    },
     "resetPassword": {
       "heading": "Por favor, introduce tu contraseña y repítela."
     },
     "signup": {
       "agree": "Acepto la <a href='https://gradido.net/de/datenschutz/' target='_blank' >Política de privacidad</a>.",
       "dont_match": "Las contraseñas no coinciden.",
-      "heading": "Regístrate introduciendo todos los datos completos y en los campos correctos.",
       "lowercase": "Se requiere una letra minúscula.",
       "minimum": "Al menos 8 caracteres.",
       "no-whitespace": "Sin espacios ni tabulaciones.",

frontend/src/locales/fr.json

@@ -288,16 +288,12 @@
     "forgotPassword": {
       "heading": "Veuillez entrer l´adresse email sous laquelle vous êtes enregistré ici svp."
     },
-    "login": {
-      "heading": "Vous connecter avec vos données d´accès. Gardez les en sécurité!"
-    },
     "resetPassword": {
       "heading": "Entrez votre mot de passe et répétez l´action svp."
     },
     "signup": {
       "agree": "J´accepte le <a href='https://gradido.net/en/datenschutz/' target='_blank' > politique de confidentialité </a>.",
       "dont_match": "Les mots de passe ne correspondent pas.",
-      "heading": "Vous enregistrer en entrant toutes les données demandées dans les champs requis.",
       "lowercase": "Une lettre minuscule est requise.",
       "minimum": "8 caractères minimum.",
       "no-whitespace": "Pas d´espace ni d´onglet",

frontend/src/locales/nl.json

@@ -288,16 +288,12 @@
     "forgotPassword": {
       "heading": "Geef alsjeblieft jouw email, waarmee je bij Gradido aangemeld bent."
     },
-    "login": {
-      "heading": "Meld je met jouw inloggegevens aan. Sla deze altijd veilig op!"
-    },
     "resetPassword": {
       "heading": "Vul alsjeblieft jouw wachtwoord in, en herhaal het."
     },
     "signup": {
       "agree": "Ik ga akkoord met <a href='https://gradido.net/de/datenschutz/' target='_blank' >Datenschutzerklärung</a>.",
       "dont_match": "De wachtwoorden zijn niet gelijk.",
-      "heading": "Schrijf je in door alle gegevens volledig en in de juiste velden in te vullen.",
       "lowercase": "Een kleine letter is noodzakelijk.",
       "minimum": "Minstens 8 tekens.",
       "no-whitespace": "Geen spaties en tabs",

frontend/src/pages/InfoStatistic.vue

@@ -47,7 +47,7 @@
     </b-container>
     <b-container>
       <div class="h3">{{ $t('contact') }}</div>
-      <b-link href="mailto: abc@example.com">{{ supportMail }}</b-link>
+      <b-link :href="`mailto:${supportMail}`">{{ supportMail }}</b-link>
     </b-container>
     <!-- 
     <hr />

frontend/src/pages/Login.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login-form">
     <b-container v-if="enterData">
-      <div class="pb-5">{{ $t('site.login.heading') }}</div>
+      <div class="pb-5" align="center">{{ $t('gdd_per_link.isFree') }}</div>
       <validation-observer ref="observer" v-slot="{ handleSubmit }">
         <b-form @submit.stop.prevent="handleSubmit(onSubmit)">
           <b-row>

frontend/src/pages/Register.vue

@@ -1,9 +1,7 @@
 <template>
   <div id="registerform">
     <b-container v-if="enterData">
-      <div class="pb-5">
-        {{ $t('site.signup.heading') }}
-      </div>
+      <div class="pb-5" align="center">{{ $t('gdd_per_link.isFree') }}</div>
       <validation-observer ref="observer" v-slot="{ handleSubmit }">
         <b-form role="form" @submit.prevent="handleSubmit(onSubmit)">
           <b-row>