Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-07 12:44:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Restyle add bank account page

Browse Source
This commit is contained in:
Joshua Dwire 2016-05-06 10:50:50 -04:00
parent 913c6eeff0
commit 77bd6f7bc5
4 changed files with 109 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/PublicClientController.php
View File

@ -764,6 +764,7 @@ class PublicClientController extends BaseController
'url' => URL::to('client/paymentmethods/add/'.$typeLink), 'url' => URL::to('client/paymentmethods/add/'.$typeLink),
'clientFontUrl' => $account->getFontsUrl(), 'clientFontUrl' => $account->getFontsUrl(),
'showAddress' => $accountGateway->show_address, 'showAddress' => $accountGateway->show_address,
'paymentTitle' => trans('texts.add_payment_method'),
]; ];
if ($paymentType == PAYMENT_TYPE_STRIPE_ACH) { if ($paymentType == PAYMENT_TYPE_STRIPE_ACH) {

4
resources/lang/en/texts.php
View File

@ -1262,7 +1262,9 @@ $LANG = array(
'link_with_plaid' => 'Link Account Instantly with Plaid', 'link_with_plaid' => 'Link Account Instantly with Plaid',
'link_manually' => 'Link Manually', 'link_manually' => 'Link Manually',
'secured_by_plaid' => 'Secured by Plaid', 'secured_by_plaid' => 'Secured by Plaid',
'plaid_linked_status' => 'Your bank account at :bank' 'plaid_linked_status' => 'Your bank account at :bank',
'add_payment_method' => 'Add Payment Method',
'account_holder_type' => 'Account Holder Type',
); );
return $LANG; return $LANG;

230
resources/views/payments/add_paymentmethod.blade.php
View File

@ -235,7 +235,7 @@
@if($paymentType == PAYMENT_TYPE_STRIPE_ACH) @if($paymentType == PAYMENT_TYPE_STRIPE_ACH)
{!! Former::vertical_open($url) {!! Former::open($url)
->autocomplete('on') ->autocomplete('on')
->addClass('payment-form') ->addClass('payment-form')
->id('payment-form') ->id('payment-form')
@ -303,13 +303,15 @@
<div class="row"> <div class="row">
<div class="col-md-7"> <div class="col-md-7">
<header> <header>
@if ($client) @if ($client && isset($invoiceNumber))
<h2>{{ $client->getDisplayName() }}</h2> <h2>{{ $client->getDisplayName() }}</h2>
@if(isset($invoiceNumber))
<h3>{{ trans('texts.invoice') . ' ' . $invoiceNumber }}<span>|&nbsp; {{ trans('texts.amount_due') }}: <em>{{ $account->formatMoney($amount, $client, true) }}</em></span></h3> <h3>{{ trans('texts.invoice') . ' ' . $invoiceNumber }}<span>|&nbsp; {{ trans('texts.amount_due') }}: <em>{{ $account->formatMoney($amount, $client, true) }}</em></span></h3>
@endif
@elseif ($paymentTitle) @elseif ($paymentTitle)
<h2>{{ $paymentTitle }}<br/><small>{{ $paymentSubtitle }}</small></h2> <h2>{{ $paymentTitle }}
@if(isset($paymentSubtitle))
<br/><small>{{ $paymentSubtitle }}</small>
@endif
</h2>
@endif @endif
</header> </header>
</div> </div>
@ -324,91 +326,88 @@
</div> </div>
<p>&nbsp;<br/>&nbsp;</p> <p>&nbsp;<br/>&nbsp;</p>
<div> <div>
<h3>{{ trans('texts.contact_information') }}</h3> @if($paymentType != PAYMENT_TYPE_STRIPE_ACH)
<div class="row"> <h3>{{ trans('texts.contact_information') }}</h3>
<div class="col-md-6">
{!! Former::text('first_name')
->placeholder(trans('texts.first_name'))
->autocomplete('given-name')
->label('') !!}
</div>
<div class="col-md-6">
{!! Former::text('last_name')
->placeholder(trans('texts.last_name'))
->autocomplete('family-name')
->label('') !!}
</div>
</div>
@if (isset($paymentTitle))
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-6">
{!! Former::text('email') {!! Former::text('first_name')
->placeholder(trans('texts.email')) ->placeholder(trans('texts.first_name'))
->autocomplete('email') ->autocomplete('given-name')
->label('') !!}
</div>
<div class="col-md-6">
{!! Former::text('last_name')
->placeholder(trans('texts.last_name'))
->autocomplete('family-name')
->label('') !!} ->label('') !!}
</div> </div>
</div> </div>
@if (isset($paymentTitle))
<div class="row">
<div class="col-md-12">
{!! Former::text('email')
->placeholder(trans('texts.email'))
->autocomplete('email')
->label('') !!}
</div>
</div>
@endif
<p>&nbsp;<br/>&nbsp;</p>
@if ($showAddress)
<h3>{{ trans('texts.billing_address') }}&nbsp;<span class="help">{{ trans('texts.payment_footer1') }}</span></h3>
<div class="row">
<div class="col-md-6">
{!! Former::text('address1')
->autocomplete('address-line1')
->placeholder(trans('texts.address1'))
->label('') !!}
</div>
<div class="col-md-6">
{!! Former::text('address2')
->autocomplete('address-line2')
->placeholder(trans('texts.address2'))
->label('') !!}
</div>
</div>
<div class="row">
<div class="col-md-6">
{!! Former::text('city')
->autocomplete('address-level2')
->placeholder(trans('texts.city'))
->label('') !!}
</div>
<div class="col-md-6">
{!! Former::text('state')
->autocomplete('address-level1')
->placeholder(trans('texts.state'))
->label('') !!}
</div>
</div>
<div class="row">
<div class="col-md-6">
{!! Former::text('postal_code')
->autocomplete('postal-code')
->placeholder(trans('texts.postal_code'))
->label('') !!}
</div>
<div class="col-md-6">
{!! Former::select('country_id')
->placeholder(trans('texts.country_id'))
->fromQuery($countries, 'name', 'id')
->addGroupClass('country-select')
->label('') !!}
</div>
</div>
<p>&nbsp;<br/>&nbsp;</p>
@endif
<h3>{{ trans('texts.billing_method') }}</h3>
@endif @endif
<p>&nbsp;<br/>&nbsp;</p>
@if ($showAddress)
<h3>{{ trans('texts.billing_address') }}
@if($paymentType != PAYMENT_TYPE_STRIPE_ACH)
&nbsp;<span class="help">{{ trans('texts.payment_footer1') }}</span></h3>
@endif
<div class="row">
<div class="col-md-6">
{!! Former::text('address1')
->autocomplete('address-line1')
->placeholder(trans('texts.address1'))
->label('') !!}
</div>
<div class="col-md-6">
{!! Former::text('address2')
->autocomplete('address-line2')
->placeholder(trans('texts.address2'))
->label('') !!}
</div>
</div>
<div class="row">
<div class="col-md-6">
{!! Former::text('city')
->autocomplete('address-level2')
->placeholder(trans('texts.city'))
->label('') !!}
</div>
<div class="col-md-6">
{!! Former::text('state')
->autocomplete('address-level1')
->placeholder(trans('texts.state'))
->label('') !!}
</div>
</div>
<div class="row">
<div class="col-md-6">
{!! Former::text('postal_code')
->autocomplete('postal-code')
->placeholder(trans('texts.postal_code'))
->label('') !!}
</div>
<div class="col-md-6">
{!! Former::select('country_id')
->placeholder(trans('texts.country_id'))
->fromQuery($countries, 'name', 'id')
->addGroupClass('country-select')
->label('') !!}
</div>
</div>
<p>&nbsp;<br/>&nbsp;</p>
@endif
<h3>{{ trans('texts.billing_method') }}</h3>
@if($paymentType == PAYMENT_TYPE_STRIPE_ACH) @if($paymentType == PAYMENT_TYPE_STRIPE_ACH)
@if($accountGateway->getPlaidEnabled()) @if($accountGateway->getPlaidEnabled())
@ -430,61 +429,34 @@
<h4>{{ trans('texts.link_manually') }}</h4> <h4>{{ trans('texts.link_manually') }}</h4>
@endif @endif
<p>{{ trans('texts.ach_verification_delay_help') }}</p> <p>{{ trans('texts.ach_verification_delay_help') }}</p>
<div class="row"> {!! Former::radios('account_holder_type')->radios(array(
<div class="col-md-6"> trans('texts.individual_account') => array('value' => 'individual'),
<div class="radio"> trans('texts.company_account') => array('value' => 'company'),
{!! Former::radios('account_holder_type')->radios(array( ))->inline()->label(trans('texts.account_holder_type')); !!}
trans('texts.individual_account') => array('value' => 'individual'), {!! Former::text('account_holder_name')
trans('texts.company_account') => array('value' => 'company'), ->label(trans('texts.account_holder_name')) !!}
))->inline()->label(''); !!}
</div>
</div>
<div class="col-md-6">
{!! Former::text('account_holder_name')
->placeholder(trans('texts.account_holder_name'))
->label('') !!}
</div>
</div>
<div class="row">
<div class="col-md-6">
{!! Former::select('country') {!! Former::select('country')
->placeholder(trans('texts.country_id')) ->label(trans('texts.country_id'))
->fromQuery($countries, 'name', 'iso_3166_2') ->fromQuery($countries, 'name', 'iso_3166_2')
->addGroupClass('country-select') ->addGroupClass('country-select') !!}
->label('') !!}
</div>
<div class="col-md-6">
{!! Former::select('currency') {!! Former::select('currency')
->placeholder(trans('texts.currency_id')) ->label(trans('texts.currency_id'))
->fromQuery($currencies, 'name', 'code') ->fromQuery($currencies, 'name', 'code')
->addGroupClass('currency-select') ->addGroupClass('currency-select') !!}
->label('') !!}
</div>
</div>
<div class="row">
<div class="col-md-6">
{!! Former::text('') {!! Former::text('')
->id('routing_number') ->id('routing_number')
->placeholder(trans('texts.routing_number')) ->label(trans('texts.routing_number')) !!}
->label('') !!} <div class="form-group" style="margin-top:-15px">
</div> <div class="col-md-8 col-md-offset-4">
<div class="col-md-6"> <div id="bank_name"></div>
<div id="bank_name"></div> </div>
</div> </div>
</div>
<div class="row">
<div class="col-md-6">
{!! Former::text('') {!! Former::text('')
->id('account_number') ->id('account_number')
->placeholder(trans('texts.account_number')) ->label(trans('texts.account_number')) !!}
->label('') !!}
</div>
<div class="col-md-6">
{!! Former::text('') {!! Former::text('')
->id('confirm_account_number') ->id('confirm_account_number')
->placeholder(trans('texts.confirm_account_number')) ->label(trans('texts.confirm_account_number')) !!}
->label('') !!}
</div>
</div> </div>
</div> </div>
<center> <center>
@ -653,7 +625,7 @@
$.ajax({ $.ajax({
url:"{{ URL::to('/bank') }}/" + routingNumber, url:"{{ URL::to('/bank') }}/" + routingNumber,
success:function(data) { success:function(data) {
var els = $().add(document.createTextNode(data.name)).add('<br>').add(document.createTextNode(data.city + ", " + data.state)); var els = $().add(document.createTextNode(data.name + ", " + data.city + ", " + data.state));
routingNumberCache[routingNumber] = els; routingNumberCache[routingNumber] = els;
// Still the same number? // Still the same number?

4
resources/views/payments/payment_css.blade.php
View File

@ -210,4 +210,8 @@ header h3 em {
font-size:150%; font-size:150%;
} }
#bank_name {
margin:5px 0 -5px;
}
</style> </style>