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

fix items count() & add support for task times

Browse Source
This commit is contained in:
Benjamin Beganović 2020-11-06 13:12:51 +01:00
parent 40b3a45642
commit 892c440ea4
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,7 +203,7 @@ class Design extends BaseDesign
return $item->type_id == 1; return $item->type_id == 1;
}); });
if ($product_items->count() == 0) { if (count($product_items) == 0) {
return []; return [];
} }
@ -224,7 +224,7 @@ class Design extends BaseDesign
return $item->type_id = 2; return $item->type_id = 2;
}); });
if ($task_items->count() == 0) { if (count($task_items) == 0) {
return []; return [];
} }
@ -269,8 +269,6 @@ class Design extends BaseDesign
return []; return [];
} }
//info($this->context);
foreach ($items as $row) { foreach ($items as $row) {
$element = ['element' => 'tr', 'elements' => []]; $element = ['element' => 'tr', 'elements' => []];
@ -304,11 +302,21 @@ class Design extends BaseDesign
// 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
if ($cell == '$task.rate') { if ($cell == '$task.rate') {
$element['elements'][] = ['element' => 'td', 'content' => $row['$task.cost']]; $element['elements'][] = ['element' => 'td', 'content' => $row['$task.cost']];
} else if ($cell == '$task.hours') { } else if ($cell == '$task.hours') {
$element['elements'][] = ['element' => 'td', 'content' => $row['$task.quantity']]; $element['elements'][] = ['element' => 'td', 'content' => $row['$task.quantity']];
} else if ($cell == '$task.notes') {
$_element = ['element' => 'td', 'content' => '', 'elements' => [
['element' => 'span', 'content' => $row[$cell]],
]];
foreach ($this->getTaskTimeLogs($row) as $log) {
$_element['elements'][] = ['element' => 'span', 'content' => $log, 'properties' => ['class' => 'task-duration']];
}
$element['elements'][] = $_element;
} else { } else {
$element['elements'][] = ['element' => 'td', 'content' => $row[$cell]]; $element['elements'][] = ['element' => 'td', 'content' => $row[$cell]];
} }