From 95a0f3dbe5d307feb1965a264d615a8f91b58abc Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 24 Jul 2024 17:26:55 +0100
Subject: [PATCH] Cleaned up UI on asset view

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/hardware/view.blade.php | 759 ++++++++++++------------
 1 file changed, 383 insertions(+), 376 deletions(-)

diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index c1a0a7d9f4..c86d9fd568 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -9,12 +9,13 @@
 {{-- Page content --}}
 @section('content')
 
+
     <div class="row">
 
         @if (!$asset->model)
             <div class="col-md-12">
                 <div class="callout callout-danger">
-                      <p><strong>{{ trans('admin/models/message.no_association') }}</strong> {{ trans('admin/models/message.no_association_fix') }}</p>
+                    <p><strong>{{ trans('admin/models/message.no_association') }}</strong> {{ trans('admin/models/message.no_association_fix') }}</p>
                 </div>
             </div>
         @endif
@@ -46,19 +47,17 @@
             </div>
         @endif
 
+
         <div class="col-md-12">
-
-
-            <!-- Custom Tabs -->
             <div class="nav-tabs-custom">
-                <ul class="nav nav-tabs">
+                <ul class="nav nav-tabs hidden-print">
 
                     <li class="active">
                         <a href="#details" data-toggle="tab">
                           <span class="hidden-lg hidden-md">
                           <i class="fas fa-info-circle fa-2x"></i>
                           </span>
-                          <span class="hidden-xs hidden-sm">{{ trans('admin/users/general.info') }}</span>
+                            <span class="hidden-xs hidden-sm">{{ trans('admin/users/general.info') }}</span>
                         </a>
                     </li>
 
@@ -67,8 +66,8 @@
                           <span class="hidden-lg hidden-md">
                             <i class="far fa-save fa-2x" aria-hidden="true"></i>
                           </span>
-                          <span class="hidden-xs hidden-sm">{{ trans('general.licenses') }}
-                            {!! ($asset->licenses->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->licenses->count()).'</span>' : '' !!}
+                            <span class="hidden-xs hidden-sm">{{ trans('general.licenses') }}
+                                {!! ($asset->licenses->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->licenses->count()).'</span>' : '' !!}
                           </span>
                         </a>
                     </li>
@@ -78,8 +77,8 @@
                           <span class="hidden-lg hidden-md">
                             <i class="far fa-hdd fa-2x" aria-hidden="true"></i>
                           </span>
-                          <span class="hidden-xs hidden-sm">{{ trans('general.components') }}
-                            {!! ($asset->components->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->components->count()).'</span>' : '' !!}
+                            <span class="hidden-xs hidden-sm">{{ trans('general.components') }}
+                                {!! ($asset->components->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->components->count()).'</span>' : '' !!}
                           </span>
                         </a>
                     </li>
@@ -89,8 +88,8 @@
                           <span class="hidden-lg hidden-md">
                             <i class="fas fa-barcode fa-2x" aria-hidden="true"></i>
                           </span>
-                          <span class="hidden-xs hidden-sm">{{ trans('general.assets') }}
-                            {!! ($asset->assignedAssets()->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->assignedAssets()->count()).'</span>' : '' !!}
+                            <span class="hidden-xs hidden-sm">{{ trans('general.assets') }}
+                                {!! ($asset->assignedAssets()->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->assignedAssets()->count()).'</span>' : '' !!}
 
                           </span>
                         </a>
@@ -102,7 +101,7 @@
                           <span class="hidden-lg hidden-md">
                             <i class="fas fa-history fa-2x" aria-hidden="true"></i>
                           </span>
-                          <span class="hidden-xs hidden-sm">{{ trans('general.history') }}
+                            <span class="hidden-xs hidden-sm">{{ trans('general.history') }}
                           </span>
                         </a>
                     </li>
@@ -112,8 +111,8 @@
                           <span class="hidden-lg hidden-md">
                             <i class="fas fa-wrench fa-2x" aria-hidden="true"></i>
                           </span>
-                          <span class="hidden-xs hidden-sm">{{ trans('general.maintenances') }}
-                            {!! ($asset->assetmaintenances()->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->assetmaintenances()->count()).'</span>' : '' !!}
+                            <span class="hidden-xs hidden-sm">{{ trans('general.maintenances') }}
+                                {!! ($asset->assetmaintenances()->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->assetmaintenances()->count()).'</span>' : '' !!}
                           </span>
                         </a>
                     </li>
@@ -123,23 +122,25 @@
                           <span class="hidden-lg hidden-md">
                             <i class="far fa-file fa-2x" aria-hidden="true"></i>
                           </span>
-                          <span class="hidden-xs hidden-sm">{{ trans('general.files') }}
-                            {!! ($asset->uploads->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->uploads->count()).'</span>' : '' !!}
+                            <span class="hidden-xs hidden-sm">{{ trans('general.files') }}
+                                {!! ($asset->uploads->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->uploads->count()).'</span>' : '' !!}
                           </span>
                         </a>
                     </li>
 
+                    @can('view', $asset->model)
                     <li>
-                    <a href="#modelfiles" data-toggle="tab">
+                        <a href="#modelfiles" data-toggle="tab">
                           <span class="hidden-lg hidden-md">
                               <i class="fa-solid fa-laptop-file fa-2x" aria-hidden="true"></i>
                           </span>
-                        <span class="hidden-xs hidden-sm">
+                            <span class="hidden-xs hidden-sm">
                             {{ trans('general.additional_files') }}
-                            {!! ($asset->model) && ($asset->model->uploads->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->model->uploads->count()).'</span>' : '' !!}
+                                {!! ($asset->model) && ($asset->model->uploads->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->model->uploads->count()).'</span>' : '' !!}
                           </span>
-                    </a>
+                        </a>
                     </li>
+                    @endcan
 
 
                     @can('update', \App\Models\Asset::class)
@@ -151,24 +152,181 @@
                         </li>
                     @endcan
 
-
                 </ul>
 
                 <div class="tab-content">
-
                     <div class="tab-pane fade in active" id="details">
