diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php index dc1bee4c8..198729e47 100755 --- a/resources/views/licenses/view.blade.php +++ b/resources/views/licenses/view.blade.php @@ -38,90 +38,36 @@
-
- +
+ +
+
- - - - - - + + + + + + + - - @if ($license->licenseseats) - @foreach ($license->licenseseats as $licensedto) - - - - - - - - @endforeach - @endif -
{{ trans('admin/licenses/general.seat') }}{{ trans('admin/licenses/general.user') }}{{ trans('admin/licenses/form.asset') }}
{{ trans('admin/licenses/general.seat') }}{{ trans('admin/licenses/general.user') }}{{ trans('admin/licenses/form.asset') }}{{ trans('general.location') }}Checkin/Checkout
Seat {{ $count }} - @if (($licensedto->user) && ($licensedto->deleted_at == NULL)) - @can('users.view') - - - {{ $licensedto->user->present()->fullName() }} - - @else - - {{ $licensedto->user->present()->fullName() }} - @endcan - - @elseif (($licensedto->user) && ($licensedto->deleted_at != NULL)) - - {{ $licensedto->user->present()->fullName() }} - - @endif - - @if ($licensedto->asset) - - @can('view', $licensedto->asset) - - - {{ $licensedto->asset->name }} {{ $licensedto->asset->asset_tag }} - - @else - - {{ $licensedto->asset->name }} {{ $licensedto->asset->asset_tag }} - @endcan - - @if ($licensedto->asset->location) - @can('locations.view') - ({!! $licensedto->asset->location->present()->nameUrl() !!}) - @else - ({{ $licensedto->asset->location->present()->name() }}) - @endcan - @endif - - @endif - - @can('checkout', $license) - @if (($licensedto->assigned_to) || ($licensedto->asset_id)) - @if ($license->reassignable) - - {{ trans('general.checkin') }} - - @else - Assigned - @endif - @else - - {{ trans('general.checkout') }} - - @endif - @endcan -
+
+
-
+
@@ -318,7 +264,7 @@ - + @@ -423,7 +369,7 @@ @section('moar_scripts') - @include ('partials.bootstrap-table', ['simple_view' => true]) + @include ('partials.bootstrap-table') @stop
{{ trans('general.notes') }}{{ trans('general.file_name') }}{{ trans('general.file_name') }}