diff --git a/app/Utils/Traits/MakesInvoiceValues.php b/app/Utils/Traits/MakesInvoiceValues.php index 29a017889873..694a6f45733e 100644 --- a/app/Utils/Traits/MakesInvoiceValues.php +++ b/app/Utils/Traits/MakesInvoiceValues.php @@ -737,36 +737,6 @@ trait MakesInvoiceValues $settings = $this->client->getMergedSettings(); $header_and_footer = ' -@media print { - thead {display: table-header-group;} - tfoot {display: table-footer-group;} - button {display: none;} - body {margin: 0;} -}'; - - $header = ' -@media print { - thead {display: table-header-group;} - button {display: none;} - body {margin: 0;} -}'; - - $footer = ' -@media print { - tfoot {display: table-footer-group;} - button {display: none;} - body {margin: 0;} -}'; - $css = ''; - - if($settings->all_pages_header && $settings->all_pages_footer) - $css .= $header_and_footer; - elseif($settings->all_pages_header && !$settings->all_pages_footer) - $css .= $header; - elseif(!$settings->all_pages_header && $settings->all_pages_footer) - $css .= $footer; - - $css .= ' .header, .header-space { height: 160px; } @@ -787,6 +757,60 @@ trait MakesInvoiceValues width: 100%; } +@media print { + thead {display: table-header-group;} + tfoot {display: table-footer-group;} + button {display: none;} + body {margin: 0;} +}'; + + $header = ' +.header, .header-space { + height: 160px; +} + +.header { + position: fixed; + top: 0mm; + width: 100%; +} + +@media print { + thead {display: table-header-group;} + button {display: none;} + body {margin: 0;} +}'; + + $footer = ' + +.footer, .footer-space { + height: 160px; +} + +.footer { + position: fixed; + bottom: 0; + width: 100%; +} + +@media print { + tfoot {display: table-footer-group;} + button {display: none;} + body {margin: 0;} +}'; + $css = ''; + +\Log::error($settings->all_pages_header); +\Log::error($settings->all_pages_footer); + + if($settings->all_pages_header && $settings->all_pages_footer) + $css .= $header_and_footer; + elseif($settings->all_pages_header && !$settings->all_pages_footer) + $css .= $header; + elseif(!$settings->all_pages_header && $settings->all_pages_footer) + $css .= $footer; + + $css .= ' .page { page-break-after: always; }