diff --git a/app/Jobs/Cron/RecurringInvoicesCron.php b/app/Jobs/Cron/RecurringInvoicesCron.php index 014db2578b65..f30232650a3e 100644 --- a/app/Jobs/Cron/RecurringInvoicesCron.php +++ b/app/Jobs/Cron/RecurringInvoicesCron.php @@ -107,7 +107,7 @@ class RecurringInvoicesCron SendRecurring::dispatchNow($recurring_invoice, $recurring_invoice->company->db); } catch(\Exception $e){ - nlog("Unable to sending recurring invoice {$recurring_invoice->id}"); + nlog("Unable to sending recurring invoice {$recurring_invoice->id} ". $e->getMessage()); } }); diff --git a/app/Jobs/RecurringInvoice/SendRecurring.php b/app/Jobs/RecurringInvoice/SendRecurring.php index a13720a6bba4..464849ef70d8 100644 --- a/app/Jobs/RecurringInvoice/SendRecurring.php +++ b/app/Jobs/RecurringInvoice/SendRecurring.php @@ -73,13 +73,14 @@ class SendRecurring implements ShouldQueue $invoice->date = now()->format('Y-m-d'); $invoice->due_date = $this->recurring_invoice->calculateDueDate(now()->format('Y-m-d')); $invoice->recurring_id = $this->recurring_invoice->id; - + $invoice->saveQuietly(); + if($invoice->client->getSetting('auto_email_invoice')) { $invoice = $invoice->service() ->markSent() ->applyNumber() - ->createInvitations() //need to only link invitations to those in the recurring invoice + //->createInvitations() //need to only link invitations to those in the recurring invoice ->fillDefaults() ->save(); diff --git a/app/Services/Invoice/MarkSent.php b/app/Services/Invoice/MarkSent.php index a205b83dd047..8fe2f2e87a49 100644 --- a/app/Services/Invoice/MarkSent.php +++ b/app/Services/Invoice/MarkSent.php @@ -33,7 +33,7 @@ class MarkSent extends AbstractService { /* Return immediately if status is not draft */ - if ($this->invoice->fresh()->status_id != Invoice::STATUS_DRAFT) { + if ($this->invoice && $this->invoice->fresh()->status_id != Invoice::STATUS_DRAFT) { return $this->invoice; }