diff --git a/app/Events/CheckoutableCheckedIn.php b/app/Events/CheckoutableCheckedIn.php
index f6a20fd3d265..4a1d46d2f479 100644
--- a/app/Events/CheckoutableCheckedIn.php
+++ b/app/Events/CheckoutableCheckedIn.php
@@ -22,12 +22,14 @@ class CheckoutableCheckedIn
 
     public $originalValues;
 
+    public ?string $filename;
+
     /**
      * Create a new event instance.
      *
      * @return void
      */
-    public function __construct($checkoutable, $checkedOutTo, User $checkedInBy, $note, $action_date = null, $originalValues = [])
+    public function __construct($checkoutable, $checkedOutTo, User $checkedInBy, $note, $action_date = null, $originalValues = [], ?string $filename = null)
     {
         $this->checkoutable = $checkoutable;
         $this->checkedOutTo = $checkedOutTo;
@@ -35,5 +37,6 @@ public function __construct($checkoutable, $checkedOutTo, User $checkedInBy, $no
         $this->note = $note;
         $this->action_date = $action_date ?? date('Y-m-d H:i:s');
         $this->originalValues = $originalValues;
+        $this->filename = $filename;
     }
 }
diff --git a/app/Events/CheckoutableCheckedOut.php b/app/Events/CheckoutableCheckedOut.php
index 0d47f64552d6..958a519aa63f 100644
--- a/app/Events/CheckoutableCheckedOut.php
+++ b/app/Events/CheckoutableCheckedOut.php
@@ -24,12 +24,14 @@ class CheckoutableCheckedOut
 
     public bool $signInPlace;
 
+    public ?string $filename;
+
     /**
      * Create a new event instance.
      *
      * @return void
      */
-    public function __construct($checkoutable, $checkedOutTo, User $checkedOutBy, $note, $originalValues = [], $quantity = 1, bool $signInPlace = false)
+    public function __construct($checkoutable, $checkedOutTo, User $checkedOutBy, $note, $originalValues = [], $quantity = 1, bool $signInPlace = false, ?string $filename = null)
     {
         $this->checkoutable = $checkoutable;
         $this->checkedOutTo = $checkedOutTo;
@@ -38,5 +40,6 @@ public function __construct($checkoutable, $checkedOutTo, User $checkedOutBy, $n
         $this->originalValues = $originalValues;
         $this->quantity = $quantity;
         $this->signInPlace = $signInPlace;
+        $this->filename = $filename;
     }
 }
diff --git a/app/Http/Controllers/Accessories/AccessoryCheckinController.php b/app/Http/Controllers/Accessories/AccessoryCheckinController.php
index 5a7dc55bcf9a..3856c659c031 100644
--- a/app/Http/Controllers/Accessories/AccessoryCheckinController.php
+++ b/app/Http/Controllers/Accessories/AccessoryCheckinController.php
@@ -5,11 +5,11 @@
 use App\Events\CheckoutableCheckedIn;
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\UploadFileRequest;
 use App\Models\Accessory;
 use App\Models\AccessoryCheckout;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
 class AccessoryCheckinController extends Controller
@@ -53,7 +53,7 @@ public function create($accessoryUserId = null, $backto = null): View|RedirectRe
      * @param  null  $accessoryCheckoutId
      * @param  string  $backto
      */
