Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Integrate new PdfMaker for CreateQuotePdf

Browse Source
This commit is contained in:
Benjamin Beganović 2020-08-12 19:21:29 +02:00
parent 207e271270
commit 0ba6a4351e
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Jobs/Invoice/CreateInvoicePdf.php
View File

@ -84,8 +84,6 @@ class CreateInvoicePdf implements ShouldQueue
$design = Design::find($invoice_design_id);
info('Start: ' . now());
$html = new HtmlEngine(null, $this->invitation, 'invoice');
$design_namespace = 'App\Services\PdfMaker\Designs\\' . $design->name;
@ -109,8 +107,6 @@ class CreateInvoicePdf implements ShouldQueue
->design($design_namespace)
->build();
info($maker->getCompiledHTML());
//todo - move this to the client creation stage so we don't keep hitting this unnecessarily
Storage::makeDirectory($path, 0755);

28
app/Jobs/Quote/CreateQuotePdf.php
View File

@ -19,6 +19,7 @@ use App\Models\ClientContact;
use App\Models\Company;
use App\Models\Design;
use App\Models\Invoice;
use App\Services\PdfMaker\PdfMaker as PdfMakerService;
use App\Utils\HtmlEngine;
use App\Utils\PhantomJS\Phantom;
use App\Utils\Traits\MakesHash;
@ -81,14 +82,33 @@ class CreateQuotePdf implements ShouldQueue
$design = Design::find($quote_design_id);
$designer = new Designer($this->quote, $design, $this->quote->client->getSetting('pdf_variables'), 'quote');
$html = new HtmlEngine(null, $this->invitation, 'quote');
$design_namespace = 'App\Services\PdfMaker\Designs\\' . $design->name;
$design_class = new $design_namespace();
$pdf_variables = json_decode(json_encode($this->quote->company->settings->pdf_variables), 1);
$state = [
'template' => $design_class->elements([
'client' => $this->quote->client,
'entity' => $this->quote,
'product-table-columns' => $pdf_variables['product_columns'],
]),
'variables' => $html->generateLabelsAndValues(),
];
$maker = new PdfMakerService($state);
$maker
->design($design_namespace)
->build();
//todo - move this to the client creation stage so we don't keep hitting this unnecessarily
Storage::makeDirectory($path, 0755);
$html = (new HtmlEngine($designer, $this->invitation, 'quote'))->build();
$pdf = $this->makePdf(null, null, $html);
$pdf = $this->makePdf(null, null, $maker->getCompiledHTML());
$file_path = $path . $this->quote->number . '.pdf';