forge-joniko/ldc-supportweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'trunk'

Browse source
This commit is contained in:
Jérémy Munsch 2021-09-29 10:26:19 +02:00
commit 2d9f30f621
No known key found for this signature in database
GPG key ID: 55196BEE445F6049
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Jobs/AutoCloseOldTickets.php
View file

@ -28,10 +28,8 @@ class AutoCloseOldTickets
$oldStatus = $ticket->status;
$ticket->status = TicketStatus::archived();
$ticket->saveQuietly();
if (!$ticket->subscriptions->contains($ticket->user)) {
event(new TicketStatusChanged($ticket, $oldStatus, null, $message));
}
event(new NotifySubscriptions($ticket, $message));
event(new TicketStatusChanged($ticket, $oldStatus, null, $message));
event(new NotifySubscriptions($ticket, $message, collect($ticket->user)));
}
}
}

2
app/Listeners/SendSubscriptionsNotificationsMail.php
View file

@ -22,7 +22,7 @@ class SendSubscriptionsNotificationsMail
foreach ($event->ticket->subscriptions as $sub) {
if (
$sub->email !== $ignoreConnectedUserEmail and
!$ignoreUsers->contains('email', $sub->email)
!$ignoreUsers->contains($sub->email)
) {
Mail::to($sub->email)
->send(new TicketUpdate($event->ticket, $event->corpsMaj));