From df9e1f902da8ff1cb153ba9d8f39de3de15381dd Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 27 May 2022 07:32:13 +1000 Subject: [PATCH] Fixes for page numbering in previews --- app/Http/Controllers/PreviewController.php | 40 +++++++++++++++++++--- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/PreviewController.php b/app/Http/Controllers/PreviewController.php index 5907ee27e1c6..be970d56d692 100644 --- a/app/Http/Controllers/PreviewController.php +++ b/app/Http/Controllers/PreviewController.php @@ -41,6 +41,7 @@ use App\Utils\Ninja; use App\Utils\PhantomJS\Phantom; use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesInvoiceHtml; +use App\Utils\Traits\Pdf\PageNumbering; use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Lang; @@ -51,6 +52,8 @@ class PreviewController extends BaseController { use MakesHash; use MakesInvoiceHtml; + use PageNumbering; + public function __construct() { @@ -157,7 +160,15 @@ class PreviewController extends BaseController } if(config('ninja.invoiceninja_hosted_pdf_generation') || config('ninja.pdf_generator') == 'hosted_ninja'){ - return (new NinjaPdf())->build($maker->getCompiledHTML(true)); + $pdf = (new NinjaPdf())->build($maker->getCompiledHTML(true)); + + $numbered_pdf = $this->pageNumbering($pdf, auth()->user()->company()); + + if($numbered_pdf) + $pdf = $numbered_pdf; + + return $pdf; + } //else @@ -285,7 +296,14 @@ class PreviewController extends BaseController } if(config('ninja.invoiceninja_hosted_pdf_generation') || config('ninja.pdf_generator') == 'hosted_ninja'){ - return (new NinjaPdf())->build($maker->getCompiledHTML(true)); + $pdf = (new NinjaPdf())->build($maker->getCompiledHTML(true)); + + $numbered_pdf = $this->pageNumbering($pdf, auth()->user()->company()); + + if($numbered_pdf) + $pdf = $numbered_pdf; + + return $pdf; } $file_path = PreviewPdf::dispatchNow($maker->getCompiledHTML(true), $company); @@ -354,7 +372,14 @@ class PreviewController extends BaseController } if(config('ninja.invoiceninja_hosted_pdf_generation') || config('ninja.pdf_generator') == 'hosted_ninja'){ - return (new NinjaPdf())->build($maker->getCompiledHTML(true)); + $pdf = (new NinjaPdf())->build($maker->getCompiledHTML(true)); + + $numbered_pdf = $this->pageNumbering($pdf, auth()->user()->company()); + + if($numbered_pdf) + $pdf = $numbered_pdf; + + return $pdf; } $file_path = PreviewPdf::dispatchNow($maker->getCompiledHTML(true), auth()->user()->company()); @@ -443,7 +468,14 @@ class PreviewController extends BaseController } if(config('ninja.invoiceninja_hosted_pdf_generation') || config('ninja.pdf_generator') == 'hosted_ninja'){ - return (new NinjaPdf())->build($maker->getCompiledHTML(true)); + $pdf = (new NinjaPdf())->build($maker->getCompiledHTML(true)); + + $numbered_pdf = $this->pageNumbering($pdf, auth()->user()->company()); + + if($numbered_pdf) + $pdf = $numbered_pdf; + + return $pdf; } $file_path = PreviewPdf::dispatchNow($maker->getCompiledHTML(true), auth()->user()->company());