From 42d86bf57bff7ab9b4d4cb9038b4917934fd2700 Mon Sep 17 00:00:00 2001
From: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Tue, 18 Jan 2022 14:21:49 -0600
Subject: [PATCH 1/2] Adds default values if the expiring alerts threshold is
 null

---
 app/Models/Asset.php   | 4 +++-
 app/Models/License.php | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index bff0134a05..a1e94b4510 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -665,13 +665,15 @@ class Asset extends Depreciable
      */
     public static function getExpiringWarrantee($days = 30)
     {
+        $days = (is_null($days)) ? 30 : $days;
+        
         return Asset::where('archived', '=', '0')
             ->whereNotNull('warranty_months')
             ->whereNotNull('purchase_date')
             ->whereNull('deleted_at')
             ->whereRaw(\DB::raw('DATE_ADD(`purchase_date`,INTERVAL `warranty_months` MONTH) <= DATE(NOW() + INTERVAL '
                                  . $days
-                                 . ' DAY) AND DATE_ADD(`purchase_date`,INTERVAL `warranty_months` MONTH) > NOW()'))
+                                 . ' DAY) AND DATE_ADD(`purchase_date`, INTERVAL `warranty_months` MONTH) > NOW()'))
             ->orderBy('purchase_date', 'ASC')
             ->get();
     }
diff --git a/app/Models/License.php b/app/Models/License.php
index 8f0fbdfaab..9bd7627f94 100755
--- a/app/Models/License.php
+++ b/app/Models/License.php
@@ -627,7 +627,8 @@ class License extends Depreciable
      */
     public static function getExpiringLicenses($days = 60)
     {
-
+        $days = (is_null($days)) ? 30 : $days;
+        
         return License::whereNotNull('expiration_date')
         ->whereNull('deleted_at')
         ->whereRaw(DB::raw('DATE_SUB(`expiration_date`,INTERVAL '.$days.' DAY) <= DATE(NOW()) '))

From a05795420a0ca007ef79b3c514c35cdd8c0bb0fb Mon Sep 17 00:00:00 2001
From: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Tue, 18 Jan 2022 14:34:14 -0600
Subject: [PATCH 2/2] Respect the default value of 60 days in expiring licenses

---
 app/Models/License.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Models/License.php b/app/Models/License.php
index 9bd7627f94..37a0e8d411 100755
--- a/app/Models/License.php
+++ b/app/Models/License.php
@@ -627,8 +627,8 @@ class License extends Depreciable
      */
     public static function getExpiringLicenses($days = 60)
     {
-        $days = (is_null($days)) ? 30 : $days;
-        
+        $days = (is_null($days)) ? 60 : $days;
+
         return License::whereNotNull('expiration_date')
         ->whereNull('deleted_at')
         ->whereRaw(DB::raw('DATE_SUB(`expiration_date`,INTERVAL '.$days.' DAY) <= DATE(NOW()) '))