From fb847dba69caf0a0c41aff055c34b5b555f24685 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 11 Jan 2021 08:06:32 +1100 Subject: [PATCH] Fixes for recurring cron --- app/Jobs/Cron/RecurringInvoicesCron.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Jobs/Cron/RecurringInvoicesCron.php b/app/Jobs/Cron/RecurringInvoicesCron.php index cd6be762e38d..0a04f8761946 100644 --- a/app/Jobs/Cron/RecurringInvoicesCron.php +++ b/app/Jobs/Cron/RecurringInvoicesCron.php @@ -41,8 +41,9 @@ class RecurringInvoicesCron nlog("Sending recurring invoices ".Carbon::now()->format('Y-m-d h:i:s')); if (! config('ninja.db.multi_db_enabled')) { - $recurring_invoices = RecurringInvoice::whereDate('next_send_date', '=', now()) + $recurring_invoices = RecurringInvoice::whereDate('next_send_date', '<=', now()) ->where('status_id', RecurringInvoice::STATUS_ACTIVE) + ->where('remaining_cycles', '!=', '0') ->with('company') ->cursor(); @@ -60,8 +61,9 @@ class RecurringInvoicesCron foreach (MultiDB::$dbs as $db) { MultiDB::setDB($db); - $recurring_invoices = RecurringInvoice::whereDate('next_send_date', '=', now()) + $recurring_invoices = RecurringInvoice::whereDate('next_send_date', '<=', now()) ->where('status_id', RecurringInvoice::STATUS_ACTIVE) + ->where('remaining_cycles', '!=', '0') ->with('company') ->cursor();