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

Merge pull request #11764 from BasO12/master

Browse source 
Added notes to audit mail notification
This commit is contained in:
snipe 2022-09-27 14:43:50 -07:00 committed by GitHub
parent a7b83fc531 61e1650542
commit c194c8a0c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
resources/views/notifications.blade.php
View file

@ -50,6 +50,9 @@
<li><b>{{ trans('general.asset_name') }} </b> {{ $asset->model->name }}</li>
@endisset
<li><b>{{ trans('general.asset_tag') }}</b> {{ $asset->asset_tag }}</li>
@isset ($asset->notes)
<li><b>{{ trans('general.notes') }}</b> {{ $asset->notes }}</li>
@endisset
</ul>
</div>

6
resources/views/notifications/markdown/upcoming-audits.blade.php
View file

@ -3,8 +3,8 @@
### {{ trans_choice('mail.upcoming-audits', $assets->count(), ['count' => $assets->count(), 'threshold' => $threshold]) }}
@component('mail::table')
| |{{ trans('mail.name') }}|{{ trans('general.last_audit') }}|{{ trans('general.next_audit_date') }}|{{ trans('mail.Days') }}|{{ trans('mail.supplier') }} | {{ trans('mail.assigned_to') }}
|-|:------------- |:-------------|:---------|:---------|:---------|:---------|
| |{{ trans('mail.name') }}|{{ trans('general.last_audit') }}|{{ trans('general.next_audit_date') }}|{{ trans('mail.Days') }}|{{ trans('mail.supplier') }} | {{ trans('mail.assigned_to') }}|{{ trans('general.notes') }}
|-|:------------- |:-------------|:---------|:---------|:---------|:---------|:---------|
@foreach ($assets as $asset)
@php
$next_audit_date = Helper::getFormattedDateObject($asset->next_audit_date, 'date', false);
@ -12,7 +12,7 @@ $last_audit_date = Helper::getFormattedDateObject($asset->last_audit_date, 'date
$diff = Carbon::parse(Carbon::now())->diffInDays($asset->next_audit_date, false);
$icon = ($diff <= 7) ? '🚨' : (($diff <= 14) ? '⚠️' : ' ');
@endphp
|{{ $icon }}| [{{ $asset->present()->name }}]({{ route('hardware.show', $asset->id) }}) | {{ $last_audit_date }}| {{ $next_audit_date }} | {{ $diff }} | {{ ($asset->supplier ? e($asset->supplier->name) : '') }}|{{ ($asset->assignedTo ? $asset->assignedTo->present()->name() : '') }}
|{{ $icon }}| [{{ $asset->present()->name }}]({{ route('hardware.show', $asset->id) }}) | {{ $last_audit_date }}| {{ $next_audit_date }} | {{ $diff }} | {{ ($asset->supplier ? e($asset->supplier->name) : '') }}|{{ ($asset->assignedTo ? $asset->assignedTo->present()->name() : '') }}|{{ $asset->notes }}
@endforeach
@endcomponent