Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 00:11:35 +02:00
Code Issues Releases Activity

Update edit client layout

Browse Source
This commit is contained in:
Hillel Coren 2017-11-19 19:52:28 +02:00
parent 7c96b23022
commit 8ff7b7fd21
3 changed files with 49 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Ninja/Presenters/ClientPresenter.php
View File

@ -95,7 +95,11 @@ class ClientPresenter extends EntityPresenter
$state = e($client->{$prefix . 'state'});
$postalCode = e($client->{$prefix . 'post_code'});
return Utils::cityStateZip($city, $state, $postalCode, $swap);
if ($city || $state || $postalCode) {
return Utils::cityStateZip($city, $state, $postalCode, $swap);
} else {
return false;
}
}

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

@ -2540,6 +2540,7 @@ $LANG = array(
'shipping_state' => 'Shipping State/Province',
'shipping_postal_code' => 'Shipping Postal Code',
'shipping_country' => 'Shipping Country',
'classify' => 'Classify',
);

65
resources/views/clients/edit.blade.php
View File

@ -163,33 +163,54 @@
</div>
<div class="panel panel-default">
<div class="panel panel-default" style="min-height:505px">
<div class="panel-heading">
<h3 class="panel-title">{!! trans('texts.additional_info') !!}</h3>
</div>
<div class="panel-body">
{!! Former::select('currency_id')->addOption('','')
->placeholder($account->currency ? $account->currency->name : '')
->fromQuery($currencies, 'name', 'id') !!}
{!! Former::select('language_id')->addOption('','')
->placeholder($account->language ? trans('texts.lang_'.$account->language->name) : '')
->fromQuery($languages, 'name', 'id') !!}
{!! Former::select('payment_terms')->addOption('','')
->fromQuery(\App\Models\PaymentTerm::getSelectOptions(), 'name', 'num_days')
->placeholder($account->present()->paymentTerms)
->help(trans('texts.payment_terms_help')) !!}
@if ($account->isModuleEnabled(ENTITY_TASK))
{!! Former::text('task_rate')
->placeholder($account->present()->taskRate)
->help('task_rate_help') !!}
@endif
{!! Former::select('size_id')->addOption('','')
->fromQuery($sizes, 'name', 'id') !!}
{!! Former::select('industry_id')->addOption('','')
->fromQuery($industries, 'name', 'id') !!}
{!! Former::textarea('public_notes') !!}
{!! Former::textarea('private_notes') !!}
<div role="tabpanel">
<ul class="nav nav-tabs" role="tablist" style="border: none">
<li role="presentation" class="active">
<a href="#defaults" aria-controls="defaults" role="tab" data-toggle="tab">{{ trans('texts.defaults') }}</a>
</li>
<li role="presentation">
<a href="#notes" aria-controls="notes" role="tab" data-toggle="tab">{{ trans('texts.notes') }}</a>
</li>
<li role="presentation">
<a href="#classify" aria-controls="classify" role="tab" data-toggle="tab">{{ trans('texts.classify') }}</a>
</li>
</ul>
</div>
<div class="tab-content" style="padding-top:24px;">
<div role="tabpanel" class="tab-pane active" id="defaults">
{!! Former::select('currency_id')->addOption('','')
->placeholder($account->currency ? $account->currency->name : '')
->fromQuery($currencies, 'name', 'id') !!}
{!! Former::select('language_id')->addOption('','')
->placeholder($account->language ? trans('texts.lang_'.$account->language->name) : '')
->fromQuery($languages, 'name', 'id') !!}
{!! Former::select('payment_terms')->addOption('','')
->fromQuery(\App\Models\PaymentTerm::getSelectOptions(), 'name', 'num_days')
->placeholder($account->present()->paymentTerms)
->help(trans('texts.payment_terms_help') . ' | ' . link_to('/settings/payment_terms', trans('texts.customize_options'))) !!}
@if ($account->isModuleEnabled(ENTITY_TASK))
{!! Former::text('task_rate')
->placeholder($account->present()->taskRate)
->help('task_rate_help') !!}
@endif
</div>
<div role="tabpanel" class="tab-pane" id="notes">
{!! Former::textarea('public_notes')->rows(6) !!}
{!! Former::textarea('private_notes')->rows(6) !!}
</div>
<div role="tabpanel" class="tab-pane" id="classify">
{!! Former::select('size_id')->addOption('','')
->fromQuery($sizes, 'name', 'id') !!}
{!! Former::select('industry_id')->addOption('','')
->fromQuery($industries, 'name', 'id') !!}
</div>
</div>
</div>
</div>