Push v3.6.5 changes into v4

resources/views/hardware/view.blade.php

@@ -14,7 +14,7 @@
     <span class="caret"></span>
   </button>
   <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenu1">
-    @if ($asset->assetstatus->deployable=='1')
+    @if (($asset->assetstatus) && ($asset->assetstatus->deployable=='1'))
       @if ($asset->assigned_to != '')
       <li role="presentation"><a href="{{ route('checkin/hardware', $asset->id) }}">{{ trans('admin/hardware/general.checkin') }}</a></li>
       @else
@@ -33,6 +33,18 @@
 <div class="row">
   <div class="col-md-12">
 
+
+    @if ($asset->deleted_at!='')
+        <div class="col-md-12">
+             <div class="alert alert-danger">
+                    <i class="fa fa-exclamation-circle faa-pulse animated"></i>
+                    <strong>WARNING: </strong>
+                    This asset has been deleted.
+                    You must <a href="{{ route('restore/hardware', $asset->id) }}">restore it</a> before you can assign it to someone.
+               </div>
+        </div>
+    @endif
+
     <!-- Custom Tabs -->
     <div class="nav-tabs-custom">
       <ul class="nav nav-tabs">
@@ -369,7 +381,7 @@
                 <img src="{{ url('/') }}/uploads/models/{{{ $asset->model->image }}}" class="assetimg img-responsive">
               @endif
 
-              @if ($snipeSettings->qr_code=='1')
+              @if  (($snipeSettings->qr_code=='1') && ($asset->deleted_at==''))
                  <img src="{{ url('/') }}/hardware/{{ $asset->id }}/qr_code" class="img-thumbnail pull-right" style="height: 100px; width: 100px; margin-right: 10px;">
               @endif