Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-21 21:31:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Start recurring invoice on send now

Browse Source
This commit is contained in:
David Bomba 2022-07-12 20:47:17 +10:00
parent 63eb2ca524
commit 7157c95ef4
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Repositories/BaseRepository.php
View File

@ -302,7 +302,7 @@ class BaseRepository
/* Perform model specific tasks */ /* Perform model specific tasks */
if ($model instanceof Invoice) { if ($model instanceof Invoice) {
if (($state['finished_amount'] != $state['starting_amount']) && ($model->status_id != Invoice::STATUS_DRAFT && $model->status_id != Invoice::STATUS_PAID)) { if (($state['finished_amount'] != $state['starting_amount']) && ($model->status_id != Invoice::STATUS_DRAFT)) {
//10-07-2022 //10-07-2022
$model->service()->updateStatus()->save(); $model->service()->updateStatus()->save();

4
app/Services/Recurring/RecurringService.php
View File

@ -123,8 +123,10 @@ class RecurringService
public function sendNow() public function sendNow()
{ {
if($this->recurring_entity instanceof RecurringInvoice) if($this->recurring_entity instanceof RecurringInvoice && $this->recurring_entity->status_id == RecurringInvoice::STATUS_DRAFT){
$this->start()->save();
SendRecurring::dispatchNow($this->recurring_entity, $this->recurring_entity->company->db); SendRecurring::dispatchNow($this->recurring_entity, $this->recurring_entity->company->db);
}
return $this->recurring_entity; return $this->recurring_entity;