From 98a42afa78fff0f414985dbe9657b2226697ba70 Mon Sep 17 00:00:00 2001 From: sh1hab Date: Thu, 29 Apr 2021 15:34:05 +0600 Subject: [PATCH] Feature #9378 remove deleted user from unaccepted assets report --- app/Http/Controllers/ReportsController.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index 3b55e43a02..7f380fe883 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -12,6 +12,7 @@ use App\Models\Depreciation; use App\Models\License; use App\Models\Setting; use Carbon\Carbon; +use Illuminate\Auth\Access\AuthorizationException; use Illuminate\Http\Request; use Illuminate\Support\Facades\Response; use Illuminate\Support\Facades\View; @@ -929,8 +930,9 @@ class ReportsController extends Controller * getAssetAcceptanceReport * * @return mixed - * @author Vincent Sposato + * @throws AuthorizationException * @version v1.0 + * @author Vincent Sposato */ public function getAssetAcceptanceReport() { @@ -940,11 +942,11 @@ class ReportsController extends Controller * Get all assets with pending checkout acceptances */ - $acceptances = CheckoutAcceptance::pending()->get(); + $acceptances = CheckoutAcceptance::pending()->with('assignedTo')->get(); $assetsForReport = $acceptances ->filter(function($acceptance) { - return $acceptance->checkoutable_type == 'App\Models\Asset'; + return $acceptance->checkoutable_type == 'App\Models\Asset' && !is_null($acceptance->assignedTo); }) ->map(function($acceptance) { return $acceptance->checkoutable;