-    public function store(Request $request, $accessoryCheckoutId = null, $backto = null): RedirectResponse
+    public function store(UploadFileRequest $request, $accessoryCheckoutId = null, $backto = null): RedirectResponse
     {
         if (is_null($accessory_checkout = AccessoryCheckout::find($accessoryCheckoutId))) {
             return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
@@ -75,9 +75,14 @@ public function store(Request $request, $accessoryCheckoutId = null, $backto = n
             $checkin_at = $request->input('checkin_at').' '.$checkin_hours;
         }
 
+        $file_name = null;
+        if ($request->hasFile('file')) {
+            $file_name = $request->handleFile('private_uploads/accessories/', 'checkin-'.$accessory->id, $request->file('file'));
+        }
+
         // Was the accessory updated?
         if ($accessory_checkout->delete()) {
-            event(new CheckoutableCheckedIn($accessory, $accessory_checkout->assignedTo, auth()->user(), $request->input('note'), $checkin_at));
+            event(new CheckoutableCheckedIn($accessory, $accessory_checkout->assignedTo, auth()->user(), $request->input('note'), $checkin_at, [], $file_name));
 
             session()->put(['redirect_option' => $request->input('redirect_option')]);
 
diff --git a/app/Http/Controllers/Accessories/AccessoryCheckoutController.php b/app/Http/Controllers/Accessories/AccessoryCheckoutController.php
index f1e3502f1185..2c220020f0af 100644
--- a/app/Http/Controllers/Accessories/AccessoryCheckoutController.php
+++ b/app/Http/Controllers/Accessories/AccessoryCheckoutController.php
@@ -96,6 +96,11 @@ public function store(AccessoryCheckoutRequest $request, Accessory $accessory):
             $accessory_checkout->save();
         }
 
+        $file_name = null;
+        if ($request->hasFile('file')) {
+            $file_name = $request->handleFile('private_uploads/accessories/', 'checkout-'.$accessory->id, $request->file('file'));
+        }
+
         event(new CheckoutableCheckedOut(
             $accessory,
             $target,
@@ -104,6 +109,7 @@ public function store(AccessoryCheckoutRequest $request, Accessory $accessory):
             [],
             $accessory->checkout_qty,
             $request->boolean('sign_in_place'),
+            $file_name,
         ));
 
         $request->request->add(['checkout_to_type' => request('checkout_to_type')]);
diff --git a/app/Http/Controllers/Api/AccessoriesController.php b/app/Http/Controllers/Api/AccessoriesController.php
index 5f9998f596bd..f36b868e6a32 100644
--- a/app/Http/Controllers/Api/AccessoriesController.php
+++ b/app/Http/Controllers/Api/AccessoriesController.php
@@ -8,6 +8,7 @@
 use App\Http\Requests\AccessoryCheckoutRequest;
 use App\Http\Requests\ImageUploadRequest;
 use App\Http\Requests\StoreAccessoryRequest;
+use App\Http\Requests\UploadFileRequest;
 use App\Http\Traits\CheckInOutTrait;
 use App\Http\Transformers\AccessoriesTransformer;
 use App\Http\Transformers\ActionlogsTransformer;
@@ -22,6 +23,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Gate;
 
 class AccessoriesController extends Controller
 {
@@ -314,8 +316,13 @@ public function checkout(AccessoryCheckoutRequest $request, Accessory $accessory
         $accessory->checkout_qty = $request->input('checkout_qty', 1);
         $payload = null;
 
+        $file_name = null;
+        if ($request->hasFile('file')) {
+            $file_name = $request->handleFile('private_uploads/accessories/', 'checkout-'.$accessory->id, $request->file('file'));
+        }
+
         // Keep checkout rows and checkout log/event atomic to avoid ghost assignments.
-        DB::transaction(function () use ($accessory, $request, $target, &$payload): void {
+        DB::transaction(function () use ($accessory, $request, $target, $file_name, &$payload): void {
             for ($i = 0; $i < $accessory->checkout_qty; $i++) {
 
                 $accessory_checkout = new AccessoryCheckout([
@@ -347,6 +354,8 @@ public function checkout(AccessoryCheckoutRequest $request, Accessory $accessory
                 $request->input('note'),
                 [],
                 $accessory->checkout_qty,
+                false,
+                $file_name,
             ));
         });
 
@@ -367,7 +376,7 @@ public function checkout(AccessoryCheckoutRequest $request, Accessory $accessory
      *
      * @internal param int $accessoryId
      */
-    public function checkin(Request $request, $accessoryUserId = null)
+    public function checkin(UploadFileRequest $request, $accessoryUserId = null)
     {
         if (is_null($accessory_checkout = AccessoryCheckout::find($accessoryUserId))) {
             return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/accessories/message.does_not_exist', ['id' => $accessoryUserId])));
@@ -376,7 +385,16 @@ public function checkin(Request $request, $accessoryUserId = null)
         $accessory = Accessory::find($accessory_checkout->accessory_id);
         $this->authorize('checkin', $accessory);
 
-        $accessory->logCheckin(User::find($accessory_checkout->assigned_to), $request->input('note'));
+        $file_name = null;
+        if ($request->hasFile('file')) {
+            $file_name = $request->handleFile('private_uploads/accessories/', 'checkin-'.$accessory->id, $request->file('file'));
+        }
+
+        $accessory->logCheckin(User::find($accessory_checkout->assigned_to), $request->input('note'), null, []);
+
+        if ($file_name && Gate::allows('files', $accessory)) {
+            $accessory->logUpload($file_name, null);
+        }
 
         // Was the accessory updated?
         if ($accessory_checkout->delete()) {
diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
index b2b1a4042cfb..49fc96fcf39c 100644
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -10,6 +10,7 @@
 use App\Http\Requests\ImageUploadRequest;
 use App\Http\Requests\StoreAssetRequest;
 use App\Http\Requests\UpdateAssetRequest;
+use App\Http\Requests\UploadFileRequest;
 use App\Http\Traits\MigratesLegacyAssetLocations;
 use App\Http\Transformers\ActionlogsTransformer;
 use App\Http\Transformers\AssetsTransformer;
@@ -1085,9 +1086,14 @@ public function checkout(AssetCheckoutRequest $request, $asset_id): JsonResponse
         //            $asset->location_id = $target->rtd_location_id;
         //        }
 
+        $file_name = null;
+        if ($request->hasFile('file')) {
+            $file_name = $request->handleFile('private_uploads/assets/', 'checkout-'.$asset->id, $request->file('file'));
+        }
+
         // Keep checkout mutation + checkout logging/event side effects atomic.
-        $wasCheckedOut = DB::transaction(function () use ($asset, $target, $checkout_at, $expected_checkin, $note, $asset_name): bool {
-            return $asset->checkOut($target, auth()->user(), $checkout_at, $expected_checkin, $note, $asset_name, $asset->location_id);
+        $wasCheckedOut = DB::transaction(function () use ($asset, $target, $checkout_at, $expected_checkin, $note, $asset_name, $file_name): bool {
+            return $asset->checkOut($target, auth()->user(), $checkout_at, $expected_checkin, $note, $asset_name, $asset->location_id, false, $file_name);
         });
 
         if ($wasCheckedOut) {
@@ -1106,7 +1112,7 @@ public function checkout(AssetCheckoutRequest $request, $asset_id): JsonResponse
      *
      * @since [v4.0]
      */
-    public function checkin(Request $request, $asset_id): JsonResponse
+    public function checkin(UploadFileRequest $request, $asset_id): JsonResponse
     {
         $asset = Asset::with('model')->findOrFail($asset_id);
         $this->authorize('checkin', $asset);
@@ -1173,6 +1179,11 @@ function (Builder $query) use ($asset) {
                 $acceptance->delete();
             });
 
+        $file_name = null;
+        if ($request->hasFile('file')) {
+            $file_name = $request->handleFile('private_uploads/assets/', 'checkin-'.$asset->id, $request->file('file'));
+        }
+
         if ($asset->save()) {
 
             // Update the location of any child assets
@@ -1180,7 +1191,7 @@ function (Builder $query) use ($asset) {
                 ->where('assigned_to', $asset->id)
                 ->update(['location_id' => $asset->location_id]);
 
-            event(new CheckoutableCheckedIn($asset, $target, auth()->user(), $request->input('note'), $checkin_at, $originalValues));
+            event(new CheckoutableCheckedIn($asset, $target, auth()->user(), $request->input('note'), $checkin_at, $originalValues, $file_name));
 
             return response()->json(Helper::formatStandardApiResponse('success', [
                 'asset_tag' => e($asset->asset_tag),
@@ -1199,7 +1210,7 @@ function (Builder $query) use ($asset) {
      *
      * @since [v6.0]
      */
-    public function checkinByTag(Request $request, $tag = null): JsonResponse
+    public function checkinByTag(UploadFileRequest $request, $tag = null): JsonResponse
     {
         $this->authorize('checkin', Asset::class);
         if ($tag == null && null !== ($request->input('asset_tag'))) {
diff --git a/app/Http/Controllers/Api/ComponentsController.php b/app/Http/Controllers/Api/ComponentsController.php
index bf754ba1a55d..ac527b3b5645 100644
--- a/app/Http/Controllers/Api/ComponentsController.php
+++ b/app/Http/Controllers/Api/ComponentsController.php
@@ -6,6 +6,7 @@
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\ImageUploadRequest;
+use App\Http\Requests\UploadFileRequest;
 use App\Http\Transformers\ActionlogsTransformer;
 use App\Http\Transformers\ComponentsTransformer;
 use App\Models\Asset;
@@ -17,6 +18,7 @@
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Validator;
 
@@ -290,7 +292,7 @@ public function getAssets(Component $component, Request $request): array
      *
      * @param  int  $componentId
      */
-    public function checkout(Request $request, $componentId): JsonResponse
+    public function checkout(UploadFileRequest $request, $componentId): JsonResponse
     {
         // Check if the component exists
         if (! $component = Component::find($componentId)) {
@@ -327,6 +329,11 @@ public function checkout(Request $request, $componentId): JsonResponse
                 return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.error_user_company')));
             }
 
+            $file_name = null;
+            if ($request->hasFile('file')) {
+                $file_name = $request->handleFile('private_uploads/components/', 'checkout-'.$component->id, $request->file('file'));
+            }
+
             // Keep pivot + action log in one transaction so checkout is all-or-nothing.
             DB::transaction(function () use ($component, $request, $asset): void {
                 $component->assigned_to = $request->input('assigned_to');
@@ -343,6 +350,10 @@ public function checkout(Request $request, $componentId): JsonResponse
                 $component->logCheckout($request->input('note'), $asset, null, [], $request->get('assigned_qty', 1));
             });
 
+            if ($file_name && Gate::allows('files', $component)) {
+                $component->logUpload($file_name, null);
+            }
+
             return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/components/message.checkout.success')));
         }
 
@@ -356,7 +367,7 @@ public function checkout(Request $request, $componentId): JsonResponse
      *
      * @since [v5.1.8]
      */
-    public function checkin(Request $request, $component_asset_id): JsonResponse
+    public function checkin(UploadFileRequest $request, $component_asset_id): JsonResponse
     {
         if ($component_assets = DB::table('components_assets')->find($component_asset_id)) {
             if (is_null($component = Component::find($component_assets->component_id))) {
@@ -394,7 +405,12 @@ public function checkin(Request $request, $component_asset_id): JsonResponse
 
             $asset = Asset::find($component_assets->asset_id);
 
-            event(new CheckoutableCheckedIn($component, $asset, auth()->user(), $request->input('note'), Carbon::now()));
+            $file_name = null;
+            if ($request->hasFile('file')) {
+                $file_name = $request->handleFile('private_uploads/components/', 'checkin-'.$component->id, $request->file('file'));
+            }
+
+            event(new CheckoutableCheckedIn($component, $asset, auth()->user(), $request->input('note'), Carbon::now(), [], $file_name));
 
             return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/components/message.checkin.success')));
         }
diff --git a/app/Http/Controllers/Api/ConsumablesController.php b/app/Http/Controllers/Api/ConsumablesController.php
index 83758d47b930..44d33d8a41d2 100644
--- a/app/Http/Controllers/Api/ConsumablesController.php
+++ b/app/Http/Controllers/Api/ConsumablesController.php
@@ -8,6 +8,7 @@
 use App\Http\Requests\FilterRequest;
 use App\Http\Requests\ImageUploadRequest;
 use App\Http\Requests\StoreConsumableRequest;
+use App\Http\Requests\UploadFileRequest;
 use App\Http\Transformers\ActionlogsTransformer;
 use App\Http\Transformers\ConsumablesTransformer;
 use App\Http\Transformers\SelectlistTransformer;
@@ -282,7 +283,7 @@ public function getDataView($consumableId): array
      *
      * @since [v4.9.5]
      */
-    public function checkout(Request $request, $id): JsonResponse
+    public function checkout(UploadFileRequest $request, $id): JsonResponse
     {
         // Check if the consumable exists
         if (! $consumable = Consumable::with('users')->find($id)) {
@@ -322,8 +323,13 @@ public function checkout(Request $request, $id): JsonResponse
         // Update the consumable data
         $consumable->assigned_to = $request->input('assigned_to');
 
+        $file_name = null;
+        if ($request->hasFile('file')) {
+            $file_name = $request->handleFile('private_uploads/consumables/', 'checkout-'.$consumable->id, $request->file('file'));
+        }
+
         // Keep pivot writes and checkout log/event atomic to avoid partial checkout state.
-        DB::transaction(function () use ($consumable, $request, $user): void {
+        DB::transaction(function () use ($consumable, $request, $user, $file_name): void {
             for ($i = 0; $i < $consumable->checkout_qty; $i++) {
                 $consumable->users()->attach($consumable->id,
                     [
@@ -342,6 +348,8 @@ public function checkout(Request $request, $id): JsonResponse
                 $request->input('note'),
                 [],
                 $consumable->checkout_qty,
+                false,
+                $file_name,
             ));
         });
 
diff --git a/app/Http/Controllers/Api/LicensesController.php b/app/Http/Controllers/Api/LicensesController.php
index 458f900dd159..a551faa97307 100644
--- a/app/Http/Controllers/Api/LicensesController.php
+++ b/app/Http/Controllers/Api/LicensesController.php
@@ -7,6 +7,7 @@
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\FilterRequest;
+use App\Http\Requests\UploadFileRequest;
 use App\Http\Transformers\ActionlogsTransformer;
 use App\Http\Transformers\LicenseSeatsTransformer;
 use App\Http\Transformers\LicensesTransformer;
@@ -278,7 +279,7 @@ public function destroy($id): JsonResponse
      *
      * @param  int  $licenseId
      */
-    public function checkout(Request $request, $licenseId): JsonResponse
+    public function checkout(UploadFileRequest $request, $licenseId): JsonResponse
     {
         $license = License::findOrFail($licenseId);
         $this->authorize('checkout', $license);
@@ -295,11 +296,16 @@ public function checkout(Request $request, $licenseId): JsonResponse
             return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/licenses/message.checkout.license_is_inactive')));
         }
 
+        $file_name = null;
+        if ($request->hasFile('file')) {
+            $file_name = $request->handleFile('private_uploads/licenses/', 'checkout-'.$license->id, $request->file('file'));
+        }
+
         $errorResponse = null;
         $updatedSeat = null;
         $target = null;
 
-        DB::transaction(function () use ($license, $validated, &$errorResponse, &$updatedSeat, &$target): void {
+        DB::transaction(function () use ($license, $validated, $file_name, &$errorResponse, &$updatedSeat, &$target): void {
             $seatId = $validated['seat_id'] ?? null;
 
             $licenseSeat = $seatId
@@ -365,7 +371,7 @@ public function checkout(Request $request, $licenseId): JsonResponse
                 return;
             }
 
-            event(new CheckoutableCheckedOut($licenseSeat, $target, auth()->user(), $validated['notes'] ?? null));
+            event(new CheckoutableCheckedOut($licenseSeat, $target, auth()->user(), $validated['notes'] ?? null, [], 1, false, $file_name));
             $updatedSeat = $licenseSeat->load('license', 'user', 'asset');
         });
 
@@ -387,7 +393,7 @@ public function checkout(Request $request, $licenseId): JsonResponse
      *
      * @param  int  $licenseId
      */
-    public function checkin(Request $request, $licenseId): JsonResponse
+    public function checkin(UploadFileRequest $request, $licenseId): JsonResponse
     {
         $license = License::findOrFail($licenseId);
         $this->authorize('checkin', $license);
@@ -423,7 +429,12 @@ public function checkin(Request $request, $licenseId): JsonResponse
             return response()->json(Helper::formatStandardApiResponse('error', null, $licenseSeat->getErrors()));
         }
 
-        event(new CheckoutableCheckedIn($licenseSeat, $target, auth()->user(), $licenseSeat->notes));
+        $file_name = null;
+        if ($request->hasFile('file')) {
+            $file_name = $request->handleFile('private_uploads/licenses/', 'checkin-'.$license->id, $request->file('file'));
+        }
+
+        event(new CheckoutableCheckedIn($licenseSeat, $target, auth()->user(), $licenseSeat->notes, null, [], $file_name));
 
         return response()->json(Helper::formatStandardApiResponse('success', (new LicenseSeatsTransformer)->transformLicenseSeat($licenseSeat->load('license', 'user', 'asset')), trans('admin/licenses/message.checkin.success')));
     }
diff --git a/app/Http/Controllers/Assets/AssetCheckinController.php b/app/Http/Controllers/Assets/AssetCheckinController.php
index fb3b81eacb16..a197b7e8bb29 100644
--- a/app/Http/Controllers/Assets/AssetCheckinController.php
+++ b/app/Http/Controllers/Assets/AssetCheckinController.php
@@ -178,13 +178,18 @@ function (Builder $query) use ($asset) {
         // Add any custom fields that should be included in the checkout
         $asset->customFieldsForCheckinCheckout('display_checkin');
 
+        $file_name = null;
+        if ($request->hasFile('file')) {
+            $file_name = $request->handleFile('private_uploads/assets/', 'checkin-'.$asset->id, $request->file('file'));
+        }
+
         if ($asset->save()) {
             // Update the location of any child assets
             Asset::where('assigned_type', Asset::class)
                 ->where('assigned_to', $asset->id)
                 ->update(['location_id' => $asset->location_id]);
 
-            event(new CheckoutableCheckedIn($asset, $target, auth()->user(), $request->input('note'), $checkin_at, $originalValues));
+            event(new CheckoutableCheckedIn($asset, $target, auth()->user(), $request->input('note'), $checkin_at, $originalValues, $file_name));
 
             return Helper::getRedirectOption($request, $asset->id, 'Assets')
                 ->with('success', trans('admin/hardware/message.checkin.success'));
diff --git a/app/Http/Controllers/Assets/AssetCheckoutController.php b/app/Http/Controllers/Assets/AssetCheckoutController.php
index 0c8e0d7f2ee3..e0ae289ea91b 100644
--- a/app/Http/Controllers/Assets/AssetCheckoutController.php
+++ b/app/Http/Controllers/Assets/AssetCheckoutController.php
@@ -138,7 +138,12 @@ public function store(AssetCheckoutRequest $request, $assetId): RedirectResponse
                 'sign_in_place' => $request->boolean('sign_in_place'),
             ]);
 
-            if ($asset->checkOut($target, $admin, $checkout_at, $expected_checkin, $request->input('note'), $request->input('name'), null, $request->boolean('sign_in_place'))) {
+            $file_name = null;
+            if ($request->hasFile('file')) {
+                $file_name = $request->handleFile('private_uploads/assets/', 'checkout-'.$asset->id, $request->file('file'));
+            }
+
+            if ($asset->checkOut($target, $admin, $checkout_at, $expected_checkin, $request->input('note'), $request->input('name'), null, $request->boolean('sign_in_place'), $file_name)) {
 
                 // When sign_in_place is requested and the target is a user, redirect to the
                 // acceptance/signature page so the user can sign in person. The signature is
diff --git a/app/Http/Controllers/Components/ComponentCheckinController.php b/app/Http/Controllers/Components/ComponentCheckinController.php
index 4980b4e997ec..a506e2b9b4de 100644
--- a/app/Http/Controllers/Components/ComponentCheckinController.php
+++ b/app/Http/Controllers/Components/ComponentCheckinController.php
@@ -5,12 +5,12 @@
 use App\Events\CheckoutableCheckedIn;
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\UploadFileRequest;
 use App\Models\Asset;
 use App\Models\Component;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
@@ -62,7 +62,7 @@ public function create($component_asset_id)
      *
      * @throws AuthorizationException
      */
-    public function store(Request $request, $component_asset_id, $backto = null)
+    public function store(UploadFileRequest $request, $component_asset_id, $backto = null)
     {
         if ($component_assets = DB::table('components_assets')->find($component_asset_id)) {
             if (is_null($component = Component::find($component_assets->component_id))) {
@@ -101,7 +101,12 @@ public function store(Request $request, $component_asset_id, $backto = null)
 
             $asset = Asset::find($component_assets->asset_id);
 
-            event(new CheckoutableCheckedIn($component, $asset, auth()->user(), $request->input('note'), Carbon::now()));
+            $file_name = null;
+            if ($request->hasFile('file')) {
+                $file_name = $request->handleFile('private_uploads/components/', 'checkin-'.$component->id, $request->file('file'));
+            }
+
+            event(new CheckoutableCheckedIn($component, $asset, auth()->user(), $request->input('note'), Carbon::now(), [], $file_name));
 
             session()->put(['redirect_option' => $request->input('redirect_option')]);
 
diff --git a/app/Http/Controllers/Components/ComponentCheckoutController.php b/app/Http/Controllers/Components/ComponentCheckoutController.php
index 90c0bc309be8..945f91037c60 100644
--- a/app/Http/Controllers/Components/ComponentCheckoutController.php
+++ b/app/Http/Controllers/Components/ComponentCheckoutController.php
@@ -5,12 +5,12 @@
 use App\Events\CheckoutableCheckedOut;
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\UploadFileRequest;
 use App\Models\Asset;
 use App\Models\Component;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Validator;
 
 class ComponentCheckoutController extends Controller
@@ -72,7 +72,7 @@ public function create($id)
      *
      * @throws AuthorizationException
      */
-    public function store(Request $request, $componentId)
+    public function store(UploadFileRequest $request, $componentId)
     {
         // Check if the component exists
         if (! $component = Component::find($componentId)) {
@@ -124,6 +124,11 @@ public function store(Request $request, $componentId)
             'note' => $request->input('note'),
         ]);
 
+        $file_name = null;
+        if ($request->hasFile('file')) {
+            $file_name = $request->handleFile('private_uploads/components/', 'checkout-'.$component->id, $request->file('file'));
+        }
+
         event(new CheckoutableCheckedOut(
             $component,
             $asset,
@@ -131,6 +136,8 @@ public function store(Request $request, $componentId)
             $request->input('note'),
             [],
             $component->checkout_qty,
+            false,
+            $file_name,
         ));
 
         $request->request->add(['checkout_to_type' => 'asset']);
diff --git a/app/Http/Controllers/Consumables/ConsumableCheckoutController.php b/app/Http/Controllers/Consumables/ConsumableCheckoutController.php
index 018655fe7c20..2550c068a0c4 100644
--- a/app/Http/Controllers/Consumables/ConsumableCheckoutController.php
+++ b/app/Http/Controllers/Consumables/ConsumableCheckoutController.php
@@ -5,13 +5,13 @@
 use App\Events\CheckoutableCheckedOut;
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\UploadFileRequest;
 use App\Models\CheckoutAcceptance;
 use App\Models\Consumable;
 use App\Models\User;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
 
 class ConsumableCheckoutController extends Controller
 {
@@ -68,7 +68,7 @@ public function create($id): View|RedirectResponse
      *
      * @throws AuthorizationException
      */
-    public function store(Request $request, $consumableId)
+    public function store(UploadFileRequest $request, $consumableId)
     {
         if (is_null($consumable = Consumable::with('users')->find($consumableId))) {
             return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.not_found'));
@@ -118,6 +118,11 @@ public function store(Request $request, $consumableId)
 
         $consumable->checkout_qty = $quantity;
 
+        $file_name = null;
+        if ($request->hasFile('file')) {
+            $file_name = $request->handleFile('private_uploads/consumables/', 'checkout-'.$consumable->id, $request->file('file'));
+        }
+
         event(new CheckoutableCheckedOut(
             $consumable,
             $user,
@@ -126,6 +131,7 @@ public function store(Request $request, $consumableId)
             [],
             $consumable->checkout_qty,
             $request->boolean('sign_in_place'),
+            $file_name,
         ));
 
         $request->request->add(['checkout_to_type' => 'user']);
diff --git a/app/Http/Controllers/Licenses/LicenseCheckinController.php b/app/Http/Controllers/Licenses/LicenseCheckinController.php
index 6960caadbf61..87bb6e7ea20e 100644
--- a/app/Http/Controllers/Licenses/LicenseCheckinController.php
+++ b/app/Http/Controllers/Licenses/LicenseCheckinController.php
@@ -5,6 +5,7 @@
 use App\Events\CheckoutableCheckedIn;
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\UploadFileRequest;
 use App\Models\Asset;
 use App\Models\License;
 use App\Models\LicenseSeat;
@@ -55,7 +56,7 @@ public function create(LicenseSeat $licenseSeat, $backTo = null)
      *
      * @throws AuthorizationException
      */
-    public function store(Request $request, $seatId = null, $backTo = null)
+    public function store(UploadFileRequest $request, $seatId = null, $backTo = null)
     {
         // Check if the asset exists
         if (is_null($licenseSeat = LicenseSeat::find($seatId))) {
@@ -108,9 +109,14 @@ public function store(Request $request, $seatId = null, $backTo = null)
             session()->put(['checkout_to_type' => 'user']);
         }
 
+        $file_name = null;
+        if ($request->hasFile('file')) {
+            $file_name = $request->handleFile('private_uploads/licenses/', 'checkin-'.$licenseSeat->license_id, $request->file('file'));
+        }
+
         // Was the asset updated?
         if ($licenseSeat->save()) {
-            event(new CheckoutableCheckedIn($licenseSeat, $return_to, auth()->user(), $licenseSeat->notes));
+            event(new CheckoutableCheckedIn($licenseSeat, $return_to, auth()->user(), $licenseSeat->notes, null, [], $file_name));
 
             return Helper::getRedirectOption($request, $license->id, 'Licenses')
                 ->with('success', trans('admin/licenses/message.checkin.success'));
diff --git a/app/Http/Controllers/Licenses/LicenseCheckoutController.php b/app/Http/Controllers/Licenses/LicenseCheckoutController.php
index 54bcef42f8d1..53c6a5bdb3c0 100644
--- a/app/Http/Controllers/Licenses/LicenseCheckoutController.php
+++ b/app/Http/Controllers/Licenses/LicenseCheckoutController.php
@@ -118,18 +118,23 @@ public function store(LicenseCheckoutRequest $request, $licenseId, $seatId = nul
             }
         }
 
+        $file_name = null;
+        if ($request->hasFile('file')) {
+            $file_name = $request->handleFile('private_uploads/licenses/', 'checkout-'.$license->id, $request->file('file'));
+        }
+
         $licenseSeat = null;
         $checkoutTarget = null;
 
-        DB::transaction(function () use ($request, $license, $seatId, &$licenseSeat, &$checkoutTarget): void {
+        DB::transaction(function () use ($request, $license, $seatId, $file_name, &$licenseSeat, &$checkoutTarget): void {
             $licenseSeat = $this->findLicenseSeatToCheckout($license, $seatId, lock: true);
             $licenseSeat->created_by = auth()->id();
             $licenseSeat->notes = $request->input('notes');
 
             if ($request->filled('asset_id')) {
-                $checkoutTarget = $this->checkoutToAsset($licenseSeat);
+                $checkoutTarget = $this->checkoutToAsset($licenseSeat, $file_name);
             } elseif ($request->filled('assigned_to')) {
-                $checkoutTarget = $this->checkoutToUser($licenseSeat);
+                $checkoutTarget = $this->checkoutToUser($licenseSeat, $file_name);
             }
         });
 
@@ -209,7 +214,7 @@ protected function findLicenseSeatToCheckout($license, $seatId, bool $lock = fal
         return $licenseSeat;
     }
 
-    protected function checkoutToAsset($licenseSeat)
+    protected function checkoutToAsset($licenseSeat, ?string $file_name = null)
     {
         if (is_null($target = Asset::find(request('asset_id')))) {
             return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.asset_does_not_exist'));
@@ -221,7 +226,7 @@ protected function checkoutToAsset($licenseSeat)
             $licenseSeat->assigned_to = $target->assigned_to;
         }
         if ($licenseSeat->save()) {
-            event(new CheckoutableCheckedOut($licenseSeat, $target, auth()->user(), request('notes'), [], 1, request()->boolean('sign_in_place')));
+            event(new CheckoutableCheckedOut($licenseSeat, $target, auth()->user(), request('notes'), [], 1, request()->boolean('sign_in_place'), $file_name));
 
             return $target;
         }
@@ -229,7 +234,7 @@ protected function checkoutToAsset($licenseSeat)
         return false;
     }
 
-    protected function checkoutToUser($licenseSeat)
+    protected function checkoutToUser($licenseSeat, ?string $file_name = null)
     {
         // Fetch the target and set the license user
         if (is_null($target = User::find(request('assigned_to')))) {
@@ -238,7 +243,7 @@ protected function checkoutToUser($licenseSeat)
         $licenseSeat->assigned_to = request('assigned_to');
 
         if ($licenseSeat->save()) {
-            event(new CheckoutableCheckedOut($licenseSeat, $target, auth()->user(), request('notes'), [], 1, request()->boolean('sign_in_place')));
+            event(new CheckoutableCheckedOut($licenseSeat, $target, auth()->user(), request('notes'), [], 1, request()->boolean('sign_in_place'), $file_name));
 
             return $target;
         }
diff --git a/app/Http/Requests/AssetCheckinRequest.php b/app/Http/Requests/AssetCheckinRequest.php
index dc5179f49c5b..0cbe96eacfc6 100644
--- a/app/Http/Requests/AssetCheckinRequest.php
+++ b/app/Http/Requests/AssetCheckinRequest.php
@@ -4,7 +4,7 @@
 
 use App\Models\Setting;
 
-class AssetCheckinRequest extends Request
+class AssetCheckinRequest extends UploadFileRequest
 {
     /**
      * Determine if the user is authorized to make this request.
diff --git a/app/Http/Requests/AssetCheckoutRequest.php b/app/Http/Requests/AssetCheckoutRequest.php
index 35e972d1c6f4..7f9e8e2d3ce6 100644
--- a/app/Http/Requests/AssetCheckoutRequest.php
+++ b/app/Http/Requests/AssetCheckoutRequest.php
@@ -4,7 +4,7 @@
 
 use App\Models\Setting;
 
-class AssetCheckoutRequest extends Request
+class AssetCheckoutRequest extends UploadFileRequest
 {
     /**
      * Determine if the user is authorized to make this request.
diff --git a/app/Http/Requests/ImageUploadRequest.php b/app/Http/Requests/ImageUploadRequest.php
index 8c30c486f134..9e5289d84dc7 100644
--- a/app/Http/Requests/ImageUploadRequest.php
+++ b/app/Http/Requests/ImageUploadRequest.php
@@ -13,7 +13,7 @@
 use Intervention\Image\Exception\NotReadableException;
 use Intervention\Image\Facades\Image;
 
-class ImageUploadRequest extends Request
+class ImageUploadRequest extends UploadFileRequest
 {
     use ConvertsBase64ToFiles;
 
diff --git a/app/Http/Requests/LicenseCheckoutRequest.php b/app/Http/Requests/LicenseCheckoutRequest.php
index ad14e00e1c93..daafefbbe2b7 100644
--- a/app/Http/Requests/LicenseCheckoutRequest.php
+++ b/app/Http/Requests/LicenseCheckoutRequest.php
@@ -2,9 +2,7 @@
 
 namespace App\Http\Requests;
 
-use Illuminate\Foundation\Http\FormRequest;
-
-class LicenseCheckoutRequest extends FormRequest
+class LicenseCheckoutRequest extends UploadFileRequest
 {
     /**
      * Determine if the user is authorized to make this request.
diff --git a/app/Listeners/LogListener.php b/app/Listeners/LogListener.php
index c2de69d88827..b90b45c2ec93 100644
--- a/app/Listeners/LogListener.php
+++ b/app/Listeners/LogListener.php
@@ -10,6 +10,7 @@
 use App\Models\Actionlog;
 use App\Models\LicenseSeat;
 use App\Models\User;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Log;
 
 class LogListener
@@ -23,6 +24,13 @@ class LogListener
     public function onCheckoutableCheckedIn(CheckoutableCheckedIn $event)
     {
         $event->checkoutable->logCheckin($event->checkedOutTo, $event->note, $event->action_date, $event->originalValues);
+
+        if ($event->filename) {
+            $item = $event->checkoutable instanceof LicenseSeat ? $event->checkoutable->license : $event->checkoutable;
+            if (Gate::allows('files', $item)) {
+                $event->checkoutable->logUpload($event->filename, null);
+            }
+        }
     }
 
     /**
@@ -40,6 +48,13 @@ public function onCheckoutableCheckedOut(CheckoutableCheckedOut $event)
             $event->originalValues,
             $event->quantity
         );
+
+        if ($event->filename) {
+            $item = $event->checkoutable instanceof LicenseSeat ? $event->checkoutable->license : $event->checkoutable;
+            if (Gate::allows('files', $item)) {
+                $event->checkoutable->logUpload($event->filename, null);
+            }
+        }
     }
 
     /**
diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index d3b1991a5a3a..1cb9eafb44dc 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -520,7 +520,7 @@ public function availableForCheckIn()
      *
      * @return bool
      */
-    public function checkOut($target, $admin = null, $checkout_at = null, $expected_checkin = null, $note = null, $name = null, $location = null, bool $signInPlace = false)
+    public function checkOut($target, $admin = null, $checkout_at = null, $expected_checkin = null, $note = null, $name = null, $location = null, bool $signInPlace = false, ?string $filename = null)
     {
         if (! $target) {
             return false;
@@ -564,7 +564,7 @@ public function checkOut($target, $admin = null, $checkout_at = null, $expected_
             } else {
                 $checkedOutBy = auth()->user();
             }
-            event(new CheckoutableCheckedOut($this, $target, $checkedOutBy, $note, $originalValues, 1, $signInPlace));
+            event(new CheckoutableCheckedOut($this, $target, $checkedOutBy, $note, $originalValues, 1, $signInPlace, $filename));
 
             $this->increment('checkout_counter', 1);
 
diff --git a/app/Models/Traits/HasUploads.php b/app/Models/Traits/HasUploads.php
index 3af2a94c9c3c..e81e765fd13c 100644
--- a/app/Models/Traits/HasUploads.php
+++ b/app/Models/Traits/HasUploads.php
@@ -15,7 +15,7 @@ public function uploads()
         return $this->hasMany(Actionlog::class, 'item_id')
             ->withoutGlobalScope(CompanyableScope::class)
             ->where('item_type', self::class)
-            ->where('action_type', '=', 'uploaded')
+            ->whereIn('action_type', ['uploaded', 'checkout', 'checkin', 'audit'])
             ->whereNotNull('filename')
             ->whereNotIn('filename', function ($query) {
                 $query->select('filename')
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index 6adaa776ff78..2cac4cae8044 100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -475,6 +475,31 @@ public function manageSupplierFiles()
         return $this->appendPermission(['suppliers.files' => '1']);
     }
 
+    public function assetsFiles()
+    {
+        return $this->appendPermission(['assets.files' => '1']);
+    }
+
+    public function accessoriesFiles()
+    {
+        return $this->appendPermission(['accessories.files' => '1']);
+    }
+
+    public function licensesFiles()
+    {
+        return $this->appendPermission(['licenses.files' => '1']);
+    }
+
+    public function componentsFiles()
+    {
+        return $this->appendPermission(['components.files' => '1']);
+    }
+
+    public function consumablesFiles()
+    {
+        return $this->appendPermission(['consumables.files' => '1']);
+    }
+
     private function appendPermission(array $permission)
     {
         return $this->state(function ($currentState) use ($permission) {
diff --git a/resources/views/accessories/checkin.blade.php b/resources/views/accessories/checkin.blade.php
index e467aa5f7281..2665d6032e17 100755
--- a/resources/views/accessories/checkin.blade.php
+++ b/resources/views/accessories/checkin.blade.php
@@ -30,6 +30,8 @@
                 type="textarea"
             />
 
+            <x-input.file-upload name="file" />
+
             <!-- Checkin date -->
             <div class="form-group {{ $errors->has('checkin_at') ? 'has-error' : '' }}">
                 <label for="checkin_at" class="col-md-3 control-label">{{ trans('admin/hardware/form.checkin_date') }}</label>
diff --git a/resources/views/accessories/checkout.blade.php b/resources/views/accessories/checkout.blade.php
index 3aa81e9e6b35..1195ccf30e9a 100755
--- a/resources/views/accessories/checkout.blade.php
+++ b/resources/views/accessories/checkout.blade.php
@@ -89,6 +89,8 @@
                 type="textarea"
             />
 
+            <x-input.file-upload name="file" />
+
             <x-slot:customfooter>
                 <x-redirect_submit_options
                     index_route="accessories.index"
diff --git a/resources/views/blade/input/file-upload.blade.php b/resources/views/blade/input/file-upload.blade.php
new file mode 100644
index 000000000000..805b7d722372
--- /dev/null
+++ b/resources/views/blade/input/file-upload.blade.php
@@ -0,0 +1,41 @@
+@use('App\Helpers\Helper')
+
+@props([
+    'name' => 'file',
+    'label' => null,
+    'accept' => null,
+    'help_text' => null,
+    'multiple' => false,
+    'required' => false,
+])
+
+<div @class(['form-group', 'has-error' => $errors->has($name)])>
+    <label class="col-md-3 control-label" for="{{ $name }}">
+        {{ $label ?? trans('general.file_upload') }}
+    </label>
+    <div class="col-md-8">
+        <input
+            type="file"
+            id="{{ $name }}"
+            name="{{ $name }}{{ $multiple ? '[]' : '' }}"
+            class="js-uploadFile sr-only"
+            data-maxsize="{{ Helper::file_upload_max_size() }}"
+            accept="{{ $accept ?? config('filesystems.allowed_upload_mimetypes') }}"
+            aria-label="{{ $label ?? trans('general.file_upload') }}"
+            @if ($multiple) multiple @endif
+            @if ($required) required @endif
+        >
+
+        <label class="btn btn-sm btn-theme" for="{{ $name }}" aria-hidden="true">
+            {{ $multiple ? trans('button.select_files') : trans('button.select_file') }}
+        </label>
+
+        <span class="label label-default" id="{{ $name }}-info"></span>
+
+        <p class="help-block" id="{{ $name }}-status">
+            {{ $help_text ?? trans('general.upload_filetypes_help', ['allowed_filetypes' => config('filesystems.allowed_upload_extensions'), 'size' => Helper::file_upload_max_size_readable()]) }}
+        </p>
+
+        {!! $errors->first($name, '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+    </div>
+</div>
diff --git a/resources/views/components/checkin.blade.php b/resources/views/components/checkin.blade.php
index 4fdcf3a1fa76..c8d50299e561 100644
--- a/resources/views/components/checkin.blade.php
+++ b/resources/views/components/checkin.blade.php
@@ -37,6 +37,8 @@
                 type="textarea"
             />
 
+            <x-input.file-upload name="file" />
+
             <x-slot:customfooter>
                 <x-redirect_submit_options
                     index_route="components.index"
diff --git a/resources/views/components/checkout.blade.php b/resources/views/components/checkout.blade.php
index 724bf835c701..088423231de3 100644
--- a/resources/views/components/checkout.blade.php
+++ b/resources/views/components/checkout.blade.php
@@ -61,6 +61,8 @@
                 type="textarea"
             />
 
+            <x-input.file-upload name="file" />
+
             <x-slot:customfooter>
                 <x-redirect_submit_options
                     index_route="components.index"
diff --git a/resources/views/consumables/checkout.blade.php b/resources/views/consumables/checkout.blade.php
index f5d94cf9fa1a..f6f259a200eb 100644
--- a/resources/views/consumables/checkout.blade.php
+++ b/resources/views/consumables/checkout.blade.php
@@ -86,6 +86,8 @@
                 type="textarea"
             />
 
+            <x-input.file-upload name="file" />
+
             <x-slot:customfooter>
                 <x-redirect_submit_options
                     index_route="consumables.index"
diff --git a/resources/views/hardware/checkin.blade.php b/resources/views/hardware/checkin.blade.php
index 036f09052b9c..3f93cec096d5 100755
--- a/resources/views/hardware/checkin.blade.php
+++ b/resources/views/hardware/checkin.blade.php
@@ -33,11 +33,11 @@
                         @if ($backto == 'user')
                             <form class="form-horizontal" method="post"
                                   action="{{ route('hardware.checkin.store', array('assetId'=> $asset->id, 'backto'=>'user')) }}"
-                                  autocomplete="off">
+                                  autocomplete="off" enctype="multipart/form-data">
                                 @else
                                     <form class="form-horizontal" method="post"
                                           action="{{ route('hardware.checkin.store', array('assetId'=> $asset->id)) }}"
-                                          autocomplete="off">
+                                          autocomplete="off" enctype="multipart/form-data">
                                         @endif
                                         {{csrf_field()}}
 
@@ -194,6 +194,8 @@ class="form-group"
                                         </div>
 
 
+                                        <x-input.file-upload name="file" />
+
                                         <!-- Custom fields -->
                                         @include("models/custom_fields_form", [
                                                 'model' => $asset->model,
diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php
index 5d96a7b31245..7f3059157c0a 100755
--- a/resources/views/hardware/checkout.blade.php
+++ b/resources/views/hardware/checkout.blade.php
@@ -20,7 +20,7 @@
         <!-- left column -->
         <div class="col-md-7">
             <div class="box box-default">
-                <form class="form-horizontal" method="post" action="" autocomplete="off">
+                <form class="form-horizontal" method="post" action="" autocomplete="off" enctype="multipart/form-data">
                     <div class="box-header with-border">
                         <h2 class="box-title"> {{ trans('admin/hardware/form.tag') }} {{ $asset->asset_tag }}</h2>
                     </div>
@@ -176,6 +176,8 @@
                             </div>
                         </div>
 
+                        <x-input.file-upload name="file" />
+
                         <!-- Custom fields -->
                         @include("models/custom_fields_form", [
                                 'model' => $asset->model,
diff --git a/resources/views/licenses/checkin.blade.php b/resources/views/licenses/checkin.blade.php
index 6e3f9db4a86e..defd9172d7d3 100755
--- a/resources/views/licenses/checkin.blade.php
+++ b/resources/views/licenses/checkin.blade.php
@@ -17,7 +17,7 @@
     <div class="row">
         <!-- left column -->
         <div class="col-md-8">
-            <form class="form-horizontal" method="post" action="{{ route('licenses.checkin.save', ['licenseId'=>$licenseSeat->id, 'backTo'=>$backto] ) }}" autocomplete="off">
+            <form class="form-horizontal" method="post" action="{{ route('licenses.checkin.save', ['licenseId'=>$licenseSeat->id, 'backTo'=>$backto] ) }}" autocomplete="off" enctype="multipart/form-data">
                 {{csrf_field()}}
 
                 <div class="box box-default">
@@ -79,6 +79,9 @@
                     {!! $errors->first('notes', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                 </div>
             </div>
+
+            <x-input.file-upload name="file" />
+
                         <x-redirect_submit_options
                                 index_route="licenses.index"
                                 :button_label="trans('general.checkin')"
diff --git a/resources/views/licenses/checkout.blade.php b/resources/views/licenses/checkout.blade.php
index 3d3f0b629002..14a29050e6a4 100755
--- a/resources/views/licenses/checkout.blade.php
+++ b/resources/views/licenses/checkout.blade.php
@@ -16,7 +16,7 @@
 <div class="row">
         <!-- left column -->
     <div class="col-md-7">
-        <form class="form-horizontal" method="post" action="" autocomplete="off">
+        <form class="form-horizontal" method="post" action="" autocomplete="off" enctype="multipart/form-data">
             {{csrf_field()}}
 
             <div class="box box-default">
@@ -85,6 +85,9 @@
                             {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                         </div>
                     </div>
+
+                    <x-input.file-upload name="file" />
+
                 </div>
 
 
diff --git a/resources/views/modals/upload-file.blade.php b/resources/views/modals/upload-file.blade.php
index 2433344157ff..d6ebd1ff4604 100644
--- a/resources/views/modals/upload-file.blade.php
+++ b/resources/views/modals/upload-file.blade.php
@@ -16,29 +16,18 @@ class="form-horizontal"
             <input type="hidden" name="_token" value="{{ csrf_token() }}" />
             <div class="modal-body">
 
-                <div class="row">
-                    <div class="col-md-12">
+                <x-input.file-upload name="file" :multiple="true" :required="true" />
 
-                        <label class="btn btn-theme btn-block">
-                            {{ trans('button.select_files')  }}
-                            <input type="file" name="file[]" multiple class="js-uploadFile" id="uploadFile" data-maxsize="{{ Helper::file_upload_max_size() }}" accept="{{ config('filesystems.allowed_upload_mimetypes') }}" style="display:none" required>
-                        </label>
-
-                    </div>
-                    <div class="col-md-12">
-                        <span id="uploadFile-info"></span>
-                    </div>
-                    <div class="col-md-12">
-                        <p class="help-block" id="uploadFile-status">{{ trans('general.upload_filetypes_help', ['allowed_filetypes' => config('filesystems.allowed_upload_extensions'), 'size' => Helper::file_upload_max_size_readable()]) }}</p>
-                    </div>
-
-                    <div class="col-md-12">
+                <div class="form-group">
+                    <label class="col-md-3 control-label" for="notes">{{ trans('general.notes') }}</label>
+                    <div class="col-md-8">
                         <x-input.textarea
                             name="notes"
+                            id="notes"
                             :value="old('notes')"
-                            placeholder="Notes (Optional)"
+                            placeholder="{{ trans('general.notes') }} ({{ trans('general.optional') }})"
                             rows="3"
-                            aria-label="file"
+                            aria-label="{{ trans('general.notes') }}"
                         />
                     </div>
                 </div>
diff --git a/resources/views/partials/forms/edit/image-upload.blade.php b/resources/views/partials/forms/edit/image-upload.blade.php
index 140ef3e12017..9489b4afdf25 100644
--- a/resources/views/partials/forms/edit/image-upload.blade.php
+++ b/resources/views/partials/forms/edit/image-upload.blade.php
@@ -48,19 +48,19 @@
 <!-- Image Upload and preview -->
 
 <div class="form-group {{ $errors->has((isset($fieldname) ? $fieldname : 'image')) ? 'has-error' : '' }}" id="image-upload">
-    <label class="col-md-3 control-label" for="{{ (isset($fieldname) ? $fieldname : 'image') }}">{{ trans('general.image_upload') }}</label>
+    <label class="col-md-3 control-label" for="{{ (isset($fieldname) ? $fieldname : 'image') }}">{{ $label ?? trans('general.image_upload') }}</label>
     <div class="col-md-8">
 
         <input type="file" id="{{ (isset($fieldname) ? $fieldname : 'image') }}" name="{{ (isset($fieldname) ? $fieldname : 'image') }}" aria-label="{{ (isset($fieldname) ? $fieldname : 'image') }}" class="sr-only">
 
         <label class="btn btn-sm btn-theme" aria-hidden="true">
             {{ trans('button.select_file')  }}
-            <input type="file" name="{{ (isset($fieldname) ? $fieldname : 'image') }}" class="js-uploadFile" id="uploadFile" data-maxsize="{{ Helper::file_upload_max_size() }}" accept="image/gif,image/jpeg,image/webp,image/png,image/svg,image/svg+xml,image/avif" style="display:none; max-width: 90%" aria-label="{{ (isset($fieldname) ? $fieldname : 'image') }}" aria-hidden="true">
+            <input type="file" name="{{ (isset($fieldname) ? $fieldname : 'image') }}" class="js-uploadFile" id="uploadFile" data-maxsize="{{ Helper::file_upload_max_size() }}" accept="{{ $accept ?? 'image/gif,image/jpeg,image/webp,image/png,image/svg,image/svg+xml,image/avif' }}" style="display:none; max-width: 90%" aria-label="{{ (isset($fieldname) ? $fieldname : 'image') }}" aria-hidden="true">
         </label>
 
         <span class='label label-default' id="uploadFile-info"></span>
 
-        <p class="help-block" id="uploadFile-status">{{ trans('general.image_filetypes_help', ['size' => Helper::file_upload_max_size_readable()]) }} {{ $help_text ?? '' }}</p>
+        <p class="help-block" id="uploadFile-status">{{ $help_text ?? trans('general.image_filetypes_help', ['size' => Helper::file_upload_max_size_readable()]) }}</p>
 
         {!! $errors->first('image', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
     </div>
diff --git a/tests/Feature/Checkins/Api/FileUploadOnCheckinTest.php b/tests/Feature/Checkins/Api/FileUploadOnCheckinTest.php
new file mode 100644
index 000000000000..54feb6db81b2
--- /dev/null
+++ b/tests/Feature/Checkins/Api/FileUploadOnCheckinTest.php
@@ -0,0 +1,119 @@
+<?php
+
+namespace Tests\Feature\Checkins\Api;
+
+use App\Models\Accessory;
+use App\Models\Actionlog;
+use App\Models\Asset;
+use App\Models\Component;
+use App\Models\License;
+use App\Models\LicenseSeat;
+use App\Models\User;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Facades\Storage;
+use Tests\TestCase;
+
+class FileUploadOnCheckinTest extends TestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+        Mail::fake();
+    }
+
+    public function test_file_upload_is_stored_on_action_log_for_asset_checkin()
+    {
+        Storage::fake('local');
+
+        $asset = Asset::factory()->assignedToUser()->create();
+
+        $this->actingAsForApi(User::factory()->checkinAssets()->assetsFiles()->create())
+            ->post(route('api.asset.checkin', $asset), [
+                'file' => UploadedFile::fake()->create('document.pdf', 100),
+            ])
+            ->assertOk();
+
+        $log = Actionlog::where('item_type', Asset::class)
+            ->where('item_id', $asset->id)
+            ->where('action_type', 'uploaded')
+            ->latest('id')
+            ->first();
+
+        $this->assertNotNull($log, 'No checkin action log entry found');
+        $this->assertNotNull($log->filename, 'Filename was not saved to action log');
+    }
+
+    public function test_file_upload_is_stored_on_action_log_for_accessory_checkin()
+    {
+        Storage::fake('local');
+
+        $accessory = Accessory::factory()->checkedOutToUser()->create();
+        $accessoryCheckout = $accessory->checkouts->first();
+
+        $this->actingAsForApi(User::factory()->checkinAccessories()->accessoriesFiles()->create())
+            ->post(route('api.accessories.checkin', $accessoryCheckout), [
+                'file' => UploadedFile::fake()->create('document.pdf', 100),
+            ])
+            ->assertOk();
+
+        $log = Actionlog::where('item_type', Accessory::class)
+            ->where('item_id', $accessory->id)
+            ->where('action_type', 'uploaded')
+            ->latest('id')
+            ->first();
+
+        $this->assertNotNull($log, 'No checkin action log entry found');
+        $this->assertNotNull($log->filename, 'Filename was not saved to action log');
+    }
+
+    public function test_file_upload_is_stored_on_action_log_for_license_checkin()
+    {
+        Storage::fake('local');
+
+        $licenseSeat = LicenseSeat::factory()->assignedToUser()->create();
+
+        $this->actingAsForApi(User::factory()->checkinLicenses()->licensesFiles()->create())
+            ->post(route('api.licenses.checkin', $licenseSeat->license->id), [
+                'seat_id' => $licenseSeat->id,
+                'file' => UploadedFile::fake()->create('document.pdf', 100),
+            ])
+            ->assertOk();
+
+        $log = Actionlog::where('item_type', License::class)
+            ->where('item_id', $licenseSeat->license_id)
+            ->where('action_type', 'uploaded')
+            ->latest('id')
+            ->first();
+
+        $this->assertNotNull($log, 'No checkin action log entry found');
+        $this->assertNotNull($log->filename, 'Filename was not saved to action log');
+    }
+
+    public function test_file_upload_is_stored_on_action_log_for_component_checkin()
+    {
+        Storage::fake('local');
+
+        $component = Component::factory()->checkedOutToAsset()->create();
+        $componentAssetId = DB::table('components_assets')
+            ->where('component_id', $component->id)
+            ->value('id');
+
+        $this->actingAsForApi(User::factory()->checkinComponents()->componentsFiles()->create())
+            ->post(route('api.components.checkin', $componentAssetId), [
+                'checkin_qty' => 1,
+                'file' => UploadedFile::fake()->create('document.pdf', 100),
+            ])
+            ->assertOk();
+
+        $log = Actionlog::where('item_type', Component::class)
+            ->where('item_id', $component->id)
+            ->where('action_type', 'uploaded')
+            ->latest('id')
+            ->first();
+
+        $this->assertNotNull($log, 'No checkin action log entry found');
+        $this->assertNotNull($log->filename, 'Filename was not saved to action log');
+    }
+}
diff --git a/tests/Feature/Checkins/Ui/FileUploadOnCheckinTest.php b/tests/Feature/Checkins/Ui/FileUploadOnCheckinTest.php
new file mode 100644
index 000000000000..a9a507e6527b
--- /dev/null
+++ b/tests/Feature/Checkins/Ui/FileUploadOnCheckinTest.php
@@ -0,0 +1,115 @@
+<?php
+
+namespace Tests\Feature\Checkins\Ui;
+
+use App\Models\Accessory;
+use App\Models\Actionlog;
+use App\Models\Asset;
+use App\Models\Component;
+use App\Models\License;
+use App\Models\LicenseSeat;
+use App\Models\User;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Facades\Storage;
+use Tests\TestCase;
+
+class FileUploadOnCheckinTest extends TestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+        Mail::fake();
+    }
+
+    public function test_file_upload_is_stored_on_action_log_for_asset_checkin()
+    {
+        Storage::fake('local');
+
+        $asset = Asset::factory()->assignedToUser()->create();
+
+        $this->actingAs(User::factory()->checkinAssets()->assetsFiles()->create())
+            ->post(route('hardware.checkin.store', $asset), [
+                'file' => UploadedFile::fake()->create('document.pdf', 100),
+            ])
+            ->assertSessionHasNoErrors();
+
+        $log = Actionlog::where('item_type', Asset::class)
+            ->where('item_id', $asset->id)
+            ->where('action_type', 'uploaded')
+            ->latest('id')
+            ->first();
+
+        $this->assertNotNull($log, 'No checkin action log entry found');
+        $this->assertNotNull($log->filename, 'Filename was not saved to action log');
+    }
+
+    public function test_file_upload_is_stored_on_action_log_for_accessory_checkin()
+    {
+        Storage::fake('local');
+
+        $accessory = Accessory::factory()->checkedOutToUser()->create();
+
+        $this->actingAs(User::factory()->checkinAccessories()->accessoriesFiles()->create())
+            ->post(route('accessories.checkin.store', $accessory->checkouts->first()->id), [
+                'file' => UploadedFile::fake()->create('document.pdf', 100),
+            ])
+            ->assertSessionHasNoErrors();
+
+        $log = Actionlog::where('item_type', Accessory::class)
+            ->where('item_id', $accessory->id)
+            ->where('action_type', 'uploaded')
+            ->latest('id')
+            ->first();
+
+        $this->assertNotNull($log, 'No checkin action log entry found');
+        $this->assertNotNull($log->filename, 'Filename was not saved to action log');
+    }
+
+    public function test_file_upload_is_stored_on_action_log_for_license_checkin()
+    {
+        Storage::fake('local');
+
+        $licenseSeat = LicenseSeat::factory()->assignedToUser()->create();
+
+        $this->actingAs(User::factory()->checkinLicenses()->licensesFiles()->create())
+            ->post(route('licenses.checkin.save', [$licenseSeat->id, 'backto' => 'user']), [
+                'file' => UploadedFile::fake()->create('document.pdf', 100),
+            ])
+            ->assertSessionHasNoErrors();
+
+        $log = Actionlog::where('item_type', License::class)
+            ->where('item_id', $licenseSeat->license_id)
+            ->where('action_type', 'uploaded')
+            ->latest('id')
+            ->first();
+
+        $this->assertNotNull($log, 'No checkin action log entry found');
+        $this->assertNotNull($log->filename, 'Filename was not saved to action log');
+    }
+
+    public function test_file_upload_is_stored_on_action_log_for_component_checkin()
+    {
+        Storage::fake('local');
+
+        $component = Component::factory()->checkedOutToAsset()->create();
+        $componentAsset = DB::table('components_assets')->where('component_id', $component->id)->first();
+
+        $this->actingAs(User::factory()->checkinComponents()->componentsFiles()->create())
+            ->post(route('components.checkin.store', $componentAsset->id), [
+                'checkin_qty' => 1,
+                'file' => UploadedFile::fake()->create('document.pdf', 100),
+            ])
+            ->assertSessionHasNoErrors();
+
+        $log = Actionlog::where('item_type', Component::class)
+            ->where('item_id', $component->id)
+            ->where('action_type', 'uploaded')
+            ->latest('id')
+            ->first();
+
+        $this->assertNotNull($log, 'No checkin action log entry found');
+        $this->assertNotNull($log->filename, 'Filename was not saved to action log');
+    }
+}
diff --git a/tests/Feature/Checkouts/Api/FileUploadOnCheckoutTest.php b/tests/Feature/Checkouts/Api/FileUploadOnCheckoutTest.php
new file mode 100644
index 000000000000..ba7e52e4134c
--- /dev/null
+++ b/tests/Feature/Checkouts/Api/FileUploadOnCheckoutTest.php
@@ -0,0 +1,149 @@
+<?php
+
+namespace Tests\Feature\Checkouts\Api;
+
+use App\Models\Accessory;
+use App\Models\Actionlog;
+use App\Models\Asset;
+use App\Models\Component;
+use App\Models\Consumable;
+use App\Models\License;
+use App\Models\LicenseSeat;
+use App\Models\User;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Facades\Storage;
+use Tests\TestCase;
+
+class FileUploadOnCheckoutTest extends TestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+        Mail::fake();
+    }
+
+    public function test_file_upload_is_stored_on_action_log_for_asset_checkout()
+    {
+        Storage::fake('local');
+
+        $asset = Asset::factory()->create();
+        $user = User::factory()->create();
+
+        $this->actingAsForApi(User::factory()->checkoutAssets()->assetsFiles()->create())
+            ->post(route('api.asset.checkout', $asset), [
+                'checkout_to_type' => 'user',
+                'assigned_user' => $user->id,
+                'file' => UploadedFile::fake()->create('document.pdf', 100),
+            ])
+            ->assertOk();
+
+        $log = Actionlog::where('item_type', Asset::class)
+            ->where('item_id', $asset->id)
+            ->where('action_type', 'uploaded')
+            ->latest('id')
+            ->first();
+
+        $this->assertNotNull($log, 'No checkout action log entry found');
+        $this->assertNotNull($log->filename, 'Filename was not saved to action log');
+    }
+
+    public function test_file_upload_is_stored_on_action_log_for_accessory_checkout()
+    {
+        Storage::fake('local');
+
+        $accessory = Accessory::factory()->create();
+        $user = User::factory()->create();
+
+        $this->actingAsForApi(User::factory()->checkoutAccessories()->accessoriesFiles()->create())
+            ->post(route('api.accessories.checkout', $accessory), [
+                'checkout_to_type' => 'user',
+                'assigned_user' => $user->id,
+                'file' => UploadedFile::fake()->create('document.pdf', 100),
+            ])
+            ->assertOk();
+
+        $log = Actionlog::where('item_type', Accessory::class)
+            ->where('item_id', $accessory->id)
+            ->where('action_type', 'uploaded')
+            ->latest('id')
+            ->first();
+
+        $this->assertNotNull($log, 'No checkout action log entry found');
+        $this->assertNotNull($log->filename, 'Filename was not saved to action log');
+    }
+
+    public function test_file_upload_is_stored_on_action_log_for_license_checkout()
+    {
+        Storage::fake('local');
+
+        $licenseSeat = LicenseSeat::factory()->create();
+        $user = User::factory()->create();
+
+        $this->actingAsForApi(User::factory()->checkoutLicenses()->licensesFiles()->create())
+            ->post(route('api.licenses.checkout', $licenseSeat->license->id), [
+                'target_type' => 'user',
+                'assigned_to' => $user->id,
+                'file' => UploadedFile::fake()->create('document.pdf', 100),
+            ])
+            ->assertOk();
+
+        $log = Actionlog::where('item_type', License::class)
+            ->where('item_id', $licenseSeat->license->id)
+            ->where('action_type', 'uploaded')
+            ->latest('id')
+            ->first();
+
+        $this->assertNotNull($log, 'No checkout action log entry found');
+        $this->assertNotNull($log->filename, 'Filename was not saved to action log');
+    }
+
+    public function test_file_upload_is_stored_on_action_log_for_component_checkout()
+    {
+        Storage::fake('local');
+
+        $component = Component::factory()->create();
+        $asset = Asset::factory()->create();
+
+        $this->actingAsForApi(User::factory()->checkoutComponents()->componentsFiles()->create())
+            ->post(route('api.components.checkout', $component->id), [
+                'assigned_to' => $asset->id,
+                'assigned_qty' => 1,
+                'file' => UploadedFile::fake()->create('document.pdf', 100),
+            ])
+            ->assertOk();
+
+        $log = Actionlog::where('item_type', Component::class)
+            ->where('item_id', $component->id)
+            ->where('action_type', 'uploaded')
+            ->latest('id')
+            ->first();
+
+        $this->assertNotNull($log, 'No checkout action log entry found');
+        $this->assertNotNull($log->filename, 'Filename was not saved to action log');
+    }
+
+    public function test_file_upload_is_stored_on_action_log_for_consumable_checkout()
+    {
+        Storage::fake('local');
+
+        $consumable = Consumable::factory()->create();
+        $user = User::factory()->create();
+
+        $this->actingAsForApi(User::factory()->checkoutConsumables()->consumablesFiles()->create())
+            ->post(route('api.consumables.checkout', $consumable), [
+                'assigned_to' => $user->id,
+                'file' => UploadedFile::fake()->create('document.pdf', 100),
+            ])
+            ->assertOk();
+
+        $log = Actionlog::where('item_type', Consumable::class)
+            ->where('item_id', $consumable->id)
+            ->where('action_type', 'uploaded')
+            ->latest('id')
+            ->first();
+
+        $this->assertNotNull($log, 'No checkout action log entry found');
+        $this->assertNotNull($log->filename, 'Filename was not saved to action log');
+    }
+}
diff --git a/tests/Feature/Checkouts/Ui/FileUploadOnCheckoutTest.php b/tests/Feature/Checkouts/Ui/FileUploadOnCheckoutTest.php
new file mode 100644
index 000000000000..653d1e116bba
--- /dev/null
+++ b/tests/Feature/Checkouts/Ui/FileUploadOnCheckoutTest.php
@@ -0,0 +1,150 @@
+<?php
+
+namespace Tests\Feature\Checkouts\Ui;
+
+use App\Models\Accessory;
+use App\Models\Actionlog;
+use App\Models\Asset;
+use App\Models\Component;
+use App\Models\Consumable;
+use App\Models\License;
+use App\Models\LicenseSeat;
+use App\Models\User;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Facades\Storage;
+use Tests\TestCase;
+
+class FileUploadOnCheckoutTest extends TestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+        Mail::fake();
+    }
+
+    public function test_file_upload_is_stored_on_action_log_for_asset_checkout()
+    {
+        Storage::fake('local');
+
+        $asset = Asset::factory()->create();
+        $user = User::factory()->create();
+
+        $this->actingAs(User::factory()->checkoutAssets()->assetsFiles()->create())
+            ->post(route('hardware.checkout.store', $asset), [
+                'checkout_to_type' => 'user',
+                'assigned_user' => $user->id,
+                'file' => UploadedFile::fake()->create('document.pdf', 100),
+            ])
+            ->assertSessionHasNoErrors();
+
+        $log = Actionlog::where('item_type', Asset::class)
+            ->where('item_id', $asset->id)
+            ->where('action_type', 'uploaded')
+            ->latest('id')
+            ->first();
+
+        $this->assertNotNull($log, 'No checkout action log entry found');
+        $this->assertNotNull($log->filename, 'Filename was not saved to action log');
+    }
+
+    public function test_file_upload_is_stored_on_action_log_for_accessory_checkout()
+    {
+        Storage::fake('local');
+
+        $accessory = Accessory::factory()->create();
+        $user = User::factory()->create();
+
+        $this->actingAs(User::factory()->checkoutAccessories()->accessoriesFiles()->create())
+            ->post(route('accessories.checkout.store', $accessory), [
+                'checkout_to_type' => 'user',
+                'assigned_user' => $user->id,
+                'file' => UploadedFile::fake()->create('document.pdf', 100),
+            ])
+            ->assertSessionHasNoErrors();
+
+        $log = Actionlog::where('item_type', Accessory::class)
+            ->where('item_id', $accessory->id)
+            ->where('action_type', 'uploaded')
+            ->latest('id')
+            ->first();
+
+        $this->assertNotNull($log, 'No checkout action log entry found');
+        $this->assertNotNull($log->filename, 'Filename was not saved to action log');
+    }
+
+    public function test_file_upload_is_stored_on_action_log_for_license_checkout()
+    {
+        Storage::fake('local');
+
+        $licenseSeat = LicenseSeat::factory()->create();
+        $user = User::factory()->create();
+
+        $this->actingAs(User::factory()->checkoutLicenses()->licensesFiles()->create())
+            ->post(route('licenses.checkout', $licenseSeat->license), [
+                'checkout_to_type' => 'user',
+                'assigned_to' => $user->id,
+                'asset_id' => null,
+                'file' => UploadedFile::fake()->create('document.pdf', 100),
+            ])
+            ->assertSessionHasNoErrors();
+
+        $log = Actionlog::where('item_type', License::class)
+            ->where('item_id', $licenseSeat->license->id)
+            ->where('action_type', 'uploaded')
+            ->latest('id')
+            ->first();
+
+        $this->assertNotNull($log, 'No checkout action log entry found');
+        $this->assertNotNull($log->filename, 'Filename was not saved to action log');
+    }
+
+    public function test_file_upload_is_stored_on_action_log_for_component_checkout()
+    {
+        Storage::fake('local');
+
+        $component = Component::factory()->create();
+        $asset = Asset::factory()->create();
+
+        $this->actingAs(User::factory()->checkoutComponents()->componentsFiles()->create())
+            ->post(route('components.checkout.store', $component), [
+                'asset_id' => $asset->id,
+                'assigned_qty' => 1,
+                'file' => UploadedFile::fake()->create('document.pdf', 100),
+            ])
+            ->assertSessionHasNoErrors();
+
+        $log = Actionlog::where('item_type', Component::class)
+            ->where('item_id', $component->id)
+            ->where('action_type', 'uploaded')
+            ->latest('id')
+            ->first();
+
+        $this->assertNotNull($log, 'No checkout action log entry found');
+        $this->assertNotNull($log->filename, 'Filename was not saved to action log');
+    }
+
+    public function test_file_upload_is_stored_on_action_log_for_consumable_checkout()
+    {
+        Storage::fake('local');
+
+        $consumable = Consumable::factory()->create();
+        $user = User::factory()->create();
+
+        $this->actingAs(User::factory()->checkoutConsumables()->consumablesFiles()->create())
+            ->post(route('consumables.checkout.store', $consumable), [
+                'assigned_to' => $user->id,
+                'file' => UploadedFile::fake()->create('document.pdf', 100),
+            ])
+            ->assertSessionHasNoErrors();
+
+        $log = Actionlog::where('item_type', Consumable::class)
+            ->where('item_id', $consumable->id)
+            ->where('action_type', 'uploaded')
+            ->latest('id')
+            ->first();
+
+        $this->assertNotNull($log, 'No checkout action log entry found');
+        $this->assertNotNull($log->filename, 'Filename was not saved to action log');
+    }
+}