From cd1d1b2d3ef2d3fb5af0b1fa3f211a40ca4b3df4 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 27 Feb 2025 14:22:40 +0000 Subject: [PATCH 1/2] Fixed count Signed-off-by: snipe --- app/Console/Commands/SendAcceptanceReminder.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/Console/Commands/SendAcceptanceReminder.php b/app/Console/Commands/SendAcceptanceReminder.php index 89a5b6167..250b08abf 100644 --- a/app/Console/Commands/SendAcceptanceReminder.php +++ b/app/Console/Commands/SendAcceptanceReminder.php @@ -70,23 +70,26 @@ class SendAcceptanceReminder extends Command // The [0] is weird, but it allows for the item_count to work and grabs the appropriate info for each user. // Collapsing and flattening the collection doesn't work above. $acceptance = $unacceptedAssetGroup[0]['acceptance']; + $locale = $acceptance->assignedTo?->locale; $email = $acceptance->assignedTo?->email; + if(!$email){ $no_email_list[] = [ - 'id' => $acceptance->assignedTo->id, - 'name' => $acceptance->assignedTo->present()->fullName(), + 'id' => $acceptance->assignedTo?->id, + 'name' => $acceptance->assignedTo?->present()->fullName(), ]; + } else { + $count++; } $item_count = $unacceptedAssetGroup->count(); if ($locale && $email) { Mail::to($email)->send((new UnacceptedAssetReminderMail($acceptance, $item_count))->locale($locale)); - } elseif ($email) { Mail::to($email)->send((new UnacceptedAssetReminderMail($acceptance, $item_count))); } - $count++; + } $this->info($count.' users notified.'); From 25807cc62f9ef77501421b0cb8d525e0fba71a4b Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 27 Feb 2025 14:22:48 +0000 Subject: [PATCH 2/2] Fixed constructor Signed-off-by: snipe --- app/Mail/UnacceptedAssetReminderMail.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Mail/UnacceptedAssetReminderMail.php b/app/Mail/UnacceptedAssetReminderMail.php index 1436bbc84..0e4473aaa 100644 --- a/app/Mail/UnacceptedAssetReminderMail.php +++ b/app/Mail/UnacceptedAssetReminderMail.php @@ -19,9 +19,10 @@ class UnacceptedAssetReminderMail extends Mailable */ public function __construct($checkout_info, $count) { + $this->count = $count; - $this->target = $checkout_info['acceptance']?->assignedTo; - $this->acceptance = $checkout_info['acceptance']; + $this->target = $checkout_info?->assignedTo; + $this->acceptance = $checkout_info; } /**