From f0d101fba4e9962cb8401e7b39d566e6ca46b0cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Mon, 8 Nov 2021 21:20:55 +0100
Subject: [PATCH 1/5] Logic for generating markup for entity images

---
 app/Utils/HtmlEngine.php | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index e165c5102bfd..fd6335276e53 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -480,6 +480,8 @@ class HtmlEngine
         $data['$statement_amount'] = ['value' => '', 'label' => ctrans('texts.amount')];
         $data['$statement'] = ['value' => '', 'label' => ctrans('texts.statement')];
 
+        $data['$entity_images'] = ['value' => $this->generateEntityImagesMarkup(), 'label' => ''];
+
         $arrKeysLength = array_map('strlen', array_keys($data));
         array_multisort($arrKeysLength, SORT_DESC, $data);
 
@@ -736,4 +738,34 @@ html {
 
         return $css;
     }
+
+    /**
+     * Generate markup for HTML images on entity.
+     * 
+     * @return string|void 
+     */
+    protected function generateEntityImagesMarkup()
+    {
+        if ($this->client->getSetting('embed_documents') === false) {
+            return '';
+        }
+
+        $dom = new \DOMDocument('1.0', 'UTF-8');
+
+        $container =  $dom->createElement('div');
+        $container->setAttribute('style', 'display:grid; grid-auto-flow: row; grid-template-columns: repeat(4, 1fr); grid-template-rows: repeat(2, 1fr);');
+
+        foreach ($this->entity->documents as $document) {
+            $image = $dom->createElement('img');
+
+            $image->setAttribute('src', $document->generateUrl());
+            $image->setAttribute('style', 'max-height: 100px; margin-top: 20px;');
+
+            $container->appendChild($image);
+        }
+
+        $dom->appendChild($container);
+
+        return $dom->saveHTML();
+    }
 }

From 6d80ff8e4e242d51ce605bcdd1368510ec94bb93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Mon, 8 Nov 2021 21:21:08 +0100
Subject: [PATCH 2/5] Update designs to support entity images

---
 resources/views/pdf-designs/bold.html     | 3 +++
 resources/views/pdf-designs/business.html | 2 ++
 resources/views/pdf-designs/clean.html    | 2 ++
 resources/views/pdf-designs/creative.html | 2 ++
 resources/views/pdf-designs/elegant.html  | 2 ++
 resources/views/pdf-designs/hipster.html  | 2 ++
 resources/views/pdf-designs/modern.html   | 2 ++
 resources/views/pdf-designs/plain.html    | 2 ++
 resources/views/pdf-designs/playful.html  | 4 +++-
 resources/views/pdf-designs/tech.html     | 2 ++
 10 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/resources/views/pdf-designs/bold.html b/resources/views/pdf-designs/bold.html
index 245515e97374..a05851f097d5 100644
--- a/resources/views/pdf-designs/bold.html
+++ b/resources/views/pdf-designs/bold.html
@@ -367,6 +367,9 @@
         </tfoot>
     </table>
 </div>
+
+$entity_images
+
 <div id="footer">
     <div>
         <p data-ref="total_table-footer">$entity_footer</p>
diff --git a/resources/views/pdf-designs/business.html b/resources/views/pdf-designs/business.html
index 280b81ea5965..70cf3a897dc8 100644
--- a/resources/views/pdf-designs/business.html
+++ b/resources/views/pdf-designs/business.html
@@ -347,6 +347,8 @@
 
 <div class="repeating-header" id="header"></div>
 
+$entity_images
+
 <div class="repeating-footer" id="footer">
     <p data-ref="total_table-footer">$entity_footer</p>
 </div>
diff --git a/resources/views/pdf-designs/clean.html b/resources/views/pdf-designs/clean.html
index b7d43f1aac69..4be61ef521ff 100644
--- a/resources/views/pdf-designs/clean.html
+++ b/resources/views/pdf-designs/clean.html
@@ -309,6 +309,8 @@
 
 <div class="repeating-header" id="header"></div>
 
+$entity_images
+
 <div class="repeating-footer" id="footer">
    <p data-ref="total_table-footer">$entity_footer</p>
 </div>
