From f71b69a739c8437c4ef2c6065ba80f8e08102d29 Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Wed, 26 Jul 2023 17:31:06 -0400
Subject: [PATCH] adding eol fields

---
 app/Http/Controllers/ReportsController.php |  4 ++--
 resources/views/reports/custom.blade.php   | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

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 @@
             </div>
 
               <!-- EoL Date -->
-              <div class="form-group eol-range">
-                  <label for="eol" class="col-md-3 control-label">{{ trans('admin/hardware/form.eol_date') }}</label>
+              <div class="form-group asset_eol_date-range">
+                  <label for="asset_eol_date" class="col-md-3 control-label">{{ trans('admin/hardware/form.eol_date') }}</label>
                   <div class="input-daterange input-group col-md-6" id="datepicker">
-                      <input type="text" class="form-control" name="eol_start" aria-label="eol_start">
+                      <input type="text" class="form-control" name="asset_eol_date_start" aria-label="asset_eol_date_start">
                       <span class="input-group-addon">to</span>
-                      <input type="text" class="form-control" name="eol_end" aria-label="eol_end">
+                      <input type="text" class="form-control" name="asset_eol_date_end" aria-label="asset_eol_date_end">
                   </div>
               </div>
 
@@ -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'