From 88acfbfecba995cb5f49f4cde4649510b0258c46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Mon, 19 Apr 2021 13:51:00 +0200
Subject: [PATCH] Show public notes outside of totals table

---
 app/Services/PdfMaker/Design.php          |  1 -
 resources/views/pdf-designs/bold.html     |  9 ++++++-
 resources/views/pdf-designs/business.html |  8 +++++-
 resources/views/pdf-designs/clean.html    |  8 +++++-
 resources/views/pdf-designs/creative.html |  8 +++++-
 resources/views/pdf-designs/elegant.html  |  8 +++++-
 resources/views/pdf-designs/hipster.html  |  4 ++-
 resources/views/pdf-designs/modern.html   |  9 ++++++-
 resources/views/pdf-designs/plain.html    |  8 +++++-
 resources/views/pdf-designs/playful.html  | 30 ++++++-----------------
 10 files changed, 62 insertions(+), 31 deletions(-)

diff --git a/app/Services/PdfMaker/Design.php b/app/Services/PdfMaker/Design.php
index fcce4dbbb784..3228b94f26e2 100644
--- a/app/Services/PdfMaker/Design.php
+++ b/app/Services/PdfMaker/Design.php
@@ -440,7 +440,6 @@ class Design extends BaseDesign
 
         $elements = [
             ['element' => 'div', 'properties' => ['style' => 'display: flex; flex-direction: column;'], 'elements' => [
-                ['element' => 'p', 'content' => strtr($_variables['values']['$entity.public_notes'], $_variables), 'properties' => ['data-ref' => 'total_table-public_notes', 'style' => 'text-align: left;']],
                 ['element' => 'p', 'content' => '', 'properties' => ['style' => 'text-align: left; display: flex; flex-direction: column;'], 'elements' => [
                     ['element' => 'span', 'content' => '$entity.terms_label: ', 'properties' => ['hidden' => $this->entityVariableCheck('$entity.terms'), 'data-ref' => 'total_table-terms-label', 'style' => 'font-weight: bold; text-align: left; margin-top: 1rem;']],
                     ['element' => 'span', 'content' => strtr($_variables['values']['$entity.terms'], $_variables), 'properties' => ['data-ref' => 'total_table-terms', 'style' => 'text-align: left;']],
diff --git a/resources/views/pdf-designs/bold.html b/resources/views/pdf-designs/bold.html
index 0dfb07b61130..7cb4876dfac9 100644
--- a/resources/views/pdf-designs/bold.html
+++ b/resources/views/pdf-designs/bold.html
@@ -213,6 +213,11 @@
         display: grid;
         grid-template-columns: 1fr 1fr 1fr;
         gap: 15px;
+        color: white;
+    }
+
+    [data-ref="total_table-public_notes"] {
+        padding-top: 0.5rem
     }
 </style>
 
@@ -233,7 +238,9 @@
     <tr>
         <td class="page-footer-cell">
             <div class="footer-wrapper" id="footer">
-                <div> <!-- #1 column --> </div>
+                <div>
+                    <p data-ref="total_table-public_notes">$entity.public_notes</p>
+                </div>
                 <div> <!-- #2 column --> </div>
                 <div> <!-- #3 column --> </div>
             </div>
diff --git a/resources/views/pdf-designs/business.html b/resources/views/pdf-designs/business.html
index 0f8eaa1fc657..5cf3d40d00e7 100644
--- a/resources/views/pdf-designs/business.html
+++ b/resources/views/pdf-designs/business.html
@@ -218,6 +218,10 @@
         text-align: right;
         padding-right: 1rem;
     }
+
+    [data-ref="total_table-public_notes"] {
+        padding-left: 1rem
+    }
 </style>
 
 <div id="header"></div>
@@ -252,4 +256,6 @@
     <table id="delivery-note-table" cellspacing="0"></table>
 </div>
 
-<div id="footer"></div>
+<div id="footer">
+    <p data-ref="total_table-public_notes">$entity.public_notes</p>
+</div>
diff --git a/resources/views/pdf-designs/clean.html b/resources/views/pdf-designs/clean.html
index 1c35ed87167a..ab62a4a52aa8 100644
--- a/resources/views/pdf-designs/clean.html
+++ b/resources/views/pdf-designs/clean.html
@@ -186,6 +186,10 @@
         text-align: right;
         padding-right: 1rem;
     }
+
+    [data-ref="total_table-public_notes"] {
+        padding-left: 1rem
+    }
 </style>
 
 <div id="header"></div>
@@ -218,4 +222,6 @@
     <table id="delivery-note-table" cellspacing="0"></table>
 </div>
 
-<div id="footer"></div>
+<div id="footer">
+    <p data-ref="total_table-public_notes">$entity.public_notes</p>
+</div>
diff --git a/resources/views/pdf-designs/creative.html b/resources/views/pdf-designs/creative.html
index 10454b16f5f2..d880a7483da5 100644
--- a/resources/views/pdf-designs/creative.html
+++ b/resources/views/pdf-designs/creative.html
@@ -178,6 +178,10 @@
         text-align: right;
         padding-right: 1rem;
     }
+
+    [data-ref="total_table-public_notes"] {
+        padding-left: 1rem
+    }
 </style>
 
 <div id="header"></div>
@@ -216,4 +220,6 @@
     <table id="delivery-note-table" cellspacing="0"></table>
 </div>
 
-<div id="footer"></div>
+<div id="footer">
+    <p data-ref="total_table-public_notes">$entity.public_notes</p>
+</div>
diff --git a/resources/views/pdf-designs/elegant.html b/resources/views/pdf-designs/elegant.html
index bdcfd88d1323..d7e6abeaa7a1 100644
--- a/resources/views/pdf-designs/elegant.html
+++ b/resources/views/pdf-designs/elegant.html
@@ -172,6 +172,10 @@
         text-align: right;
         padding-right: 0.5rem;
     }
