From 91b53bffa1f606484c922534ffba0a36c41959d3 Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Thu, 26 Oct 2023 14:23:31 -0500 Subject: [PATCH 1/2] resolved --- app/Http/Controllers/ReportsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index bfa7d98b24..f89ae029db 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -744,7 +744,7 @@ class ReportsController extends Controller } if ($request->filled('eol')) { - $row[] = ($asset->purchase_date != '') ? $asset->present()->eol_date() : ''; + $row[] = ($asset->eol_explicit) ? $asset->asset_eol_date : $asset->present()->eol_date(); } if ($request->filled('order')) { From f12d44509e8100ca82274f1aef1ee54dd68f5b92 Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Thu, 26 Oct 2023 14:39:02 -0500 Subject: [PATCH 2/2] asset_eol_date should always be filled now --- app/Http/Controllers/ReportsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index f89ae029db..d449d3c444 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -744,7 +744,7 @@ class ReportsController extends Controller } if ($request->filled('eol')) { - $row[] = ($asset->eol_explicit) ? $asset->asset_eol_date : $asset->present()->eol_date(); + $row[] = ($asset->asset_eol_date) ? $asset->asset_eol_date : ''; } if ($request->filled('order')) {