Skip to content

A free open source IT asset/license management system

Merge branch 'develop' into fixes/existing-assets-report

Marcus Mooredb5bb1928eba
diff --cc resources/views/notifications/markdown/report-expiring-assets.blade.php
index de586bfd8c,4c7ac47f1f..31112ec4eb
--- a/resources/views/notifications/markdown/report-expiring-assets.blade.php
+++ b/resources/views/notifications/markdown/report-expiring-assets.blade.php
@@@ -8,18 -10,8 +8,18 @@@ $expires = Helper::getFormattedDateObje
$diff = round(abs(strtotime($asset->present()->warranty_expires) - strtotime(date('Y-m-d')))/86400);
$icon = ($diff <= ($threshold / 2)) ? '🚨' : (($diff <= $threshold) ? '⚠️' : ' ');
@endphp
- <tr><td>{{ $icon }} </td><td> <a href="{{ route('hardware.show', $asset->id) }}">{{ $asset->display_name }}</a><br><small>{{trans('mail.serial').': '.$asset->serial}}</small></td><td> {{ $diff }} {{ trans('mail.Days') }} </td><td> {{ !is_null($expires) ? $expires['formatted'] : '' }} </td><td> {{ ($asset->supplier ? e($asset->supplier->name) : '') }} </td><td> {{ ($asset->assignedTo ? e($asset->assignedTo->present()->display_name) : '') }} </td></tr>
+@component('mail::table')
+| | | |
+| ------------- | ------------- | ------------- |
- | {{ $icon }} | **{{ trans('mail.name') }}** | <a href="{{ route('hardware.show', $asset->id) }}">{{ $asset->present()->name }}</a> <br><small>{{trans('mail.serial').': '.$asset->serial}}</small> |
++| {{ $icon }} | **{{ trans('mail.name') }}** | <a href="{{ route('hardware.show', $asset->id) }}">{{ $asset->display_name }}</a> <br><small>{{trans('mail.serial').': '.$asset->serial}}</small> |
+| | **{{ trans('mail.expires') }}** | {{ !is_null($expires) ? $expires['formatted'] : '' }} (<strong>{{ $diff }} {{ trans('mail.Days') }}</strong>) |
+@if ($asset->supplier)
+| | **{{ trans('mail.supplier') }}** | {{ ($asset->supplier ? e($asset->supplier->name) : '') }} |
+@endif
+@if ($asset->assignedTo)
+| | **{{ trans('mail.assigned_to') }}** | {{ e($asset->assignedTo->present()->display_name) }} |
+@endif
+@endcomponent
@endforeach
-</table>
@endcomponent
@endcomponent