diff --git a/resources/lang/de/spende.php b/resources/lang/de/spende.php
index 052254aa35cc326d5ae81ddc25c51876152ee743..85ca171ad51bfcd8bea5238214dbbb0be91e567a 100644
--- a/resources/lang/de/spende.php
+++ b/resources/lang/de/spende.php
@@ -5,7 +5,7 @@ return [
'headline.2' => 'Mit Ihrer Spende unterstützen Sie den Erhalt und die Weiterentwicklung der unabhängigen Suchmaschine metager.de und die Arbeit des gemeinnützigen Trägervereins SUMA-EV. <a href="/about" rel="noopener" target=_blank>Mehr erfahren</a> und <a href="/beitritt" target="_blank" rel="noopener">Mitglied werden.</a>.',
'headline.3' => 'Welchen Beitragen möchten Sie spenden?',
- 'headline.4' => 'Wie regelmäßig wollen Sie spenden?',
+ 'headline.4' => 'Wie regelmäßig möchten Sie spenden?',
'headline.5' => 'Wie wollen Sie spenden?',
@@ -22,7 +22,7 @@ return [
'paypal' => 'Paypal',
- 'bankinfo.1' => 'Spenden mittels einer Ãœberweisung',
+ 'bankinfo.1' => 'Um für den SUMA-EV unseren Trägerverein zu spenden, brauchen Sie nur eine Überweisung auf folgendes Konto zu tätigen:',
'bankinfo.2' => 'SUMA-EV',
'bankinfo.2.1' => 'IBAN: DE64 4306 0967 4075 0332 01',
'bankinfo.2.2' => 'BIC: GENODEM1GLS',
diff --git a/resources/less/metager/pages/donation.less b/resources/less/metager/pages/donation.less
index 9e8bcdaa855b1257cb205c5037fb21b1b3bfb980..256a58eabfc2e4118c8042e48065dca02282c437 100644
--- a/resources/less/metager/pages/donation.less
+++ b/resources/less/metager/pages/donation.less
@@ -23,26 +23,6 @@
margin: 0;
}
- .sepa-debit-details {
- display: none;
- }
-
- #lastschrift:checked ~ .sepa-debit-details {
- display: block;
- }
- .bank-transfer {
- display: none;
- }
-
- #ueberweisung:checked ~ .bank-transfer {
- display: block;
- }
- .paypal-method {
- display:none;
- }
- #paypal:checked ~ .paypal-method {
- display:block;
- }
input[type=radio] {
margin: 0px;
margin-left: 2px;
@@ -73,9 +53,7 @@
.amount-radio {
display:none;
}
- .payment-radio {
- display:none;
- }
+
.frequency-label {
margin-top: 5px;
height:45px;
@@ -86,7 +64,9 @@
width: 150px;
border-radius: 6px;
}
- .payment-label {
+ .payment-label {
+ display: inline-block;
+ color: @text-color;
margin-top: 5px;
height:45px;
font-weight: normal;
@@ -120,64 +100,10 @@
display: none;
width: 164px;
}
- #amount-custom:checked + label{
- border: 4px solid #f47216;
- }
#amount-custom:checked + label + input{
display: initial;
}
- #amount-5euro:checked + label {
- border: 4px solid #f47216;
- }
- #amount-10euro:checked + label {
- border: 4px solid #f47216;
- }
- #amount-15euro:checked + label {
- border: 4px solid #f47216;
- }
- #amount-20euro:checked + label {
- border: 4px solid #f47216;
- }
- #amount-25euro:checked + label {
- border: 4px solid #f47216;
- }
- #amount-50euro:checked + label {
- border: 4px solid #f47216;
- }
- #amount-100euro:checked + label {
- border: 4px solid #f47216;
- }
- #amount-200euro:checked + label {
- border: 4px solid #f47216;
- }
- #amount-250euro:checked + label {
- border: 4px solid #f47216;
- }
- #amount-300euro:checked + label {
- border: 4px solid #f47216;
- }
- #once:checked + label{
- border: 4px solid #f47216;
- }
- #monthly:checked + label{
- border: 4px solid #f47216;
- }
- #quarterly:checked + label{
- border: 4px solid #f47216;
- }
- #six-monthly:checked + label{
- border: 4px solid #f47216;
- }
- #annual:checked + label{
- border: 4px solid #f47216;
- }
- #lastschrift:checked + label{
- border: 4px solid #f47216;
- }
- #ueberweisung:checked + label{
- border: 4px solid #f47216;
- }
- #paypal:checked + label{
+ input[type=radio]:checked + label, .payment-label-selected {
border: 4px solid #f47216;
}
}
diff --git a/resources/views/spende/spende.blade.php b/resources/views/spende/spende.blade.php
index 03cc30c8f89453051ef6602de3b29e9bb10cdaee..573b385ca86974380e0be3e8476e4cceb00eb14b 100644
--- a/resources/views/spende/spende.blade.php
+++ b/resources/views/spende/spende.blade.php
@@ -11,8 +11,64 @@
<p>{!! trans('spende.headline.2') !!}</p>
</div>
<div class="two-col">
+
<form class="col-left" action="/" method="get">
+ @if (app('request')->input('method') == "paypal")
+ <div class="section">
+ <h3>{!! trans('spende.headline.5') !!}</h3>
+
+
+ <a class="payment-label" href="?method=debit">{!! trans('spende.head.lastschrift') !!}</a>
+ <a class="payment-label" href="?method=bank-transfer">{!! trans('spende.ueberweisung') !!}</a>
+ <a class="payment-label payment-label-selected" href="?method=paypal">{!! trans('spende.paypal') !!}</a>
+ <p>{!! trans('spende.paypal.1') !!}</p>
+ <div class="center-wrapper">
+ @if (LaravelLocalization::getCurrentLocale() == "de")
+ <form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
+ <input type="hidden" name="lc" value="{{ Request::getPreferredLanguage([]) }}">
+ <input type="hidden" name="cmd" value="_s-xclick" />
+ <input type="hidden" name="hosted_button_id" value="5JPHYQT88JSRQ" />
+ <input type="image" src="{{ action('Pictureproxy@get', ['url' => 'https://www.paypalobjects.com/de_DE/DE/i/btn/btn_donateCC_LG.gif']) }}" border="0" name="submit" title="PayPal - The safer, easier way to pay online!" alt="Donate with PayPal button" />
+ <img alt="" border="0" src="{{ action('Pictureproxy@get', ['url' => 'https://www.paypal.com/de_DE/i/scr/pixel.gif']) }}" width="1" height="1" />
+ </form>
+ @else
+ <form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
+ <input type="hidden" name="lc" value="{{ Request::getPreferredLanguage([]) }}">
+ <input type="hidden" name="cmd" value="_s-xclick" />
+ <input type="hidden" name="hosted_button_id" value="LXWAVD6P3ZSWG" />
+ <input type="image" src="{{ action('Pictureproxy@get', ['url' => 'https://www.paypalobjects.com/en_US/DK/i/btn/btn_donateCC_LG.gif']) }}" border="0" name="submit" title="PayPal - The safer, easier way to pay online!" alt="Donate with PayPal button" />
+ <img alt="" border="0" src="{{ action('Pictureproxy@get', ['url' => 'https://www.paypal.com/en_DE/i/scr/pixel.gif']) }}" width="1" height="1" />
+ </form>
+ @endif
+ </div>
+
+ </div>
+
+ @elseif ((app('request')->input('method') == "bank-transfer"))
<div class="section">
+ <h3>{!! trans('spende.headline.5') !!}</h3>
+
+ <a class="payment-label" href="?method=debit">{!! trans('spende.head.lastschrift') !!}</a>
+ <a class="payment-label payment-label-selected" href="?method=bank-transfer">{!! trans('spende.ueberweisung') !!}</a>
+ <a class="payment-label" href="?method=paypal">{!! trans('spende.paypal') !!}</a>
+
+ <p>{!! trans('spende.bankinfo.1') !!}</p>
+ <p>{!! trans('spende.bankinfo.2') !!}</p>
+ <p>{!! trans('spende.bankinfo.2.1') !!}</p>
+ <p>{!! trans('spende.bankinfo.2.2') !!}</p>
+ <p>{!! trans('spende.bankinfo.2.3') !!}</p>
+ <p>{!! trans('spende.bankinfo.2.4') !!}</p> <br>
+ <p>{!! trans('spende.bankinfo.3') !!}</p>
+ </div>
+ @else
+ <div class="section">
+ <h3>{!! trans('spende.headline.5') !!}</h3>
+
+ <a class="payment-label payment-label-selected" href="?method=debit">{!! trans('spende.head.lastschrift') !!}</a>
+
+ <a class="payment-label" href="?method=bank-transfer">{!! trans('spende.ueberweisung') !!}</a>
+ <a class="payment-label" href="?method=paypal">{!! trans('spende.paypal') !!}</a>
+
<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"> <label for="amount-5euro" class="amount-label">5€</label>
@@ -32,8 +88,6 @@
<input type="radio" name="amount" id="amount-custom" required="required"><label for="amount-custom" class="amount-custom">{!! trans('spende.wunschbetrag') !!}</label> <input id="custom-amount" type="number" step=".01" placeholder="Betrag in €" value="">
</div>
-
-
<br>
<h3>{!! trans('spende.headline.4') !!}</h3>
@@ -49,59 +103,35 @@
<input type="radio" class="frequency-radio" name="frequency" id="annual" required="required"><label class="frequency-label" for="annual">{!! trans('spende.frequency.5') !!}</label> <br>
<br>
- <h3>{!! trans('spende.headline.5') !!}</h3>
-
- <input type="radio" class="payment-radio" name="payment-method" id="lastschrift" required="required"><label class="payment-label" for="lastschrift">{!! trans('spende.head.lastschrift') !!}</label><br>
-
- <div class="sepa-debit-details">
<p>{!! trans('spende.lastschrift.2') !!}</p>
- <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" name="Name" placeholder="{!! trans('spende.lastschrift.3.placeholder') !!}" @if(isset($data['name'])) value="{{$data['name']}}" @endif />
- </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" @if(isset($data['email'])) value="{{$data['email']}}" @endif>
- </div>
- <div class="form-group donation-form-group">
- <label for="iban">*{!! trans('spende.lastschrift.6') !!}</label>
- <input type="text" class="form-control" id="iban" name="iban" placeholder="IBAN" @if(isset($data['iban'])) value="{{$data['iban']}}" @endif>
- </div>
- <div class="form-group donation-form-group">
- <label for="bic">{!! trans('spende.lastschrift.7') !!}</label>
- <input type="text" class="form-control" id="bic" name="bic" placeholder="BIC" @if(isset($data['bic'])) value="{{$data['bic']}}" @endif>
- </div>
- <div class="form-group donation-form-group">
- <label for="msg">{!! trans('spende.lastschrift.8.message')!!}</label>
- <p>{!! trans('spende.bankinfo.3')!!}</p>
- <textarea class="form-control" id="msg" name="Nachricht" placeholder="{!! trans('spende.lastschrift.8.message.placeholder') !!}">@if(isset($data['nachricht'])){{$data['nachricht']}}@endif</textarea>
- </div>
-
+ <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" name="Name" placeholder="{!! trans('spende.lastschrift.3.placeholder') !!}" @if(isset($data['name'])) value="{{$data['name']}}" @endif />
+ </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" @if(isset($data['email'])) value="{{$data['email']}}" @endif>
+ </div>
+ <div class="form-group donation-form-group">
+ <label for="iban">*{!! trans('spende.lastschrift.6') !!}</label>
+ <input type="text" class="form-control" id="iban" name="iban" placeholder="IBAN" @if(isset($data['iban'])) value="{{$data['iban']}}" @endif>
+ </div>
+ <div class="form-group donation-form-group">
+ <label for="bic">{!! trans('spende.lastschrift.7') !!}</label>
+ <input type="text" class="form-control" id="bic" name="bic" placeholder="BIC" @if(isset($data['bic'])) value="{{$data['bic']}}" @endif>
+ </div>
+ <div class="form-group donation-form-group">
+ <label for="msg">{!! trans('spende.lastschrift.8.message')!!}</label>
+ <p>{!! trans('spende.bankinfo.3')!!}</p>
+ <textarea class="form-control" id="msg" name="Nachricht" placeholder="{!! trans('spende.lastschrift.8.message.placeholder') !!}">@if(isset($data['nachricht'])){{$data['nachricht']}}@endif</textarea>
</div>
-
-
- <input type="radio" class="payment-radio" name="payment-method" id="ueberweisung" required="required"><label class="payment-label" for="ueberweisung">{!! trans('spende.ueberweisung') !!}</label> <br>
-
- <div class="bank-transfer" id="direct-payment">
- <p>{!! trans('spende.bankinfo.2') !!}</p>
- <p>{!! trans('spende.bankinfo.2.1') !!}</p>
- <p>{!! trans('spende.bankinfo.2.2') !!}</p>
- <p>{!! trans('spende.bankinfo.2.3') !!}</p>
- <p>{!! trans('spende.bankinfo.2.4') !!}</p> <br>
- <p>{!! trans('spende.bankinfo.3') !!}</p></div>
-
-
- <input type="radio" class="payment-radio" name="payment-method" id="paypal" required="required"><label class="payment-label" for="paypal">{!! trans('spende.paypal') !!}</label> <br>
- <div class="paypal-method">
- <p>{!! trans('spende.paypal.1') !!}</p></div>
-
<div class="section">
<input type="submit" value="{!! trans('spende.submit') !!}">
</div>
</div>
+ @endif
</form>
-
<div class="col-right">