Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-01 00:34:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updates for populating options

Browse Source
This commit is contained in:
David Bomba 2023-10-26 17:13:06 +11:00
parent 0d285b606d
commit c66fecb39c
5 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -128,6 +128,9 @@ class PreviewController extends BaseController
'options' => [ 'options' => [
'all_pages_header' => $client->getSetting('all_pages_header'), 'all_pages_header' => $client->getSetting('all_pages_header'),
'all_pages_footer' => $client->getSetting('all_pages_footer'), 'all_pages_footer' => $client->getSetting('all_pages_footer'),
'client' => $entity_obj->client ?? [],
'vendor' => $entity_obj->vendor ?? [],
$request->input('entity')."s" => [$entity_obj],
], ],
'process_markdown' => $client->company->markdown_enabled, 'process_markdown' => $client->company->markdown_enabled,
]; ];
@ -271,7 +274,8 @@ class PreviewController extends BaseController
'variables' => $html->generateLabelsAndValues(), 'variables' => $html->generateLabelsAndValues(),
'process_markdown' => $entity_obj->client->company->markdown_enabled, 'process_markdown' => $entity_obj->client->company->markdown_enabled,
'options' => [ 'options' => [
'client' => $entity_obj->client, 'client' => $entity_obj->client ?? [],
'vendor' => $entity_obj->vendor ?? [],
request()->input('entity_type', 'invoice')."s" => [$entity_obj], request()->input('entity_type', 'invoice')."s" => [$entity_obj],
] ]
]; ];

14
app/Http/Controllers/PreviewPurchaseOrderController.php
View File

@ -122,6 +122,10 @@ class PreviewPurchaseOrderController extends BaseController
]), ]),
'variables' => $html->generateLabelsAndValues(), 'variables' => $html->generateLabelsAndValues(),
'process_markdown' => $entity_obj->company->markdown_enabled, 'process_markdown' => $entity_obj->company->markdown_enabled,
'options' => [
'vendor' => $entity_obj->vendor ?? [],
request()->input('entity')."s" => [$entity_obj],
]
]; ];
$design = new Design(request()->design['name']); $design = new Design(request()->design['name']);
@ -235,7 +239,7 @@ class PreviewPurchaseOrderController extends BaseController
'options' => [ 'options' => [
'client' => null, 'client' => null,
'vendor' => $entity_obj->vendor, 'vendor' => $entity_obj->vendor,
'entity' => $entity_obj, 'purchase_orders' => [$entity_obj],
'variables' => $html->generateLabelsAndValues(), 'variables' => $html->generateLabelsAndValues(),
], ],
'process_markdown' => $entity_obj->company->markdown_enabled, 'process_markdown' => $entity_obj->company->markdown_enabled,
@ -330,6 +334,10 @@ class PreviewPurchaseOrderController extends BaseController
]), ]),
'variables' => $html->generateLabelsAndValues(), 'variables' => $html->generateLabelsAndValues(),
'process_markdown' => $invitation->company->markdown_enabled, 'process_markdown' => $invitation->company->markdown_enabled,
'options' => [
'vendor' => $invitation->purchase_order->vendor,
'purchase_orders' => $invitation->purchase_order,
],
]; ];
@ -435,6 +443,10 @@ class PreviewPurchaseOrderController extends BaseController
]), ]),
'variables' => $html->generateLabelsAndValues(), 'variables' => $html->generateLabelsAndValues(),
'process_markdown' => $purchase_order->company->markdown_enabled, 'process_markdown' => $purchase_order->company->markdown_enabled,
'options' => [
'vendor' => $invitation->purchase_order->vendor,
'purchase_orders' => $invitation->purchase_order,
],
]; ];
$maker = new PdfMaker($state); $maker = new PdfMaker($state);

3
app/Jobs/Entity/CreateRawPdf.php
View File

@ -83,7 +83,8 @@ class CreateRawPdf
{ {
/** Testing this override to improve PDF generation performance */ /** Testing this override to improve PDF generation performance */
$ps = new PdfService($this->invitation, 'product', [ $ps = new PdfService($this->invitation, 'product', [
'client' => $this->entity->client, 'client' => $this->entity->client ?? false,
'vendor' => $this->entity->vendor ?? false,
"{$this->entity_string}s" => [$this->entity], "{$this->entity_string}s" => [$this->entity],
]); ]);

4
tests/Feature/PdfMaker/ExampleIntegrationTest.php
View File

@ -49,6 +49,10 @@ class ExampleIntegrationTest extends TestCase
'pdf_variables' => (array) $invoice->company->settings->pdf_variables, 'pdf_variables' => (array) $invoice->company->settings->pdf_variables,
]), ]),
'variables' => $engine->generateLabelsAndValues(), 'variables' => $engine->generateLabelsAndValues(),
'options' => [
'client' => $invoice->client,
'invoices' => [$invoice]
],
]; ];
$maker = new PdfMaker($state); $maker = new PdfMaker($state);

3
tests/Feature/Template/TemplateTest.php
View File

@ -684,7 +684,8 @@ class TemplateTest extends TestCase
'all_pages_header' => $entity_obj->client->getSetting('all_pages_header'), 'all_pages_header' => $entity_obj->client->getSetting('all_pages_header'),
'all_pages_footer' => $entity_obj->client->getSetting('all_pages_footer'), 'all_pages_footer' => $entity_obj->client->getSetting('all_pages_footer'),
'client' => $entity_obj->client, 'client' => $entity_obj->client,
'entity' => $entity_obj, 'entity' => [$entity_obj],
'invoices' => [$entity_obj],
'variables' => $variables, 'variables' => $variables,
], ],
'process_markdown' => $entity_obj->client->company->markdown_enabled, 'process_markdown' => $entity_obj->client->company->markdown_enabled,