-                        <div class="row">
-                            <div class="col-md-8">
+                    <div class="row">
+
+                            @if ($asset->deleted_at!='')
+                                <div class="col-md-12">
+                                    <div class="callout callout-warning">
+                                        <i class="icon fas fa-exclamation-triangle"></i>
+                                        {{ trans('admin/users/message.user_deleted_warning') }}
+                                    </div>
+                                </div>
+                            @endif
+
+                            <!-- Start button column -->
+                            <div class="col-md-3 col-xs-12 col-sm-push-9">
+
+                                <div class="col-md-12 text-center">
+                                    @if (($asset->image) || (($asset->model) && ($asset->model->image!='')))
+                                        <div class="text-center col-md-12" style="padding-bottom: 15px;">
+                                            <a href="{{ ($asset->getImageUrl()) ? $asset->getImageUrl() : null }}" data-toggle="lightbox">
+                                                <img src="{{ ($asset->getImageUrl()) ? $asset->getImageUrl() : null }}" class="assetimg img-responsive" alt="{{ $asset->getDisplayNameAttribute() }}">
+                                            </a>
+                                        </div>
+                                    @else
+                                        <!-- generic image goes here -->
+                                    @endif
+                                </div>
+
+
+
+                                @if (($asset->assetstatus) && ($asset->assetstatus->deployable=='1'))
+                                    @if (($asset->assigned_to != '') && ($asset->deleted_at==''))
+                                        @can('checkin', \App\Models\Asset::class)
+                                            <div class="col-md-12">
+                                                    <span class="tooltip-wrapper"{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}>
+                                                        <a role="button" href="{{ route('hardware.checkin.create', $asset->id) }}" class="btn btn-sm btn-primary btn-block hidden-print{{ (!$asset->model ? ' disabled' : '') }}">
+                                                        {{ trans('admin/hardware/general.checkin') }}
+                                                    </a>
+                                                    </span>
+                                            </div>
+                                        @endcan
+                                    @elseif (($asset->assigned_to == '') && ($asset->deleted_at==''))
+                                        @can('checkout', \App\Models\Asset::class)
+                                            <div class="col-md-12" style="padding-top: 5px;">
+                                                    <span class="tooltip-wrapper"{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}>
+                                                        <a href="{{ route('hardware.checkout.create', $asset->id)  }}" class="btn btn-sm btn-primary btn-block hidden-print{{ (!$asset->model ? ' disabled' : '') }}">
+                                                        {{ trans('admin/hardware/general.checkout') }}
+                                                    </a>
+                                                    </span>
+                                            </div>
+                                        @endcan
+                                    @endif
+                                @endif
+
+
+                                @can('update', $asset)
+                                    @if ($asset->deleted_at=='')
+                                        <div class="col-md-12" style="padding-top: 5px;">
+                                            <a href="{{ route('hardware.edit', $asset->id) }}" class="btn btn-sm btn-primary btn-block hidden-print">
+                                                {{ trans('admin/hardware/general.edit') }}
+                                            </a>
+                                        </div>
+                                    @endif
+                                @endcan
+
+                                @can('create', $asset)
+                                    <div class="col-md-12" style="padding-top: 5px;">
+                                        <a href="{{ route('clone/hardware', $asset->id) }}" class="btn btn-sm btn-primary btn-block hidden-print">
+                                            {{ trans('admin/hardware/general.clone') }}
+                                        </a>
+                                    </div>
+                                @endcan
+
+                                @can('audit', \App\Models\Asset::class)
+                                    <div class="col-md-12" style="padding-top: 5px;">
+                                            <span class="tooltip-wrapper"{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}>
+                                                <a href="{{ route('asset.audit.create', $asset->id)  }}" class="btn btn-sm btn-primary btn-block hidden-print{{ (!$asset->model ? ' disabled' : '') }}">
+                                                 {{ trans('general.audit') }}
+                                            </a>
+                                            </span>
+                                    </div>
+                                @endcan
+
+                                @can('delete', $asset)
+                                    <div class="col-md-12" style="padding-top: 30px; padding-bottom: 30px;">
+                                        @if ($asset->deleted_at=='')
+                                            <button class="btn btn-sm btn-block btn-danger delete-asset" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $asset->asset_tag]) }}" data-target="#dataConfirmModal">{{ trans('general.delete') }}
+                                            </button>
+                                            <span class="sr-only">{{ trans('general.delete') }}</span>
+                                        @else
+                                            <form method="POST" action="{{ route('restore/hardware', ['assetId' => $asset->id]) }}">
+                                                @csrf
+                                                <button class="btn btn-sm btn-warning btn-block">{{ trans('general.restore') }}</button>
+                                            </form>
+                                        @endif
+                                    </div>
+                                @endcan
+
+                                @if (($asset->assignedTo) && ($asset->deleted_at==''))
+                                    <div class="col-md-12" style="text-align: left">
+                                        <h2>
+                                            {{ trans('admin/hardware/form.checkedout_to') }}
+                                        </h2>
+                                        <p>
+                                            @if (($asset->checkedOutToUser()) && ($asset->assignedTo->present()->gravatar()))
+                                                <img src="{{ $asset->assignedTo->present()->gravatar() }}" class="user-image-inline" alt="{{ $asset->assignedTo->present()->fullName() }}">
+                                            @endif
+                                        </p>
+                                        {!! $asset->assignedTo->present()->glyph() . ' ' .$asset->assignedTo->present()->nameUrl() !!}
+
+
+                                        <ul class="list-unstyled" style="line-height: 25px;">
+                                            @if ((isset($asset->assignedTo->email)) && ($asset->assignedTo->email!=''))
+                                                <li>
+                                                    <i class="far fa-envelope" aria-hidden="true"></i>
+                                                    <a href="mailto:{{ $asset->assignedTo->email }}">{{ $asset->assignedTo->email }}</a>
+                                                </li>
+                                            @endif
+
+                                            @if ((isset($asset->assignedTo)) && ($asset->assignedTo->phone!=''))
+                                                <li>
+                                                    <i class="fas fa-phone" aria-hidden="true"></i>
+                                                    <a href="tel:{{ $asset->assignedTo->phone }}">{{ $asset->assignedTo->phone }}</a>
+                                                </li>
+                                            @endif
+
+                                            @if((isset($asset->assignedTo)) && ($asset->assignedTo->department))
+                                                <li>{{ trans('admin/hardware/general.user_department') }}: {{ $asset->assignedTo->department->name}}</li>
+                                            @endif
+
+                                            @if (isset($asset->location))
+                                                <li><i class="fas fa-map-marker-alt" aria-hidden="true"></i> {{ $asset->location->name }}</li>
+                                                <li>{{ $asset->location->address }}
+                                                    @if ($asset->location->address2!='')
+                                                        {{ $asset->location->address2 }}
+                                                    @endif
+                                                </li>
+
+                                                <li>{{ $asset->location->city }}
+                                                    @if (($asset->location->city!='') && ($asset->location->state!=''))
+                                                        ,
+                                                    @endif
+                                                    {{ $asset->location->state }} {{ $asset->location->zip }}
+                                                </li>
+                                            @endif
+                                            <li>
+                                                <i class="fas fa-calendar"></i> {{ trans('admin/hardware/form.checkout_date') }}: {{ Helper::getFormattedDateObject($asset->last_checkout, 'date', false) }}
+                                            </li>
+                                            @if (isset($asset->expected_checkin))
+                                                <li>
+                                                    <i class="fas fa-calendar"></i> {{ trans('admin/hardware/form.expected_checkin') }}: {{ Helper::getFormattedDateObject($asset->expected_checkin, 'date', false) }}
+                                                </li>
+                                            @endif
+                                        </ul>
+                                    </div>
+
+                                @endif
+                              <br><br>
+                            </div>
+
+                            <!-- End button column -->
+
+                            <div class="col-md-9 col-xs-12 col-sm-pull-3">
+
+                                <div class="row-new-striped">
 
