A free open source IT asset/license management system
Merge branch 'develop' into update-print-invtentory-view-with-assigned2assets
Godfrey M8747ff32ddec
diff --cc app/Http/Controllers/ProfileController.phpindex 584e880824,cf2edeb85b..9c925f3b45--- a/app/Http/Controllers/ProfileController.php+++ b/app/Http/Controllers/ProfileController.php@@@ -206,23 -206,19 +206,24 @@@ class ProfileController extends Control* Print inventory** @author A. Gianotto+ ** @since [v6.0.12]*/- public function printInventory() : View+ public function printInventory(): View{- $show_users = User::where('id', auth()->user()->id)->get();-- return view('users/print')- ->with('assets', auth()->user()->assets())- ->with('licenses', auth()->user()->licenses()->get())- ->with('accessories', auth()->user()->accessories()->get())- ->with('consumables', auth()->user()->consumables()->get())- ->with('users', $show_users)+ $userId = auth()->id();++ $show_user = User::withInventoryRelations($userId)->first();++ $indirectItemsCount =+ $show_user->assets->flatMap->assignedAssets->count()+ + $show_user->assets->flatMap->components->count()+ + $show_user->assets->flatMap->licenses->count()+ + $show_user->assets->flatMap->assignedAccessories->count();++ return view('users.print')+ ->with('users', [$show_user])+ ->with('indirectItemsCount', $indirectItemsCount)->with('settings', Setting::getSettings());}diff --cc app/Models/User.phpindex 309d351389,798ccbead1..536d20611e--- a/app/Models/User.php+++ b/app/Models/User.php@@@ -492,12 -515,8 +515,12 @@@ class User extends SnipeModel implement*/public function licenses(){- return $this->belongsToMany(\App\Models\License::class, 'license_seats', 'assigned_to', 'license_id')->withPivot('id', 'created_at', 'updated_at');+ return $this->belongsToMany(License::class, 'license_seats', 'assigned_to', 'license_id')->withPivot('id', 'created_at', 'updated_at');}+ public function directLicenses()+ {+ return $this->belongsToMany(\App\Models\License::class, 'license_seats', 'assigned_to', 'license_id')->withPivot('id', 'created_at', 'updated_at')->wherePivotNull('asset_id')->withTrashed();+ }/*** Establishes the user -> reportTemplates relationship