Skip to content

A free open source IT asset/license management system

add licenses to indirect assignedment table

Godfrey Ma2ec707f795d
diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php
index 11f008ffea..e070813386 100755
--- a/app/Http/Controllers/Users/UsersController.php
+++ b/app/Http/Controllers/Users/UsersController.php
@@ -632,8 +632,11 @@ class UsersController extends Controller
'assets.assignedAssets.defaultLoc',
'assets.assignedAssets.location',
'assets.assignedAssets.model.category',
+ 'assets.components',
+ 'assets.assignedAccessories',
'assets.defaultLoc',
'assets.location',
+ 'assets.licenses',
'assets.model.category',
'accessories.log' => fn($query) => $query->withTrashed()->where('target_type', User::class)->where('target_id', $id)->where('action_type', 'accepted'),
'accessories.category',
@@ -645,12 +648,14 @@ class UsersController extends Controller
])
->withTrashed()
->first();
-
+// dd($user->assets->assignedAssets);
+ $indirectItemsCount = $user->assets->flatMap->assignedAssets->count() + $user->assets->flatMap->components->count() + $user->assets->flatMap->licenses->count() + $user->assets->flatMap->assignedAccessories->count();
if ($user) {
$this->authorize('view', $user);
return view('users.print')
->with('users', [$user])
+ ->with('indirectItemsCount', $indirectItemsCount)
->with('settings', Setting::getSettings());
}
diff --git a/app/Models/User.php b/app/Models/User.php
index 406aece1f3..83145dec62 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -494,6 +494,10 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
{
return $this->belongsToMany(\App\Models\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
diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php
index 935959a400..589d53aeeb 100644
--- a/resources/views/users/print.blade.php
+++ b/resources/views/users/print.blade.php
@@ -398,7 +398,54 @@
@endforeach
</table>
@endif
+ @if ($indirectItemsCount> 0)
+ <div id="indirectAssignment-toolbar">
+ <h4>{{ trans_choice('mail.assigned_to_assets', $indirectItemsCount, ['count' => $indirectItemsCount]) }}</h4>
+ </div>
+ <table
+ class="snipe-table table table-striped inventory"
+ id="indirectAssignments"
+ data-pagination="false"
+ data-toolbar="#indirectAssignment-toolbar"
+ data-id-table="indirectAssignments"
+ data-search="false"
+ data-side-pagination="client"
+ data-sortable="true"
+ data-sort-order="desc"
+ data-sort-name="created_at"
+ data-show-columns="true"
+ data-cookie-id-table="indirectAssignments">
+ <thead>
+ @php
+ $indirectAssignmentsCounter = 1;
+ @endphp
+ <tr>
+ <th style="width: 20px;" data-sortable="false" data-switchable="false"></th>
+ <th style="width: 40%;" data-sortable="true" data-switchable="false">{{ trans('mail.assigned_to') }}</th>
+ <th style="width: 50%;" data-sortable="true">{{ trans('general.category') }}</th>
+ <th style="width: 10%;" data-sortable="true">{{ trans('mail.item') }}</th>
+ <th style="width: 10%;" data-sortable="true">{{ trans('general.quantity') }}</th>
+ </tr>
+ </thead>
+ @foreach ($show_user->assets as $asset)
+ @foreach ($asset->licenses as $assetsLicense)
+ @if($assetsLicense)
+ <tr>
+ <td>{{$indirectAssignmentsCounter}}</td>
+ <td>{{ $asset->display_name ?? ''}}</td>
+ <td>{{ $assetsLicense->category?->name ?? '' }}</td>
+ <td>{{ $assetsLicense->name ?? '' }}</td>
+ </tr>
+ @endif
+ @php
+ $indirectAssignmentsCounter ++
+ @endphp
+ @endforeach
+ @endforeach
+ </table>
+ @endif
+{{-- @endif--}}
@php
if (!empty($eulas)) $eulas = array_unique($eulas);
@endphp