ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse Source
This commit is contained in:
snipe
2025-06-22 20:14:59 +01:00
parent 002b5c0f6f 8d6b21a076
commit 5f73d81935
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Licenses/LicenseCheckinController.php
View File

@@ -86,7 +86,7 @@ class LicenseCheckinController extends Controller
}
if($licenseSeat->assigned_to != null){
$return_to = User::find($licenseSeat->assigned_to);
$return_to = User::withTrashed()->find($licenseSeat->assigned_to);
session()->put('checkedInFrom', $return_to->id);
} else {
$return_to = Asset::find($licenseSeat->asset_id);

4
resources/views/users/print.blade.php
View File

@@ -82,6 +82,10 @@
@foreach ($users as $show_user)
<div id="start_of_user_section"> {{-- used for page breaks when printing --}}</div>
<h3>
@if ($show_user->company)
<b>{{ trans('admin/companies/table.name') }}:</b> {{ $show_user->company->name }}</b>
<br>
@endif
{{ trans('general.assigned_to', ['name' => $show_user->present()->fullName()]) }}
{{ ($show_user->employee_num!='') ? ' (#'.$show_user->employee_num.') ' : '' }}
{{ ($show_user->jobtitle!='' ? ' - '.$show_user->jobtitle : '') }}