Skip to content

A free open source IT asset/license management system

Add checkout date and assigned quantity

Marcus Moore357fc2785a8e
diff --git a/app/Http/Controllers/Reports/CustomComponentReportController.php b/app/Http/Controllers/Reports/CustomComponentReportController.php
index 0f941be46d..4953479eee 100644
--- a/app/Http/Controllers/Reports/CustomComponentReportController.php
+++ b/app/Http/Controllers/Reports/CustomComponentReportController.php
@@ -110,11 +110,15 @@ class CustomComponentReportController extends Controller
$row[] = $component->assets[$i]->asset_tag ?? '';
$row[] = $component->assets[$i]->company->name ?? '';
$row[] = $component->assets[$i]->serial;
+ $row[] = $component->assets[$i]->pivot->created_at ?? '';
+ $row[] = $component->assets[$i]->pivot->assigned_qty;
} else {
$row[] = '';
$row[] = '';
$row[] = '';
$row[] = '';
+ $row[] = '';
+ $row[] = '';
}
}
@@ -155,11 +159,6 @@ class CustomComponentReportController extends Controller
}
}
- // if ($request->filled('checkout_date')) {
- // // todo: checkout date
- // $row[] = '';
- // }
-
if ($request->filled('created_at')) {
$row[] = $component->created_at;
}
@@ -243,6 +242,9 @@ class CustomComponentReportController extends Controller
$header[] = trans('admin/hardware/form.tag');
$header[] = trans('admin/reports/general.custom_export.asset_company');
$header[] = trans('admin/reports/general.custom_export.asset_serial');
+ $header[] = trans('admin/hardware/form.checkout_date');
+ // todo: translate
+ $header[] = 'Assigned Qty';
}
if ($request->filled('purchase_date')) {
@@ -282,11 +284,6 @@ class CustomComponentReportController extends Controller
$header[] = trans('general.zip');
}
- // todo: has to have include_assignments enabled
- // if ($request->filled('checkout_date')) {
- // $header[] = trans('admin/hardware/table.checkout_date');
- // }
-
if ($request->filled('created_at')) {
$header[] = trans('general.created_at');
}
diff --git a/tests/Feature/Reporting/Custom/CustomComponentReportTest.php b/tests/Feature/Reporting/Custom/CustomComponentReportTest.php
index c072260870..8da52d07a4 100644
--- a/tests/Feature/Reporting/Custom/CustomComponentReportTest.php
+++ b/tests/Feature/Reporting/Custom/CustomComponentReportTest.php
@@ -605,11 +605,13 @@ class CustomComponentReportTest extends TestCase
->assertOk()
->assertCsvHeader()
->assertDontSeeTextInStreamedResponse([
- trans('admin/hardware/table.checkout_date'),
trans('admin/hardware/form.name'),
trans('admin/hardware/form.tag'),
trans('admin/reports/general.custom_export.asset_company'),
trans('admin/reports/general.custom_export.asset_serial'),
+ trans('admin/hardware/table.checkout_date'),
+ // todo: translate
+ 'Assigned Qty',
])
->assertSeeTextInStreamedResponse('Component A')
->assertSeeTextInStreamedResponse('Component B')
@@ -639,12 +641,13 @@ class CustomComponentReportTest extends TestCase
->assertOk()
->assertCsvHeader()
->assertSeeTextInStreamedResponse([
- // todo:
- // trans('admin/hardware/table.checkout_date'),
trans('admin/hardware/form.name'),
trans('admin/hardware/form.tag'),
trans('admin/reports/general.custom_export.asset_company'),
trans('admin/reports/general.custom_export.asset_serial'),
+ trans('admin/hardware/table.checkout_date'),
+ // todo: translate
+ 'Assigned Qty',
])
->assertSeeTextInStreamedResponse([
'Component A',