-                                <!-- start striped rows -->
-                                <div class="container row-striped">
 
                                     @if ($asset->deleted_at!='')
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <span class="text-danger"><strong>{{ trans('general.deleted') }}</strong></span>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 {{ \App\Helpers\Helper::getFormattedDateObject($asset->deleted_at, 'date', false) }}
 
                                             </div>
@@ -180,10 +338,10 @@
                                     @if ($asset->assetstatus)
 
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>{{ trans('general.status') }}</strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 @if (($asset->assignedTo) && ($asset->deleted_at==''))
                                                     <i class="fas fa-circle text-blue"></i>
                                                     {{ $asset->assetstatus->name }}
@@ -211,10 +369,10 @@
 
                                     @if ($asset->company)
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>{{ trans('general.company') }}</strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 <a href="{{ url('/companies/' . $asset->company->id) }}">{{ $asset->company->name }}</a>
                                             </div>
                                         </div>
@@ -222,10 +380,10 @@
 
                                     @if ($asset->name)
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>{{ trans('admin/hardware/form.name') }}</strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 {{ $asset->name }}
                                             </div>
                                         </div>
@@ -233,10 +391,10 @@
 
                                     @if ($asset->serial)
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>{{ trans('admin/hardware/form.serial') }}</strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 <span class="js-copy">{{ $asset->serial  }}</span>
 
                                                 <i class="fa-regular fa-clipboard js-copy-link" data-clipboard-target=".js-copy" aria-hidden="true" data-tooltip="true" data-placement="top" title="{{ trans('general.copy_to_clipboard') }}">
@@ -248,12 +406,12 @@
 
                                     @if ((isset($audit_log)) && ($audit_log->created_at))
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('general.last_audit') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 {!! $asset->checkInvalidNextAuditDate() ? '<i class="fas fa-exclamation-triangle text-orange" aria-hidden="true"></i>' : '' !!}
                                                 {{ Helper::getFormattedDateObject($audit_log->created_at, 'date', false) }}
                                                 @if ($audit_log->user)
@@ -266,12 +424,12 @@
 
                                     @if ($asset->next_audit_date)
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('general.next_audit_date') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 {!! $asset->checkInvalidNextAuditDate() ? '<i class="fas fa-exclamation-triangle text-orange" aria-hidden="true"></i>' : '' !!}
                                                 {{ Helper::getFormattedDateObject($asset->next_audit_date, 'date', false) }}
                                             </div>
@@ -280,12 +438,12 @@
 
                                     @if (($asset->model) && ($asset->model->manufacturer))
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('admin/hardware/form.manufacturer') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 <ul class="list-unstyled">
                                                     @can('view', \App\Models\Manufacturer::class)
 
@@ -299,7 +457,7 @@
                                                         <li> {{ $asset->model->manufacturer->name }}</li>
                                                     @endcan
 
-                                                        @if (($asset->model) && ($asset->model->manufacturer) &&  ($asset->model->manufacturer->url!=''))
+                                                    @if (($asset->model) && ($asset->model->manufacturer) &&  ($asset->model->manufacturer->url!=''))
                                                         <li>
                                                             <i class="fas fa-globe-americas" aria-hidden="true"></i>
                                                             <a href="{{ $asset->present()->dynamicUrl($asset->model->manufacturer->url) }}" target="_blank">
@@ -353,12 +511,12 @@
                                     @endif
 
                                     <div class="row">
-                                        <div class="col-md-2">
+                                        <div class="col-md-3">
                                             <strong>
                                                 {{ trans('general.category') }}
                                             </strong>
                                         </div>
-                                        <div class="col-md-6">
+                                        <div class="col-md-9">
                                             @if (($asset->model) && ($asset->model->category))
 
                                                 @can('view', \App\Models\Category::class)
@@ -377,12 +535,12 @@
 
                                     @if ($asset->model)
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('admin/hardware/form.model') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 @if ($asset->model)
 
                                                     @can('view', \App\Models\AssetModel::class)
@@ -399,22 +557,22 @@
                                     @endif
 
                                     <div class="row">
-                                        <div class="col-md-2">
+                                        <div class="col-md-3">
                                             <strong>
                                                 {{ trans('admin/models/table.modelnumber') }}
                                             </strong>
                                         </div>
