Skip to content

GitLab

MetaGer
MetaGer
Commit 8f3c6e98 authored by Phil Höfer's avatar Phil Höfer
Browse files
Options

Merge branch '793-rework-bitcoin-donation-page' into 'development' 

Resolve "rework bitcoin donation page"

Closes #793

See merge request !1360
parents 8d808dcc a23533be
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 232 additions and 69 deletions
resources/js/bitpay.js 0 → 100644
View file @ 8f3c6e98
function bitpayCheckRequiredFields(form) {
var elements = form.elements;
var invalid = false;
for (var i = 0; i < elements.length; i++) {
elements[i].className = elements[i].className.replace('bitpay-donate-error', '');
if (elements[i].className.indexOf("required") !== -1 && elements[i].value.length < 1) {
elements[i].className = elements[i].className + ' bitpay-donate-error';
invalid = true;
};
}
if (invalid) {
return false;
}
var donationElement = document.getElementById('donation-value');
if (donationElement) {
var enteredDonation = Number(donationElement.value);
var maximumDonation = Number(document.getElementById('reference-maximum').value);
if (enteredDonation > maximumDonation) {
alert("Your donation was larger than the allowed maximum of " + Number(maximumDonation).toFixed(2))
return false;
};
};
return true;
};
\ No newline at end of file
resources/lang/de/bitpay.php 0 → 100644
View file @ 8f3c6e98
<?php
return [
'amount' => 'Betrag',
];
resources/lang/de/spende.php
View file @ 8f3c6e98
This diff is collapsed.
resources/less/metager/general/general.less
View file @ 8f3c6e98
......@@ -294,6 +294,7 @@ summary {
>* {
width: 50%;
margin: 0;
padding: 0;
float: left;
@media (max-width: @screen-mobile) {
width: 100%;
......@@ -417,4 +418,11 @@ label a {
// For Elements where newlines should actually be displayed
.wrap {
white-space: pre-wrap;
}
// When the content should be centerd horizontally
.center-wrapper {
display: flex;
flex-direction: column;
align-items: center;
}
\ No newline at end of file
resources/less/metager/metager.less
View file @ 8f3c6e98
......@@ -19,4 +19,5 @@
@import "./parts/modals.less";
@import "./parts/searchbar.less";
@import "./parts/settings.less";
@import "./parts/sidebar.less";
\ No newline at end of file
@import "./parts/sidebar.less";
@import "./parts/bitpay.less";
\ No newline at end of file
resources/less/metager/parts/bitpay.less 0 → 100644
View file @ 8f3c6e98
.bitpay-donate {
margin: 20px 0;
fieldset {
border: 0;
}
.field-input {
color: #666;
background: #fff;
border: 1px solid #eee;
height: 30px;
box-sizing: border-box;
flex-grow: 1;
}
.field-input-wrapper {
display: inline-flex;
float: none;
width: 80%;
}
input {
padding: 4px 10px;
}
select {
padding: 3px 10px;
}
.bitpay-donate-button {
padding: 12px 0;
width: 188px;
box-sizing: border-box;
}
ul,
li {
padding: 0;
margin: 0;
list-style: none;
}
li {
padding: 10px 0;
}
.bitpay-donate-field {
clear: both;
label {
float: left;
width: 100px;
}
div {
float: left;
}
}
.bitpay-donate-field-email {
width: 80%;
}
.bitpay-donate-field-price {
width: 40%;
}
.bitpay-donate-field-currency {
width: 40%;
}
.bitpay-donate-button-wrapper {
clear: both;
margin: auto;
text-align: center;
}
input.bitpay-donate-error {
border: 2px solid red;
}
}
\ No newline at end of file
resources/views/spende/bitpay.blade.php 0 → 100644
View file @ 8f3c6e98
<form class="bitpay-donate" action="https://bitpay.com/checkout" method="post" onsubmit="return bitpayCheckRequiredFields(this);" target="_blank">
<input name="action" type="hidden" value="checkout">
<fieldset>
<ul>
<li class="bitpay-donate-field">
<label>{{ trans('bitpay.amount') }}</label>
<div class="field-input-wrapper">
<input class="bitpay-donate-field-price field-input" name="price" type="number" value="10.00" placeholder="{{ trans('bitpay.amount') }}" maxlength="10" min="1" step="0.01"/>
<select class="bitpay-donate-field-currency field-input" name="currency" value="">
<option selected="selected" value="USD">USD</option>
<option value="BTC">BTC</option>
<option value="EUR">EUR</option>
<option value="GBP">GBP</option>
<option value="AUD">AUD</option>
<option value="BGN">BGN</option>
<option value="BRL">BRL</option>
<option value="CAD">CAD</option>
<option value="CHF">CHF</option>
<option value="CNY">CNY</option>
<option value="CZK">CZK</option>
<option value="DKK">DKK</option>
<option value="HKD">HKD</option>
<option value="HRK">HRK</option>
<option value="HUF">HUF</option>
<option value="IDR">IDR</option>
<option value="ILS">ILS</option>
<option value="INR">INR</option>
<option value="JPY">JPY</option>
<option value="KRW">KRW</option>
<option value="LTL">LTL</option>
<option value="LVL">LVL</option>
<option value="MXN">MXN</option>
<option value="MYR">MYR</option>
<option value="NOK">NOK</option>
<option value="NZD">NZD</option>
<option value="PHP">PHP</option>
<option value="PLN">PLN</option>
<option value="RON">RON</option>
<option value="RUB">RUB</option>
<option value="SEK">SEK</option>
<option value="SGD">SGD</option>
<option value="THB">THB</option>
<option value="TRY">TRY</option>
<option value="ZAR">ZAR</option>
</select>
<div>
</li>
</ul>
<input type="hidden" name="data" value="7vfsM4tlJTE54JMpsAbG/vza+uhjCUlwTLyNfRIxcXxYZKp0AjWMJdRX/EiOkwvyysCmCtCJew937VQ3e+/NxT79NJMGmDwDFTXOA1P8NSMf2J4skBfMzOVYxEdM5CRiT9M9T+JOpZZUQGD8OVEJ5QbZavJKM/x+5TCagn/l6v9tEOIQrt4t0Qh4qs3GpZlqI0vmyNs+/fNnfdvrI512wBU0dTwM9Qi2+D18wUn2CfvjICMFhKF+j1N9nhow7tjs">
<div class="bitpay-donate-button-wrapper">
<input class="bitpay-donate-button" name="submit" src="/meta/picture?url=https%3A%2F%2Fbitpay.com%2Fcdn%2Fen_US%2Fbp-btn-donate-currencies.svg" onerror="this.onerror=null; this.src='/meta/picture?url=https%3A%2F%2Fbitpay.com%2Fcdn%2Fen_US%2Fbp-btn-donate-currencies.svg'" type="image" alt="BitPay, the easy way to pay with bitcoins.">
</div>
</fieldset>
</form>
<script src="{{ mix('js/bitpay.js') }}"></script>
resources/views/spende/spende.blade.php
View file @ 8f3c6e98
......@@ -12,7 +12,7 @@
<p><i class="fa fa-info fa-fw fa-lg" aria-hidden="true"></i>{!! trans('spende.bankinfo.3') !!}</p>
</div>
<div class="two-col">
<div>
<div class="col-left">
<div class="card-medium">
<h3 id="lastschrift">{!! trans('spende.lastschrift.1') !!}</h3>
<p>{!! trans('spende.lastschrift.2') !!}</p>
......@@ -47,36 +47,39 @@
</form>
</div>
</div>
<div>
<div class="col-right">
<div class="card-medium">
<h3>{!! trans('spende.bankinfo.1') !!}</h3>
<p>{!! trans('spende.bankinfo.2') !!}</p>
</div>
</div>
<div>
<div class="card-medium">
<h3>{!! trans('spende.paypal.1') !!}</h3>
<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
<input name="cmd" value="_xclick" type="hidden">
<input name="business" value="wsb@suma-ev.de" type="hidden">
<input name="item_name" value="SuMa-eV Spende" type="hidden">
<input name="buyer_credit_promo_code" value="" type="hidden">
<input name="buyer_credit_product_category" value="" type="hidden">
<input name="buyer_credit_shipping_method" value="" type="hidden">
<input name="buyer_credit_user_address_change" value="" type="hidden">
<input name="no_shipping" value="0" type="hidden">
<input name="no_note" value="1" type="hidden">
<input name="currency_code" value="EUR" type="hidden">
<input name="tax" value="0" type="hidden">
<input name="lc" value="DE" type="hidden">
<input name="bn" value="PP-DonationsBF" type="hidden">
<input src="/img/paypalspenden.gif" name="submit" width="120" alt="{!! trans('spende.paypal.2') !!}" type="image">
</form>
<h3>{!! trans('spende.paypal.title') !!}</h3>
<p>{!! trans('spende.paypal.subtitle') !!}</p>
<div class="center-wrapper">
<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
<input name="cmd" value="_xclick" type="hidden">
<input name="business" value="wsb@suma-ev.de" type="hidden">
<input name="item_name" value="SuMa-eV Spende" type="hidden">
<input name="buyer_credit_promo_code" value="" type="hidden">
<input name="buyer_credit_product_category" value="" type="hidden">
<input name="buyer_credit_shipping_method" value="" type="hidden">
<input name="buyer_credit_user_address_change" value="" type="hidden">
<input name="no_shipping" value="0" type="hidden">
<input name="no_note" value="1" type="hidden">
<input name="currency_code" value="EUR" type="hidden">
<input name="tax" value="0" type="hidden">
<input name="lc" value="DE" type="hidden">
<input name="bn" value="PP-DonationsBF" type="hidden">
<input src="/img/paypalspenden.gif" name="submit" width="120" alt="{!! trans('spende.paypal.2') !!}" type="image">
</form>
</div>
</div>
<div class="card-medium">
<h3>{{ trans('spende.bitpay.title') }}</h3>
@include('spende.bitpay')
</div>
</div>
<div>
<div class="card-medium">
<p>{!! trans('spende.lastschrift.10') !!}</p>
<p>{!! trans('spende.lastschrift.10') !!}</p>
</div>
</div>
</div>
......
webpack.mix.js
View file @ 8f3c6e98
......@@ -69,6 +69,7 @@ mix
.babel("resources/js/focus-creator.js", "public/js/focus-creator.js")
.babel("resources/js/focus-creator.js", "public/js/focus-creator.js")
.babel("resources/js/editLanguage.js", "public/js/editLanguage.js")
.babel("resources/js/bitpay.js", "public/js/bitpay.js")
// utility
.babel(
["resources/js/utility.js", "resources/js/translations.js"],
......
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