Check for array key for license report/formatters

Author: snipe

app/Console/Commands/SendExpirationAlerts.php

@@ -107,7 +107,7 @@ public function handle()
                         trans('general.name') => $item->name,
                         trans('general.purchase_date') => $item->purchase_date_formatted,
                         trans('admin/licenses/form.expiration') => $item->expires_formatted_date,
-                        trans('mail.expires') => $item->expires_diff_for_humans,
+                        trans('mail.expires') => $item->expires_formatted_date ? $item->expires_diff_for_humans : '',
                         trans('admin/licenses/form.termination_date') => $item->terminates_formatted_date,
                         trans('mail.terminates') => $item->terminates_diff_for_humans
                     ])

app/Models/SnipeModel.php

@@ -32,22 +32,22 @@ protected function purchaseDateFormatted(): Attribute
     protected function expiresDiffInDays(): Attribute
     {
         return Attribute:: make(
-            get: fn(mixed $value, array $attributes) => in_array('expiration_date', $attributes) ? Carbon::now()->diffInDays($attributes['expiration_date']) : null,
+            get: fn(mixed $value, array $attributes) => array_key_exists('expiration_date', $attributes) ? Carbon::now()->diffInDays($attributes['expiration_date']) : null,
         );
     }
 
 
     protected function expiresDiffForHumans(): Attribute
     {
         return Attribute:: make(
-            get: fn(mixed $value, array $attributes) => in_array('expiration_date', $attributes) ? Carbon::parse($attributes['expiration_date'])->diffForHumans() : null,
+            get: fn(mixed $value, array $attributes) => array_key_exists('expiration_date', $attributes) ? Carbon::parse($attributes['expiration_date'])->diffForHumans() : null,
         );
     }
 
     protected function expiresFormattedDate(): Attribute
     {
         return Attribute:: make(
-            get: fn(mixed $value, array $attributes) => in_array('expiration_date', $attributes) ? Helper::getFormattedDateObject($attributes['expiration_date'], 'date', false) : null,
+            get: fn(mixed $value, array $attributes) => array_key_exists('expiration_date', $attributes) ? Helper::getFormattedDateObject($attributes['expiration_date'], 'date', false) : null,
         );
     }
 

resources/views/notifications/markdown/report-expiring-licenses.blade.php

@@ -6,7 +6,7 @@
 |        | {{ trans('mail.name') }} | {{ trans('general.category') }} | {{ trans('mail.expires') }} | {{ trans('mail.terminates') }} |
 | :------------- | :------------- | :------------- | :------------- | :------------- |
 @foreach ($licenses as $license)
-| {{ (($license->isExpired()) || ($license->isTerminated()) || ($license->terminates_diff_in_days <= ($threshold / 2)) || ($license->expires_diff_in_days <= ($threshold / 2))) ? '🚨' : (($license->expires_diff_in_days <= $threshold) ? '⚠️' : 'ℹ️ ') }} | <a href="{{ route('licenses.show', $license->id) }}">{{ $license->name }}</a> {{ $license->manufacturer ?  '('.$license->manufacturer->name.')' : '' }} | {{ $license->category ?  $license->category->name : '' }} | {{ $license->expires_formatted_date }} {!! $license->expires_diff_for_humans ? ' ('.$license->expires_diff_for_humans .')' : '' !!} | {{ $license->terminates_formatted_date }} {{ $license->terminates_diff_for_humans ? ' ('.$license->terminates_diff_for_humans .')' : '' }}|
+| {{ (($license->isExpired()) || ($license->isTerminated()) || ($license->terminates_diff_in_days <= ($threshold / 2)) || ($license->expires_diff_in_days <= ($threshold / 2))) ? '🚨' : (($license->expires_diff_in_days <= $threshold) ? '⚠️' : 'ℹ️ ') }} | <a href="{{ route('licenses.show', $license->id) }}">{{ $license->name }}</a> {{ $license->manufacturer ?  '('.$license->manufacturer->name.')' : '' }} | {{ $license->category ?  $license->category->name : '' }} | {{ $license->expires_formatted_date }} {{ $license->expires_formatted_date ? ' ('.$license->expires_diff_for_humans .')' : '' }} | {{ $license->terminates_formatted_date }} {{ $license->terminates_diff_for_humans ? ' ('.$license->terminates_diff_for_humans .')' : '' }}|
 | <hr> | <hr> | <hr> | <hr> | <hr> |
 @endforeach
 </x-mail::table>