-                                        <div class="col-md-6">
+                                        <div class="col-md-9">
                                             {{ ($asset->model) ? $asset->model->model_number : ''}}
                                         </div>
                                     </div>
 
                                     <!-- byod -->
                                     <div class="row">
-                                        <div class="col-md-2">
+                                        <div class="col-md-3">
                                             <strong>{{ trans('general.byod') }}</strong>
                                         </div>
-                                        <div class="col-md-6">
+                                        <div class="col-md-9">
                                             {!! ($asset->byod=='1') ? '<i class="fas fa-check text-success" aria-hidden="true"></i> '.trans('general.yes') : '<i class="fas fa-times text-danger" aria-hidden="true"></i> '.trans('general.no')  !!}
                                         </div>
                                     </div>
@@ -422,12 +580,12 @@
                                     @if (($asset->model) && ($asset->model->fieldset))
                                         @foreach($asset->model->fieldset->fields as $field)
                                             <div class="row">
-                                                <div class="col-md-2">
+                                                <div class="col-md-3">
                                                     <strong>
                                                         {{ $field->name }}
                                                     </strong>
                                                 </div>
-                                                <div class="col-md-6{{ (($field->format=='URL') && ($asset->{$field->db_column_name()}!='')) ? ' ellipsis': '' }}">
+                                                <div class="col-md-9{{ (($field->format=='URL') && ($asset->{$field->db_column_name()}!='')) ? ' ellipsis': '' }}">
                                                     @if (($field->field_encrypted=='1') && ($asset->{$field->db_column_name()}!=''))
                                                         <i class="fas fa-lock" data-tooltip="true" data-placement="top" title="{{ trans('admin/custom_fields/general.value_encrypted') }}" onclick="showHideEncValue(this)" id="text-{{ $field->id }}"></i>
                                                     @endif
@@ -435,23 +593,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)
                                                                 <span id="text-{{ $field->id }}-to-hide">{{ str_repeat('*', $fieldSize) }}</span>
                                                                 <span class="js-copy-{{ $field->id }}" id="text-{{ $field->id }}-to-show" style="font-size: 0px;">
                                                                 @if (($field->format=='URL') && ($asset->{$field->db_column_name()}!=''))
-                                                                    <a href="{{ Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }}" target="_new">{{ Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }}</a>
-                                                                @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
+                                                                        <a href="{{ Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }}" target="_new">{{ Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }}</a>
+                                                                    @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
                                                                 </span>
                                                                 <i class="fa-regular fa-clipboard js-copy-link" data-clipboard-target=".js-copy-{{ $field->id }}" aria-hidden="true" data-tooltip="true" data-placement="top" title="{{ trans('general.copy_to_clipboard') }}">
                                                                     <span class="sr-only">{{ trans('general.copy_to_clipboard') }}</span>
                                                                 </i>
-							    @endif
+                                                            @endif
                                                         @else
                                                             {{ strtoupper(trans('admin/custom_fields/general.encrypted')) }}
                                                         @endcan
@@ -480,12 +638,12 @@
 
                                     @if ($asset->purchase_date)
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('admin/hardware/form.date') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 {{ 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 +654,12 @@
 
                                     @if ($asset->purchase_cost)
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('admin/hardware/form.cost') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 @if (($asset->id) && ($asset->location))
                                                     {{ $asset->location->currency }}
                                                 @elseif (($asset->id) && ($asset->location))
@@ -516,12 +674,12 @@
                                     @endif
                                     @if(($asset->components->count() > 0) && ($asset->purchase_cost))
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('admin/hardware/table.components_cost') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 @if (($asset->id) && ($asset->location))
                                                     {{ $asset->location->currency }}
                                                 @elseif (($asset->id) && ($asset->location))
@@ -535,20 +693,20 @@
                                     @endif
                                     @if (($asset->model) && ($asset->depreciation) && ($asset->purchase_date))
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('admin/hardware/table.current_value') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
-                                                    @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() )}}
+                                            <div class="col-md-9">
+                                                @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() )}}
 
 
                                             </div>
@@ -556,12 +714,12 @@
                                     @endif
                                     @if ($asset->order_number)
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('general.order_number') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 <a href="{{ route('hardware.index', ['order_number' => $asset->order_number]) }}">#{{ $asset->order_number }}</a>
                                             </div>
                                         </div>
@@ -569,12 +727,12 @@
 
                                     @if ($asset->supplier)
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('general.supplier') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 @can ('superuser')
                                                     <a href="{{ route('suppliers.show', $asset->supplier_id) }}">
                                                         {{ $asset->supplier->name }}
@@ -589,12 +747,12 @@
 
                                     @if ($asset->warranty_months)
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('admin/hardware/form.warranty') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 {{ $asset->warranty_months }}
                                                 {{ trans('admin/hardware/form.months') }}
 
@@ -606,53 +764,53 @@
                                             </div>
                                         </div>
 
-                                            <div class="row">
-                                                <div class="col-md-2">
-                                                    <strong>
-                                                        {{ trans('admin/hardware/form.warranty_expires') }}
-                                                        @if ($asset->purchase_date)
-                                                        {!! $asset->present()->warranty_expires() < date("Y-m-d") ? '<i class="fas fa-exclamation-triangle text-orange" aria-hidden="true"></i>' : '' !!}
-                                                        @endif
-
-                                                    </strong>
-                                                </div>
-                                                <div class="col-md-6">
+                                        <div class="row">
+                                            <div class="col-md-3">
+                                                <strong>
+                                                    {{ trans('admin/hardware/form.warranty_expires') }}
                                                     @if ($asset->purchase_date)
+                                                        {!! $asset->present()->warranty_expires() < date("Y-m-d") ? '<i class="fas fa-exclamation-triangle text-orange" aria-hidden="true"></i>' : '' !!}
+                                                    @endif
+
+                                                </strong>
+                                            </div>
+                                            <div class="col-md-9">
+                                                @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
-                                                </div>
+                                                @else
+                                                    {{ trans('general.na_no_purchase_date') }}
+                                                @endif
                                             </div>
