DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 13:44:06 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

fixes the order expiring assets are listed in notifications

Browse source
This commit is contained in:
Godfrey M 2022-07-11 12:25:38 -07:00
parent 78d5c37267
commit 309229619b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Models/Asset.php
View file

@ -694,7 +694,7 @@ class Asset extends Depreciable
public static function getExpiringWarrantee($days = 30) public static function getExpiringWarrantee($days = 30)
{ {
$days = (is_null($days)) ? 30 : $days; $days = (is_null($days)) ? 30 : $days;
return self::where('archived', '=', '0') return self::where('archived', '=', '0')
->whereNotNull('warranty_months') ->whereNotNull('warranty_months')
->whereNotNull('purchase_date') ->whereNotNull('purchase_date')
@ -702,7 +702,7 @@ class Asset extends Depreciable
->whereRaw(\DB::raw('DATE_ADD(`purchase_date`,INTERVAL `warranty_months` MONTH) <= DATE(NOW() + INTERVAL ' ->whereRaw(\DB::raw('DATE_ADD(`purchase_date`,INTERVAL `warranty_months` MONTH) <= DATE(NOW() + INTERVAL '
. $days . $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') ->orderByRaw(\DB::raw('DATE_ADD(`purchase_date`,INTERVAL `warranty_months` MONTH)'))
->get(); ->get();
} }