Skip to content

Use nicer locale for purchase date #17695

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snipe merged 2 commits into from
Aug 21, 2025
Merged

Use nicer locale for purchase date #17695

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b84d928
Use normal locale for warranty
snipe Aug 21, 2025
822339f
Moved warning
snipe Aug 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions resources/views/hardware/view.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,7 @@ class="form-inline"
<div class="col-md-9">
{{ Helper::getFormattedDateObject($asset->purchase_date, 'date', false) }}
-
{{ Carbon::parse($asset->purchase_date)->diff(Carbon::now())->format('%y years, %m months and %d days')}}
{{ Carbon::parse($asset->purchase_date)->diffForHumans(['parts' => 3]) }}

</div>
</div>
Expand Down Expand Up @@ -930,17 +930,19 @@ class="form-inline"
<div class="col-md-3">
<strong>
{{ trans('admin/hardware/form.warranty_expires') }}
@if ($asset->purchase_date)
{!! $asset->present()->warranty_expires() < date("Y-m-d") ? '<i class="fas fa-exclamation-triangle text-orange" aria-hidden="true"></i>' : '' !!}
@endif


</strong>
</div>
<div class="col-md-9">
@if ($asset->purchase_date)
{{ Helper::getFormattedDateObject($asset->present()->warranty_expires(), 'date', false) }}
-
{{ Carbon::parse($asset->present()->warranty_expires())->diffForHumans(['parts' => 2]) }}
{{ Carbon::parse($asset->present()->warranty_expires())->diffForHumans(['parts' => 3]) }}

@if ($asset->purchase_date)
{!! $asset->present()->warranty_expires() < date("Y-m-d") ? '<i class="fas fa-exclamation-triangle text-orange" aria-hidden="true"></i>' : '' !!}
@endif
@else
{{ trans('general.na_no_purchase_date') }}
@endif
Expand Down Expand Up @@ -971,7 +973,7 @@ class="form-inline"
@if ($asset->purchase_date)
{{ Helper::getFormattedDateObject($asset->depreciated_date()->format('Y-m-d'), 'date', false) }}
-
{{ Carbon::parse($asset->depreciated_date())->diffForHumans(['parts' => 2]) }}
{{ Carbon::parse($asset->depreciated_date())->diffForHumans(['parts' => 3]) }}
@else
{{ trans('general.na_no_purchase_date') }}
@endif
Expand Down Expand Up @@ -1008,7 +1010,7 @@ class="form-inline"
@if ($asset->asset_eol_date)
{{ Helper::getFormattedDateObject($asset->asset_eol_date, 'date', false) }}
-
{{ Carbon::parse($asset->asset_eol_date)->diffForHumans(['parts' => 2]) }}
{{ Carbon::parse($asset->asset_eol_date)->locale(app()->getLocale())->diffForHumans(['parts' => 3]) }}
@else
{{ trans('general.na_no_purchase_date') }}
@endif
Expand All @@ -1017,7 +1019,7 @@ class="form-inline"
data-placement="top"
data-title="Explicit EOL"
title="Explicit EOL">
<x-icon type="warning" class="text-orange" />
<x-icon type="warning" class="text-primary" />
</span>
@endif
</div>
Expand Down
Loading