From 2635b8c09013a82907c75cb15ac69b53734ed4d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 8 Sep 2020 14:26:13 +0200 Subject: [PATCH] Fix logic for all_pages_header/footer --- app/Services/PdfMaker/PdfMakerUtilities.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/Services/PdfMaker/PdfMakerUtilities.php b/app/Services/PdfMaker/PdfMakerUtilities.php index 5b1bb9f88ac0..6f05f2cbbcd1 100644 --- a/app/Services/PdfMaker/PdfMakerUtilities.php +++ b/app/Services/PdfMaker/PdfMakerUtilities.php @@ -55,7 +55,7 @@ trait PdfMakerUtilities if (isset($element['tag'])) { $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']); } else { continue; @@ -80,7 +80,7 @@ trait PdfMakerUtilities $processed = []; foreach ($children as $child) { - if (! isset($child['order'])) { + if (!isset($child['order'])) { $child['order'] = 0; } @@ -163,7 +163,11 @@ trait PdfMakerUtilities 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; } @@ -265,6 +269,8 @@ trait PdfMakerUtilities $this->document->getElementById('repeat-content')->appendChild($clone); } + info($this->data['options']); + if ( $header = $this->document->getElementById('header') && isset($this->data['options']['all_pages_header']) &&