Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 08:30:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bug: change plan when company has multiple accounts

Browse Source
This commit is contained in:
Hillel Coren 2016-12-29 22:50:55 +02:00
parent 6e75c240f8
commit 9e051da756
2 changed files with 58 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2291,6 +2291,7 @@ $LANG = array(
'iphone_app_message' => 'Consider downloading our :link', 'iphone_app_message' => 'Consider downloading our :link',
'iphone_app' => 'iPhone app', 'iphone_app' => 'iPhone app',
'logged_in' => 'Logged In', 'logged_in' => 'Logged In',
'switch_to_primary' => 'Switch to your primary company (:name) to manage your plan.'
); );

6
resources/views/accounts/management.blade.php
View File

@ -13,6 +13,11 @@
<h3 class="panel-title">{!! trans('texts.plan_status') !!}</h3> <h3 class="panel-title">{!! trans('texts.plan_status') !!}</h3>
</div> </div>
<div class="panel-body"> <div class="panel-body">
@if (Auth::user()->primaryAccount()->id != Auth::user()->account->id)
<center style="font-size:16px;color:#888888;">
{{ trans('texts.switch_to_primary', ['name' => Auth::user()->primaryAccount()->getDisplayName()]) }}
</center>
@else
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label">{{ trans('texts.plan') }}</label> <label class="col-sm-4 control-label">{{ trans('texts.plan') }}</label>
<div class="col-sm-8"> <div class="col-sm-8">
@ -82,6 +87,7 @@
{!! Former::actions( Button::success(trans('texts.white_label_button'))->large()->withAttributes(['onclick' => 'loadImages("#whiteLabelModal");$("#whiteLabelModal").modal("show");'])->appendIcon(Icon::create('plus-sign'))) !!} {!! Former::actions( Button::success(trans('texts.white_label_button'))->large()->withAttributes(['onclick' => 'loadImages("#whiteLabelModal");$("#whiteLabelModal").modal("show");'])->appendIcon(Icon::create('plus-sign'))) !!}
@endif @endif
@endif @endif
@endif
</div> </div>
</div> </div>
@if (Utils::isNinjaProd()) @if (Utils::isNinjaProd())