diff --git a/app/Http/Controllers/MailController.php b/app/Http/Controllers/MailController.php
index c705eea18a5aefd22d386f31fdb64f4b6f690c18..5835dfe7bfa4cf8d9beac69a86462ce3f0849339 100644
--- a/app/Http/Controllers/MailController.php
+++ b/app/Http/Controllers/MailController.php
@@ -82,7 +82,6 @@ class MailController extends Controller
$messageType = "error";
} else {
$message = "\r\nName: " . $request->input('Name', 'Keine Angabe');
- $message .= "\r\nTelefon: " . $request->input('Telefon', 'Keine Angabe');
$message .= "\r\nKontonummer: " . $request->input('Kontonummer');
$message .= "\r\nBankleitzahl: " . $request->input('Bankleitzahl');
$message .= "\r\nBetrag: " . $request->input('Betrag');
@@ -92,12 +91,15 @@ class MailController extends Controller
$message .= "\r\nUser-Agent: " . $request->header('User-Agent', "");
$replyTo = $request->input('email', 'anonymous-user@metager.de');
+ if($replyTo == ""){
+ $replyTo = "noreply@metager.de";
+ }
if (!filter_var($replyTo, FILTER_VALIDATE_EMAIL)) {
$messageToUser .= "Die eingegebene Email-Addresse ($replyTo) scheint nicht korrekt zu sein.";
}
try {
- Mail::to("dominik@suma-ev.de")
+ Mail::to("spenden@suma-ev.de")
->send(new Spende($replyTo, $message));
$messageType = "success";
@@ -115,7 +117,7 @@ class MailController extends Controller
->with('title', 'Kontakt')
->with($messageType, $messageToUser);
} else {
- $data = ['name' => $request->input('Name', 'Keine Angabe'), 'telefon' => $request->input('Telefon', 'Keine Angabe'), 'kontonummer' => $request->input('Kontonummer'), 'bankleitzahl' => $request->input('Bankleitzahl'), 'email' => $request->input('email', 'anonymous-user@metager.de'), 'betrag' => $request->input('Betrag'), 'nachricht' => $request->input('Nachricht')];
+ $data = ['name' => $request->input('Name', 'Keine Angabe'), 'kontonummer' => $request->input('Kontonummer'), 'bankleitzahl' => $request->input('Bankleitzahl'), 'email' => $request->input('email', 'anonymous-user@metager.de'), 'betrag' => $request->input('Betrag'), 'nachricht' => $request->input('Nachricht')];
$data = base64_encode(serialize($data));
return redirect(LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), route("danke", ['data' => $data])));
}
diff --git a/resources/views/spende/danke.blade.php b/resources/views/spende/danke.blade.php
index 7e815dbded263ace30d0f81861a977a609170148..53d06b7d326b36751c1821955d0a5573000e5730 100644
--- a/resources/views/spende/danke.blade.php
+++ b/resources/views/spende/danke.blade.php
@@ -16,10 +16,6 @@
<td>{{ trans('spende.lastschrift.3.placeholder')}}</td>
<td>{{ $data['name'] }}</td>
</tr>
- <tr>
- <td>{{ trans('spende.telefonnummer') }}</td>
- <td>{{ $data['telefon'] }}</td>
- </tr>
<tr>
<td>Email</td>
<td>{{ $data['email'] }}</td>
diff --git a/resources/views/spende/spende.blade.php b/resources/views/spende/spende.blade.php
index 792fa06b70dca76121a5d36d2d4ebc859f0a78b5..1af0e03c11619ec89870858031a5c14489298a22 100644
--- a/resources/views/spende/spende.blade.php
+++ b/resources/views/spende/spende.blade.php
@@ -24,10 +24,6 @@
<input type="email" class="form-control" id="email" name="email" placeholder="Email" value="{{ old('email') }}">
</div>
<div class="form-group donation-form-group">
- <label for="tel">{!! trans('spende.lastschrift.5') !!}</label>
- <input type="tel" class="form-control" id="tel" name="Telefon" placeholder="xxxx-xxxxx" value="{{ old('Telefon') }}">
- </div>
- <div class="form-group donation-form-group">
<label for="iban">{!! trans('spende.lastschrift.6') !!}</label>
<input type="text" class="form-control" id="iban" required="" name="Kontonummer" placeholder="IBAN" value="{{ old('Kontonummer') }}">
</div>
diff --git a/resources/views/spende/spendenaufruf.blade.php b/resources/views/spende/spendenaufruf.blade.php
index f566fb40092925f50bcc896b3e454643a1f805d3..3a99c2d33848bda61306b7d720f80f6a1c6e22ae 100644
--- a/resources/views/spende/spendenaufruf.blade.php
+++ b/resources/views/spende/spendenaufruf.blade.php
@@ -68,37 +68,37 @@
<div class="clearfix"></div>
<hr>
<div class="col-md-6">
- <h2 id="lastschrift">{{ trans('spende.lastschrift.1') }}</h2>
- <p>{{ trans('spende.lastschrift.2') }}</p>
- <form role="form" method="POST" action="{{ action('MailController@donation') }}">
- <input type="hidden" name="dt" value="{{ md5(date('Y') . date('m') . date('d')) }}" />
- <div class="form-group" style="text-align:left;">
- <label for="Name">{{ trans('spende.lastschrift.3') }}</label>
- <input type="text" class="form-control" id="Name" required="" name="Name" placeholder="{{ trans('spende.lastschrift.3.placeholder') }}">
- </div>
- <div class="form-group" style="text-align:left;">
- <label for="email">{{ trans('spende.lastschrift.4') }}</label>
- <input type="email" class="form-control" id="email" name="email" placeholder="Email">
- </div>
- <div class="form-group" style="text-align:left;">
- <label for="tel">{{ trans('spende.lastschrift.5') }}</label>
- <input type="tel" class="form-control" id="tel" name="Telefon" placeholder="xxxx-xxxxx">
- </div>
- <div class="form-group" style="text-align:left;">
- <label for="iban">{{ trans('spende.lastschrift.6') }}</label>
- <input type="text" class="form-control" id="iban" required="" name="Kontonummer" placeholder="IBAN">
- </div>
- <div class="form-group" style="text-align:left;">
- <label for="bic">{{ trans('spende.lastschrift.7') }}</label>
- <input type="text" class="form-control" id="bic" required="" name="Bankleitzahl" placeholder="BIC">
- </div>
- <div class="form-group" style="text-align:left;">
- <label for="msg">{{ trans('spende.lastschrift.8') }}</label>
- <textarea class="form-control" id="msg" required="" name="Nachricht" placeholder="{{ trans('spende.lastschrift.8.placeholder') }}"></textarea>
- </div>
- <button type="submit" class="btn btn-default">{{ trans('spende.lastschrift.9') }}</button>
- </form>
- <p>{{ trans('spende.lastschrift.10') }}</p>
+ <h3 id="lastschrift">{!! trans('spende.lastschrift.1') !!}</h3>
+ <p>{!! trans('spende.lastschrift.2') !!}</p>
+ <form id="donate" role="form" method="POST" action="/spende">
+ <input type="hidden" name="dt" value="{{ md5(date('Y') . date('m') . date('d')) }}">
+ <div class="form-group donation-form-group">
+ <label for="Name">{!! trans('spende.lastschrift.3') !!}</label>
+ <input type="text" class="form-control" id="Name" required="" name="Name" placeholder="{!! trans('spende.lastschrift.3.placeholder') !!}" value="{{ old('Name') }}" />
+ </div>
+ <div class="form-group donation-form-group">
+ <label for="email">{!! trans('spende.lastschrift.4') !!}</label>
+ <input type="email" class="form-control" id="email" name="email" placeholder="Email" value="{{ old('email') }}">
+ </div>
+ <div class="form-group donation-form-group">
+ <label for="iban">{!! trans('spende.lastschrift.6') !!}</label>
+ <input type="text" class="form-control" id="iban" required="" name="Kontonummer" placeholder="IBAN" value="{{ old('Kontonummer') }}">
+ </div>
+ <div class="form-group donation-form-group">
+ <label for="bic">{!! trans('spende.lastschrift.7') !!}</label>
+ <input type="text" class="form-control" id="bic" required="" name="Bankleitzahl" placeholder="BIC" value="{{ old('Bankleitzahl') }}">
+ </div>
+ <div class="form-group donation-form-group">
+ <label for="value">{!! trans('spende.lastschrift.8.value')!!} </label>
+ <input type="number" class="form-control" id="value" required="" name="Betrag" placeholder="{!! trans('spende.lastschrift.8.value.placeholder') !!}" value="{{ old('Bankleitzahl') }}">
+ </div>
+ <div class="form-group donation-form-group">
+ <label for="msg">{!! trans('spende.lastschrift.8.message')!!}</label>
+ <label for="msg"><u>{!! trans('spende.bankinfo.3')!!}</u></label>
+ <textarea class="form-control" id="msg" name="Nachricht" placeholder="{!! trans('spende.lastschrift.8.message.placeholder') !!}">{{ old('Nachricht') }}</textarea>
+ </div>
+ <button type="submit" form="donate" class="btn btn-default">{!! trans('spende.lastschrift.9') !!}</button>
+ </form>
</div>
<div class="col-md-6">
<h2 id="mails">Aus den EMails vorheriger Spender:</h2>