diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index c61d2de303..cda7d990f9 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -649,8 +649,8 @@ class ReportsController extends Controller $assets->whereBetween('assets.expected_checkin', [$request->input('expected_checkin_start'), $request->input('expected_checkin_end')]); } - if (($request->filled('eol')) && ($request->filled('eol'))) { - $assets->whereBetween('assets.eol', [$request->input('eol_start'), $request->input('eol_end')]); + if (($request->filled('asset_eol_date_start')) && ($request->filled('asset_eol_date_end'))) { + $assets->whereBetween('assets.asset_eol_date', [$request->input('asset_eol_date_start'), $request->input('asset_eol_date_end')]); } if (($request->filled('last_audit_start')) && ($request->filled('last_audit_end'))) { diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php index 2ccc0e8e98..2220b2f163 100644 --- a/resources/views/reports/custom.blade.php +++ b/resources/views/reports/custom.blade.php @@ -304,12 +304,12 @@ -
- +
+
- + to - +
@@ -401,7 +401,7 @@ format: 'yyyy-mm-dd' }); - $('.eol-range .input-daterange').datepicker({ + $('.asset_eol_date-range .input-daterange').datepicker({ clearBtn: true, todayHighlight: true, format: 'yyyy-mm-dd'