diff --git a/admin/src/components/ContributionLink/ContributionLink.spec.js b/admin/src/components/ContributionLink/ContributionLink.spec.js index 9818e8b93..b72a0347c 100644 --- a/admin/src/components/ContributionLink/ContributionLink.spec.js +++ b/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() + }) }) }) diff --git a/admin/src/components/ContributionLink/ContributionLink.vue b/admin/src/components/ContributionLink/ContributionLink.vue index a2d171d56..ca82fcd42 100644 --- a/admin/src/components/ContributionLink/ContributionLink.vue +++ b/admin/src/components/ContributionLink/ContributionLink.vue @@ -8,7 +8,11 @@ header-class="text-center" class="mt-5" > - + {{ $t('math.plus') }} {{ $t('contributionLink.newContributionLink') }} @@ -19,6 +23,7 @@ :contributionLinkData="contributionLinkData" :editContributionLink="editContributionLink" @get-contribution-links="$emit('get-contribution-links')" + @closeContributionForm="closeContributionForm" /> @@ -29,6 +34,7 @@ :items="items" @editContributionLinkData="editContributionLinkData" @get-contribution-links="$emit('get-contribution-links')" + @closeContributionForm="closeContributionForm" />
{{ $t('contributionLink.noContributionLinks') }}
@@ -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 }, diff --git a/admin/src/components/ContributionLink/ContributionLinkForm.vue b/admin/src/components/ContributionLink/ContributionLinkForm.vue index 05f5dac8b..2afd8e1c5 100644 --- a/admin/src/components/ContributionLink/ContributionLinkForm.vue +++ b/admin/src/components/ContributionLink/ContributionLinkForm.vue @@ -6,6 +6,7 @@ {{ $t('contributionLink.clear') }} + + {{ $t('contributionLink.close') }} + @@ -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 }, }, } diff --git a/admin/src/components/ContributionLink/ContributionLinkList.vue b/admin/src/components/ContributionLink/ContributionLinkList.vue index c99821097..f67feced2 100644 --- a/admin/src/components/ContributionLink/ContributionLinkList.vue +++ b/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) => { diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json index ffe1cab24..456290ca7 100644 --- a/admin/src/locales/de.json +++ b/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", diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json index b32efe97e..9bff733c5 100644 --- a/admin/src/locales/en.json +++ b/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", diff --git a/frontend/src/components/LinkInformations/RedeemLoggedOut.vue b/frontend/src/components/LinkInformations/RedeemLoggedOut.vue index 6673b3c5b..bbad3f9fb 100644 --- a/frontend/src/components/LinkInformations/RedeemLoggedOut.vue +++ b/frontend/src/components/LinkInformations/RedeemLoggedOut.vue @@ -13,7 +13,6 @@ {{ $t('gdd_per_link.to-register') }} -

{{ $t('gdd_per_link.isFree') }}

{{ $t('gdd_per_link.has-account') }}

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index de5033071..aa1b02871 100644 --- a/frontend/src/locales/de.json +++ b/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 Datenschutzerklärung 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", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 260aaa221..2b455d599 100644 --- a/frontend/src/locales/en.json +++ b/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 privacy policy.", "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", diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json index b2a229f1c..2c7e4c4ba 100644 --- a/frontend/src/locales/es.json +++ b/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 Política de privacidad.", "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.", diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json index e7ac18a18..98d2e5a10 100644 --- a/frontend/src/locales/fr.json +++ b/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 politique de confidentialité .", "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", diff --git a/frontend/src/locales/nl.json b/frontend/src/locales/nl.json index 34f484fd7..eb28615c6 100644 --- a/frontend/src/locales/nl.json +++ b/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 Datenschutzerklärung.", "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", diff --git a/frontend/src/pages/InfoStatistic.vue b/frontend/src/pages/InfoStatistic.vue index 9b3b4dff5..254a895e0 100644 --- a/frontend/src/pages/InfoStatistic.vue +++ b/frontend/src/pages/InfoStatistic.vue @@ -47,7 +47,7 @@
{{ $t('contact') }}
- {{ supportMail }} + {{ supportMail }}