From 2fb4486532084a6279c5fab0f2551684f90afe9d Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 19 Apr 2025 13:38:28 +1000
Subject: [PATCH] v5.11.69

---
 VERSION.txt                       |  2 +-
 app/Services/Client/Statement.php | 20 ++++++++++++++++----
 config/ninja.php                  |  4 ++--
 routes/client.php                 |  2 +-
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index 8ec8e54b4e..71b69c8d6a 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.11.68
\ No newline at end of file
+5.11.69
\ No newline at end of file
diff --git a/app/Services/Client/Statement.php b/app/Services/Client/Statement.php
index ee9a5f4932..30677bbe7f 100644
--- a/app/Services/Client/Statement.php
+++ b/app/Services/Client/Statement.php
@@ -20,14 +20,12 @@ use App\Models\Invoice;
 use App\Models\Payment;
 use App\Utils\HtmlEngine;
 use Illuminate\Support\Carbon;
-use App\Factory\InvoiceFactory;
 use App\Utils\Traits\MakesHash;
 use App\Utils\PhantomJS\Phantom;
 use App\Utils\Traits\MakesDates;
 use App\Utils\HostedPDF\NinjaPdf;
 use App\Utils\Traits\Pdf\PdfMaker;
 use App\Factory\InvoiceItemFactory;
-use App\Factory\InvoiceInvitationFactory;
 use Illuminate\Database\Eloquent\Builder;
 
 class Statement
@@ -215,13 +213,27 @@ class Statement
             $settings->industry_id = '';
             $settings->size_id = '';
 
+            $this->client->settings = $settings;
+
             $this->entity = \App\Models\Invoice::factory()->make(); //@phpstan-ignore-line
-            $this->entity->client = \App\Models\Client::factory()->make(['settings' => $settings]); //@phpstan-ignore-line
+            $this->entity->client =$this->client;
+            $ii = \App\Models\InvoiceInvitation::factory()->make(); //@phpstan-ignore-line
+            $ii->setRelation('invoice', $this->entity); //@phpstan-ignore-line
+            $ii->setRelation('contact', $this->client->contacts->first()); //@phpstan-ignore-line
+            $ii->setRelation('company', $this->client->company);
+            $ii->setRelation('user', $this->client->user);
             $this->entity->client->setRelation('company', $this->client->company);
-            $this->entity->setRelation('invitations', \App\Models\InvoiceInvitation::factory()->make()); //@phpstan-ignore-line
+            $this->entity->setRelation('invitations', $ii); //@phpstan-ignore-line
             $this->entity->setRelation('company', $this->client->company);
             $this->entity->setRelation('user', $this->client->user);
 
+            // $this->entity = \App\Models\Invoice::factory()->make(); //@phpstan-ignore-line
+            // $this->entity->client = \App\Models\Client::factory()->make(['settings' => $settings]); //@phpstan-ignore-line
+            // $this->entity->client->setRelation('company', $this->client->company);
+            // $this->entity->setRelation('invitations', \App\Models\InvoiceInvitation::factory()->make()); //@phpstan-ignore-line
+            // $this->entity->setRelation('company', $this->client->company);
+            // $this->entity->setRelation('user', $this->client->user);
+            
         }
 
         return $this;
diff --git a/config/ninja.php b/config/ninja.php
index 8785d87f6a..9c60c1e8d0 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -17,8 +17,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.11.68'),
-    'app_tag' => env('APP_TAG', '5.11.68'),
+    'app_version' => env('APP_VERSION', '5.11.69'),
+    'app_tag' => env('APP_TAG', '5.11.69'),
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),
diff --git a/routes/client.php b/routes/client.php
index bcb6c035a6..48fb93cb0c 100644
--- a/routes/client.php
+++ b/routes/client.php
@@ -37,7 +37,7 @@ Route::get('tmp_pdf/{hash}', [App\Http\Controllers\ClientPortal\TempRouteControl
 Route::get('client/key_login/{contact_key}', [App\Http\Controllers\ClientPortal\ContactHashLoginController::class, 'login'])->name('client.contact_login')->middleware(['domain_db','contact_key_login']);
 Route::get('client/magic_link/{magic_link}', [App\Http\Controllers\ClientPortal\ContactHashLoginController::class, 'magicLink'])->name('client.contact_magic_link')->middleware(['domain_db','contact_key_login']);
 
-Route::get('documents/{document_hash}', [App\Http\Controllers\ClientPortal\DocumentController::class, 'publicDownload'])->name('documents.public_download')->middleware(['api_db','token_auth']);
+Route::get('documents/{document_hash}', [App\Http\Controllers\ClientPortal\DocumentController::class, 'publicDownload'])->name('documents.public_download')->middleware(['token_auth']);
 Route::get('documents/{hash}/hashed', [App\Http\Controllers\ClientPortal\DocumentController::class, 'hashDownload'])->name('documents.hashed_download');
 Route::get('error', [App\Http\Controllers\ClientPortal\ContactHashLoginController::class, 'errorPage'])->name('client.error');
 Route::get('client/payment/{contact_key}/{payment_id}', [App\Http\Controllers\ClientPortal\InvitationController::class, 'paymentRouter'])->middleware(['domain_db','contact_key_login']);