From 3b5e4c44ebbc6fa405c1775b229724fae4029986 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 16 Jan 2018 07:46:34 -0800 Subject: [PATCH] Fixed depreciation report not showing assigned to --- resources/views/reports/depreciation.blade.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/resources/views/reports/depreciation.blade.php b/resources/views/reports/depreciation.blade.php index 383c6ddd52..f36f24483a 100644 --- a/resources/views/reports/depreciation.blade.php +++ b/resources/views/reports/depreciation.blade.php @@ -74,13 +74,14 @@ @endif - @if ($asset->assignedTo) - @if ($asset->assignedTo->deleted_at!='') - {{ $asset->assignedTo->present()->name() }} + @if ($asset->checkedOutToUser()) + {{ $asset->assigned->getFullNameAttribute() }} @else - {!! $asset->assignedTo->present()->nameUrl() !!} + + @if ($asset->assigned) + {{ $asset->assigned->name }} + @endif @endif - @endif @if ($asset->location)