From d3d5230d0ca9dcc579291023b5fc60317f7defd2 Mon Sep 17 00:00:00 2001
From: spencerrlongg <spencer@spencerlong.com>
Date: Tue, 17 Jun 2025 19:15:13 -0500
Subject: [PATCH 1/2] add with trashed to user search

---
 app/Http/Controllers/Licenses/LicenseCheckinController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Licenses/LicenseCheckinController.php b/app/Http/Controllers/Licenses/LicenseCheckinController.php
index 72a3d43d51..de115af543 100644
--- a/app/Http/Controllers/Licenses/LicenseCheckinController.php
+++ b/app/Http/Controllers/Licenses/LicenseCheckinController.php
@@ -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);

From e4534c4319bdc198faef076f1da829e25f8bbba2 Mon Sep 17 00:00:00 2001
From: Robert-Azelis <82208283+Robert-Azelis@users.noreply.github.com>
Date: Fri, 20 Jun 2025 10:33:09 +0200
Subject: [PATCH 2/2] Company info - user print assets

---
 resources/views/users/print.blade.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php
index 9ed76ae3f0..52c4a069ef 100644
--- a/resources/views/users/print.blade.php
+++ b/resources/views/users/print.blade.php
@@ -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 : '') }}