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

Merge pull request #4136 from beganovich/v2-products-table-in-invoices

Browse Source 
(v5) Support for custom products table columns
This commit is contained in:
David Bomba 2020-10-08 06:59:16 +11:00 committed by GitHub
commit 4bbdeef539
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/PreviewController.php
View File

@ -113,6 +113,7 @@ class PreviewController extends BaseController
'client' => $entity_obj->client, 'client' => $entity_obj->client,
'entity' => $entity_obj, 'entity' => $entity_obj,
'pdf_variables' => (array) $entity_obj->company->settings->pdf_variables, 'pdf_variables' => (array) $entity_obj->company->settings->pdf_variables,
'products' => request()->design['design']['product'],
]), ]),
'variables' => $html->generateLabelsAndValues(), 'variables' => $html->generateLabelsAndValues(),
]; ];
@ -184,6 +185,7 @@ class PreviewController extends BaseController
'client' => $invoice->client, 'client' => $invoice->client,
'entity' => $invoice, 'entity' => $invoice,
'pdf_variables' => (array) $invoice->company->settings->pdf_variables, 'pdf_variables' => (array) $invoice->company->settings->pdf_variables,
'products' => request()->design['design']['product'],
]), ]),
'variables' => $html->generateLabelsAndValues(), 'variables' => $html->generateLabelsAndValues(),
]; ];

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

@ -94,6 +94,7 @@ class CreateInvoicePdf implements ShouldQueue
'client' => $this->invoice->client, 'client' => $this->invoice->client,
'entity' => $this->invoice, 'entity' => $this->invoice,
'pdf_variables' => (array) $this->invoice->company->settings->pdf_variables, 'pdf_variables' => (array) $this->invoice->company->settings->pdf_variables,
'products' => $design->design->product,
]), ]),
'variables' => $html->generateLabelsAndValues(), 'variables' => $html->generateLabelsAndValues(),
'options' => [ 'options' => [

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

@ -92,6 +92,7 @@ class CreateQuotePdf implements ShouldQueue
'client' => $this->quote->client, 'client' => $this->quote->client,
'entity' => $this->quote, 'entity' => $this->quote,
'pdf_variables' => (array) $this->quote->company->settings->pdf_variables, 'pdf_variables' => (array) $this->quote->company->settings->pdf_variables,
'products' => $design->design->product,
]), ]),
'variables' => $html->generateLabelsAndValues(), 'variables' => $html->generateLabelsAndValues(),
'options' => [ 'options' => [

30
app/Services/PdfMaker/Design.php
View File

@ -16,6 +16,7 @@ use App\Services\PdfMaker\Designs\Utilities\BaseDesign;
use App\Services\PdfMaker\Designs\Utilities\DesignHelpers; use App\Services\PdfMaker\Designs\Utilities\DesignHelpers;
use App\Utils\Number; use App\Utils\Number;
use App\Utils\Traits\MakesInvoiceValues; use App\Utils\Traits\MakesInvoiceValues;
use DOMDocument;
use Illuminate\Support\Str; use Illuminate\Support\Str;
class Design extends BaseDesign class Design extends BaseDesign
@ -210,8 +211,33 @@ class Design extends BaseDesign
foreach ($items as $row) { foreach ($items as $row) {
$element = ['element' => 'tr', 'elements' => []]; $element = ['element' => 'tr', 'elements' => []];
foreach ($this->context['pdf_variables']["{$this->type}_columns"] as $key => $cell) { if (
$element['elements'][] = ['element' => 'td', 'content' => $row[$cell]]; isset($this->context['products']) &&
!empty($this->context['products']) &&
!is_null($this->context['products'])
) {
$document = new DOMDocument();
$document->loadHTML($this->context['products'], LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD);
$td = $document->getElementsByTagName('tr')->item(0);
if ($td) {
foreach ($td->childNodes as $child) {
if ($child->nodeType !== 1) {
continue;
}
if ($child->tagName !== 'td') {
continue;
}
$element['elements'][] = ['element' => 'td', 'content' => strtr($child->nodeValue, $row)];
}
}
} else {
foreach ($this->context['pdf_variables']["{$this->type}_columns"] as $key => $cell) {
$element['elements'][] = ['element' => 'td', 'content' => $row[$cell]];
}
} }
$elements[] = $element; $elements[] = $element;