Merge pull request #5766 from beganovich/v5-2005-design-updates

(v5) 20.05. design updates
2025-11-04 05:58:50 -05:00 · 2021-05-20 15:06:39 +02:00 · 2021-05-20 15:06:39 +02:00 · e18a2f225f
commit e18a2f225f
parent 5833ddd02f b19561f8c4
11 changed files with 155 additions and 24 deletions
--- a/app/Services/PdfMaker/Design.php
+++ b/app/Services/PdfMaker/Design.php
@ -432,10 +432,6 @@ class Design extends BaseDesign
            ? $this->context['variables']
            : ['values' => ['$entity.public_notes' => $this->entity->public_notes, '$entity.terms' => $this->entity->terms, '$entity_footer' => $this->entity->footer], 'labels' => []];

-        if ($this->type == 'delivery_note') {
-            return [];
-        }
-
        $variables = $this->context['pdf_variables']['total_columns'];

        $elements = [
@ -453,6 +449,10 @@ class Design extends BaseDesign
            ['element' => 'div', 'properties' => ['class' => 'totals-table-right-side'], 'elements' => []],
        ];

+        if ($this->type == 'delivery_note') {
+            return $elements;
+        }
+
        foreach (['discount'] as $property) {
            $variable = sprintf('%s%s', '$', $property);

--- a/database/migrations/2021_05_20_115919_update_designs.php
+++ b/database/migrations/2021_05_20_115919_update_designs.php
--- a/resources/views/pdf-designs/bold.html
+++ b/resources/views/pdf-designs/bold.html
@ -141,6 +141,7 @@
    }

    #table-totals {
+        margin-top: 1rem;
        display: grid;
        grid-template-columns: 2fr 1fr;
        padding-top: .5rem;
@ -241,6 +242,17 @@
            <div class="footer-wrapper" id="footer">
                <div>
                    <p data-ref="total_table-footer">$entity_footer</p>
+
+                    <script>
+                        // Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
+                        document.addEventListener('DOMContentLoaded', () => {
+                            ['product-table', 'task-table', 'delivery-note-table'].forEach((tableIdentifier) => {
+                                document.getElementById(tableIdentifier).childElementCount === 0
+                                    ? document.getElementById(tableIdentifier).style.display = 'none'
+                                    : '';
+                            });
+                        });
+                    </script>
                </div>
                <div> <!-- #2 column --> </div>
                <div> <!-- #3 column --> </div>
@ -269,9 +281,9 @@

            <table id="task-table" cellspacing="0"></table>

-            <div id="table-totals" cellspacing="0"></div>
-
            <table id="delivery-note-table" cellspacing="0"></table>
+
+            <div id="table-totals" cellspacing="0"></div>
        </td>
    </tr>
    </tbody>
--- a/resources/views/pdf-designs/business.html
+++ b/resources/views/pdf-designs/business.html
@ -177,6 +177,7 @@
    }

    #table-totals {
+        margin-top: 1rem;
        display: grid;
        grid-template-columns: 2fr 1fr;
        gap: 80px;
@ -222,6 +223,10 @@
    [data-ref="total_table-footer"] {
        padding-left: 1rem
    }
+
+    #footer {
+        margin-top: 30px;
+    }
 </style>

 <div id="header"></div>
@ -251,11 +256,22 @@

    <table id="task-table" cellspacing="0"></table>

-    <div id="table-totals" cellspacing="0"></div>
-
    <table id="delivery-note-table" cellspacing="0"></table>
+    
+    <div id="table-totals" cellspacing="0"></div>
 </div>

 <div id="footer">
    <p data-ref="total_table-footer">$entity_footer</p>
+
+    <script>
+        // Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
+        document.addEventListener('DOMContentLoaded', () => {
+            ['product-table', 'task-table', 'delivery-note-table'].forEach((tableIdentifier) => {
+                document.getElementById(tableIdentifier).childElementCount === 0
+                    ? document.getElementById(tableIdentifier).style.display = 'none'
+                    : '';
+            });
+        });
+    </script>
 </div>
--- a/resources/views/pdf-designs/clean.html
+++ b/resources/views/pdf-designs/clean.html
@ -148,6 +148,7 @@
    }

    #table-totals {
