Skip to content

A free open source IT asset/license management system

WIP: Populate additional fields

Marcus Mooredec4ff9a44b2
diff --git a/app/Http/Controllers/Reports/CustomComponentReportController.php b/app/Http/Controllers/Reports/CustomComponentReportController.php
index e58ce9ed00..0edf20addc 100644
--- a/app/Http/Controllers/Reports/CustomComponentReportController.php
+++ b/app/Http/Controllers/Reports/CustomComponentReportController.php
@@ -103,12 +103,30 @@ class CustomComponentReportController extends Controller
$row[] = $component->assets[$i]?->name;
}
- // todo: serial
- // todo: purchase date
+ if ($request->filled('serial')) {
+ $row[] = $component->serial;
+ }
+
+ if ($request->filled('purchase')) {
+ $row[] = $component->purchase_date ? Carbon::make($component->purchase_date)->format('Y-m-d') : '';
+ }
// todo: quantity
// todo: min quantity
// todo: unit cost
+ if ($request->filled('quantity')) {
+ $row[] = $component->qty;
+ }
+
+ if ($request->filled('min_amount')) {
+ $row[] = $component->min_amt;
+ }
+
+ // todo:
+ // if ($request->filled('unit_cost')) {
+ //
+ // }
+
if ($request->filled('order')) {
$row[] = $component->order_number;
}