A free open source IT asset/license management system
adds assets to indirect assignment table
Godfrey M706b623d95e4
diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.phpindex d5ac995c64..6867b583ab 100755--- a/app/Http/Controllers/Users/UsersController.php+++ b/app/Http/Controllers/Users/UsersController.php@@ -648,7 +648,7 @@ class UsersController extends Controller])->withTrashed()->first();-// dd($user->assets->flatMap->licenses->count(), "assets ".$user->assets->flatMap->components->count());+$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);diff --git a/resources/lang/en-US/mail.php b/resources/lang/en-US/mail.phpindex 7bcec8349f..29e0cc5c57 100644--- a/resources/lang/en-US/mail.php+++ b/resources/lang/en-US/mail.php@@ -48,6 +48,7 @@ return ['asset_tag' => 'Asset Tag','assets_warrantee_alert' => 'There is :count asset with an expiring warranty or that are reaching their end of life in the next :threshold days.|There are :count assets with expiring warranties or that are reaching their end of life in the next :threshold days.','assigned_to' => 'Assigned To',+ 'assigned_to_assets' => 'Assigned to Assets','eol' => 'EOL','best_regards' => 'Best regards,','canceled' => 'Canceled',diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.phpindex 117467f2c1..f6f20fad50 100644--- a/resources/views/users/print.blade.php+++ b/resources/views/users/print.blade.php@@ -398,9 +398,9 @@@endforeach</table>@endif-{{-- @if ($indirectItemsCount > 0)--}}+ @if($indirectItemsCount > 0 && $settings->show_assigned_assets)<div id="indirectAssignment-toolbar">- <h4>{{ trans_choice('mail.assigned_to_assets', $indirectItemsCount, ['count' => $indirectItemsCount]) }}</h4>+ <h4>{{ $indirectItemsCount.' '.trans('mail.assigned_to_assets') }}</h4></div><tableclass="snipe-table table table-striped inventory"@@ -429,6 +429,18 @@</thead>@foreach ($show_user->assets as $asset)+ @foreach ($asset->assignedAssets as $indirectAsset)+ <tr>+ <td>{{ $indirectAssignmentsCounter }}</td>+ <td>{{ $indirectAsset->assignedTo->display_name }}</td>+ <td>{{ (($indirectAsset->model) && ($indirectAsset->model->category)) ? $indirectAsset->model->category->name : trans('general.invalid_category') }}</td>+ <td>{{ ($indirectAsset->model) ? $indirectAsset->model->name : trans('general.invalid_model') }}</td>++ </tr>+ @php+ $indirectAssignmentsCounter+++ @endphp+ @endforeach@foreach ($asset->licenses as $assetsLicense)@if($assetsLicense)<tr>@@ -443,7 +455,7 @@@endphp@endforeach@foreach ($asset->components as $component)- @if($assetsLicense)+ @if($component)<tr><td>{{$indirectAssignmentsCounter}}</td><td>{{ $asset->display_name ?? ''}}</td>@@ -456,8 +468,22 @@$indirectAssignmentsCounter ++@endphp@endforeach+ @foreach ($asset->assignedAccessories as $accessory)+ @if($accessory)+ <tr>+ <td>{{$indirectAssignmentsCounter}}</td>+ <td>{{ $asset->display_name ?? '' }}</td>+ <td>{{ $accessory->accessory->category?->name ?? '' }}</td>+ <td>{{ $accessory->accessory->name ?? '' }}</td>+ </tr>+ @endif+ @php+ $indirectAssignmentsCounter +++ @endphp+ @endforeach@endforeach</table>+ @endif@phpif (!empty($eulas)) $eulas = array_unique($eulas);@endphp