diff --git a/app/views/accounts/payments.blade.php b/app/views/accounts/payments.blade.php index 01d91b14ee02..a47ba1ce2cab 100755 --- a/app/views/accounts/payments.blade.php +++ b/app/views/accounts/payments.blade.php @@ -1,26 +1,5 @@ @extends('accounts.nav') -@section('head') - @parent - - - -@stop - @section('content') @parent diff --git a/app/views/payments/payment.blade.php b/app/views/payments/payment.blade.php index 62b56f727700..13debcf3732c 100755 --- a/app/views/payments/payment.blade.php +++ b/app/views/payments/payment.blade.php @@ -50,8 +50,8 @@ header { } .panel-body { - padding-left: 100px; - padding-right: 100px; + padding-left: 150px; + padding-right: 150px; } } @@ -166,16 +166,16 @@ header h3 em {

{{ trans('texts.contact_information') }}

-
+
{{ Former::text('first_name')->placeholder(trans('texts.first_name'))->raw() }}
-
+
{{ Former::text('last_name')->placeholder(trans('texts.last_name'))->raw() }}
@if (isset($paymentTitle))
-
+
{{ Former::text('email')->placeholder(trans('texts.email'))->raw() }}
@@ -183,39 +183,42 @@ header h3 em {

 
 

-

{{ trans('texts.billing_address') }}

+

{{ trans('texts.billing_address') }}  {{ trans('texts.payment_footer1') }}

-
+
{{ Former::text('address1')->placeholder(trans('texts.address1'))->raw() }}
-
+
{{ Former::text('address2')->placeholder(trans('texts.address2'))->raw() }}
-
+
{{ Former::text('city')->placeholder(trans('texts.city'))->raw() }}
-
+
{{ Former::text('state')->placeholder(trans('texts.state'))->raw() }}
-
+
{{ Former::text('postal_code')->placeholder(trans('texts.postal_code'))->raw() }}

 
 

-

{{ trans('texts.billing_method') }}  {{ trans('texts.match_address') }}

+

{{ trans('texts.billing_method') }}

-
+
{{ Former::text('card_number')->placeholder(trans('texts.card_number'))->raw() }}
+
+ {{ Former::text('cvv')->placeholder(trans('texts.cvv'))->raw() }} +
-
+
{{ Former::select('expiration_month')->placeholder(trans('texts.expiration_month')) ->addOption('01 - January', '1') ->addOption('02 - February', '2') @@ -231,7 +234,7 @@ header h3 em { ->addOption('12 - December', '12')->raw(); }}
-
+
{{ Former::select('expiration_year')->placeholder(trans('texts.expiration_year')) ->addOption('2014', '2014') ->addOption('2015', '2015') @@ -242,22 +245,19 @@ header h3 em { ->addOption('2020', '2020')->raw(); }}
-
- {{ Former::text('cvv')->placeholder(trans('texts.cvv'))->raw() }} -
-
+
@if ($account->showTokenCheckbox()) - selectTokenCheckbox() ? 'CHECKED' : '' }} value="1" style="margin-left:0px; vertical-align:text-top"> - + selectTokenCheckbox() ? 'CHECKED' : '' }} value="1" style="margin-left:0px; vertical-align:top"> + {{ trans('texts.token_billing_secure', ['stripe_link' => link_to('https://stripe.com/', 'Stripe.com', ['target' => '_blank'])]) }} @endif
-
+
@if (isset($acceptedCreditCardTypes))
@foreach ($acceptedCreditCardTypes as $card) @@ -272,7 +272,7 @@ header h3 em {

 
 

-
+
{{ Button::block_success_submit_lg(strtoupper(trans('texts.pay_now') . ' - ' . Utils::formatMoney($amount, $currencyId) )) }}
diff --git a/public/built.css b/public/built.css index 159952ef228b..ec54314db7d6 100644 --- a/public/built.css +++ b/public/built.css @@ -2892,4 +2892,19 @@ table.table thead .sorting_asc_disabled:after { content: '' !important } table.table thead .sorting_desc_disabled:after { content: '' !important } /* Prevent modal from shifting page a bit - https://github.com/twbs/bootstrap/issues/9886 */ -body.modal-open { overflow:inherit; padding-right:inherit !important; } \ No newline at end of file +body.modal-open { overflow:inherit; padding-right:inherit !important; } + + +/* bootstrap 3.2.0 fix */ +/* https://github.com/twbs/bootstrap/issues/13984 */ +.radio input[type="radio"], +.checkbox input[type="checkbox"] { + margin-left: 0; + margin-right: 5px; + height: inherit; + width: inherit; + float: left; + display: inline-block; + position: relative; + margin-top: 3px; +} diff --git a/public/built.js b/public/built.js index b526de7baa0e..2ab5710bea95 100644 --- a/public/built.js +++ b/public/built.js @@ -33013,11 +33013,6 @@ function setDocHexDraw(doc, hex) { return doc.setDrawColor(r, g, b); } -function openUrl(url, track) { - trackUrl(track ? track : url); - window.open(url, '_blank'); -} - function toggleDatePicker(field) { $('#'+field).datepicker('show'); } diff --git a/public/css/style.css b/public/css/style.css index 53eec512662f..963e607370c6 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -784,4 +784,19 @@ table.table thead .sorting_asc_disabled:after { content: '' !important } table.table thead .sorting_desc_disabled:after { content: '' !important } /* Prevent modal from shifting page a bit - https://github.com/twbs/bootstrap/issues/9886 */ -body.modal-open { overflow:inherit; padding-right:inherit !important; } \ No newline at end of file +body.modal-open { overflow:inherit; padding-right:inherit !important; } + + +/* bootstrap 3.2.0 fix */ +/* https://github.com/twbs/bootstrap/issues/13984 */ +.radio input[type="radio"], +.checkbox input[type="checkbox"] { + margin-left: 0; + margin-right: 5px; + height: inherit; + width: inherit; + float: left; + display: inline-block; + position: relative; + margin-top: 3px; +}