From b092779697c588cc501b200ec5d46f30e3c9e6e6 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 7 Jul 2025 14:37:38 +0100 Subject: [PATCH] Fixed #17273 - switch to HTML table from markdown Signed-off-by: snipe --- .../markdown/upcoming-audits.blade.php | 33 ++++++++++++++++--- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/resources/views/notifications/markdown/upcoming-audits.blade.php b/resources/views/notifications/markdown/upcoming-audits.blade.php index c6b9bf445b..35a30721b9 100644 --- a/resources/views/notifications/markdown/upcoming-audits.blade.php +++ b/resources/views/notifications/markdown/upcoming-audits.blade.php @@ -2,9 +2,21 @@ ### {{ 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('general.notes') }} -|-|:------------- |:-------------|:---------|:---------|:---------|:---------|:---------| + + + + + + + + + + + + + + + @foreach ($assets as $asset) @php $next_audit_date = Helper::getFormattedDateObject($asset->next_audit_date, 'date', false); @@ -12,9 +24,20 @@ $last_audit_date = Helper::getFormattedDateObject($asset->last_audit_date, 'date $diff = (int) Carbon::parse(Carbon::now())->diffInDays($asset->next_audit_date, true); $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() : '') }}|{{ $asset->notes }} + + + + + + + + + + + + @endforeach -@endcomponent +
{{ 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') }}
{{ $icon }}{{ $asset->present()->name }}{{ $last_audit_date }}{{ $next_audit_date }}{{ $diff }}{{ ($asset->supplier ? e($asset->supplier->name) : '') }}{{ ($asset->assignedTo ? $asset->assignedTo->present()->name() : '') }}{!! nl2br(e($asset->notes)) !!}
@endcomponent