From aec2f2a249b08b5646c7ff3b12c6de0ba5ebd66e Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 23 Oct 2020 06:54:45 -0700 Subject: [PATCH] Fixed #8576 - switch to HTML from markdown MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is really stupid. A markdown table with over 3 columns doesn’t render correctly. :( --- .../markdown/report-expiring-assets.blade.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/resources/views/notifications/markdown/report-expiring-assets.blade.php b/resources/views/notifications/markdown/report-expiring-assets.blade.php index a2ff14369..b60cdc2bf 100644 --- a/resources/views/notifications/markdown/report-expiring-assets.blade.php +++ b/resources/views/notifications/markdown/report-expiring-assets.blade.php @@ -1,20 +1,17 @@ @component('mail::message') - {{ trans_choice('mail.assets_warrantee_alert', $assets->count(), ['count'=>$assets->count(), 'threshold' => $threshold]) }} - @component('mail::table') -| |{{ trans('mail.name') }} |{{ trans('mail.expires') }} |{{ trans('mail.Days') }}|{{ trans('mail.supplier') }} | {{ trans('mail.assigned_to') }} -| |:------------- |:-------------|:---------|:---------|:---------|:---------| + + + @foreach ($assets as $asset) @php $expires = \App\Helpers\Helper::getFormattedDateObject($asset->present()->warrantee_expires, 'date'); $diff = round(abs(strtotime($asset->present()->warrantee_expires) - strtotime(date('Y-m-d')))/86400); $icon = ($diff <= ($threshold / 2)) ? '🚨' : (($diff <= $threshold) ? '⚠️' : ' '); - @endphp -|{{ $icon }}| [{{ $asset->present()->name }}]({{ route('hardware.show', $asset->id) }}) | {{ $expires['formatted'] }} | {{ $diff }} {{ trans('mail.Days') }} | {{ ($asset->supplier ? e($asset->supplier->name) : '') }}|{{ ($asset->assignedTo ? e($asset->assignedTo->present()->name()) : '') }} + @endforeach +
 {{ trans('mail.name') }}{{ trans('mail.Days') }}{{ trans('mail.expires') }}{{ trans('mail.supplier') }}{{ trans('mail.assigned_to') }}
{{ $icon }} {{ $asset->present()->name }} {{ $diff }} {{ trans('mail.Days') }} {{ $expires['formatted'] }} {{ ($asset->supplier ? e($asset->supplier->name) : '') }} {{ ($asset->assignedTo ? e($asset->assignedTo->present()->name()) : '') }}
@endcomponent - - @endcomponent