Skip to content

GitLab

Commit 0000cd29 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

fixed style of thank you page

parent 859242e1
Show whitespace changes
Inline Side-by-side
app/Http/Controllers/MailController.php
View file @ 0000cd29
...@@ -137,22 +137,22 @@ class MailController extends Controller ...@@ -137,22 +137,22 @@ class MailController extends Controller
public function donation(Request $request) public function donation(Request $request)
{ {
$name = ''; $firstname = "";
if($request->input('person') === 'private') { $lastname = "";
$company = "";
$private = $request->input('person', '') === 'private' ? true : false;
if($request->input('person', '') === 'private') {
$firstname = $request->input('firstname'); $firstname = $request->input('firstname');
$lastname = $request->input('lastname'); $lastname = $request->input('lastname');
if($firstname !== '' || $lastname !== '') { } elseif($request->input('person', '') === 'company') {
$name = $firstname . ' ' . $lastname;
}
} elseif($request->input('person') === 'company') {
$company = $request->input('companyname'); $company = $request->input('companyname');
$name = $company;
} }
$name = trim($name);
$data = [ $data = [
'name' => $name, 'person' => $request->input('person', ''),
'firstname' => $request->input('firstname', ''),
'lastname' => $request->input('lastname', ''),
'company' => $company,
'iban' => $request->input('iban', ''), 'iban' => $request->input('iban', ''),
'bic' => $request->input('bic', ''), 'bic' => $request->input('bic', ''),
'email' => $request->input('email', ''), 'email' => $request->input('email', ''),
...@@ -189,7 +189,6 @@ class MailController extends Controller ...@@ -189,7 +189,6 @@ class MailController extends Controller
# Check the IBAN # Check the IBAN
$iban = new IBAN($iban); $iban = new IBAN($iban);
$bic = $request->input('Bankleitzahl', '');
$country = new IBANCountry($iban->Country()); $country = new IBANCountry($iban->Country());
$isSEPA = filter_var($country->IsSEPA(), FILTER_VALIDATE_BOOLEAN); $isSEPA = filter_var($country->IsSEPA(), FILTER_VALIDATE_BOOLEAN);
...@@ -200,7 +199,7 @@ class MailController extends Controller ...@@ -200,7 +199,7 @@ class MailController extends Controller
if (!filter_var($email, FILTER_VALIDATE_EMAIL)) { if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
$email = "anonymous@suma-ev.de"; $email = "anonymous@suma-ev.de";
} }
if($name === ''){ if(($private && (empty($firstname) || empty($lastname))) || (!$private && empty($company))){
$messageToUser = trans('spende.error.name'); $messageToUser = trans('spende.error.name');
$messageType = "error"; $messageType = "error";
} elseif (!$iban->Verify()) { } elseif (!$iban->Verify()) {
...@@ -223,34 +222,6 @@ class MailController extends Controller ...@@ -223,34 +222,6 @@ class MailController extends Controller
# Generating personalised key for donor # Generating personalised key for donor
$key = app('App\Models\Key')->generateKey($betrag); $key = app('App\Models\Key')->generateKey($betrag);
# a complete set of data from the form consists of:
# -- if person == private --
# firstname
# lastname
# -- if person == company --
# companyname
# --
# email
# iban
# bic
# amount
# frequency
# message
$message = "\r\nName: " . $name;
$message .= "\r\nIBAN: " . $iban->HumanFormat();
if ($bic !== "") {
$message .= "\r\nBIC: " . $bic;
}
$message .= "\r\nBetrag: " . $betrag;
$message .= "\r\nHäufigkeit: " . trans('spende.frequency.' . $frequency);
$message .= "\r\nNachricht: " . $nachricht;
if($key){
$message .= "\r\nSchlüssel:" . $key;
}
try { try {
$postdata = [ $postdata = [
"entity" => "Contribution", "entity" => "Contribution",
...@@ -276,7 +247,7 @@ class MailController extends Controller ...@@ -276,7 +247,7 @@ class MailController extends Controller
$postdata = http_build_query($postdata); $postdata = http_build_query($postdata);
$resulthash = md5($message); $resulthash = md5(json_encode($postdata));
$mission = [ $mission = [
"resulthash" => $resulthash, "resulthash" => $resulthash,
......
resources/lang/de/spende.php
View file @ 0000cd29
...@@ -67,15 +67,15 @@ return [ ...@@ -67,15 +67,15 @@ return [
'drucken' => 'Drucken', 'drucken' => 'Drucken',
'danke.title' => 'Herzlichen Dank! Wir haben Ihre Spendenbenachrichtigung für MetaGer an SUMA-EV erhalten.', 'danke.title' => 'Herzlichen Dank! Wir haben Ihre Spendenbenachrichtigung erhalten.',
'danke.nachricht' => 'Falls Sie Kontaktdaten angegeben haben, erhalten Sie demnächst auch eine persönliche Nachricht.', 'danke.nachricht' => 'Falls Sie Kontaktdaten angegeben haben, erhalten Sie demnächst auch eine persönliche Nachricht.',
'danke.kontrolle' => 'Folgende Nachricht hat uns erreicht:', 'danke.kontrolle' => 'Folgende Nachricht hat uns erreicht:',
'danke.schluessel' => 'Als kleines Dankeschön bieten wir unseren Spendern einen Schlüssel für werbefreie Suchen. <br> Dieser lässt sich eingeben indem man auf das Schlüsselsymbol in der Suchleiste geht. <br> Ihr Schlüssel lautet: ', 'danke.schluessel' => 'Als kleines Dankeschön bieten wir unseren Spendern einen Schlüssel für werbefreie Suchen. <br> Dieser lässt sich eingeben indem man auf das Schlüsselsymbol neben der Suchleiste klickt. <br> Ihr Schlüssel lautet: ',
'telefonnummer' => 'Telefonnummer', 'telefonnummer' => 'Telefonnummer',
'iban' => 'IBAN/Kontonummer', 'iban' => 'IBAN',
'bic' => 'BIC/Bankleitzahl', 'bic' => 'BIC',
'betrag' => 'Betrag', 'betrag' => 'Betrag',
'danke.message' => 'Ihre Nachricht', 'danke.message' => 'Ihre Nachricht',
......
resources/less/metager/general/forms.less
View file @ 0000cd29
...@@ -61,6 +61,12 @@ label { ...@@ -61,6 +61,12 @@ label {
// address browser inconsistencies. // address browser inconsistencies.
// Override content-box in Normalize (* isn't specific enough) // Override content-box in Normalize (* isn't specific enough)
input[type="text"] {
background-color: @input-background;
color: @input-text;
padding: 4px 8px;
}
input[type="search"] { input[type="search"] {
.box-sizing(border-box); .box-sizing(border-box);
} }
......
resources/less/metager/pages/spende/danke.less 0 → 100644
View file @ 0000cd29
.data-element {
&> label {
min-width: 100px;
}
&> input, textarea {
padding: 4px 8px;
min-width: 250px;
}
}
\ No newline at end of file
resources/views/spende/danke.blade.php
View file @ 0000cd29
...@@ -5,57 +5,64 @@ ...@@ -5,57 +5,64 @@
@section('navbarFocus.donate', 'class="dropdown active"') @section('navbarFocus.donate', 'class="dropdown active"')
@section('content') @section('content')
<h1>{{ trans('spende.danke.title') }}</h1> <div id="donation-data" class="card-heavy">
<div class="col"> <h2>{{ trans('spende.danke.title') }}</h2>
<div id="left" class="col-lg-6 col-md-12 col-sm-12 others">
<p style="width:100%;" class="text-muted">{{ trans('spende.danke.nachricht') }}</p> <p style="width:100%;" class="text-muted">{{ trans('spende.danke.nachricht') }}</p>
<h2>{{ trans('spende.danke.kontrolle') }}</h2> <h3>{{ trans('spende.danke.kontrolle') }}</h3>
<div> <div>
<table class="table table-condensed"> @if($data["person"] === "private")
<tr> <div class="data-element">
<td>{{ trans('spende.lastschrift.3.placeholder')}}</td> <label for="firstname" style="margin-right: 16px;">{{ trans('spende.lastschrift.3f.placeholder')}}</label>
<td>{{ $data['name'] }}</td> <input type="text" name="firstname" id="firstname" value="{{ $data['firstname'] }}" readonly>
</tr> </div>
<tr> <div class="data-element">
<td>Email</td> <label for="lastname" style="margin-right: 16px;">{{ trans('spende.lastschrift.3l.placeholder')}}</label>
<td>{{ $data['email'] }}</td> <input type="text" name="lastname" id="lastname" value="{{ $data['lastname'] }}" readonly>
</tr> </div>
<tr> @else
<td>{{ trans('spende.iban') }}</td> <div class="data-element">
<td>{{ $data['iban'] }}</td> <label for="company" style="margin-right: 16px;">{{ trans('spende.lastschrift.3c.placeholder')}}</label>
</tr> <input type="text" name="company" id="company" value="{{ $data['company'] }}" readonly>
<tr> </div>
<td>{{ trans('spende.bic') }}</td> @endif
<td>{{ $data['bic'] }}</td> @if(!empty($data['email']))
</tr> <div class="data-element">
<tr> <label for="email" style="margin-right: 16px;">Email</label>
<td>{{ trans('spende.betrag') }}</td> <input type="text" name="email" id="email" value="{{ $data['email'] }}" readonly>
<td>{{ $data['betrag'] }} €</td> </div>
</tr> @endif
<tr> <div class="data-element">
<td>{{ trans('spende.frequency') }}</td> <label for="iban" style="margin-right: 16px;">{{ trans('spende.iban') }}</label>
<td>{{ trans('spende.frequency.' . $data['frequency']) }} </td> <input type="text" name="iban" id="iban" value="{{ $data['iban'] }}" readonly>
</tr> </div>
<tr> @if(!empty($data["bic"]))
<td>{{ trans('spende.danke.message') }}</td> <div class="data-element">
<td>{{ $data['nachricht'] }}</td> <label for="bic" style="margin-right: 16px;">{{ trans('spende.bic') }}</label>
</tr> <input type="text" name="bic" id="bic" value="{{ $data['bic'] }}" readonly>
</table>
</div>
<button type="button" class="btn btn-primary noprint" onclick="window.print();">{{ trans('spende.drucken') }}</button>
@if($data['key'] !== false)
<div class="card-light">
<p style="text-align: center; width:100%;">{!! trans('spende.danke.schluessel') . ' ' . $data['key'] !!}</p>
</div> </div>
@endif @endif
<div class="data-element">
<label for="betrag" style="margin-right: 16px;">{{ trans('spende.betrag') }}</label>
<input type="text" name="betrag" id="betrag" value="{{ $data['betrag'] }} €" readonly>
</div>
<div class="data-element">
<label for="frequency" style="margin-right: 16px;">{{ trans('spende.frequency') }}</label>
<input type="text" name="frequency" id="frequency" value="{{ trans('spende.frequency.' . $data['frequency']) }}" readonly>
</div>
<div class="data-element">
<label for="nachricht" style="margin-right: 16px;">{{ trans('spende.danke.message') }}</label>
<textarea name="nachricht" id="nachricht" readonly>{{ $data['nachricht'] }}</textarea>
</div>
</div> </div>
<div class="col-lg-6 col-md-12 col-sm-12 others noprint" id="right"> <button type="button" style="margin-top: 16px; margin-bottom: 16px;" class="btn btn-primary noprint js-only" onclick="window.print();">{{ trans('spende.drucken') }}</button>
<h2>{{ trans('about.about.1') }}</h2> @if($data['key'] !== false)
<p>{!! trans('about.about.2') !!}</p> <div class="card-light">
<p>{!! trans('about.about.3') !!}</p> <p style="text-align: center; width:100%;">{!! trans('spende.danke.schluessel') !!}</p>
<p>{!! trans('about.about.4') !!}</p> <div class="copyLink">
<p>{!! trans('about.about.5') !!}</p> <input id="key" class="loadSettings" type="text" style="text-align: center;" value="{{ $data['key'] }}">
<button class="btn btn-default js-only" onclick="var copyText = document.getElementById('key');copyText.select();copyText.setSelectionRange(0, 99999);document.execCommand('copy');">Kopieren</button>
</div> </div>
<div class="clearfix"></div> </div>
@endif
</div> </div>
@endsection @endsection
resources/views/spende/spende.blade.php
View file @ 0000cd29
...@@ -96,13 +96,13 @@ ...@@ -96,13 +96,13 @@
<p>{!! trans('spende.lastschrift.2') !!}</p> <p>{!! trans('spende.lastschrift.2') !!}</p>
<input type="hidden" name="dt" value="{{ md5(date('Y') . date('m') . date('d')) }}"> <input type="hidden" name="dt" value="{{ md5(date('Y') . date('m') . date('d')) }}">
<div id="input-picker" class="form-group donation-form-group"> <div id="input-picker" class="form-group donation-form-group">
<input type="radio" required="required" id="private" name="person" value="private" checked="checked"><label for="private">{{trans('spende.lastschrift.private')}}</label> <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"> <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 /> <input type="text" class="form-control" id="firstname" name="firstname" placeholder="{!! trans('spende.lastschrift.3f.placeholder') !!}" @if(isset($data['firstname'])) value="{{$data['firstname']}}" @endif />
<input type="text" class="form-control" id="lastname" name="lastname" placeholder="{!! trans('spende.lastschrift.3l.placeholder') !!}" @if(isset($data['lastname'])) value="{{$data['lastname']}}" @endif /> <input type="text" class="form-control" id="lastname" name="lastname" placeholder="{!! trans('spende.lastschrift.3l.placeholder') !!}" @if(isset($data['lastname'])) value="{{$data['lastname']}}" @endif />
</div> </div>
<br> <br>
<input type="radio" id="company" name="person" value="company"><label for="company">{{trans('spende.lastschrift.company')}}</label> <input type="radio" id="company" name="person" value="company" @if(!empty($data) && $data["person"] === "company")checked="checked"@endif><label for="company">{{trans('spende.lastschrift.company')}}</label>
<div id="input-company" class="show-on-input-checked form-inline"> <div id="input-company" class="show-on-input-checked form-inline">
<input type="text" class="form-control" id="companyname" name="companyname" placeholder="{!! trans('spende.lastschrift.3c.placeholder') !!}" @if(isset($data['company'])) value="{{$data['company']}}" @endif /> <input type="text" class="form-control" id="companyname" name="companyname" placeholder="{!! trans('spende.lastschrift.3c.placeholder') !!}" @if(isset($data['company'])) value="{{$data['company']}}" @endif />
</div> </div>
......
routes/web.php
View file @ 0000cd29
...@@ -91,6 +91,7 @@ Route::group( ...@@ -91,6 +91,7 @@ Route::group(
return view('spende.danke') return view('spende.danke')
->with('title', trans('titles.spende')) ->with('title', trans('titles.spende'))
->with('navbarFocus', 'foerdern') ->with('navbarFocus', 'foerdern')
->with('css', [mix('/css/spende/danke.css')])
->with('data', unserialize(base64_decode($data))); ->with('data', unserialize(base64_decode($data)));
}]); }]);
Route::get('partnershops', function () { Route::get('partnershops', function () {
......
webpack.mix.js
View file @ 0000cd29
...@@ -55,6 +55,9 @@ mix ...@@ -55,6 +55,9 @@ mix
.less("resources/less/metager/pages/count/style.less", "public/css/count/style.css", { .less("resources/less/metager/pages/count/style.less", "public/css/count/style.css", {
strictMath: true strictMath: true
}) })
.less("resources/less/metager/pages/spende/danke.less", "public/css/spende/danke.css", {
strictMath: true
})
// js // js
.babel( .babel(
[ [
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment