From 0f57b067c59a9ae2f96ef7f38f6435cf93fadecb Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 28 Oct 2023 22:27:31 +1100
Subject: [PATCH 1/2] Minor fixes for tests

---
 tests/Pdf/PdfmockTest.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/tests/Pdf/PdfmockTest.php b/tests/Pdf/PdfmockTest.php
index 1a6cf65c7b3b..940969783831 100644
--- a/tests/Pdf/PdfmockTest.php
+++ b/tests/Pdf/PdfmockTest.php
@@ -12,9 +12,9 @@
 
 namespace Tests\Pdf;
 
-use App\DataMapper\CompanySettings;
 use Tests\TestCase;
 use App\Models\Design;
+use App\Models\Account;
 use App\Models\Company;
 use App\Models\Country;
 use App\Models\Invoice;
@@ -24,6 +24,7 @@ use App\Services\Pdf\PdfMock;
 use Beganovich\Snappdf\Snappdf;
 use App\Services\Pdf\PdfBuilder;
 use App\Services\Pdf\PdfService;
+use App\DataMapper\CompanySettings;
 use App\Services\Pdf\PdfConfiguration;
 
 /**
@@ -47,7 +48,11 @@ class PdfmockTest extends TestCase
             'entity_type' => 'invoice',
         ];
 
-        $entity = (new \App\Services\Pdf\PdfMock($data, Company::factory()->make()))->build()->initEntity();
+        $company = Company::factory()->make();
+        $account = Account::factory()->make();
+        $company->setRelation('account', $account);
+
+        $entity = (new \App\Services\Pdf\PdfMock($data,$company))->build()->initEntity();
 
         $this->assertInstanceOf(Invoice::class, $entity);
         $this->assertNotNull($entity->client);
@@ -71,7 +76,11 @@ class PdfmockTest extends TestCase
             'entity_type' => 'invoice',
         ];
 
-        $pdf_mock = (new PdfMock($data, Company::factory()->make()))->build();
+        $company = Company::factory()->make();
+        $account = Account::factory()->make();
+        $company->setRelation('account', $account);
+
+        $pdf_mock = (new PdfMock($data, $company))->build();
         $mock = $pdf_mock->initEntity();
 
         $pdf_service = new PdfService($mock->invitation);

From ca828a5fed01972bfb3c675737b79f7cc6593a3c Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 29 Oct 2023 10:22:56 +1100
Subject: [PATCH 2/2] v5.7.36

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

diff --git a/VERSION.txt b/VERSION.txt
index 097c041f2526..1d1a43ec8a07 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.7.35
\ No newline at end of file
+5.7.36
\ No newline at end of file
diff --git a/config/ninja.php b/config/ninja.php
index 52bcd06fbdd7..6f9fdab3d065 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -15,8 +15,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => env('APP_VERSION','5.7.35'),
-    'app_tag' => env('APP_TAG','5.7.35'),
+    'app_version' => env('APP_VERSION','5.7.36'),
+    'app_tag' => env('APP_TAG','5.7.36'),
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),