lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #16375 from snipe/fixes_16371_name_not_included_in_reminder_emails

Browse source 
Fixed #16371 - incorrect count and missing name in acceptance reminder email
This commit is contained in:
snipe 2025-02-27 15:00:04 +00:00 • committed by GitHub
commit 1051b1d16d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/Console/Commands/SendAcceptanceReminder.php
View file

@ -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. // 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. // Collapsing and flattening the collection doesn't work above.
$acceptance = $unacceptedAssetGroup[0]['acceptance']; $acceptance = $unacceptedAssetGroup[0]['acceptance'];
$locale = $acceptance->assignedTo?->locale; $locale = $acceptance->assignedTo?->locale;
$email = $acceptance->assignedTo?->email; $email = $acceptance->assignedTo?->email;
if(!$email){ if(!$email){
$no_email_list[] = [ $no_email_list[] = [
'id' => $acceptance->assignedTo->id, 'id' => $acceptance->assignedTo?->id,
'name' => $acceptance->assignedTo->present()->fullName(), 'name' => $acceptance->assignedTo?->present()->fullName(),
]; ];
} else {
$count++;
} }
$item_count = $unacceptedAssetGroup->count(); $item_count = $unacceptedAssetGroup->count();
if ($locale && $email) { if ($locale && $email) {
Mail::to($email)->send((new UnacceptedAssetReminderMail($acceptance, $item_count))->locale($locale)); Mail::to($email)->send((new UnacceptedAssetReminderMail($acceptance, $item_count))->locale($locale));
} elseif ($email) { } elseif ($email) {
Mail::to($email)->send((new UnacceptedAssetReminderMail($acceptance, $item_count))); Mail::to($email)->send((new UnacceptedAssetReminderMail($acceptance, $item_count)));
} }
$count++;
} }
$this->info($count.' users notified.'); $this->info($count.' users notified.');

5
app/Mail/UnacceptedAssetReminderMail.php
View file

@ -19,9 +19,10 @@ class UnacceptedAssetReminderMail extends Mailable
*/ */
public function __construct($checkout_info, $count) public function __construct($checkout_info, $count)
{ {
$this->count = $count; $this->count = $count;
$this->target = $checkout_info['acceptance']?->assignedTo; $this->target = $checkout_info?->assignedTo;
$this->acceptance = $checkout_info['acceptance']; $this->acceptance = $checkout_info;
} }
/** /**