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

fix custom1234

Browse Source
This commit is contained in:
Benjamin Beganović 2020-10-20 13:01:07 +02:00
parent 9bcea0cf58
commit 1de6f94f10
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -196,7 +196,7 @@ class PreviewController extends BaseController
->design($design) ->design($design)
->build(); ->build();
// info($maker->getCompiledHTML(true)); info($maker->getCompiledHTML(true));
$file_path = PreviewPdf::dispatchNow($maker->getCompiledHTML(true), auth()->user()->company()); $file_path = PreviewPdf::dispatchNow($maker->getCompiledHTML(true), auth()->user()->company());

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

@ -109,6 +109,8 @@ class CreateInvoicePdf implements ShouldQueue
->design($template) ->design($template)
->build(); ->build();
info($maker->getCompiledHTML());
//todo - move this to the client creation stage so we don't keep hitting this unnecessarily //todo - move this to the client creation stage so we don't keep hitting this unnecessarily
Storage::makeDirectory($path, 0775); Storage::makeDirectory($path, 0775);

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

@ -169,8 +169,9 @@ class Design extends BaseDesign
foreach ($variables as $variable) { foreach ($variables as $variable) {
$_variable = explode('.', $variable)[1]; $_variable = explode('.', $variable)[1];
$_customs = ['custom1', 'custom2', 'custom3', 'custom4'];
if ($_variable == 'custom1' || $_variable == 'custom2') { if (in_array($_variable, $_customs)) {
$elements[] = ['element' => 'tr', 'elements' => [ $elements[] = ['element' => 'tr', 'elements' => [
['element' => 'th', 'content' => $variable . '_label'], ['element' => 'th', 'content' => $variable . '_label'],
['element' => 'th', 'content' => $variable], ['element' => 'th', 'content' => $variable],