Skip to content

A free open source IT asset/license management system

Added checked out to in checkin forms

snipe0af21844bce7
diff --git a/app/Http/Controllers/Accessories/AccessoryCheckinController.php b/app/Http/Controllers/Accessories/AccessoryCheckinController.php
index 4fc22c43c8..093859cd27 100644
--- a/app/Http/Controllers/Accessories/AccessoryCheckinController.php
+++ b/app/Http/Controllers/Accessories/AccessoryCheckinController.php
@@ -39,7 +39,18 @@ class AccessoryCheckinController extends Controller
default => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.user')]),
};
- return view('accessories/checkin', compact('accessory', 'target_option'))->with('backto', $backto);
+ // Hydrate the polymorphic target so the checkin form can
+ // display which user, asset, or location the accessory is
+ // currently checked out to.
+ $target = null;
+ if ($accessory_user->assigned_type && $accessory_user->assigned_to) {
+ $targetClass = $accessory_user->assigned_type;
+ if (class_exists($targetClass)) {
+ $target = $targetClass::find($accessory_user->assigned_to);
+ }
+ }
+
+ return view('accessories/checkin', compact('accessory', 'target', 'target_option'))->with('backto', $backto);
}
diff --git a/resources/views/accessories/checkin.blade.php b/resources/views/accessories/checkin.blade.php
index d61b6a6b51..d26c7f3afc 100755
--- a/resources/views/accessories/checkin.blade.php
+++ b/resources/views/accessories/checkin.blade.php
@@ -23,6 +23,8 @@
<x-form.static :label="trans('admin/hardware/form.name')">{{ $accessory->name }}</x-form.static>
@endif
+ <x-checkin.checked-out-from :target="$target ?? null" />
+
<x-form.row
:label="trans('admin/hardware/form.notes')"
:item="$accessory"
diff --git a/resources/views/blade/checkin/checked-out-from.blade.php b/resources/views/blade/checkin/checked-out-from.blade.php
new file mode 100644
index 0000000000..bf96dc5af9
--- /dev/null
+++ b/resources/views/blade/checkin/checked-out-from.blade.php
@@ -0,0 +1,25 @@
+@props([
+ 'target' => null,
+])
+
+@if ($target)
+ @php
+ $iconType = match (class_basename($target)) {
+ 'User' => 'user',
+ 'Asset' => 'asset',
+ 'Location' => 'location',
+ default => null,
+ };
+ $tagColor = $target->tag_color ?? null;
+ $link = method_exists($target->present(), 'formattedNameLink')
+ ? $target->present()->formattedNameLink()
+ : e($target->present()->fullName() ?? $target->name ?? '');
+ @endphp
+
+ <x-form.static :label="trans('general.checked_out_to')">
+ @if ($iconType)
+ <x-icon :type="$iconType" class="fa-fw" style="{{ $tagColor ? 'color: '.e($tagColor).';' : '' }}" />
+ @endif
+ {!! $link !!}
+ </x-form.static>
+@endif
diff --git a/resources/views/components/checkin.blade.php b/resources/views/components/checkin.blade.php
index 4fdcf3a1fa..52d96bb367 100644
--- a/resources/views/components/checkin.blade.php
+++ b/resources/views/components/checkin.blade.php
@@ -19,7 +19,7 @@
<x-box header="{{ $snipe_component->name }}">
- <x-form.static :label="trans('general.checkin_from')">{{ $asset->present()->fullName }}</x-form.static>
+ <x-checkin.checked-out-from :target="$asset" />
<x-input.quantity
name="checkin_qty"
diff --git a/resources/views/hardware/checkin.blade.php b/resources/views/hardware/checkin.blade.php
index 85a90ec2da..913afb08af 100755
--- a/resources/views/hardware/checkin.blade.php
+++ b/resources/views/hardware/checkin.blade.php
@@ -76,6 +76,8 @@
</x-form.row>
@endif
+ <x-checkin.checked-out-from :target="$asset->assignedTo" />
+
{{-- Asset name --}}
<x-form.row
:label="trans('general.name')"