DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-10-02 05:37:53 -07:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Feature #9378 remove deleted user from unaccepted assets report

Browse source
This commit is contained in:
sh1hab 2021-04-29 15:34:05 +06:00
parent b01baec7a8
commit 98a42afa78
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12,6 +12,7 @@ use App\Models\Depreciation;
use App\Models\License; use App\Models\License;
use App\Models\Setting; use App\Models\Setting;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Auth\Access\AuthorizationException;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Response; use Illuminate\Support\Facades\Response;
use Illuminate\Support\Facades\View; use Illuminate\Support\Facades\View;
@ -929,8 +930,9 @@ class ReportsController extends Controller
* getAssetAcceptanceReport * getAssetAcceptanceReport
* *
* @return mixed * @return mixed
* @author Vincent Sposato <vincent.sposato@gmail.com> * @throws AuthorizationException
* @version v1.0 * @version v1.0
* @author Vincent Sposato <vincent.sposato@gmail.com>
*/ */
public function getAssetAcceptanceReport() public function getAssetAcceptanceReport()
{ {
@ -940,11 +942,11 @@ class ReportsController extends Controller
* Get all assets with pending checkout acceptances * Get all assets with pending checkout acceptances
*/ */
$acceptances = CheckoutAcceptance::pending()->get(); $acceptances = CheckoutAcceptance::pending()->with('assignedTo')->get();
$assetsForReport = $acceptances $assetsForReport = $acceptances
->filter(function($acceptance) { ->filter(function($acceptance) {
return $acceptance->checkoutable_type == 'App\Models\Asset'; return $acceptance->checkoutable_type == 'App\Models\Asset' && !is_null($acceptance->assignedTo);
}) })
->map(function($acceptance) { ->map(function($acceptance) {
return $acceptance->checkoutable; return $acceptance->checkoutable;