+        margin-top: 1rem;
        display: grid;
        grid-template-columns: 2fr 1fr;
        padding-top: .5rem;
@ -187,8 +188,8 @@
        padding-right: 1rem;
    }

-    [data-ref="total_table-footer"] {
-        padding-left: 1rem
+    #footer {
+        margin-top: 30px;
    }
 </style>

@ -217,11 +218,22 @@

    <table id="task-table" cellspacing="0"></table>

-    <div id="table-totals" cellspacing="0"></div>
-
    <table id="delivery-note-table" cellspacing="0"></table>
+
+    <div id="table-totals" cellspacing="0"></div>
 </div>

 <div id="footer">
    <p data-ref="total_table-footer">$entity_footer</p>
+    
+    <script>
+        // Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
+        document.addEventListener('DOMContentLoaded', () => {
+            ['product-table', 'task-table', 'delivery-note-table'].forEach((tableIdentifier) => {
+                document.getElementById(tableIdentifier).childElementCount === 0
+                    ? document.getElementById(tableIdentifier).style.display = 'none'
+                    : '';
+            });
+        });
+    </script>
 </div>
--- a/resources/views/pdf-designs/creative.html
+++ b/resources/views/pdf-designs/creative.html
@ -144,6 +144,7 @@
    }

    #table-totals {
+        margin-top: 1rem;
        display: grid;
        grid-template-columns: 2fr 1fr;
        padding-top: 1rem;
@ -182,6 +183,10 @@
    [data-ref="total_table-footer"] {
        padding-left: 1rem
    }
+
+    #footer {
+        margin-top: 30px;
+    }
 </style>

 <div id="header"></div>
@ -215,11 +220,22 @@

    <table id="task-table" cellspacing="0"></table>

-    <div id="table-totals" cellspacing="0"></div>
-
    <table id="delivery-note-table" cellspacing="0"></table>
+    
+    <div id="table-totals" cellspacing="0"></div>
 </div>

 <div id="footer">
    <p data-ref="total_table-footer">$entity_footer</p>
+
+    <script>
+        // Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
+        document.addEventListener('DOMContentLoaded', () => {
+            ['product-table', 'task-table', 'delivery-note-table'].forEach((tableIdentifier) => {
+                document.getElementById(tableIdentifier).childElementCount === 0
+                    ? document.getElementById(tableIdentifier).style.display = 'none'
+                    : '';
+            });
+        });
+    </script>
 </div>
--- a/resources/views/pdf-designs/elegant.html
+++ b/resources/views/pdf-designs/elegant.html
@ -137,6 +137,7 @@
    }

    #table-totals {
+        margin-top: 1rem;
        display: grid;
        grid-template-columns: 2fr 1fr;
        padding-top: 0.5rem;
@ -180,6 +181,10 @@
    [data-ref="total_table-footer"] {
        padding-left: 1rem
    }
+
+    #footer {
+        margin-top: 30px;
+    }
 </style>

 <div id="header"></div>
@ -219,12 +224,23 @@

    <table id="task-table" cellspacing="0"></table>

-    <div id="table-totals" cellspacing="0"></div>
-
    <table id="delivery-note-table" cellspacing="0"></table>
+    
+    <div id="table-totals" cellspacing="0"></div>
 </div>

 <div id="footer">
    <p data-ref="total_table-footer">$entity_footer</p>
+
+    <script>
+        // Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
+        document.addEventListener('DOMContentLoaded', () => {
+            ['product-table', 'task-table', 'delivery-note-table'].forEach((tableIdentifier) => {
+                document.getElementById(tableIdentifier).childElementCount === 0
+                    ? document.getElementById(tableIdentifier).style.display = 'none'
+                    : '';
+            });
+        });
+    </script>
 </div>

--- a/resources/views/pdf-designs/hipster.html
+++ b/resources/views/pdf-designs/hipster.html
@ -153,6 +153,7 @@
    }

    #table-totals {
+        margin-top: 1rem;
        display: grid;
        grid-template-columns: 2fr 1fr;
        padding-top: 0.5rem;
@ -191,6 +192,10 @@
        text-align: right;
        padding-right: 1rem;
    }
+
+    #footer {
+        margin-top: 30px;
+    }
 </style>
 <div id="header"></div>

