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

Updates for PDF designer with custom columns

Browse Source
This commit is contained in:
David Bomba 2023-03-15 12:03:39 +11:00
parent a1c986d83a
commit 4bd1895fa7
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -679,7 +679,14 @@ class Design extends BaseDesign
'$task.rate' => '$task.cost', '$task.rate' => '$task.cost',
]; ];
foreach ($this->context['pdf_variables']["{$type}_columns"] as $column) { $table_type = "{$type}_columns";
nlog($table_type);
if($type == 'product' && $this->entity instanceof Quote && !$this->settings_object->getSetting('sync_invoice_quote_columns'))
$table_type = "product_quote_columns";
foreach ($this->context['pdf_variables'][$table_type] as $column) {
if (array_key_exists($column, $aliases)) { if (array_key_exists($column, $aliases)) {
$elements[] = ['element' => 'th', 'content' => $aliases[$column] . '_label', 'properties' => ['data-ref' => "{$type}_table-" . substr($aliases[$column], 1) . '-th', 'hidden' => $this->settings_object->getSetting('hide_empty_columns_on_pdf')]]; $elements[] = ['element' => 'th', 'content' => $aliases[$column] . '_label', 'properties' => ['data-ref' => "{$type}_table-" . substr($aliases[$column], 1) . '-th', 'hidden' => $this->settings_object->getSetting('hide_empty_columns_on_pdf')]];
} elseif ($column == '$product.discount' && !$this->company->enable_product_discount) { } elseif ($column == '$product.discount' && !$this->company->enable_product_discount) {
@ -748,6 +755,14 @@ class Design extends BaseDesign
return $elements; return $elements;
} }
$_type = Str::startsWith($type, '$') ? ltrim($type, '$') : $type;
$table_type = "{$_type}_columns";
if ($_type == 'product' && $this->entity instanceof Quote && !$this->settings_object->getSetting('sync_invoice_quote_columns')) {
$table_type = "product_quote_columns";
}
foreach ($items as $row) { foreach ($items as $row) {
$element = ['element' => 'tr', 'elements' => []]; $element = ['element' => 'tr', 'elements' => []];
@ -775,9 +790,8 @@ class Design extends BaseDesign
} }
} }
} else { } else {
$_type = Str::startsWith($type, '$') ? ltrim($type, '$') : $type;
foreach ($this->context['pdf_variables']["{$_type}_columns"] as $key => $cell) { foreach ($this->context['pdf_variables'][$table_type] as $key => $cell) {
// We want to keep aliases like these: // We want to keep aliases like these:
// $task.cost => $task.rate // $task.cost => $task.rate
// $task.quantity => $task.hours // $task.quantity => $task.hours