From f6e440af803a0b60962465af909e815dbfe57850 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 5 Feb 2023 15:22:44 +1100
Subject: [PATCH 1/9] Add purge purchase orders to company deletes

---
 app/Http/Controllers/MigrationController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Http/Controllers/MigrationController.php b/app/Http/Controllers/MigrationController.php
index 59f2a62e9..0cfe59533 100644
--- a/app/Http/Controllers/MigrationController.php
+++ b/app/Http/Controllers/MigrationController.php
@@ -179,6 +179,7 @@ class MigrationController extends BaseController
         $company->tasks()->forceDelete();
         $company->vendors()->forceDelete();
         $company->expenses()->forceDelete();
+        $company->purchase_orders()->forceDelete();
         $company->bank_transaction_rules()->forceDelete();
         $company->bank_transactions()->forceDelete();
         // $company->bank_integrations()->forceDelete();

From 385dd8606f6a9d6eb51f1d06c3c29aa3f72446fb Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 5 Feb 2023 15:25:52 +1100
Subject: [PATCH 2/9] Add vendor foreign key to purchase orders

---
 ..._05_042351_add_foreign_key_for_vendors.php | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 database/migrations/2023_02_05_042351_add_foreign_key_for_vendors.php

diff --git a/database/migrations/2023_02_05_042351_add_foreign_key_for_vendors.php b/database/migrations/2023_02_05_042351_add_foreign_key_for_vendors.php
new file mode 100644
index 000000000..805743e3d
--- /dev/null
+++ b/database/migrations/2023_02_05_042351_add_foreign_key_for_vendors.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('purchase_orders', function (Blueprint $table){
+
+            $table->foreign('vendor_id')->references('id')->on('vendors')->onDelete('cascade')->onUpdate('cascade');
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+};

From 44cbdc388e29f88d45b5cbff154c6443e0ad9319 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 5 Feb 2023 16:00:27 +1100
Subject: [PATCH 3/9] Add Discord to README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a9bc5a50c..282a956be 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
 
 ## [Hosted](https://www.invoiceninja.com) | [Self-Hosted](https://www.invoiceninja.org)
 
-Join us on [Slack](http://slack.invoiceninja.com), [Discourse](https://forum.invoiceninja.com) -
+Join us on [Slack](http://slack.invoiceninja.com), [Discord](https://discord.com/channels/1071654583870435439/1071654584390537279) [Discourse](https://forum.invoiceninja.com) -
 or [StackOverflow](https://stackoverflow.com/tags/invoice-ninja/) if you like,
 just make sure to add the `invoice-ninja` tag to your question.
 

From dba59c601e60990d171c8c06379c9bc3cd50ef33 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 5 Feb 2023 16:01:47 +1100
Subject: [PATCH 4/9] Update checkdata

---
 app/Console/Commands/CheckData.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Console/Commands/CheckData.php b/app/Console/Commands/CheckData.php
index fa74167ae..d8ce88c0f 100644
--- a/app/Console/Commands/CheckData.php
+++ b/app/Console/Commands/CheckData.php
@@ -1138,7 +1138,7 @@ class CheckData extends Command
         $cc = ClientContact::on('db-ninja-01')->where('company_id', config('ninja.ninja_default_company_id'))->where('email', $cu->user->email)->first();
 
             if($cc){
-                $ninja_portal_url = "https://invoiceninja.invoicing.co/client/ninja/{$cc->contact_key}/{$cu->company->company_key}";
+                $ninja_portal_url = "https://invoiceninja.invoicing.co/client/ninja/{$cc->contact_key}/{$cu->company->account->key}";
 
                 $cu->ninja_portal_url = $ninja_portal_url;
                 $cu->save();

From 0c2e94b6ee28e7641d83555ac6301e388f20b4d3 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 5 Feb 2023 17:03:55 +1100
Subject: [PATCH 5/9] Fixes for check data

---
 app/Console/Commands/CheckData.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Console/Commands/CheckData.php b/app/Console/Commands/CheckData.php
index d8ce88c0f..1c47c4b6d 100644
--- a/app/Console/Commands/CheckData.php
+++ b/app/Console/Commands/CheckData.php
@@ -1138,7 +1138,7 @@ class CheckData extends Command
         $cc = ClientContact::on('db-ninja-01')->where('company_id', config('ninja.ninja_default_company_id'))->where('email', $cu->user->email)->first();
 
             if($cc){
-                $ninja_portal_url = "https://invoiceninja.invoicing.co/client/ninja/{$cc->contact_key}/{$cu->company->account->key}";
+                $ninja_portal_url = "https://invoiceninja.invoicing.co/client/ninja/{$cc->contact_key}/{$cu->account->key}";
 
                 $cu->ninja_portal_url = $ninja_portal_url;
                 $cu->save();

From d7ec070cc238eeaf3e8fab028f38485535e7c68b Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 5 Feb 2023 17:25:15 +1100
Subject: [PATCH 6/9] Remove migration for vendor_id

---
 .../2023_02_05_042351_add_foreign_key_for_vendors.php       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/database/migrations/2023_02_05_042351_add_foreign_key_for_vendors.php b/database/migrations/2023_02_05_042351_add_foreign_key_for_vendors.php
index 805743e3d..3cbc35f2f 100644
--- a/database/migrations/2023_02_05_042351_add_foreign_key_for_vendors.php
+++ b/database/migrations/2023_02_05_042351_add_foreign_key_for_vendors.php
@@ -13,11 +13,11 @@ return new class extends Migration
      */
     public function up()
     {
-        Schema::table('purchase_orders', function (Blueprint $table){
+        // Schema::table('purchase_orders', function (Blueprint $table){
 
-            $table->foreign('vendor_id')->references('id')->on('vendors')->onDelete('cascade')->onUpdate('cascade');
+        //     $table->foreign('vendor_id')->references('id')->on('vendors')->onDelete('cascade')->onUpdate('cascade');
 
-        });
+        // });
     }
 
     /**

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 7/9] 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 e15e5d87e..580e6dd1e 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 8/9] 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 1af79af33..9f5c2cf8c 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 9/9] 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 3692885ce..4b14ecd1e 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 1070541d6..0cce27612 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', ''),