diff --git a/app/Http/Controllers/MailController.php b/app/Http/Controllers/MailController.php
index 17f847dcde9289f82f4248d7d7a99ccf4ca4c1af..575d6f742be26b2b00eceef638a0a8deccaa61c9 100644
--- a/app/Http/Controllers/MailController.php
+++ b/app/Http/Controllers/MailController.php
@@ -197,7 +197,7 @@ class MailController extends Controller
# Validate Email
if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
- $email = "anonymous@suma-ev.de";
+ $email = "";
}
if(($private && (empty($firstname) || empty($lastname))) || (!$private && empty($company))){
$messageToUser = trans('spende.error.name');
diff --git a/resources/js/donation.js b/resources/js/donation.js
index 9c649d0b1913578c145a6627ba5f7dd1e2e824eb..404befffbcc7975d96237bd00d581c9c9dfd4e5f 100644
--- a/resources/js/donation.js
+++ b/resources/js/donation.js
@@ -6,4 +6,35 @@ document.addEventListener("DOMContentLoaded", (event) => {
}, 100);
}
});
-});
\ No newline at end of file
+ updateRequiredForName();
+ document.querySelector("#donate-button").removeAttribute("disabled");
+ document.querySelectorAll("input[name=person]").forEach(element => {
+ element.onclick = (e) => {
+ updateRequiredForName();
+ }
+ element.onchange = (e) => {
+ updateRequiredForName();
+ }
+ });
+});
+
+function updateRequiredForName() {
+ let privateCheckbox = document.querySelector("#private");
+ let companyCheckbox = document.querySelector("#company");
+ let firstname = document.querySelector("#firstname");
+ let lastname = document.querySelector("#lastname");
+ let companyname = document.querySelector("#companyname");
+ if(!privateCheckbox || !companyCheckbox || !firstname || !lastname || !companyname){
+ return;
+ }
+ if(privateCheckbox.checked){
+ firstname.required = "required";
+ lastname.required = "required";
+ companyname.removeAttribute("required");
+ }
+ if(companyCheckbox.checked){
+ companyname.required = "required";
+ firstname.removeAttribute("required");
+ lastname.removeAttribute("required");
+ }
+}
\ No newline at end of file
diff --git a/resources/lang/de/spende.php b/resources/lang/de/spende.php
index 36f20392b863d548b5af95d124856ba552970668..193e73d537f4c1a8389f627af9fe800f9ecba224 100644
--- a/resources/lang/de/spende.php
+++ b/resources/lang/de/spende.php
@@ -32,6 +32,8 @@ return [
'bankinfo.2.4' => '(Konto-Nr.: 4075 0332 01, BLZ: 43060967)',
'bankinfo.3' => 'Falls Sie eine Spendenbescheinigung wünschen, teilen Sie uns bitte Ihre vollständige Adresse mit. Bei Spenden bis 300,-€ genügt der Kontoauszug für die Absetzbarkeit beim Finanzamt.',
+ 'lastschrift.info' => 'Wenn Sie per Lastschrift spenden möchten, tragen Sie in das nachfolgende Formular bitte die Informationen zur Spendenhöhe und Ihre Kontoinformationen ein. Wir buchen dann bequem innerhalb der nächsten 2 Wochen vom angegebenen Konto ab.',
+ 'lastschrift.info2' => 'Sofern unter Regelmäßigkeit nicht anders von Ihnen angegeben, findet eine Abbuchung stets nur einmalig statt.',
'lastschrift.1' => 'Spenden mittels elektronischem Lastschriftverfahren:',
'lastschrift.2' => 'Tragen Sie hier Ihre Kontodaten ein. Wir buchen dann entsprechend von Ihrem Konto ab. Notwendige Felder sind mit einem "*" gekennzeichnet.',
'lastschrift.3f' => 'Bitte geben Sie den Vornamen des Kontoinhabers ein:',
@@ -39,7 +41,7 @@ return [
'lastschrift.3l' => 'Bitte geben Sie den Nachnamen des Kontoinhabers ein:',
'lastschrift.3l.placeholder' => 'Nachname',
'lastschrift.3c' => 'Bitte geben Sie den Firmenkontonamen ein:',
- 'lastschrift.3c.placeholder' => 'Firma',
+ 'lastschrift.3c.placeholder' => 'Firmenname',
'lastschrift.4' => 'Ihre E-Mail Adresse:',
'lastschrift.5' => 'Ihre Telefonnummer, um Ihre Spende ggf. durch einen Rückruf zu verifizieren:',
'lastschrift.6' => 'Ihre IBAN:',
@@ -47,14 +49,14 @@ return [
'lastschrift.8.message' => 'Hier können Sie uns ggf. noch eine Mitteilung dazu senden:',
'lastschrift.8.message.placeholder' => 'Weitere Angaben',
'lastschrift.10' => 'Ihre Daten werden über eine verschlüsselte Verbindung zu uns übertragen und können von Dritten nicht mitgelesen werden. SUMA-EV verwendet Ihre Daten ausschließlich für die Spendenabrechnung; Ihre Daten werden nicht weitergegeben. Spenden an den SUMA-EV sind steuerlich absetzbar, da der Verein vom Finanzamt Hannover Nord als gemeinnützig anerkannt ist, eingetragen in das Vereinsregister beim Amtsgericht Hannover unter VR200033.',
- 'lastschrift.private' => '*Privatperson:',
- 'lastschrift.company' => '*Firma:',
+ 'lastschrift.private' => 'Privatperson:',
+ 'lastschrift.company' => 'Firma:',
'paypal.1' => 'Mit einem Klick auf Spenden werden Sie zu Paypal weitergeleitet.',
- 'submit' => 'Spenden',
+ 'submit' => 'Abschicken',
'member.1' => 'Oder doch lieber Mitglied werden?',
'member.2' => 'Es kostet nicht mehr und bietet viele Vorteile:',
diff --git a/resources/lang/en/key.php b/resources/lang/en/key.php
index a78cb1fe3b7d01ec60431d39d5972a814409158d..663e31900db9a758c54f8127ffaa79b43a3ed21d 100644
--- a/resources/lang/en/key.php
+++ b/resources/lang/en/key.php
@@ -1,16 +1,20 @@
<?php
return [
- 'h1' => "Key for your ad-free search",
- 'p1' => 'MetaGer offers <a href=":url1">SUMA-EV members</a> and generous <a href=":url2">donors</a> a key that gives them access to a volume of ad-free searches.',
- 'p2' => 'On this page you can enter your key (if known). We save it with the help of a cookie on your PC. This way, your browser automatically sends the key to us every time you search, so we can remove the ad for you.',
- 'p3' => 'If you look at the cookie there is "key = xxxx" in there. We do not use it for tracking purposes. It is also never stored or logged by us in any way.',
- 'p4' => 'Important: In order to use this function, you must have allowed cookies in your browser. The setting will remain saved as long as your browser saves cookies.',
- 'p5' => 'In order to be able to save the key beyond that, you have the following options:',
- 'li1' => 'Set the following URL as start page/bookmark in your browser:',
- 'li2' => 'If you are using MetaGer as the default search engine, you can delete the entry after entering the key and add it again. If you have to enter a "search string" in your browser, you can use <code>:url</code>.',
- 'placeholder1' => 'Enter key ...',
- 'removeKey' => 'Remove current key',
- 'invalidKey' => 'The entered key is invalid',
- 'backLink' => 'Back to the last page',
+ "h1" => "Key for your ad-free search",
+ "p1" => "MetaGer offers <a href=\":url1\">SUMA-EV members</a> and generous <a href=\":url2\">donors</a> a key that gives them access to a volume of ad-free searches.",
+ "p2" => "On this page you can enter your key (if known). We save it with the help of a cookie on your PC. This way, your browser automatically sends the key to us every time you search, so we can remove the ad for you.",
+ "p3" => "If you look at the cookie there is \"key = xxxx\" in there. We do not use it for tracking purposes. It is also never stored or logged by us in any way.",
+ "p4" => "Important: In order to use this function, you must have allowed cookies in your browser. The setting will remain saved as long as your browser saves cookies.",
+ "p5" => "In order to be able to save the key beyond that, you have the following options:",
+ "li1" => "Set the following URL as start page/bookmark in your browser:",
+ "li2" => "If you are using MetaGer as the default search engine, you can delete the entry after entering the key and add it again. If you have to enter a \"search string\" in your browser, you can use <code>:url</code>.",
+ "placeholder1" => "Enter key ...",
+ "removeKey" => "Remove current key",
+ "invalidKey" => "The entered key is invalid",
+ "empty" => "Your key is valid but no longer contains ad-free searches.",
+ "backLink" => "Back to the last page",
+ "custom.h3" => "Favorite Key",
+ "custom.p1" => "Members of the SUMA-EV have the opportunity to choose their own key.",
+ "custom.a1" => "Set up the favorite key"
];
diff --git a/resources/lang/en/spende.php b/resources/lang/en/spende.php
index 77168c8bf588e88324832e36888ce8eaac3df56d..753087209afcdc972fc4bb36cc14beab6d3cced7 100644
--- a/resources/lang/en/spende.php
+++ b/resources/lang/en/spende.php
@@ -32,20 +32,22 @@ return [
'bankinfo.2.4' => '(AN: 4075 0332 01, BC: 43060967)',
"bankinfo.3" => "If you wish to receive a donation receipt,\r\nplease specify your full adress and (if available)\r\nyour E-Mail adress on the money transfer form.",
-
+ "lastschrift.info" => "If you would like to donate by direct debit, please enter the information about the amount of the donation and your account information in the form below. We will then conveniently debit the specified account within the next 2 weeks.",
+ "lastschrift.info2" => "Unless otherwise specified by you under Regularity, a charge will only be made once.",
"lastschrift.1" => "Donate by Sepa direct debit",
"lastschrift.2" => "Enter your account data. We will debit your bank account accordingly. This method is only available for SEPA area. Required fields are marked with \"*\"",
+ "lastschrift.3c" => "Please enter the company account name:",
+ "lastschrift.3f" => "Please enter the first name of the account holder:",
"lastschrift.3f.placeholder" => "First Name",
+ "lastschrift.3l" => "Please enter the last name of the account holder:",
"lastschrift.3l.placeholder" => "Last Name",
"lastschrift.3c.placeholder" => "Business Name",
"lastschrift.4" => "Your E-Mail Adress:",
"lastschrift.5" => "Your phone number to verify your donation by callback:",
"lastschrift.6" => "Your IBAN:",
"lastschrift.7" => "Your BIC:",
- "lastschrift.8.value" => "Here you can tell us, what amount you want to donate:",
"lastschrift.8.message" => "Here you can informally add a message to your donation:",
"lastschrift.8.message.placeholder" => "Message",
- "lastschrift.9" => "Donate",
"lastschrift.10" => "Your information is transmitted encrypted and is not read by a third party. SUMA-EV only uses your information for accounting; Your information is not passed on. Donations to the SUMA-EV are tax-deductible, because the association is recognized as charitable by the Finanzamt Hannover Nord (revenue board), listed in the register of associations, Amtsgericht Hannover under VR200033. A certificate for single donations above 300,-EUR is sent automatically (post address is required!). For donations below 300,-EUR an account current is enough for tax-deduction.",
"lastschrift.private" => "*As a Person:",
"lastschrift.company" => "*As a Business:",
@@ -74,9 +76,11 @@ return [
"bic" => "BIC",
'betrag' => 'Amount',
"danke.message" => "Your message",
+ "danke.schluessel" => "As a small thank you, we offer our donors a key for advertising-free searches. <br> This can be entered by clicking on the key symbol next to the search bar. <br> Your key is:",
'error.iban' => 'The IBAN entered does not seem to be correct. Message was not sent.',
'error.bic' => 'The IBAN entered does not belong to a country in the SEPA area. For a direct debit we need a BIC from you.',
'error.amount' => 'The donation amount entered is invalid. Please correct your entry and try again.',
+ "error.name" => "It seems like they didn't give a name. Please try again.",
'error.frequency' => 'The frequency you entered for your donation is invalid.',
];
diff --git a/resources/lang/en/titles.php b/resources/lang/en/titles.php
index a4b5d0ff4c5777703ab467272cd8b975a6a164fe..8de337c0b27804f23570014ced90fadbf92a7f86 100644
--- a/resources/lang/en/titles.php
+++ b/resources/lang/en/titles.php
@@ -1,30 +1,30 @@
<?php
return [
- "index" => "MetaGer: Privacy Protected Search & Find",
- "impressum" => "Site Notice - MetaGer",
- "about" => "About Us - MetaGer",
- "team" => "Team - MetaGer",
- "kontakt" => "Contact - MetaGer",
- "spende" => "Donation - MetaGer",
- "datenschutz" => "Privacy - MetaGer",
- "hilfe" => "Help - MetaGer",
- "widget" => "MetaGer Widget",
- "settings" => "Settings",
- "websearch" => "Websearch-Widget - MetaGer",
- "sitesearch" => "Sitesearch-Widget - MetaGer",
- "faq" => "FAQ - MetaGer",
- "partnershops" => "Partnershops - MetaGer",
- "languages" => "translation tool - MetaGer",
- "languages.edit" => "Edit language files - MetaGer",
- "app" => "Apps - MetaGer",
- "faktencheck" => "Fact-checks versus fake news",
- 'jugendschutz' => 'Youth protection',
- 'ad-info' => 'MetaGer Advertisements',
- 'asso' => 'Associator - MetaGer',
- 'plugin' => 'Plugin - MetaGer',
- 'key' => 'Ad-Free-Key - MetaGer',
- 'allSettings' => 'All Settings - MetaGer',
- 'transparency' => 'Transparency statement - MetaGer',
-
+ "index" => "MetaGer: Privacy Protected Search & Find",
+ "impressum" => "Site Notice - MetaGer",
+ "about" => "About Us - MetaGer",
+ "team" => "Team - MetaGer",
+ "kontakt" => "Contact - MetaGer",
+ "spende" => "Donation - MetaGer",
+ "datenschutz" => "Privacy - MetaGer",
+ "hilfe" => "Help - MetaGer",
+ "widget" => "MetaGer Widget",
+ "settings" => "Settings",
+ "websearch" => "Websearch-Widget - MetaGer",
+ "sitesearch" => "Sitesearch-Widget - MetaGer",
+ "faq" => "FAQ - MetaGer",
+ "partnershops" => "Partnershops - MetaGer",
+ "languages" => "translation tool - MetaGer",
+ "languages.edit" => "Edit language files - MetaGer",
+ "app" => "Apps - MetaGer",
+ "faktencheck" => "Fact-checks versus fake news",
+ "jugendschutz" => "Youth protection",
+ "ad-info" => "MetaGer Advertisements",
+ "asso" => "Associator - MetaGer",
+ "plugin" => "Plugin - MetaGer",
+ "key" => "Ad-Free-Key - MetaGer",
+ "keychange" => "Change membership key",
+ "allSettings" => "All Settings - MetaGer",
+ "transparency" => "Transparency statement - MetaGer"
];
diff --git a/resources/lang/es/spende.php b/resources/lang/es/spende.php
index 5b0450f5332e2ff30b5b3d41bf901f677b1d0b7b..9e8659eb2b7f1e963d728b35e5041c8af7746bc0 100644
--- a/resources/lang/es/spende.php
+++ b/resources/lang/es/spende.php
@@ -24,11 +24,8 @@ return [
"bankinfo.2.2" => "BIC: GENODEM1GLS",
"bankinfo.2.3" => "Banco: GLS Gemeinschaftsbank, Bochum",
"bankinfo.2.4" => "(NDC: 4075 0332 01, Código: 43060967)",
- "bankinfo.3" => "En caso que desea recibir un recibo de donación, indÃquenos su dirección completa. Para donaciones de hasta 200,00 €, es suficiente el extracto de cuenta donde figura la donación para solicitar la deducción de impuestos.",
"lastschrift.1" => "Donaciones mediante domiciliación bancaria electrónica:",
"lastschrift.2" => "Ingrese los detalles de su cuenta aquÃ. Luego, debitaremos su cuenta según sus indicaciones. Los campos que están marcados con \"*\" son obligatorios.",
- "lastschrift.3" => "Por favor introduzca el nombre del titular de la cuenta:",
- "lastschrift.3.placeholder" => "Nombre",
"lastschrift.4" => "Su correo electrónico:",
"lastschrift.5" => "Su número de teléfono, para que podamos verificar su donación con una llamada telefónica si es necesario:",
"lastschrift.6" => "Su IBAN:",
@@ -58,7 +55,4 @@ return [
"error.bic" => "El IBAN introducido no pertenece a ningún paÃs del área SEPA. Necesitamos su BIC para una domiciliación bancaria.",
"error.amount" => "El monto de la donación ingresado no es válido. Corrija su entrada y vuelva a intentarlo.",
"error.frequency" => "La frecuencia ingresada para su donación no es válida.",
- "lastschrift.8.value" => "Aquà puede entrar su donación:",
- "lastschrift.8.value.placeholder" => "Monto de donación",
- "lastschrift.9" => "Donación"
];
diff --git a/resources/less/metager/pages/donation.less b/resources/less/metager/pages/donation.less
index ef10a95f6e95c6cdca0467afc10c04d82b05b1c8..b7d819a568060c0ee977e6d25f51254720da91c3 100644
--- a/resources/less/metager/pages/donation.less
+++ b/resources/less/metager/pages/donation.less
@@ -71,6 +71,11 @@
font-weight: bold;
}
}
+
+ #lastschrift-info {
+ margin-top: 16px;
+ }
+
#payment-methods {
display: flex;
flex-wrap: wrap;
diff --git a/resources/views/spende/spende.blade.php b/resources/views/spende/spende.blade.php
index 45d95c0698c2f7bd86c1812043ad980415da9f4b..7263c1ebf68a11e956ce331b981b088fea482763 100644
--- a/resources/views/spende/spende.blade.php
+++ b/resources/views/spende/spende.blade.php
@@ -68,6 +68,8 @@
<a class="payment-label" href="?method=bank-transfer"><nobr>{!! trans('spende.ueberweisung') !!}</nobr></a>
<a class="payment-label" href="?method=paypal"><nobr>{!! trans('spende.paypal') !!}</nobr></a>
</div>
+ <p id="lastschrift-info">@lang('spende.lastschrift.info')</p>
+ <p>@lang('spende.lastschrift.info2')</p>
<h3>{!! trans('spende.headline.3') !!}</h3>
<div class="amount-row">
<input type="radio" value="5" class="amount-radio" name="amount" id="amount-5euro" required="required" @if(empty($data) || $data["betrag"] === "5")checked="checked"@endif> <label for="amount-5euro" class="amount-label">5€</label>
@@ -96,6 +98,8 @@
<p>{!! trans('spende.lastschrift.2') !!}</p>
<input type="hidden" name="dt" value="{{ md5(date('Y') . date('m') . date('d')) }}">
<div id="input-picker" class="form-group donation-form-group">
+ <label>*Kontoinhaber</label>
+ <br>
<input type="radio" required="required" id="private" name="person" value="private" @if(empty($data) || $data["person"] === "private")checked="checked"@endif><label for="private">{{trans('spende.lastschrift.private')}}</label>
<div id="input-private" class="show-on-input-checked form-inline">
<input type="text" class="form-control" id="firstname" name="firstname" placeholder="{!! trans('spende.lastschrift.3f.placeholder') !!}" @if(isset($data['firstname'])) value="{{$data['firstname']}}" @endif />