From d40604b574d6ce214cdcc72ca2393afa70a50b0f Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 26 Apr 2024 19:01:05 +0100
Subject: [PATCH] Removed debugging, added date cast

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Models/Asset.php | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index dd89efedad..a6502d53d6 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -74,9 +74,9 @@ class Asset extends Depreciable
         'eol_explicit' => 'boolean',
         'last_checkout' => 'datetime',
         'last_checkin' => 'datetime',
-        'expected_checkin' => 'date',
+        'expected_checkin' => 'datetime:m-d-Y',
         'last_audit_date' => 'datetime',
-        'next_audit_date' => 'date',
+        'next_audit_date' => 'datetime:m-d-Y',
         'model_id'       => 'integer',
         'status_id'      => 'integer',
         'company_id'     => 'integer',
@@ -1166,10 +1166,6 @@ class Asset extends Depreciable
         $today = Carbon::now();
         $interval_date = $today->copy()->addDays($interval)->format('Y-m-d');
 
-        \Log::debug($interval);
-        \Log::debug($today);
-        \Log::debug($interval_date);
-
         return $query->whereNotNull('assets.next_audit_date')
             ->whereBetween('assets.next_audit_date', [$today->format('Y-m-d'), $interval_date])
             ->where('assets.archived', '=', 0)
@@ -1233,6 +1229,26 @@ class Asset extends Depreciable
      * @return \Illuminate\Database\Query\Builder          Modified query builder
      */
 
+    public function scopeDueForCheckinToday($query)
+    {
+        return $query->whereNotNull('assets.expected_checkin')
+            ->where('assets.expected_checkin', '=', Carbon::now()->format('Y-m-d'))
+            ->where('assets.archived', '=', 0)
+            ->NotArchived();
+    }
+
+    public function scopeDueForCheckin($query, $settings)
+    {
+        $interval = $settings->audit_warning_days ?? 0;
+        $today = Carbon::now();
+        $interval_date = $today->copy()->addDays($interval)->format('Y-m-d');
+
+        return $query->whereNotNull('assets.expected_checkin')
+            ->whereBetween('assets.expected_checkin', [$today->format('Y-m-d'), $interval_date])
+            ->where('assets.archived', '=', 0)
+            ->NotArchived();
+    }
+
     public function scopeOverdueForCheckin($query)
     {
         return $query->whereNotNull('assets.expected_checkin')
@@ -1254,7 +1270,7 @@ class Asset extends Depreciable
     {
 
         return $query->whereNotNull('assets.expected_checkin')
-            ->where('assets.expected_checkin', '<', Carbon::now()->format('Y-m-d'))
+            ->where('assets.expected_checkin', '<=', Carbon::now()->format('Y-m-d'))
             ->where('assets.archived', '=', 0)
             ->NotArchived();
     }