DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-12 14:27:33 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #9508 from sh1hab/feature/remove_deleted_user_from_unaccepted_assets_report

Browse source 
Feature #9378 remove deleted user from unaccepted assets report
This commit is contained in:
snipe 2021-10-28 18:11:19 -07:00 committed by GitHub
parent 84a3a85823 d36849bd41
commit 5458e44a40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -14,6 +14,7 @@ use App\Models\License;
use App\Models\Setting; use App\Models\Setting;
use App\Notifications\CheckoutAssetNotification; use App\Notifications\CheckoutAssetNotification;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Auth\Access\AuthorizationException;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Notification; use Illuminate\Support\Facades\Notification;
use Illuminate\Support\Facades\Response; use Illuminate\Support\Facades\Response;
@ -908,6 +909,7 @@ class ReportsController extends Controller
* *
* @return mixed * @return mixed
* @throws \Illuminate\Auth\Access\AuthorizationException * @throws \Illuminate\Auth\Access\AuthorizationException
* @author Vincent Sposato <vincent.sposato@gmail.com> * @author Vincent Sposato <vincent.sposato@gmail.com>
* @version v1.0 * @version v1.0
*/ */
@ -919,17 +921,12 @@ class ReportsController extends Controller
/** /**
* Get all assets with pending checkout acceptances * Get all assets with pending checkout acceptances
*/ */
if($showDeleted) {
$acceptances = CheckoutAcceptance::pending()->withTrashed()->with(['assignedTo' , 'checkoutable.assignedTo', 'checkoutable.model'])->get(); $acceptances = CheckoutAcceptance::pending()->with('assignedTo')->get();
} else {
$acceptances = CheckoutAcceptance::pending()->with(['assignedTo' => function ($query) {
$query->withTrashed();
}, 'checkoutable.assignedTo', 'checkoutable.model'])->get();
}
$assetsForReport = $acceptances $assetsForReport = $acceptances
->filter(function ($acceptance) { ->filter(function($acceptance) {
return $acceptance->checkoutable_type == \App\Models\Asset::class; return $acceptance->checkoutable_type == 'App\Models\Asset' && !is_null($acceptance->assignedTo);
}) })
->map(function($acceptance) { ->map(function($acceptance) {
return ['assetItem' => $acceptance->checkoutable, 'acceptance' => $acceptance]; return ['assetItem' => $acceptance->checkoutable, 'acceptance' => $acceptance];