From 380c6171b73d98d49ee7fe8ef792c3d595ce4b0d Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 12 Jan 2021 18:02:10 -0800 Subject: [PATCH] Check if the asset is deployed before prompting for an expected checkin date --- resources/views/hardware/edit.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php index 9c1010a36..f047bab5d 100755 --- a/resources/views/hardware/edit.blade.php +++ b/resources/views/hardware/edit.blade.php @@ -66,13 +66,13 @@ @include ('partials.forms.edit.status', [ 'required' => 'true']) - @if (!$item->id) @include ('partials.forms.checkout-selector', ['user_select' => 'true','asset_select' => 'true', 'location_select' => 'true', 'style' => 'display:none;']) @include ('partials.forms.edit.user-select', ['translated_name' => trans('admin/hardware/form.checkout_to'), 'fieldname' => 'assigned_user', 'style' => 'display:none;', 'required' => 'false']) @include ('partials.forms.edit.asset-select', ['translated_name' => trans('admin/hardware/form.checkout_to'), 'fieldname' => 'assigned_asset', 'style' => 'display:none;', 'required' => 'false']) @include ('partials.forms.edit.location-select', ['translated_name' => trans('admin/hardware/form.checkout_to'), 'fieldname' => 'assigned_location', 'style' => 'display:none;', 'required' => 'false']) - @else + @elseif (($item->assignedTo) && ($item->deleted_at=='')) + @include ('partials.forms.edit.datepicker', ['translated_name' => trans('admin/hardware/form.expected_checkin'),'fieldname' => 'expected_checkin']) @endif