diff --git a/resources/views/header.blade.php b/resources/views/header.blade.php
index 8d909af01c89..5f9ec992998f 100644
--- a/resources/views/header.blade.php
+++ b/resources/views/header.blade.php
@@ -585,7 +585,7 @@
@endif
@if (!isset($showBreadcrumbs) || $showBreadcrumbs)
- {!! Form::breadcrumbs(isset($entityStatus) ? $entityStatus : '') !!}
+ {!! Form::breadcrumbs((isset($entity) && $entity->exists) ? $entity->present()->statusLabel : false) !!}
@endif
@yield('content')
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index 0828cdca59db..8a9319b8d5d5 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -36,14 +36,15 @@
{{ trans($errors->first('invoice_items')) }}
@endif
- @if ($invoice->id)
+ @if ($invoice->id)
- @if ($invoice->is_recurring)
- - {!! link_to('invoices', trans('texts.recurring_invoice')) !!}
- @else
- - {!! link_to(($entityType == ENTITY_QUOTE ? 'quotes' : 'invoices'), trans('texts.' . ($entityType == ENTITY_QUOTE ? 'quotes' : 'invoices'))) !!}
- - {{ $invoice->invoice_number }}
- @endif
+ @if ($invoice->is_recurring)
+ - {!! link_to('invoices', trans('texts.recurring_invoice')) !!}
+ @else
+ - {!! link_to(($entityType == ENTITY_QUOTE ? 'quotes' : 'invoices'), trans('texts.' . ($entityType == ENTITY_QUOTE ? 'quotes' : 'invoices'))) !!}
+ - {{ $invoice->invoice_number }}
+ @endif
+ {!! $invoice->present()->statusLabel !!}
@endif
diff --git a/resources/views/partials/upgrade_modal.blade.php b/resources/views/partials/upgrade_modal.blade.php
index 668e9e223d34..eb60fe32e11f 100644
--- a/resources/views/partials/upgrade_modal.blade.php
+++ b/resources/views/partials/upgrade_modal.blade.php
@@ -123,7 +123,7 @@
diff --git a/resources/views/vendors/show.blade.php b/resources/views/vendors/show.blade.php
index 378d1b52f025..3063bb4d7130 100644
--- a/resources/views/vendors/show.blade.php
+++ b/resources/views/vendors/show.blade.php
@@ -21,47 +21,58 @@
@section('content')
-
- {!! Former::open('vendors/bulk')->addClass('mainForm') !!}
-
- {!! Former::text('action') !!}
- {!! Former::text('public_id')->value($vendor->public_id) !!}
-
+
+
+
+ - {{ link_to('/vendors', trans('texts.vendors')) }}
+ - {{ $vendor->getDisplayName() }}
{!! $vendor->present()->statusLabel !!}
+
+
+
+
- @if ( ! $vendor->is_deleted)
- @can('edit', $vendor)
- {!! DropdownButton::normal(trans('texts.edit_vendor'))
- ->withAttributes(['class'=>'normalDropDown'])
- ->withContents([
- ($vendor->trashed() ? false : ['label' => trans('texts.archive_vendor'), 'url' => "javascript:onArchiveClick()"]),
- ['label' => trans('texts.delete_vendor'), 'url' => "javascript:onDeleteClick()"],
- ]
- )->split() !!}
- @endcan
- @if ( ! $vendor->trashed())
- @can('create', ENTITY_EXPENSE)
- {!! Button::primary(trans("texts.new_expense"))
- ->asLinkTo(URL::to("/expenses/create/{$vendor->public_id}"))
- ->appendIcon(Icon::create('plus-sign')) !!}
- @endcan
- @endif
- @endif
+ {!! Former::open('vendors/bulk')->addClass('mainForm') !!}
+
+ {!! Former::text('action') !!}
+ {!! Former::text('public_id')->value($vendor->public_id) !!}
+
- @if ($vendor->trashed())
- @can('edit', $vendor)
- {!! Button::primary(trans('texts.restore_vendor'))
- ->appendIcon(Icon::create('cloud-download'))
- ->withAttributes(['onclick' => 'onRestoreClick()']) !!}
- @endcan
- @endif
+ @if ( ! $vendor->is_deleted)
+ @can('edit', $vendor)
+ {!! DropdownButton::normal(trans('texts.edit_vendor'))
+ ->withAttributes(['class'=>'normalDropDown'])
+ ->withContents([
+ ($vendor->trashed() ? false : ['label' => trans('texts.archive_vendor'), 'url' => "javascript:onArchiveClick()"]),
+ ['label' => trans('texts.delete_vendor'), 'url' => "javascript:onDeleteClick()"],
+ ]
+ )->split() !!}
+ @endcan
+ @if ( ! $vendor->trashed())
+ @can('create', ENTITY_EXPENSE)
+ {!! Button::primary(trans("texts.new_expense"))
+ ->asLinkTo(URL::to("/expenses/create/{$vendor->public_id}"))
+ ->appendIcon(Icon::create('plus-sign')) !!}
+ @endcan
+ @endif
+ @endif
+
+ @if ($vendor->trashed())
+ @can('edit', $vendor)
+ {!! Button::primary(trans('texts.restore_vendor'))
+ ->appendIcon(Icon::create('cloud-download'))
+ ->withAttributes(['onclick' => 'onRestoreClick()']) !!}
+ @endcan
+ @endif
- {!! Former::close() !!}
+ {!! Former::close() !!}
+
+
+
+
-
-
{{ $vendor->getDisplayName() }}