lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #11489 from Godmartinz/bug/sc-19333/expiring-assets-report-email-content-ordering

Browse source 
Fixed the order expiring assets are listed in notifications
This commit is contained in:
snipe 2022-08-29 12:37:01 -07:00 • committed by GitHub
commit 7fa9214beb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Models/Asset.php
View file

@ -700,10 +700,10 @@ class Asset extends Depreciable
->whereNotNull('warranty_months') ->whereNotNull('warranty_months')
->whereNotNull('purchase_date') ->whereNotNull('purchase_date')
->whereNull('deleted_at') ->whereNull('deleted_at')
->whereRaw(\DB::raw('DATE_ADD(`purchase_date`,INTERVAL `warranty_months` MONTH) <= DATE(NOW() + INTERVAL ' ->whereRaw('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('DATE_ADD(`purchase_date`,INTERVAL `warranty_months` MONTH)')
->get(); ->get();
} }