From af7995815c74370fe45c28cf60a1bc3848040fc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 27 Aug 2020 08:47:51 +0200
Subject: [PATCH] Rename all_page_* to all_pages_* for dynamic header/footer

---
 app/Jobs/Invoice/CreateInvoicePdf.php       |  6 ++++++
 app/Jobs/Quote/CreateQuotePdf.php           |  4 ++++
 app/Services/PdfMaker/PdfMakerUtilities.php | 10 +++++-----
 tests/Feature/PdfMaker/PdfMakerTest.php     |  2 +-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/Jobs/Invoice/CreateInvoicePdf.php b/app/Jobs/Invoice/CreateInvoicePdf.php
index 5b3ecbdfe724..2d81fcdd7a66 100644
--- a/app/Jobs/Invoice/CreateInvoicePdf.php
+++ b/app/Jobs/Invoice/CreateInvoicePdf.php
@@ -99,6 +99,10 @@ class CreateInvoicePdf implements ShouldQueue
                 'product-table-columns' => $pdf_variables['product_columns'],
             ]),
             'variables' => $html->generateLabelsAndValues(),
+            'options' => [
+                'all_pages_header' => $this->invoice->client->getSetting('all_pages_header'),
+                'all_pages_footer' => $this->invoice->client->getSetting('all_pages_footer'),
+            ],
         ];
 
         $maker = new PdfMakerService($state);
@@ -110,6 +114,8 @@ class CreateInvoicePdf implements ShouldQueue
         //todo - move this to the client creation stage so we don't keep hitting this unnecessarily
         Storage::makeDirectory($path, 0775);
 
+        info($maker->getCompiledHTML());
+
         $pdf       = $this->makePdf(null, null, $maker->getCompiledHTML());
 
         $instance  = Storage::disk($this->disk)->put($file_path, $pdf);
diff --git a/app/Jobs/Quote/CreateQuotePdf.php b/app/Jobs/Quote/CreateQuotePdf.php
index d1b759d73ef5..6c17b032883c 100644
--- a/app/Jobs/Quote/CreateQuotePdf.php
+++ b/app/Jobs/Quote/CreateQuotePdf.php
@@ -97,6 +97,10 @@ class CreateQuotePdf implements ShouldQueue
                 'product-table-columns' => $pdf_variables['product_columns'],
             ]),
             'variables' => $html->generateLabelsAndValues(),
+            'options' => [
+                'all_pages_header' => $this->invoice->client->getSetting('all_pages_header'),
+                'all_pages_footer' => $this->invoice->client->getSetting('all_pages_footer'),
+            ],
         ];
 
         $maker = new PdfMakerService($state);
diff --git a/app/Services/PdfMaker/PdfMakerUtilities.php b/app/Services/PdfMaker/PdfMakerUtilities.php
index 24c3a2cc2228..af2444478e7b 100644
--- a/app/Services/PdfMaker/PdfMakerUtilities.php
+++ b/app/Services/PdfMaker/PdfMakerUtilities.php
@@ -156,7 +156,7 @@ trait PdfMakerUtilities
 
     public function processOptions()
     {
-        if (!isset($this->options['all_page_header']) && !isset($this->options['all_page_footer'])) {
+        if (!isset($this->options['all_pages_header']) && !isset($this->options['all_pages_footer'])) {
             return;
         }
 
@@ -260,8 +260,8 @@ trait PdfMakerUtilities
 
         if (
             $header = $this->document->getElementById('header') && 
-            isset($this->data['options']['all_page_header']) &&
-            $this->data['options']['all_page_header']
+            isset($this->data['options']['all_pages_header']) &&
+            $this->data['options']['all_pages_header']
         ) {
 
             $header = $this->document->getElementById('header');
@@ -273,8 +273,8 @@ trait PdfMakerUtilities
 
         if (
             $footer = $this->document->getElementById('footer') &&
-            isset($this->data['options']['all_page_footer']) &&
-            $this->data['options']['all_page_footer']
+            isset($this->data['options']['all_pages_footer']) &&
+            $this->data['options']['all_pages_footer']
         ) {
             $footer = $this->document->getElementById('footer');
             $clone = $footer->cloneNode(true);
diff --git a/tests/Feature/PdfMaker/PdfMakerTest.php b/tests/Feature/PdfMaker/PdfMakerTest.php
index 49f5d2410031..147d36dd1472 100644
--- a/tests/Feature/PdfMaker/PdfMakerTest.php
+++ b/tests/Feature/PdfMaker/PdfMakerTest.php
@@ -357,7 +357,7 @@ class PdfMakerTest extends TestCase
                 'values' => [],
             ],
             'options' => [
-                'all_page_footer' => true,
+                'all_pages_footer' => true,
             ],
         ];