From f4ca8178d79b62bad3f76b18e143c7b0eb55b400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Wed, 29 Sep 2021 10:24:55 +0200 Subject: [PATCH 1/2] Fix SenSubscriptionsNotification ignore --- app/Listeners/SendSubscriptionsNotificationsMail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Listeners/SendSubscriptionsNotificationsMail.php b/app/Listeners/SendSubscriptionsNotificationsMail.php index fe5d622..0ba5511 100644 --- a/app/Listeners/SendSubscriptionsNotificationsMail.php +++ b/app/Listeners/SendSubscriptionsNotificationsMail.php @@ -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)); From b91e2a3624631abf63a1313d543761e23b8ff6db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Wed, 29 Sep 2021 10:25:07 +0200 Subject: [PATCH 2/2] Fix Autoclose Old tickets job --- app/Jobs/AutoCloseOldTickets.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/Jobs/AutoCloseOldTickets.php b/app/Jobs/AutoCloseOldTickets.php index 1279d11..984587e 100644 --- a/app/Jobs/AutoCloseOldTickets.php +++ b/app/Jobs/AutoCloseOldTickets.php @@ -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))); } } }