From 9f3a58129f575bf344e2c11af4f92dadd5cb1431 Mon Sep 17 00:00:00 2001
From: Lars Kusch <lars@lars-kusch.de>
Date: Mon, 7 Aug 2023 09:59:10 +0200
Subject: [PATCH 01/42] Removed pdf-parameters

---
 app/Jobs/Entity/CreateEntityPdf.php         | 2 +-
 app/Jobs/Invoice/CreateEInvoice.php         | 2 +-
 app/Jobs/Invoice/ZipInvoices.php            | 2 +-
 app/Services/Invoice/GetInvoiceEInvoice.php | 2 +-
 app/Services/Invoice/InvoiceService.php     | 4 ++--
 tests/Unit/EInvoiceTest.php                 | 6 +++---
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/Jobs/Entity/CreateEntityPdf.php b/app/Jobs/Entity/CreateEntityPdf.php
index fe25cd410332..58c60b7cb5ee 100644
--- a/app/Jobs/Entity/CreateEntityPdf.php
+++ b/app/Jobs/Entity/CreateEntityPdf.php
@@ -213,7 +213,7 @@ class CreateEntityPdf implements ShouldQueue
             }
         }
         if ($this->entity_string == "invoice" && $this->client->getSetting('enable_e_invoice')){
-            (new CreateEInvoice($this->entity, true))->handle();
+            (new CreateEInvoice($this->entity))->handle();
         }
         $this->invitation = null;
         // $this->entity = null;
diff --git a/app/Jobs/Invoice/CreateEInvoice.php b/app/Jobs/Invoice/CreateEInvoice.php
index dc2fdfba1d39..e97444705fe3 100644
--- a/app/Jobs/Invoice/CreateEInvoice.php
+++ b/app/Jobs/Invoice/CreateEInvoice.php
@@ -29,7 +29,7 @@ class CreateEInvoice implements ShouldQueue
 
     public $deleteWhenMissingModels = true;
 
-    public function __construct(private Invoice $invoice, private bool $alterPDF, private string $custom_pdf_path = "")
+    public function __construct(private Invoice $invoice)
     {
     }
 
diff --git a/app/Jobs/Invoice/ZipInvoices.php b/app/Jobs/Invoice/ZipInvoices.php
index 17209446b345..d8c15054343f 100644
--- a/app/Jobs/Invoice/ZipInvoices.php
+++ b/app/Jobs/Invoice/ZipInvoices.php
@@ -76,7 +76,7 @@ class ZipInvoices implements ShouldQueue
         $this->invoices->each(function ($invoice) {
             (new CreateEntityPdf($invoice->invitations()->first()))->handle();
             if ($invoice->client->getSetting('enable_e_invoice')){
-                (new CreateEInvoice($invoice, false))->handle();
+                (new CreateEInvoice($invoice))->handle();
             }
         });
 
diff --git a/app/Services/Invoice/GetInvoiceEInvoice.php b/app/Services/Invoice/GetInvoiceEInvoice.php
index 6b6dac9f544f..b3690eef603c 100644
--- a/app/Services/Invoice/GetInvoiceEInvoice.php
+++ b/app/Services/Invoice/GetInvoiceEInvoice.php
@@ -43,7 +43,7 @@ class GetInvoiceEInvoice extends AbstractService
         $file = Storage::disk($disk)->exists($file_path);
 
         if (! $file) {
-            $file_path = (new CreateEInvoice($this->invoice, false))->handle();
+            $file_path = (new CreateEInvoice($this->invoice))->handle();
         }
 
         return $file_path;
diff --git a/app/Services/Invoice/InvoiceService.php b/app/Services/Invoice/InvoiceService.php
index 8558c0128ec6..a024ccaef8ba 100644
--- a/app/Services/Invoice/InvoiceService.php
+++ b/app/Services/Invoice/InvoiceService.php
@@ -465,7 +465,7 @@ class InvoiceService
 
                     if ($invitation->invoice->client->getSetting('enable_e_invoice') && $invitation instanceof InvoiceInvitation)
                     {
-                        (new CreateEInvoice($invitation->invoice, true))->handle();
+                        (new CreateEInvoice($invitation->invoice))->handle();
                     }
 
                 });
@@ -478,7 +478,7 @@ class InvoiceService
                 CreateEntityPdf::dispatch($invitation);
 
                 if ($invitation->invoice->client->getSetting('enable_e_invoice') && $invitation instanceof InvoiceInvitation) {
-                    CreateEInvoice::dispatch($invitation->invoice, true);
+                    CreateEInvoice::dispatch($invitation->invoice);
                 }
 
             });
diff --git a/tests/Unit/EInvoiceTest.php b/tests/Unit/EInvoiceTest.php
index 6c31974bf3e9..2a76d5971891 100644
--- a/tests/Unit/EInvoiceTest.php
+++ b/tests/Unit/EInvoiceTest.php
@@ -42,7 +42,7 @@ class EInvoiceTest extends TestCase
         $this->company->e_invoice_type = "EN16931";
         $this->invoice->client->routing_id = 'DE123456789';
         $this->invoice->client->save();
-        $xinvoice = (new CreateEInvoice($this->invoice, false))->handle();
+        $xinvoice = (new CreateEInvoice($this->invoice))->handle();
         $this->assertNotNull($xinvoice);
         $this->assertTrue(Storage::exists($xinvoice));
     }
@@ -56,7 +56,7 @@ class EInvoiceTest extends TestCase
          $this->invoice->client->routing_id = 'DE123456789';
          $this->invoice->client->save();
 
-         $xinvoice = (new CreateEInvoice($this->invoice, false))->handle();
+         $xinvoice = (new CreateEInvoice($this->invoice))->handle();
          nlog(Storage::path($xinvoice));
          $document = ZugferdDocumentReader::readAndGuessFromFile(Storage::path($xinvoice));
          $document->getDocumentInformation($documentno, $documenttypecode, $documentdate, $documentcurrency, $taxcurrency, $taxname, $documentlangeuage, $rest);
@@ -69,7 +69,7 @@ class EInvoiceTest extends TestCase
      public function checkEmbededPDFFile()
      {
          $pdf = (new CreateEntityPdf($this->invoice->invitations()->first()))->handle();
-         (new CreateEInvoice($this->invoice, true, $pdf))->handle();
+         (new CreateEInvoice($this->invoice))->handle();
          $document = ZugferdDocumentReader::readAndGuessFromFile($pdf);
          $document->getDocumentInformation($documentno, $documenttypecode, $documentdate, $documentcurrency, $taxcurrency, $taxname, $documentlangeuage, $rest);
          $this->assertEquals($this->invoice->number, $documentno);

From 0c83ca51c5b24f1e246c593b9da27065d1e38bc5 Mon Sep 17 00:00:00 2001
From: Lars Kusch <lars@lars-kusch.de>
Date: Mon, 7 Aug 2023 10:22:11 +0200
Subject: [PATCH 02/42] More adjustments

---
 app/Jobs/Invoice/MergeEInvoice.php     | 61 ++++++++++++++++++++++++++
 app/Services/Invoice/GetInvoicePdf.php |  7 ++-
 app/Services/Invoice/MergeEInvoice.php | 53 ++++++----------------
 3 files changed, 80 insertions(+), 41 deletions(-)
 create mode 100644 app/Jobs/Invoice/MergeEInvoice.php

diff --git a/app/Jobs/Invoice/MergeEInvoice.php b/app/Jobs/Invoice/MergeEInvoice.php
new file mode 100644
index 000000000000..671c187e9fd1
--- /dev/null
+++ b/app/Jobs/Invoice/MergeEInvoice.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Jobs\Invoice;
+
+use App\Models\ClientContact;
+use App\Models\Invoice;
+use horstoeko\zugferd\ZugferdDocumentPdfBuilder;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Support\Facades\Storage;
+use horstoeko\zugferd\ZugferdDocumentReader;
+
+class MergeEInvoice implements ShouldQueue
+{
+    public function __construct(public Invoice $invoice, public ?ClientContact $contact = null)
+    {
+    }
+
+    /**
+     * @throws \Exception
+     */
+    public function handle(): void
+    {
+        $e_invoice_type = $this->invoice->client->getSetting('e_invoice_type');
+        switch ($e_invoice_type) {
+            case "EN16931":
+            case "XInvoice_2_2":
+            case "XInvoice_2_1":
+            case "XInvoice_2_0":
+            case "XInvoice_1_0":
+            case "XInvoice-Extended":
+            case "XInvoice-BasicWL":
+            case "XInvoice-Basic":
+                $this->embedEInvoiceZuGFerD();
+            //case "Facturae_3.2":
+            //case "Facturae_3.2.1":
+            //case "Facturae_3.2.2":
+            //
+            default:
+                $this->embedEInvoiceZuGFerD();
+                break;
+        }
+    }
+
+    /**
+     * @throws \Exception
+     */
+    private function embedEInvoiceZuGFerD(): void
+    {
+        $filepath_pdf = $this->invoice->client->invoice_filepath($this->invoice->invitations->first()) . $this->invoice->getFileName();
+        $e_invoice_path = $this->invoice->client->e_invoice_filepath($this->invoice->invitations->first()) . $this->invoice->getFileName("xml");
+        $document = ZugferdDocumentReader::readAndGuessFromFile($e_invoice_path);
+        $disk = config('filesystems.default');
+
+        if (!Storage::disk($disk)->exists($this->invoice->client->e_invoice_filepath($this->invoice->invitations->first()))) {
+            Storage::makeDirectory($this->invoice->client->e_invoice_filepath($this->invoice->invitations->first()));
+        }
+        $pdfBuilder = new ZugferdDocumentPdfBuilder($document, Storage::disk($disk)->path($filepath_pdf));
+        $pdfBuilder->generateDocument();
+        $pdfBuilder->saveDocument(Storage::disk($disk)->path($filepath_pdf));
+    }
+}
diff --git a/app/Services/Invoice/GetInvoicePdf.php b/app/Services/Invoice/GetInvoicePdf.php
index 376cdfd95d98..346f707e3b15 100644
--- a/app/Services/Invoice/GetInvoicePdf.php
+++ b/app/Services/Invoice/GetInvoicePdf.php
@@ -12,6 +12,8 @@
 namespace App\Services\Invoice;
 
 use App\Jobs\Entity\CreateEntityPdf;
+use App\Jobs\Invoice\CreateEInvoice;
+use App\Jobs\Invoice\MergeEInvoice;
 use App\Models\ClientContact;
 use App\Models\Invoice;
 use App\Services\AbstractService;
@@ -47,7 +49,10 @@ class GetInvoicePdf extends AbstractService
         if (! $file) {
             $file_path = (new CreateEntityPdf($invitation))->handle();
         }
-
+        if ($this->invoice->client->getSetting('enable_e_invoice')){
+            (new CreateEInvoice($this->invoice))->handle();
+            (new MergeEInvoice($this->invoice))->handle();
+        }
         return $file_path;
     }
 }
diff --git a/app/Services/Invoice/MergeEInvoice.php b/app/Services/Invoice/MergeEInvoice.php
index d05d61abaf86..ecb30f7a8d69 100644
--- a/app/Services/Invoice/MergeEInvoice.php
+++ b/app/Services/Invoice/MergeEInvoice.php
@@ -4,58 +4,31 @@ namespace App\Services\Invoice;
 
 use App\Models\ClientContact;
 use App\Models\Invoice;
-use App\Services\AbstractService;
-use horstoeko\zugferd\ZugferdDocumentPdfBuilder;
 use Illuminate\Support\Facades\Storage;
-use horstoeko\zugferd\ZugferdDocumentReader;
 
-class MergeEInvoice extends AbstractService
+class MergeEInvoice
 {
+
+    /**
+     * @param Invoice $invoice
+     * @param mixed|null $contact
+     */
     public function __construct(public Invoice $invoice, public ?ClientContact $contact = null)
     {
     }
 
-    /**
-     * @throws \Exception
-     */
     public function run(): void
     {
-        $e_invoice_type = $this->invoice->client->getSetting('e_invoice_type');
-        switch ($e_invoice_type) {
-            case "EN16931":
-            case "XInvoice_2_2":
-            case "XInvoice_2_1":
-            case "XInvoice_2_0":
-            case "XInvoice_1_0":
-            case "XInvoice-Extended":
-            case "XInvoice-BasicWL":
-            case "XInvoice-Basic":
-               $this->embedEInvoiceZuGFerD();
-            //case "Facturae_3.2":
-            //case "Facturae_3.2.1":
-            //case "Facturae_3.2.2":
-             //
-            default:
-                $this->embedEInvoiceZuGFerD();
-                break;
-        }
-    }
+        $file_path = $this->invoice->client->e_invoice_filepath($this->invoice->invitations->first()). $this->invoice->getFileName("xml");
 
-    /**
-     * @throws \Exception
-     */
-    private function embedEInvoiceZuGFerD(): void
-    {
-        $filepath_pdf = $this->invoice->client->invoice_filepath($this->invoice->invitations->first()) . $this->invoice->getFileName();
-        $e_invoice_path = $this->invoice->client->e_invoice_filepath($this->invoice->invitations->first()) . $this->invoice->getFileName("xml");
-        $document = ZugferdDocumentReader::readAndGuessFromFile($e_invoice_path);
+        // $disk = 'public';
         $disk = config('filesystems.default');
 
-        if (!Storage::disk($disk)->exists($this->invoice->client->e_invoice_filepath($this->invoice->invitations->first()))) {
-            Storage::makeDirectory($this->invoice->client->e_invoice_filepath($this->invoice->invitations->first()));
+        $file = Storage::disk($disk)->exists($file_path);
+
+        if (! $file) {
+            (new \App\Jobs\Invoice\MergeEInvoice($this->invoice))->handle();
         }
-        $pdfBuilder = new ZugferdDocumentPdfBuilder($document, Storage::disk($disk)->path($filepath_pdf));
-        $pdfBuilder->generateDocument();
-        $pdfBuilder->saveDocument(Storage::disk($disk)->path($filepath_pdf));
+
     }
 }

From d8a6578be206eb377321df760a8a383013b37029 Mon Sep 17 00:00:00 2001
From: Lars Kusch <lars@lars-kusch.de>
Date: Mon, 7 Aug 2023 21:18:50 +0200
Subject: [PATCH 03/42] More fixes

---
 app/Services/Invoice/InvoiceService.php | 2 ++
 app/Services/Invoice/MergeEInvoice.php  | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/Services/Invoice/InvoiceService.php b/app/Services/Invoice/InvoiceService.php
index a024ccaef8ba..d8fc0f47d5ea 100644
--- a/app/Services/Invoice/InvoiceService.php
+++ b/app/Services/Invoice/InvoiceService.php
@@ -343,6 +343,7 @@ class InvoiceService
                                      })->toArray();
 
         $this->deletePdf();
+        $this->deleteEInvoice();
 
         return $this;
     }
@@ -410,6 +411,7 @@ class InvoiceService
 
         $this->invoice = $this->invoice->calc()->getInvoice();
         $this->deletePdf();
+        $this->deleteEInvoice();
 
         /* 24-03-2022 */
         $new_balance = $this->invoice->balance;
diff --git a/app/Services/Invoice/MergeEInvoice.php b/app/Services/Invoice/MergeEInvoice.php
index ecb30f7a8d69..c40cb0bafa58 100644
--- a/app/Services/Invoice/MergeEInvoice.php
+++ b/app/Services/Invoice/MergeEInvoice.php
@@ -19,14 +19,15 @@ class MergeEInvoice
 
     public function run(): void
     {
-        $file_path = $this->invoice->client->e_invoice_filepath($this->invoice->invitations->first()). $this->invoice->getFileName("xml");
-
+        $file_path_xml = $this->invoice->client->e_invoice_filepath($this->invoice->invitations->first()). $this->invoice->getFileName("xml");
+        $file_path_pdf = $this->invoice->getFileName();
         // $disk = 'public';
         $disk = config('filesystems.default');
 
-        $file = Storage::disk($disk)->exists($file_path);
+        $file_xml = Storage::disk($disk)->exists($file_path_xml);
+        $file_pdf = Storage::disk($disk)->exists($file_path_pdf);
 
-        if (! $file) {
+        if ($file_xml && $file_pdf) {
             (new \App\Jobs\Invoice\MergeEInvoice($this->invoice))->handle();
         }
 

From dd17119fd60ea9bb8ab2c78b4c3d16167ac98de4 Mon Sep 17 00:00:00 2001
From: Lars Kusch <lars@lars-kusch.de>
Date: Mon, 7 Aug 2023 21:55:12 +0200
Subject: [PATCH 04/42] Enable E-Invoice for client download

---
 app/Http/Livewire/PdfSlot.php                 | 39 +++++++++++++------
 app/Jobs/Entity/CreateRawPdf.php              |  4 ++
 .../components/livewire/pdf-slot.blade.php    | 13 ++++++-
 .../portal/ninja2020/invoices/index.blade.php |  3 +-
 4 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/app/Http/Livewire/PdfSlot.php b/app/Http/Livewire/PdfSlot.php
index 8c8770eb1205..306fcf961c0e 100644
--- a/app/Http/Livewire/PdfSlot.php
+++ b/app/Http/Livewire/PdfSlot.php
@@ -12,6 +12,7 @@
 
 namespace App\Http\Livewire;
 
+use App\Services\Invoice\GetInvoiceEInvoice;
 use App\Utils\Number;
 use Livewire\Component;
 use App\Utils\HtmlEngine;
@@ -38,7 +39,7 @@ class PdfSlot extends Component
     public $pdf;
 
     public $url;
-    
+
     private $settings;
 
     private $html_variables;
@@ -61,7 +62,7 @@ class PdfSlot extends Component
     }
 
     public function getPdf()
-    {        
+    {
         // $this->pdf = $this->entity->fullscreenPdfViewer($this->invitation);
 
         $blob = [
@@ -74,14 +75,14 @@ class PdfSlot extends Component
         $hash = Str::random(64);
 
         Cache::put($hash, $blob, now()->addMinutes(2));
-        
+
         $this->pdf = $hash;
 
     }
 
     public function downloadPdf()
     {
-        
+
         $file_name = $this->entity->numberFormatter().'.pdf';
 
         if($this->entity instanceof \App\Models\PurchaseOrder)
@@ -95,11 +96,25 @@ class PdfSlot extends Component
             echo $file;
         }, $file_name, $headers);
 
+    }
+    public function downloadEInvoice()
+    {
+
+        $file_name = $this->entity->numberFormatter().'.xml';
+
+        $file = (new GetInvoiceEInvoice($this->entity))->run();
+
+        $headers = ['Content-Type' => 'application/xml'];
+
+        return response()->streamDownload(function () use ($file) {
+            echo $file;
+        }, $file_name, $headers);
+
     }
 
     public function render()
     {
-        
+
         $this->entity_type = $this->resolveEntityType();
 
         $this->settings = $this->entity->client ? $this->entity->client->getMergedSettings() : $this->entity->company->settings;
@@ -146,7 +161,7 @@ class PdfSlot extends Component
 
     private function getCompanyAddress()
     {
-        
+
         $company_address = "";
 
         foreach($this->settings->pdf_variables->company_address as $variable) {
@@ -166,7 +181,7 @@ class PdfSlot extends Component
         }
 
         return $this->convertVariables($company_details);
-  
+
     }
 
     private function getEntityDetails()
@@ -174,9 +189,9 @@ class PdfSlot extends Component
         $entity_details = "";
 
         if($this->entity_type == 'invoice' || $this->entity_type == 'recurring_invoice') {
-            foreach($this->settings->pdf_variables->invoice_details as $variable) 
+            foreach($this->settings->pdf_variables->invoice_details as $variable)
                 $entity_details .= "<div class='flex px-5 block'><p class= w-36 block'>{$variable}_label</p><p class='pl-5 w-36 block entity-field'>{$variable}</p></div>";
-    
+
         }
         elseif($this->entity_type == 'quote'){
             foreach($this->settings->pdf_variables->quote_details as $variable)
@@ -190,7 +205,7 @@ class PdfSlot extends Component
             foreach($this->settings->pdf_variables->purchase_order_details as $variable)
                 $entity_details .= "<div class='flex px-5 block'><p class= w-36 block'>{$variable}_label</p><p class='pl-5 w-36 block entity-field'>{$variable}</p></div>";
         }
-            
+
         return $this->convertVariables($entity_details);
 
     }
@@ -206,7 +221,7 @@ class PdfSlot extends Component
 
             $name = $this->settings->pdf_variables->client_details[0];
         }
-                
+
         return $this->convertVariables($name);
 
     }
@@ -225,7 +240,7 @@ class PdfSlot extends Component
                 $user_details .= "<p>{$variable}</p>";
             }
         }
-        
+
         return $this->convertVariables($user_details);
     }
 
diff --git a/app/Jobs/Entity/CreateRawPdf.php b/app/Jobs/Entity/CreateRawPdf.php
index 4231b6595b44..e4297068d40d 100644
--- a/app/Jobs/Entity/CreateRawPdf.php
+++ b/app/Jobs/Entity/CreateRawPdf.php
@@ -12,6 +12,7 @@
 namespace App\Jobs\Entity;
 
 use App\Exceptions\FilePermissionsFailure;
+use App\Jobs\Invoice\MergeEInvoice;
 use App\Libraries\MultiDB;
 use App\Models\Credit;
 use App\Models\CreditInvitation;
@@ -202,6 +203,9 @@ class CreateRawPdf implements ShouldQueue
         if ($pdf) {
             $maker =null;
             $state = null;
+            if ($this->invitation->invoice->client->getSetting('enable_e_invoice') && $this->entity == "invoice"){
+                (new \App\Services\Invoice\MergeEInvoice($this->invitation->invoice))->run();
+            };
             return $pdf;
         }
 
diff --git a/resources/views/portal/ninja2020/components/livewire/pdf-slot.blade.php b/resources/views/portal/ninja2020/components/livewire/pdf-slot.blade.php
index 992c75e86947..8d6154df9b94 100644
--- a/resources/views/portal/ninja2020/components/livewire/pdf-slot.blade.php
+++ b/resources/views/portal/ninja2020/components/livewire/pdf-slot.blade.php
@@ -9,6 +9,15 @@
             </svg>
         </div>
     </button>
+  <button wire:loading.attr="disabled" wire:click="downloadEInvoice" class="bg-gray-100 hover:bg-gray-200 text-gray-800 font-bold px-2 rounded inline-flex" type="button">
+          <span>{{ ctrans('texts.download_xml') }}</span>
+          <div wire:loading wire:target="downloadEInvoice">
+              <svg class="animate-spin h-5 w-5 text-blue" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+                  <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
+                  <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
+              </svg>
+          </div>
+      </button>
   </div>
   <div class="hidden lg:block">
     <div wire:init="getPdf()">
@@ -86,7 +95,7 @@ function waitForElement(querySelector, timeout){
       }
     });
     observer.observe(document.body, {
-      childList: true, 
+      childList: true,
       subtree: true
     });
     if(timeout) timer = setTimeout(()=>{
@@ -97,4 +106,4 @@ function waitForElement(querySelector, timeout){
 
 }
 
-</script>
\ No newline at end of file
+</script>
diff --git a/resources/views/portal/ninja2020/invoices/index.blade.php b/resources/views/portal/ninja2020/invoices/index.blade.php
index 0ce6e4292b7b..b9e95ba914bc 100644
--- a/resources/views/portal/ninja2020/invoices/index.blade.php
+++ b/resources/views/portal/ninja2020/invoices/index.blade.php
@@ -16,7 +16,8 @@
         <form action="{{ route('client.invoices.bulk') }}" method="post" id="bulkActions">
             @csrf
             <button type="submit" onclick="setTimeout(() => this.disabled = true, 0); setTimeout(() => this.disabled = false, 5000); return true;" class="button button-primary bg-primary" name="action" value="download">{{ ctrans('texts.download') }}</button>
-
+            @csrf
+            <button type="submit" onclick="setTimeout(() => this.disabled = true, 0); setTimeout(() => this.disabled = false, 5000); return true;" class="button button-primary bg-secondary" name="action-xml" value="download">{{ ctrans('texts.download_xml') }}</button>
             @if(!empty(auth()->user()->client->service()->getPaymentMethods(0)))
                 <button onclick="setTimeout(() => this.disabled = true, 0); return true;" type="submit" class="button button-primary bg-primary" name="action" value="payment">{{ ctrans('texts.pay_now') }}</button>
             @endif

From 5f929f7a6cac1bd20701a05ee0cbb6fd9488c308 Mon Sep 17 00:00:00 2001
From: Lars Kusch <lars@lars-kusch.de>
Date: Mon, 7 Aug 2023 22:02:02 +0200
Subject: [PATCH 05/42] Try to merge e-invoice in as many cases as possible.

---
 app/Jobs/Entity/CreateEntityPdf.php         |  3 +++
 app/Jobs/Invoice/ZipInvoices.php            |  1 +
 app/Services/Invoice/GetInvoiceEInvoice.php |  2 ++
 app/Services/Invoice/InvoiceService.php     |  1 +
 tests/Unit/EInvoiceTest.php                 | 13 +++++++------
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/Jobs/Entity/CreateEntityPdf.php b/app/Jobs/Entity/CreateEntityPdf.php
index 58c60b7cb5ee..266437cd777f 100644
--- a/app/Jobs/Entity/CreateEntityPdf.php
+++ b/app/Jobs/Entity/CreateEntityPdf.php
@@ -13,6 +13,7 @@ namespace App\Jobs\Entity;
 
 use App\Exceptions\FilePermissionsFailure;
 use App\Jobs\Invoice\CreateEInvoice;
+use App\Jobs\Invoice\MergeEInvoice;
 use App\Libraries\MultiDB;
 use App\Models\Credit;
 use App\Models\CreditInvitation;
@@ -214,6 +215,8 @@ class CreateEntityPdf implements ShouldQueue
         }
         if ($this->entity_string == "invoice" && $this->client->getSetting('enable_e_invoice')){
             (new CreateEInvoice($this->entity))->handle();
+            (new MergeEInvoice($this->entity))->handle();
+
         }
         $this->invitation = null;
         // $this->entity = null;
diff --git a/app/Jobs/Invoice/ZipInvoices.php b/app/Jobs/Invoice/ZipInvoices.php
index d8c15054343f..c257e647ccb8 100644
--- a/app/Jobs/Invoice/ZipInvoices.php
+++ b/app/Jobs/Invoice/ZipInvoices.php
@@ -77,6 +77,7 @@ class ZipInvoices implements ShouldQueue
             (new CreateEntityPdf($invoice->invitations()->first()))->handle();
             if ($invoice->client->getSetting('enable_e_invoice')){
                 (new CreateEInvoice($invoice))->handle();
+                (new MergeEInvoice($invoice))->handle();
             }
         });
 
diff --git a/app/Services/Invoice/GetInvoiceEInvoice.php b/app/Services/Invoice/GetInvoiceEInvoice.php
index b3690eef603c..66a4759fb6b9 100644
--- a/app/Services/Invoice/GetInvoiceEInvoice.php
+++ b/app/Services/Invoice/GetInvoiceEInvoice.php
@@ -44,6 +44,8 @@ class GetInvoiceEInvoice extends AbstractService
 
         if (! $file) {
             $file_path = (new CreateEInvoice($this->invoice))->handle();
+            (new \App\Jobs\Invoice\MergeEInvoice($this->invoice))->handle();
+
         }
 
         return $file_path;
diff --git a/app/Services/Invoice/InvoiceService.php b/app/Services/Invoice/InvoiceService.php
index d8fc0f47d5ea..2e167561f7c6 100644
--- a/app/Services/Invoice/InvoiceService.php
+++ b/app/Services/Invoice/InvoiceService.php
@@ -468,6 +468,7 @@ class InvoiceService
                     if ($invitation->invoice->client->getSetting('enable_e_invoice') && $invitation instanceof InvoiceInvitation)
                     {
                         (new CreateEInvoice($invitation->invoice))->handle();
+                        (new MergeEInvoice($invitation->invoice))->run();
                     }
 
                 });
diff --git a/tests/Unit/EInvoiceTest.php b/tests/Unit/EInvoiceTest.php
index 2a76d5971891..41349c264b04 100644
--- a/tests/Unit/EInvoiceTest.php
+++ b/tests/Unit/EInvoiceTest.php
@@ -42,9 +42,10 @@ class EInvoiceTest extends TestCase
         $this->company->e_invoice_type = "EN16931";
         $this->invoice->client->routing_id = 'DE123456789';
         $this->invoice->client->save();