+
+    [data-ref="total_table-public_notes"] {
+        padding-left: 1rem
+    }
 </style>
 
 <div id="header"></div>
@@ -216,5 +220,7 @@
     <table id="delivery-note-table" cellspacing="0"></table>
 </div>
 
-<div id="footer"></div>
+<div id="footer">
+    <p data-ref="total_table-public_notes">$entity.public_notes</p>
+</div>
 
diff --git a/resources/views/pdf-designs/hipster.html b/resources/views/pdf-designs/hipster.html
index 95203018680e..b4b054c0c604 100644
--- a/resources/views/pdf-designs/hipster.html
+++ b/resources/views/pdf-designs/hipster.html
@@ -257,4 +257,6 @@
     <table id="delivery-note-table" cellspacing="0"></table>
 </div>
 
-<div id="footer"></div>
+<div id="footer">
+    <p data-ref="total_table-public_notes">$entity.public_notes</p>
+</div>
diff --git a/resources/views/pdf-designs/modern.html b/resources/views/pdf-designs/modern.html
index c30c02006896..e7f975360dc6 100644
--- a/resources/views/pdf-designs/modern.html
+++ b/resources/views/pdf-designs/modern.html
@@ -222,6 +222,11 @@
     .page-content-cell {
         padding: 1rem;
     }
+
+    [data-ref="total_table-public_notes"] {
+        margin-top: 2rem;
+        margin-bottom: 2rem
+    }
 </style>
 
 <table class="page-container">
@@ -242,7 +247,9 @@
                 <div style="margin-top: 195px"></div>
                 <div class="footer-wrapper" id="footer">
                     <div class="footer-content">
-                        <div></div>
+                        <div>
+                            <p data-ref="total_table-public_notes">$entity.public_notes</p>
+                        </div>
                         <div id="company-details"></div>
                         <div id="company-address"></div>
                     </div>
diff --git a/resources/views/pdf-designs/plain.html b/resources/views/pdf-designs/plain.html
index edfaded7ed0c..134f87e2b785 100644
--- a/resources/views/pdf-designs/plain.html
+++ b/resources/views/pdf-designs/plain.html
@@ -150,6 +150,10 @@
         text-align: right;
         padding-right: 1rem;
     }
+
+    [data-ref="total_table-public_notes"] {
+        padding-left: 1rem
+    }
 </style>
 <div id="header"></div>
 
@@ -180,4 +184,6 @@
     <table id="delivery-note-table" cellspacing="0"></table>
 </div>
 
-<div id="footer"></div>
+<div id="footer">
+    <p data-ref="total_table-public_notes">$entity.public_notes</p>
+</div>
diff --git a/resources/views/pdf-designs/playful.html b/resources/views/pdf-designs/playful.html
index 0081c1a5a828..b4d896266c60 100644
--- a/resources/views/pdf-designs/playful.html
+++ b/resources/views/pdf-designs/playful.html
@@ -94,7 +94,9 @@
     #product-table,
     #delivery-note-table,
     #task-table {
-        padding: 3rem;
+        padding-left: 3rem;
+        padding-right: 3rem;
+        margin-top: 3rem;
         /* margin-bottom: 200px; */
         min-width: 100%;
         table-layout: fixed;
@@ -220,17 +222,10 @@
         padding: 10px;
     }
 
-    #footer {
-        position: fixed;
-        bottom: 0;
-        min-width: 100%;
-        display: grid;
-        grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr;
-        margin-left: -10px;
-    }
-
-    #footer > * {
-        padding: 5px;
+    [data-ref="total_table-public_notes"] {
+        text-align: left;
+        padding-left: 3rem;
+        padding-right: 3rem;
     }
 </style>
 
@@ -286,15 +281,6 @@
 </div>
 
 <div id="footer">
-
-
-    <div style="background-color: #00968B"><!-- 1 --></div>
-    <div style="background-color: #1D756E"><!-- 2 --></div>
-    <div style="background-color: #FCB600"><!-- 3 --></div>
-    <div style="background-color: #BA932F"><!-- 4 --></div>
-    <div style="background-color: #A72A4E"><!-- 5 --></div>
-    <div style="background-color: #E20041"><!-- 6 --></div>
-    <div style="background-color: #F8B300"><!-- 7 --></div>
-    <div style="background-color: #009B8F"><!-- 8 --></div>
+    <p data-ref="total_table-public_notes">$entity.public_notes</p>
 </div>