+                                        </div>
 
                                     @endif
 
                                     @if (($asset->model) && ($asset->depreciation))
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('general.depreciation') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 {{ $asset->depreciation->name }}
                                                 ({{ $asset->depreciation->months }}
                                                 {{ trans('admin/hardware/form.months') }})
                                             </div>
                                         </div>
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('admin/hardware/form.fully_depreciated') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 @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 +821,12 @@
 
                                     @if (($asset->asset_eol_date) && ($asset->purchase_date))
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('admin/hardware/form.eol_rate') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 {{ Carbon::parse($asset->asset_eol_date)->diffInMonths($asset->purchase_date) }}
                                                 {{ trans('admin/hardware/form.months') }}
 
@@ -677,19 +835,19 @@
                                     @endif
                                     @if ($asset->asset_eol_date)
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('admin/hardware/form.eol_date') }}
                                                     @if ($asset->purchase_date)
-							{!! $asset->asset_eol_date < date("Y-m-d") ? '<i class="fas fa-exclamation-triangle text-orange" aria-hidden="true"></i>' : '' !!}
+                                                        {!! $asset->asset_eol_date < date("Y-m-d") ? '<i class="fas fa-exclamation-triangle text-orange" aria-hidden="true"></i>' : '' !!}
                                                     @endif
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 @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 +866,24 @@
 
 
                                     <div class="row">
-                                        <div class="col-md-2">
+                                        <div class="col-md-3">
                                             <strong>
                                                 {{ trans('admin/hardware/form.notes') }}
                                             </strong>
                                         </div>
-                                        <div class="col-md-6">
+                                        <div class="col-md-9">
                                             {!! nl2br(Helper::parseEscapedMarkedownInline($asset->notes)) !!}
                                         </div>
                                     </div>
 
                                     @if ($asset->location)
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('general.location') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 @can('superuser')
                                                     <a href="{{ route('locations.show', ['location' => $asset->location->id]) }}">
                                                         {{ $asset->location->name }}
@@ -739,12 +897,12 @@
 
                                     @if ($asset->defaultLoc)
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('admin/hardware/form.default_location') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 @can('superuser')
                                                     <a href="{{ route('locations.show', ['location' => $asset->defaultLoc->id]) }}">
                                                         {{ $asset->defaultLoc->name }}
@@ -758,12 +916,12 @@
 
                                     @if ($asset->created_at!='')
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('general.created_at') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 {{ Helper::getFormattedDateObject($asset->created_at, 'datetime', false) }}
                                             </div>
                                         </div>
@@ -771,266 +929,115 @@
 
                                     @if ($asset->updated_at!='')
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('general.updated_at') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 {{ Helper::getFormattedDateObject($asset->updated_at, 'datetime', false) }}
                                             </div>
                                         </div>
                                     @endif
-                                     @if ($asset->last_checkout!='')
+                                    @if ($asset->last_checkout!='')
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('admin/hardware/table.checkout_date') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 {{ Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }}
                                             </div>
                                         </div>
-                                     @endif
-                                     @if ($asset->expected_checkin!='')
+                                    @endif
+                                    @if ($asset->expected_checkin!='')
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('admin/hardware/form.expected_checkin') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 {{ Helper::getFormattedDateObject($asset->expected_checkin, 'date', false) }}
                                             </div>
                                         </div>
-                                     @endif
+                                    @endif
 
-                                     @if ($asset->last_checkin!='')
-                                            <div class="row">
-                                                <div class="col-md-2">
-                                                    <strong>
-                                                        {{ trans('admin/hardware/table.last_checkin_date') }}
-                                                    </strong>
-                                                </div>
-                                                <div class="col-md-6">
-                                                    {{ Helper::getFormattedDateObject($asset->last_checkin, 'datetime', false) }}
-                                                </div>
+                                    @if ($asset->last_checkin!='')
+                                        <div class="row">
+                                            <div class="col-md-3">
+                                                <strong>
+                                                    {{ trans('admin/hardware/table.last_checkin_date') }}
+                                                </strong>
                                             </div>
-                                     @endif
+                                            <div class="col-md-9">
+                                                {{ Helper::getFormattedDateObject($asset->last_checkin, 'datetime', false) }}
+                                            </div>
+                                        </div>
+                                    @endif
 
 
 
                                     <div class="row">
-                                        <div class="col-md-2">
+                                        <div class="col-md-3">
                                             <strong>
                                                 {{ trans('general.checkouts_count') }}
                                             </strong>
                                         </div>
-                                        <div class="col-md-6">
+                                        <div class="col-md-9">
                                             {{ ($asset->checkouts) ? (int) $asset->checkouts->count() : '0' }}
                                         </div>
                                     </div>
 
 
                                     <div class="row">
-                                        <div class="col-md-2">
+                                        <div class="col-md-3">
                                             <strong>
                                                 {{ trans('general.checkins_count') }}
                                             </strong>
                                         </div>
-                                        <div class="col-md-6">
+                                        <div class="col-md-9">
                                             {{ ($asset->checkins) ? (int) $asset->checkins->count() : '0' }}
                                         </div>
                                     </div>
 
 
                                     <div class="row">
-                                        <div class="col-md-2">
+                                        <div class="col-md-3">
                                             <strong>
                                                 {{ trans('general.user_requests_count') }}
                                             </strong>
                                         </div>
-                                        <div class="col-md-6">
+                                        <div class="col-md-9">
                                             {{ ($asset->userRequests) ? (int) $asset->userRequests->count() : '0' }}
                                         </div>
                                     </div>
                                     <div class="row">
-                                        <div class="col-md-2">
+                                        <div class="col-md-3">
                                             <strong>
-                                               Labels
+                                                Labels
                                             </strong>
                                         </div>
-                                        <div class="col-md-6">
+                                        <div class="col-md-9">
                                             {{ Form::open([
                                                       'method' => 'POST',
                                                       'route' => ['hardware/bulkedit'],
                                                       'class' => 'form-inline',
                                                        'id' => 'bulkForm']) }}
