From 776da3b3ca104be62b9e3a4653cab497e11a04fc Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 7 Aug 2022 16:47:37 +1000
Subject: [PATCH 1/2] Fixes for auto billing

---
 app/Jobs/Cron/AutoBill.php                  | 8 ++++++--
 app/Services/Recurring/RecurringService.php | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/Jobs/Cron/AutoBill.php b/app/Jobs/Cron/AutoBill.php
index 07b244cbbf..464ab62f3f 100644
--- a/app/Jobs/Cron/AutoBill.php
+++ b/app/Jobs/Cron/AutoBill.php
@@ -14,10 +14,14 @@ namespace App\Jobs\Cron;
 use App\Libraries\MultiDB;
 use App\Models\Invoice;
 use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
 
-class AutoBill
+class AutoBill implements ShouldQueue
 {
-    use Dispatchable;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     public $tries = 1;
 
diff --git a/app/Services/Recurring/RecurringService.php b/app/Services/Recurring/RecurringService.php
index f02173fbcd..e4ac548402 100644
--- a/app/Services/Recurring/RecurringService.php
+++ b/app/Services/Recurring/RecurringService.php
@@ -125,7 +125,7 @@ class RecurringService
     
         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::dispatch($this->recurring_entity, $this->recurring_entity->company->db); 
         }
 
         return $this->recurring_entity;

From faa9d42724578f392851f5afae9bbf0069f3069e Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 7 Aug 2022 16:54:18 +1000
Subject: [PATCH 2/2] version bump

---
 VERSION.txt      | 2 +-
 config/ninja.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index 322240ef0e..32b0e1eace 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.5.7
\ No newline at end of file
+5.5.8
\ No newline at end of file
diff --git a/config/ninja.php b/config/ninja.php
index 8d50a532dd..c6663a6fbd 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -14,8 +14,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => '5.5.7',
-    'app_tag' => '5.5.7',
+    'app_version' => '5.5.8',
+    'app_tag' => '5.5.8',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),