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

Refactored due-or-overdue methods

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2024-04-26 20:59:27 +01:00
parent bfd0530597
commit 839db8ef44
1 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/Models/Asset.php
View file

@ -1211,12 +1211,11 @@ class Asset extends Depreciable
public function scopeDueOrOverdueForAudit($query, $settings)
{
$interval = $settings->audit_warning_days ?? 0;
$today = Carbon::now();
$interval_date = $today->copy()->addDays($interval);
return $query->whereNotNull('assets.next_audit_date')
->where('assets.next_audit_date', '<=', $interval_date);
return $query->where(function ($query) {
$query->OverdueForAudit();
})->orWhere(function ($query) use ($settings) {
$query->DueForAudit($settings);
});
}
@ -1252,8 +1251,7 @@ class Asset extends Depreciable
}
/**
* Query builder scope for Assets that are due for checkin OR overdue, based on the assets.next_audit_date
* and settings.audit_warning_days.
* Query builder scope for Assets that are due for checkin OR overdue
*
* @author A. Gianotto <snipe@snipe.net>
* @since v6.4.0
@ -1262,12 +1260,11 @@ class Asset extends Depreciable
public function scopeDueOrOverdueForCheckin($query, $settings)
{
return $query->whereNotNull('assets.expected_checkin')
->where('assets.expected_checkin', '<=', Carbon::now()->format('Y-m-d'))
->where('assets.archived', '=', 0)
->whereNotNull('assets.assigned_to')
->NotArchived();
return $query->where(function ($query) {
$query->OverdueForCheckin();
})->orWhere(function ($query) use ($settings) {
$query->DueForCheckin($settings);
});
}