From bdd104527289e445ecf6e4a41b58355a785e648d Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Wed, 19 Apr 2023 09:11:44 -0700
Subject: [PATCH 1/3] adds a checkout range for custom asset reports

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

diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index 9764df923e..5303126ca8 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -641,6 +641,9 @@ class ReportsController extends Controller
             if (($request->filled('created_start')) && ($request->filled('created_end'))) {
                 $assets->whereBetween('assets.created_at', [$request->input('created_start'), $request->input('created_end')]);
             }
+            if (($request->filled('checkout_date_start')) && ($request->filled('checkout_date_end'))) {
+                $assets->whereBetween('assets.last_checkout', [$request->input('checkout_date_start'), $request->input('checkout_date_end')]);
+            }
 
             if (($request->filled('expected_checkin_start')) && ($request->filled('expected_checkin_end'))) {
                 $assets->whereBetween('assets.expected_checkin', [$request->input('expected_checkin_start'), $request->input('expected_checkin_end')]);
diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php
index d059781543..7dab008bef 100644
--- a/resources/views/reports/custom.blade.php
+++ b/resources/views/reports/custom.blade.php
@@ -283,6 +283,16 @@
               </div>
             </div>
 
+          <!-- Created Date -->
+          <div class="form-group purchase-range">
+              <label for="checkout_date" class="col-md-3 control-label">{{ trans('general.checkout') }} {{  trans('general.range') }}</label>
+              <div class="input-daterange input-group col-md-6" id="datepicker">
+                  <input type="text" class="form-control" name="checkout_date_start" aria-label="checkout_date_start">
+                  <span class="input-group-addon">to</span>
+                  <input type="text" class="form-control" name="checkout_date_end" aria-label="checkout_date_end">
+              </div>
+          </div>
+
             <!-- Expected Checkin Date -->
             <div class="form-group expected_checkin-range">
               <label for="expected_checkin_start" class="col-md-3 control-label">{{ trans('admin/hardware/form.expected_checkin') }}</label>

From 8a5612d1c9558c8910efce5b28576d3115cd00f5 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Wed, 19 Apr 2023 09:13:43 -0700
Subject: [PATCH 2/3] fixes comment

---
 resources/views/reports/custom.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php
index 7dab008bef..561755fe10 100644
--- a/resources/views/reports/custom.blade.php
+++ b/resources/views/reports/custom.blade.php
@@ -283,7 +283,7 @@
               </div>
             </div>
 
-          <!-- Created Date -->
+          <!-- Checkout Date -->
           <div class="form-group purchase-range">
               <label for="checkout_date" class="col-md-3 control-label">{{ trans('general.checkout') }} {{  trans('general.range') }}</label>
               <div class="input-daterange input-group col-md-6" id="datepicker">

From 0e1f50c226b14e3bb1a3bcda28c8cfacf6d0237f Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Wed, 19 Apr 2023 10:11:26 -0700
Subject: [PATCH 3/3] adds checkout-range to jquery

---
 resources/views/reports/custom.blade.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php
index 561755fe10..c48f8df20a 100644
--- a/resources/views/reports/custom.blade.php
+++ b/resources/views/reports/custom.blade.php
@@ -284,7 +284,7 @@
             </div>
 
           <!-- Checkout Date -->
-          <div class="form-group purchase-range">
+          <div class="form-group checkout-range">
               <label for="checkout_date" class="col-md-3 control-label">{{ trans('general.checkout') }} {{  trans('general.range') }}</label>
               <div class="input-daterange input-group col-md-6" id="datepicker">
                   <input type="text" class="form-control" name="checkout_date_start" aria-label="checkout_date_start">
@@ -378,6 +378,12 @@
           endDate: '0d',
           format: 'yyyy-mm-dd'
       });
+      $('.checkout-range .input-daterange').datepicker({
+          clearBtn: true,
+          todayHighlight: true,
+          endDate: '0d',
+          format: 'yyyy-mm-dd'
+      });
 
       $('.expected_checkin-range .input-daterange').datepicker({
           clearBtn: true,