From 7157c95ef4e68e5ee69483035df0c138e5c19c35 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 12 Jul 2022 20:47:17 +1000
Subject: [PATCH] Start recurring invoice on send now

---
 app/Repositories/BaseRepository.php         | 2 +-
 app/Services/Recurring/RecurringService.php | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Repositories/BaseRepository.php b/app/Repositories/BaseRepository.php
index 68261c0d4fb4..f0afe983f6b7 100644
--- a/app/Repositories/BaseRepository.php
+++ b/app/Repositories/BaseRepository.php
@@ -302,7 +302,7 @@ class BaseRepository
         /* Perform model specific tasks */
         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
                 $model->service()->updateStatus()->save();
diff --git a/app/Services/Recurring/RecurringService.php b/app/Services/Recurring/RecurringService.php
index 5f4f3c49c1f8..f02173fbcdb6 100644
--- a/app/Services/Recurring/RecurringService.php
+++ b/app/Services/Recurring/RecurringService.php
@@ -123,8 +123,10 @@ class RecurringService
     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); 
+        }
 
         return $this->recurring_entity;