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

uses notArchived scope instead now

Browse source
This commit is contained in:
Godfrey M 2022-07-12 12:20:11 -07:00
parent 48349071ed
commit 58c54cc3dc
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Controllers/ReportsController.php
View file

@ -643,7 +643,8 @@ class ReportsController extends Controller
$assets->whereBetween('assets.next_audit_date', [$request->input('next_audit_start'), $request->input('next_audit_end')]); $assets->whereBetween('assets.next_audit_date', [$request->input('next_audit_start'), $request->input('next_audit_end')]);
} }
if($request->filled('exclude_archived')){ if($request->filled('exclude_archived')){
$assets->where('archived', '=', 0) && $assets->where('status_id', '!=', 3); $assets->notArchived();
// where('archived', '=', 0) && $assets->where('status_id', '!=', 3);
} }
$assets->orderBy('assets.id', 'ASC')->chunk(20, function ($assets) use ($handle, $customfields, $request) { $assets->orderBy('assets.id', 'ASC')->chunk(20, function ($assets) use ($handle, $customfields, $request) {