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

Check that the asset is not already checked in

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2024-04-26 19:06:46 +01:00
parent 87de67e4a9
commit 52d6a8990a
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Models/Asset.php
View file

@ -1246,6 +1246,7 @@ class Asset extends Depreciable
return $query->whereNotNull('assets.expected_checkin') return $query->whereNotNull('assets.expected_checkin')
->whereBetween('assets.expected_checkin', [$today->format('Y-m-d'), $interval_date]) ->whereBetween('assets.expected_checkin', [$today->format('Y-m-d'), $interval_date])
->where('assets.archived', '=', 0) ->where('assets.archived', '=', 0)
->whereNotNull('assets.assigned_to')
->NotArchived(); ->NotArchived();
} }
@ -1254,6 +1255,7 @@ class Asset extends Depreciable
return $query->whereNotNull('assets.expected_checkin') 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) ->where('assets.archived', '=', 0)
->whereNotNull('assets.assigned_to')
->NotArchived(); ->NotArchived();
} }
@ -1272,6 +1274,7 @@ class Asset extends Depreciable
return $query->whereNotNull('assets.expected_checkin') 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) ->where('assets.archived', '=', 0)
->whereNotNull('assets.assigned_to')
->NotArchived(); ->NotArchived();
} }