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

Merge pull request #4400 from beganovich/v5-alias-task.item-to-task.service

Browse Source 
(v5) Alias task.product_key as task.service
This commit is contained in:
Benjamin Beganović 2020-12-01 15:20:14 +01:00 committed by GitHub
commit d6dc7ffc27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -292,8 +292,17 @@ class Design extends BaseDesign
$elements = [];
// Some of column can be aliased. This is simple workaround for these.
$aliases = [
'$task.product_key' => '$task.service',
];
foreach ($this->context['pdf_variables']["{$type}_columns"] as $column) {
$elements[] = ['element' => 'th', 'content' => $column . '_label'];
if (array_key_exists($column, $aliases)) {
$elements[] = ['element' => 'th', 'content' => $aliases[$column] . '_label'];
} else {
$elements[] = ['element' => 'th', 'content' => $column . '_label'];
}
}
return $elements;
@ -322,7 +331,7 @@ class Design extends BaseDesign
$element['elements'][] = ['element' => 'td', 'content' => $row['delivery_note.product_key']];
$element['elements'][] = ['element' => 'td', 'content' => $row['delivery_note.notes']];
$element['elements'][] = ['element' => 'td', 'content' => $row['delivery_note.quantity']];
$elements[] = $element;
}

1
app/Utils/HtmlEngine.php
View File

@ -316,6 +316,7 @@ class HtmlEngine
$data['$task.tax_name2'] = ['value' => '', 'label' => ctrans('texts.tax')];
$data['$task.tax_name3'] = ['value' => '', 'label' => ctrans('texts.tax')];
$data['$task.line_total'] = ['value' => '', 'label' => ctrans('texts.line_total')];
$data['$task.service'] = ['value' => '', 'label' => ctrans('texts.service')];
if ($this->settings->signature_on_pdf) {
$data['$contact.signature'] = ['value' => $this->invitation->signature_base64, 'label' => ctrans('texts.signature')];

2
resources/lang/en/texts.php
View File

@ -3311,4 +3311,6 @@ return [
'billing_country' => 'Billing Country',
'shipping_country' => 'Shipping Country',
'service' => 'Service',
];