From 7556b68b1f7d3c5a955d1a104ffa867340f79619 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 2 Jul 2021 19:40:44 +1000 Subject: [PATCH] Constrain recurring / reminders if the client is archived / deleted --- app/Jobs/Cron/RecurringInvoicesCron.php | 8 ++++++++ app/Jobs/Util/ReminderJob.php | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/app/Jobs/Cron/RecurringInvoicesCron.php b/app/Jobs/Cron/RecurringInvoicesCron.php index 0350b61749ec..ae993e180ea0 100644 --- a/app/Jobs/Cron/RecurringInvoicesCron.php +++ b/app/Jobs/Cron/RecurringInvoicesCron.php @@ -48,6 +48,10 @@ class RecurringInvoicesCron ->whereNull('deleted_at') ->where('status_id', RecurringInvoice::STATUS_ACTIVE) ->where('remaining_cycles', '!=', '0') + ->whereHas('client', function ($query) { + $query->where('is_deleted',0) + ->where('deleted_at', NULL); + }) ->with('company') ->cursor(); @@ -70,6 +74,10 @@ class RecurringInvoicesCron ->whereNull('deleted_at') ->where('status_id', RecurringInvoice::STATUS_ACTIVE) ->where('remaining_cycles', '!=', '0') + ->whereHas('client', function ($query) { + $query->where('is_deleted',0) + ->where('deleted_at', NULL); + }) ->with('company') ->cursor(); diff --git a/app/Jobs/Util/ReminderJob.php b/app/Jobs/Util/ReminderJob.php index dd0b1d521764..e51072b1a921 100644 --- a/app/Jobs/Util/ReminderJob.php +++ b/app/Jobs/Util/ReminderJob.php @@ -62,6 +62,10 @@ class ReminderJob implements ShouldQueue ->where('is_deleted', 0) ->whereIn('status_id', [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL]) ->where('balance', '>', 0) + ->whereHas('client', function ($query) { + $query->where('is_deleted',0) + ->where('deleted_at', NULL); + }) ->with('invitations')->cursor()->each(function ($invoice) { if ($invoice->isPayable()) {