DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #12509 from inietov/fixes/add_images_to_user_inventory_mail_report

Browse source 
Added images to emailed user inventory report [sc-19801]
This commit is contained in:
snipe 2023-02-22 10:38:07 -08:00 committed by GitHub
parent 05f6d0bd5e d494afcf01
commit 81cb29db5e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Models/User.php
View file

@ -285,7 +285,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
*/
public function assets()
{
return $this->morphMany(\App\Models\Asset::class, 'assigned', 'assigned_type', 'assigned_to')->withTrashed();
return $this->morphMany(\App\Models\Asset::class, 'assigned', 'assigned_type', 'assigned_to')->withTrashed()->orderBy('id');
}
/**
@ -313,7 +313,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
public function accessories()
{
return $this->belongsToMany(\App\Models\Accessory::class, 'accessories_users', 'assigned_to', 'accessory_id')
->withPivot('id', 'created_at', 'note')->withTrashed();
->withPivot('id', 'created_at', 'note')->withTrashed()->orderBy('accessory_id');
}
/**

28
resources/views/notifications/markdown/user-inventory.blade.php
View file

@ -9,9 +9,18 @@
## {{ $assets->count() }} {{ trans('general.assets') }}
<table width="100%">
<tr><th align="left">{{ trans('mail.name') }} </th><th align="left">{{ trans('mail.asset_tag') }}</th><th align="left">{{ trans('admin/hardware/table.serial') }}</th></tr>
<tr><th align="left">{{ trans('mail.name') }} </th><th align="left">{{ trans('mail.asset_tag') }}</th><th align="left">{{ trans('admin/hardware/table.serial') }}</th> <th></th> </tr>
@foreach($assets as $asset)
<tr><td>{{ $asset->present()->name }}</td><td> {{ $asset->asset_tag }} </td><td> {{ $asset->serial }} </td></tr>
<tr>
<td>{{ $asset->present()->name }}</td>
<td> {{ $asset->asset_tag }} </td>
<td> {{ $asset->serial }} </td>
@if (($snipeSettings->show_images_in_email =='1') && $asset->getImageUrl())
<td>
<img src="{{ asset($asset->getImageUrl()) }}" alt="Asset" style="max-width: 64px;">
</td>
@endif
</tr>
@endforeach
</table>
@endif
@ -20,9 +29,16 @@
## {{ $accessories->count() }} {{ trans('general.accessories') }}
<table width="100%">
<tr><th align="left">{{ trans('mail.name') }} </th></tr>
<tr><th align="left">{{ trans('mail.name') }} </th> <th></th> </tr>
@foreach($accessories as $accessory)
<tr><td>{{ $accessory->name }}</td></tr>
<tr>
<td>{{ $accessory->name }}</td>
@if (($snipeSettings->show_images_in_email =='1') && $accessory->getImageUrl())
<td>
<img src="{{ asset($accessory->getImageUrl()) }}" alt="Accessory" style="max-width: 64px;">
</td>
@endif
</tr>
@endforeach
</table>
@endif
@ -33,7 +49,9 @@
<table width="100%">
<tr><th align="left"{{ trans('mail.name') }} </th></tr>
@foreach($licenses as $license)
<tr><td>{{ $license->name }}</td></tr>
<tr>
<td>{{ $license->name }}</td>
</tr>
@endforeach
</table>
@endif