DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-12 06:17:28 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed 500 when depreciation is set but no purchase_date

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2022-09-15 15:39:47 -07:00
parent 51d7f2b97b
commit 24910433a1
3 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Models/Depreciable.php
View file

@ -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()) {

1
resources/lang/en/general.php
View file

@ -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',
];

18
resources/views/hardware/view.blade.php
View file

@ -519,7 +519,7 @@
</div>
</div>
@endif
@if (($asset->model) && ($asset->depreciation))
@if (($asset->model) && ($asset->depreciation) && ($asset->purchase_date))
<div class="row">
<div class="col-md-2">
<strong>
@ -597,14 +597,17 @@
<strong>
{{ trans('admin/hardware/form.warranty_expires') }}
{!! $asset->present()->warranty_expires() < date("Y-m-d") ? '<i class="fas fa-exclamation-triangle text-orange" aria-hidden="true"></i>' : '' !!}
</strong>
</div>
<div class="col-md-6">
@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
</div>
</div>
@ -630,9 +633,13 @@
</strong>
</div>
<div class="col-md-6">
@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
</div>
</div>
@ -659,10 +666,13 @@
</strong>
</div>
<div class="col-md-6">
@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
</div>
</div>
@endif