diff --git a/VERSION.txt b/VERSION.txt index fb2688fbd9e6..0efc4c830b95 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.3.91 \ No newline at end of file +5.3.92 \ No newline at end of file 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()); diff --git a/config/ninja.php b/config/ninja.php index 12f9b93bbf76..37b48bac0f1b 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -14,8 +14,8 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'), - 'app_version' => '5.3.91', - 'app_tag' => '5.3.91', + 'app_version' => '5.3.92', + 'app_tag' => '5.3.92', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', ''),