diff --git a/app/Models/Depreciable.php b/app/Models/Depreciable.php index 20a28af40a..e22fb65a7f 100644 --- a/app/Models/Depreciable.php +++ b/app/Models/Depreciable.php @@ -68,9 +68,13 @@ class Depreciable extends SnipeModel */ public function getLinearDepreciatedValue() // TODO - for testing it might be nice to have an optional $relative_to param here, defaulted to 'now' { - $months_passed = $this->purchase_date->diff(now())->m; + if ($this->purchase_date) { + $months_passed = $this->purchase_date->diff(now())->m; + } else { + return null; + } - if($months_passed >= $this->get_depreciation()->months){ + if ($months_passed >= $this->get_depreciation()->months){ //if there is a floor use it if($this->get_depreciation()->deprecation_min->isNotEmpty()) { diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index 6a2bc35080..029b74d195 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -372,6 +372,7 @@ return [ 'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.', 'bulk_checkin_success' => 'The items for the selected users have been checked in.', 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ', + 'na_no_purchase_date' => 'N/A - No purchase date provided', ]; \ No newline at end of file diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index 2e24d8a62b..167ad70287 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -519,7 +519,7 @@ @endif - @if (($asset->model) && ($asset->depreciation)) + @if (($asset->model) && ($asset->depreciation) && ($asset->purchase_date))
@@ -596,15 +596,20 @@
{{ trans('admin/hardware/form.warranty_expires') }} + @if ($asset->purchase_date) {!! $asset->present()->warranty_expires() < date("Y-m-d") ? '' : '' !!} + @endif +
- + @if ($asset->purchase_date) {{ Helper::getFormattedDateObject($asset->present()->warranty_expires(), 'date', false) }} - {{ Carbon::parse($asset->present()->warranty_expires())->diffForHumans() }} - + @else + {{ trans('general.na_no_purchase_date') }} + @endif
@@ -630,9 +635,13 @@
+ @if ($asset->purchase_date) {{ Helper::getFormattedDateObject($asset->depreciated_date()->format('Y-m-d'), 'date', false) }} - {{ Carbon::parse($asset->depreciated_date())->diffForHumans() }} + @else + {{ trans('general.na_no_purchase_date') }} + @endif
@@ -659,10 +668,13 @@
+ @if ($asset->purchase_date) {{ Helper::getFormattedDateObject($asset->present()->eol_date(), 'date', false) }} - {{ Carbon::parse($asset->present()->eol_date())->diffForHumans() }} - + @else + {{ trans('general.na_no_purchase_date') }} + @endif
@endif @@ -1186,10 +1198,14 @@ @endif + @if (Storage::exists('private_uploads/assets/'.$file->filename)) {{ $file->filename }} + @else + {{ $file->filename }} + @endif - - {{ @Helper::formatFilesizeUnits(Storage::size('private_uploads/assets/'.$file->filename)) }} + + {{ @Helper::formatFilesizeUnits(Storage::exists('private_uploads/assets/'.$file->filename) ? Storage::size('private_uploads/assets/'.$file->filename) : '') }} @if ($file->note) @@ -1197,7 +1213,7 @@ @endif - @if ($file->filename) + @if (($file->filename) && (Storage::exists('private_uploads/assets/'.$file->filename))) @@ -1279,10 +1295,14 @@ @endif - {{ $file->filename }} + @if (Storage::exists('private_uploads/assetmodels/'.$file->filename)) + {{ $file->filename }} + @else + {{ $file->filename }} + @endif - - {{ Helper::formatFilesizeUnits(Storage::size('private_uploads/assetmodels/'.$file->filename)) }} + + {{ Helper::formatFilesizeUnits(@Storage::size('private_uploads/assetmodels/'.$file->filename)) }} @if ($file->note) @@ -1290,7 +1310,7 @@ @endif - @if ($file->filename) + @if (($file->filename) && (Storage::exists('private_uploads/assetmodels/'.$file->filename)))