Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix logic for all_pages_header/footer

Browse Source
This commit is contained in:
Benjamin Beganović 2020-09-08 14:26:13 +02:00
parent 14dc3ea2aa
commit 2635b8c090
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Services/PdfMaker/PdfMakerUtilities.php
View File

@ -55,7 +55,7 @@ trait PdfMakerUtilities
if (isset($element['tag'])) { if (isset($element['tag'])) {
$node = $this->document->getElementsByTagName($element['tag'])->item(0); $node = $this->document->getElementsByTagName($element['tag'])->item(0);
} elseif (! is_null($this->document->getElementById($element['id']))) { } elseif (!is_null($this->document->getElementById($element['id']))) {
$node = $this->document->getElementById($element['id']); $node = $this->document->getElementById($element['id']);
} else { } else {
continue; continue;
@ -80,7 +80,7 @@ trait PdfMakerUtilities
$processed = []; $processed = [];
foreach ($children as $child) { foreach ($children as $child) {
if (! isset($child['order'])) { if (!isset($child['order'])) {
$child['order'] = 0; $child['order'] = 0;
} }
@ -163,7 +163,11 @@ trait PdfMakerUtilities
public function processOptions() public function processOptions()
{ {
if (! isset($this->options['all_pages_header']) && ! isset($this->options['all_pages_footer'])) { if (!isset($this->options['all_pages_header']) || $this->options['all_pages_header'] == false) {
return;
}
if (!isset($this->options['all_pages_footer']) || $this->options['all_pages_footer'] == false) {
return; return;
} }
@ -265,6 +269,8 @@ trait PdfMakerUtilities
$this->document->getElementById('repeat-content')->appendChild($clone); $this->document->getElementById('repeat-content')->appendChild($clone);
} }
info($this->data['options']);
if ( if (
$header = $this->document->getElementById('header') && $header = $this->document->getElementById('header') &&
isset($this->data['options']['all_pages_header']) && isset($this->data['options']['all_pages_header']) &&