A free open source IT asset/license management system
WIP: Render assignments
Marcus Mooree6808100ead5
diff --git a/app/Http/Controllers/Reports/CustomComponentReportController.php b/app/Http/Controllers/Reports/CustomComponentReportController.phpindex ea6469a17b..e58ce9ed00 100644--- a/app/Http/Controllers/Reports/CustomComponentReportController.php+++ b/app/Http/Controllers/Reports/CustomComponentReportController.php@@ -69,9 +69,9 @@ class CustomComponentReportController extends Controller$formatter = new EscapeFormula('`');foreach ($components as $component) {+ $rowsToWrite = $component->qty;- foreach ($component->assets as $asset) {-+ for ($i = 0; $i < $rowsToWrite; $i++) {$count++;$row = [];@@ -99,8 +99,8 @@ class CustomComponentReportController extends Controller$row[] = $component->model_number;}- if ($request->filled('include_assignments')) {- $row[] = $asset->name;+ if ($request->filled('include_assignments') && isset($component->assets[$i])) {+ $row[] = $component->assets[$i]?->name;}// todo: serial