Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Do not autobilling recurring invoices in draft state

Browse Source
This commit is contained in:
David Bomba 2022-12-15 23:17:50 +11:00
parent 1dc24bb734
commit 8170831b73
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Jobs/RecurringInvoice/SendRecurring.php
View File

@ -99,7 +99,6 @@ class SendRecurring implements ShouldQueue
/* 09-01-2022 ensure we create the PDFs at this point in time! */ /* 09-01-2022 ensure we create the PDFs at this point in time! */
$invoice->service()->touchPdf(true); $invoice->service()->touchPdf(true);
//nlog('updating recurring invoice dates');
/* Set next date here to prevent a recurring loop forming */ /* Set next date here to prevent a recurring loop forming */
$this->recurring_invoice->next_send_date = $this->recurring_invoice->nextSendDate(); $this->recurring_invoice->next_send_date = $this->recurring_invoice->nextSendDate();
$this->recurring_invoice->next_send_date_client = $this->recurring_invoice->nextSendDateClient(); $this->recurring_invoice->next_send_date_client = $this->recurring_invoice->nextSendDateClient();
@ -111,10 +110,6 @@ class SendRecurring implements ShouldQueue
$this->recurring_invoice->setCompleted(); $this->recurring_invoice->setCompleted();
} }
//nlog('next send date = '.$this->recurring_invoice->next_send_date);
// nlog('remaining cycles = '.$this->recurring_invoice->remaining_cycles);
//nlog('last send date = '.$this->recurring_invoice->last_sent_date);
$this->recurring_invoice->save(); $this->recurring_invoice->save();
event('eloquent.created: App\Models\Invoice', $invoice); event('eloquent.created: App\Models\Invoice', $invoice);
@ -125,8 +120,6 @@ class SendRecurring implements ShouldQueue
$invoice->entityEmailEvent($invoice->invitations->first(), 'invoice', 'email_template_invoice'); $invoice->entityEmailEvent($invoice->invitations->first(), 'invoice', 'email_template_invoice');
} }
nlog("Invoice {$invoice->number} created");
$invoice->invitations->each(function ($invitation) use ($invoice) { $invoice->invitations->each(function ($invitation) use ($invoice) {
if ($invitation->contact && ! $invitation->contact->trashed() && strlen($invitation->contact->email) >= 1 && $invoice->client->getSetting('auto_email_invoice')) { if ($invitation->contact && ! $invitation->contact->trashed() && strlen($invitation->contact->email) >= 1 && $invoice->client->getSetting('auto_email_invoice')) {
try { try {
@ -140,15 +133,14 @@ class SendRecurring implements ShouldQueue
}); });
} }
if ($invoice->client->getSetting('auto_bill_date') == 'on_send_date' && $invoice->auto_bill_enabled) { //auto bill, BUT NOT DRAFTS!!
if ($invoice->auto_bill_enabled && $invoice->client->getSetting('auto_bill_date') == 'on_send_date' && $invoice->client->getSetting('auto_email_invoice')) {
nlog("attempting to autobill {$invoice->number}"); nlog("attempting to autobill {$invoice->number}");
// $invoice->service()->autoBill();
AutoBill::dispatch($invoice->id, $this->db)->delay(rand(1,2)); AutoBill::dispatch($invoice->id, $this->db)->delay(rand(1,2));
} elseif ($invoice->client->getSetting('auto_bill_date') == 'on_due_date' && $invoice->auto_bill_enabled) { } elseif ($invoice->auto_bill_enabled && $invoice->client->getSetting('auto_bill_date') == 'on_due_date' && $invoice->client->getSetting('auto_email_invoice')) {
if ($invoice->due_date && Carbon::parse($invoice->due_date)->startOfDay()->lte(now()->startOfDay())) { if ($invoice->due_date && Carbon::parse($invoice->due_date)->startOfDay()->lte(now()->startOfDay())) {
nlog("attempting to autobill {$invoice->number}"); nlog("attempting to autobill {$invoice->number}");
// $invoice->service()->autoBill();
AutoBill::dispatch($invoice->id, $this->db)->delay(rand(1,2)); AutoBill::dispatch($invoice->id, $this->db)->delay(rand(1,2));
} }
} }