-
-
+
- + + {{ $asset->assignedTo->email }} + + @endif + + @if ((isset($asset->assignedTo)) && ($asset->assignedTo->phone!='')) +
- + + {{ $asset->assignedTo->phone }} + + @endif + + @if((isset($asset->assignedTo)) && ($asset->assignedTo->department)) +
- {{ trans('admin/hardware/general.user_department') }}: {{ $asset->assignedTo->department->name}} + @endif + + @if (isset($asset->location)) +
- {{ $asset->location->name }} +
- {{ $asset->location->address }} + @if ($asset->location->address2!='') + {{ $asset->location->address2 }} + @endif + + +
- {{ $asset->location->city }} + @if (($asset->location->city!='') && ($asset->location->state!='')) + , + @endif + {{ $asset->location->state }} {{ $asset->location->zip }} + + @endif +
- + {{ trans('admin/hardware/form.checkout_date') }}: {{ Helper::getFormattedDateObject($asset->last_checkout, 'date', false) }} + + @if (isset($asset->expected_checkin)) +
- + {{ trans('admin/hardware/form.expected_checkin') }}: {{ Helper::getFormattedDateObject($asset->expected_checkin, 'date', false) }} + + @endif +
- {{ $asset->model->manufacturer->name }} @endcan - @if (($asset->model) && ($asset->model->manufacturer) && ($asset->model->manufacturer->url!='')) + @if (($asset->model) && ($asset->model->manufacturer) && ($asset->model->manufacturer->url!=''))
-
@@ -353,12 +499,12 @@
@endif
-+{{ trans('general.category') }}-+@if (($asset->model) && ($asset->model->category)) @can('view', \App\Models\Category::class) @@ -377,12 +523,12 @@ @if ($asset->model)-+{{ trans('admin/hardware/form.model') }}-+@if ($asset->model) @can('view', \App\Models\AssetModel::class) @@ -399,22 +545,22 @@ @endif-+{{ trans('admin/models/table.modelnumber') }}-+{{ ($asset->model) ? $asset->model->model_number : ''}}-+{{ trans('general.byod') }}-+@@ -422,12 +568,12 @@ @if (($asset->model) && ($asset->model->fieldset)) @foreach($asset->model->fieldset->fields as $field){!! ($asset->byod=='1') ? ' '.trans('general.yes') : ' '.trans('general.no') !!}-+{{ $field->name }}-+@if (($field->field_encrypted=='1') && ($asset->{$field->db_column_name()}!='')) @endif @@ -435,23 +581,23 @@ @if ($field->isFieldDecryptable($asset->{$field->db_column_name()} )) @can('assets.view.encrypted_custom_fields') @php - $fieldSize=strlen(Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()})) + $fieldSize=strlen(Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()})) @endphp @if ($fieldSize>0) {{ str_repeat('*', $fieldSize) }} @if (($field->format=='URL') && ($asset->{$field->db_column_name()}!='')) - {{ Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }} - @elseif (($field->format=='DATE') && ($asset->{$field->db_column_name()}!='')) - {{ \App\Helpers\Helper::gracefulDecrypt($field, \App\Helpers\Helper::getFormattedDateObject($asset->{$field->db_column_name()}, 'date', false)) }} - @else - {{ Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }} - @endif + {{ Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }} + @elseif (($field->format=='DATE') && ($asset->{$field->db_column_name()}!='')) + {{ \App\Helpers\Helper::gracefulDecrypt($field, \App\Helpers\Helper::getFormattedDateObject($asset->{$field->db_column_name()}, 'date', false)) }} + @else + {{ Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }} + @endif {{ trans('general.copy_to_clipboard') }} - @endif + @endif @else {{ strtoupper(trans('admin/custom_fields/general.encrypted')) }} @endcan @@ -480,12 +626,12 @@ @if ($asset->purchase_date)-+{{ trans('admin/hardware/form.date') }}-+{{ Helper::getFormattedDateObject($asset->purchase_date, 'date', false) }} - {{ Carbon::parse($asset->purchase_date)->diff(Carbon::now())->format('%y years, %m months and %d days')}} @@ -496,12 +642,12 @@ @if ($asset->purchase_cost)-+{{ trans('admin/hardware/form.cost') }}-+@if (($asset->id) && ($asset->location)) {{ $asset->location->currency }} @elseif (($asset->id) && ($asset->location)) @@ -516,12 +662,12 @@ @endif @if(($asset->components->count() > 0) && ($asset->purchase_cost))-+{{ trans('admin/hardware/table.components_cost') }}-+@if (($asset->id) && ($asset->location)) {{ $asset->location->currency }} @elseif (($asset->id) && ($asset->location)) @@ -535,20 +681,20 @@ @endif @if (($asset->model) && ($asset->depreciation) && ($asset->purchase_date))-+{{ trans('admin/hardware/table.current_value') }}-- @if (($asset->id) && ($asset->location)) - {{ $asset->location->currency }} - @elseif (($asset->id) && ($asset->location)) - {{ $asset->location->currency }} - @else - {{ $snipeSettings->default_currency }} - @endif - {{ Helper::formatCurrencyOutput($asset->getDepreciatedValue() )}} ++ @if (($asset->id) && ($asset->location)) + {{ $asset->location->currency }} + @elseif (($asset->id) && ($asset->location)) + {{ $asset->location->currency }} + @else + {{ $snipeSettings->default_currency }} + @endif + {{ Helper::formatCurrencyOutput($asset->getDepreciatedValue() )}}@@ -556,12 +702,12 @@ @endif @if ($asset->order_number)-+{{ trans('general.order_number') }}- @@ -569,12 +715,12 @@ @if ($asset->supplier)-+{{ trans('general.supplier') }}-+@can ('superuser') {{ $asset->supplier->name }} @@ -589,12 +735,12 @@ @if ($asset->warranty_months)-+{{ trans('admin/hardware/form.warranty') }}-+-{{ $asset->warranty_months }} {{ trans('admin/hardware/form.months') }} @@ -606,53 +752,53 @@-- - {{ trans('admin/hardware/form.warranty_expires') }} - @if ($asset->purchase_date) - {!! $asset->present()->warranty_expires() < date("Y-m-d") ? '' : '' !!} - @endif - - --+@endif @if (($asset->model) && ($asset->depreciation))+++ + {{ trans('admin/hardware/form.warranty_expires') }} @if ($asset->purchase_date) + {!! $asset->present()->warranty_expires() < date("Y-m-d") ? '' : '' !!} + @endif + + +++ @if ($asset->purchase_date) {{ Helper::getFormattedDateObject($asset->present()->warranty_expires(), 'date', false) }} - {{ Carbon::parse($asset->present()->warranty_expires())->diffForHumans(['parts' => 2]) }} - @else - {{ trans('general.na_no_purchase_date') }} - @endif -+ @else + {{ trans('general.na_no_purchase_date') }} + @endif-+{{ trans('general.depreciation') }}-+{{ $asset->depreciation->name }} ({{ $asset->depreciation->months }} {{ trans('admin/hardware/form.months') }})-+{{ trans('admin/hardware/form.fully_depreciated') }}-+@if ($asset->purchase_date) - {{ Helper::getFormattedDateObject($asset->depreciated_date()->format('Y-m-d'), 'date', false) }} - - - {{ Carbon::parse($asset->depreciated_date())->diffForHumans(['parts' => 2]) }} + {{ Helper::getFormattedDateObject($asset->depreciated_date()->format('Y-m-d'), 'date', false) }} + - + {{ Carbon::parse($asset->depreciated_date())->diffForHumans(['parts' => 2]) }} @else {{ trans('general.na_no_purchase_date') }} @endif @@ -663,12 +809,12 @@ @if (($asset->asset_eol_date) && ($asset->purchase_date))-+{{ trans('admin/hardware/form.eol_rate') }}-+{{ Carbon::parse($asset->asset_eol_date)->diffInMonths($asset->purchase_date) }} {{ trans('admin/hardware/form.months') }} @@ -677,19 +823,19 @@ @endif @if ($asset->asset_eol_date)-+{{ trans('admin/hardware/form.eol_date') }} @if ($asset->purchase_date) - {!! $asset->asset_eol_date < date("Y-m-d") ? '' : '' !!} + {!! $asset->asset_eol_date < date("Y-m-d") ? '' : '' !!} @endif-+@if ($asset->asset_eol_date) - {{ Helper::getFormattedDateObject($asset->asset_eol_date, 'date', false) }} - - - {{ Carbon::parse($asset->asset_eol_date)->diffForHumans(['parts' => 2]) }} + {{ Helper::getFormattedDateObject($asset->asset_eol_date, 'date', false) }} + - + {{ Carbon::parse($asset->asset_eol_date)->diffForHumans(['parts' => 2]) }} @else {{ trans('general.na_no_purchase_date') }} @endif @@ -708,24 +854,24 @@-+{{ trans('admin/hardware/form.notes') }}-+@if ($asset->location){!! nl2br(Helper::parseEscapedMarkedownInline($asset->notes)) !!}-+{{ trans('general.location') }}-+@can('superuser') {{ $asset->location->name }} @@ -739,12 +885,12 @@ @if ($asset->defaultLoc)-+{{ trans('admin/hardware/form.default_location') }}-+@can('superuser') {{ $asset->defaultLoc->name }} @@ -758,12 +904,12 @@ @if ($asset->created_at!='')-+{{ trans('general.created_at') }}-+@@ -771,266 +917,115 @@ @if ($asset->updated_at!=''){{ Helper::getFormattedDateObject($asset->created_at, 'datetime', false) }}-+{{ trans('general.updated_at') }}-+@endif - @if ($asset->last_checkout!='') + @if ($asset->last_checkout!=''){{ Helper::getFormattedDateObject($asset->updated_at, 'datetime', false) }}-+{{ trans('admin/hardware/table.checkout_date') }}-+- @endif - @if ($asset->expected_checkin!='') + @endif + @if ($asset->expected_checkin!=''){{ Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }}-+{{ trans('admin/hardware/form.expected_checkin') }}-+- @endif + @endif - @if ($asset->last_checkin!='') -{{ Helper::getFormattedDateObject($asset->expected_checkin, 'date', false) }}-- - {{ trans('admin/hardware/table.last_checkin_date') }} - --- {{ Helper::getFormattedDateObject($asset->last_checkin, 'datetime', false) }} -+ @if ($asset->last_checkin!='') +++ @endif+ + {{ trans('admin/hardware/table.last_checkin_date') }} +- @endif ++ {{ Helper::getFormattedDateObject($asset->last_checkin, 'datetime', false) }} ++-++{{ trans('general.checkouts_count') }}-+{{ ($asset->checkouts) ? (int) $asset->checkouts->count() : '0' }}-+++{{ trans('general.checkins_count') }}-+{{ ($asset->checkins) ? (int) $asset->checkins->count() : '0' }}-- + ++-{{ trans('general.user_requests_count') }}-+{{ ($asset->userRequests) ? (int) $asset->userRequests->count() : '0' }}-- -+- -- Labels + Labels-+-{{ Form::open([ 'method' => 'POST', 'route' => ['hardware/bulkedit'], 'class' => 'form-inline', 'id' => 'bulkForm']) }} - - - + + + {{ Form::close() }}- - @if (($asset->image) || (($asset->model) && ($asset->model->image!=''))) --- -- @else - - @endif - - - - @if (($asset->assetstatus) && ($asset->assetstatus->deployable=='1')) - @if (($asset->assigned_to != '') && ($asset->deleted_at=='')) - @can('checkin', \App\Models\Asset::class) -
- -
- model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}> - - -- @endcan - @elseif (($asset->assigned_to == '') && ($asset->deleted_at=='')) - @can('checkout', \App\Models\Asset::class) -- model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}> - - -- @endcan - @endif - @endif - - - @can('update', $asset) - @if ($asset->deleted_at=='') -- -- @endif - @endcan - - @can('create', $asset) -- -- @endcan - - @can('audit', \App\Models\Asset::class) -- model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}> - - -- @endcan - - @can('delete', $asset) -- @if ($asset->deleted_at=='') - - {{ trans('general.delete') }} - @else - - @endif -- @endcan - - @if (($asset->assignedTo) && ($asset->deleted_at=='')) --- - @endif - - @if ($snipeSettings->qr_code=='1') -- {{ trans('admin/hardware/form.checkedout_to') }} -
-- @if (($asset->checkedOutToUser()) && ($asset->assignedTo->present()->gravatar())) -
- {!! $asset->assignedTo->present()->glyph() . ' ' .$asset->assignedTo->present()->nameUrl() !!} - - -- @endif -
-
- @if ((isset($asset->assignedTo->email)) && ($asset->assignedTo->email!=''))
-
- - - {{ $asset->assignedTo->email }} - - @endif - - @if ((isset($asset->assignedTo)) && ($asset->assignedTo->phone!='')) -
- - - {{ $asset->assignedTo->phone }} - - @endif - - @if((isset($asset->assignedTo)) && ($asset->assignedTo->department)) -
- {{ trans('admin/hardware/general.user_department') }}: {{ $asset->assignedTo->department->name}} - @endif - - @if (isset($asset->location)) -
- {{ $asset->location->name }} -
- {{ $asset->location->address }} - @if ($asset->location->address2!='') - {{ $asset->location->address2 }} - @endif - - -
- {{ $asset->location->city }} - @if (($asset->location->city!='') && ($asset->location->state!='')) - , - @endif - {{ $asset->location->state }} {{ $asset->location->zip }} - - @endif -
- - {{ trans('admin/hardware/form.checkout_date') }}: {{ Helper::getFormattedDateObject($asset->last_checkout, 'date', false) }} - - @if (isset($asset->expected_checkin)) -
- - {{ trans('admin/hardware/form.expected_checkin') }}: {{ Helper::getFormattedDateObject($asset->expected_checkin, 'date', false) }} - - @endif -
-- @endif - --
@@ -1095,7 +1090,7 @@- + @foreach ($asset->components as $component) @@ -1111,7 +1106,7 @@ {{ trans('general.checkin') }} - purchase_cost *$component->pivot->assigned_qty) ?> + purchase_cost *$component->pivot->assigned_qty) ?> @endif @endforeach @@ -1209,9 +1204,9 @@ - @endcan + @endcan - + - -
- - - + data-url="{{ route('api.activity.index', ['item_id' => $asset->id, 'item_type' => 'asset']) }}" + data-cookie-id-table="assetHistory" + data-cookie="true"> + +- - -{{ trans('admin/hardware/table.icon') }} -{{ trans('general.date') }} -{{ trans('general.admin') }} -{{ trans('general.action') }} -{{ trans('general.file_name') }} -{{ trans('general.item') }} -{{ trans('general.target') }} -{{ trans('general.notes') }} -{{ trans('general.signature') }} -{{ trans('general.download') }} -{{ trans('admin/hardware/table.changed')}} -{{ trans('admin/settings/general.login_ip') }} -{{ trans('admin/settings/general.login_user_agent') }} -{{ trans('general.action_source') }} -+ + + + + + -{{ trans('admin/hardware/table.icon') }} +{{ trans('general.date') }} +{{ trans('general.admin') }} +{{ trans('general.action') }} +{{ trans('general.file_name') }} +{{ trans('general.item') }} +{{ trans('general.target') }} +{{ trans('general.notes') }} +{{ trans('general.signature') }} +{{ trans('general.download') }} +{{ trans('admin/hardware/table.changed')}} +{{ trans('admin/settings/general.login_ip') }} +{{ trans('admin/settings/general.login_user_agent') }} +{{ trans('general.action_source') }} +--+++- @if ($asset->uploads->count() > 0) -id }}-files", "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"] }' @@ -1335,9 +1330,9 @@
@if (Storage::exists('private_uploads/assets/'.$file->filename)) - {{ $file->filename }} + {{ $file->filename }} @else - {{ $file->filename }}+{{ $file->filename }}@endif@@ -1386,6 +1381,7 @@ + @can('view', $asset->model) - - - - + @endcan + + + @can('update', \App\Models\Asset::class) @include ('modals.upload-file', ['item_type' => 'asset', 'item_id' => $asset->id]) @endcan - @stop -@section('moar_scripts') - + @include ('partials.bootstrap-table') -@stop +@stop \ No newline at end of file diff --git a/routes/web/hardware.php b/routes/web/hardware.php index 7833f0fda..ee888aa1d 100644 --- a/routes/web/hardware.php +++ b/routes/web/hardware.php @@ -78,17 +78,14 @@ Route::group( [AssetsController::class, 'getAssetBySerial'] )->where('any', '.*')->name('findbyserial/hardware'); - Route::get('{assetId}/clone', + Route::get('{asset}/clone', [AssetsController::class, 'getClone'] - )->name('clone/hardware'); + )->name('clone/hardware')->withTrashed(); Route::get('{assetId}/label', [AssetsController::class, 'getLabel'] )->name('label/hardware'); - - Route::post('{assetId}/clone', - [AssetsController::class, 'postCreate'] - ); + Route::get('{assetId}/checkout', [AssetCheckoutController::class, 'create'] diff --git a/tests/Feature/Assets/Ui/CloneAssetTest.php b/tests/Feature/Assets/Ui/CloneAssetTest.php new file mode 100644 index 000000000..18e1ccc5e --- /dev/null +++ b/tests/Feature/Assets/Ui/CloneAssetTest.php @@ -0,0 +1,37 @@ +create(); + $this->actingAs(User::factory()->create()) + ->get(route('clone/hardware', $asset)) + ->assertForbidden(); + } + + public function testPageCanBeAccessed(): void + { + $asset = Asset::factory()->create(); + $response = $this->actingAs(User::factory()->createAssets()->create()) + ->get(route('clone/hardware', $asset)); + $response->assertStatus(200); + } + + public function testAssetCanBeCloned() + { + $asset_to_clone = Asset::factory()->create(['name'=>'Asset to clone']); + $this->actingAs(User::factory()->createAssets()->create()) + ->get(route('clone/hardware', $asset_to_clone)) + ->assertOk() + ->assertSee([ + 'Asset to clone' + ], false); + } +}@@ -1487,28 +1483,27 @@
-
-
-
+
+
+ @if ($asset->deleted_at!='')
+
+
+ @endif
+
+
+
+
+ {{ trans('admin/users/message.user_deleted_warning') }}
+
+
+
+
+
+
+
+
+
+ @if (($asset->image) || (($asset->model) && ($asset->model->image!='')))
+
+
+
+
+ @if (($asset->assetstatus) && ($asset->assetstatus->deployable=='1'))
+ @if (($asset->assigned_to != '') && ($asset->deleted_at==''))
+ @can('checkin', \App\Models\Asset::class)
+
+
+
+
+
+ @else
+
+ @endif
+
+ model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}>
+
+
+
+ @endcan
+ @elseif (($asset->assigned_to == '') && ($asset->deleted_at==''))
+ @can('checkout', \App\Models\Asset::class)
+
+ model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}>
+
+
+
+ @endcan
+ @endif
+ @endif
+
+ @if ($asset->deleted_at=='')
+ @can('update', $asset)
+
+
+
+ @endcan
+
+ @can('audit', \App\Models\Asset::class)
+
+ model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}>
+
+
+
+ @endcan
+ @endif
+
+ @can('create', $asset)
+
+
+
+ @endcan
+
+ @can('delete', $asset)
+
+ @if ($asset->deleted_at=='')
+
+ {{ trans('general.delete') }}
+ @else
+
+ @endif
+
+ @endcan
+
+ @if (($asset->assignedTo) && ($asset->deleted_at==''))
+
+
+
+ @endif
+ + {{ trans('admin/hardware/form.checkedout_to') }} +
+
+ @if (($asset->checkedOutToUser()) && ($asset->assignedTo->present()->gravatar()))
+
-
+ @if ((isset($asset->assignedTo->email)) && ($asset->assignedTo->email!=''))
+
+
+
+
-
-
@if ($asset->deleted_at!='')
-
+
{{ trans('general.deleted') }}
-
+
{{ \App\Helpers\Helper::getFormattedDateObject($asset->deleted_at, 'date', false) }}
@@ -180,10 +326,10 @@
@if ($asset->assetstatus)
-
+
{{ trans('general.status') }}
-
+
@if (($asset->assignedTo) && ($asset->deleted_at==''))
{{ $asset->assetstatus->name }}
@@ -211,10 +357,10 @@
@if ($asset->company)
-
+
{{ trans('general.company') }}
-
@@ -222,10 +368,10 @@
@if ($asset->name)
-
+
{{ trans('admin/hardware/form.name') }}
-
+
@@ -233,10 +379,10 @@
@if ($asset->serial)
{{ $asset->name }}
-
+
{{ trans('admin/hardware/form.serial') }}
-
+
{{ $asset->serial }}
@@ -248,12 +394,12 @@
@if ((isset($audit_log)) && ($audit_log->created_at))
-
+
{{ trans('general.last_audit') }}
-
+
{!! $asset->checkInvalidNextAuditDate() ? '' : '' !!}
{{ Helper::getFormattedDateObject($audit_log->created_at, 'date', false) }}
@if ($audit_log->user)
@@ -266,12 +412,12 @@
@if ($asset->next_audit_date)
-
+
{{ trans('general.next_audit_date') }}
-
+
{!! $asset->checkInvalidNextAuditDate() ? '' : '' !!}
{{ Helper::getFormattedDateObject($asset->next_audit_date, 'date', false) }}
@@ -280,12 +426,12 @@
@if (($asset->model) && ($asset->model->manufacturer))
-
+
{{ trans('admin/hardware/form.manufacturer') }}
-
+
-
@can('view', \App\Models\Manufacturer::class)
@@ -299,7 +445,7 @@