-                                                <input type="hidden" name="bulk_actions" value="labels" />
-                                                <input type="hidden" name="ids[{{$asset->id}}]" value="{{ $asset->id }}" />
-                                                <button class="btn btn-sm btn-default" id="bulkEdit"{{ (!$asset->model ? ' disabled' : '') }}{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid').'"' : '') !!}><i class="fas fa-barcode" aria-hidden="true"></i> {{ trans_choice('button.generate_labels', 1) }}</button>
+                                            <input type="hidden" name="bulk_actions" value="labels" />
+                                            <input type="hidden" name="ids[{{$asset->id}}]" value="{{ $asset->id }}" />
+                                            <button class="btn btn-sm btn-default" id="bulkEdit"{{ (!$asset->model ? ' disabled' : '') }}{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid').'"' : '') !!}><i class="fas fa-barcode" aria-hidden="true"></i> {{ trans_choice('button.generate_labels', 1) }}</button>
 
                                             {{ Form::close() }}
 
                                         </div>
                                     </div>
-                                </div> <!-- end row-striped -->
-
-                            </div><!-- /col-md-8 -->
-
-                            <div class="col-md-4">
-
-                                @if (($asset->image) || (($asset->model) && ($asset->model->image!='')))
-                                    <div class="text-center col-md-12" style="padding-bottom: 15px;">
-                                        <a href="{{ ($asset->getImageUrl()) ? $asset->getImageUrl() : null }}" data-toggle="lightbox">
-                                            <img src="{{ ($asset->getImageUrl()) ? $asset->getImageUrl() : null }}" class="assetimg img-responsive" alt="{{ $asset->getDisplayNameAttribute() }}">
-                                        </a>
-                                    </div>
-                                @else
-                                    <!-- generic image goes here -->
-                                @endif
-
-                                    <!-- Start side button column -->
-
-                                    @if (($asset->assetstatus) && ($asset->assetstatus->deployable=='1'))
-                                        @if (($asset->assigned_to != '') && ($asset->deleted_at==''))
-                                            @can('checkin', \App\Models\Asset::class)
-                                                <div class="col-md-12">
-                                                    <span class="tooltip-wrapper"{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}>
-                                                        <a role="button" href="{{ route('hardware.checkin.create', $asset->id) }}" class="btn btn-sm btn-primary btn-block hidden-print{{ (!$asset->model ? ' disabled' : '') }}">
-                                                        {{ trans('admin/hardware/general.checkin') }}
-                                                    </a>
-                                                    </span>
-                                                </div>
-                                            @endcan
-                                        @elseif (($asset->assigned_to == '') && ($asset->deleted_at==''))
-                                            @can('checkout', \App\Models\Asset::class)
-                                                <div class="col-md-12" style="padding-top: 5px;">
-                                                    <span class="tooltip-wrapper"{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}>
-                                                        <a href="{{ route('hardware.checkout.create', $asset->id)  }}" class="btn btn-sm btn-primary btn-block hidden-print{{ (!$asset->model ? ' disabled' : '') }}">
-                                                        {{ trans('admin/hardware/general.checkout') }}
-                                                    </a>
-                                                    </span>
-                                                </div>
-                                            @endcan
-                                        @endif
-                                    @endif
-
-
-                                    @can('update', $asset)
-                                        @if ($asset->deleted_at=='')
-                                        <div class="col-md-12" style="padding-top: 5px;">
-                                            <a href="{{ route('hardware.edit', $asset->id) }}" class="btn btn-sm btn-primary btn-block hidden-print">
-                                                {{ trans('admin/hardware/general.edit') }}
-                                            </a>
-                                        </div>
-                                        @endif
-                                    @endcan
-
-                                    @can('create', $asset)
-                                        <div class="col-md-12" style="padding-top: 5px;">
-                                            <a href="{{ route('clone/hardware', $asset->id) }}" class="btn btn-sm btn-primary btn-block hidden-print">
-                                                {{ trans('admin/hardware/general.clone') }}
-                                            </a>
-                                        </div>
-                                    @endcan
-
-                                    @can('audit', \App\Models\Asset::class)
-                                        <div class="col-md-12" style="padding-top: 5px;">
-                                            <span class="tooltip-wrapper"{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}>
-                                                <a href="{{ route('asset.audit.create', $asset->id)  }}" class="btn btn-sm btn-primary btn-block hidden-print{{ (!$asset->model ? ' disabled' : '') }}">
-                                                 {{ trans('general.audit') }}
-                                            </a>
-                                            </span>
-                                        </div>
-                                    @endcan
-
-                                    @can('delete', $asset)
-                                        <div class="col-md-12" style="padding-top: 30px; padding-bottom: 30px;">
-                                            @if ($asset->deleted_at=='')
-                                                <button class="btn btn-sm btn-block btn-danger delete-asset" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $asset->asset_tag]) }}" data-target="#dataConfirmModal">{{ trans('general.delete') }}
-                                                </button>
-                                                <span class="sr-only">{{ trans('general.delete') }}</span>
-                                            @else
-                                                <form method="POST" action="{{ route('restore/hardware', ['assetId' => $asset->id]) }}">
-                                                    @csrf
-                                                    <button class="btn btn-sm btn-warning btn-block">{{ trans('general.restore') }}</button>
-                                                </form>
-                                           @endif
-                                        </div>
-                                    @endcan
-
-                                @if (($asset->assignedTo) && ($asset->deleted_at==''))
-                                    <div style="text-align: left">
-                                        <h2>
-                                            {{ trans('admin/hardware/form.checkedout_to') }}
-                                        </h2>
-                                        <p>
-                                        @if (($asset->checkedOutToUser()) && ($asset->assignedTo->present()->gravatar()))
-                                            <img src="{{ $asset->assignedTo->present()->gravatar() }}" class="user-image-inline" alt="{{ $asset->assignedTo->present()->fullName() }}">
-                                        @endif
-                                        </p>
-                                            {!! $asset->assignedTo->present()->glyph() . ' ' .$asset->assignedTo->present()->nameUrl() !!}
-                                        </p>
-
-                                        <ul class="list-unstyled" style="line-height: 25px;">
-                                            @if ((isset($asset->assignedTo->email)) && ($asset->assignedTo->email!=''))
-                                                <li>
-                                                    <i class="far fa-envelope" aria-hidden="true"></i>
-                                                    <a href="mailto:{{ $asset->assignedTo->email }}">{{ $asset->assignedTo->email }}</a>
-                                                </li>
-                                            @endif
-
-                                            @if ((isset($asset->assignedTo)) && ($asset->assignedTo->phone!=''))
-                                                <li>
-                                                    <i class="fas fa-phone" aria-hidden="true"></i>
-                                                    <a href="tel:{{ $asset->assignedTo->phone }}">{{ $asset->assignedTo->phone }}</a>
-                                                </li>
-                                            @endif
-
-                                            @if((isset($asset->assignedTo)) && ($asset->assignedTo->department))
-                                                <li>{{ trans('admin/hardware/general.user_department') }}: {{ $asset->assignedTo->department->name}}</li>
-                                            @endif
-
-                                            @if (isset($asset->location))
-                                                <li><i class="fas fa-map-marker-alt" aria-hidden="true"></i> {{ $asset->location->name }}</li>
-                                                <li>{{ $asset->location->address }}
-                                                    @if ($asset->location->address2!='')
-                                                        {{ $asset->location->address2 }}
-                                                    @endif
-                                                </li>
-
-                                                <li>{{ $asset->location->city }}
-                                                    @if (($asset->location->city!='') && ($asset->location->state!=''))
-                                                        ,
-                                                    @endif
-                                                    {{ $asset->location->state }} {{ $asset->location->zip }}
-                                                </li>
-                                            @endif
-                                                <li>
-                                                    <i class="fas fa-calendar"></i> {{ trans('admin/hardware/form.checkout_date') }}: {{ Helper::getFormattedDateObject($asset->last_checkout, 'date', false) }}
-                                                </li>
-                                            @if (isset($asset->expected_checkin))
-                                                <li>
-                                                    <i class="fas fa-calendar"></i> {{ trans('admin/hardware/form.expected_checkin') }}: {{ Helper::getFormattedDateObject($asset->expected_checkin, 'date', false) }}
-                                                </li>
-                                            @endif
-                                        </ul>
-                                    </div>
-
-                                @endif
-
-                                @if  ($snipeSettings->qr_code=='1')
-                                    <div class="col-md-12" style="padding-top: 15px;">
-                                        <img src="{{ config('app.url') }}/hardware/{{ $asset->id }}/qr_code" class="img-thumbnail pull-right" style="height: 100px; width: 100px; margin-right: 10px;" alt="QR code for {{ $asset->getDisplayNameAttribute() }}">
-                                    </div>
-                                @endif
-
-                            </div> <!-- div.col-md-4 -->
-                        </div><!-- /row -->
-                    </div><!-- /.tab-pane asset details -->
-                 
+                                    
+                                </div> <!--/end striped container-->
+                            </div> <!-- end col-md-9 -->
+                        </div> <!--/.row-->
+                    </div><!-- /.tab-pane -->
 
                     <div class="tab-pane fade" id="software">
                         <div class="row">
