From 1a8016ae13a9b219de570a2e0afa510eb272382f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Fri, 21 Apr 2023 12:23:17 +0200 Subject: [PATCH] Fix #12 --- app/Jobs/AutoCloseOldTickets.php | 3 +-- app/Jobs/WarnBeforeAutoCloseTicket.php | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/Jobs/AutoCloseOldTickets.php b/app/Jobs/AutoCloseOldTickets.php index b94bdde..0f1deff 100644 --- a/app/Jobs/AutoCloseOldTickets.php +++ b/app/Jobs/AutoCloseOldTickets.php @@ -20,8 +20,7 @@ class AutoCloseOldTickets $limitDays = 15; $message = 'En l\'absence d\'activitée depuis 15 jours ce ticket est automatiquement clos et archivé.'; $tickets = Ticket::where(function ($q) { - $q->where('status', TicketStatus::production()) - ->orWhere('status', TicketStatus::processed()); + $q->where('status', TicketStatus::production()); })->whereDate('updated_at', '<=', Carbon::now()->subDays($limitDays)) ->whereDoesntHave('messages', function ($q) use ($limitDays) { $q->whereDate('updated_at', '>', Carbon::now()->subDays($limitDays)); diff --git a/app/Jobs/WarnBeforeAutoCloseTicket.php b/app/Jobs/WarnBeforeAutoCloseTicket.php index 1ffd37a..b57f08c 100644 --- a/app/Jobs/WarnBeforeAutoCloseTicket.php +++ b/app/Jobs/WarnBeforeAutoCloseTicket.php @@ -23,8 +23,7 @@ class WarnBeforeAutoCloseTicket // phpcs:ignore Generic.Files.LineLength.TooLong $messageToUser = 'En l\'absence d\'activitée, ou de réponse de votre part ce ticket sera automatiquement clos et archivé dans %s jours.'; $tickets = Ticket::where(function ($q) { - $q->where('status', TicketStatus::production()) - ->orWhere('status', TicketStatus::processed()); + $q->where('status', TicketStatus::production()); })->whereDate('updated_at', '<=', Carbon::now()->subDays($warningDays)) ->whereDoesntHave('messages', function ($q) use ($warningDays) { $q->whereDate('updated_at', '>', Carbon::now()->subDays($warningDays));