-        $xinvoice = (new CreateEInvoice($this->invoice))->handle();
-        $this->assertNotNull($xinvoice);
-        $this->assertTrue(Storage::exists($xinvoice));
+        $e_invoice = (new CreateEInvoice($this->invoice))->handle();
+        (new \App\Jobs\Invoice\MergeEInvoice($this->invoice))->handle();
+        $this->assertNotNull($e_invoice);
+        $this->assertTrue(Storage::exists($e_invoice));
     }
 
      /**
@@ -56,9 +57,8 @@ class EInvoiceTest extends TestCase
          $this->invoice->client->routing_id = 'DE123456789';
          $this->invoice->client->save();
 
-         $xinvoice = (new CreateEInvoice($this->invoice))->handle();
-         nlog(Storage::path($xinvoice));
-         $document = ZugferdDocumentReader::readAndGuessFromFile(Storage::path($xinvoice));
+         $e_invoice = (new CreateEInvoice($this->invoice))->handle();
+         $document = ZugferdDocumentReader::readAndGuessFromFile(Storage::path($e_invoice));
          $document->getDocumentInformation($documentno, $documenttypecode, $documentdate, $documentcurrency, $taxcurrency, $taxname, $documentlangeuage, $rest);
          $this->assertEquals($this->invoice->number, $documentno);
      }
@@ -70,6 +70,7 @@ class EInvoiceTest extends TestCase
      {
          $pdf = (new CreateEntityPdf($this->invoice->invitations()->first()))->handle();
          (new CreateEInvoice($this->invoice))->handle();
+         (new \App\Jobs\Invoice\MergeEInvoice($this->invoice))->handle();
          $document = ZugferdDocumentReader::readAndGuessFromFile($pdf);
          $document->getDocumentInformation($documentno, $documenttypecode, $documentdate, $documentcurrency, $taxcurrency, $taxname, $documentlangeuage, $rest);
          $this->assertEquals($this->invoice->number, $documentno);

From 005b1e521bae0b45c94412d20666449a9c5be37b Mon Sep 17 00:00:00 2001
From: Lars Kusch <lars@lars-kusch.de>
Date: Tue, 8 Aug 2023 08:14:40 +0200
Subject: [PATCH 06/42] Fixes for absolute paths

---
 app/Jobs/Invoice/MergeEInvoice.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/Jobs/Invoice/MergeEInvoice.php b/app/Jobs/Invoice/MergeEInvoice.php
index 671c187e9fd1..9536f15c37d0 100644
--- a/app/Jobs/Invoice/MergeEInvoice.php
+++ b/app/Jobs/Invoice/MergeEInvoice.php
@@ -48,8 +48,13 @@ class MergeEInvoice implements ShouldQueue
     {
         $filepath_pdf = $this->invoice->client->invoice_filepath($this->invoice->invitations->first()) . $this->invoice->getFileName();
         $e_invoice_path = $this->invoice->client->e_invoice_filepath($this->invoice->invitations->first()) . $this->invoice->getFileName("xml");
-        $document = ZugferdDocumentReader::readAndGuessFromFile($e_invoice_path);
         $disk = config('filesystems.default');
+        $file = Storage::disk($disk)->exists($e_invoice_path);
+        if (! $file){
+            (new CreateEInvoice($this->invoice))->handle();
+        }
+        $document = ZugferdDocumentReader::readAndGuessFromFile(Storage::disk($disk)->path($e_invoice_path));
+
 
         if (!Storage::disk($disk)->exists($this->invoice->client->e_invoice_filepath($this->invoice->invitations->first()))) {
             Storage::makeDirectory($this->invoice->client->e_invoice_filepath($this->invoice->invitations->first()));

From 5bda4a7aabb88e3b8176e7af9b59c4f2710ed33b Mon Sep 17 00:00:00 2001
From: Lars Kusch <lars@lars-kusch.de>
Date: Tue, 8 Aug 2023 08:31:01 +0200
Subject: [PATCH 07/42] Added E-Invoicing-Download-Option to Client portal

---
 lang/en/texts.php                                        | 9 +++++----
 .../ninja2020/components/livewire/pdf-slot.blade.php     | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lang/en/texts.php b/lang/en/texts.php
index fefb47bf3eb6..5cac96a76c79 100644
--- a/lang/en/texts.php
+++ b/lang/en/texts.php
@@ -5098,7 +5098,7 @@ $LANG = array(
     'certificate_passphrase' => 'Certificate Passphrase',
     'valid_vat_number' => 'Valid VAT Number',
     'react_notification_link' => 'React Notification Links',
-    'react_notification_link_help' => 'Admin emails will contain links to the react application',  
+    'react_notification_link_help' => 'Admin emails will contain links to the react application',
     'show_task_billable' => 'Show Task Billable',
     'credit_item' => 'Credit Item',
     'drop_file_here' => 'Drop file here',
@@ -5106,7 +5106,7 @@ $LANG = array(
     'camera' => 'Camera',
     'gallery' => 'Gallery',
     'project_location' => 'Project Location',
-    'add_gateway_help_message' => 'Add a payment gateway (ie. Stripe, WePay or PayPal) to accept online payments', 
+    'add_gateway_help_message' => 'Add a payment gateway (ie. Stripe, WePay or PayPal) to accept online payments',
     'lang_Hungarian' => 'Hungarian',
     'use_mobile_to_manage_plan' => 'Use your phone subscription settings to manage your plan',
     'item_tax3' => 'Item Tax3',
@@ -5122,7 +5122,7 @@ $LANG = array(
     'lang_French - Swiss' => 'French - Swiss',
     'currency_swazi_lilangeni' => 'Swazi Lilangeni',
     'income' => 'Income',
-    'amount_received_help' => 'Enter a value here if the total amount received was MORE than the invoice amount, or when recording a payment with no invoices. Otherwise this field should be left blank.',  
+    'amount_received_help' => 'Enter a value here if the total amount received was MORE than the invoice amount, or when recording a payment with no invoices. Otherwise this field should be left blank.',
     'vendor_phone' => 'Vendor Phone',
     'mercado_pago' => 'Mercado Pago',
     'mybank' => 'MyBank',
@@ -5140,8 +5140,9 @@ $LANG = array(
     'is_tax_exempt' => 'Tax Exempt',
     'drop_files_here' => 'Drop files here',
     'upload_files' => 'Upload Files',
+    'download_e_invoice' => 'Download E-Invoice',
 );
 
 return $LANG;
 
-?>
\ No newline at end of file
+?>
diff --git a/resources/views/portal/ninja2020/components/livewire/pdf-slot.blade.php b/resources/views/portal/ninja2020/components/livewire/pdf-slot.blade.php
index 8d6154df9b94..3e86f37eb68c 100644
--- a/resources/views/portal/ninja2020/components/livewire/pdf-slot.blade.php
+++ b/resources/views/portal/ninja2020/components/livewire/pdf-slot.blade.php
@@ -1,5 +1,5 @@
 <div>
-  <div class="flex flex-col items-end mb-2" x-data>
+  <div class="flex flex-row-reverse items-end mb-2 float-right" x-data>
     <button wire:loading.attr="disabled" wire:click="downloadPdf" class="bg-gray-100 hover:bg-gray-200 text-gray-800 font-bold px-2 rounded inline-flex" type="button">
         <span>{{ ctrans('texts.download_pdf') }}</span>
         <div wire:loading wire:target="downloadPdf">
@@ -10,7 +10,7 @@
         </div>
     </button>
   <button wire:loading.attr="disabled" wire:click="downloadEInvoice" class="bg-gray-100 hover:bg-gray-200 text-gray-800 font-bold px-2 rounded inline-flex" type="button">
-          <span>{{ ctrans('texts.download_xml') }}</span>
+          <span>{{ ctrans('texts.download_e_invoice') }}</span>
           <div wire:loading wire:target="downloadEInvoice">
               <svg class="animate-spin h-5 w-5 text-blue" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
                   <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>

From b2f0e04e78a00aa86b9828555984d9c25431ceac Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 12 Aug 2023 12:40:41 +1000
Subject: [PATCH 08/42] Fixes for tests

---
 tests/Feature/UserTest.php | 63 ++++++++++++++++++++++++++++++++++----
 1 file changed, 57 insertions(+), 6 deletions(-)

diff --git a/tests/Feature/UserTest.php b/tests/Feature/UserTest.php
index b79644f586a7..083dc0a58c24 100644
--- a/tests/Feature/UserTest.php
+++ b/tests/Feature/UserTest.php
@@ -38,6 +38,8 @@ class UserTest extends TestCase
 
     private $default_email = 'attach@gmail.com';
 
+    public $faker;
+
     protected function setUp() :void
     {
         parent::setUp();
@@ -50,7 +52,7 @@ class UserTest extends TestCase
 
         Model::reguard();
 
-        $this->withoutExceptionHandling();
+        // $this->withoutExceptionHandling();
 
         $this->withoutMiddleware(
             ThrottleRequests::class,
@@ -58,10 +60,9 @@ class UserTest extends TestCase
         );
     }
 
-    public function testUserAttemptingtToDeleteThemselves()
+    private function mockAccout()
     {
 
-
         $account = Account::factory()->create([
             'hosted_client_count' => 1000,
             'hosted_company_count' => 1000,
@@ -102,17 +103,67 @@ class UserTest extends TestCase
         $company_token->token = $token;
         $company_token->is_system = true;
 
+
+    }
+
+    public function testUserAttemptingtToDeleteThemselves()
+    {
+
+        $account = Account::factory()->create([
+            'hosted_client_count' => 1000,
+            'hosted_company_count' => 1000,
+        ]);
+
+        $account->num_users = 3;
+        $account->save();
+
+        $user = User::factory()->create([
+            'account_id' => $this->account->id,
+            'confirmation_code' => 'xyz123',
+            'email' => $this->faker->unique()->safeEmail(),
+            'password' => \Illuminate\Support\Facades\Hash::make('ALongAndBriliantPassword'),
+        ]);
+
+        $settings = CompanySettings::defaults();
+        $settings->client_online_payment_notification = false;
+        $settings->client_manual_payment_notification = false;
+
+        $company = Company::factory()->create([
+            'account_id' => $account->id,
+            'settings' => $settings,
+        ]);
+
+
+        $cu = CompanyUserFactory::create($user->id, $company->id, $account->id);
+        $cu->is_owner = true;
+        $cu->is_admin = true;
+        $cu->is_locked = false;
+        $cu->save();
+
+        $token = \Illuminate\Support\Str::random(64);
+
+        $company_token = new CompanyToken();
+        $company_token->user_id = $user->id;
+        $company_token->company_id = $company->id;
+        $company_token->account_id = $account->id;
+        $company_token->name = 'test token';
+        $company_token->token = $token;
+        $company_token->is_system = true;
+        $company_token->save();
+
         $data = [
             'ids' => [$user->hashed_id],
-                ];
+        ];
 
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-TOKEN' => $token,
             'X-API-PASSWORD' => 'ALongAndBriliantPassword',
-        ])->postJson('/api/v1/users/bulk?action=dete', $data)
-        ->assertStatus(403);
+        ])->postJson('/api/v1/users/bulk?action=delete', $data);
 
+        nlog($response);
+
+        $response->assertStatus(401);
 
     }
 

From a847bdb0edd52fc068256141b7bf894f3dce3daf Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 12 Aug 2023 12:46:46 +1000
Subject: [PATCH 09/42] Fixes for tests

---
 tests/Feature/UserTest.php | 65 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 64 insertions(+), 1 deletion(-)

diff --git a/tests/Feature/UserTest.php b/tests/Feature/UserTest.php
index 083dc0a58c24..595195ce6f7f 100644
--- a/tests/Feature/UserTest.php
+++ b/tests/Feature/UserTest.php
@@ -60,7 +60,7 @@ class UserTest extends TestCase
         );
     }
 
-    private function mockAccout()
+    private function mockAccount()
     {
 
         $account = Account::factory()->create([
@@ -75,6 +75,7 @@ class UserTest extends TestCase
             'account_id' => $this->account->id,
             'confirmation_code' => 'xyz123',
             'email' => $this->faker->unique()->safeEmail(),
+            'password' => \Illuminate\Support\Facades\Hash::make('ALongAndBriliantPassword'),
         ]);
 
         $settings = CompanySettings::defaults();
@@ -102,6 +103,68 @@ class UserTest extends TestCase
         $company_token->name = 'test token';
         $company_token->token = $token;
         $company_token->is_system = true;
+        $company_token->save();
+
+        return $company_token;
+
+    }
+
+    public function testUserResponse()
+    {
+        $company_token = $this->mockAccount();
+
+        $data = [
+                'first_name' => 'hey',
+                'last_name' => 'you',
+                'email' => 'normal_user@gmail.com',
+                'company_user' => [
+                    'is_admin' => true,
+                    'is_owner' => false,
+                    'permissions' => 'create_client,create_invoice',
+                ],
+                'phone' => null,
+            ];
+
+        $response = $this->withHeaders([
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $company_token->token,
+            'X-API-PASSWORD' => 'ALongAndBriliantPassword',
+        ])->post('/api/v1/users?include=company_user', $data);
+
+        $response->assertStatus(200);
+
+        $user = $response->json();
+        $user_id = $user['data']['id'];
+
+        $response = $this->withHeaders([
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $company_token->token,
+            'X-API-PASSWORD' => 'ALongAndBriliantPassword',
+        ])->get('/api/v1/users', $data);
+
+
+        $response->assertStatus(200);
+        $arr = $response->json();
+
+        $this->assertCount(2, $arr['data']);
+
+            //archive the user we just created:
+
+            $data = [
+                'action' => 'archive',
+                'ids' => [$user_id],
+            ];
+
+
+            $response = $this->withHeaders([
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $company_token->token,
+                'X-API-PASSWORD' => 'ALongAndBriliantPassword',
+            ])->postJson('/api/v1/users/bulk', $data);
+
+            $response->assertStatus(200);
+
+            $this->assertCount(1, $response->json()['data']);
 
 
     }

From 0f931fe1a8fdc0309374a165b6548674a113b783 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 12 Aug 2023 16:21:06 +1000
Subject: [PATCH 10/42] Tests for users

---
 app/Filters/UserFilters.php |  3 +-
 tests/Feature/UserTest.php  | 60 +++++++++++++++++++++++++++++--------
 2 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/app/Filters/UserFilters.php b/app/Filters/UserFilters.php
index 12a26d27a6cf..3989ec7450ed 100644
--- a/app/Filters/UserFilters.php
+++ b/app/Filters/UserFilters.php
@@ -127,8 +127,7 @@ class UserFilters extends QueryFilters
         $user_array = $this->transformKeys(explode(',', $user_id));
 
         return  $this->builder->where(function ($query) use ($user_array) {
-            $query->whereNotIn('id', $user_array)
-                  ->where('account_id', auth()->user()->account_id);
+            $query->whereNotIn('id', $user_array);
         });
     }
 }
diff --git a/tests/Feature/UserTest.php b/tests/Feature/UserTest.php
index 595195ce6f7f..4872dd7478a3 100644
--- a/tests/Feature/UserTest.php
+++ b/tests/Feature/UserTest.php
@@ -142,29 +142,63 @@ class UserTest extends TestCase
             'X-API-PASSWORD' => 'ALongAndBriliantPassword',
         ])->get('/api/v1/users', $data);
 
-
         $response->assertStatus(200);
         $arr = $response->json();
 
         $this->assertCount(2, $arr['data']);
 
-            //archive the user we just created:
+        //archive the user we just created:
 
-            $data = [
-                'action' => 'archive',
-                'ids' => [$user_id],
-            ];
+        $data = [
+            'action' => 'archive',
+            'ids' => [$user_id],
+        ];
 
+        $response = $this->withHeaders([
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $company_token->token,
+            'X-API-PASSWORD' => 'ALongAndBriliantPassword',
+        ])->postJson('/api/v1/users/bulk', $data);
 
-            $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $company_token->token,
-                'X-API-PASSWORD' => 'ALongAndBriliantPassword',
-            ])->postJson('/api/v1/users/bulk', $data);
+        $response->assertStatus(200);
 
-            $response->assertStatus(200);
+        $this->assertCount(1, $response->json()['data']);
 
-            $this->assertCount(1, $response->json()['data']);
+        $response = $this->withHeaders([
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $company_token->token,
+            'X-API-PASSWORD' => 'ALongAndBriliantPassword',
+        ])->get("/api/v1/users?without={$company_token->user->hashed_id}");
+
+        $response->assertStatus(200);
+        $this->assertCount(1, $response->json()['data']);
+
+        $response = $this->withHeaders([
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $company_token->token,
+            'X-API-PASSWORD' => 'ALongAndBriliantPassword',
+        ])->get("/api/v1/users?without={$company_token->user->hashed_id}&status=active");
+
+        $response->assertStatus(200);
+        $this->assertCount(0, $response->json()['data']);
+
+        $response = $this->withHeaders([
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $company_token->token,
+            'X-API-PASSWORD' => 'ALongAndBriliantPassword',
+        ])->get("/api/v1/users?without={$company_token->user->hashed_id}&status=archived");
+
+        $response->assertStatus(200);
+        $this->assertCount(1, $response->json()['data']);
+        
+        $response = $this->withHeaders([
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $company_token->token,
+            'X-API-PASSWORD' => 'ALongAndBriliantPassword',
+        ])->get("/api/v1/users?without={$company_token->user->hashed_id}&status=deleted");
+
+        $response->assertStatus(200);
+        $this->assertCount(0, $response->json()['data']);
 
 
     }

From aa45e686ee62923d96c1cb79040304036d88a6d0 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Aug 2023 16:21:55 +1000
Subject: [PATCH 11/42] Internal lightlogs

---
 app/DataMapper/Analytics/RevenueTrack.php     | 98 +++++++++++++++++++
 app/Listeners/Payment/PaymentNotification.php | 17 +++-
 2 files changed, 112 insertions(+), 3 deletions(-)
 create mode 100644 app/DataMapper/Analytics/RevenueTrack.php

diff --git a/app/DataMapper/Analytics/RevenueTrack.php b/app/DataMapper/Analytics/RevenueTrack.php
new file mode 100644
index 000000000000..75af0ded48fa
--- /dev/null
+++ b/app/DataMapper/Analytics/RevenueTrack.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\DataMapper\Analytics;
+
+use Turbo124\Beacon\ExampleMetric\GenericMixedMetric;
+
+class RevenueTrack extends GenericMixedMetric
+{
+    /**
+     * The type of Sample.
+     *
+     * Monotonically incrementing counter
+     *
+     * 	- counter
+     *
+     * @var string
+     */
+    public $type = 'mixed_metric';
+
+    /**
+     * The name of the counter.
+     * @var string
+     */
+    public $name = 'app.revenue';
+
+    /**
+     * The datetime of the counter measurement.
+     *
+     * date("Y-m-d H:i:s")
+     *
+     */
+    public $datetime;
+
+    /**
+     * The Client email
+     *
+     * @var string
+     */
+    public $string_metric5 = 'email';
+
+    /**
+     * The AccountKey email
+     *
+     * @var string
+     */
+    public $string_metric6 = 'key';
+
+    /**
+     * Product Type
+     *
+     * @var string
+     */
+    public $string_metric7 = 'product';
+
+    /**
+     * Gateway Reference
+     *
+     * @var string
+     */
+    public $string_metric8 = 'gateway_reference';
+
+    public $string_metric9 = 'entity_reference';
+
+    /**
+     * The counter
+     * set to 1.
+     *
+     * @var int
+     */
+    public $int_metric1 = 1;
+
+    /**
+     * Amount Received
+     *
+     * @var double
+     */
+    public $double_metric2 = 0;
+
+    public function __construct($string_metric5, $string_metric6, $int_metric1, $double_metric2, $string_metric7, $string_metric8, $string_metric9)
+    {
+        $this->int_metric1 = $int_metric1;
+        $this->double_metric2 = $double_metric2;
+        $this->string_metric5 = $string_metric5;
+        $this->string_metric6 = $string_metric6;
+        $this->string_metric7 = $string_metric7;
+        $this->string_metric8 = $string_metric8;
+        $this->string_metric9 = $string_metric9;
+    }
+}
diff --git a/app/Listeners/Payment/PaymentNotification.php b/app/Listeners/Payment/PaymentNotification.php
index 37623bf8dc75..2c4607dfc994 100644
--- a/app/Listeners/Payment/PaymentNotification.php
+++ b/app/Listeners/Payment/PaymentNotification.php
@@ -11,14 +11,16 @@
 
 namespace App\Listeners\Payment;
 
+use App\Utils\Ninja;
+use App\Libraries\MultiDB;
 use App\Jobs\Mail\NinjaMailer;
 use App\Jobs\Mail\NinjaMailerJob;
 use App\Jobs\Mail\NinjaMailerObject;
-use App\Libraries\MultiDB;
 use App\Mail\Admin\EntityPaidObject;
-use App\Utils\Ninja;
-use App\Utils\Traits\Notifications\UserNotifies;
+use Turbo124\Beacon\Facades\LightLogs;
+use App\DataMapper\Analytics\RevenueTrack;
 use Illuminate\Contracts\Queue\ShouldQueue;
+use App\Utils\Traits\Notifications\UserNotifies;
 
 class PaymentNotification implements ShouldQueue
 {
@@ -158,6 +160,15 @@ class PaymentNotification implements ShouldQueue
 
         $url = $base."&t=item&in={$item}&ip={$amount}&iq=1";
         $this->sendAnalytics($url);
+
+        $email = $client->present()->email();
+        $account_key = $client->custom_value2 ?? 'unknown';
+        $product = $item;
+        $gateway_reference = $client->gateway_tokens()->count() >= 1 ? ($client->gateway_tokens()->first()->gateway_customer_reference ?? '') : '';
+
+        LightLogs::create(new RevenueTrack($email, $account_key, 1, $amount, $product, $gateway_reference, $entity_number))
+                 ->batch();
+
     }
 
     /**

From 6eb85636971d1beac18695eb5fbc930aefda8187 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Aug 2023 20:00:26 +1000
Subject: [PATCH 12/42] Fixes for types

---
 app/Jobs/User/UserEmailChanged.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Jobs/User/UserEmailChanged.php b/app/Jobs/User/UserEmailChanged.php
index c397f1ae65dd..f49718c916c4 100644
--- a/app/Jobs/User/UserEmailChanged.php
+++ b/app/Jobs/User/UserEmailChanged.php
@@ -36,10 +36,10 @@ class UserEmailChanged implements ShouldQueue
      * Create a new job instance.
      *
      * @param \App\Models\User $new_user
-     * @param \App\Models\User $old_user
+     * @param \stdClass $old_user
      * @param \App\Models\Company $company
      */
-    public function __construct(protected User $new_user, protected User $old_user, protected Company $company)
+    public function __construct(protected User $new_user, protected \stdClass $old_user, protected Company $company)
     {
         $this->settings = $this->company->settings;
     }

From 68c817bdcd2a089ce2c55e7335a929e180eed26d Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 14 Aug 2023 07:30:38 +1000
Subject: [PATCH 13/42] Fixes for types

---
 app/Http/Livewire/BillingPortalPurchase.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/Livewire/BillingPortalPurchase.php b/app/Http/Livewire/BillingPortalPurchase.php
index 9a7fae37b9ca..74e693faa459 100644
--- a/app/Http/Livewire/BillingPortalPurchase.php
+++ b/app/Http/Livewire/BillingPortalPurchase.php
@@ -62,11 +62,11 @@ class BillingPortalPurchase extends Component
     public $password;
 
     /**
-     * Instance of subscription.
+     * This arrives as an int and we resolve in the mount method
      *
-     * @var \App\Models\Subscription $subscription
+     * @var int|Subscription
      */
-    public Subscription $subscription;
+    public $subscription;
 
     /**
      * Instance of client contact.

From fda2b1d4f0566e77f6d7827fb7c95ee3e27db2e9 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 14 Aug 2023 07:38:17 +1000
Subject: [PATCH 14/42] fixes for imports

---
 app/Repositories/Migration/InvoiceMigrationRepository.php | 6 +++++-
 app/Utils/TemplateEngine.php                              | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/Repositories/Migration/InvoiceMigrationRepository.php b/app/Repositories/Migration/InvoiceMigrationRepository.php
index 05b4dafc20aa..729a9551b95f 100644
--- a/app/Repositories/Migration/InvoiceMigrationRepository.php
+++ b/app/Repositories/Migration/InvoiceMigrationRepository.php
@@ -136,7 +136,11 @@ class InvoiceMigrationRepository extends BaseRepository
 
         $state['finished_amount'] = $model->amount;
 
-        $model = $model->service()->applyNumber()->setReminder()->save();
+        $model = $model->service()->applyNumber()->save();
+
+        if ($class->name == Invoice::class) {
+            $model->service()->setReminder()->save();
+        }
 
         if ($class->name == Invoice::class || $class->name == RecurringInvoice::class) {
             if (($state['finished_amount'] != $state['starting_amount']) && ($model->status_id != Invoice::STATUS_DRAFT)) {
diff --git a/app/Utils/TemplateEngine.php b/app/Utils/TemplateEngine.php
index 2e531daf9484..4bd3b8310a26 100644
--- a/app/Utils/TemplateEngine.php
+++ b/app/Utils/TemplateEngine.php
@@ -52,8 +52,8 @@ class TemplateEngine
 
     public $template;
 
-    /** @var \App\Models\Invoice | \App\Models\Quote | \App\Models\Credit | \App\Models\PurchaseOrder | \App\Models\RecurringInvoice $entity_obj **/
-    private \App\Models\Invoice | \App\Models\Quote | \App\Models\Credit | \App\Models\PurchaseOrder | \App\Models\RecurringInvoice $entity_obj;
+    /** @var \App\Models\Invoice | \App\Models\Quote | \App\Models\Credit | \App\Models\PurchaseOrder | \App\Models\RecurringInvoice | \App\Models\Payment $entity_obj **/
+    private \App\Models\Invoice | \App\Models\Quote | \App\Models\Credit | \App\Models\PurchaseOrder | \App\Models\RecurringInvoice | \App\Models\Payment $entity_obj;
 
     /** @var \App\Models\Company | \App\Models\Client | null $settings_entity **/
     private $settings_entity;

From 6609f89d94333f3088c43e3758d024abf8315aab Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 14 Aug 2023 07:54:51 +1000
Subject: [PATCH 15/42] Fixes for list search

---
 app/Filters/CreditFilters.php           | 5 +++++
 app/Filters/InvoiceFilters.php          | 5 +++++
 app/Filters/PaymentFilters.php          | 7 ++++++-
 app/Filters/QuoteFilters.php            | 7 ++++++-
 app/Filters/RecurringInvoiceFilters.php | 7 ++++++-
 app/Filters/TaskFilters.php             | 7 ++++++-
 6 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/app/Filters/CreditFilters.php b/app/Filters/CreditFilters.php
index 83dc2c7781fd..bd17e34819a5 100644
--- a/app/Filters/CreditFilters.php
+++ b/app/Filters/CreditFilters.php
@@ -88,6 +88,11 @@ class CreditFilters extends QueryFilters
                           ->orWhere('credits.custom_value4', 'like', '%'.$filter.'%')
                           ->orWhereHas('client', function ($q) use ($filter) {
                               $q->where('name', 'like', '%'.$filter.'%');
+                          })
+                          ->orWhereHas('client.contacts', function ($q) use ($filter) {
+                              $q->where('first_name', 'like', '%'.$filter.'%')
+                                ->orWhere('last_name', 'like', '%'.$filter.'%')
+                                ->orWhere('email', 'like', '%'.$filter.'%');
                           });
         });
     }
diff --git a/app/Filters/InvoiceFilters.php b/app/Filters/InvoiceFilters.php
index deab3483fd8b..8ade4be3a6a1 100644
--- a/app/Filters/InvoiceFilters.php
+++ b/app/Filters/InvoiceFilters.php
@@ -116,6 +116,11 @@ class InvoiceFilters extends QueryFilters
                           ->orWhere('custom_value4', 'like', '%'.$filter.'%')
                           ->orWhereHas('client', function ($q) use ($filter) {
                               $q->where('name', 'like', '%'.$filter.'%');
+                          })
+                          ->orWhereHas('client.contacts', function ($q) use ($filter) {
+                              $q->where('first_name', 'like', '%'.$filter.'%')
+                                ->orWhere('last_name', 'like', '%'.$filter.'%')
+                                ->orWhere('email', 'like', '%'.$filter.'%');
                           });
         });
     }
diff --git a/app/Filters/PaymentFilters.php b/app/Filters/PaymentFilters.php
index 38381ed786bb..b6c82430baad 100644
--- a/app/Filters/PaymentFilters.php
+++ b/app/Filters/PaymentFilters.php
@@ -44,7 +44,12 @@ class PaymentFilters extends QueryFilters
                           ->orWhere('custom_value4', 'like', '%'.$filter.'%')
                           ->orWhereHas('client', function ($q) use ($filter) {
                                 $q->where('name', 'like', '%'.$filter.'%');
-                            });
+                            })
+                            ->orWhereHas('client.contacts', function ($q) use ($filter) {
+                              $q->where('first_name', 'like', '%'.$filter.'%')
+                                ->orWhere('last_name', 'like', '%'.$filter.'%')
+                                ->orWhere('email', 'like', '%'.$filter.'%');
+                          });
         });
     }
 
diff --git a/app/Filters/QuoteFilters.php b/app/Filters/QuoteFilters.php
index a08c6aa09418..26a6b3f0ae2e 100644
--- a/app/Filters/QuoteFilters.php
+++ b/app/Filters/QuoteFilters.php
@@ -40,7 +40,12 @@ class QuoteFilters extends QueryFilters
                   ->orWhere('custom_value4', 'like', '%'.$filter.'%')
                   ->orWhereHas('client', function ($q) use ($filter) {
                       $q->where('name', 'like', '%'.$filter.'%');
-                  });
+                  })
+                  ->orWhereHas('client.contacts', function ($q) use ($filter) {
+                              $q->where('first_name', 'like', '%'.$filter.'%')
+                                ->orWhere('last_name', 'like', '%'.$filter.'%')
+                                ->orWhere('email', 'like', '%'.$filter.'%');
+                          });
         });
     }
 
diff --git a/app/Filters/RecurringInvoiceFilters.php b/app/Filters/RecurringInvoiceFilters.php
index 03a66b11f127..71fcca9d101f 100644
--- a/app/Filters/RecurringInvoiceFilters.php
+++ b/app/Filters/RecurringInvoiceFilters.php
@@ -42,7 +42,12 @@ class RecurringInvoiceFilters extends QueryFilters
                     ->orWhere('custom_value4', 'like', '%'.$filter.'%')
                     ->orWhereHas('client', function ($q) use ($filter) {
                         $q->where('name', 'like', '%'.$filter.'%');
-                    });
+                    })
+                    ->orWhereHas('client.contacts', function ($q) use ($filter) {
+                              $q->where('first_name', 'like', '%'.$filter.'%')
+                                ->orWhere('last_name', 'like', '%'.$filter.'%')
+                                ->orWhere('email', 'like', '%'.$filter.'%');
+                          });
         });
     }
 
diff --git a/app/Filters/TaskFilters.php b/app/Filters/TaskFilters.php
index 3e09a0d2addf..0c564af5a4f6 100644
--- a/app/Filters/TaskFilters.php
+++ b/app/Filters/TaskFilters.php
@@ -45,7 +45,12 @@ class TaskFilters extends QueryFilters
                             })
                           ->orWhereHas('client', function ($q) use ($filter) {
                                 $q->where('name', 'like', '%'.$filter.'%');
-                            });
+                            })
+                            ->orWhereHas('client.contacts', function ($q) use ($filter) {
+                              $q->where('first_name', 'like', '%'.$filter.'%')
+                                ->orWhere('last_name', 'like', '%'.$filter.'%')
+                                ->orWhere('email', 'like', '%'.$filter.'%');
+                          });
         });
     }
 

From a4a23606abcaaa342f206e8c0df13374214542ac Mon Sep 17 00:00:00 2001
From: Lars Kusch <lars@lars-kusch.de>
Date: Mon, 14 Aug 2023 10:22:54 +0200
Subject: [PATCH 16/42] Workaround for wrong conversion

---
 app/Jobs/Invoice/CreateEInvoice.php               |  9 +++++----
 app/Jobs/Invoice/MergeEInvoice.php                | 11 ++---------
 app/Services/Invoice/EInvoice/ZugferdEInvoice.php |  8 +++++---
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/app/Jobs/Invoice/CreateEInvoice.php b/app/Jobs/Invoice/CreateEInvoice.php
index e97444705fe3..017c8fcac448 100644
--- a/app/Jobs/Invoice/CreateEInvoice.php
+++ b/app/Jobs/Invoice/CreateEInvoice.php
@@ -14,6 +14,7 @@ namespace App\Jobs\Invoice;
 
 use App\Utils\Ninja;
 use App\Models\Invoice;
+use horstoeko\zugferd\ZugferdDocumentBuilder;
 use Illuminate\Bus\Queueable;
 use Illuminate\Support\Facades\App;
 use Illuminate\Queue\SerializesModels;
@@ -29,7 +30,7 @@ class CreateEInvoice implements ShouldQueue
 
     public $deleteWhenMissingModels = true;
 
-    public function __construct(private Invoice $invoice)
+    public function __construct(private Invoice $invoice, private bool $returnObject = false)
     {
     }
 
@@ -39,7 +40,7 @@ class CreateEInvoice implements ShouldQueue
      *
      * @return string
      */
-    public function handle(): string
+    public function handle(): string|ZugferdDocumentBuilder
     {
         /* Forget the singleton*/
         App::forgetInstance('translator');
@@ -63,13 +64,13 @@ class CreateEInvoice implements ShouldQueue
             case "XInvoice-Extended":
             case "XInvoice-BasicWL":
             case "XInvoice-Basic":
-                return (new ZugferdEInvoice($this->invoice))->run();
+                return (new ZugferdEInvoice($this->invoice, $this->returnObject))->run();
             case "Facturae_3.2":
             case "Facturae_3.2.1":
             case "Facturae_3.2.2":
                 return (new FacturaEInvoice($this->invoice, str_replace("Facturae_", "", $e_invoice_type)))->run();
             default:
-                return (new ZugferdEInvoice($this->invoice))->run();
+                return (new ZugferdEInvoice($this->invoice, $this->returnObject))->run();
 
         }
 
diff --git a/app/Jobs/Invoice/MergeEInvoice.php b/app/Jobs/Invoice/MergeEInvoice.php
index 9536f15c37d0..fd5952d3ac89 100644
--- a/app/Jobs/Invoice/MergeEInvoice.php
+++ b/app/Jobs/Invoice/MergeEInvoice.php
@@ -47,19 +47,12 @@ class MergeEInvoice implements ShouldQueue
     private function embedEInvoiceZuGFerD(): void
     {
         $filepath_pdf = $this->invoice->client->invoice_filepath($this->invoice->invitations->first()) . $this->invoice->getFileName();
-        $e_invoice_path = $this->invoice->client->e_invoice_filepath($this->invoice->invitations->first()) . $this->invoice->getFileName("xml");
         $disk = config('filesystems.default');
-        $file = Storage::disk($disk)->exists($e_invoice_path);
-        if (! $file){
-            (new CreateEInvoice($this->invoice))->handle();
-        }
-        $document = ZugferdDocumentReader::readAndGuessFromFile(Storage::disk($disk)->path($e_invoice_path));
-
-
+        $xrechnung = (new CreateEInvoice($this->invoice, true))->handle();
         if (!Storage::disk($disk)->exists($this->invoice->client->e_invoice_filepath($this->invoice->invitations->first()))) {
             Storage::makeDirectory($this->invoice->client->e_invoice_filepath($this->invoice->invitations->first()));
         }
-        $pdfBuilder = new ZugferdDocumentPdfBuilder($document, Storage::disk($disk)->path($filepath_pdf));
+        $pdfBuilder = new ZugferdDocumentPdfBuilder($xrechnung, Storage::disk($disk)->path($filepath_pdf));
         $pdfBuilder->generateDocument();
         $pdfBuilder->saveDocument(Storage::disk($disk)->path($filepath_pdf));
     }