diff --git a/resources/views/pdf-designs/creative.html b/resources/views/pdf-designs/creative.html
index a41317f7a788..a5f4aa19c638 100644
--- a/resources/views/pdf-designs/creative.html
+++ b/resources/views/pdf-designs/creative.html
@@ -307,6 +307,8 @@
    <p data-ref="total_table-footer">$entity_footer</p>
 </div>
 
+$entity_images
+
 <script>
     // Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
     document.addEventListener('DOMContentLoaded', () => {
diff --git a/resources/views/pdf-designs/elegant.html b/resources/views/pdf-designs/elegant.html
index 52c43d607751..e140bc23c2f2 100644
--- a/resources/views/pdf-designs/elegant.html
+++ b/resources/views/pdf-designs/elegant.html
@@ -317,6 +317,8 @@
    <p data-ref="total_table-footer">$entity_footer</p>
 </div>
 
+$entity_images
+
 <script>
     // Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
     document.addEventListener('DOMContentLoaded', () => {
diff --git a/resources/views/pdf-designs/hipster.html b/resources/views/pdf-designs/hipster.html
index 2f956e295745..e74f8b9055e9 100644
--- a/resources/views/pdf-designs/hipster.html
+++ b/resources/views/pdf-designs/hipster.html
@@ -358,6 +358,8 @@
    <p data-ref="total_table-footer">$entity_footer</p>
 </div>
 
+$entity_images
+
 <script>
     // Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
     document.addEventListener('DOMContentLoaded', () => {
diff --git a/resources/views/pdf-designs/modern.html b/resources/views/pdf-designs/modern.html
index b6bd3cf4bb9f..608380e11fb4 100644
--- a/resources/views/pdf-designs/modern.html
+++ b/resources/views/pdf-designs/modern.html
@@ -344,6 +344,8 @@
     </table>
 </div>
 
+$entity_images
+
 <div id="footer">
     <div class="footer-content">
         <div>
diff --git a/resources/views/pdf-designs/plain.html b/resources/views/pdf-designs/plain.html
index a6102e69af38..6b9533a80eeb 100644
--- a/resources/views/pdf-designs/plain.html
+++ b/resources/views/pdf-designs/plain.html
@@ -292,6 +292,8 @@
    <p data-ref="total_table-footer">$entity_footer</p>
 </div>
 
+$entity_images
+
 <script>
     // Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
     document.addEventListener('DOMContentLoaded', () => {
diff --git a/resources/views/pdf-designs/playful.html b/resources/views/pdf-designs/playful.html
index 9ed109edcd31..1a015e9aae7c 100644
--- a/resources/views/pdf-designs/playful.html
+++ b/resources/views/pdf-designs/playful.html
@@ -375,7 +375,9 @@
     </div>
 </div>
 
-<div  class="repeating-footer"  id="footer">
+$entity_images
+
+<div class="repeating-footer"  id="footer">
     <p data-ref="total_table-footer">$entity_footer</p>
 
     <div id="footer-colors">
diff --git a/resources/views/pdf-designs/tech.html b/resources/views/pdf-designs/tech.html
index 9f239eba0439..7aa939b9b2d8 100644
--- a/resources/views/pdf-designs/tech.html
+++ b/resources/views/pdf-designs/tech.html
@@ -357,6 +357,8 @@
    <p data-ref="total_table-footer">$entity_footer</p>
 </div>
 
+$entity_images
+
 <script>
     // Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
     document.addEventListener('DOMContentLoaded', () => {

From c46ce9bc812c7609ef574ae855f70add771fee31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Mon, 8 Nov 2021 21:21:52 +0100
Subject: [PATCH 3/5] Migration file

---
 ..._03_131308_onboarding.php => 2021_11_08_131308_onboarding.php} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename database/migrations/{2021_11_03_131308_onboarding.php => 2021_11_08_131308_onboarding.php} (100%)

diff --git a/database/migrations/2021_11_03_131308_onboarding.php b/database/migrations/2021_11_08_131308_onboarding.php
similarity index 100%
rename from database/migrations/2021_11_03_131308_onboarding.php
rename to database/migrations/2021_11_08_131308_onboarding.php

From 9b383b525b2a8a1340b11ce8484e8df237ae1bb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Tue, 9 Nov 2021 17:30:17 +0100
Subject: [PATCH 4/5] Filter images

---
 app/Helpers/Document/WithTypeHelpers.php | 30 ++++++++++++++++
 app/Models/Document.php                  |  2 ++
 app/Utils/HtmlEngine.php                 |  4 +++
 tests/Unit/WithTypeHelpersTest.php       | 45 ++++++++++++++++++++++++
 4 files changed, 81 insertions(+)
 create mode 100644 app/Helpers/Document/WithTypeHelpers.php
 create mode 100644 tests/Unit/WithTypeHelpersTest.php

diff --git a/app/Helpers/Document/WithTypeHelpers.php b/app/Helpers/Document/WithTypeHelpers.php
new file mode 100644
index 000000000000..17609f017254
--- /dev/null
+++ b/app/Helpers/Document/WithTypeHelpers.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\Helpers\Document;
+
+trait WithTypeHelpers
+{
+    /**
+     * Returns boolean based on checks for image.
+     * 
+     * @return bool 
+     */
+    public function isImage(): bool
+    {
+        if (in_array($this->type, ['png', 'svg', 'jpeg', 'jpg', 'tiff', 'gif'])) {
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/app/Models/Document.php b/app/Models/Document.php
index 70a5d8b8a5ff..20059e724ad2 100644
--- a/app/Models/Document.php
+++ b/app/Models/Document.php
@@ -11,6 +11,7 @@
 
 namespace App\Models;
 
+use App\Helpers\Document\WithTypeHelpers;
 use App\Models\Filterable;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\Storage;
@@ -19,6 +20,7 @@ class Document extends BaseModel
 {
     use SoftDeletes;
     use Filterable;
+    use WithTypeHelpers;
 
     const DOCUMENT_PREVIEW_SIZE = 300; // pixels
 
diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index fd6335276e53..51be7e78d30b 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -756,6 +756,10 @@ html {
         $container->setAttribute('style', 'display:grid; grid-auto-flow: row; grid-template-columns: repeat(4, 1fr); grid-template-rows: repeat(2, 1fr);');
 
         foreach ($this->entity->documents as $document) {
+            if (!$document->isImage()) {
+                continue;
+            }
+
             $image = $dom->createElement('img');
 
             $image->setAttribute('src', $document->generateUrl());
diff --git a/tests/Unit/WithTypeHelpersTest.php b/tests/Unit/WithTypeHelpersTest.php
new file mode 100644
index 000000000000..563aafed02af
--- /dev/null
+++ b/tests/Unit/WithTypeHelpersTest.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace Tests\Unit;
+
+use App\Models\Account;
+use App\Models\Company;
+use App\Models\Document;
+use Tests\TestCase;
+
+class WithTypeHelpersTest extends TestCase
+{
+    public function testIsImageHelper(): void
+    {
+        $account = Account::factory()->create();
+
+        $company = Company::factory()->create([
+            'account_id' => $account->id,
+        ]);
+
+        /** @var Document */
+        $document = Document::factory()->create([
+            'company_id' => $company->id,
+            'type' => 'jpeg',
+        ]);
+
+        $this->assertTrue($document->isImage());
+
+        /** @var Document */
+        $document = Document::factory()->create([
+            'company_id' => $company->id,
+        ]);
+
+        $this->assertFalse($document->isImage());
+    }
+}

From 74b5afba963db2092d4ccf6a859577177682ab79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Tue, 9 Nov 2021 19:59:44 +0100
Subject: [PATCH 5/5] Licence update

---
 app/Helpers/Document/WithTypeHelpers.php | 2 +-
 tests/Unit/WithTypeHelpersTest.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Helpers/Document/WithTypeHelpers.php b/app/Helpers/Document/WithTypeHelpers.php
index 17609f017254..55fad141aa96 100644
--- a/app/Helpers/Document/WithTypeHelpers.php
+++ b/app/Helpers/Document/WithTypeHelpers.php
@@ -7,7 +7,7 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://opensource.org/licenses/AAL
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
 namespace App\Helpers\Document;
diff --git a/tests/Unit/WithTypeHelpersTest.php b/tests/Unit/WithTypeHelpersTest.php
index 563aafed02af..73bc0425bebc 100644
--- a/tests/Unit/WithTypeHelpersTest.php
+++ b/tests/Unit/WithTypeHelpersTest.php
@@ -7,7 +7,7 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://opensource.org/licenses/AAL
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
 namespace Tests\Unit;