@ -251,11 +256,22 @@

    <table id="task-table" cellspacing="0"></table>

-    <div id="table-totals" cellspacing="0"></div>
-
    <table id="delivery-note-table" cellspacing="0"></table>
+
+    <div id="table-totals" cellspacing="0"></div>
 </div>

 <div id="footer">
    <p data-ref="total_table-footer">$entity_footer</p>
+
+    <script>
+        // Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
+        document.addEventListener('DOMContentLoaded', () => {
+            ['product-table', 'task-table', 'delivery-note-table'].forEach((tableIdentifier) => {
+                document.getElementById(tableIdentifier).childElementCount === 0
+                    ? document.getElementById(tableIdentifier).style.display = 'none'
+                    : '';
+            });
+        });
+    </script>
 </div>
--- a/resources/views/pdf-designs/modern.html
+++ b/resources/views/pdf-designs/modern.html
@ -249,6 +249,17 @@
                    <div class="footer-content">
                        <div>
                            <p data-ref="total_table-footer">$entity_footer</p>
+
+                            <script>
+                                // Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
+                                document.addEventListener('DOMContentLoaded', () => {
+                                    ['product-table', 'task-table', 'delivery-note-table'].forEach((tableIdentifier) => {
+                                        document.getElementById(tableIdentifier).childElementCount === 0
+                                            ? document.getElementById(tableIdentifier).style.display = 'none'
+                                            : '';
+                                    });
+                                });
+                            </script>
                        </div>
                        <div id="company-details"></div>
                        <div id="company-address"></div>
--- a/resources/views/pdf-designs/plain.html
+++ b/resources/views/pdf-designs/plain.html
@ -117,6 +117,7 @@
    }

    #table-totals {
+        margin-top: 1rem;
        display: grid;
        grid-template-columns: 2fr 1fr;
        padding-top: .5rem;
@ -154,6 +155,10 @@
    [data-ref="total_table-footer"] {
        padding-left: 1rem
    }
+
+    #footer {
+        margin-top: 30px;
+    }
 </style>
 <div id="header"></div>

@ -179,11 +184,22 @@

    <table id="task-table" cellspacing="0"></table>

-    <div id="table-totals" cellspacing="0"></div>
-
    <table id="delivery-note-table" cellspacing="0"></table>
+
+    <div id="table-totals" cellspacing="0"></div>
 </div>

 <div id="footer">
    <p data-ref="total_table-footer">$entity_footer</p>
+
+    <script>
+        // Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
+        document.addEventListener('DOMContentLoaded', () => {
+            ['product-table', 'task-table', 'delivery-note-table'].forEach((tableIdentifier) => {
+                document.getElementById(tableIdentifier).childElementCount === 0
+                    ? document.getElementById(tableIdentifier).style.display = 'none'
+                    : '';
+            });
+        });
+    </script>
 </div>
--- a/resources/views/pdf-designs/playful.html
+++ b/resources/views/pdf-designs/playful.html
@ -169,6 +169,7 @@
    }

    #table-totals {
+        margin-top: 1rem;
        display: grid;
        grid-template-columns: 2fr 1fr;
        gap: 80px;
@ -227,6 +228,10 @@
        padding-left: 3rem;
        padding-right: 3rem;
    }
+
+    #footer {
+        margin-top: 1rem;
+    }
 </style>


@ -275,12 +280,23 @@

    <table id="task-table" cellspacing="0"></table>

-    <div id="table-totals" cellspacing="0"></div>
-
    <table id="delivery-note-table" cellspacing="0"></table>
+
+    <div id="table-totals" cellspacing="0"></div>
 </div>

 <div id="footer">
-    <p data-ref="total_table-footer">$entity_footer/p>
+    <p data-ref="total_table-footer">$entity_footer</p>
+
+    <script>
+        // Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
+        document.addEventListener('DOMContentLoaded', () => {
+            ['product-table', 'task-table', 'delivery-note-table'].forEach((tableIdentifier) => {
+                document.getElementById(tableIdentifier).childElementCount === 0
+                    ? document.getElementById(tableIdentifier).style.display = 'none'
+                    : '';
+            });
+        });
+    </script>
 </div>