From f6b53d27e6841e2106514d4f6a651e6e7bdc0201 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 1 Nov 2020 21:29:34 +1100 Subject: [PATCH] is_disabled for recurring invoices --- app/Jobs/Cron/RecurringInvoicesCron.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/app/Jobs/Cron/RecurringInvoicesCron.php b/app/Jobs/Cron/RecurringInvoicesCron.php index 198fe0dff3ce..6927648d0b0c 100644 --- a/app/Jobs/Cron/RecurringInvoicesCron.php +++ b/app/Jobs/Cron/RecurringInvoicesCron.php @@ -47,9 +47,7 @@ class RecurringInvoicesCron $recurring_invoices = RecurringInvoice::whereDate('next_send_date', '=', now()) ->where('status_id', RecurringInvoice::STATUS_ACTIVE) - ->whereHas('company', function(Builder $query){ - $query->where('is_disabled', false); - }) + ->with('company') ->cursor(); Log::info(now()->format('Y-m-d') . ' Sending Recurring Invoices. Count = '.$recurring_invoices->count()); @@ -58,7 +56,8 @@ class RecurringInvoicesCron info("Current date = " . now()->format("Y-m-d") . " Recurring date = " .$recurring_invoice->next_send_date); - SendRecurring::dispatchNow($recurring_invoice, $recurring_invoice->company->db); + if(!$recurring_invoice->company->is_disabled) + SendRecurring::dispatchNow($recurring_invoice, $recurring_invoice->company->db); }); @@ -70,9 +69,7 @@ class RecurringInvoicesCron $recurring_invoices = RecurringInvoice::whereDate('next_send_date', '=', now()) ->where('status_id', RecurringInvoice::STATUS_ACTIVE) - ->whereHas('company', function(Builder $query){ - $query->where('is_disabled', false); - }) + ->with('company') ->cursor(); Log::info(now()->format('Y-m-d') . ' Sending Recurring Invoices. Count = '.$recurring_invoices->count().' On Database # '.$db); @@ -81,7 +78,8 @@ class RecurringInvoicesCron info("Current date = " . now()->format("Y-m-d") . " Recurring date = " .$recurring_invoice->next_send_date); - SendRecurring::dispatchNow($recurring_invoice, $recurring_invoice->company->db); + if(!$recurring_invoice->company->is_disabled) + SendRecurring::dispatchNow($recurring_invoice, $recurring_invoice->company->db); }); }