diff --git a/app/Jobs/Cron/AutoBillCron.php b/app/Jobs/Cron/AutoBillCron.php index 0b852cb4806b..b84203681fa3 100644 --- a/app/Jobs/Cron/AutoBillCron.php +++ b/app/Jobs/Cron/AutoBillCron.php @@ -52,6 +52,9 @@ class AutoBillCron ->where('auto_bill_enabled', true) ->where('balance', '>', 0) ->where('is_deleted', false) + ->whereHas('company', function ($query) { + $query->where('is_disabled',0); + }) ->with('company'); nlog($auto_bill_partial_invoices->count(). " partial invoices to auto bill"); @@ -65,6 +68,9 @@ class AutoBillCron ->where('auto_bill_enabled', true) ->where('balance', '>', 0) ->where('is_deleted', false) + ->whereHas('company', function ($query) { + $query->where('is_disabled',0); + }) ->with('company'); nlog($auto_bill_invoices->count(). " full invoices to auto bill"); @@ -85,6 +91,9 @@ class AutoBillCron ->where('auto_bill_enabled', true) ->where('balance', '>', 0) ->where('is_deleted', false) + ->whereHas('company', function ($query) { + $query->where('is_disabled',0); + }) ->with('company'); nlog($auto_bill_partial_invoices->count(). " partial invoices to auto bill db = {$db}"); @@ -98,6 +107,9 @@ class AutoBillCron ->where('auto_bill_enabled', true) ->where('balance', '>', 0) ->where('is_deleted', false) + ->whereHas('company', function ($query) { + $query->where('is_disabled',0); + }) ->with('company'); nlog($auto_bill_invoices->count(). " full invoices to auto bill db = {$db}"); diff --git a/app/Jobs/Cron/RecurringExpensesCron.php b/app/Jobs/Cron/RecurringExpensesCron.php index 78a59aec6bff..8af8f9aef352 100644 --- a/app/Jobs/Cron/RecurringExpensesCron.php +++ b/app/Jobs/Cron/RecurringExpensesCron.php @@ -66,6 +66,9 @@ class RecurringExpensesCron ->whereNull('deleted_at') ->where('status_id', RecurringInvoice::STATUS_ACTIVE) ->where('remaining_cycles', '!=', '0') + ->whereHas('company', function ($query) { + $query->where('is_disabled',0); + }) ->with('company') ->cursor(); diff --git a/app/Jobs/Cron/RecurringInvoicesCron.php b/app/Jobs/Cron/RecurringInvoicesCron.php index 14e9c1cfa56f..bff131da8838 100644 --- a/app/Jobs/Cron/RecurringInvoicesCron.php +++ b/app/Jobs/Cron/RecurringInvoicesCron.php @@ -53,23 +53,27 @@ class RecurringInvoicesCron $query->where('is_deleted',0) ->where('deleted_at', NULL); }) + ->whereHas('company', function ($query) { + $query->where('is_disabled',0); + }) ->with('company') ->cursor(); nlog(now()->format('Y-m-d') . ' Sending Recurring Invoices. Count = '.$recurring_invoices->count()); $recurring_invoices->each(function ($recurring_invoice, $key) { + nlog("Current date = " . now()->format("Y-m-d") . " Recurring date = " .$recurring_invoice->next_send_date); - if (!$recurring_invoice->company->is_disabled) { - - try{ - SendRecurring::dispatchNow($recurring_invoice, $recurring_invoice->company->db); - } - catch(\Exception $e){ - nlog("Unable to sending recurring invoice {$recurring_invoice->id}"); - } + nlog("Trying to send {$recurring_invoice->number}"); + + try{ + SendRecurring::dispatchNow($recurring_invoice, $recurring_invoice->company->db); } + catch(\Exception $e){ + nlog("Unable to sending recurring invoice {$recurring_invoice->id}"); + } + }); } else { //multiDB environment, need to @@ -86,6 +90,9 @@ class RecurringInvoicesCron $query->where('is_deleted',0) ->where('deleted_at', NULL); }) + ->whereHas('company', function ($query) { + $query->where('is_disabled',0); + }) ->with('company') ->cursor(); @@ -94,15 +101,15 @@ class RecurringInvoicesCron $recurring_invoices->each(function ($recurring_invoice, $key) { nlog("Current date = " . now()->format("Y-m-d") . " Recurring date = " .$recurring_invoice->next_send_date ." Recurring #id = ". $recurring_invoice->id); - if (!$recurring_invoice->company->is_disabled) { - + nlog("Trying to send {$recurring_invoice->number}"); + try{ SendRecurring::dispatchNow($recurring_invoice, $recurring_invoice->company->db); } catch(\Exception $e){ nlog("Unable to sending recurring invoice {$recurring_invoice->id}"); } - } + }); } } diff --git a/app/Jobs/Util/ReminderJob.php b/app/Jobs/Util/ReminderJob.php index b468fb097c48..55b0ae690703 100644 --- a/app/Jobs/Util/ReminderJob.php +++ b/app/Jobs/Util/ReminderJob.php @@ -70,6 +70,9 @@ class ReminderJob implements ShouldQueue $query->where('is_deleted',0) ->where('deleted_at', NULL); }) + ->whereHas('company', function ($query) { + $query->where('is_disabled',0); + }) ->with('invitations')->cursor()->each(function ($invoice) { if ($invoice->isPayable()) {