lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2022-10-12 10:22:48 -07:00
commit 0ed50f4e58
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
resources/assets/less/overrides.less
View file

@ -684,7 +684,4 @@ th.css-accessory > .th-inner::before
.sidebar-menu { .sidebar-menu {
margin-top:51px margin-top:51px
} }
}
.main-sidebar{
margin-top:50px;
} }

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

@ -606,7 +606,7 @@
@if ($asset->purchase_date) @if ($asset->purchase_date)
{{ Helper::getFormattedDateObject($asset->present()->warranty_expires(), 'date', false) }} {{ Helper::getFormattedDateObject($asset->present()->warranty_expires(), 'date', false) }}
- -
{{ Carbon::parse($asset->present()->warranty_expires())->diffForHumans() }} {{ Carbon::parse($asset->present()->warranty_expires())->diffForHumans(['parts' => 2]) }}
@else @else
{{ trans('general.na_no_purchase_date') }} {{ trans('general.na_no_purchase_date') }}
@endif @endif
@ -638,7 +638,7 @@
@if ($asset->purchase_date) @if ($asset->purchase_date)
{{ Helper::getFormattedDateObject($asset->depreciated_date()->format('Y-m-d'), 'date', false) }} {{ Helper::getFormattedDateObject($asset->depreciated_date()->format('Y-m-d'), 'date', false) }}
- -
{{ Carbon::parse($asset->depreciated_date())->diffForHumans() }} {{ Carbon::parse($asset->depreciated_date())->diffForHumans(['parts' => 2]) }}
@else @else
{{ trans('general.na_no_purchase_date') }} {{ trans('general.na_no_purchase_date') }}
@endif @endif
@ -671,7 +671,7 @@
@if ($asset->purchase_date) @if ($asset->purchase_date)
{{ Helper::getFormattedDateObject($asset->present()->eol_date(), 'date', false) }} {{ Helper::getFormattedDateObject($asset->present()->eol_date(), 'date', false) }}
- -
{{ Carbon::parse($asset->present()->eol_date())->diffForHumans() }} {{ Carbon::parse($asset->present()->eol_date())->diffForHumans(['parts' => 2]) }}
@else @else
{{ trans('general.na_no_purchase_date') }} {{ trans('general.na_no_purchase_date') }}
@endif @endif