@@ -1095,7 +1102,7 @@
                                         <th></th>
                                         </thead>
                                         <tbody>
-                                        <?php $totalCost = 0; ?>
+                                            <?php $totalCost = 0; ?>
                                         @foreach ($asset->components as $component)
 
 
@@ -1111,7 +1118,7 @@
                                                         <a href="{{ route('components.checkin.show', $component->pivot->id) }}" class="btn btn-sm bg-purple" data-tooltip="true">{{ trans('general.checkin') }}</a>
                                                     </td>
 
-                                                    <?php $totalCost = $totalCost + ($component->purchase_cost *$component->pivot->assigned_qty) ?>
+                                                        <?php $totalCost = $totalCost + ($component->purchase_cost *$component->pivot->assigned_qty) ?>
                                                 </tr>
                                             @endif
                                         @endforeach
@@ -1209,9 +1216,9 @@
                                     <div id="maintenance-toolbar">
                                         <a href="{{ route('maintenances.create', ['asset_id' => $asset->id]) }}" class="btn btn-primary">{{ trans('button.add_maintenance') }}</a>
                                     </div>
-                            @endcan
+                                @endcan
 
-                            <!-- Asset Maintenance table -->
+                                <!-- Asset Maintenance table -->
                                 <table
                                         data-columns="{{ \App\Presenters\AssetMaintenancesPresenter::dataTableLayout() }}"
                                         class="table table-striped snipe-table"
@@ -1259,52 +1266,52 @@
                          "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-cookie="true">