diff --git a/app/Services/Invoice/EInvoice/ZugferdEInvoice.php b/app/Services/Invoice/EInvoice/ZugferdEInvoice.php
index e40d3ed6dbc4..37d6ce32fe65 100644
--- a/app/Services/Invoice/EInvoice/ZugferdEInvoice.php
+++ b/app/Services/Invoice/EInvoice/ZugferdEInvoice.php
@@ -23,11 +23,11 @@ use horstoeko\zugferd\codelists\ZugferdDutyTaxFeeCategories;
 class ZugferdEInvoice extends AbstractService
 {
 
-    public function __construct(public Invoice $invoice, private array $tax_map = [])
+    public function __construct(public Invoice $invoice, private readonly bool $returnObject = false, private array $tax_map = [])
     {
     }
 
-    public function run()
+    public function run(): string|ZugferdDocumentBuilder
     {
 
         $company = $this->invoice->company;
@@ -175,7 +175,9 @@ class ZugferdEInvoice extends AbstractService
 
         $xrechnung->writeFile(Storage::disk($disk)->path($client->e_invoice_filepath($this->invoice->invitations->first()) . $this->invoice->getFileName("xml")));
         // The validity can be checked using https://portal3.gefeg.com/invoice/validation or https://e-rechnung.bayern.de/app/#/upload
-
+        if ($this->returnObject){
+            return $xrechnung;
+        }
         return $client->e_invoice_filepath($this->invoice->invitations->first()) . $this->invoice->getFileName("xml");
     }
 

From c5316f2ad20c83d00cb17f13ecc69631dfad21c2 Mon Sep 17 00:00:00 2001
From: Lars Kusch <lars@lars-kusch.de>
Date: Mon, 14 Aug 2023 10:23:17 +0200
Subject: [PATCH 17/42] Adopt classes for html attributes

---
 .../portal/ninja2020/components/livewire/pdf-slot.blade.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/portal/ninja2020/components/livewire/pdf-slot.blade.php b/resources/views/portal/ninja2020/components/livewire/pdf-slot.blade.php
index e8e2fcea3b40..290de387db96 100644
--- a/resources/views/portal/ninja2020/components/livewire/pdf-slot.blade.php
+++ b/resources/views/portal/ninja2020/components/livewire/pdf-slot.blade.php
@@ -9,7 +9,7 @@
             </svg>
         </div>
     </button>
-  <button wire:loading.attr="disabled" wire:click="downloadEInvoice" class="bg-gray-100 hover:bg-gray-200 text-gray-800 font-bold px-2 rounded inline-flex" type="button">
+  <button wire:loading.attr="disabled" wire:click="downloadEInvoice" class="bg-primary text-white px-4 py-4 lg:px-2 lg:py-2 rounded" type="button">
           <span>{{ ctrans('texts.download_e_invoice') }}</span>
           <div wire:loading wire:target="downloadEInvoice">
               <svg class="animate-spin h-5 w-5 text-blue" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">

From 1d7d55447ac6ba08d9d342d5598904c2c13daba2 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 14 Aug 2023 20:01:28 +1000
Subject: [PATCH 18/42] Add specific delays for some activities

---
 app/Listeners/Activity/PaymentCreatedActivity.php   | 1 +
 app/Listeners/Invoice/InvoicePaidActivity.php       | 2 ++
 app/Services/PurchaseOrder/PurchaseOrderExpense.php | 2 +-
 app/Services/PurchaseOrder/PurchaseOrderService.php | 7 ++-----
 phpstan.neon                                        | 6 ++----
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/Listeners/Activity/PaymentCreatedActivity.php b/app/Listeners/Activity/PaymentCreatedActivity.php
index ff0c0abd0889..12ed24c288b4 100644
--- a/app/Listeners/Activity/PaymentCreatedActivity.php
+++ b/app/Listeners/Activity/PaymentCreatedActivity.php
@@ -21,6 +21,7 @@ class PaymentCreatedActivity implements ShouldQueue
 {
     protected $activity_repo;
 
+    public $delay = 5;
     /**
      * Create the event listener.
      *
diff --git a/app/Listeners/Invoice/InvoicePaidActivity.php b/app/Listeners/Invoice/InvoicePaidActivity.php
index 2d340dfb08df..836136aad0e0 100644
--- a/app/Listeners/Invoice/InvoicePaidActivity.php
+++ b/app/Listeners/Invoice/InvoicePaidActivity.php
@@ -21,6 +21,8 @@ class InvoicePaidActivity implements ShouldQueue
 {
     protected $activity_repo;
     
+    public $delay = 10;
+    
     /**
      * Create the event listener.
      *
diff --git a/app/Services/PurchaseOrder/PurchaseOrderExpense.php b/app/Services/PurchaseOrder/PurchaseOrderExpense.php
index d206efbb28fb..e25bc84de163 100644
--- a/app/Services/PurchaseOrder/PurchaseOrderExpense.php
+++ b/app/Services/PurchaseOrder/PurchaseOrderExpense.php
@@ -57,7 +57,7 @@ class PurchaseOrderExpense
 
         $expense->number = empty($expense->number) ? $this->getNextExpenseNumber($expense) : $expense->number;
 
-        $expense->save();
+        $expense->saveQuietly();
         event('eloquent.created: App\Models\Expense', $expense);
 
         $this->purchase_order->expense_id = $expense->id;
diff --git a/app/Services/PurchaseOrder/PurchaseOrderService.php b/app/Services/PurchaseOrder/PurchaseOrderService.php
index f9bc5d7c75e1..3445e261dd7d 100644
--- a/app/Services/PurchaseOrder/PurchaseOrderService.php
+++ b/app/Services/PurchaseOrder/PurchaseOrderService.php
@@ -20,11 +20,8 @@ class PurchaseOrderService
 {
     use MakesHash;
 
-    public PurchaseOrder $purchase_order;
-
-    public function __construct(PurchaseOrder $purchase_order)
+    public function __construct(public PurchaseOrder $purchase_order)
     {
-        $this->purchase_order = $purchase_order;
     }
 
     public function createInvitations()
@@ -156,7 +153,7 @@ class PurchaseOrderService
 
     /**
      * Saves the purchase order.
-     * @return \App\Models\PurchaseOrder object
+     * @return \App\Models\PurchaseOrder 
      */
     public function save(): ?PurchaseOrder
     {
diff --git a/phpstan.neon b/phpstan.neon
index 92bb5444400e..ff93e96cc5b3 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -8,6 +8,7 @@ parameters:
     excludePaths:
         - 'vendor/'
         - 'app/Jobs/Ninja/*'
+        - 'app/Models/Presenters/*'
         - 'app/Console/Commands/*'
         - 'app/DataMapper/Analytics/*'
         - 'app/PaymentDrivers/Authorize/*'
@@ -17,10 +18,7 @@ parameters:
         - App\DataMapper\FeesAndLimits
     reportUnmatchedIgnoredErrors: false
     ignoreErrors:
-        - '#Call to an undefined method [a-zA-Z0-9\\_]+::company\(\)#' 
-        - '#Call to an undefined method [a-zA-Z0-9\\_]+::entityFilter\(\)#'
-        - '#Call to an undefined method [a-zA-Z0-9\\_]+::exclude\(\)#'
         - '#Array has 2 duplicate keys with value#'
-        - '#Undefined method#'
+        - '#Call to an undefined method#'
         - '#makeHidden#'
         - '#Socialite#'
\ No newline at end of file

From 19fcab3b357760d7b60bd434667d193e3e92e927 Mon Sep 17 00:00:00 2001
From: Lars Kusch <lars@lars-kusch.de>
Date: Mon, 14 Aug 2023 12:08:25 +0200
Subject: [PATCH 19/42] Bugfixes

---
 app/Jobs/Entity/CreateRawPdf.php            |  7 +++++--
 app/Jobs/Invoice/MergeEInvoice.php          | 17 ++++++++++-------
 app/Services/Invoice/GetInvoiceEInvoice.php |  1 -
 app/Services/Invoice/GetInvoicePdf.php      |  2 +-
 app/Services/Invoice/MergeEInvoice.php      | 16 +++++-----------
 5 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/app/Jobs/Entity/CreateRawPdf.php b/app/Jobs/Entity/CreateRawPdf.php
index faced3f35ace..8c3b4d77f7f0 100644
--- a/app/Jobs/Entity/CreateRawPdf.php
+++ b/app/Jobs/Entity/CreateRawPdf.php
@@ -203,8 +203,11 @@ class CreateRawPdf implements ShouldQueue
         if ($pdf) {
             $maker =null;
             $state = null;
-            if ($this->invitation->invoice->client->getSetting('enable_e_invoice') && $this->entity == "invoice"){
-                (new \App\Services\Invoice\MergeEInvoice($this->invitation->invoice))->run();
+            if ($this->invitation->invoice->client->getSetting('enable_e_invoice') && $this->entity_string == "invoice"){
+                $filename = tempnam(sys_get_temp_dir(), 'InvoiceNinja').".pdf";
+                file_put_contents($filename, $pdf);
+                (new \App\Services\Invoice\MergeEInvoice($this->invitation->invoice, $filename))->run();
+                return file_get_contents($filename);
             };
             return $pdf;
         }
diff --git a/app/Jobs/Invoice/MergeEInvoice.php b/app/Jobs/Invoice/MergeEInvoice.php
index fd5952d3ac89..ea1b9b969a9f 100644
--- a/app/Jobs/Invoice/MergeEInvoice.php
+++ b/app/Jobs/Invoice/MergeEInvoice.php
@@ -11,7 +11,7 @@ use horstoeko\zugferd\ZugferdDocumentReader;
 
 class MergeEInvoice implements ShouldQueue
 {
-    public function __construct(public Invoice $invoice, public ?ClientContact $contact = null)
+    public function __construct(public Invoice $invoice, private string $pdf_path = "")
     {
     }
 
@@ -46,14 +46,17 @@ class MergeEInvoice implements ShouldQueue
      */
     private function embedEInvoiceZuGFerD(): void
     {
-        $filepath_pdf = $this->invoice->client->invoice_filepath($this->invoice->invitations->first()) . $this->invoice->getFileName();
+        $filepath_pdf = !empty($this->pdf_path) ? $this->pdf_path : $this->invoice->service()->getInvoicePdf();
         $disk = config('filesystems.default');
-        $xrechnung = (new CreateEInvoice($this->invoice, true))->handle();
-        if (!Storage::disk($disk)->exists($this->invoice->client->e_invoice_filepath($this->invoice->invitations->first()))) {
-            Storage::makeDirectory($this->invoice->client->e_invoice_filepath($this->invoice->invitations->first()));
+        $e_rechnung = (new CreateEInvoice($this->invoice, true))->handle();
+        if (!empty($this->pdf_path)){
+            $realpath_pdf = $filepath_pdf;
         }
-        $pdfBuilder = new ZugferdDocumentPdfBuilder($xrechnung, Storage::disk($disk)->path($filepath_pdf));
+        else {
+           $realpath_pdf = Storage::disk($disk)->path($filepath_pdf);
+        }
+        $pdfBuilder = new ZugferdDocumentPdfBuilder($e_rechnung, $realpath_pdf);
         $pdfBuilder->generateDocument();
-        $pdfBuilder->saveDocument(Storage::disk($disk)->path($filepath_pdf));
+        $pdfBuilder->saveDocument($realpath_pdf);
     }
 }
diff --git a/app/Services/Invoice/GetInvoiceEInvoice.php b/app/Services/Invoice/GetInvoiceEInvoice.php
index 66a4759fb6b9..0434b6917fd0 100644
--- a/app/Services/Invoice/GetInvoiceEInvoice.php
+++ b/app/Services/Invoice/GetInvoiceEInvoice.php
@@ -47,7 +47,6 @@ class GetInvoiceEInvoice extends AbstractService
             (new \App\Jobs\Invoice\MergeEInvoice($this->invoice))->handle();
 
         }
-
         return $file_path;
     }
 }
diff --git a/app/Services/Invoice/GetInvoicePdf.php b/app/Services/Invoice/GetInvoicePdf.php
index 346f707e3b15..8044e8a290d6 100644
--- a/app/Services/Invoice/GetInvoicePdf.php
+++ b/app/Services/Invoice/GetInvoicePdf.php
@@ -51,7 +51,7 @@ class GetInvoicePdf extends AbstractService
         }
         if ($this->invoice->client->getSetting('enable_e_invoice')){
             (new CreateEInvoice($this->invoice))->handle();
-            (new MergeEInvoice($this->invoice))->handle();
+           (new MergeEInvoice($this->invoice, $file_path))->handle();
         }
         return $file_path;
     }
diff --git a/app/Services/Invoice/MergeEInvoice.php b/app/Services/Invoice/MergeEInvoice.php
index c40cb0bafa58..ad80c49cd821 100644
--- a/app/Services/Invoice/MergeEInvoice.php
+++ b/app/Services/Invoice/MergeEInvoice.php
@@ -11,23 +11,17 @@ class MergeEInvoice
 
     /**
      * @param Invoice $invoice
-     * @param mixed|null $contact
      */
-    public function __construct(public Invoice $invoice, public ?ClientContact $contact = null)
+    public function __construct(public Invoice $invoice, public string $pdf_path = "")
     {
     }
 
     public function run(): void
     {
-        $file_path_xml = $this->invoice->client->e_invoice_filepath($this->invoice->invitations->first()). $this->invoice->getFileName("xml");
-        $file_path_pdf = $this->invoice->getFileName();
-        // $disk = 'public';
-        $disk = config('filesystems.default');
-
-        $file_xml = Storage::disk($disk)->exists($file_path_xml);
-        $file_pdf = Storage::disk($disk)->exists($file_path_pdf);
-
-        if ($file_xml && $file_pdf) {
+        if (!empty($this->pdf_path)) {
+            (new \App\Jobs\Invoice\MergeEInvoice($this->invoice, $this->pdf_path))->handle();
+        }
+        else {
             (new \App\Jobs\Invoice\MergeEInvoice($this->invoice))->handle();
         }
 

From 7fada967f364042e93c1723edccfa053b2d24e03 Mon Sep 17 00:00:00 2001
From: Lars Kusch <lars@lars-kusch.de>
Date: Mon, 14 Aug 2023 12:10:21 +0200
Subject: [PATCH 20/42] Bugfixes

---
 app/Jobs/Invoice/MergeEInvoice.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/Jobs/Invoice/MergeEInvoice.php b/app/Jobs/Invoice/MergeEInvoice.php
index ea1b9b969a9f..1a33db8be1db 100644
--- a/app/Jobs/Invoice/MergeEInvoice.php
+++ b/app/Jobs/Invoice/MergeEInvoice.php
@@ -55,8 +55,14 @@ class MergeEInvoice implements ShouldQueue
         else {
            $realpath_pdf = Storage::disk($disk)->path($filepath_pdf);
         }
-        $pdfBuilder = new ZugferdDocumentPdfBuilder($e_rechnung, $realpath_pdf);
-        $pdfBuilder->generateDocument();
-        $pdfBuilder->saveDocument($realpath_pdf);
+        if (file_exists($realpath_pdf)){
+            $pdfBuilder = new ZugferdDocumentPdfBuilder($e_rechnung, $realpath_pdf);
+            $pdfBuilder->generateDocument();
+            $pdfBuilder->saveDocument($realpath_pdf);
+        }
+        else{
+            nlog("E_Invoice Merge failed - file to merge not found");
+        }
+
     }
 }

From 8630acb41268c4783df2b5664a4b8a0045850f3f Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 14 Aug 2023 21:26:51 +1000
Subject: [PATCH 21/42] Block rev tracking

---
 app/Listeners/Payment/PaymentNotification.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Listeners/Payment/PaymentNotification.php b/app/Listeners/Payment/PaymentNotification.php
index 2c4607dfc994..f46c228b836e 100644
--- a/app/Listeners/Payment/PaymentNotification.php
+++ b/app/Listeners/Payment/PaymentNotification.php
@@ -166,8 +166,8 @@ class PaymentNotification implements ShouldQueue
         $product = $item;
         $gateway_reference = $client->gateway_tokens()->count() >= 1 ? ($client->gateway_tokens()->first()->gateway_customer_reference ?? '') : '';
 
-        LightLogs::create(new RevenueTrack($email, $account_key, 1, $amount, $product, $gateway_reference, $entity_number))
-                 ->batch();
+        // LightLogs::create(new RevenueTrack($email, $account_key, 1, $amount, $product, $gateway_reference, $entity_number))
+        //          ->batch();
 
     }
 

From 17e4e901bddcfa72cf81132857042089be38a6a7 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 15 Aug 2023 08:31:34 +1000
Subject: [PATCH 22/42] Improve return types for vendor settings

---
 app/Console/Commands/CheckData.php | 6 +++---
 app/Models/Company.php             | 1 +
 app/Models/Vendor.php              | 4 ++--
 config/beacon.php                  | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/Console/Commands/CheckData.php b/app/Console/Commands/CheckData.php
index 4f522262d093..8f49531ea467 100644
--- a/app/Console/Commands/CheckData.php
+++ b/app/Console/Commands/CheckData.php
@@ -471,7 +471,7 @@ class CheckData extends Command
             $ii->saveQuietly();
         });
 
