Skip to content

A free open source IT asset/license management system

Implement order number

Marcus Moorea6e6797dacfe
diff --git a/app/Http/Controllers/Reports/CustomComponentReportController.php b/app/Http/Controllers/Reports/CustomComponentReportController.php
index 3efe54b340..92317be569 100644
--- a/app/Http/Controllers/Reports/CustomComponentReportController.php
+++ b/app/Http/Controllers/Reports/CustomComponentReportController.php
@@ -70,6 +70,7 @@ class CustomComponentReportController extends Controller
$localConstraints = [
'by_model_number' => 'components.model_number',
'by_name' => 'components.name',
+ 'by_order_number' => 'components.order_number',
];
foreach ($localConstraints as $formKey => $column) {
@@ -139,6 +140,10 @@ class CustomComponentReportController extends Controller
$row[] = $component->name;
}
+ if ($request->filled('order')) {
+ $row[] = $component->order_number;
+ }
+
// CSV_ESCAPE_FORMULAS is set to false in the .env
if (config('app.escape_formulas') === false) {
fputcsv($handle, $row);
diff --git a/tests/Feature/Reporting/Custom/CustomComponentReportTest.php b/tests/Feature/Reporting/Custom/CustomComponentReportTest.php
index 37b9cc54fb..b74ef78c34 100644
--- a/tests/Feature/Reporting/Custom/CustomComponentReportTest.php
+++ b/tests/Feature/Reporting/Custom/CustomComponentReportTest.php
@@ -318,8 +318,6 @@ class CustomComponentReportTest extends TestCase
public function test_limiting_by_order_number()
{
- $this->markTestIncomplete();
-
Component::factory()->create(['order_number' => 'ORD-001']);
Component::factory()->create(['order_number' => 'ORD-002']);