Show archived/deleted in breadcrumbs

app/Http/Controllers/ExpenseController.php

@@ -134,6 +134,7 @@ class ExpenseController extends BaseController
         $data = [
             'vendor' => null,
             'expense' => $expense,
+            'entity' => $expense,
             'method' => 'PUT',
             'url' => 'expenses/'.$expense->public_id,
             'title' => 'Edit Expense',

app/Http/Controllers/PaymentController.php

@@ -142,11 +142,13 @@ class PaymentController extends BaseController
             'invoices' => Invoice::scope()->invoiceType(INVOICE_TYPE_STANDARD)->where('is_recurring', '=', false)
                             ->with('client', 'invoice_status')->orderBy('invoice_number')->get(),
             'payment' => $payment,
+            'entity' => $payment,
             'method' => 'PUT',
             'url' => 'payments/'.$payment->public_id,
             'title' => trans('texts.edit_payment'),
             'paymentTypes' => Cache::get('paymentTypes'),
-            'clients' => Client::scope()->with('contacts')->orderBy('name')->get(), ];
+            'clients' => Client::scope()->with('contacts')->orderBy('name')->get(),
+        ];
 
         return View::make('payments.edit', $data);
     }

app/Http/Controllers/ProductController.php

@@ -81,11 +81,13 @@ class ProductController extends BaseController
     public function edit($publicId)
     {
         $account = Auth::user()->account;
+        $product = Product::scope($publicId)->withTrashed()->firstOrFail();
 
         $data = [
           'account' => $account,
           'taxRates' => $account->invoice_item_taxes ? TaxRate::scope()->get(['id', 'name', 'rate']) : null,
-          'product' => Product::scope($publicId)->withTrashed()->firstOrFail(),
+          'product' => $product,
+          'entity' => $product,
           'method' => 'PUT',
           'url' => 'products/'.$publicId,
           'title' => trans('texts.edit_product'),

app/Http/Controllers/TaskController.php

@@ -177,6 +177,7 @@ class TaskController extends BaseController
 
         $data = [
             'task' => $task,
+            'entity' => $task,
             'clientPublicId' => $task->client ? $task->client->public_id : 0,
             'method' => 'PUT',
             'url' => 'tasks/'.$task->public_id,
@@ -185,7 +186,6 @@ class TaskController extends BaseController
             'actions' => $actions,
             'timezone' => Auth::user()->account->timezone ? Auth::user()->account->timezone->name : DEFAULT_TIMEZONE,
             'datetimeFormat' => Auth::user()->account->getMomentDateTimeFormat(),
-            //'entityStatus' => $task->present()->status,
         ];
 
         $data = array_merge($data, self::getViewModel());

app/Ninja/Presenters/ClientPresenter.php

@@ -23,22 +23,4 @@ class ClientPresenter extends EntityPresenter {
 
         return $account->formatMoney($client->paid_to_date, $client);
     }
-
-    public function status()
-    {
-        $class = $text = '';
-
-        if ($this->entity->is_deleted) {
-            $class = 'danger';
-            $text = trans('texts.deleted');
-        } elseif ($this->entity->trashed()) {
-            $class = 'warning';
-            $text = trans('texts.archived');
-        } else {
-            $class = 'success';
-            $text = trans('texts.active');
-        }
-
-        return "<span class=\"label label-{$class}\">{$text}</span>";
-    }
 }

app/Ninja/Presenters/EntityPresenter.php

@@ -17,6 +17,24 @@ class EntityPresenter extends Presenter
         return URL::to($link);
     }
 
+    public function statusLabel()
+    {
+        $class = $text = '';
+
+        if ($this->entity->is_deleted) {
+            $class = 'danger';
+            $text = trans('texts.deleted');
+        } elseif ($this->entity->trashed()) {
+            $class = 'warning';
+            $text = trans('texts.archived');
+        } else {
+            //$class = 'success';
+            //$text = trans('texts.active');
+        }
+
+        return "<span style=\"font-size:13px\" class=\"label label-{$class}\">{$text}</span>";
+    }
+
     /**
      * @return mixed
      */

app/Providers/AppServiceProvider.php

@@ -117,7 +117,7 @@ class AppServiceProvider extends ServiceProvider
             }
 
             if ($status) {
-                $str .= '    ' . $status;
+                $str .= $status;
             }
 
             return $str . '</ol>';

resources/assets/css/style.css

@@ -1220,3 +1220,8 @@ div.panel-body div.panel-body {
     background-color: #eee!important;
     color: #999!important;
 }
+
+.breadcrumb .label {
+  vertical-align: middle;
+  margin-left: 16px;
+}

resources/views/clients/show.blade.php

@@ -23,12 +23,10 @@
 
     <div class="row">
         <div class="col-md-7">
-            <div>
+            <ol class="breadcrumb">
-                <span style="font-size:28px">{{ $client->getDisplayName() }}</span>
+              <li>{{ link_to('/clients', trans('texts.clients')) }}</li>
-                @if ($client->trashed())
+              <li class='active'>{{ $client->getDisplayName() }}</li> {!! $client->present()->statusLabel !!}
-                    &nbsp;&nbsp;{!! $client->present()->status !!}
+            </ol>
-                @endif
-            </div>
         </div>
         <div class="col-md-5">
             <div class="pull-right">
@@ -83,7 +81,6 @@
 		{{ trans('texts.last_logged_in') }} {{ Utils::timestampToDateTimeString(strtotime($client->last_login)) }}
 	</small></h3>
 	@endif
-    <br/>
 
     <div class="panel panel-default">
     <div class="panel-body">

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')

resources/views/invoices/edit.blade.php

@@ -44,6 +44,7 @@
 			<li>{!! link_to(($entityType == ENTITY_QUOTE ? 'quotes' : 'invoices'), trans('texts.' . ($entityType == ENTITY_QUOTE ? 'quotes' : 'invoices'))) !!}</li>
 			<li class="active">{{ $invoice->invoice_number }}</li>
 		@endif
+		{!! $invoice->present()->statusLabel !!}
 		</ol>
 	@endif
 

resources/views/partials/upgrade_modal.blade.php

@@ -123,7 +123,7 @@
 <div id="upgrade-modal" class="container" style="">
 <div class="row">
 <div class="col-md-10 text-right">
-  <a href="#"><i class="fa fa-close" onclick="hideUpgradeModal()"></i></a>
+  <a href="#"><i class="fa fa-close" onclick="hideUpgradeModal()" title="{{ trans('texts.close') }}"></i></a>
 </div>
 </div>
 <div class="row">

resources/views/vendors/show.blade.php

@@ -21,7 +21,16 @@
 
 @section('content')
 
+<div class="row">
+    <div class="col-md-7">
+        <ol class="breadcrumb">
+          <li>{{ link_to('/vendors', trans('texts.vendors')) }}</li>
+          <li class='active'>{{ $vendor->getDisplayName() }}</li> {!! $vendor->present()->statusLabel !!}
+        </ol>
+    </div>
+    <div class="col-md-5">
         <div class="pull-right">
+
           {!! Former::open('vendors/bulk')->addClass('mainForm') !!}
       		<div style="display:none">
       			{!! Former::text('action') !!}
@@ -59,9 +68,11 @@
       	  {!! Former::close() !!}
 
         </div>
+    </div>
+</div>
+
 
 
-	<h2>{{ $vendor->getDisplayName() }}</h2>
     <div class="panel panel-default">
     <div class="panel-body">
 	<div class="row">