-        collect([Invoice::class, Quote::class, Credit::class, PurchaseOrder::class])->each(function ($entity) {
+        collect([Invoice::class, Quote::class, Credit::class, PurchaseOrder::class, RecurringInvoice::class])->each(function ($entity) {
             if ($entity::doesntHave('invitations')->count() > 0) {
                 $entity::doesntHave('invitations')->cursor()->each(function ($entity) {
                     $client_vendor_key = 'client_id';
@@ -694,7 +694,7 @@ class CheckData extends Command
     {
         $this->wrong_balances = 0;
 
-        Client::cursor()->where('is_deleted', 0)->where('clients.updated_at', '>', now()->subDays(2))->each(function ($client) {
+        Client::query()->cursor()->where('is_deleted', 0)->where('clients.updated_at', '>', now()->subDays(2))->each(function ($client) {
             $client->invoices->where('is_deleted', false)->whereIn('status_id', '!=', Invoice::STATUS_DRAFT)->each(function ($invoice) use ($client) {
                 $total_paid = $invoice->payments()
                                     ->where('is_deleted', false)->whereIn('status_id', [Payment::STATUS_COMPLETED, Payment::STATUS_PENDING, Payment::STATUS_PARTIALLY_REFUNDED, Payment::STATUS_REFUNDED])
@@ -876,7 +876,7 @@ class CheckData extends Command
         $this->wrong_balances = 0;
         $this->wrong_paid_to_dates = 0;
 
-        foreach (Client::where('is_deleted', 0)->where('clients.updated_at', '>', now()->subDays(2))->cursor() as $client) {
+        foreach (Client::query()->where('is_deleted', 0)->where('clients.updated_at', '>', now()->subDays(2))->cursor() as $client) {
             $invoice_balance = $client->invoices()->where('is_deleted', false)->whereIn('status_id', [2,3])->sum('balance');
             $ledger = CompanyLedger::where('client_id', $client->id)->orderBy('id', 'DESC')->first();
 
diff --git a/app/Models/Company.php b/app/Models/Company.php
index 9b9f12c11858..644dcab807e1 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -707,6 +707,7 @@ class Company extends BaseModel
     
     public function getSetting($setting)
     {
+        //todo $this->setting ?? false
         if (property_exists($this->settings, $setting) != false) {
             return $this->settings->{$setting};
         }
diff --git a/app/Models/Vendor.php b/app/Models/Vendor.php
index a055ed7992b4..84dcd3f286a1 100644
--- a/app/Models/Vendor.php
+++ b/app/Models/Vendor.php
@@ -230,9 +230,9 @@ class Vendor extends BaseModel
      * Returns a vendor settings proxying company setting
      *
      * @param string $setting
-     * @return string
+     * @return mixed
      */
-    public function getSetting($setting): string
+    public function getSetting($setting): mixed
     {
         if ((property_exists($this->company->settings, $setting) != false) && (isset($this->company->settings->{$setting}) !== false)) {
             return $this->company->settings->{$setting};
diff --git a/config/beacon.php b/config/beacon.php
index 801fb16091e7..06006106b268 100644
--- a/config/beacon.php
+++ b/config/beacon.php
@@ -22,8 +22,8 @@ return [
      */
     'batch'     => true,
 
-    'cache_connection' => 'sentinel-cache',
-
+   // 'cache_connection' => 'sentinel-cache',
+    'cache_connection' => 'cache',
     /*
      * The default key used to store
      * metrics for batching

From c91e093a414861eed3a96d29fd0eb21310e914d8 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 15 Aug 2023 09:49:09 +1000
Subject: [PATCH 23/42] Fixes for static analysis

---
 app/Http/Controllers/InvoiceController.php | 86 +++++++---------------
 app/Jobs/Util/Import.php                   |  2 +-
 2 files changed, 26 insertions(+), 62 deletions(-)

diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index d52068faa310..f9977878988c 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -162,7 +162,9 @@ class InvoiceController extends BaseController
      */
     public function create(CreateInvoiceRequest $request)
     {
-        $invoice = InvoiceFactory::create(auth()->user()->company()->id, auth()->user()->id);
+        /** @var \App\Models\User $user */
+        $user = auth()->user();
+        $invoice = InvoiceFactory::create($user->company()->id, $user->id);
 
         return $this->itemResponse($invoice);
     }
@@ -211,7 +213,11 @@ class InvoiceController extends BaseController
      */
     public function store(StoreInvoiceRequest $request)
     {
-        $invoice = $this->invoice_repo->save($request->all(), InvoiceFactory::create(auth()->user()->company()->id, auth()->user()->id));
+        
+        /** @var \App\Models\User $user */
+        $user = auth()->user();
+
+        $invoice = $this->invoice_repo->save($request->all(), InvoiceFactory::create($user->company()->id, $user->id));
 
         $invoice = $invoice->service()
                            ->fillDefaults()
@@ -219,7 +225,7 @@ class InvoiceController extends BaseController
                            ->adjustInventory()
                            ->save();
 
-        event(new InvoiceWasCreated($invoice, $invoice->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
+        event(new InvoiceWasCreated($invoice, $invoice->company, Ninja::eventVars($user ? $user->id : null)));
 
         $transaction = [
             'invoice' => $invoice->transaction_event(),
@@ -473,62 +479,17 @@ class InvoiceController extends BaseController
         return $this->itemResponse($invoice->fresh());
     }
 
-    /**
-     * Perform bulk actions on the list view.
-     *
-     * @return \Illuminate\Support\Collection
-     *
-     * @OA\Post(
-     *      path="/api/v1/invoices/bulk",
-     *      operationId="bulkInvoices",
-     *      tags={"invoices"},
-     *      summary="Performs bulk actions on an array of invoices",
-     *      description="",
-     *      @OA\Parameter(ref="#/components/parameters/X-API-TOKEN"),
-     *      @OA\Parameter(ref="#/components/parameters/X-Requested-With"),
-     *      @OA\Parameter(ref="#/components/parameters/index"),
-     *      @OA\RequestBody(
-     *         description="User credentials",
-     *         required=true,
-     *         @OA\MediaType(
-     *             mediaType="application/json",
-     *             @OA\Schema(
-     *                 type="array",
-     *                 @OA\Items(
-     *                     type="integer",
-     *                     description="Array of hashed IDs to be bulk 'actioned",
-     *                     example="[0,1,2,3]",
-     *                 ),
-     *             )
-     *         )
-     *     ),
-     *      @OA\Response(
-     *          response=200,
-     *          description="The Bulk Action response",
-     *          @OA\Header(header="X-MINIMUM-CLIENT-VERSION", ref="#/components/headers/X-MINIMUM-CLIENT-VERSION"),
-     *          @OA\Header(header="X-RateLimit-Remaining", ref="#/components/headers/X-RateLimit-Remaining"),
-     *          @OA\Header(header="X-RateLimit-Limit", ref="#/components/headers/X-RateLimit-Limit"),
-     *       ),
-     *       @OA\Response(
-     *          response=422,
-     *          description="Validation error",
-     *          @OA\JsonContent(ref="#/components/schemas/ValidationError"),
-
-     *       ),
-     *       @OA\Response(
-     *           response="default",
-     *           description="Unexpected Error",
-     *           @OA\JsonContent(ref="#/components/schemas/Error"),
-     *       ),
-     *     )
-     */
     public function bulk(BulkInvoiceRequest $request)
     {
+        
+        /** @var \App\Models\User $user */
+        $user = auth()->user();
+
         $action = $request->input('action');
 
         $ids = $request->input('ids');
 
-        if (Ninja::isHosted() && (stripos($action, 'email') !== false) && !auth()->user()->company()->account->account_sms_verified) {
+        if (Ninja::isHosted() && (stripos($action, 'email') !== false) && !$user->company()->account->account_sms_verified) {
             return response(['message' => 'Please verify your account to send emails.'], 400);
         }
 
@@ -543,8 +504,8 @@ class InvoiceController extends BaseController
          */
 
         if ($action == 'bulk_download' && $invoices->count() > 1) {
-            $invoices->each(function ($invoice) {
-                if (auth()->user()->cannot('view', $invoice)) {
+            $invoices->each(function ($invoice) use($user) {
+                if ($user->cannot('view', $invoice)) {
                     nlog('access denied');
 
                     return response()->json(['message' => ctrans('text.access_denied')]);
@@ -556,7 +517,7 @@ class InvoiceController extends BaseController
             return response()->json(['message' => ctrans('texts.sent_message')], 200);
         }
 
-        if ($action == 'download' && $invoices->count() >=1 && auth()->user()->can('view', $invoices->first())) {
+        if ($action == 'download' && $invoices->count() >=1 && $user->can('view', $invoices->first())) {
             $file = $invoices->first()->service()->getInvoicePdf();
 
             return response()->streamDownload(function () use ($file) {
@@ -564,7 +525,7 @@ class InvoiceController extends BaseController
             }, basename($file), ['Content-Type' => 'application/pdf']);
         }
 
-        if ($action == 'bulk_print' && auth()->user()->can('view', $invoices->first())) {
+        if ($action == 'bulk_print' && $user->can('view', $invoices->first())) {
             $paths = $invoices->map(function ($invoice) {
                 return $invoice->service()->getInvoicePdf();
             });
@@ -579,15 +540,15 @@ class InvoiceController extends BaseController
         /*
          * Send the other actions to the switch
          */
-        $invoices->each(function ($invoice, $key) use ($action) {
-            if (auth()->user()->can('edit', $invoice)) {
+        $invoices->each(function ($invoice, $key) use ($action, $user) {
+            if ($user->can('edit', $invoice)) {
                 $this->performAction($invoice, $action, true);
             }
         });
 
         /* Need to understand which permission are required for the given bulk action ie. view / edit */
 
-        return $this->listResponse(Invoice::withTrashed()->whereIn('id', $this->transformKeys($ids))->company());
+        return $this->listResponse(Invoice::query()->withTrashed()->whereIn('id', $this->transformKeys($ids))->company());
     }
 
     /**
@@ -1022,7 +983,10 @@ class InvoiceController extends BaseController
 
     public function update_reminders(UpdateReminderRequest $request)
     {
-        UpdateReminders::dispatch(auth()->user()->company());
+        /** @var \App\Models\User $user */
+        $user = auth()->user();
+
+        UpdateReminders::dispatch($user->company());
 
         return response()->json(['message' => 'Updating reminders'], 200);
     }
diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php
index 175074cf221a..8a12e02e11d4 100644
--- a/app/Jobs/Util/Import.php
+++ b/app/Jobs/Util/Import.php
@@ -1821,7 +1821,7 @@ class Import implements ShouldQueue
 
     private function processActivities(array $data): void
     {
-        Activity::where('company_id', $this->company->id)->cursor()->each(function ($a){
+        Activity::query()->where('company_id', $this->company->id)->cursor()->each(function ($a){
             $a->forceDelete();
             nlog("deleting {$a->id}");
         });

From 16c907958315559c3a3c79ef540230a5f91426e5 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 15 Aug 2023 22:14:00 +1000
Subject: [PATCH 24/42] Add listener for Stripe Connect where users have not
 yet linked Stripe

---
 app/Events/Account/StripeConnectFailure.php   |  36 ++++++
 .../Account/StripeConnectFailureListener.php  |  57 +++++++++
 app/Mail/Ninja/StripeConnectFailed.php        | 114 ++++++++++++++++++
 app/Providers/EventServiceProvider.php        |   9 ++
 .../admin/stripe_connect_failed.blade.php     |  59 +++++++++
 .../stripe_connect_failed_text.blade.php      |   5 +
 6 files changed, 280 insertions(+)
 create mode 100644 app/Events/Account/StripeConnectFailure.php
 create mode 100644 app/Listeners/Account/StripeConnectFailureListener.php
 create mode 100644 app/Mail/Ninja/StripeConnectFailed.php
 create mode 100644 resources/views/email/admin/stripe_connect_failed.blade.php
 create mode 100644 resources/views/email/admin/stripe_connect_failed_text.blade.php

diff --git a/app/Events/Account/StripeConnectFailure.php b/app/Events/Account/StripeConnectFailure.php
new file mode 100644
index 000000000000..fd6f5a5d5738
--- /dev/null
+++ b/app/Events/Account/StripeConnectFailure.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Events\Account;
+
+use App\Models\Company;
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Broadcasting\InteractsWithSockets;
+
+/**
+ * Class StripeConnectFailure.
+ */
+class StripeConnectFailure
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    public function __construct(public Company $company, public string $db)
+    {
+    }
+
+    public function broadcastOn()
+    {
+        return [];
+    }
+}
diff --git a/app/Listeners/Account/StripeConnectFailureListener.php b/app/Listeners/Account/StripeConnectFailureListener.php
new file mode 100644
index 000000000000..12ff3f94b412
--- /dev/null
+++ b/app/Listeners/Account/StripeConnectFailureListener.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Listeners\Account;
+
+use App\Utils\Ninja;
+use App\Libraries\MultiDB;
+use App\Jobs\Mail\NinjaMailerJob;
+use App\Jobs\Mail\NinjaMailerObject;
+use Illuminate\Support\Facades\Cache;
+use App\Mail\Ninja\StripeConnectFailed;
+use Illuminate\Contracts\Queue\ShouldQueue;
+
+class StripeConnectFailureListener implements ShouldQueue
+{
+    /**
+     * Create the event listener.
+     *
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param  object  $event
+     * @return void
+     */
+    public function handle($event)
+    {
+        MultiDB::setDb($event->db);
+
+        if (Ninja::isHosted() && is_null(Cache::get("stripe_connect_notification:{$event->company->company_key}"))) 
+        {
+
+            $nmo = new NinjaMailerObject();
+            $nmo->mailable = new StripeConnectFailed($event->company->owner(), $event->company);
+            $nmo->company = $event->company;
+            $nmo->settings = $event->company->settings;
+            $nmo->to_user = $event->company->owner();
+
+            NinjaMailerJob::dispatch($nmo, true);
+
+            Cache::put("stripe_connect_notification:{$event->company->company_key}", true, 60 * 60 * 24);
+
+        }
+    }
+}
diff --git a/app/Mail/Ninja/StripeConnectFailed.php b/app/Mail/Ninja/StripeConnectFailed.php
new file mode 100644
index 000000000000..4c935cdf291f
--- /dev/null
+++ b/app/Mail/Ninja/StripeConnectFailed.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Mail\Ninja;
+
+use App\Models\User;
+use App\Models\Company;
+use Illuminate\Mail\Mailable;
+use Illuminate\Mail\Mailables\Content;
+use Illuminate\Mail\Mailables\Headers;
+use Illuminate\Mail\Mailables\Envelope;
+
+class StripeConnectFailed extends Mailable
+{
+
+    /**
+     * Create a new message instance.
+     *
+     * @return void
+     */
+    public function __construct(public User $user, public Company $company)
+    {
+    }
+
+    /**
+     * Get the message envelope.
+     *
+     * @return \Illuminate\Mail\Mailables\Envelope
+     */
+    public function envelope()
+    {
+        return new Envelope(
+            subject: "Stripe Connect not configured, please login and connect.",
+            from: "maildelivery@invoicing.co",
+            to: $this->user->email,
+        );
+    }
+
+    /**
+     * Get the message content definition.
+     *
+     * @return \Illuminate\Mail\Mailables\Content
+     */
+    public function content()
+    {
+        
+        return new Content(
+            view: 'email.admin.stripe_connect_failed',
+            text: 'email.admin.stripe_connect_failed_text',
+            with: [
+                'text_body' => $this->textBody(), //@todo this is a bit hacky here.
+                'body' => $this->htmlBody(),
+                'title' => 'Connect your Stripe account',
+                'settings' => $this->company->settings,
+                'logo' => $this->company->present()->logo(),
+                'signature' => '',
+                'company' => $this->company,
+                'greeting' => '',
+                'links' => [],
+                'url' => 'https://www.loom.com/share/a3dc3131cc924e14a34634d5d48065c8?sid=b1971aa2-9deb-4339-8ebd-53f9947ef633',
+                'button' => "texts.view"
+            ]
+        );
+    }
+
+    private function textBody()
+    {
+        return "
+        We note you are yet to connect your Stripe account to Invoice Ninja. Please log in to Invoice Ninja and connect your Stripe account.\n\n
+        Once logged in you can use the following resource to connect your Stripe account: \n\n
+        ";
+    }
+
+    private function htmlBody()
+    {
+        return "
+        We note you are yet to connect your Stripe account to Invoice Ninja. Please log in to Invoice Ninja and connect your Stripe account.<br><br>
+
+        Once logged in you can use the following resource to connect your Stripe account: <br><br>
+
+        ";
+    }
+    /**
+     * Get the attachments for the message.
+     *
+     * @return array
+     */
+    public function attachments()
+    {
+        return [];
+    }
+ 
+    /**
+     * Get the message headers.
+     *
+     * @return \Illuminate\Mail\Mailables\Headers
+     */
+    public function headers()
+    {
+        return new Headers(
+            messageId: null,
+            references: [],
+            text:['' => ''],
+        );
+    }
+}
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index d83f5602c8f3..028eeb4dffc7 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -94,6 +94,7 @@ use App\Events\Misc\InvitationWasViewed;
 use App\Events\Payment\PaymentWasVoided;
 use App\Events\Vendor\VendorWasArchived;
 use App\Events\Vendor\VendorWasRestored;
+use App\Events\Account\StripeConnectFailure;
 use App\Listeners\Mail\MailSentListener;
 use App\Observers\ClientContactObserver;
 use App\Observers\PurchaseOrderObserver;
@@ -198,6 +199,8 @@ use App\Listeners\Invoice\InvoiceRestoredActivity;
 use App\Listeners\Invoice\InvoiceReversedActivity;
 use App\Listeners\Payment\PaymentRestoredActivity;
 use App\Listeners\Quote\QuoteApprovedNotification;
+use SocialiteProviders\Apple\AppleExtendSocialite;
+use SocialiteProviders\Manager\SocialiteWasCalled;
 use App\Events\Subscription\SubscriptionWasCreated;
 use App\Events\Subscription\SubscriptionWasDeleted;
 use App\Events\Subscription\SubscriptionWasUpdated;
@@ -221,10 +224,12 @@ use App\Listeners\Invoice\InvoiceEmailFailedActivity;
 use App\Events\PurchaseOrder\PurchaseOrderWasAccepted;
 use App\Events\PurchaseOrder\PurchaseOrderWasArchived;
 use App\Events\PurchaseOrder\PurchaseOrderWasRestored;
+use App\Listeners\Payment\PaymentEmailFailureActivity;
 use App\Listeners\Vendor\UpdateVendorContactLastLogin;
 use App\Events\RecurringQuote\RecurringQuoteWasCreated;
 use App\Events\RecurringQuote\RecurringQuoteWasDeleted;
 use App\Events\RecurringQuote\RecurringQuoteWasUpdated;
+use App\Listeners\Account\StripeConnectFailureListener;
 use App\Listeners\Activity\CreatedSubscriptionActivity;
 use App\Listeners\Activity\SubscriptionDeletedActivity;
 use App\Listeners\Activity\SubscriptionUpdatedActivity;
@@ -234,6 +239,7 @@ use App\Events\RecurringQuote\RecurringQuoteWasRestored;
 use App\Listeners\Activity\SubscriptionArchivedActivity;
 use App\Listeners\Activity\SubscriptionRestoredActivity;
 use App\Listeners\Invoice\InvoiceFailedEmailNotification;
+use SocialiteProviders\Microsoft\MicrosoftExtendSocialite;
 use App\Events\RecurringExpense\RecurringExpenseWasCreated;
 use App\Events\RecurringExpense\RecurringExpenseWasDeleted;
 use App\Events\RecurringExpense\RecurringExpenseWasUpdated;
@@ -587,6 +593,9 @@ class EventServiceProvider extends ServiceProvider
         TaskWasRestored::class => [
             TaskRestoredActivity::class,
         ],
+        StripeConnectFailure::class => [
+            StripeConnectFailureListener::class,
+        ],
         SubscriptionWasCreated::class => [
             CreatedSubscriptionActivity::class,
         ],
diff --git a/resources/views/email/admin/stripe_connect_failed.blade.php b/resources/views/email/admin/stripe_connect_failed.blade.php
new file mode 100644
index 000000000000..aba251b4892f
--- /dev/null
+++ b/resources/views/email/admin/stripe_connect_failed.blade.php
@@ -0,0 +1,59 @@
+@component('email.template.admin', ['design' => 'light', 'settings' => $settings, 'logo' => $logo])
+    <div class="center">
+        @isset($greeting)
+            <p>{{ $greeting }}</p>
+        @endisset
+
+        @isset($title)
+            <h1>{{ $title }}</h1>
+        @endisset
+
+        @isset($h2)
+            <h2>{{ $title }}</h2>
+        @endisset
+
+        <div style="margin-top: 10px; margin-bottom: 30px;">
+            @isset($body)
+                {!! $body !!}
+            @endisset
+
+            @isset($slot)
+                {{ $slot }}
+            @endisset
+        </div>
+
+        @isset($additional_info)
+            <p>{{ $additional_info }}</p>
+        @endisset
+
+        @isset($url)
+
+        <!--[if (gte mso 9)|(IE)]>
+        <table align="center" cellspacing="0" cellpadding="0" style="width: 600px;">
+            <tr>
+            <td align="center" valign="top">
+                <![endif]-->        
+                <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" >
+                <tbody><tr>
+                <td align="center" class="new_button" style="border-radius: 2px; background-color: {{ $settings->primary_color }} ;">
+                    <a href="{{ $url }}" target="_blank" class="new_button" style="text-decoration: none; border: 1px solid {{ $settings->primary_color }}; display: inline-block; border-radius: 2px; padding-top: 15px; padding-bottom: 15px; padding-left: 25px; padding-right: 25px; font-size: 20px; color: #fff">
+                    <singleline label="cta button">{{ ctrans($button) }}</singleline>
+                    </a>
+                </td>
+                </tr>
+                </tbody>
+                </table>
+        <!--[if (gte mso 9)|(IE)]>
+            </td>
+            </tr>
+        </table>
+        <![endif]-->
+
+
+        @endisset
+
+        @isset($signature)
+            <p>{!! nl2br($signature) !!}</p>
+        @endisset
+    </div>
+@endcomponent
diff --git a/resources/views/email/admin/stripe_connect_failed_text.blade.php b/resources/views/email/admin/stripe_connect_failed_text.blade.php
new file mode 100644
index 000000000000..319daf0679d0
--- /dev/null
+++ b/resources/views/email/admin/stripe_connect_failed_text.blade.php
@@ -0,0 +1,5 @@
+{!! $title !!}
+
+{!! $text_body !!}
+
+{!! $url !!}
\ No newline at end of file

From d2fbf34bebcb14fd26f2dbe328f091642e0fabfc Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 15 Aug 2023 22:47:54 +1000
Subject: [PATCH 25/42] Fixes for static analysis

---
 app/Models/PaymentHash.php                         | 2 +-
 app/PaymentDrivers/CheckoutCom/CheckoutWebhook.php | 4 ++--
 config/beacon.php                                  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Models/PaymentHash.php b/app/Models/PaymentHash.php
index 9905feddab65..233cb2d36731 100644
--- a/app/Models/PaymentHash.php
+++ b/app/Models/PaymentHash.php
@@ -40,7 +40,7 @@ class PaymentHash extends Model
 
 
     /**
-     * @return array
+     * @return mixed
      */
     public function invoices()
     {
diff --git a/app/PaymentDrivers/CheckoutCom/CheckoutWebhook.php b/app/PaymentDrivers/CheckoutCom/CheckoutWebhook.php
index fcac5acdc3ac..5b9b51599982 100644
--- a/app/PaymentDrivers/CheckoutCom/CheckoutWebhook.php
+++ b/app/PaymentDrivers/CheckoutCom/CheckoutWebhook.php
@@ -69,7 +69,7 @@ class CheckoutWebhook implements ShouldQueue
     {
         $payment_object = $this->webhook_array['data'];
 
-        $payment = Payment::withTrashed()->where('transaction_reference', $payment_object['id'])->first();
+        $payment = Payment::query()->withTrashed()->where('transaction_reference', $payment_object['id'])->first();
 
         if($payment && $payment->status_id == Payment::STATUS_COMPLETED)
             return;
@@ -84,7 +84,7 @@ class CheckoutWebhook implements ShouldQueue
             
             $metadata = $this->webhook_array['metadata'];
             
-            $payment_hash = PaymentHash::where('hash', $metadata['udf2'])->first();
+            $payment_hash = PaymentHash::query()->where('hash', $metadata['udf2'])->first();
 
             $driver = $this->company_gateway->driver($payment_hash->fee_invoice->client)->init()->setPaymentMethod();
 
diff --git a/config/beacon.php b/config/beacon.php
index 06006106b268..8fff666a8173 100644
--- a/config/beacon.php
+++ b/config/beacon.php
@@ -22,8 +22,8 @@ return [
      */
     'batch'     => true,
 
-   // 'cache_connection' => 'sentinel-cache',
-    'cache_connection' => 'cache',
+   'cache_connection' => 'sentinel-cache',
+    // 'cache_connection' => 'cache',
     /*
      * The default key used to store
      * metrics for batching

From eec0920d1d076e5b192b1692b29842510e1b3fd9 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 15 Aug 2023 22:50:47 +1000
Subject: [PATCH 26/42] Allow xml files to be uploads

---
 app/Http/Requests/Invoice/UploadInvoiceRequest.php | 4 +++-
 app/Http/Requests/Request.php                      | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Http/Requests/Invoice/UploadInvoiceRequest.php b/app/Http/Requests/Invoice/UploadInvoiceRequest.php
index 070fb4443d1b..17af8468e9b3 100644
--- a/app/Http/Requests/Invoice/UploadInvoiceRequest.php
+++ b/app/Http/Requests/Invoice/UploadInvoiceRequest.php
@@ -23,7 +23,9 @@ class UploadInvoiceRequest extends Request
      */
     public function authorize() : bool
     {
-        return auth()->user()->can('edit', $this->invoice);
+        /** @var \App\Models\User $user */
+        $user = auth()->user();
+        return $user->can('edit', $this->invoice);
     }
 
     public function rules()
diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php
index 789d723938c7..5d8577efa189 100644
--- a/app/Http/Requests/Request.php
+++ b/app/Http/Requests/Request.php
@@ -20,7 +20,7 @@ class Request extends FormRequest
     use MakesHash;
     use RuntimeFormRequest;
 
-    protected $file_validation = 'sometimes|file|mimes:png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx,webp|max:20000';
+    protected $file_validation = 'sometimes|file|mimes:png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx,webp,xml|max:20000';
     /**
      * Get the validation rules that apply to the request.
      *

From f3b1e9387372684031e5fc909c467aa742e5a7e5 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 16 Aug 2023 00:23:18 +1000
Subject: [PATCH 27/42] Set public/private for documents

---
 app/Http/Controllers/InvoiceController.php       |  5 +++--
 .../Requests/Invoice/UploadInvoiceRequest.php    |  2 ++
 app/Jobs/Util/UploadFile.php                     |  2 +-
 app/Models/PaymentHash.php                       | 16 +++++++++++-----
 .../CheckoutCom/CheckoutWebhook.php              |  9 +++++----
 app/PaymentDrivers/CheckoutCom/Webhook.php       |  2 --
 6 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index f9977878988c..ec86da941082 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -966,16 +966,17 @@ class InvoiceController extends BaseController
      */
     public function upload(UploadInvoiceRequest $request, Invoice $invoice)
     {
+
         if (! $this->checkFeature(Account::FEATURE_DOCUMENTS)) {
             return $this->featureFailure();
         }
 
         if ($request->has('documents')) {
-            $this->saveDocuments($request->file('documents'), $invoice);
+            $this->saveDocuments($request->file('documents'), $invoice, $request->input('is_public', true));
         }
 
         if ($request->has('file')) {
-            $this->saveDocuments($request->file('documents'), $invoice);
+            $this->saveDocuments($request->file('documents'), $invoice, $request->input('is_public', true));
         }
 
         return $this->itemResponse($invoice->fresh());
diff --git a/app/Http/Requests/Invoice/UploadInvoiceRequest.php b/app/Http/Requests/Invoice/UploadInvoiceRequest.php
index 17af8468e9b3..8339f64aa393 100644
--- a/app/Http/Requests/Invoice/UploadInvoiceRequest.php
+++ b/app/Http/Requests/Invoice/UploadInvoiceRequest.php
@@ -44,6 +44,8 @@ class UploadInvoiceRequest extends Request
             $rules['file'] = $this->file_validation;
         }
 
+        $rules['is_public'] = 'sometimes|boolean';
+        
         return $rules;
     }
 
diff --git a/app/Jobs/Util/UploadFile.php b/app/Jobs/Util/UploadFile.php
index 43417f3529a1..33aeef21c0b3 100644
--- a/app/Jobs/Util/UploadFile.php
+++ b/app/Jobs/Util/UploadFile.php
@@ -53,7 +53,7 @@ class UploadFile implements ShouldQueue
 
     public $disk;
     
-    public function __construct($file, $type, $user, $company, $entity, $disk = null, $is_public = false)
+    public function __construct($file, $type, $user, $company, $entity, $disk = null, $is_public = true)
     {
         $this->file = $file;
         $this->type = $type;
diff --git a/app/Models/PaymentHash.php b/app/Models/PaymentHash.php
index 233cb2d36731..daf6b6197d9f 100644
--- a/app/Models/PaymentHash.php
+++ b/app/Models/PaymentHash.php
@@ -20,7 +20,7 @@ use Illuminate\Database\Eloquent\Model;
  * @property string $hash
  * @property float $fee_total
  * @property int|null $fee_invoice_id
- * @property mixed $data
+ * @property \stdClass $data
  * @property int|null $payment_id
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
@@ -38,6 +38,13 @@ class PaymentHash extends Model
         'data' => 'object',
     ];
 
+        /**
+        * @class \App\Models\PaymentHash $this
+        * @property \App\Models\PaymentHash $data
+        * @class \stdClass $data
+        * @property string $raw_value
+        */
+
 
     /**
      * @return mixed
@@ -75,9 +82,8 @@ class PaymentHash extends Model
 
     public function withData(string $property, $value): self
     {
-        $this->data = array_merge((array) $this->data, [$property => $value]);
-        $this->save();
-
-        return $this;
+        $this->data = array_merge((array) $this->data, [$property => $value]); // @phpstan-ignore-line
+        $this->save();// @phpstan-ignore-line
+        return $this; // @phpstan-ignore-line
     }
 }
diff --git a/app/PaymentDrivers/CheckoutCom/CheckoutWebhook.php b/app/PaymentDrivers/CheckoutCom/CheckoutWebhook.php
index 5b9b51599982..c7c1069c63ff 100644
--- a/app/PaymentDrivers/CheckoutCom/CheckoutWebhook.php
+++ b/app/PaymentDrivers/CheckoutCom/CheckoutWebhook.php
@@ -88,14 +88,15 @@ class CheckoutWebhook implements ShouldQueue
 
             $driver = $this->company_gateway->driver($payment_hash->fee_invoice->client)->init()->setPaymentMethod();
 
-            $payment_hash->data = array_merge((array) $payment_hash->data, $this->webhook_array);
-            $payment_hash->save();
-            $driver->setPaymentHash($payment_hash);
+            $payment_hash->data = array_merge((array) $payment_hash->data, $this->webhook_array); // @phpstan-ignore-line
+            $payment_hash->save(); 
+            $driver->setPaymentHash($payment_hash); 
 
+            // @phpstan-ignore-line
             $data = [
                 'payment_method' => isset($this->webhook_array['source']['id']) ? $this->webhook_array['source']['id'] : '',
                 'payment_type' => PaymentType::CREDIT_CARD_OTHER,
-                'amount' => $payment_hash->data->raw_value,
+                'amount' => $payment_hash->data->raw_value, // @phpstan-ignore-line
                 'transaction_reference' => $payment_object['id'],
                 'gateway_type_id' => GatewayType::CREDIT_CARD,
             ];
diff --git a/app/PaymentDrivers/CheckoutCom/Webhook.php b/app/PaymentDrivers/CheckoutCom/Webhook.php
index 187d2dad2220..8fc5744762b7 100644
--- a/app/PaymentDrivers/CheckoutCom/Webhook.php
+++ b/app/PaymentDrivers/CheckoutCom/Webhook.php
@@ -66,8 +66,6 @@ class Webhook
 
     /**
      * Lists the workflows in Checkout
-     *
-     * @return void
      */
     public function getWorkFlows()
     {

From 71b1428994001fc0bd0bfb464ad298064e105353 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 16 Aug 2023 09:37:11 +1000
Subject: [PATCH 28/42] Minor fixes

---
 app/DataMapper/Analytics/RevenueTrack.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/DataMapper/Analytics/RevenueTrack.php b/app/DataMapper/Analytics/RevenueTrack.php
index 75af0ded48fa..0e790c63b4b5 100644
--- a/app/DataMapper/Analytics/RevenueTrack.php
+++ b/app/DataMapper/Analytics/RevenueTrack.php
@@ -70,6 +70,8 @@ class RevenueTrack extends GenericMixedMetric
 
     public $string_metric9 = 'entity_reference';
 
+    public $string_metric10 = 'gateway_type';
+
     /**
      * The counter
      * set to 1.
@@ -85,7 +87,7 @@ class RevenueTrack extends GenericMixedMetric
      */
     public $double_metric2 = 0;
 
-    public function __construct($string_metric5, $string_metric6, $int_metric1, $double_metric2, $string_metric7, $string_metric8, $string_metric9)
+    public function __construct($string_metric5, $string_metric6, $int_metric1, $double_metric2, $string_metric7, $string_metric8, $string_metric9, $string_metric10)
     {
         $this->int_metric1 = $int_metric1;
         $this->double_metric2 = $double_metric2;
@@ -94,5 +96,6 @@ class RevenueTrack extends GenericMixedMetric
         $this->string_metric7 = $string_metric7;
         $this->string_metric8 = $string_metric8;
         $this->string_metric9 = $string_metric9;
+        $this->string_metric10 = $string_metric10;
     }
 }

From 3366db305a71dc1f1161977c081af199c7364c11 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 16 Aug 2023 09:45:08 +1000
Subject: [PATCH 29/42] Disable quantity in previews for mobile

---
 app/Http/Livewire/PdfSlot.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Http/Livewire/PdfSlot.php b/app/Http/Livewire/PdfSlot.php
index 8c8770eb1205..43cc14c1a1d6 100644
--- a/app/Http/Livewire/PdfSlot.php
+++ b/app/Http/Livewire/PdfSlot.php
@@ -106,6 +106,7 @@ class PdfSlot extends Component
 
         $this->show_cost = in_array('$product.unit_cost', $this->settings->pdf_variables->product_columns);
         $this->show_line_total = in_array('$product.line_total', $this->settings->pdf_variables->product_columns);
+        $this->show_quantity = in_array('$product.quantity', $this->settings->pdf_variables->product_columns);
 
         if($this->entity_type == 'quote' && !$this->settings->sync_invoice_quote_columns ){
             $this->show_cost = in_array('$product.unit_cost', $this->settings->pdf_variables->product_quote_columns);

From ed32d4441538e1d025a232033f74049b214508b6 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 16 Aug 2023 14:52:43 +1000
Subject: [PATCH 30/42] Updated lock

---
 composer.lock | 743 +++++++++++++++++++++++++-------------------------
 1 file changed, 374 insertions(+), 369 deletions(-)

diff --git a/composer.lock b/composer.lock
index 6bf16dd7b2c8..3d3cb2598a93 100644
--- a/composer.lock
+++ b/composer.lock
@@ -370,16 +370,16 @@
         },
         {
             "name": "aws/aws-crt-php",
-            "version": "v1.2.1",
+            "version": "v1.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/awslabs/aws-crt-php.git",
-                "reference": "1926277fc71d253dfa820271ac5987bdb193ccf5"
+                "reference": "2f1dc7b7eda080498be96a4a6d683a41583030e9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/1926277fc71d253dfa820271ac5987bdb193ccf5",
-                "reference": "1926277fc71d253dfa820271ac5987bdb193ccf5",
+                "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/2f1dc7b7eda080498be96a4a6d683a41583030e9",
+                "reference": "2f1dc7b7eda080498be96a4a6d683a41583030e9",
                 "shasum": ""
             },
             "require": {
@@ -418,22 +418,22 @@
             ],
             "support": {
                 "issues": "https://github.com/awslabs/aws-crt-php/issues",
-                "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.1"
+                "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.2"
             },
-            "time": "2023-03-24T20:22:19+00:00"
+            "time": "2023-07-20T16:49:55+00:00"
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.276.2",
+            "version": "3.278.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "78c9510280512121e8fdaa9538b744778ab48bf9"
+                "reference": "596534c0627d8b38597061341e99b460437d1a16"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/78c9510280512121e8fdaa9538b744778ab48bf9",
-                "reference": "78c9510280512121e8fdaa9538b744778ab48bf9",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/596534c0627d8b38597061341e99b460437d1a16",
+                "reference": "596534c0627d8b38597061341e99b460437d1a16",
                 "shasum": ""
             },
             "require": {
@@ -513,9 +513,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.276.2"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.278.3"
             },
-            "time": "2023-07-20T18:16:37+00:00"
+            "time": "2023-08-15T18:07:55+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -1351,16 +1351,16 @@
         },
         {
             "name": "doctrine/dbal",
-            "version": "3.6.4",
+            "version": "3.6.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "19f0dec95edd6a3c3c5ff1d188ea94c6b7fc903f"
+                "reference": "96d5a70fd91efdcec81fc46316efc5bf3da17ddf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/19f0dec95edd6a3c3c5ff1d188ea94c6b7fc903f",
-                "reference": "19f0dec95edd6a3c3c5ff1d188ea94c6b7fc903f",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/96d5a70fd91efdcec81fc46316efc5bf3da17ddf",
+                "reference": "96d5a70fd91efdcec81fc46316efc5bf3da17ddf",
                 "shasum": ""
             },
             "require": {
@@ -1375,10 +1375,10 @@
             "require-dev": {
                 "doctrine/coding-standard": "12.0.0",
                 "fig/log-test": "^1",
-                "jetbrains/phpstorm-stubs": "2022.3",
-                "phpstan/phpstan": "1.10.14",
+                "jetbrains/phpstorm-stubs": "2023.1",
+                "phpstan/phpstan": "1.10.21",
                 "phpstan/phpstan-strict-rules": "^1.5",
-                "phpunit/phpunit": "9.6.7",
+                "phpunit/phpunit": "9.6.9",
                 "psalm/plugin-phpunit": "0.18.4",
                 "squizlabs/php_codesniffer": "3.7.2",
                 "symfony/cache": "^5.4|^6.0",
@@ -1443,7 +1443,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/dbal/issues",
-                "source": "https://github.com/doctrine/dbal/tree/3.6.4"
+                "source": "https://github.com/doctrine/dbal/tree/3.6.5"
             },
             "funding": [
                 {
@@ -1459,7 +1459,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-06-15T07:40:12+00:00"
+            "time": "2023-07-17T09:15:50+00:00"
         },
         {
             "name": "doctrine/deprecations",
@@ -1762,28 +1762,27 @@
         },
         {
             "name": "doctrine/lexer",
-            "version": "2.1.0",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/lexer.git",
-                "reference": "39ab8fcf5a51ce4b85ca97c7a7d033eb12831124"
+                "reference": "84a527db05647743d50373e0ec53a152f2cde568"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/39ab8fcf5a51ce4b85ca97c7a7d033eb12831124",
-                "reference": "39ab8fcf5a51ce4b85ca97c7a7d033eb12831124",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/84a527db05647743d50373e0ec53a152f2cde568",
+                "reference": "84a527db05647743d50373e0ec53a152f2cde568",
                 "shasum": ""
             },
             "require": {
-                "doctrine/deprecations": "^1.0",
-                "php": "^7.1 || ^8.0"
+                "php": "^8.1"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^9 || ^10",
-                "phpstan/phpstan": "^1.3",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "doctrine/coding-standard": "^10",
+                "phpstan/phpstan": "^1.9",
+                "phpunit/phpunit": "^9.5",
                 "psalm/plugin-phpunit": "^0.18.3",
-                "vimeo/psalm": "^4.11 || ^5.0"
+                "vimeo/psalm": "^5.0"
             },
             "type": "library",
             "autoload": {
@@ -1820,7 +1819,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/lexer/issues",
-                "source": "https://github.com/doctrine/lexer/tree/2.1.0"
+                "source": "https://github.com/doctrine/lexer/tree/3.0.0"
             },
             "funding": [
                 {
@@ -1836,20 +1835,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-12-14T08:49:07+00:00"
+            "time": "2022-12-15T16:57:16+00:00"
         },
         {
             "name": "dragonmantank/cron-expression",
-            "version": "v3.3.2",
+            "version": "v3.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dragonmantank/cron-expression.git",
-                "reference": "782ca5968ab8b954773518e9e49a6f892a34b2a8"
+                "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/782ca5968ab8b954773518e9e49a6f892a34b2a8",
-                "reference": "782ca5968ab8b954773518e9e49a6f892a34b2a8",
+                "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/adfb1f505deb6384dc8b39804c5065dd3c8c8c0a",
+                "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a",
                 "shasum": ""
             },
             "require": {
@@ -1889,7 +1888,7 @@
             ],
             "support": {
                 "issues": "https://github.com/dragonmantank/cron-expression/issues",
-                "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.2"
+                "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.3"
             },
             "funding": [
                 {
@@ -1897,7 +1896,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-09-10T18:51:20+00:00"
+            "time": "2023-08-10T19:36:49+00:00"
         },
         {
             "name": "egulias/email-validator",
@@ -2485,16 +2484,16 @@
         },
         {
             "name": "google/apiclient-services",
-            "version": "v0.309.0",
+            "version": "v0.312.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/googleapis/google-api-php-client-services.git",
-                "reference": "562f8e5ddbca68d52afc3bf47d03839e78722026"
+                "reference": "45d47fed73b28254c511882bc743b1690a99558d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/562f8e5ddbca68d52afc3bf47d03839e78722026",
-                "reference": "562f8e5ddbca68d52afc3bf47d03839e78722026",
+                "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/45d47fed73b28254c511882bc743b1690a99558d",
+                "reference": "45d47fed73b28254c511882bc743b1690a99558d",
                 "shasum": ""
             },
             "require": {
@@ -2523,9 +2522,9 @@
             ],
             "support": {
                 "issues": "https://github.com/googleapis/google-api-php-client-services/issues",
-                "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.309.0"
+                "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.312.0"
             },
-            "time": "2023-07-16T01:08:14+00:00"
+            "time": "2023-08-14T00:56:12+00:00"
         },
         {
             "name": "google/auth",
@@ -2912,16 +2911,16 @@
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "2.5.0",
+            "version": "2.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "b635f279edd83fc275f822a1188157ffea568ff6"
+                "reference": "8bd7c33a0734ae1c5d074360512beb716bef3f77"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/b635f279edd83fc275f822a1188157ffea568ff6",
-                "reference": "b635f279edd83fc275f822a1188157ffea568ff6",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/8bd7c33a0734ae1c5d074360512beb716bef3f77",
+                "reference": "8bd7c33a0734ae1c5d074360512beb716bef3f77",
                 "shasum": ""
             },
             "require": {
@@ -3008,7 +3007,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.5.0"
+                "source": "https://github.com/guzzle/psr7/tree/2.6.0"
             },
             "funding": [
                 {
@@ -3024,7 +3023,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-04-17T16:11:26+00:00"
+            "time": "2023-08-03T15:06:02+00:00"
         },
         {
             "name": "guzzlehttp/uri-template",
@@ -3926,22 +3925,22 @@
         },
         {
             "name": "jms/serializer",
-            "version": "3.26.0",
+            "version": "3.27.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/schmittjoh/serializer.git",
-                "reference": "926a7d57438fa1ff4ab794551c5ae26e68536853"
+                "reference": "e8c812460d7b47b15bc0ccd78901276bd44ad452"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/926a7d57438fa1ff4ab794551c5ae26e68536853",
-                "reference": "926a7d57438fa1ff4ab794551c5ae26e68536853",
+                "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/e8c812460d7b47b15bc0ccd78901276bd44ad452",
+                "reference": "e8c812460d7b47b15bc0ccd78901276bd44ad452",
                 "shasum": ""
             },
             "require": {
                 "doctrine/annotations": "^1.13 || ^2.0",
                 "doctrine/instantiator": "^1.0.3 || ^2.0",
-                "doctrine/lexer": "^2",
+                "doctrine/lexer": "^2.0 || ^3.0",
                 "jms/metadata": "^2.6",
                 "php": "^7.2||^8.0",
                 "phpstan/phpdoc-parser": "^0.4 || ^0.5 || ^1.0"
@@ -4010,7 +4009,7 @@
             ],
             "support": {
                 "issues": "https://github.com/schmittjoh/serializer/issues",
-                "source": "https://github.com/schmittjoh/serializer/tree/3.26.0"
+                "source": "https://github.com/schmittjoh/serializer/tree/3.27.0"
             },
             "funding": [
                 {
@@ -4018,20 +4017,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-06-24T19:25:58+00:00"
+            "time": "2023-07-29T22:33:44+00:00"
         },
         {
             "name": "josemmo/facturae-php",
-            "version": "v1.7.7",
+            "version": "v1.7.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/josemmo/Facturae-PHP.git",
-                "reference": "00c093bb4a618dca4f195d8d84120b2c762801b4"
+                "reference": "3c490fa60e668a6275ba2fb6c228f1e19216d02e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/josemmo/Facturae-PHP/zipball/00c093bb4a618dca4f195d8d84120b2c762801b4",
-                "reference": "00c093bb4a618dca4f195d8d84120b2c762801b4",
+                "url": "https://api.github.com/repos/josemmo/Facturae-PHP/zipball/3c490fa60e668a6275ba2fb6c228f1e19216d02e",
+                "reference": "3c490fa60e668a6275ba2fb6c228f1e19216d02e",
                 "shasum": ""
             },
             "require": {
@@ -4073,9 +4072,9 @@
             ],
             "support": {
                 "issues": "https://github.com/josemmo/Facturae-PHP/issues",
-                "source": "https://github.com/josemmo/Facturae-PHP/tree/v1.7.7"
+                "source": "https://github.com/josemmo/Facturae-PHP/tree/v1.7.8"
             },
-            "time": "2023-07-02T08:07:03+00:00"
+            "time": "2023-08-06T15:34:37+00:00"
         },
         {
             "name": "khanamiryan/qrcode-detector-decoder",
@@ -4235,16 +4234,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v9.52.10",
+            "version": "v9.52.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "858add225ce88a76c43aec0e7866288321ee0ee9"
+                "reference": "e3350e87a52346af9cc655a3012d2175d2d05ad7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/858add225ce88a76c43aec0e7866288321ee0ee9",
-                "reference": "858add225ce88a76c43aec0e7866288321ee0ee9",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/e3350e87a52346af9cc655a3012d2175d2d05ad7",
+                "reference": "e3350e87a52346af9cc655a3012d2175d2d05ad7",
                 "shasum": ""
             },
             "require": {
@@ -4429,20 +4428,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2023-06-27T13:25:54+00:00"
+            "time": "2023-08-08T14:28:40+00:00"
         },
         {
             "name": "laravel/serializable-closure",
-            "version": "v1.3.0",
+            "version": "v1.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/serializable-closure.git",
-                "reference": "f23fe9d4e95255dacee1bf3525e0810d1a1b0f37"
+                "reference": "e5a3057a5591e1cfe8183034b0203921abe2c902"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/f23fe9d4e95255dacee1bf3525e0810d1a1b0f37",
-                "reference": "f23fe9d4e95255dacee1bf3525e0810d1a1b0f37",
+                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/e5a3057a5591e1cfe8183034b0203921abe2c902",
+                "reference": "e5a3057a5591e1cfe8183034b0203921abe2c902",
                 "shasum": ""
             },
             "require": {
@@ -4489,7 +4488,7 @@
                 "issues": "https://github.com/laravel/serializable-closure/issues",
                 "source": "https://github.com/laravel/serializable-closure"
             },
-            "time": "2023-01-30T18:31:20+00:00"
+            "time": "2023-07-14T13:56:28+00:00"
         },
         {
             "name": "laravel/slack-notification-channel",
@@ -5079,16 +5078,16 @@
         },
         {
             "name": "league/csv",
-            "version": "9.9.0",
+            "version": "9.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/csv.git",
-                "reference": "b4418ede47fbd88facc34e40a16c8ce9153b961b"
+                "reference": "d24b0d484812313b07ab74b0fe4db9661606df6c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/csv/zipball/b4418ede47fbd88facc34e40a16c8ce9153b961b",
-                "reference": "b4418ede47fbd88facc34e40a16c8ce9153b961b",
+                "url": "https://api.github.com/repos/thephpleague/csv/zipball/d24b0d484812313b07ab74b0fe4db9661606df6c",
+                "reference": "d24b0d484812313b07ab74b0fe4db9661606df6c",
                 "shasum": ""
             },
             "require": {
@@ -5097,16 +5096,17 @@
                 "php": "^8.1.2"
             },
             "require-dev": {
-                "doctrine/collections": "^2.1.2",
+                "doctrine/collections": "^2.1.3",
                 "ext-dom": "*",
                 "ext-xdebug": "*",
-                "friendsofphp/php-cs-fixer": "^v3.14.3",
-                "phpbench/phpbench": "^1.2.8",
-                "phpstan/phpstan": "^1.10.4",
-                "phpstan/phpstan-deprecation-rules": "^1.1.2",
-                "phpstan/phpstan-phpunit": "^1.3.10",
-                "phpstan/phpstan-strict-rules": "^1.5.0",
-                "phpunit/phpunit": "^10.0.14"
+                "friendsofphp/php-cs-fixer": "^v3.22.0",
+                "phpbench/phpbench": "^1.2.14",
+                "phpstan/phpstan": "^1.10.26",
+                "phpstan/phpstan-deprecation-rules": "^1.1.3",
+                "phpstan/phpstan-phpunit": "^1.3.13",
+                "phpstan/phpstan-strict-rules": "^1.5.1",
+                "phpunit/phpunit": "^10.3.1",
+                "symfony/var-dumper": "^6.3.3"
             },
             "suggest": {
                 "ext-dom": "Required to use the XMLConverter and the HTMLConverter classes",
@@ -5162,7 +5162,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-03-11T15:57:12+00:00"
+            "time": "2023-08-04T15:12:48+00:00"
         },
         {
             "name": "league/flysystem",
@@ -5448,26 +5448,26 @@
         },
         {
             "name": "league/mime-type-detection",
-            "version": "1.11.0",
+            "version": "1.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/mime-type-detection.git",
-                "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd"
+                "reference": "a6dfb1194a2946fcdc1f38219445234f65b35c96"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ff6248ea87a9f116e78edd6002e39e5128a0d4dd",
-                "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd",
+                "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/a6dfb1194a2946fcdc1f38219445234f65b35c96",
+                "reference": "a6dfb1194a2946fcdc1f38219445234f65b35c96",
                 "shasum": ""
             },
             "require": {
                 "ext-fileinfo": "*",
-                "php": "^7.2 || ^8.0"
+                "php": "^7.4 || ^8.0"
             },
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "^3.2",
                 "phpstan/phpstan": "^0.12.68",
-                "phpunit/phpunit": "^8.5.8 || ^9.3"
+                "phpunit/phpunit": "^8.5.8 || ^9.3 || ^10.0"
             },
             "type": "library",
             "autoload": {
@@ -5488,7 +5488,7 @@
             "description": "Mime-type detection for Flysystem",
             "support": {
                 "issues": "https://github.com/thephpleague/mime-type-detection/issues",
-                "source": "https://github.com/thephpleague/mime-type-detection/tree/1.11.0"
+                "source": "https://github.com/thephpleague/mime-type-detection/tree/1.13.0"
             },
             "funding": [
                 {
@@ -5500,7 +5500,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-17T13:12:02+00:00"
+            "time": "2023-08-05T12:09:49+00:00"
         },
         {
             "name": "league/oauth1-client",
@@ -5643,16 +5643,16 @@
         },
         {
             "name": "livewire/livewire",
-            "version": "v2.12.3",
+            "version": "v2.12.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/livewire/livewire.git",
-                "reference": "019b1e69d8cd8c7e749eba7a38e4fa69ecbc8f74"
+                "reference": "7d3a57b3193299cf1a0639a3935c696f4da2cf92"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/livewire/livewire/zipball/019b1e69d8cd8c7e749eba7a38e4fa69ecbc8f74",
-                "reference": "019b1e69d8cd8c7e749eba7a38e4fa69ecbc8f74",
+                "url": "https://api.github.com/repos/livewire/livewire/zipball/7d3a57b3193299cf1a0639a3935c696f4da2cf92",
+                "reference": "7d3a57b3193299cf1a0639a3935c696f4da2cf92",
                 "shasum": ""
             },
             "require": {
@@ -5704,7 +5704,7 @@
             "description": "A front-end framework for Laravel.",
             "support": {
                 "issues": "https://github.com/livewire/livewire/issues",
-                "source": "https://github.com/livewire/livewire/tree/v2.12.3"
+                "source": "https://github.com/livewire/livewire/tree/v2.12.6"
             },
             "funding": [
                 {
@@ -5712,20 +5712,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-03-03T20:12:38+00:00"
+            "time": "2023-08-11T04:02:34+00:00"
         },
         {
             "name": "microsoft/microsoft-graph",
-            "version": "1.103.0",
+            "version": "1.104.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/microsoftgraph/msgraph-sdk-php.git",
-                "reference": "6e325c22145dbed4e51970ffecca4d7648c3c27e"
+                "reference": "fc2a3549e8efc9501dbf5d55d350882d8d641295"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/microsoftgraph/msgraph-sdk-php/zipball/6e325c22145dbed4e51970ffecca4d7648c3c27e",
-                "reference": "6e325c22145dbed4e51970ffecca4d7648c3c27e",
+                "url": "https://api.github.com/repos/microsoftgraph/msgraph-sdk-php/zipball/fc2a3549e8efc9501dbf5d55d350882d8d641295",
+                "reference": "fc2a3549e8efc9501dbf5d55d350882d8d641295",
                 "shasum": ""
             },
             "require": {
@@ -5762,22 +5762,22 @@
             "homepage": "https://developer.microsoft.com/en-us/graph",
             "support": {
                 "issues": "https://github.com/microsoftgraph/msgraph-sdk-php/issues",
-                "source": "https://github.com/microsoftgraph/msgraph-sdk-php/tree/1.103.0"
+                "source": "https://github.com/microsoftgraph/msgraph-sdk-php/tree/1.104.0"
             },
-            "time": "2023-07-19T03:27:15+00:00"
+            "time": "2023-08-11T07:41:39+00:00"
         },
         {
             "name": "mollie/mollie-api-php",
-            "version": "v2.59.0",
+            "version": "v2.61.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mollie/mollie-api-php.git",
-                "reference": "9834e5779c695d1cc278b2c78ee514de9434b084"
+                "reference": "d3ec7a191985aa57bec9b4425a665e95b4ba346a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mollie/mollie-api-php/zipball/9834e5779c695d1cc278b2c78ee514de9434b084",
-                "reference": "9834e5779c695d1cc278b2c78ee514de9434b084",
+                "url": "https://api.github.com/repos/mollie/mollie-api-php/zipball/d3ec7a191985aa57bec9b4425a665e95b4ba346a",
+                "reference": "d3ec7a191985aa57bec9b4425a665e95b4ba346a",
                 "shasum": ""
             },
             "require": {
@@ -5854,9 +5854,9 @@
             ],
             "support": {
                 "issues": "https://github.com/mollie/mollie-api-php/issues",
-                "source": "https://github.com/mollie/mollie-api-php/tree/v2.59.0"
+                "source": "https://github.com/mollie/mollie-api-php/tree/v2.61.0"
             },
-            "time": "2023-07-18T13:41:40+00:00"
+            "time": "2023-07-31T15:37:46+00:00"
         },
         {
             "name": "moneyphp/money",
@@ -6350,21 +6350,21 @@
         },
         {
             "name": "nette/schema",
-            "version": "v1.2.3",
+            "version": "v1.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/schema.git",
-                "reference": "abbdbb70e0245d5f3bf77874cea1dfb0c930d06f"
+                "reference": "c9ff517a53903b3d4e29ec547fb20feecb05b8ab"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/schema/zipball/abbdbb70e0245d5f3bf77874cea1dfb0c930d06f",
-                "reference": "abbdbb70e0245d5f3bf77874cea1dfb0c930d06f",
+                "url": "https://api.github.com/repos/nette/schema/zipball/c9ff517a53903b3d4e29ec547fb20feecb05b8ab",
+                "reference": "c9ff517a53903b3d4e29ec547fb20feecb05b8ab",
                 "shasum": ""
             },
             "require": {
                 "nette/utils": "^2.5.7 || ^3.1.5 ||  ^4.0",
-                "php": ">=7.1 <8.3"
+                "php": "7.1 - 8.3"
             },
             "require-dev": {
                 "nette/tester": "^2.3 || ^2.4",
@@ -6406,26 +6406,26 @@
             ],
             "support": {
                 "issues": "https://github.com/nette/schema/issues",
-                "source": "https://github.com/nette/schema/tree/v1.2.3"
+                "source": "https://github.com/nette/schema/tree/v1.2.4"
             },
-            "time": "2022-10-13T01:24:26+00:00"
+            "time": "2023-08-05T18:56:25+00:00"
         },
         {
             "name": "nette/utils",
-            "version": "v4.0.0",
+            "version": "v4.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/utils.git",
-                "reference": "cacdbf5a91a657ede665c541eda28941d4b09c1e"
+                "reference": "9124157137da01b1f5a5a22d6486cb975f26db7e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/utils/zipball/cacdbf5a91a657ede665c541eda28941d4b09c1e",
-                "reference": "cacdbf5a91a657ede665c541eda28941d4b09c1e",
+                "url": "https://api.github.com/repos/nette/utils/zipball/9124157137da01b1f5a5a22d6486cb975f26db7e",
+                "reference": "9124157137da01b1f5a5a22d6486cb975f26db7e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0 <8.3"
+                "php": ">=8.0 <8.4"
             },
             "conflict": {
                 "nette/finder": "<3",
@@ -6433,7 +6433,7 @@
             },
             "require-dev": {
                 "jetbrains/phpstorm-attributes": "dev-master",
-                "nette/tester": "^2.4",
+                "nette/tester": "^2.5",
                 "phpstan/phpstan": "^1.0",
                 "tracy/tracy": "^2.9"
             },
@@ -6493,22 +6493,22 @@
             ],
             "support": {
                 "issues": "https://github.com/nette/utils/issues",
-                "source": "https://github.com/nette/utils/tree/v4.0.0"
+                "source": "https://github.com/nette/utils/tree/v4.0.1"
             },
-            "time": "2023-02-02T10:41:53+00:00"
+            "time": "2023-07-30T15:42:21+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.16.0",
+            "version": "v4.17.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "19526a33fb561ef417e822e85f08a00db4059c17"
+                "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/19526a33fb561ef417e822e85f08a00db4059c17",
-                "reference": "19526a33fb561ef417e822e85f08a00db4059c17",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d",
+                "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d",
                 "shasum": ""
             },
             "require": {
@@ -6549,9 +6549,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.16.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1"
             },
-            "time": "2023-06-25T14:52:30+00:00"
+            "time": "2023-08-13T19:53:39+00:00"
         },
         {
             "name": "nunomaduro/termwind",
@@ -7711,16 +7711,16 @@
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.7.2",
+            "version": "1.7.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "b2fe4d22a5426f38e014855322200b97b5362c0d"
+                "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/b2fe4d22a5426f38e014855322200b97b5362c0d",
-                "reference": "b2fe4d22a5426f38e014855322200b97b5362c0d",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419",
+                "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419",
                 "shasum": ""
             },
             "require": {
@@ -7763,9 +7763,9 @@
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
             "support": {
                 "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.2"
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.3"
             },
-            "time": "2023-05-30T18:13:47+00:00"
+            "time": "2023-08-12T11:01:26+00:00"
         },
         {
             "name": "phpoption/phpoption",
@@ -7954,16 +7954,16 @@
         },
         {
             "name": "phpstan/phpdoc-parser",
-            "version": "1.22.1",
+            "version": "1.23.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "65c39594fbd8c67abfc68bb323f86447bab79cc0"
+                "reference": "846ae76eef31c6d7790fac9bc399ecee45160b26"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/65c39594fbd8c67abfc68bb323f86447bab79cc0",
-                "reference": "65c39594fbd8c67abfc68bb323f86447bab79cc0",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/846ae76eef31c6d7790fac9bc399ecee45160b26",
+                "reference": "846ae76eef31c6d7790fac9bc399ecee45160b26",
                 "shasum": ""
             },
             "require": {
@@ -7995,9 +7995,9 @@
             "description": "PHPDoc parser with support for nullable, intersection and generic types",
             "support": {
                 "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.22.1"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.23.1"
             },
-            "time": "2023-06-29T20:46:06+00:00"
+            "time": "2023-08-03T16:32:59+00:00"
         },
         {
             "name": "pragmarx/google2fa",
@@ -8514,16 +8514,16 @@
         },
         {
             "name": "psy/psysh",
-            "version": "v0.11.19",
+            "version": "v0.11.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "1724ceff278daeeac5a006744633bacbb2dc4706"
+                "reference": "0fa27040553d1d280a67a4393194df5228afea5b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/1724ceff278daeeac5a006744633bacbb2dc4706",
-                "reference": "1724ceff278daeeac5a006744633bacbb2dc4706",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/0fa27040553d1d280a67a4393194df5228afea5b",
+                "reference": "0fa27040553d1d280a67a4393194df5228afea5b",
                 "shasum": ""
             },
             "require": {
@@ -8584,9 +8584,9 @@
             ],
             "support": {
                 "issues": "https://github.com/bobthecow/psysh/issues",
-                "source": "https://github.com/bobthecow/psysh/tree/v0.11.19"
+                "source": "https://github.com/bobthecow/psysh/tree/v0.11.20"
             },
-            "time": "2023-07-15T19:42:19+00:00"
+            "time": "2023-07-31T14:32:22+00:00"
         },
         {
             "name": "pusher/pusher-php-server",
@@ -9207,16 +9207,16 @@
         },
         {
             "name": "sentry/sentry",
-            "version": "3.20.1",
+            "version": "3.21.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/getsentry/sentry-php.git",
-                "reference": "644ad9768c18139a80ac510090fad000d9ffd8a4"
+                "reference": "624aafc22b84b089ffa43b71fb01e0096505ec4f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/644ad9768c18139a80ac510090fad000d9ffd8a4",
-                "reference": "644ad9768c18139a80ac510090fad000d9ffd8a4",
+                "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/624aafc22b84b089ffa43b71fb01e0096505ec4f",
+                "reference": "624aafc22b84b089ffa43b71fb01e0096505ec4f",
                 "shasum": ""
             },
             "require": {
@@ -9260,11 +9260,6 @@
                 "monolog/monolog": "Allow sending log messages to Sentry by using the included Monolog handler."
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.13.x-dev"
-                }
-            },
             "autoload": {
                 "files": [
                     "src/functions.php"
@@ -9296,7 +9291,7 @@
             ],
             "support": {
                 "issues": "https://github.com/getsentry/sentry-php/issues",
-                "source": "https://github.com/getsentry/sentry-php/tree/3.20.1"
+                "source": "https://github.com/getsentry/sentry-php/tree/3.21.0"
             },
             "funding": [
                 {
@@ -9308,20 +9303,20 @@
                     "type": "custom"
                 }
             ],
-            "time": "2023-06-26T11:01:40+00:00"
+            "time": "2023-07-31T15:31:24+00:00"
         },
         {
             "name": "sentry/sentry-laravel",
-            "version": "3.6.1",
+            "version": "3.7.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/getsentry/sentry-laravel.git",
-                "reference": "eb94a52b88794d0c108dc46ca1a680531c3a8bad"
+                "reference": "2aee4ad217be8ef04ffcde6e9f7dd17af5a3b0bf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/getsentry/sentry-laravel/zipball/eb94a52b88794d0c108dc46ca1a680531c3a8bad",
-                "reference": "eb94a52b88794d0c108dc46ca1a680531c3a8bad",
+                "url": "https://api.github.com/repos/getsentry/sentry-laravel/zipball/2aee4ad217be8ef04ffcde6e9f7dd17af5a3b0bf",
+                "reference": "2aee4ad217be8ef04ffcde6e9f7dd17af5a3b0bf",
                 "shasum": ""
             },
             "require": {
@@ -9329,7 +9324,7 @@
                 "nyholm/psr7": "^1.0",
                 "php": "^7.2 | ^8.0",
                 "sentry/sdk": "^3.4",
-                "sentry/sentry": "^3.20",
+                "sentry/sentry": "^3.20.1",
                 "symfony/psr-http-message-bridge": "^1.0 | ^2.0"
             },
             "require-dev": {
@@ -9337,6 +9332,7 @@
                 "laravel/framework": "^6.0 | ^7.0 | ^8.0 | ^9.0 | ^10.0",
                 "mockery/mockery": "^1.3",
                 "orchestra/testbench": "^4.7 | ^5.1 | ^6.0 | ^7.0 | ^8.0",
+                "phpstan/phpstan": "^1.10",
                 "phpunit/phpunit": "^8.4 | ^9.3"
             },
             "type": "library",
@@ -9386,7 +9382,7 @@
             ],
             "support": {
                 "issues": "https://github.com/getsentry/sentry-laravel/issues",
-                "source": "https://github.com/getsentry/sentry-laravel/tree/3.6.1"
+                "source": "https://github.com/getsentry/sentry-laravel/tree/3.7.3"
             },
             "funding": [
                 {
@@ -9398,7 +9394,7 @@
                     "type": "custom"
                 }
             ],
-            "time": "2023-07-04T10:30:42+00:00"
+            "time": "2023-08-03T10:10:23+00:00"
         },
         {
             "name": "setasign/fpdf",
@@ -9448,16 +9444,16 @@
         },
         {
             "name": "setasign/fpdi",
-            "version": "v2.3.7",
+            "version": "v2.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Setasign/FPDI.git",
-                "reference": "bccc892d5fa1f48c43f8ba7db5ed4ba6f30c8c05"
+                "reference": "f4ba73e5bc053ccc90b81717c5df1cb2ea7bae7b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Setasign/FPDI/zipball/bccc892d5fa1f48c43f8ba7db5ed4ba6f30c8c05",
-                "reference": "bccc892d5fa1f48c43f8ba7db5ed4ba6f30c8c05",
+                "url": "https://api.github.com/repos/Setasign/FPDI/zipball/f4ba73e5bc053ccc90b81717c5df1cb2ea7bae7b",
+                "reference": "f4ba73e5bc053ccc90b81717c5df1cb2ea7bae7b",
                 "shasum": ""
             },
             "require": {
@@ -9470,7 +9466,7 @@
             "require-dev": {
                 "phpunit/phpunit": "~5.7",
                 "setasign/fpdf": "~1.8",
-                "setasign/tfpdf": "1.31",
+                "setasign/tfpdf": "~1.31",
                 "squizlabs/php_codesniffer": "^3.5",
                 "tecnickcom/tcpdf": "~6.2"
             },
@@ -9508,7 +9504,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Setasign/FPDI/issues",
-                "source": "https://github.com/Setasign/FPDI/tree/v2.3.7"
+                "source": "https://github.com/Setasign/FPDI/tree/v2.4.1"
             },
             "funding": [
                 {
@@ -9516,7 +9512,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-02-09T10:38:43+00:00"
+            "time": "2023-07-27T08:12:09+00:00"
         },
         {
             "name": "shopify/shopify-api",
@@ -9583,16 +9579,16 @@
         },
         {
             "name": "smalot/pdfparser",
-            "version": "v2.5.0",
+            "version": "v2.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/smalot/pdfparser.git",
-                "reference": "9094d7777aeaa7d8a0a845b352f7dfe4a8baced3"
+                "reference": "eef0263bbaec86d30801d3551ac83f4e1015d4c3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/smalot/pdfparser/zipball/9094d7777aeaa7d8a0a845b352f7dfe4a8baced3",
-                "reference": "9094d7777aeaa7d8a0a845b352f7dfe4a8baced3",
+                "url": "https://api.github.com/repos/smalot/pdfparser/zipball/eef0263bbaec86d30801d3551ac83f4e1015d4c3",
+                "reference": "eef0263bbaec86d30801d3551ac83f4e1015d4c3",
                 "shasum": ""
             },
             "require": {
@@ -9628,9 +9624,9 @@
             ],
             "support": {
                 "issues": "https://github.com/smalot/pdfparser/issues",
-                "source": "https://github.com/smalot/pdfparser/tree/v2.5.0"
+                "source": "https://github.com/smalot/pdfparser/tree/v2.7.0"
             },
-            "time": "2023-04-24T07:00:49+00:00"
+            "time": "2023-08-10T06:11:26+00:00"
         },
         {
             "name": "socialiteproviders/apple",
@@ -9830,16 +9826,16 @@
         },
         {
             "name": "spatie/laravel-data",
-            "version": "3.7.0",
+            "version": "3.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-data.git",
-                "reference": "a975123d86e0133a361ac225d17acb3d11aa351f"
+                "reference": "7ead3d8f761846185a94d06e584bfe17e43b9239"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-data/zipball/a975123d86e0133a361ac225d17acb3d11aa351f",
-                "reference": "a975123d86e0133a361ac225d17acb3d11aa351f",
+                "url": "https://api.github.com/repos/spatie/laravel-data/zipball/7ead3d8f761846185a94d06e584bfe17e43b9239",
+                "reference": "7ead3d8f761846185a94d06e584bfe17e43b9239",
                 "shasum": ""
             },
             "require": {
@@ -9901,7 +9897,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/laravel-data/issues",
-                "source": "https://github.com/spatie/laravel-data/tree/3.7.0"
+                "source": "https://github.com/spatie/laravel-data/tree/3.8.1"
             },
             "funding": [
                 {
@@ -9909,20 +9905,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-07-05T11:45:14+00:00"
+            "time": "2023-08-11T11:59:07+00:00"
         },
         {
             "name": "spatie/laravel-package-tools",
-            "version": "1.15.0",
+            "version": "1.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-package-tools.git",
-                "reference": "efab1844b8826443135201c4443690f032c3d533"
+                "reference": "38fe533e93f86a1b2fb1000bf7df09c4748e6458"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/efab1844b8826443135201c4443690f032c3d533",
-                "reference": "efab1844b8826443135201c4443690f032c3d533",
+                "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/38fe533e93f86a1b2fb1000bf7df09c4748e6458",
+                "reference": "38fe533e93f86a1b2fb1000bf7df09c4748e6458",
                 "shasum": ""
             },
             "require": {
@@ -9961,7 +9957,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/laravel-package-tools/issues",
-                "source": "https://github.com/spatie/laravel-package-tools/tree/1.15.0"
+                "source": "https://github.com/spatie/laravel-package-tools/tree/1.16.0"
             },
             "funding": [
                 {
@@ -9969,7 +9965,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-04-27T08:09:01+00:00"
+            "time": "2023-08-09T14:08:04+00:00"
         },
         {
             "name": "sprain/swiss-qr-bill",
@@ -10150,16 +10146,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v6.3.0",
+            "version": "v6.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "8788808b07cf0bdd6e4b7fdd23d8ddb1470c83b7"
+                "reference": "aa5d64ad3f63f2e48964fc81ee45cb318a723898"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/8788808b07cf0bdd6e4b7fdd23d8ddb1470c83b7",
-                "reference": "8788808b07cf0bdd6e4b7fdd23d8ddb1470c83b7",
+                "url": "https://api.github.com/repos/symfony/console/zipball/aa5d64ad3f63f2e48964fc81ee45cb318a723898",
+                "reference": "aa5d64ad3f63f2e48964fc81ee45cb318a723898",
                 "shasum": ""
             },
             "require": {
@@ -10220,7 +10216,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v6.3.0"
+                "source": "https://github.com/symfony/console/tree/v6.3.2"
             },
             "funding": [
                 {
@@ -10236,20 +10232,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-29T12:49:39+00:00"
+            "time": "2023-07-19T20:17:28+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v6.3.0",
+            "version": "v6.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "88453e64cd86c5b60e8d2fb2c6f953bbc353ffbf"
+                "reference": "883d961421ab1709877c10ac99451632a3d6fa57"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/88453e64cd86c5b60e8d2fb2c6f953bbc353ffbf",
-                "reference": "88453e64cd86c5b60e8d2fb2c6f953bbc353ffbf",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/883d961421ab1709877c10ac99451632a3d6fa57",
+                "reference": "883d961421ab1709877c10ac99451632a3d6fa57",
                 "shasum": ""
             },
             "require": {
@@ -10285,7 +10281,7 @@
             "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v6.3.0"
+                "source": "https://github.com/symfony/css-selector/tree/v6.3.2"
             },
             "funding": [
                 {
@@ -10301,7 +10297,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-20T16:43:42+00:00"
+            "time": "2023-07-12T16:00:22+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -10372,16 +10368,16 @@
         },
         {
             "name": "symfony/error-handler",
-            "version": "v6.3.0",
+            "version": "v6.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "99d2d814a6351461af350ead4d963bd67451236f"
+                "reference": "85fd65ed295c4078367c784e8a5a6cee30348b7a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/99d2d814a6351461af350ead4d963bd67451236f",
-                "reference": "99d2d814a6351461af350ead4d963bd67451236f",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/85fd65ed295c4078367c784e8a5a6cee30348b7a",
+                "reference": "85fd65ed295c4078367c784e8a5a6cee30348b7a",
                 "shasum": ""
             },
             "require": {
@@ -10426,7 +10422,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v6.3.0"
+                "source": "https://github.com/symfony/error-handler/tree/v6.3.2"
             },
             "funding": [
                 {
@@ -10442,20 +10438,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-10T12:03:13+00:00"
+            "time": "2023-07-16T17:05:46+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v6.3.0",
+            "version": "v6.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "3af8ac1a3f98f6dbc55e10ae59c9e44bfc38dfaa"
+                "reference": "adb01fe097a4ee930db9258a3cc906b5beb5cf2e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/3af8ac1a3f98f6dbc55e10ae59c9e44bfc38dfaa",
-                "reference": "3af8ac1a3f98f6dbc55e10ae59c9e44bfc38dfaa",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/adb01fe097a4ee930db9258a3cc906b5beb5cf2e",
+                "reference": "adb01fe097a4ee930db9258a3cc906b5beb5cf2e",
                 "shasum": ""
             },
             "require": {
@@ -10506,7 +10502,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v6.3.0"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v6.3.2"
             },
             "funding": [
                 {
@@ -10522,7 +10518,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-04-21T14:41:17+00:00"
+            "time": "2023-07-06T06:56:43+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -10665,16 +10661,16 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v6.3.0",
+            "version": "v6.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "d9b01ba073c44cef617c7907ce2419f8d00d75e2"
+                "reference": "9915db259f67d21eefee768c1abcf1cc61b1fc9e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/d9b01ba073c44cef617c7907ce2419f8d00d75e2",
-                "reference": "d9b01ba073c44cef617c7907ce2419f8d00d75e2",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/9915db259f67d21eefee768c1abcf1cc61b1fc9e",
+                "reference": "9915db259f67d21eefee768c1abcf1cc61b1fc9e",
                 "shasum": ""
             },
             "require": {
@@ -10709,7 +10705,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v6.3.0"
+                "source": "https://github.com/symfony/finder/tree/v6.3.3"
             },
             "funding": [
                 {
@@ -10725,20 +10721,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-04-02T01:25:41+00:00"
+            "time": "2023-07-31T08:31:44+00:00"
         },
         {
             "name": "symfony/http-client",
-            "version": "v6.3.1",
+            "version": "v6.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-client.git",
-                "reference": "1c828a06aef2f5eeba42026dfc532d4fc5406123"
+                "reference": "15f9f4bad62bfcbe48b5dedd866f04a08fc7ff00"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client/zipball/1c828a06aef2f5eeba42026dfc532d4fc5406123",
-                "reference": "1c828a06aef2f5eeba42026dfc532d4fc5406123",
+                "url": "https://api.github.com/repos/symfony/http-client/zipball/15f9f4bad62bfcbe48b5dedd866f04a08fc7ff00",
+                "reference": "15f9f4bad62bfcbe48b5dedd866f04a08fc7ff00",
                 "shasum": ""
             },
             "require": {
@@ -10801,7 +10797,7 @@
                 "http"
             ],
             "support": {
-                "source": "https://github.com/symfony/http-client/tree/v6.3.1"
+                "source": "https://github.com/symfony/http-client/tree/v6.3.2"
             },
             "funding": [
                 {
@@ -10817,7 +10813,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-06-24T11:51:27+00:00"
+            "time": "2023-07-05T08:41:27+00:00"
         },
         {
             "name": "symfony/http-client-contracts",
@@ -10899,16 +10895,16 @@
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v6.3.1",
+            "version": "v6.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "e0ad0d153e1c20069250986cd9e9dd1ccebb0d66"
+                "reference": "43ed99d30f5f466ffa00bdac3f5f7aa9cd7617c3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e0ad0d153e1c20069250986cd9e9dd1ccebb0d66",
-                "reference": "e0ad0d153e1c20069250986cd9e9dd1ccebb0d66",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/43ed99d30f5f466ffa00bdac3f5f7aa9cd7617c3",
+                "reference": "43ed99d30f5f466ffa00bdac3f5f7aa9cd7617c3",
                 "shasum": ""
             },
             "require": {
@@ -10956,7 +10952,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v6.3.1"
+                "source": "https://github.com/symfony/http-foundation/tree/v6.3.2"
             },
             "funding": [
                 {
@@ -10972,20 +10968,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-06-24T11:51:27+00:00"
+            "time": "2023-07-23T21:58:39+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v6.3.1",
+            "version": "v6.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "161e16fd2e35fb4881a43bc8b383dfd5be4ac374"
+                "reference": "d3b567f0addf695e10b0c6d57564a9bea2e058ee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/161e16fd2e35fb4881a43bc8b383dfd5be4ac374",
-                "reference": "161e16fd2e35fb4881a43bc8b383dfd5be4ac374",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/d3b567f0addf695e10b0c6d57564a9bea2e058ee",
+                "reference": "d3b567f0addf695e10b0c6d57564a9bea2e058ee",
                 "shasum": ""
             },
             "require": {
@@ -11069,7 +11065,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v6.3.1"
+                "source": "https://github.com/symfony/http-kernel/tree/v6.3.3"
             },
             "funding": [
                 {
@@ -11085,20 +11081,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-06-26T06:07:32+00:00"
+            "time": "2023-07-31T10:33:00+00:00"
         },
         {
             "name": "symfony/intl",
-            "version": "v6.3.1",
+            "version": "v6.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/intl.git",
-                "reference": "fdf4aff85fff2cc681cc45936b6b2a52731acc23"
+                "reference": "1f8cb145c869ed089a8531c51a6a4b31ed0b3c69"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/intl/zipball/fdf4aff85fff2cc681cc45936b6b2a52731acc23",
-                "reference": "fdf4aff85fff2cc681cc45936b6b2a52731acc23",
+                "url": "https://api.github.com/repos/symfony/intl/zipball/1f8cb145c869ed089a8531c51a6a4b31ed0b3c69",
+                "reference": "1f8cb145c869ed089a8531c51a6a4b31ed0b3c69",
                 "shasum": ""
             },
             "require": {
@@ -11106,7 +11102,8 @@
             },
             "require-dev": {
                 "symfony/filesystem": "^5.4|^6.0",
-                "symfony/finder": "^5.4|^6.0"
+                "symfony/finder": "^5.4|^6.0",
+                "symfony/var-exporter": "^5.4|^6.0"
             },
             "type": "library",
             "autoload": {
@@ -11150,7 +11147,7 @@
                 "localization"
             ],
             "support": {
-                "source": "https://github.com/symfony/intl/tree/v6.3.1"
+                "source": "https://github.com/symfony/intl/tree/v6.3.2"
             },
             "funding": [
                 {
@@ -11166,7 +11163,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-06-21T12:08:28+00:00"
+            "time": "2023-07-20T07:43:09+00:00"
         },
         {
             "name": "symfony/mailer",
@@ -11250,16 +11247,16 @@
         },
         {
             "name": "symfony/mailgun-mailer",
-            "version": "v6.3.0",
+            "version": "v6.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mailgun-mailer.git",
-                "reference": "2fafefe8683a93155aceb6cca622c7cee2e27174"
+                "reference": "df371e42a4c2a78a28c8de910f96949040e308fd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mailgun-mailer/zipball/2fafefe8683a93155aceb6cca622c7cee2e27174",
-                "reference": "2fafefe8683a93155aceb6cca622c7cee2e27174",
+                "url": "https://api.github.com/repos/symfony/mailgun-mailer/zipball/df371e42a4c2a78a28c8de910f96949040e308fd",
+                "reference": "df371e42a4c2a78a28c8de910f96949040e308fd",
                 "shasum": ""
             },
             "require": {
@@ -11299,7 +11296,7 @@
             "description": "Symfony Mailgun Mailer Bridge",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/mailgun-mailer/tree/v6.3.0"
+                "source": "https://github.com/symfony/mailgun-mailer/tree/v6.3.2"
             },
             "funding": [
                 {
@@ -11315,24 +11312,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-02T16:15:19+00:00"
+            "time": "2023-07-20T10:26:17+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v6.3.0",
+            "version": "v6.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "7b5d2121858cd6efbed778abce9cfdd7ab1f62ad"
+                "reference": "9a0cbd52baa5ba5a5b1f0cacc59466f194730f98"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/7b5d2121858cd6efbed778abce9cfdd7ab1f62ad",
-                "reference": "7b5d2121858cd6efbed778abce9cfdd7ab1f62ad",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/9a0cbd52baa5ba5a5b1f0cacc59466f194730f98",
+                "reference": "9a0cbd52baa5ba5a5b1f0cacc59466f194730f98",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-intl-idn": "^1.10",
                 "symfony/polyfill-mbstring": "^1.0"
             },
@@ -11341,7 +11339,7 @@
                 "phpdocumentor/reflection-docblock": "<3.2.2",
                 "phpdocumentor/type-resolver": "<1.4.0",
                 "symfony/mailer": "<5.4",
-                "symfony/serializer": "<6.2"
+                "symfony/serializer": "<6.2.13|>=6.3,<6.3.2"
             },
             "require-dev": {
                 "egulias/email-validator": "^2.1.10|^3.1|^4",
@@ -11350,7 +11348,7 @@
                 "symfony/dependency-injection": "^5.4|^6.0",
                 "symfony/property-access": "^5.4|^6.0",
                 "symfony/property-info": "^5.4|^6.0",
-                "symfony/serializer": "^6.2"
+                "symfony/serializer": "~6.2.13|^6.3.2"
             },
             "type": "library",
             "autoload": {
@@ -11382,7 +11380,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v6.3.0"
+                "source": "https://github.com/symfony/mime/tree/v6.3.3"
             },
             "funding": [
                 {
@@ -11398,7 +11396,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-04-28T15:57:00+00:00"
+            "time": "2023-07-31T07:08:24+00:00"
         },
         {
             "name": "symfony/options-resolver",
@@ -12442,16 +12440,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v6.3.0",
+            "version": "v6.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "8741e3ed7fe2e91ec099e02446fb86667a0f1628"
+                "reference": "c5ce962db0d9b6e80247ca5eb9af6472bd4d7b5d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/8741e3ed7fe2e91ec099e02446fb86667a0f1628",
-                "reference": "8741e3ed7fe2e91ec099e02446fb86667a0f1628",
+                "url": "https://api.github.com/repos/symfony/process/zipball/c5ce962db0d9b6e80247ca5eb9af6472bd4d7b5d",
+                "reference": "c5ce962db0d9b6e80247ca5eb9af6472bd4d7b5d",
                 "shasum": ""
             },
             "require": {
@@ -12483,7 +12481,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v6.3.0"
+                "source": "https://github.com/symfony/process/tree/v6.3.2"
             },
             "funding": [
                 {
@@ -12499,20 +12497,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-19T08:06:44+00:00"
+            "time": "2023-07-12T16:00:22+00:00"
         },
         {
             "name": "symfony/property-access",
-            "version": "v5.4.22",
+            "version": "v5.4.26",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/property-access.git",
-                "reference": "ffee082889586b5718347b291e04071f4d07b38f"
+                "reference": "0249e46f69e92049a488f39fcf531cb42c50caaa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/property-access/zipball/ffee082889586b5718347b291e04071f4d07b38f",
-                "reference": "ffee082889586b5718347b291e04071f4d07b38f",
+                "url": "https://api.github.com/repos/symfony/property-access/zipball/0249e46f69e92049a488f39fcf531cb42c50caaa",
+                "reference": "0249e46f69e92049a488f39fcf531cb42c50caaa",
                 "shasum": ""
             },
             "require": {
@@ -12564,7 +12562,7 @@
                 "reflection"
             ],
             "support": {
-                "source": "https://github.com/symfony/property-access/tree/v5.4.22"
+                "source": "https://github.com/symfony/property-access/tree/v5.4.26"
             },
             "funding": [
                 {
@@ -12580,7 +12578,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-14T14:59:20+00:00"
+            "time": "2023-07-13T15:20:41+00:00"
         },
         {
             "name": "symfony/property-info",
@@ -12667,21 +12665,22 @@
         },
         {
             "name": "symfony/psr-http-message-bridge",
-            "version": "v2.2.0",
+            "version": "v2.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/psr-http-message-bridge.git",
-                "reference": "28a732c05bbad801304ad5a5c674cf2970508993"
+                "reference": "581ca6067eb62640de5ff08ee1ba6850a0ee472e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/28a732c05bbad801304ad5a5c674cf2970508993",
-                "reference": "28a732c05bbad801304ad5a5c674cf2970508993",
+                "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/581ca6067eb62640de5ff08ee1ba6850a0ee472e",
+                "reference": "581ca6067eb62640de5ff08ee1ba6850a0ee472e",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
                 "psr/http-message": "^1.0 || ^2.0",
+                "symfony/deprecation-contracts": "^2.5 || ^3.0",
                 "symfony/http-foundation": "^5.4 || ^6.0"
             },
             "require-dev": {
@@ -12700,7 +12699,7 @@
             "type": "symfony-bridge",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.2-dev"
+                    "dev-main": "2.3-dev"
                 }
             },
             "autoload": {
@@ -12735,7 +12734,7 @@
             ],
             "support": {
                 "issues": "https://github.com/symfony/psr-http-message-bridge/issues",
-                "source": "https://github.com/symfony/psr-http-message-bridge/tree/v2.2.0"
+                "source": "https://github.com/symfony/psr-http-message-bridge/tree/v2.3.1"
             },
             "funding": [
                 {
@@ -12751,24 +12750,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-04-21T08:40:19+00:00"
+            "time": "2023-07-26T11:53:26+00:00"
         },
         {
             "name": "symfony/routing",
-            "version": "v6.3.1",
+            "version": "v6.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "d37ad1779c38b8eb71996d17dc13030dcb7f9cf5"
+                "reference": "e7243039ab663822ff134fbc46099b5fdfa16f6a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/d37ad1779c38b8eb71996d17dc13030dcb7f9cf5",
-                "reference": "d37ad1779c38b8eb71996d17dc13030dcb7f9cf5",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/e7243039ab663822ff134fbc46099b5fdfa16f6a",
+                "reference": "e7243039ab663822ff134fbc46099b5fdfa16f6a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3"
             },
             "conflict": {
                 "doctrine/annotations": "<1.12",
@@ -12817,7 +12817,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v6.3.1"
+                "source": "https://github.com/symfony/routing/tree/v6.3.3"
             },
             "funding": [
                 {
@@ -12833,7 +12833,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-06-05T15:30:22+00:00"
+            "time": "2023-07-31T07:08:24+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -12919,16 +12919,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v6.3.0",
+            "version": "v6.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "f2e190ee75ff0f5eced645ec0be5c66fac81f51f"
+                "reference": "53d1a83225002635bca3482fcbf963001313fb68"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/f2e190ee75ff0f5eced645ec0be5c66fac81f51f",
-                "reference": "f2e190ee75ff0f5eced645ec0be5c66fac81f51f",
+                "url": "https://api.github.com/repos/symfony/string/zipball/53d1a83225002635bca3482fcbf963001313fb68",
+                "reference": "53d1a83225002635bca3482fcbf963001313fb68",
                 "shasum": ""
             },
             "require": {
@@ -12985,7 +12985,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.3.0"
+                "source": "https://github.com/symfony/string/tree/v6.3.2"
             },
             "funding": [
                 {
@@ -13001,24 +13001,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-21T21:06:29+00:00"
+            "time": "2023-07-05T08:41:27+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v6.3.0",
+            "version": "v6.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "f72b2cba8f79dd9d536f534f76874b58ad37876f"
+                "reference": "3ed078c54bc98bbe4414e1e9b2d5e85ed5a5c8bd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/f72b2cba8f79dd9d536f534f76874b58ad37876f",
-                "reference": "f72b2cba8f79dd9d536f534f76874b58ad37876f",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/3ed078c54bc98bbe4414e1e9b2d5e85ed5a5c8bd",
+                "reference": "3ed078c54bc98bbe4414e1e9b2d5e85ed5a5c8bd",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-mbstring": "~1.0",
                 "symfony/translation-contracts": "^2.5|^3.0"
             },
@@ -13079,7 +13080,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v6.3.0"
+                "source": "https://github.com/symfony/translation/tree/v6.3.3"
             },
             "funding": [
                 {
@@ -13095,7 +13096,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-19T12:46:45+00:00"
+            "time": "2023-07-31T07:08:24+00:00"
         },
         {
             "name": "symfony/translation-contracts",
@@ -13251,16 +13252,16 @@
         },
         {
             "name": "symfony/validator",
-            "version": "v6.3.1",
+            "version": "v6.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/validator.git",
-                "reference": "1b71f43c62ee867ab08195ba6039a1bc3e6654dc"
+                "reference": "b0c4ecf17d39eee1edfecc92299a03b9f5d5220b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/validator/zipball/1b71f43c62ee867ab08195ba6039a1bc3e6654dc",
-                "reference": "1b71f43c62ee867ab08195ba6039a1bc3e6654dc",
+                "url": "https://api.github.com/repos/symfony/validator/zipball/b0c4ecf17d39eee1edfecc92299a03b9f5d5220b",
+                "reference": "b0c4ecf17d39eee1edfecc92299a03b9f5d5220b",
                 "shasum": ""
             },
             "require": {
@@ -13327,7 +13328,7 @@
             "description": "Provides tools to validate values",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/validator/tree/v6.3.1"
+                "source": "https://github.com/symfony/validator/tree/v6.3.2"
             },
             "funding": [
                 {
@@ -13343,24 +13344,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-06-21T12:08:28+00:00"
+            "time": "2023-07-26T17:39:03+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v6.3.1",
+            "version": "v6.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "c81268d6960ddb47af17391a27d222bd58cf0515"
+                "reference": "77fb4f2927f6991a9843633925d111147449ee7a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c81268d6960ddb47af17391a27d222bd58cf0515",
-                "reference": "c81268d6960ddb47af17391a27d222bd58cf0515",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/77fb4f2927f6991a9843633925d111147449ee7a",
+                "reference": "77fb4f2927f6991a9843633925d111147449ee7a",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
@@ -13369,6 +13371,7 @@
             "require-dev": {
                 "ext-iconv": "*",
                 "symfony/console": "^5.4|^6.0",
+                "symfony/http-kernel": "^5.4|^6.0",
                 "symfony/process": "^5.4|^6.0",
                 "symfony/uid": "^5.4|^6.0",
                 "twig/twig": "^2.13|^3.0.4"
@@ -13409,7 +13412,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v6.3.1"
+                "source": "https://github.com/symfony/var-dumper/tree/v6.3.3"
             },
             "funding": [
                 {
@@ -13425,24 +13428,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-06-21T12:08:28+00:00"
+            "time": "2023-07-31T07:08:24+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v6.3.0",
+            "version": "v6.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "a9a8337aa641ef2aa39c3e028f9107ec391e5927"
+                "reference": "e23292e8c07c85b971b44c1c4b87af52133e2add"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/a9a8337aa641ef2aa39c3e028f9107ec391e5927",
-                "reference": "a9a8337aa641ef2aa39c3e028f9107ec391e5927",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/e23292e8c07c85b971b44c1c4b87af52133e2add",
+                "reference": "e23292e8c07c85b971b44c1c4b87af52133e2add",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-ctype": "^1.8"
             },
             "conflict": {
@@ -13480,7 +13484,7 @@
             "description": "Loads and dumps YAML files",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/yaml/tree/v6.3.0"
+                "source": "https://github.com/symfony/yaml/tree/v6.3.3"
             },
             "funding": [
                 {
@@ -13496,7 +13500,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-04-28T13:28:14+00:00"
+            "time": "2023-07-31T07:08:24+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -14232,16 +14236,16 @@
         },
         {
             "name": "barryvdh/laravel-debugbar",
-            "version": "v3.8.1",
+            "version": "v3.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/laravel-debugbar.git",
-                "reference": "aff3235fecb4104203b1e62c32239c56530eee32"
+                "reference": "56a2dc1da9d3219164074713983eef68996386cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/aff3235fecb4104203b1e62c32239c56530eee32",
-                "reference": "aff3235fecb4104203b1e62c32239c56530eee32",
+                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/56a2dc1da9d3219164074713983eef68996386cf",
+                "reference": "56a2dc1da9d3219164074713983eef68996386cf",
                 "shasum": ""
             },
             "require": {
@@ -14300,7 +14304,7 @@
             ],
             "support": {
                 "issues": "https://github.com/barryvdh/laravel-debugbar/issues",
-                "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.8.1"
+                "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.8.2"
             },
             "funding": [
                 {
@@ -14312,7 +14316,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-21T14:21:02+00:00"
+            "time": "2023-07-26T04:57:49+00:00"
         },
         {
             "name": "barryvdh/laravel-ide-helper",
@@ -15188,16 +15192,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.22.0",
+            "version": "v3.23.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "92b019f6c8d79aa26349d0db7671d37440dc0ff3"
+                "reference": "35af3cbbacfa91e164b252a28ec0b644f1ed4e78"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/92b019f6c8d79aa26349d0db7671d37440dc0ff3",
-                "reference": "92b019f6c8d79aa26349d0db7671d37440dc0ff3",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/35af3cbbacfa91e164b252a28ec0b644f1ed4e78",
+                "reference": "35af3cbbacfa91e164b252a28ec0b644f1ed4e78",
                 "shasum": ""
             },
             "require": {
@@ -15273,7 +15277,7 @@
             ],
             "support": {
                 "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.22.0"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.23.0"
             },
             "funding": [
                 {
@@ -15281,7 +15285,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-07-16T23:08:06+00:00"
+            "time": "2023-08-14T12:27:35+00:00"
         },
         {
             "name": "hamcrest/hamcrest-php",
@@ -15461,31 +15465,31 @@
         },
         {
             "name": "mockery/mockery",
-            "version": "1.6.4",
+            "version": "1.6.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mockery/mockery.git",
-                "reference": "d1413755e26fe56a63455f7753221c86cbb88f66"
+                "reference": "b8e0bb7d8c604046539c1115994632c74dcb361e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mockery/mockery/zipball/d1413755e26fe56a63455f7753221c86cbb88f66",
-                "reference": "d1413755e26fe56a63455f7753221c86cbb88f66",
+                "url": "https://api.github.com/repos/mockery/mockery/zipball/b8e0bb7d8c604046539c1115994632c74dcb361e",
+                "reference": "b8e0bb7d8c604046539c1115994632c74dcb361e",
                 "shasum": ""
             },
             "require": {
                 "hamcrest/hamcrest-php": "^2.0.1",
                 "lib-pcre": ">=7.0",
-                "php": ">=7.4,<8.3"
+                "php": ">=7.3"
             },
             "conflict": {
                 "phpunit/phpunit": "<8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5 || ^9.3",
+                "phpunit/phpunit": "^8.5 || ^9.6.10",
                 "psalm/plugin-phpunit": "^0.18.4",
                 "symplify/easy-coding-standard": "^11.5.0",
-                "vimeo/psalm": "^5.13.1"
+                "vimeo/psalm": "^4.30"
             },
             "type": "library",
             "autoload": {
@@ -15542,7 +15546,7 @@
                 "security": "https://github.com/mockery/mockery/security/advisories",
                 "source": "https://github.com/mockery/mockery"
             },
-            "time": "2023-07-19T15:51:02+00:00"
+            "time": "2023-08-09T00:03:52+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -15744,16 +15748,16 @@
         },
         {
             "name": "nunomaduro/larastan",
-            "version": "v2.6.3",
+            "version": "v2.6.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/larastan.git",
-                "reference": "73e5be5f5c732212ce6ca77ffd2753a136f36a23"
+                "reference": "6c5e8820f3db6397546f3ce48520af9d312aed27"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/larastan/zipball/73e5be5f5c732212ce6ca77ffd2753a136f36a23",
-                "reference": "73e5be5f5c732212ce6ca77ffd2753a136f36a23",
+                "url": "https://api.github.com/repos/nunomaduro/larastan/zipball/6c5e8820f3db6397546f3ce48520af9d312aed27",
+                "reference": "6c5e8820f3db6397546f3ce48520af9d312aed27",
                 "shasum": ""
             },
             "require": {
@@ -15816,7 +15820,7 @@
             ],
             "support": {
                 "issues": "https://github.com/nunomaduro/larastan/issues",
-                "source": "https://github.com/nunomaduro/larastan/tree/v2.6.3"
+                "source": "https://github.com/nunomaduro/larastan/tree/v2.6.4"
             },
             "funding": [
                 {
@@ -15836,7 +15840,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2023-06-13T21:39:27+00:00"
+            "time": "2023-07-29T12:13:13+00:00"
         },
         {
             "name": "openlss/lib-array2xml",
@@ -16148,16 +16152,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.26",
+            "version": "1.10.29",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "5d660cbb7e1b89253a47147ae44044f49832351f"
+                "reference": "ee5d8f2d3977fb09e55603eee6fb53bdd76ee9c1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/5d660cbb7e1b89253a47147ae44044f49832351f",
-                "reference": "5d660cbb7e1b89253a47147ae44044f49832351f",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ee5d8f2d3977fb09e55603eee6fb53bdd76ee9c1",
+                "reference": "ee5d8f2d3977fb09e55603eee6fb53bdd76ee9c1",
                 "shasum": ""
             },
             "require": {
@@ -16206,20 +16210,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-07-19T12:44:37+00:00"
+            "time": "2023-08-14T13:24:11+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.26",
+            "version": "9.2.27",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1"
+                "reference": "b0a88255cb70d52653d80c890bd7f38740ea50d1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/443bc6912c9bd5b409254a40f4b0f4ced7c80ea1",
-                "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/b0a88255cb70d52653d80c890bd7f38740ea50d1",
+                "reference": "b0a88255cb70d52653d80c890bd7f38740ea50d1",
                 "shasum": ""
             },
             "require": {
@@ -16275,7 +16279,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.26"
+                "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.27"
             },
             "funding": [
                 {
@@ -16283,7 +16288,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-03-06T12:58:08+00:00"
+            "time": "2023-07-26T13:44:30+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -17135,16 +17140,16 @@
         },
         {
             "name": "sebastian/global-state",
-            "version": "5.0.5",
+            "version": "5.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2"
+                "reference": "bde739e7565280bda77be70044ac1047bc007e34"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2",
-                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34",
+                "reference": "bde739e7565280bda77be70044ac1047bc007e34",
                 "shasum": ""
             },
             "require": {
@@ -17187,7 +17192,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5"
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6"
             },
             "funding": [
                 {
@@ -17195,7 +17200,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-02-14T08:28:10+00:00"
+            "time": "2023-08-02T09:26:13+00:00"
         },
         {
             "name": "sebastian/lines-of-code",
@@ -17657,16 +17662,16 @@
         },
         {
             "name": "spatie/flare-client-php",
-            "version": "1.4.1",
+            "version": "1.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/flare-client-php.git",
-                "reference": "943894c6a6b00501365ac0b91ae0dce56f2226fa"
+                "reference": "5f2c6a7a0d2c1d90c12559dc7828fd942911a544"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/943894c6a6b00501365ac0b91ae0dce56f2226fa",
-                "reference": "943894c6a6b00501365ac0b91ae0dce56f2226fa",
+                "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/5f2c6a7a0d2c1d90c12559dc7828fd942911a544",
+                "reference": "5f2c6a7a0d2c1d90c12559dc7828fd942911a544",
                 "shasum": ""
             },
             "require": {
@@ -17715,7 +17720,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/flare-client-php/issues",
-                "source": "https://github.com/spatie/flare-client-php/tree/1.4.1"
+                "source": "https://github.com/spatie/flare-client-php/tree/1.4.2"
             },
             "funding": [
                 {
@@ -17723,7 +17728,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-07-06T09:29:49+00:00"
+            "time": "2023-07-28T08:07:24+00:00"
         },
         {
             "name": "spatie/ignition",

From 4a1ad9170db0b627677648a96be55d7e49cd1251 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 16 Aug 2023 15:02:27 +1000
Subject: [PATCH 31/42] v5.6.31

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

diff --git a/VERSION.txt b/VERSION.txt
index 230cac8f9b7e..f3cb8c412987 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.6.30
\ No newline at end of file
+5.6.31
\ No newline at end of file
diff --git a/config/ninja.php b/config/ninja.php
index a3d19b473f7d..233559f73bbf 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.6.30'),
-    'app_tag' => env('APP_TAG','5.6.30'),
+    'app_version' => env('APP_VERSION','5.6.31'),
+    'app_tag' => env('APP_TAG','5.6.31'),
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),

From 33dd437d96063ed205892633951eac83a9dd974c Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 16 Aug 2023 15:38:08 +1000
Subject: [PATCH 32/42] Minor fixes for return types for e-invoices

---
 app/DataMapper/InvoiceItem.php                |  5 +++
 app/Jobs/Invoice/CreateEInvoice.php           |  2 +-
 app/Jobs/Invoice/MergeEInvoice.php            | 36 ++++++++++---------
 .../Invoice/EInvoice/ZugferdEInvoice.php      |  5 ++-
 4 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/app/DataMapper/InvoiceItem.php b/app/DataMapper/InvoiceItem.php
index 49571d668fdf..cdb1953c9be4 100644
--- a/app/DataMapper/InvoiceItem.php
+++ b/app/DataMapper/InvoiceItem.php
@@ -61,8 +61,13 @@ class InvoiceItem
 
     public $tax_id = '';
 
+    public $task_id = '';
+
+    public $expense_id = '';
 
     public static $casts = [
+        'task_id' => 'string',
+        'expense_id' => 'string',
         'tax_id' => 'string',
         'type_id' => 'string',
         'quantity' => 'float',
diff --git a/app/Jobs/Invoice/CreateEInvoice.php b/app/Jobs/Invoice/CreateEInvoice.php
index 017c8fcac448..3988c688b4c8 100644
--- a/app/Jobs/Invoice/CreateEInvoice.php
+++ b/app/Jobs/Invoice/CreateEInvoice.php
@@ -38,7 +38,7 @@ class CreateEInvoice implements ShouldQueue
      * Execute the job.
      *
      *
-     * @return string
+     * @return string|ZugferdDocumentBuilder
      */
     public function handle(): string|ZugferdDocumentBuilder
     {
diff --git a/app/Jobs/Invoice/MergeEInvoice.php b/app/Jobs/Invoice/MergeEInvoice.php
index 1a33db8be1db..cae7d110682b 100644
--- a/app/Jobs/Invoice/MergeEInvoice.php
+++ b/app/Jobs/Invoice/MergeEInvoice.php
@@ -46,23 +46,25 @@ class MergeEInvoice implements ShouldQueue
      */
     private function embedEInvoiceZuGFerD(): void
     {
-        $filepath_pdf = !empty($this->pdf_path) ? $this->pdf_path : $this->invoice->service()->getInvoicePdf();
-        $disk = config('filesystems.default');
-        $e_rechnung = (new CreateEInvoice($this->invoice, true))->handle();
-        if (!empty($this->pdf_path)){
-            $realpath_pdf = $filepath_pdf;
-        }
-        else {
-           $realpath_pdf = Storage::disk($disk)->path($filepath_pdf);
-        }
-        if (file_exists($realpath_pdf)){
-            $pdfBuilder = new ZugferdDocumentPdfBuilder($e_rechnung, $realpath_pdf);
-            $pdfBuilder->generateDocument();
-            $pdfBuilder->saveDocument($realpath_pdf);
-        }
-        else{
-            nlog("E_Invoice Merge failed - file to merge not found");
-        }
+        try {
+            $filepath_pdf = !empty($this->pdf_path) ? $this->pdf_path : $this->invoice->service()->getInvoicePdf();
+            $disk = config('filesystems.default');
+            $e_rechnung = (new CreateEInvoice($this->invoice, true))->handle();
+            if (!empty($this->pdf_path)) {
+                $realpath_pdf = $filepath_pdf;
+            } else {
+                $realpath_pdf = Storage::disk($disk)->path($filepath_pdf);
+            }
+            if (file_exists($realpath_pdf)) {
+                $pdfBuilder = new ZugferdDocumentPdfBuilder($e_rechnung, $realpath_pdf);
+                $pdfBuilder->generateDocument();
+                $pdfBuilder->saveDocument($realpath_pdf);
+            } else {
+                nlog("E_Invoice Merge failed - file to merge not found");
+            }
 
+        } catch (\Exception $e) {
+            nlog("E_Invoice Merge failed - " . $e->getMessage());
+        }
     }
 }
diff --git a/app/Services/Invoice/EInvoice/ZugferdEInvoice.php b/app/Services/Invoice/EInvoice/ZugferdEInvoice.php
index 37d6ce32fe65..3baf14128f8b 100644
--- a/app/Services/Invoice/EInvoice/ZugferdEInvoice.php
+++ b/app/Services/Invoice/EInvoice/ZugferdEInvoice.php
@@ -178,7 +178,10 @@ class ZugferdEInvoice extends AbstractService
         if ($this->returnObject){
             return $xrechnung;
         }
-        return $client->e_invoice_filepath($this->invoice->invitations->first()) . $this->invoice->getFileName("xml");
+
+        throw new \Exception("Invalid e invoice object");
+
+        // return $client->e_invoice_filepath($this->invoice->invitations->first()) . $this->invoice->getFileName("xml");
     }
 
     private function getTaxType($name): string

From 2ba713eeb84a7b3c70afb13ce8cde9e79a691527 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 16 Aug 2023 19:55:35 +1000
Subject: [PATCH 33/42] Refactor for einvoicing

---
 app/Http/Controllers/InvoiceController.php    |   5 +-
 app/Http/Livewire/PdfSlot.php                 |   5 +-
 app/Jobs/Entity/CreateEntityPdf.php           | 117 +++++++++++++-----
 app/Jobs/Entity/CreateRawPdf.php              | 110 +++++++++++-----
 app/Jobs/Invoice/CreateEInvoice.php           |  10 +-
 app/Jobs/Invoice/MergeEInvoice.php            |  70 -----------
 app/Jobs/Invoice/ZipInvoices.php              |  22 +---
 app/Models/BaseModel.php                      |   1 +
 app/Services/Email/EmailDefaults.php          |   6 +-
 .../Invoice/EInvoice/ZugferdEInvoice.php      |  88 ++++++-------
 app/Services/Invoice/GetInvoiceEInvoice.php   |  52 --------
 app/Services/Invoice/GetInvoicePdf.php        |   6 +-
 app/Services/Invoice/InvoiceService.php       |  21 ++--
 13 files changed, 242 insertions(+), 271 deletions(-)
 delete mode 100644 app/Jobs/Invoice/MergeEInvoice.php
 delete mode 100644 app/Services/Invoice/GetInvoiceEInvoice.php

diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index ec86da941082..626c22df9acc 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -850,6 +850,7 @@ class InvoiceController extends BaseController
         $invoice = $invitation->invoice;
 
         $file = $invoice->service()->getEInvoice($contact);
+        $file_name = $invoice->getFileName("xml");
 
         $headers = ['Content-Type' => 'application/xml'];
 
@@ -858,8 +859,8 @@ class InvoiceController extends BaseController
         }
 
         return response()->streamDownload(function () use ($file) {
-            echo Storage::get($file);
-        }, basename($file), $headers);
+            echo $file;
+        }, $file_name, $headers);
     }
 
     /**
diff --git a/app/Http/Livewire/PdfSlot.php b/app/Http/Livewire/PdfSlot.php
index 0990ac3ec76d..3a44b5b3a8bd 100644
--- a/app/Http/Livewire/PdfSlot.php
+++ b/app/Http/Livewire/PdfSlot.php
@@ -12,7 +12,6 @@
 
 namespace App\Http\Livewire;
 
-use App\Services\Invoice\GetInvoiceEInvoice;
 use App\Utils\Number;
 use Livewire\Component;
 use App\Utils\HtmlEngine;
@@ -22,10 +21,12 @@ use App\Models\QuoteInvitation;
 use App\Utils\VendorHtmlEngine;
 use App\Models\CreditInvitation;
 use App\Models\InvoiceInvitation;
+use App\Jobs\Invoice\CreateEInvoice;
 use Illuminate\Support\Facades\Cache;
 use App\Models\PurchaseOrderInvitation;
 use App\Models\RecurringInvoiceInvitation;
 use App\Jobs\Vendor\CreatePurchaseOrderPdf;
+use App\Services\Invoice\GetInvoiceEInvoice;
 use App\Services\PdfMaker\Designs\Utilities\DesignHelpers;
 
 class PdfSlot extends Component
@@ -102,7 +103,7 @@ class PdfSlot extends Component
 
         $file_name = $this->entity->numberFormatter().'.xml';
 
-        $file = (new GetInvoiceEInvoice($this->entity))->run();
+        $file = (new CreateEInvoice($this->entity))->handle();
 
         $headers = ['Content-Type' => 'application/xml'];
 
diff --git a/app/Jobs/Entity/CreateEntityPdf.php b/app/Jobs/Entity/CreateEntityPdf.php
index 6fdf3d7f309e..7ef89d2c3e81 100644
--- a/app/Jobs/Entity/CreateEntityPdf.php
+++ b/app/Jobs/Entity/CreateEntityPdf.php
@@ -11,38 +11,38 @@
 
 namespace App\Jobs\Entity;
 
-use App\Exceptions\FilePermissionsFailure;
-use App\Jobs\Invoice\CreateEInvoice;
-use App\Jobs\Invoice\MergeEInvoice;
-use App\Libraries\MultiDB;
+use App\Utils\Ninja;
+use App\Models\Quote;
 use App\Models\Credit;
-use App\Models\CreditInvitation;
 use App\Models\Design;
 use App\Models\Invoice;
-use App\Models\InvoiceInvitation;
-use App\Models\Quote;
+use App\Utils\HtmlEngine;
+use App\Libraries\MultiDB;
+use Illuminate\Bus\Queueable;
 use App\Models\QuoteInvitation;
+use App\Utils\Traits\MakesHash;
+use App\Models\CreditInvitation;
 use App\Models\RecurringInvoice;
+use App\Utils\PhantomJS\Phantom;
+use App\Models\InvoiceInvitation;
+use App\Utils\HostedPDF\NinjaPdf;
+use App\Utils\Traits\Pdf\PdfMaker;
+use Illuminate\Support\Facades\App;
+use App\Jobs\Invoice\CreateEInvoice;
+use App\Utils\Traits\NumberFormatter;
+use App\Utils\Traits\MakesInvoiceHtml;
+use Illuminate\Queue\SerializesModels;
+use App\Utils\Traits\Pdf\PageNumbering;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Queue\InteractsWithQueue;
+use App\Exceptions\FilePermissionsFailure;
 use App\Models\RecurringInvoiceInvitation;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use horstoeko\zugferd\ZugferdDocumentPdfBuilder;
 use App\Services\PdfMaker\Design as PdfDesignModel;
 use App\Services\PdfMaker\Design as PdfMakerDesign;
 use App\Services\PdfMaker\PdfMaker as PdfMakerService;
-use App\Utils\HostedPDF\NinjaPdf;
-use App\Utils\HtmlEngine;
-use App\Utils\Ninja;
-use App\Utils\PhantomJS\Phantom;
-use App\Utils\Traits\MakesHash;
-use App\Utils\Traits\MakesInvoiceHtml;
-use App\Utils\Traits\NumberFormatter;
-use App\Utils\Traits\Pdf\PageNumbering;
-use App\Utils\Traits\Pdf\PdfMaker;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\App;
-use Illuminate\Support\Facades\Storage;
 
 class CreateEntityPdf implements ShouldQueue
 {
@@ -117,7 +117,8 @@ class CreateEntityPdf implements ShouldQueue
         }
 
         $entity_design_id = '';
-
+        $path = '';
+        
         if ($this->entity instanceof Invoice) {
             $path = $this->client->invoice_filepath($this->invitation);
             $entity_design_id = 'invoice_design_id';
@@ -207,6 +208,11 @@ class CreateEntityPdf implements ShouldQueue
             info($maker->getCompiledHTML());
         }
 
+        if($this->entity_string == "invoice" && $this->client->getSetting('enable_e_invoice'))
+        {
+            $pdf = $this->checkEInvoice($pdf);
+        }
+
         if ($pdf) {
             try {
                 Storage::disk($this->disk)->put($file_path, $pdf);
@@ -214,11 +220,7 @@ class CreateEntityPdf implements ShouldQueue
                 throw new FilePermissionsFailure($e->getMessage());
             }
         }
-        if ($this->entity_string == "invoice" && $this->client->getSetting('enable_e_invoice')){
-            (new CreateEInvoice($this->entity))->handle();
-            (new MergeEInvoice($this->entity))->handle();
-
-        }
+        
         $this->invitation = null;
         // $this->entity = null;
         $this->company = null;
@@ -227,10 +229,65 @@ class CreateEntityPdf implements ShouldQueue
         $maker = null;
         $state = null;
 
-
         return $file_path;
     }
 
+    /**
+     * Switch to determine if we need to embed the xml into the PDF itself
+     *
+     * @param  string $pdf
+     * @return string
+     */
+    private function checkEInvoice(string $pdf): string
+    {
+        if(!$this->entity instanceof Invoice)
+            return $pdf;
+
+        $e_invoice_type = $this->entity->client->getSetting('e_invoice_type');
+
+        switch ($e_invoice_type) {
+            case "EN16931":
+            case "XInvoice_2_2":
+            case "XInvoice_2_1":
+            case "XInvoice_2_0":
+            case "XInvoice_1_0":
+            case "XInvoice-Extended":
+            case "XInvoice-BasicWL":
+            case "XInvoice-Basic":
+                return $this->embedEInvoiceZuGFerD($pdf) ?? $pdf;
+                //case "Facturae_3.2":
+                //case "Facturae_3.2.1":
+                //case "Facturae_3.2.2":
+                //
+            default:
+                return $pdf;
+        }
+
+    }
+    
+    /**
+     * Embed the .xml file into the PDF
+     *
+     * @param  string $pdf
+     * @return string
+     */
+    private function embedEInvoiceZuGFerD(string $pdf): string
+    {
+        try {
+
+            $e_rechnung = (new CreateEInvoice($this->entity, true))->handle();
+            $pdfBuilder = new ZugferdDocumentPdfBuilder($e_rechnung, $pdf);
+            $pdfBuilder->generateDocument();
+            return $pdfBuilder->downloadString(basename($this->entity->getFileName()));
+
+        } catch (\Exception $e) {
+            nlog("E_Invoice Merge failed - " . $e->getMessage());
+        }
+
+        return $pdf;
+    }
+
+
     public function failed($e)
     {
     }
diff --git a/app/Jobs/Entity/CreateRawPdf.php b/app/Jobs/Entity/CreateRawPdf.php
index 8c3b4d77f7f0..921879021c61 100644
--- a/app/Jobs/Entity/CreateRawPdf.php
+++ b/app/Jobs/Entity/CreateRawPdf.php
@@ -11,42 +11,43 @@
 
 namespace App\Jobs\Entity;
 
-use App\Exceptions\FilePermissionsFailure;
-use App\Jobs\Invoice\MergeEInvoice;
-use App\Libraries\MultiDB;
+use App\Utils\Ninja;
+use App\Models\Quote;
 use App\Models\Credit;
-use App\Models\CreditInvitation;
 use App\Models\Design;
 use App\Models\Invoice;
-use App\Models\InvoiceInvitation;
-use App\Models\Quote;
+use App\Utils\HtmlEngine;
+use App\Libraries\MultiDB;
+use Illuminate\Bus\Queueable;
 use App\Models\QuoteInvitation;
+use App\Utils\Traits\MakesHash;
+use App\Models\CreditInvitation;
 use App\Models\RecurringInvoice;
+use App\Utils\PhantomJS\Phantom;
+use App\Models\InvoiceInvitation;
+use App\Utils\HostedPDF\NinjaPdf;
+use App\Utils\Traits\Pdf\PdfMaker;
+use Illuminate\Support\Facades\App;
+use App\Jobs\Invoice\CreateEInvoice;
+use App\Utils\Traits\NumberFormatter;
+use App\Utils\Traits\MakesInvoiceHtml;
+use Illuminate\Queue\SerializesModels;
+use App\Utils\Traits\Pdf\PageNumbering;
+use Illuminate\Queue\InteractsWithQueue;
+use App\Exceptions\FilePermissionsFailure;
 use App\Models\RecurringInvoiceInvitation;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use horstoeko\zugferd\ZugferdDocumentPdfBuilder;
 use App\Services\PdfMaker\Design as PdfDesignModel;
 use App\Services\PdfMaker\Design as PdfMakerDesign;
 use App\Services\PdfMaker\PdfMaker as PdfMakerService;
-use App\Utils\HostedPDF\NinjaPdf;
-use App\Utils\HtmlEngine;
-use App\Utils\Ninja;
-use App\Utils\PhantomJS\Phantom;
-use App\Utils\Traits\MakesHash;
-use App\Utils\Traits\MakesInvoiceHtml;
-use App\Utils\Traits\NumberFormatter;
-use App\Utils\Traits\Pdf\PageNumbering;
-use App\Utils\Traits\Pdf\PdfMaker;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\App;
 
 class CreateRawPdf implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, NumberFormatter, MakesInvoiceHtml, PdfMaker, MakesHash, PageNumbering;
 
-    public $entity;
+    public Invoice | Credit | Quote | RecurringInvoice $entity;
 
     public $company;
 
@@ -104,6 +105,7 @@ class CreateRawPdf implements ShouldQueue
         }
 
         $entity_design_id = '';
+        $path = '';
 
         if ($this->entity instanceof Invoice) {
             $path = $this->entity->client->invoice_filepath($this->invitation);
@@ -203,17 +205,67 @@ class CreateRawPdf implements ShouldQueue
         if ($pdf) {
             $maker =null;
             $state = null;
-            if ($this->invitation->invoice->client->getSetting('enable_e_invoice') && $this->entity_string == "invoice"){
-                $filename = tempnam(sys_get_temp_dir(), 'InvoiceNinja').".pdf";
-                file_put_contents($filename, $pdf);
-                (new \App\Services\Invoice\MergeEInvoice($this->invitation->invoice, $filename))->run();
-                return file_get_contents($filename);
-            };
-            return $pdf;
+            
+            return $this->checkEInvoice($pdf);
         }
 
         throw new FilePermissionsFailure('Unable to generate the raw PDF');
     }
+    
+    /**
+     * Switch to determine if we need to embed the xml into the PDF itself
+     *
+     * @param  string $pdf
+     * @return string
+     */
+    private function checkEInvoice(string $pdf): string
+    {
+        if(!$this->entity instanceof Invoice)
+            return $pdf;
+
+        $e_invoice_type = $this->entity->client->getSetting('e_invoice_type');
+
+        switch ($e_invoice_type) {
+            case "EN16931":
+            case "XInvoice_2_2":
+            case "XInvoice_2_1":
+            case "XInvoice_2_0":
+            case "XInvoice_1_0":
+            case "XInvoice-Extended":
+            case "XInvoice-BasicWL":
+            case "XInvoice-Basic":
+                return $this->embedEInvoiceZuGFerD($pdf) ?? $pdf;
+                //case "Facturae_3.2":
+                //case "Facturae_3.2.1":
+                //case "Facturae_3.2.2":
+                //
+            default:
+                return $pdf;
+        }
+
+    }
+    
+    /**
+     * Embed the .xml file into the PDF
+     *
+     * @param  string $pdf
+     * @return string
+     */
+    private function embedEInvoiceZuGFerD(string $pdf): string
+    {
+        try {
+
+            $e_rechnung = (new CreateEInvoice($this->entity, true))->handle();
+            $pdfBuilder = new ZugferdDocumentPdfBuilder($e_rechnung, $pdf);
+            $pdfBuilder->generateDocument();
+            return $pdfBuilder->downloadString(basename($this->entity->getFileName()));
+
+        } catch (\Exception $e) {
+            nlog("E_Invoice Merge failed - " . $e->getMessage());
+        }
+
+        return $pdf;
+    }
 
     public function failed($e)
     {
diff --git a/app/Jobs/Invoice/CreateEInvoice.php b/app/Jobs/Invoice/CreateEInvoice.php
index 3988c688b4c8..c68662c4b108 100644
--- a/app/Jobs/Invoice/CreateEInvoice.php
+++ b/app/Jobs/Invoice/CreateEInvoice.php
@@ -37,7 +37,6 @@ class CreateEInvoice implements ShouldQueue
     /**
      * Execute the job.
      *
-     *
      * @return string|ZugferdDocumentBuilder
      */
     public function handle(): string|ZugferdDocumentBuilder
@@ -64,13 +63,18 @@ class CreateEInvoice implements ShouldQueue
             case "XInvoice-Extended":
             case "XInvoice-BasicWL":
             case "XInvoice-Basic":
-                return (new ZugferdEInvoice($this->invoice, $this->returnObject))->run();
+                $zugferd = (new ZugferdEInvoice($this->invoice))->run();
+
+                return $this->returnObject ? $zugferd->xrechnung : $zugferd->getXml();
             case "Facturae_3.2":
             case "Facturae_3.2.1":
             case "Facturae_3.2.2":
                 return (new FacturaEInvoice($this->invoice, str_replace("Facturae_", "", $e_invoice_type)))->run();
             default:
-                return (new ZugferdEInvoice($this->invoice, $this->returnObject))->run();
+                
+                $zugferd = (new ZugferdEInvoice($this->invoice))->run();
+
+                return $this->returnObject ? $zugferd : $zugferd->getXml();
 
         }
 
diff --git a/app/Jobs/Invoice/MergeEInvoice.php b/app/Jobs/Invoice/MergeEInvoice.php
deleted file mode 100644
index cae7d110682b..000000000000
--- a/app/Jobs/Invoice/MergeEInvoice.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-namespace App\Jobs\Invoice;
-
-use App\Models\ClientContact;
-use App\Models\Invoice;
-use horstoeko\zugferd\ZugferdDocumentPdfBuilder;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Support\Facades\Storage;
-use horstoeko\zugferd\ZugferdDocumentReader;
-
-class MergeEInvoice implements ShouldQueue
-{
-    public function __construct(public Invoice $invoice, private string $pdf_path = "")
-    {
-    }
-
-    /**
-     * @throws \Exception
-     */
-    public function handle(): void
-    {
-        $e_invoice_type = $this->invoice->client->getSetting('e_invoice_type');
-        switch ($e_invoice_type) {
-            case "EN16931":
-            case "XInvoice_2_2":
-            case "XInvoice_2_1":
-            case "XInvoice_2_0":
-            case "XInvoice_1_0":
-            case "XInvoice-Extended":
-            case "XInvoice-BasicWL":
-            case "XInvoice-Basic":
-                $this->embedEInvoiceZuGFerD();
-            //case "Facturae_3.2":
-            //case "Facturae_3.2.1":
-            //case "Facturae_3.2.2":
-            //
-            default:
-                $this->embedEInvoiceZuGFerD();
-                break;
-        }
-    }
-
-    /**
-     * @throws \Exception
-     */
-    private function embedEInvoiceZuGFerD(): void
-    {
-        try {
-            $filepath_pdf = !empty($this->pdf_path) ? $this->pdf_path : $this->invoice->service()->getInvoicePdf();
-            $disk = config('filesystems.default');
-            $e_rechnung = (new CreateEInvoice($this->invoice, true))->handle();
-            if (!empty($this->pdf_path)) {
-                $realpath_pdf = $filepath_pdf;
-            } else {
-                $realpath_pdf = Storage::disk($disk)->path($filepath_pdf);
-            }
-            if (file_exists($realpath_pdf)) {
-                $pdfBuilder = new ZugferdDocumentPdfBuilder($e_rechnung, $realpath_pdf);
-                $pdfBuilder->generateDocument();
-                $pdfBuilder->saveDocument($realpath_pdf);
-            } else {
-                nlog("E_Invoice Merge failed - file to merge not found");
-            }
-
-        } catch (\Exception $e) {
-            nlog("E_Invoice Merge failed - " . $e->getMessage());
-        }
-    }
-}
diff --git a/app/Jobs/Invoice/ZipInvoices.php b/app/Jobs/Invoice/ZipInvoices.php
index c257e647ccb8..25722b6f6fb2 100644
--- a/app/Jobs/Invoice/ZipInvoices.php
+++ b/app/Jobs/Invoice/ZipInvoices.php
@@ -73,28 +73,12 @@ class ZipInvoices implements ShouldQueue
         $invitation = $this->invoices->first()->invitations->first();
         $path = $this->invoices->first()->client->invoice_filepath($invitation);
 
-        $this->invoices->each(function ($invoice) {
-            (new CreateEntityPdf($invoice->invitations()->first()))->handle();
-            if ($invoice->client->getSetting('enable_e_invoice')){
-                (new CreateEInvoice($invoice))->handle();
-                (new MergeEInvoice($invoice))->handle();
-            }
-        });
-
         try {
 
             foreach ($this->invoices as $invoice) {
-                $file = $invoice->service()->getInvoicePdf();
-                $zip_file_name = basename($file);
-                $zipFile->addFromString($zip_file_name, Storage::get($file));
-
-                if($invoice->client->getSetting('enable_e_invoice')){
-
-                    $xinvoice = $invoice->service()->getEInvoice();
-                    $xinvoice_zip_file_name = basename($xinvoice);
-                    $zipFile->addFromString($xinvoice_zip_file_name, Storage::get($xinvoice));
-
-                }
+                $file = $invoice->service()->getRawInvoicePdf();
+                $zip_file_name = $invoice->getFileName();
+                $zipFile->addFromString($zip_file_name, $file);
             }
 
             Storage::put($path.$file_name, $zipFile->outputAsString());
diff --git a/app/Models/BaseModel.php b/app/Models/BaseModel.php
index 7f8c0d4bca69..bd55d0684203 100644
--- a/app/Models/BaseModel.php
+++ b/app/Models/BaseModel.php
@@ -276,6 +276,7 @@ class BaseModel extends Model
 
     /**
      * Returns the base64 encoded PDF string of the entity
+     * @deprecated - unused implementation
      */
     public function fullscreenPdfViewer($invitation = null): string
     {
diff --git a/app/Services/Email/EmailDefaults.php b/app/Services/Email/EmailDefaults.php
index a374ddfa353c..e2d833fa9e31 100644
--- a/app/Services/Email/EmailDefaults.php
+++ b/app/Services/Email/EmailDefaults.php
@@ -322,10 +322,10 @@ class EmailDefaults
         }
         /** E-Invoice xml file */
         if ($this->email->email_object->settings->enable_e_invoice && $this->email->email_object->entity instanceof Invoice) {
-            $xinvoice_path = $this->email->email_object->entity->service()->getEInvoice();
+            $xml_string = $this->email->email_object->entity->service()->getEInvoice();
 
-            if(Storage::disk(config('filesystems.default'))->exists($xinvoice_path))
-                $this->email->email_object->attachments = array_merge($this->email->email_object->attachments, [['file' => base64_encode(Storage::get($xinvoice_path)), 'name' => explode(".", $this->email->email_object->entity->getFileName('xml'))[0]."-e_invoice.xml"]]);
+            if($xml_string)
+                $this->email->email_object->attachments = array_merge($this->email->email_object->attachments, [['file' => base64_encode($xml_string), 'name' => explode(".", $this->email->email_object->entity->getFileName('xml'))[0]."-e_invoice.xml"]]);
         }
 
         if (!$this->email->email_object->settings->document_email_attachment || !$this->email->company->account->hasFeature(Account::FEATURE_DOCUMENTS)) {
diff --git a/app/Services/Invoice/EInvoice/ZugferdEInvoice.php b/app/Services/Invoice/EInvoice/ZugferdEInvoice.php
index 3baf14128f8b..0410422a4d7e 100644
--- a/app/Services/Invoice/EInvoice/ZugferdEInvoice.php
+++ b/app/Services/Invoice/EInvoice/ZugferdEInvoice.php
@@ -22,12 +22,13 @@ use horstoeko\zugferd\codelists\ZugferdDutyTaxFeeCategories;
 
 class ZugferdEInvoice extends AbstractService
 {
+    public ZugferdDocumentBuilder $xrechnung;
 
     public function __construct(public Invoice $invoice, private readonly bool $returnObject = false, private array $tax_map = [])
     {
     }
 
-    public function run(): string|ZugferdDocumentBuilder
+    public function run(): self
     {
 
         $company = $this->invoice->company;
@@ -45,10 +46,9 @@ class ZugferdEInvoice extends AbstractService
             default => ZugferdProfiles::PROFILE_EN16931,
         };
 
+        $this->xrechnung = ZugferdDocumentBuilder::CreateNew($profile);
 
-        $xrechnung = ZugferdDocumentBuilder::CreateNew($profile);
-
-        $xrechnung
+        $this->xrechnung
             ->setDocumentSupplyChainEvent(date_create($this->invoice->date))
             ->setDocumentSeller($company->getSetting('name'))
             ->setDocumentSellerAddress($company->getSetting("address1"), $company->getSetting("address2"), "", $company->getSetting("postal_code"), $company->getSetting("city"), $company->country()->iso_3166_2, $company->getSetting("state"))
@@ -59,32 +59,32 @@ class ZugferdEInvoice extends AbstractService
             ->addDocumentPaymentTerm(ctrans("texts.xinvoice_payable", ['payeddue' => date_create($this->invoice->date)->diff(date_create($this->invoice->due_date))->format("%d"), 'paydate' => $this->invoice->due_date]));
 
             if (!empty($this->invoice->public_notes)) {
-            $xrechnung->addDocumentNote($this->invoice->public_notes);
+            $this->xrechnung->addDocumentNote($this->invoice->public_notes);
         }
 		if (empty($this->invoice->number)){
-        	$xrechnung->setDocumentInformation("DRAFT", "380", date_create($this->invoice->date), $this->invoice->client->getCurrencyCode());
+        	$this->xrechnung->setDocumentInformation("DRAFT", "380", date_create($this->invoice->date), $this->invoice->client->getCurrencyCode());
         } else {
-          $xrechnung->setDocumentInformation($this->invoice->number, "380", date_create($this->invoice->date), $this->invoice->client->getCurrencyCode());
+          $this->xrechnung->setDocumentInformation($this->invoice->number, "380", date_create($this->invoice->date), $this->invoice->client->getCurrencyCode());
         }
         if (!empty($this->invoice->po_number)) {
-            $xrechnung->setDocumentBuyerOrderReferencedDocument($this->invoice->po_number);
+            $this->xrechnung->setDocumentBuyerOrderReferencedDocument($this->invoice->po_number);
         }
 
         if (empty($client->routing_id)) {
-            $xrechnung->setDocumentBuyerReference(ctrans("texts.xinvoice_no_buyers_reference"));
+            $this->xrechnung->setDocumentBuyerReference(ctrans("texts.xinvoice_no_buyers_reference"));
         } else {
-            $xrechnung->setDocumentBuyerReference($client->routing_id);
+            $this->xrechnung->setDocumentBuyerReference($client->routing_id);
         }
         if (!empty($client->shipping_address1)){
-            $xrechnung->setDocumentShipToAddress($client->shipping_address1, $client->shipping_address2, "", $client->shipping_postal_code, $client->shipping_city, $client->shipping_country->iso_3166_2, $client->shipping_state);
+            $this->xrechnung->setDocumentShipToAddress($client->shipping_address1, $client->shipping_address2, "", $client->shipping_postal_code, $client->shipping_city, $client->shipping_country->iso_3166_2, $client->shipping_state);
         }
 
-        $xrechnung->addDocumentPaymentMean(68, ctrans("texts.xinvoice_online_payment"));
+        $this->xrechnung->addDocumentPaymentMean(68, ctrans("texts.xinvoice_online_payment"));
 
         if (str_contains($company->getSetting('vat_number'), "/")) {
-            $xrechnung->addDocumentSellerTaxRegistration("FC", $company->getSetting('vat_number'));
+            $this->xrechnung->addDocumentSellerTaxRegistration("FC", $company->getSetting('vat_number'));
         } else {
-            $xrechnung->addDocumentSellerTaxRegistration("VA", $company->getSetting('vat_number'));
+            $this->xrechnung->addDocumentSellerTaxRegistration("VA", $company->getSetting('vat_number'));
         }
 
         $invoicing_data = $this->invoice->calc();
@@ -92,29 +92,29 @@ class ZugferdEInvoice extends AbstractService
         //Create line items and calculate taxes
         foreach ($this->invoice->line_items as $index => $item) {
             /** @var \App\DataMapper\InvoiceItem $item **/
-            $xrechnung->addNewPosition($index)
+            $this->xrechnung->addNewPosition($index)
                 ->setDocumentPositionGrossPrice($item->gross_line_total)
                 ->setDocumentPositionNetPrice($item->line_total);
             if (!empty($item->product_key)){
                 if (!empty($item->notes)){
-                   $xrechnung->setDocumentPositionProductDetails($item->product_key, $item->notes);
+                   $this->xrechnung->setDocumentPositionProductDetails($item->product_key, $item->notes);
                 }
                 else {
-                    $xrechnung->setDocumentPositionProductDetails($item->product_key);
+                    $this->xrechnung->setDocumentPositionProductDetails($item->product_key);
                 }
             }
             else {
                 if (!empty($item->notes)){
-                    $xrechnung->setDocumentPositionProductDetails($item->notes);
+                    $this->xrechnung->setDocumentPositionProductDetails($item->notes);
                 }
                 else {
-                    $xrechnung->setDocumentPositionProductDetails("no product name defined");
+                    $this->xrechnung->setDocumentPositionProductDetails("no product name defined");
                 }
             }
             if (isset($item->task_id)) {
-                $xrechnung->setDocumentPositionQuantity($item->quantity, "HUR");
+                $this->xrechnung->setDocumentPositionQuantity($item->quantity, "HUR");
             } else {
-                $xrechnung->setDocumentPositionQuantity($item->quantity, "H87");
+                $this->xrechnung->setDocumentPositionQuantity($item->quantity, "H87");
             }
             $linenetamount = $item->line_total;
             if ($item->discount > 0) {
@@ -124,18 +124,18 @@ class ZugferdEInvoice extends AbstractService
                     $linenetamount -= $linenetamount * ($item->discount / 100);
                 }
             }
-            $xrechnung->setDocumentPositionLineSummation($linenetamount);
+            $this->xrechnung->setDocumentPositionLineSummation($linenetamount);
             // According to european law, each line item can only have one tax rate
             if (!(empty($item->tax_name1) && empty($item->tax_name2) && empty($item->tax_name3))) {
                 $taxtype = $this->getTaxType($item->tax_id);
                 if (!empty($item->tax_name1)) {
-                    $xrechnung->addDocumentPositionTax($taxtype, 'VAT', $item->tax_rate1);
+                    $this->xrechnung->addDocumentPositionTax($taxtype, 'VAT', $item->tax_rate1);
                     $this->addtoTaxMap($taxtype, $linenetamount, $item->tax_rate1);
                 } elseif (!empty($item->tax_name2)) {
-                    $xrechnung->addDocumentPositionTax($taxtype, 'VAT', $item->tax_rate2);
+                    $this->xrechnung->addDocumentPositionTax($taxtype, 'VAT', $item->tax_rate2);
                     $this->addtoTaxMap($taxtype, $linenetamount, $item->tax_rate2);
                 } elseif (!empty($item->tax_name3)) {
-                    $xrechnung->addDocumentPositionTax($taxtype, 'VAT', $item->tax_rate3);
+                    $this->xrechnung->addDocumentPositionTax($taxtype, 'VAT', $item->tax_rate3);
                     $this->addtoTaxMap($taxtype, $linenetamount, $item->tax_rate3);
                 } else {
                     nlog("Can't add correct tax position");
@@ -143,45 +143,45 @@ class ZugferdEInvoice extends AbstractService
             } else {
                 if (!empty($this->invoice->tax_name1)) {
                     $taxtype = $this->getTaxType($this->invoice->tax_name1);
-                    $xrechnung->addDocumentPositionTax($taxtype, 'VAT', $this->invoice->tax_rate1);
+                    $this->xrechnung->addDocumentPositionTax($taxtype, 'VAT', $this->invoice->tax_rate1);
                     $this->addtoTaxMap($taxtype, $linenetamount, $this->invoice->tax_rate1);
                 } elseif (!empty($this->invoice->tax_name2)) {
                     $taxtype = $this->getTaxType($this->invoice->tax_name2);
-                    $xrechnung->addDocumentPositionTax($taxtype, 'VAT', $this->invoice->tax_rate2);
+                    $this->xrechnung->addDocumentPositionTax($taxtype, 'VAT', $this->invoice->tax_rate2);
                     $this->addtoTaxMap($taxtype, $linenetamount, $this->invoice->tax_rate2);
                 } elseif (!empty($this->invoice->tax_name3)) {
                     $taxtype = $this->getTaxType($this->invoice->tax_name3);
-                    $xrechnung->addDocumentPositionTax($taxtype, 'VAT', $this->invoice->tax_rate3);
+                    $this->xrechnung->addDocumentPositionTax($taxtype, 'VAT', $this->invoice->tax_rate3);
                     $this->addtoTaxMap($taxtype, $linenetamount, $this->invoice->tax_rate3);
                 } else {
                     $taxtype = ZugferdDutyTaxFeeCategories::ZERO_RATED_GOODS;
-                    $xrechnung->addDocumentPositionTax($taxtype, 'VAT', 0);
+                    $this->xrechnung->addDocumentPositionTax($taxtype, 'VAT', 0);
                     $this->addtoTaxMap($taxtype, $linenetamount, 0);
                     nlog("Can't add correct tax position");
                 }
             }
         }
 
-        $xrechnung->setDocumentSummation($this->invoice->amount, $this->invoice->balance, $invoicing_data->getSubTotal(), $invoicing_data->getTotalSurcharges(), $invoicing_data->getTotalDiscount(), $invoicing_data->getSubTotal(), $invoicing_data->getItemTotalTaxes(), 0.0, $this->invoice->amount-$this->invoice->balance);
+        $this->xrechnung->setDocumentSummation($this->invoice->amount, $this->invoice->balance, $invoicing_data->getSubTotal(), $invoicing_data->getTotalSurcharges(), $invoicing_data->getTotalDiscount(), $invoicing_data->getSubTotal(), $invoicing_data->getItemTotalTaxes(), 0.0, $this->invoice->amount-$this->invoice->balance);
 
         foreach ($this->tax_map as $item){
-            $xrechnung->addDocumentTax($item["tax_type"], "VAT", $item["net_amount"], $item["tax_rate"]*$item["net_amount"], $item["tax_rate"]*100);
-        }
-        $disk = config('filesystems.default');
-
-        if (!Storage::disk($disk)->exists($client->e_invoice_filepath($this->invoice->invitations->first()))) {
-            Storage::makeDirectory($client->e_invoice_filepath($this->invoice->invitations->first()));
+            $this->xrechnung->addDocumentTax($item["tax_type"], "VAT", $item["net_amount"], $item["tax_rate"]*$item["net_amount"], $item["tax_rate"]*100);
         }
 
-        $xrechnung->writeFile(Storage::disk($disk)->path($client->e_invoice_filepath($this->invoice->invitations->first()) . $this->invoice->getFileName("xml")));
         // The validity can be checked using https://portal3.gefeg.com/invoice/validation or https://e-rechnung.bayern.de/app/#/upload
-        if ($this->returnObject){
-            return $xrechnung;
-        }
-
-        throw new \Exception("Invalid e invoice object");
-
-        // return $client->e_invoice_filepath($this->invoice->invitations->first()) . $this->invoice->getFileName("xml");
+        return $this;
+        
+    }
+    
+    /**
+     * Returns the XML document
+     * in string format
+     *
+     * @return string
+     */
+    public function getXml(): string
+    {
+        return $this->xrechnung->getContent();
     }
 
     private function getTaxType($name): string
diff --git a/app/Services/Invoice/GetInvoiceEInvoice.php b/app/Services/Invoice/GetInvoiceEInvoice.php
deleted file mode 100644
index 0434b6917fd0..000000000000
--- a/app/Services/Invoice/GetInvoiceEInvoice.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Invoice Ninja (https://invoiceninja.com).
- *
- * @link https://github.com/invoiceninja/invoiceninja source repository
- *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
- *
- * @license https://www.elastic.co/licensing/elastic-license
- */
-
-namespace App\Services\Invoice;
-
-use App\Jobs\Invoice\CreateEInvoice;
-use App\Models\ClientContact;
-use App\Models\Invoice;
-use App\Services\AbstractService;
-use Illuminate\Support\Facades\Storage;
-
-class GetInvoiceEInvoice extends AbstractService
-{
-    public function __construct(public Invoice $invoice, public ?ClientContact $contact = null)
-    {
-    }
-
-    public function run()
-    {
-        if (! $this->contact) {
-            $this->contact = $this->invoice->client->primary_contact()->first() ?: $this->invoice->client->contacts()->first();
-        }
-
-        $invitation = $this->invoice->invitations->where('client_contact_id', $this->contact->id)->first();
-
-        if (! $invitation) {
-            $invitation = $this->invoice->invitations->first();
-        }
-
-        $file_path = $this->invoice->client->e_invoice_filepath($this->invoice->invitations->first()). $this->invoice->getFileName("xml");
-
-        // $disk = 'public';
-        $disk = config('filesystems.default');
-
-        $file = Storage::disk($disk)->exists($file_path);
-
-        if (! $file) {
-            $file_path = (new CreateEInvoice($this->invoice))->handle();
-            (new \App\Jobs\Invoice\MergeEInvoice($this->invoice))->handle();
-
-        }
-        return $file_path;
-    }
-}
diff --git a/app/Services/Invoice/GetInvoicePdf.php b/app/Services/Invoice/GetInvoicePdf.php
index 8044e8a290d6..9211a15bb8fd 100644
--- a/app/Services/Invoice/GetInvoicePdf.php
+++ b/app/Services/Invoice/GetInvoicePdf.php
@@ -13,7 +13,6 @@ namespace App\Services\Invoice;
 
 use App\Jobs\Entity\CreateEntityPdf;
 use App\Jobs\Invoice\CreateEInvoice;
-use App\Jobs\Invoice\MergeEInvoice;
 use App\Models\ClientContact;
 use App\Models\Invoice;
 use App\Services\AbstractService;
@@ -49,10 +48,7 @@ class GetInvoicePdf extends AbstractService
         if (! $file) {
             $file_path = (new CreateEntityPdf($invitation))->handle();
         }
-        if ($this->invoice->client->getSetting('enable_e_invoice')){
-            (new CreateEInvoice($this->invoice))->handle();
-           (new MergeEInvoice($this->invoice, $file_path))->handle();
-        }
+        
         return $file_path;
     }
 }
diff --git a/app/Services/Invoice/InvoiceService.php b/app/Services/Invoice/InvoiceService.php
index d350d28a597c..148f0cae88d5 100644
--- a/app/Services/Invoice/InvoiceService.php
+++ b/app/Services/Invoice/InvoiceService.php
@@ -13,6 +13,7 @@ namespace App\Services\Invoice;
 
 use App\Events\Invoice\InvoiceWasArchived;
 use App\Jobs\Entity\CreateEntityPdf;
+use App\Jobs\Entity\CreateRawPdf;
 use App\Jobs\Inventory\AdjustProductInventory;
 use App\Jobs\Invoice\CreateEInvoice;
 use App\Libraries\Currency\Conversion\CurrencyApi;
@@ -187,6 +188,13 @@ class InvoiceService
         return (new GetInvoicePdf($this->invoice, $contact))->run();
     }
 
+    public function getRawInvoicePdf($contact = null)
+    {
+        $invitation = $contact ? $this->invoice->invitations()->where('contact_id', $contact->id)->first() : $this->invoice->invitations()->first();
+
+        return (new CreateRawPdf($invitation, $invitation->company->db))->handle();
+    }
+
     public function getInvoiceDeliveryNote(Invoice $invoice, \App\Models\ClientContact $contact = null)
     {
         return (new GenerateDeliveryNote($invoice, $contact))->run();
@@ -194,13 +202,9 @@ class InvoiceService
 
     public function getEInvoice($contact = null)
     {
-        return (new GetInvoiceEInvoice($this->invoice, $contact))->run();
+        return (new CreateEInvoice($this->invoice))->handle();
     }
 
-    public function mergeEInvoice($contact = null): void
-    {
-        (new MergeEInvoice($this->invoice, $contact))->run();
-    }
     public function sendEmail($contact = null)
     {
         $send_email = new SendEmail($this->invoice, null, $contact);
@@ -464,13 +468,6 @@ class InvoiceService
             if ($force) {
                 $this->invoice->invitations->each(function ($invitation) {
                     (new CreateEntityPdf($invitation))->handle();
-
-                    if ($invitation->invoice->client->getSetting('enable_e_invoice') && $invitation instanceof InvoiceInvitation)
-                    {
-                        (new CreateEInvoice($invitation->invoice))->handle();
-                        (new MergeEInvoice($invitation->invoice))->run();
-                    }
-
                 });
 
                 return $this;

From 8f5a63eb946006972a11c0687eeb0b2452c11835 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 16 Aug 2023 19:57:03 +1000
Subject: [PATCH 34/42] Cleanup

---
 app/Http/Livewire/PdfSlot.php          |  1 -
 app/Services/Invoice/MergeEInvoice.php | 29 --------------------------
 2 files changed, 30 deletions(-)
 delete mode 100644 app/Services/Invoice/MergeEInvoice.php

diff --git a/app/Http/Livewire/PdfSlot.php b/app/Http/Livewire/PdfSlot.php
index 3a44b5b3a8bd..a97444ba89ee 100644
--- a/app/Http/Livewire/PdfSlot.php
+++ b/app/Http/Livewire/PdfSlot.php
@@ -26,7 +26,6 @@ use Illuminate\Support\Facades\Cache;
 use App\Models\PurchaseOrderInvitation;
 use App\Models\RecurringInvoiceInvitation;
 use App\Jobs\Vendor\CreatePurchaseOrderPdf;
-use App\Services\Invoice\GetInvoiceEInvoice;
 use App\Services\PdfMaker\Designs\Utilities\DesignHelpers;
 
 class PdfSlot extends Component
diff --git a/app/Services/Invoice/MergeEInvoice.php b/app/Services/Invoice/MergeEInvoice.php
deleted file mode 100644
index ad80c49cd821..000000000000
--- a/app/Services/Invoice/MergeEInvoice.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Services\Invoice;
-
-use App\Models\ClientContact;
-use App\Models\Invoice;
-use Illuminate\Support\Facades\Storage;
-
-class MergeEInvoice
-{
-
-    /**
-     * @param Invoice $invoice
-     */
-    public function __construct(public Invoice $invoice, public string $pdf_path = "")
-    {
-    }
-
-    public function run(): void
-    {
-        if (!empty($this->pdf_path)) {
-            (new \App\Jobs\Invoice\MergeEInvoice($this->invoice, $this->pdf_path))->handle();
-        }
-        else {
-            (new \App\Jobs\Invoice\MergeEInvoice($this->invoice))->handle();
-        }
-
-    }
-}

From 822aed5a6117e2836ef1526c352eb9aed6c93e81 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 16 Aug 2023 20:52:01 +1000
Subject: [PATCH 35/42] Fixes for einvoicing

---
 composer.json | 10 +++++--
 composer.lock | 83 ++++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 73 insertions(+), 20 deletions(-)

diff --git a/composer.json b/composer.json
index 0d071ca1da10..d6ae389afaff 100644
--- a/composer.json
+++ b/composer.json
@@ -53,7 +53,7 @@
         "halaxa/json-machine": "^0.7.0",
         "hashids/hashids": "^4.0",
         "hedii/laravel-gelf-logger": "^7.0",
-        "horstoeko/zugferd": "^1",
+        "horstoeko/zugferd": "dev-master",
         "imdhemy/laravel-purchases": "^1.7",
         "intervention/image": "^2.5",
         "invoiceninja/inspector": "^1.0",
@@ -170,5 +170,11 @@
         }
     },
     "minimum-stability": "dev",
-    "prefer-stable": true
+    "prefer-stable": true,
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/turbo124/zugferd.git"
+        }
+    ]
 }
diff --git a/composer.lock b/composer.lock
index 3d3cb2598a93..6e9124a5e1b7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "9d7348352c913eb82fcca2e67670e1f8",
+    "content-hash": "b48cfe4230f3fd18612bc2852ae2e029",
     "packages": [
         {
             "name": "adrienrn/php-mimetyper",
@@ -3344,16 +3344,16 @@
         },
         {
             "name": "horstoeko/zugferd",
-            "version": "v1.0.20",
+            "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "https://github.com/horstoeko/zugferd.git",
-                "reference": "725c130ec0a09d72cf54b3d819840f3959a5502c"
+                "url": "https://github.com/turbo124/zugferd.git",
+                "reference": "2d27efab66d948266dd439db5caeeb8ed1756b4c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/horstoeko/zugferd/zipball/725c130ec0a09d72cf54b3d819840f3959a5502c",
-                "reference": "725c130ec0a09d72cf54b3d819840f3959a5502c",
+                "url": "https://api.github.com/repos/turbo124/zugferd/zipball/2d27efab66d948266dd439db5caeeb8ed1756b4c",
+                "reference": "2d27efab66d948266dd439db5caeeb8ed1756b4c",
                 "shasum": ""
             },
             "require": {
@@ -3379,17 +3379,60 @@
                 "sebastian/phpcpd": "^6",
                 "squizlabs/php_codesniffer": "^3"
             },
+            "default-branch": true,
             "type": "package",
             "autoload": {
                 "psr-4": {
                     "horstoeko\\zugferd\\": "src",
+                    "horstoeko\\zugferd\\rsm\\": "src/entities/rsm",
                     "horstoeko\\zugferd\\qdt\\": "src/entities/qdt",
                     "horstoeko\\zugferd\\ram\\": "src/entities/ram",
-                    "horstoeko\\zugferd\\rsm\\": "src/entities/rsm",
                     "horstoeko\\zugferd\\udt\\": "src/entities/udt"
                 }
             },
-            "notification-url": "https://packagist.org/downloads/",
+            "autoload-dev": {
+                "psr-4": {
+                    "horstoeko\\zugferd\\tests\\": "tests"
+                }
+            },
+            "scripts": {
+                "tests": [
+                    "./vendor/bin/phpunit ./tests/"
+                ],
+                "testsreal": [
+                    "./vendor/bin/phpunit --configuration ./build/phpunit.xml"
+                ],
+                "phpcs": [
+                    "./vendor/bin/phpcs --standard=./build/phpcsrules.xml --extensions=php --ignore=autoload.php ./src ./tests"
+                ],
+                "phpcs12": [
+                    "./vendor/bin/phpcs --standard=./build/phpcsrules_psr12.xml --extensions=php --ignore=autoload.php ./src ./tests"
+                ],
+                "phpcbf": [
+                    "./vendor/bin/phpcbf -q ./src ./tests"
+                ],
+                "phpcbf1": [
+                    "./vendor/bin/phpcbf --standard=./build/phpcsrules_psr1.xml -q ./src ./tests"
+                ],
+                "phpcbf2": [
+                    "./vendor/bin/phpcbf --standard=./build/phpcsrules_psr2.xml -q ./src ./tests"
+                ],
+                "phpcbf12": [
+                    "./vendor/bin/phpcbf --standard=./build/phpcsrules_psr12.xml -q ./src ./tests"
+                ],
+                "phpcbfsq": [
+                    "./vendor/bin/phpcbf --standard=./build/phpcsrules_squiz.xml -q ./src ./tests"
+                ],
+                "phpstan": [
+                    "./vendor/bin/phpstan analyze -c ./build/phpstan.neon --autoload-file=vendor/autoload.php --no-interaction --no-progress --xdebug"
+                ],
+                "phpstan_cs": [
+                    "./vendor/bin/phpstan analyze -c ./build/phpstan.neon --autoload-file=vendor/autoload.php --no-interaction --no-progress --error-format=checkstyle --xdebug"
+                ],
+                "makedoc": [
+                    "phing -f ./build.xml projectdoc"
+                ]
+            },
             "license": [
                 "MIT"
             ],
@@ -3403,17 +3446,16 @@
             "description": "A library for creating and reading european electronic invoices",
             "homepage": "https://github.com/horstoeko/zugferd",
             "keywords": [
-                "ZUGFeRD",
                 "electronic",
                 "factur-x",
                 "invoice",
-                "xrechnung"
+                "xrechnung",
+                "zugferd"
             ],
             "support": {
-                "issues": "https://github.com/horstoeko/zugferd/issues",
-                "source": "https://github.com/horstoeko/zugferd/tree/v1.0.20"
+                "source": "https://github.com/turbo124/zugferd/tree/add_string_output_for_pdf"
             },
-            "time": "2023-07-04T15:21:32+00:00"
+            "time": "2023-08-16T10:23:41+00:00"
         },
         {
             "name": "http-interop/http-factory-guzzle",
@@ -6248,25 +6290,29 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "2.68.1",
+            "version": "2.69.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "4f991ed2a403c85efbc4f23eb4030063fdbe01da"
+                "reference": "4308217830e4ca445583a37d1bf4aff4153fa81c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4f991ed2a403c85efbc4f23eb4030063fdbe01da",
-                "reference": "4f991ed2a403c85efbc4f23eb4030063fdbe01da",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4308217830e4ca445583a37d1bf4aff4153fa81c",
+                "reference": "4308217830e4ca445583a37d1bf4aff4153fa81c",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "php": "^7.1.8 || ^8.0",
+                "psr/clock": "^1.0",
                 "symfony/polyfill-mbstring": "^1.0",
                 "symfony/polyfill-php80": "^1.16",
                 "symfony/translation": "^3.4 || ^4.0 || ^5.0 || ^6.0"
             },
+            "provide": {
+                "psr/clock-implementation": "1.0"
+            },
             "require-dev": {
                 "doctrine/dbal": "^2.0 || ^3.1.4",
                 "doctrine/orm": "^2.7",
@@ -6346,7 +6392,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-06-20T18:29:04+00:00"
+            "time": "2023-08-03T09:00:52+00:00"
         },
         {
             "name": "nette/schema",
@@ -18319,6 +18365,7 @@
     "aliases": [],
     "minimum-stability": "dev",
     "stability-flags": {
+        "horstoeko/zugferd": 20,
         "webpatser/laravel-countries": 20
     },
     "prefer-stable": true,

From 00ff163d4fe427dbcbceebc35b7f139a5ae90b66 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 16 Aug 2023 20:59:42 +1000
Subject: [PATCH 36/42] Fixes for tests

---
 tests/Unit/EInvoiceTest.php | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/tests/Unit/EInvoiceTest.php b/tests/Unit/EInvoiceTest.php
index 41349c264b04..59c2024017a1 100644
--- a/tests/Unit/EInvoiceTest.php
+++ b/tests/Unit/EInvoiceTest.php
@@ -43,9 +43,7 @@ class EInvoiceTest extends TestCase
         $this->invoice->client->routing_id = 'DE123456789';
         $this->invoice->client->save();
         $e_invoice = (new CreateEInvoice($this->invoice))->handle();
-        (new \App\Jobs\Invoice\MergeEInvoice($this->invoice))->handle();
-        $this->assertNotNull($e_invoice);
-        $this->assertTrue(Storage::exists($e_invoice));
+        $this->assertIsString($e_invoice);
     }
 
      /**
@@ -58,7 +56,7 @@ class EInvoiceTest extends TestCase
          $this->invoice->client->save();
 
          $e_invoice = (new CreateEInvoice($this->invoice))->handle();
-         $document = ZugferdDocumentReader::readAndGuessFromFile(Storage::path($e_invoice));
+         $document = ZugferdDocumentReader::readAndGuessFromContent($e_invoice);
          $document->getDocumentInformation($documentno, $documenttypecode, $documentdate, $documentcurrency, $taxcurrency, $taxname, $documentlangeuage, $rest);
          $this->assertEquals($this->invoice->number, $documentno);
      }
@@ -69,9 +67,7 @@ class EInvoiceTest extends TestCase
      public function checkEmbededPDFFile()
      {
          $pdf = (new CreateEntityPdf($this->invoice->invitations()->first()))->handle();
-         (new CreateEInvoice($this->invoice))->handle();
-         (new \App\Jobs\Invoice\MergeEInvoice($this->invoice))->handle();
-         $document = ZugferdDocumentReader::readAndGuessFromFile($pdf);
+         $document = ZugferdDocumentReader::readAndGuessFromContent($pdf);
          $document->getDocumentInformation($documentno, $documenttypecode, $documentdate, $documentcurrency, $taxcurrency, $taxname, $documentlangeuage, $rest);
          $this->assertEquals($this->invoice->number, $documentno);
      }

From 18f3b6522f97519134e2f42a0d94e33d91343f94 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 16 Aug 2023 22:05:35 +1000
Subject: [PATCH 37/42] Fixes for adding back xml e invoices when zipping in
 bulk

---
 app/Jobs/Invoice/ZipInvoices.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/Jobs/Invoice/ZipInvoices.php b/app/Jobs/Invoice/ZipInvoices.php
index 25722b6f6fb2..dc5b39cf56f5 100644
--- a/app/Jobs/Invoice/ZipInvoices.php
+++ b/app/Jobs/Invoice/ZipInvoices.php
@@ -75,9 +75,16 @@ class ZipInvoices implements ShouldQueue
 
         try {
 
+
             foreach ($this->invoices as $invoice) {
+                
+                if ($invoice->client->getSetting('enable_e_invoice')) {
+                    $xml = $invoice->service()->getEInvoice();
+                    $zipFile->addFromString($invoice->getFileName("xml"), $xml);
+                }
+
                 $file = $invoice->service()->getRawInvoicePdf();
-                $zip_file_name = $invoice->getFileName();
+$zip_file_name = $invoice->getFileName();
                 $zipFile->addFromString($zip_file_name, $file);
             }
 

From 156aa5cc55748fb6c70eea12a9e28322594385a5 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 17 Aug 2023 08:18:15 +1000
Subject: [PATCH 38/42] Updates for composer

---
 composer.json |  10 +---
 composer.lock | 127 +++++++++++++++++---------------------------------
 2 files changed, 46 insertions(+), 91 deletions(-)

diff --git a/composer.json b/composer.json
index d6ae389afaff..0d071ca1da10 100644
--- a/composer.json
+++ b/composer.json
@@ -53,7 +53,7 @@
         "halaxa/json-machine": "^0.7.0",
         "hashids/hashids": "^4.0",
         "hedii/laravel-gelf-logger": "^7.0",
-        "horstoeko/zugferd": "dev-master",
+        "horstoeko/zugferd": "^1",
         "imdhemy/laravel-purchases": "^1.7",
         "intervention/image": "^2.5",
         "invoiceninja/inspector": "^1.0",
@@ -170,11 +170,5 @@
         }
     },
     "minimum-stability": "dev",
-    "prefer-stable": true,
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/turbo124/zugferd.git"
-        }
-    ]
+    "prefer-stable": true
 }
diff --git a/composer.lock b/composer.lock
index 6e9124a5e1b7..2be5001245e6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b48cfe4230f3fd18612bc2852ae2e029",
+    "content-hash": "9d7348352c913eb82fcca2e67670e1f8",
     "packages": [
         {
             "name": "adrienrn/php-mimetyper",
@@ -424,16 +424,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.278.3",
+            "version": "3.279.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "596534c0627d8b38597061341e99b460437d1a16"
+                "reference": "7b3d38cfccd393add0ea0ce281de91846967c61e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/596534c0627d8b38597061341e99b460437d1a16",
-                "reference": "596534c0627d8b38597061341e99b460437d1a16",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/7b3d38cfccd393add0ea0ce281de91846967c61e",
+                "reference": "7b3d38cfccd393add0ea0ce281de91846967c61e",
                 "shasum": ""
             },
             "require": {
@@ -442,11 +442,11 @@
                 "ext-pcre": "*",
                 "ext-simplexml": "*",
                 "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5",
-                "guzzlehttp/promises": "^1.4.0",
+                "guzzlehttp/promises": "^1.4.0 || ^2.0",
                 "guzzlehttp/psr7": "^1.9.1 || ^2.4.5",
                 "mtdowling/jmespath.php": "^2.6",
-                "php": ">=5.5",
-                "psr/http-message": "^1.0"
+                "php": ">=7.2.5",
+                "psr/http-message": "^1.0 || ^2.0"
             },
             "require-dev": {
                 "andrewsville/php-token-reflection": "^1.4",
@@ -461,7 +461,7 @@
                 "ext-sockets": "*",
                 "nette/neon": "^2.3",
                 "paragonie/random_compat": ">= 2",
-                "phpunit/phpunit": "^4.8.35 || ^5.6.3 || ^9.5",
+                "phpunit/phpunit": "^5.6.3 || ^8.5 || ^9.5",
                 "psr/cache": "^1.0",
                 "psr/simple-cache": "^1.0",
                 "sebastian/comparator": "^1.2.3 || ^4.0",
@@ -513,9 +513,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.278.3"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.279.0"
             },
-            "time": "2023-08-15T18:07:55+00:00"
+            "time": "2023-08-16T18:18:34+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -2832,29 +2832,33 @@
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "1.5.3",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e"
+                "reference": "111166291a0f8130081195ac4556a5587d7f1b5d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/67ab6e18aaa14d753cc148911d273f6e6cb6721e",
-                "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/111166291a0f8130081195ac4556a5587d7f1b5d",
+                "reference": "111166291a0f8130081195ac4556a5587d7f1b5d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5"
+                "php": "^7.2.5 || ^8.0"
             },
             "require-dev": {
-                "symfony/phpunit-bridge": "^4.4 || ^5.1"
+                "bamarni/composer-bin-plugin": "^1.8.1",
+                "phpunit/phpunit": "^8.5.29 || ^9.5.23"
             },
             "type": "library",
+            "extra": {
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": false
+                }
+            },
             "autoload": {
-                "files": [
-                    "src/functions_include.php"
-                ],
                 "psr-4": {
                     "GuzzleHttp\\Promise\\": "src/"
                 }
@@ -2891,7 +2895,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/1.5.3"
+                "source": "https://github.com/guzzle/promises/tree/2.0.1"
             },
             "funding": [
                 {
@@ -2907,7 +2911,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-21T12:31:43+00:00"
+            "time": "2023-08-03T15:11:55+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
@@ -3344,16 +3348,16 @@
         },
         {
             "name": "horstoeko/zugferd",
-            "version": "dev-master",
+            "version": "v1.0.23",
             "source": {
                 "type": "git",
-                "url": "https://github.com/turbo124/zugferd.git",
-                "reference": "2d27efab66d948266dd439db5caeeb8ed1756b4c"
+                "url": "https://github.com/horstoeko/zugferd.git",
+                "reference": "bb55417be4c4de8deb0113e832feeaf7b4d3984e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/turbo124/zugferd/zipball/2d27efab66d948266dd439db5caeeb8ed1756b4c",
-                "reference": "2d27efab66d948266dd439db5caeeb8ed1756b4c",
+                "url": "https://api.github.com/repos/horstoeko/zugferd/zipball/bb55417be4c4de8deb0113e832feeaf7b4d3984e",
+                "reference": "bb55417be4c4de8deb0113e832feeaf7b4d3984e",
                 "shasum": ""
             },
             "require": {
@@ -3379,60 +3383,17 @@
                 "sebastian/phpcpd": "^6",
                 "squizlabs/php_codesniffer": "^3"
             },
-            "default-branch": true,
             "type": "package",
             "autoload": {
                 "psr-4": {
                     "horstoeko\\zugferd\\": "src",
-                    "horstoeko\\zugferd\\rsm\\": "src/entities/rsm",
                     "horstoeko\\zugferd\\qdt\\": "src/entities/qdt",
                     "horstoeko\\zugferd\\ram\\": "src/entities/ram",
+                    "horstoeko\\zugferd\\rsm\\": "src/entities/rsm",
                     "horstoeko\\zugferd\\udt\\": "src/entities/udt"
                 }
             },
-            "autoload-dev": {
-                "psr-4": {
-                    "horstoeko\\zugferd\\tests\\": "tests"
-                }
-            },
-            "scripts": {
-                "tests": [
-                    "./vendor/bin/phpunit ./tests/"
-                ],
-                "testsreal": [
-                    "./vendor/bin/phpunit --configuration ./build/phpunit.xml"
-                ],
-                "phpcs": [
-                    "./vendor/bin/phpcs --standard=./build/phpcsrules.xml --extensions=php --ignore=autoload.php ./src ./tests"
-                ],
-                "phpcs12": [
-                    "./vendor/bin/phpcs --standard=./build/phpcsrules_psr12.xml --extensions=php --ignore=autoload.php ./src ./tests"
-                ],
-                "phpcbf": [
-                    "./vendor/bin/phpcbf -q ./src ./tests"
-                ],
-                "phpcbf1": [
-                    "./vendor/bin/phpcbf --standard=./build/phpcsrules_psr1.xml -q ./src ./tests"
-                ],
-                "phpcbf2": [
-                    "./vendor/bin/phpcbf --standard=./build/phpcsrules_psr2.xml -q ./src ./tests"
-                ],
-                "phpcbf12": [
-                    "./vendor/bin/phpcbf --standard=./build/phpcsrules_psr12.xml -q ./src ./tests"
-                ],
-                "phpcbfsq": [
-                    "./vendor/bin/phpcbf --standard=./build/phpcsrules_squiz.xml -q ./src ./tests"
-                ],
-                "phpstan": [
-                    "./vendor/bin/phpstan analyze -c ./build/phpstan.neon --autoload-file=vendor/autoload.php --no-interaction --no-progress --xdebug"
-                ],
-                "phpstan_cs": [
-                    "./vendor/bin/phpstan analyze -c ./build/phpstan.neon --autoload-file=vendor/autoload.php --no-interaction --no-progress --error-format=checkstyle --xdebug"
-                ],
-                "makedoc": [
-                    "phing -f ./build.xml projectdoc"
-                ]
-            },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
@@ -3446,16 +3407,17 @@
             "description": "A library for creating and reading european electronic invoices",
             "homepage": "https://github.com/horstoeko/zugferd",
             "keywords": [
+                "ZUGFeRD",
                 "electronic",
                 "factur-x",
                 "invoice",
-                "xrechnung",
-                "zugferd"
+                "xrechnung"
             ],
             "support": {
-                "source": "https://github.com/turbo124/zugferd/tree/add_string_output_for_pdf"
+                "issues": "https://github.com/horstoeko/zugferd/issues",
+                "source": "https://github.com/horstoeko/zugferd/tree/v1.0.23"
             },
-            "time": "2023-08-16T10:23:41+00:00"
+            "time": "2023-08-16T17:39:36+00:00"
         },
         {
             "name": "http-interop/http-factory-guzzle",
@@ -5902,16 +5864,16 @@
         },
         {
             "name": "moneyphp/money",
-            "version": "v4.1.1",
+            "version": "v4.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/moneyphp/money.git",
-                "reference": "9682220995ffd396843be5b4ee1e5f2c2d6ecee2"
+                "reference": "f660ab7f1d7a4c2ffdd30f50c55ed2c95c26fc3f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/moneyphp/money/zipball/9682220995ffd396843be5b4ee1e5f2c2d6ecee2",
-                "reference": "9682220995ffd396843be5b4ee1e5f2c2d6ecee2",
+                "url": "https://api.github.com/repos/moneyphp/money/zipball/f660ab7f1d7a4c2ffdd30f50c55ed2c95c26fc3f",
+                "reference": "f660ab7f1d7a4c2ffdd30f50c55ed2c95c26fc3f",
                 "shasum": ""
             },
             "require": {
@@ -5985,9 +5947,9 @@
             ],
             "support": {
                 "issues": "https://github.com/moneyphp/money/issues",
-                "source": "https://github.com/moneyphp/money/tree/v4.1.1"
+                "source": "https://github.com/moneyphp/money/tree/v4.2.0"
             },
-            "time": "2023-04-11T09:18:34+00:00"
+            "time": "2023-08-16T14:31:24+00:00"
         },
         {
             "name": "monolog/monolog",
@@ -18365,7 +18327,6 @@
     "aliases": [],
     "minimum-stability": "dev",
     "stability-flags": {
-        "horstoeko/zugferd": 20,
         "webpatser/laravel-countries": 20
     },
     "prefer-stable": true,

From 035b683eb74958baa35eaa51103a378a22446369 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 17 Aug 2023 08:58:10 +1000
Subject: [PATCH 39/42] Fixes for types

---
 app/Console/Commands/CheckData.php            |  1 +
 .../Requests/Shop/StoreShopClientRequest.php  |  2 +-
 app/Utils/Traits/Inviteable.php               |  6 ++---
 phpstan.neon                                  |  1 +
 .../components/livewire/pdf-slot.blade.php    | 22 ++++++++++---------
 5 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/app/Console/Commands/CheckData.php b/app/Console/Commands/CheckData.php
index 8f49531ea467..7d931c1022fa 100644
--- a/app/Console/Commands/CheckData.php
+++ b/app/Console/Commands/CheckData.php
@@ -35,6 +35,7 @@ use App\Models\BankTransaction;
 use App\Models\QuoteInvitation;
 use Illuminate\Console\Command;
 use App\Models\CreditInvitation;
+use App\Models\RecurringInvoice;
 use App\Models\InvoiceInvitation;
 use App\DataMapper\ClientSettings;
 use Illuminate\Support\Facades\DB;
diff --git a/app/Http/Requests/Shop/StoreShopClientRequest.php b/app/Http/Requests/Shop/StoreShopClientRequest.php
index beffeeac2f1d..140dc08a904b 100644
--- a/app/Http/Requests/Shop/StoreShopClientRequest.php
+++ b/app/Http/Requests/Shop/StoreShopClientRequest.php
@@ -108,7 +108,7 @@ class StoreShopClientRequest extends Request
             $settings->currency_id = $this->getCurrencyCode($input['currency_code']);
         }
 
-        $input['settings'] = $settings;
+        $input['settings'] = (array)$settings;
 
         if (isset($input['contacts'])) {
             foreach ($input['contacts'] as $key => $contact) {
diff --git a/app/Utils/Traits/Inviteable.php b/app/Utils/Traits/Inviteable.php
index ed7c7056845c..13a161462aae 100644
--- a/app/Utils/Traits/Inviteable.php
+++ b/app/Utils/Traits/Inviteable.php
@@ -79,7 +79,7 @@ trait Inviteable
         if (Ninja::isHosted()) {
             $domain = $this->company->domain();
         } else {
-            $domain = strlen($this->company->portal_domain) > 5 ? $this->company->portal_domain : config('ninja.app_url');
+            $domain = strlen($this->company->portal_domain ?? '') > 5 ? $this->company->portal_domain : config('ninja.app_url');
         }
 
         $entity_type = Str::snake(class_basename($this->entityType()));
@@ -94,7 +94,7 @@ trait Inviteable
         if (Ninja::isHosted()) {
             $domain = $this->company->domain();
         } else {
-            $domain = strlen($this->company->portal_domain) > 5 ? $this->company->portal_domain : config('ninja.app_url');
+            $domain = strlen($this->company->portal_domain ?? '') > 5 ? $this->company->portal_domain : config('ninja.app_url');
         }
 
         switch ($this->company->portal_mode) {
@@ -119,7 +119,7 @@ trait Inviteable
         if (Ninja::isHosted()) {
             $domain = $this->company->domain();
         } else {
-            $domain = strlen($this->company->portal_domain) > 5 ? $this->company->portal_domain : config('ninja.app_url');
+            $domain = strlen($this->company->portal_domain ?? '') > 5 ? $this->company->portal_domain : config('ninja.app_url');
         }
 
         switch ($this->company->portal_mode) {
diff --git a/phpstan.neon b/phpstan.neon
index ff93e96cc5b3..6bc4f9205594 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -13,6 +13,7 @@ parameters:
         - 'app/DataMapper/Analytics/*'
         - 'app/PaymentDrivers/Authorize/*'
         - 'app/Utils/Traits/*'
+        - 'resources/views/*'
     universalObjectCratesClasses:
         - App\DataMapper\Tax\RuleInterface
         - App\DataMapper\FeesAndLimits
diff --git a/resources/views/portal/ninja2020/components/livewire/pdf-slot.blade.php b/resources/views/portal/ninja2020/components/livewire/pdf-slot.blade.php
index 290de387db96..d15f748c6e23 100644
--- a/resources/views/portal/ninja2020/components/livewire/pdf-slot.blade.php
+++ b/resources/views/portal/ninja2020/components/livewire/pdf-slot.blade.php
@@ -1,5 +1,5 @@
 <div>
-  <div class="flex flex-col items-end mb-2" x-data>
+  <div class="flex flex-row space-x-2 float-right mb-2" x-data>
     <button wire:loading.attr="disabled" wire:click="downloadPdf" class="bg-primary text-white px-4 py-4 lg:px-2 lg:py-2 rounded" type="button">
         <span class="mr-0">{{ ctrans('texts.download_pdf') }}</span>
         <div wire:loading wire:target="downloadPdf">
@@ -9,15 +9,17 @@
             </svg>
         </div>
     </button>
-  <button wire:loading.attr="disabled" wire:click="downloadEInvoice" class="bg-primary text-white px-4 py-4 lg:px-2 lg:py-2 rounded" type="button">
-          <span>{{ ctrans('texts.download_e_invoice') }}</span>
-          <div wire:loading wire:target="downloadEInvoice">
-              <svg class="animate-spin h-5 w-5 text-blue" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
-                  <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
-                  <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
-              </svg>
-          </div>
-      </button>
+    @if($settings->enable_e_invoice && $entity_type == 'invoice')
+    <button wire:loading.attr="disabled" wire:click="downloadEInvoice" class="bg-primary text-white px-4 py-4 lg:px-2 lg:py-2 rounded" type="button">
+        <span>{{ ctrans('texts.download_e_invoice') }}</span>
+        <div wire:loading wire:target="downloadEInvoice">
+            <svg class="animate-spin h-5 w-5 text-blue" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+                <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
+                <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
+            </svg>
+        </div>
+    </button>
+    @endif
   </div>
   <div class="hidden lg:block">
     <div wire:init="getPdf()">

From 44956ce6b83344433de07788155c95474c3cdf18 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 17 Aug 2023 09:06:30 +1000
Subject: [PATCH 40/42] merge downloads into single action for e invoices

---
 .../Controllers/ClientPortal/InvoiceController.php  | 13 +++++++++++--
 .../views/portal/ninja2020/invoices/index.blade.php |  1 -
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/ClientPortal/InvoiceController.php b/app/Http/Controllers/ClientPortal/InvoiceController.php
index f67ae6042705..265cc5f8961e 100644
--- a/app/Http/Controllers/ClientPortal/InvoiceController.php
+++ b/app/Http/Controllers/ClientPortal/InvoiceController.php
@@ -252,11 +252,20 @@ class InvoiceController extends Controller
         // create new archive
         $zipFile = new \PhpZip\ZipFile();
         try {
+
             foreach ($invoices as $invoice) {
-                //add it to the zip
-                $zipFile->addFromString(basename($invoice->pdf_file_path()), file_get_contents($invoice->pdf_file_path(null, 'url', true)));
+                            
+                if ($invoice->client->getSetting('enable_e_invoice')) {
+                    $xml = $invoice->service()->getEInvoice();
+                    $zipFile->addFromString($invoice->getFileName("xml"), $xml);
+                }
+
+                $file = $invoice->service()->getRawInvoicePdf();
+                $zip_file_name = $invoice->getFileName();
+                $zipFile->addFromString($zip_file_name, $file);
             }
 
+
             $filename = date('Y-m-d').'_'.str_replace(' ', '_', trans('texts.invoices')).'.zip';
             $filepath = sys_get_temp_dir().'/'.$filename;
 
diff --git a/resources/views/portal/ninja2020/invoices/index.blade.php b/resources/views/portal/ninja2020/invoices/index.blade.php
index b9e95ba914bc..7b9dabe1a591 100644
--- a/resources/views/portal/ninja2020/invoices/index.blade.php
+++ b/resources/views/portal/ninja2020/invoices/index.blade.php
@@ -17,7 +17,6 @@
             @csrf
             <button type="submit" onclick="setTimeout(() => this.disabled = true, 0); setTimeout(() => this.disabled = false, 5000); return true;" class="button button-primary bg-primary" name="action" value="download">{{ ctrans('texts.download') }}</button>
             @csrf
-            <button type="submit" onclick="setTimeout(() => this.disabled = true, 0); setTimeout(() => this.disabled = false, 5000); return true;" class="button button-primary bg-secondary" name="action-xml" value="download">{{ ctrans('texts.download_xml') }}</button>
             @if(!empty(auth()->user()->client->service()->getPaymentMethods(0)))
                 <button onclick="setTimeout(() => this.disabled = true, 0); return true;" type="submit" class="button button-primary bg-primary" name="action" value="payment">{{ ctrans('texts.pay_now') }}</button>
             @endif

From f10c880ffb1da0ad44d4a85b72a8ee7cda6890d0 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 17 Aug 2023 09:07:49 +1000
Subject: [PATCH 41/42] format documents

---
 app/Jobs/Invoice/ZipInvoices.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Jobs/Invoice/ZipInvoices.php b/app/Jobs/Invoice/ZipInvoices.php
index dc5b39cf56f5..f7292988b0d1 100644
--- a/app/Jobs/Invoice/ZipInvoices.php
+++ b/app/Jobs/Invoice/ZipInvoices.php
@@ -84,7 +84,7 @@ class ZipInvoices implements ShouldQueue
                 }
 
                 $file = $invoice->service()->getRawInvoicePdf();
-$zip_file_name = $invoice->getFileName();
+                $zip_file_name = $invoice->getFileName();
                 $zipFile->addFromString($zip_file_name, $file);
             }
 

From eee79c90a20bb6dddbd82d2aaec0d7cb00c21432 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 17 Aug 2023 09:24:36 +1000
Subject: [PATCH 42/42] Minor fixes for emails

---
 app/Mail/TemplateEmail.php | 16 ++++++++++------
 app/Models/BaseModel.php   |  9 +++++++++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/app/Mail/TemplateEmail.php b/app/Mail/TemplateEmail.php
index ff77463df864..2fcd68874a81 100644
--- a/app/Mail/TemplateEmail.php
+++ b/app/Mail/TemplateEmail.php
@@ -18,7 +18,6 @@ use App\Services\PdfMaker\Designs\Utilities\DesignHelpers;
 use App\Utils\HtmlEngine;
 use App\Utils\Ninja;
 use Illuminate\Mail\Mailable;
-use Illuminate\Support\Facades\Storage;
 
 class TemplateEmail extends Mailable
 {
@@ -111,7 +110,7 @@ class TemplateEmail extends Mailable
             if (Ninja::isHosted()) {
                 $bccs = explode(',', str_replace(' ', '', $settings->bcc_email));
                 $this->bcc(array_slice($bccs, 0, 2));
-            //$this->bcc(reset($bccs)); //remove whitespace if any has been inserted.
+                //$this->bcc(reset($bccs)); //remove whitespace if any has been inserted.
             } else {
                 $this->bcc(explode(',', str_replace(' ', '', $settings->bcc_email)));
             }//remove whitespace if any has been inserted.
@@ -149,16 +148,21 @@ class TemplateEmail extends Mailable
         if ($this->invitation && $this->invitation->invoice && $settings->ubl_email_attachment && $this->company->account->hasFeature(Account::FEATURE_PDF_ATTACHMENT)) {
             $ubl_string = (new CreateUbl($this->invitation->invoice))->handle();
 
+            nlog("template {$ubl_string}");
+
             if ($ubl_string) {
                 $this->attachData($ubl_string, $this->invitation->invoice->getFileName('xml'));
             }
+            
         }
         if ($this->invitation && $this->invitation->invoice && $this->invitation->invoice->client->getSetting('enable_e_invoice') && $this->company->account->hasFeature(Account::FEATURE_PDF_ATTACHMENT)) {
-            
-            $xinvoice_filepath = $this->invitation->invoice->service()->getEInvoice($this->invitation->contact);
+            $xml_string = $this->invitation->invoice->service()->getEInvoice($this->invitation->contact);
 
-            if(Storage::disk(config('filesystems.default'))->exists($xinvoice_filepath))
-                $this->attach(Storage::disk(config('filesystems.default'))->path($xinvoice_filepath), ['as' => $this->invitation->invoice->getFileName("xml"), 'mime' => null]);
+            nlog("template {$xml_string}");
+
+            if($xml_string) {
+                $this->attachData($xml_string, $this->invitation->invoice->getEFileName("xml"));
+            }
         
         }
 
diff --git a/app/Models/BaseModel.php b/app/Models/BaseModel.php
index bd55d0684203..eb4c1772236a 100644
--- a/app/Models/BaseModel.php
+++ b/app/Models/BaseModel.php
@@ -237,6 +237,15 @@ class BaseModel extends Model
         return $this->numberFormatter().'.'.$extension;
     }
 
+     /**
+     * @param string $extension
+     * @return string
+     */
+    public function getEFileName($extension = 'pdf')
+    {
+        return ctrans("texts.e_invoice"). "_" . $this->numberFormatter().'.'.$extension;
+    }
+
     public function numberFormatter()
     {
         $number = strlen($this->number) >= 1 ? $this->translate_entity() . "_" . $this->number : class_basename($this) . "_" . Str::random(5);