-                <thead>
-                <tr>
-                  <th data-visible="true" data-field="icon" style="width: 40px;" class="hidden-xs" data-formatter="iconFormatter">{{ trans('admin/hardware/table.icon') }}</th>
-                  <th data-visible="true" data-field="action_date" data-sortable="true" data-formatter="dateDisplayFormatter">{{ trans('general.date') }}</th>
-                  <th data-visible="true" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.admin') }}</th>
-                  <th data-visible="true" data-field="action_type">{{ trans('general.action') }}</th>
-                  <th class="col-sm-2" data-field="file" data-visible="false" data-formatter="fileUploadNameFormatter">{{ trans('general.file_name') }}</th>
-                  <th data-visible="true" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
-                  <th data-visible="true" data-field="target" data-formatter="polymorphicItemFormatter">{{ trans('general.target') }}</th>
-                  <th data-field="note">{{ trans('general.notes') }}</th>
-                  <th data-field="signature_file" data-visible="false"  data-formatter="imageFormatter">{{ trans('general.signature') }}</th>
-                  <th data-visible="false" data-field="file" data-visible="false"  data-formatter="fileUploadFormatter">{{ trans('general.download') }}</th>
-                   <th data-field="log_meta" data-visible="true" data-formatter="changeLogFormatter">{{ trans('admin/hardware/table.changed')}}</th>
-                   <th data-field="remote_ip" data-visible="false" data-sortable="true">{{ trans('admin/settings/general.login_ip') }}</th>
-                   <th data-field="user_agent" data-visible="false" data-sortable="true">{{ trans('admin/settings/general.login_user_agent') }}</th>
-                   <th data-field="action_source" data-visible="false" data-sortable="true">{{ trans('general.action_source') }}</th>
-                </tr>
-                </thead>
-              </table>
-            </div>
-          </div> <!-- /.row -->
-        </div> <!-- /.tab-pane history -->
+                                        data-url="{{ route('api.activity.index', ['item_id' => $asset->id, 'item_type' => 'asset']) }}"
+                                        data-cookie-id-table="assetHistory"
+                                        data-cookie="true">
+                                    <thead>
+                                    <tr>
+                                        <th data-visible="true" data-field="icon" style="width: 40px;" class="hidden-xs" data-formatter="iconFormatter">{{ trans('admin/hardware/table.icon') }}</th>
+                                        <th data-visible="true" data-field="action_date" data-sortable="true" data-formatter="dateDisplayFormatter">{{ trans('general.date') }}</th>
+                                        <th data-visible="true" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.admin') }}</th>
+                                        <th data-visible="true" data-field="action_type">{{ trans('general.action') }}</th>
+                                        <th class="col-sm-2" data-field="file" data-visible="false" data-formatter="fileUploadNameFormatter">{{ trans('general.file_name') }}</th>
+                                        <th data-visible="true" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
+                                        <th data-visible="true" data-field="target" data-formatter="polymorphicItemFormatter">{{ trans('general.target') }}</th>
+                                        <th data-field="note">{{ trans('general.notes') }}</th>
+                                        <th data-field="signature_file" data-visible="false"  data-formatter="imageFormatter">{{ trans('general.signature') }}</th>
+                                        <th data-visible="false" data-field="file" data-visible="false"  data-formatter="fileUploadFormatter">{{ trans('general.download') }}</th>
+                                        <th data-field="log_meta" data-visible="true" data-formatter="changeLogFormatter">{{ trans('admin/hardware/table.changed')}}</th>
+                                        <th data-field="remote_ip" data-visible="false" data-sortable="true">{{ trans('admin/settings/general.login_ip') }}</th>
+                                        <th data-field="user_agent" data-visible="false" data-sortable="true">{{ trans('admin/settings/general.login_user_agent') }}</th>
+                                        <th data-field="action_source" data-visible="false" data-sortable="true">{{ trans('general.action_source') }}</th>
+                                    </tr>
+                                    </thead>
+                                </table>
+                            </div>
+                        </div> <!-- /.row -->
+                    </div> <!-- /.tab-pane history -->
 
-        <div class="tab-pane fade" id="files">
-          <div class="row">
-            <div class="col-md-12">
+                    <div class="tab-pane fade" id="files">
+                        <div class="row">
+                            <div class="col-md-12">
 
-              @if ($asset->uploads->count() > 0)
-              <table
-                      class="table table-striped snipe-table"
-                      id="assetFileHistory"
-                      data-pagination="true"
-                      data-id-table="assetFileHistory"
-                      data-search="true"
-                      data-side-pagination="client"
-                      data-sortable="true"
-                      data-show-columns="true"
-                      data-show-fullscreen="true"
-                      data-show-refresh="true"
-                      data-sort-order="desc"
-                      data-sort-name="created_at"
-                      data-show-export="true"
-                      data-export-options='{
+                                @if ($asset->uploads->count() > 0)
+                                    <table
+                                            class="table table-striped snipe-table"
+                                            id="assetFileHistory"
+                                            data-pagination="true"
+                                            data-id-table="assetFileHistory"
+                                            data-search="true"
+                                            data-side-pagination="client"
+                                            data-sortable="true"
+                                            data-show-columns="true"
+                                            data-show-fullscreen="true"
+                                            data-show-refresh="true"
+                                            data-sort-order="desc"
+                                            data-sort-name="created_at"
+                                            data-show-export="true"
+                                            data-export-options='{
                          "fileName": "export-asset-{{ $asset->id }}-files",
                          "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                        }'
@@ -1335,9 +1342,9 @@
                                                 </td>
                                                 <td>
                                                     @if (Storage::exists('private_uploads/assets/'.$file->filename))
-                                                    {{ $file->filename }}
+                                                        {{ $file->filename }}
                                                     @else
-                                                    <del>{{ $file->filename }}</del>
+                                                        <del>{{ $file->filename }}</del>
                                                     @endif
                                                 </td>
                                                 <td data-value="{{ (Storage::exists('private_uploads/assets/'.$file->filename) ? Storage::size('private_uploads/assets/'.$file->filename) : '') }}">
@@ -1386,6 +1393,7 @@
                         </div> <!-- /.row -->
                     </div> <!-- /.tab-pane files -->
 
+                    @can('view', $asset->model)
                     <div class="tab-pane fade" id="modelfiles">
                         <div class="row">
                             <div class="col-md-12">
@@ -1487,28 +1495,27 @@
                             </div> <!-- /.col-md-12 -->
                         </div> <!-- /.row -->
                     </div> <!-- /.tab-pane files -->
-                </div> <!-- /. tab-content -->
-            </div> <!-- /.nav-tabs-custom -->
-        </div> <!-- /. col-md-12 -->
-    </div> <!-- /. row -->
+                    @endcan
+            </div><!-- /.tab-content -->
+        </div><!-- nav-tabs-custom -->
+    </div>
 
     @can('update', \App\Models\Asset::class)
         @include ('modals.upload-file', ['item_type' => 'asset', 'item_id' => $asset->id])
     @endcan
-
 @stop
 
-@section('moar_scripts')
-    <script>
+            @section('moar_scripts')
+                <script>
 
-        $('#dataConfirmModal').on('show.bs.modal', function (event) {
-            var content = $(event.relatedTarget).data('content');
-            var title = $(event.relatedTarget).data('title');
-            $(this).find(".modal-body").text(content);
-            $(this).find(".modal-header").text(title);
-        });
+                    $('#dataConfirmModal').on('show.bs.modal', function (event) {
+                        var content = $(event.relatedTarget).data('content');
+                        var title = $(event.relatedTarget).data('title');
+                        $(this).find(".modal-body").text(content);
+                        $(this).find(".modal-header").text(title);
+                    });
 
-    </script>
+                </script>
     @include ('partials.bootstrap-table')
 
-@stop
+@stop
\ No newline at end of file