diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index dcbb4c137122..038b2ab7510b 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -16,25 +16,30 @@ @endcan @@ -46,23 +51,23 @@
@if (!$asset->model) -
-
-

NO MODEL ASSOCIATED

-

This will break things in weird and horrible ways. Edit this asset now to assign it a model.

-
+
+
+

NO MODEL ASSOCIATED

+

This will break things in weird and horrible ways. Edit this asset now to assign it a model.

+
@endif @if ($asset->deleted_at!='') -
-
- - WARNING: - This asset has been deleted. - You must restore it before you can assign it to someone. -
+
+
+ + WARNING: + This asset has been deleted. + You must restore it before you can assign it to someone.
+
@endif
@@ -74,25 +79,34 @@
@@ -559,40 +597,41 @@
@if ($asset->licenses->count() > 0) - - - - - - - - - - @foreach ($asset->licenseseats as $seat) - - - - - - @endforeach - -
{{ trans('general.name') }}{{ trans('admin/licenses/form.license_key') }}{{ trans('table.actions') }}
{{ $seat->license->name }} - @can('viewKeys', $seat->license) - {!! nl2br(e($seat->license->serial)) !!} - @else - ------------ - @endcan - - {{ trans('general.checkin') }} -
- @else + + + + + + + + + + @foreach ($asset->licenseseats as $seat) + + + + + + @endforeach + +
{{ trans('general.name') }}{{ trans('admin/licenses/form.license_key') }}{{ trans('table.actions') }}
{{ $seat->license->name }} + @can('viewKeys', $seat->license) + {!! nl2br(e($seat->license->serial)) !!} + @else + ------------ + @endcan + + {{ trans('general.checkin') }} +
+ @else -
-
- - {{ trans('general.no_results') }} -
+
+
+ + {{ trans('general.no_results') }}
+
@endif
@@ -601,48 +640,48 @@
-
- @if($asset->components->count() > 0) - - - - - - - - - @foreach ($asset->components as $component) - - - @if (is_null($component->deleted_at)) - - - - - purchase_cost ;?> - - - @endif - @endforeach - - - - - - - - -
{{ trans('general.name') }}{{ trans('general.qty') }}{{ trans('general.purchase_cost') }}
- {{ $component->name }} - {{ $component->pivot->assigned_qty }}{{ $component->purchase_cost }}
- {{ $totalCost }}
- @else -
- - {{ trans('general.no_results') }} -
- @endif +
+ @if($asset->components->count() > 0) + + + + + + + + + @foreach ($asset->components as $component) + + + @if (is_null($component->deleted_at)) + + + + + purchase_cost; ?> + + + @endif + @endforeach + + + + + + + + +
{{ trans('general.name') }}{{ trans('general.qty') }}{{ trans('general.purchase_cost') }}
+ {{ $component->name }} + {{ $component->pivot->assigned_qty }}{{ $component->purchase_cost }}
+ {{ $totalCost }}
+ @else +
+ + {{ trans('general.no_results') }}
+ @endif +
@@ -667,21 +706,13 @@
- $asset->id, 'assigned_type' => 'App\Models\Asset']) }}" + data-export-options='{ "fileName": "export-assets-{{ str_slug($asset->name) }}-assets-{{ date('Y-m-d') }}", "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"] }'> @@ -699,32 +730,24 @@ class="table table-striped snipe-table"
- @can('update', \App\Models\Asset::class) - - @endcan + @can('update', \App\Models\Asset::class) + + @endcan -
asset_tag }}-maintenances", "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"] - }' - data-url="{{ route('api.maintenances.index', array('asset_id' => $asset->id)) }}" - data-cookie-id-table="assetMaintenancesTable"> -
+ }' data-url="{{ route('api.maintenances.index', array('asset_id' => $asset->id)) }}" + data-cookie-id-table="assetMaintenancesTable"> +
@@ -733,40 +756,38 @@ class="table table-striped snipe-table"
- id }}-history", "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"] }' - - data-url="{{ route('api.activity.index', ['item_id' => $asset->id, 'item_type' => 'asset']) }}" - data-cookie-id-table="assetHistory"> + data-url="{{ route('api.activity.index', ['item_id' => $asset->id, 'item_type' => 'asset']) }}" + data-cookie-id-table="assetHistory"> - - - - - - - - - @if ($snipeSettings->require_accept_signature=='1') - - @endif - - - + + + + + + + + + @if ($snipeSettings->require_accept_signature=='1') + + @endif + + +
{{ trans('general.date') }}{{ trans('general.admin') }}{{ trans('general.action') }}{{ trans('general.item') }}{{ trans('general.target') }}{{ trans('general.notes') }}{{ trans('general.signature') }}{{ trans('general.download') }}Changed
{{ trans('general.date') }} + {{ trans('general.admin') }}{{ trans('general.action') }}{{ trans('general.item') }}{{ trans('general.target') }}{{ trans('general.notes') }}{{ trans('general.signature') }}{{ trans('general.download') }} + Changed
@@ -777,80 +798,84 @@ class="table table-striped snipe-table"
- id }}-files", "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"] - }' - data-cookie-id-table="assetFileHistory"> + }' data-cookie-id-table="assetFileHistory"> - - - - - - + + + + + + @if ($asset->uploads->count() > 0) - @foreach ($asset->uploads as $file) - - - - - - - - - + @foreach ($asset->uploads as $file) + + + + + + - - - @endforeach + + + + + + @endforeach @else - - - + + + @endif
{{ trans('general.notes') }}{{ trans('general.image') }}{{ trans('general.file_name') }}{{ trans('general.download') }}{{ trans('general.created_at') }}{{ trans('table.actions') }} + {{ trans('general.notes') }} + {{ trans('general.image') }} + {{ trans('general.file_name') }} + {{ trans('general.download') }} + {{ trans('general.created_at') }} + {{ trans('table.actions') }}
- @if ($file->note) - {{ $file->note }} - @endif - - @if ( \App\Helpers\Helper::checkUploadIsImage($file->get_src('assets'))) - - - - @endif - - {{ $file->filename }} - - @if ($file->filename) - - @endif - - @if ($file->created_at) - {{ \App\Helpers\Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }} - @endif -
+ @if ($file->note) + {{ $file->note }} + @endif + + @if ( \App\Helpers\Helper::checkUploadIsImage($file->get_src('assets'))) + + + + @endif + + {{ $file->filename }} + + @if ($file->filename) + + @endif + - @can('update', \App\Models\Asset::class) - - @endcan -
+ @if ($file->created_at) + {{ \App\Helpers\Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }} + @endif + + @can('update', \App\Models\Asset::class) + + @endcan +
- {{ trans('general.no_results') }} -
+ {{ trans('general.no_results') }} +
@@ -863,12 +888,12 @@ class="table table-striped snipe-table"
@can('update', \App\Models\Asset::class) - @include ('modals.upload-file', ['item_type' => 'asset', 'item_id' => $asset->id]) +@include ('modals.upload-file', ['item_type' => 'asset', 'item_id' => $asset->id]) @endcan @stop @section('moar_scripts') - @include ('partials.bootstrap-table') +@include ('partials.bootstrap-table') @stop