diff --git a/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php b/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php index 16ba8632549a..93cbb60c92d7 100644 --- a/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php +++ b/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php @@ -161,10 +161,11 @@ trait DesignHelpers public function sharedFooterElements() { - return ['element' => 'div', 'properties' => ['style' => 'display: flex; justify-content: space-between; margin-top: 1.5rem; page-break-inside: avoid;'], 'elements' => [ - ['element' => 'img', 'properties' => ['src' => '$contact.signature', 'style' => 'height: 5rem;']], - ['element' => 'img', 'properties' => ['src' => '$app_url/images/created-by-invoiceninja-new.png', 'style' => 'height: 5rem;', 'hidden' => $this->entity->user->account->isPaid() ? 'true' : 'false']], - ]]; + // return ['element' => 'div', 'properties' => ['style' => 'display: flex; justify-content: space-between; margin-top: 1.5rem; page-break-inside: avoid;'], 'elements' => [ + // ['element' => 'img', 'properties' => ['src' => '$invoiceninja.whitelabel', 'style' => 'height: 5rem;', 'hidden' => $this->entity->user->account->isPaid() ? 'true' : 'false']], + // ]]; + + return ['element' => 'img', 'properties' => ['src' => '$invoiceninja.whitelabel', 'style' => 'height: 3rem; position: fixed; bottom: 0; left: 0; padding: 5px; margin: 5px;', 'hidden' => $this->entity->user->account->isPaid() ? 'true' : 'false', 'id' => 'invoiceninja-whitelabel-logo']]; } public function entityVariableCheck(string $variable): bool diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php index 77a4a97537de..f9cdc0814928 100644 --- a/app/Utils/HtmlEngine.php +++ b/app/Utils/HtmlEngine.php @@ -317,6 +317,8 @@ class HtmlEngine $data['$font-size'] = ['value' => $this->settings->font_size . 'px', 'label' => '']; + $data['$invoiceninja.whitelabel'] = ['value' => asset('images/created-by-invoiceninja-new.png'), 'label' => '']; + // $data['custom_label1'] = ['value' => '', 'label' => ctrans('texts.')]; // $data['custom_label2'] = ['value' => '', 'label' => ctrans('texts.')]; // $data['custom_label3'] = ['value' => '', 'label' => ctrans('texts.')]; diff --git a/resources/views/pdf-designs/business.html b/resources/views/pdf-designs/business.html index b2ddee254c3e..b75e2d489d46 100644 --- a/resources/views/pdf-designs/business.html +++ b/resources/views/pdf-designs/business.html @@ -134,7 +134,7 @@ margin-right: 0; } } - + #product-table-footer { page-break-inside: avoid; } diff --git a/resources/views/pdf-designs/clean.html b/resources/views/pdf-designs/clean.html index cf4f5e384a04..0d84d8e69dc8 100644 --- a/resources/views/pdf-designs/clean.html +++ b/resources/views/pdf-designs/clean.html @@ -11,9 +11,6 @@ -moz-osx-font-smoothing: grayscale; font-family: Arial, Helvetica, sans-serif; font-size: '$font-size'; - } - - @page { margin: 1cm; } diff --git a/resources/views/pdf-designs/creative.html b/resources/views/pdf-designs/creative.html index 5966b7a140ca..12afeced77fb 100644 --- a/resources/views/pdf-designs/creative.html +++ b/resources/views/pdf-designs/creative.html @@ -9,11 +9,6 @@ font-size: '$font-size'; } - @page { - margin-top: 1cm; - margin-bottom: 1cm; - } - p { margin: 0; padding: 0; @@ -24,6 +19,8 @@ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; font-family: Arial, Helvetica, sans-serif; + margin-top: 1cm; + margin-bottom: 1cm; } @media print { diff --git a/resources/views/pdf-designs/elegant.html b/resources/views/pdf-designs/elegant.html index 6a331eb6ef40..613df3046dac 100644 --- a/resources/views/pdf-designs/elegant.html +++ b/resources/views/pdf-designs/elegant.html @@ -9,10 +9,6 @@ font-size: '$font-size'; } - @page { - margin: 1cm; - } - p { margin: 0; padding: 0; @@ -22,6 +18,7 @@ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; font-family: Arial, Helvetica, sans-serif; + margin: 1cm; } .company-logo-wrapper { @@ -111,7 +108,7 @@ padding-bottom: 1rem; border-bottom: 4px solid; } - + #product-table-footer { page-break-inside: avoid; } @@ -119,7 +116,7 @@ #product-table-footer > * { display: grid; grid-template-columns: 3fr 1fr 1fr; - padding-top: .5rem; + padding-top: 0.5rem; padding-left: 1rem; gap: 20px; } diff --git a/resources/views/pdf-designs/hipster.html b/resources/views/pdf-designs/hipster.html index 7c984673b6ba..d549f89f9663 100644 --- a/resources/views/pdf-designs/hipster.html +++ b/resources/views/pdf-designs/hipster.html @@ -9,11 +9,6 @@ font-size: '$font-size'; } - @page { - margin: 1cm; - } - - p { margin: 0; padding: 0; @@ -25,11 +20,14 @@ font-family: Arial, Helvetica, sans-serif; } + @page { margin: 1cm; } + .header-wrapper { display: grid; grid-template-columns: 1.2fr 1.8fr; gap: 20px; } + .header-wrapper .header-text-label { font-size: 1.1rem; color: #bba238; @@ -124,7 +122,7 @@ #product-table-footer > * { display: grid; grid-template-columns: 3fr 1fr 1fr; - padding-top: .5rem; + padding-top: 0.5rem; padding-left: 1rem; gap: 20px; } diff --git a/resources/views/pdf-designs/modern.html b/resources/views/pdf-designs/modern.html index e6c34bd8c8e2..c4d06d678fc7 100644 --- a/resources/views/pdf-designs/modern.html +++ b/resources/views/pdf-designs/modern.html @@ -29,7 +29,10 @@ display: grid; grid-template-columns: 1.5fr 1fr; padding: 1.5rem; + width: 100%; + height: 160px; } + .header-container .company-name { font-size: 2rem; } @@ -97,6 +100,10 @@ margin-top: 1rem; background-color: #f46521; padding: 1rem; + height: 160px; + width: 100%; + position: fixed; + bottom: 0; } .footer-content { @@ -152,39 +159,68 @@ padding-top: 0.7rem; padding-bottom: 0.7rem; } + + table.page-container { + page-break-after: always; + } + thead.page-header { + display: table-header-group; + } + tfoot.page-footer { + display: table-footer-group; + } -