Merge pull request #7304 from turbo124/v5-develop

v5.3.73

VERSION.txt

@@ -1 +1 @@
-5.3.71
+5.3.73

app/Services/PdfMaker/Design.php

@@ -659,21 +659,37 @@ class Design extends BaseDesign
         $variables = $this->context['pdf_variables']['total_columns'];
 
         /* 'labels' is a protected value - if the user enters labels it attempts to replace this string again - we need to set labels are a protected text label and remove it from the string */
+        // $elements = [
+        //     ['element' => 'div', 'properties' => ['style' => 'display: flex; flex-direction: column;'], 'elements' => [
+        //         ['element' => 'p', 'content' => strtr(str_replace("labels", "", $_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(str_replace("labels", "", $_variables['values']['$entity.terms']), $_variables['labels']), 'properties' => ['data-ref' => 'total_table-terms', 'style' => 'text-align: left;']],
+        //         ]],
+        //         ['element' => 'img', 'properties' => ['style' => 'max-width: 50%; height: auto;', 'src' => '$contact.signature', 'id' => 'contact-signature']],
+        //         ['element' => 'div', 'properties' => ['style' => 'margin-top: 1.5rem; display: block; align-items: flex-start; page-break-inside: avoid; visible !important;'], 'elements' => [
+        //             ['element' => 'img', 'properties' => ['src' => '$invoiceninja.whitelabel', 'style' => 'overflow: visible !important; display: block; page-break-inside: avoid; height: 2.5rem;', 'hidden' => $this->entity->user->account->isPaid() ? 'true' : 'false', 'id' => 'invoiceninja-whitelabel-logo']],
+        //         ]],
+        //     ]],
+        //     ['element' => 'div', 'properties' => ['class' => 'totals-table-right-side', 'dir' => '$dir'], 'elements' => []],
+        // ];
+
         $elements = [
             ['element' => 'div', 'properties' => ['style' => 'display: flex; flex-direction: column;'], 'elements' => [
                 ['element' => 'p', 'content' => strtr(str_replace("labels", "", $_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' => 'p', 'content' => '', 'properties' => ['style' => 'text-align: left; display: flex; flex-direction: column; page-break-inside: auto;'], '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(str_replace("labels", "", $_variables['values']['$entity.terms']), $_variables['labels']), 'properties' => ['data-ref' => 'total_table-terms', 'style' => 'text-align: left;']],
                 ]],
                 ['element' => 'img', 'properties' => ['style' => 'max-width: 50%; height: auto;', 'src' => '$contact.signature', 'id' => 'contact-signature']],
-                ['element' => 'div', 'properties' => ['style' => 'margin-top: 1.5rem; display: block; align-items: flex-start; page-break-inside: avoid; visible !important;'], 'elements' => [
+                ['element' => 'div', 'properties' => ['style' => 'margin-top: 1.5rem; display: flex; align-items: flex-start; page-break-inside: auto;'], 'elements' => [
-                    ['element' => 'img', 'properties' => ['src' => '$invoiceninja.whitelabel', 'style' => 'overflow: visible !important; display: block; page-break-inside: avoid; height: 2.5rem;', 'hidden' => $this->entity->user->account->isPaid() ? 'true' : 'false', 'id' => 'invoiceninja-whitelabel-logo']],
+                    ['element' => 'img', 'properties' => ['src' => '$invoiceninja.whitelabel', 'style' => 'height: 2.5rem;', 'hidden' => $this->entity->user->account->isPaid() ? 'true' : 'false', 'id' => 'invoiceninja-whitelabel-logo']],
                 ]],
             ]],
             ['element' => 'div', 'properties' => ['class' => 'totals-table-right-side', 'dir' => '$dir'], 'elements' => []],
         ];
 
+
         if ($this->type == self::DELIVERY_NOTE) {
             return $elements;
         }

config/ninja.php

@@ -14,8 +14,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => '5.3.71',
+    'app_version' => '5.3.73',
-    'app_tag' => '5.3.71',
+    'app_tag' => '5.3.73',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),

resources/views/pdf-designs/bold.html

@@ -22,7 +22,6 @@
 
     @page {
         margin: 0 !important;
-        size: $page_size $page_layout;
     }
 
     p {

resources/views/pdf-designs/business.html

@@ -20,7 +20,6 @@
         margin-right: $global_margin;
         margin-top: 0;
         margin-bottom: 0;
-        size: $page_size $page_layout;
     }
 
     p {

resources/views/pdf-designs/clean.html

@@ -18,9 +18,8 @@
     @page {
         margin-left: $global_margin;
         margin-right: $global_margin;
-        margin-bottom: 0;
         margin-top: 0;
-        size: $page_size $page_layout;
+        margin-bottom: 0;
     }
 
     p {

resources/views/pdf-designs/creative.html

@@ -20,7 +20,6 @@
         margin-right: $global_margin;
         margin-top: 0;
         margin-bottom: 0;
-        size: $page_size $page_layout;
     }
 
     p {

resources/views/pdf-designs/elegant.html

@@ -17,7 +17,6 @@
 
     @page {
         margin: $global_margin;
-        size: $page_size $page_layout;
     }
 
     p {

resources/views/pdf-designs/hipster.html

@@ -17,7 +17,6 @@
 
     @page {
         margin: $global_margin;
-        size: $page_size $page_layout;
     }
 
     p {

resources/views/pdf-designs/modern.html

@@ -21,7 +21,6 @@
 
       @page {
           margin: 0 !important;
-          size: $page_size $page_layout;
       }
 
       p {

resources/views/pdf-designs/plain.html

@@ -16,8 +16,13 @@
     }
 
     @page {
-        margin: 5px $global_margin $global_margin $global_margin;
+        position: absolute;
-        size: $page_size $page_layout;
+        top: 0;
+        margin-left: $global_margin;
+        margin-right: $global_margin;
+        margin-top: 0;
+        margin-bottom: 0;
+
     }
 
     p {
@@ -71,10 +76,10 @@
     }
 
     [data-ref="table"] {
+        margin-top: 1rem;
         min-width: 100%;
         table-layout: fixed;
         overflow-wrap: break-word;
-        margin-top: 1rem;
         /* margin-bottom: 200px; */
     }
 

resources/views/pdf-designs/playful.html

@@ -17,7 +17,6 @@
 
     @page {
         margin: -0.25cm !important;
-        size: $page_size $page_layout;
     }
 
     p {

resources/views/pdf-designs/tech.html

@@ -17,7 +17,6 @@
 
     @page {
         margin: 0;
-        size: $page_size $page_layout;
     }
 
     @media print {
@@ -355,7 +354,7 @@
 
 $entity_images
 
-<div class="repeating-footer" id="footer">
+<div class="repeating-footerx" id="footer">
    <p data-ref="total_table-footer">$entity_footer</p>
 
         <script>