From 7856113bdce13e3ab04992a43e1255622aa49285 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 5 Feb 2023 18:54:54 +1100
Subject: [PATCH 1/3] Fixes for client blade template

---
 resources/views/email/template/client.blade.php | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/resources/views/email/template/client.blade.php b/resources/views/email/template/client.blade.php
index e15e5d87e5c8..580e6dd1ee58 100644
--- a/resources/views/email/template/client.blade.php
+++ b/resources/views/email/template/client.blade.php
@@ -110,20 +110,14 @@
             position: relative;
         } 
 
-        .doc_links {
-
+        a.doc_links {
+            text-decoration: none;
             padding-bottom: 10px;
             display: inline-block;
-            
-        }
-
-        a {
-
-            text-decoration: none;
             color: inherit !important;
-
         }
 
+
     </style>
 
     <!--[if gte mso 9]>

From 6c82beaf0227a2bdf477512e2142e34c65c06749 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 6 Feb 2023 08:20:32 +1100
Subject: [PATCH 2/3] Minor fixes for subscriptionsg

---
 app/PaymentDrivers/BaseDriver.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/PaymentDrivers/BaseDriver.php b/app/PaymentDrivers/BaseDriver.php
index 1af79af33999..9f5c2cf8cee5 100644
--- a/app/PaymentDrivers/BaseDriver.php
+++ b/app/PaymentDrivers/BaseDriver.php
@@ -359,7 +359,11 @@ class BaseDriver extends AbstractPaymentDriver
         event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars()));
 
         if (property_exists($this->payment_hash->data, 'billing_context') && $status == Payment::STATUS_COMPLETED) {
-            $billing_subscription = \App\Models\Subscription::find($this->decodePrimaryKey($this->payment_hash->data->billing_context->subscription_id));
+
+            if(is_int($this->payment_hash->data->billing_context->subscription_id))
+                $billing_subscription = \App\Models\Subscription::find($this->payment_hash->data->billing_context->subscription_id);
+            else
+                $billing_subscription = \App\Models\Subscription::find($this->decodePrimaryKey($this->payment_hash->data->billing_context->subscription_id));
 
             // To access campaign hash => $this->payment_hash->data->billing_context->campaign;
             // To access campaign data => Cache::get(CAMPAIGN_HASH)

From ab8eb409cbc6522303bdfd642a2f16e64070cdf7 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 6 Feb 2023 08:21:04 +1100
Subject: [PATCH 3/3] v5.5.68

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

diff --git a/VERSION.txt b/VERSION.txt
index 3692885ce0ca..4b14ecd1e5b0 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.5.67
\ No newline at end of file
+5.5.68
\ No newline at end of file
diff --git a/config/ninja.php b/config/ninja.php
index 1070541d618d..0cce2761257e 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.67',
-    'app_tag' => '5.5.67',
+    'app_version' => '5.5.68',
+    'app_tag' => '5.5.68',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),