Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature #9378 remove deleted user from unaccepted assets report #9508

Merged
merged 6 commits into from
Oct 29, 2021
Merged

Feature #9378 remove deleted user from unaccepted assets report #9508

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
98a42af
Feature #9378 remove deleted user from unaccepted assets report
sh1hab Apr 29, 2021
193a8d9
Feature #9378 update phpdoc comment
sh1hab Apr 29, 2021
6799ce9
merge develop with remove_deleted_user_from_unaccepted_assets_report
sh1hab May 5, 2021
cd4b1d8
Merge branch 'develop' of https://github.com/snipe/snipe-it into feat…
sh1hab May 21, 2021
f43413b
Feature snipe#9378 update
sh1hab May 21, 2021
d36849b
Merge branch 'develop' into feature/remove_deleted_user_from_unaccept…
snipe Oct 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions app/Http/Controllers/ReportsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
use App\Models\Setting;
use App\Notifications\CheckoutAssetNotification;
use Carbon\Carbon;
use Illuminate\Auth\Access\AuthorizationException;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Notification;
use Illuminate\Support\Facades\Response;
Expand Down Expand Up @@ -908,6 +909,7 @@ public function exportAssetMaintenancesReport()
*
* @return mixed
* @throws \Illuminate\Auth\Access\AuthorizationException

* @author Vincent Sposato <[email protected]>
* @version v1.0
*/
Expand All @@ -919,17 +921,12 @@ public function getAssetAcceptanceReport($deleted = false)
/**
* Get all assets with pending checkout acceptances
*/
if($showDeleted) {
$acceptances = CheckoutAcceptance::pending()->withTrashed()->with(['assignedTo' , 'checkoutable.assignedTo', 'checkoutable.model'])->get();
} else {
$acceptances = CheckoutAcceptance::pending()->with(['assignedTo' => function ($query) {
$query->withTrashed();
}, 'checkoutable.assignedTo', 'checkoutable.model'])->get();
}

$acceptances = CheckoutAcceptance::pending()->with('assignedTo')->get();

$assetsForReport = $acceptances
->filter(function ($acceptance) {
return $acceptance->checkoutable_type == \App\Models\Asset::class;
->filter(function($acceptance) {
return $acceptance->checkoutable_type == 'App\Models\Asset' && !is_null($acceptance->assignedTo);
})
->map(function($acceptance) {
return ['assetItem' => $acceptance->checkoutable, 'acceptance' => $acceptance];
Expand Down