diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index a32503d7ea..ce814d5c76 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -904,27 +904,18 @@
@endcan
@can('delete', $asset)
- @if ($asset->deleted_at=='')
-
-
+
+ @if ($asset->deleted_at=='')
+
{{ trans('general.delete') }}
-
- @endif
+ @else
+
+ @endif
@endcan
- @if ($asset->deleted_at!='')
-
-
-
- @endif
-
- @if ($snipeSettings->qr_code=='1')
-
 }}/hardware/{{ $asset->id }}/qr_code)
- @endif
-
@if (($asset->assignedTo) && ($asset->deleted_at==''))
{{ trans('admin/hardware/form.checkedout_to') }}
@@ -982,6 +973,13 @@
@endif
+
+ @if ($snipeSettings->qr_code=='1')
+
+
 }}/hardware/{{ $asset->id }}/qr_code)
+
+ @endif
+
diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php
index 91f112d8aa..76d3322998 100755
--- a/resources/views/models/view.blade.php
+++ b/resources/views/models/view.blade.php
@@ -236,6 +236,12 @@
@endif
+ @if ($model->created_at)
+ {{ trans('general.created_at') }}:
+ {{ Helper::getFormattedDateObject($model->created_at, 'datetime', false) }}
+
+ @endif
+
@if ($model->min_amt)
{{ trans('general.min_amt') }}:
{{$model->min_amt }}
@@ -313,11 +319,6 @@
@endif
-
-
- @if ($model->deleted_at!='')
-
{{ trans('admin/models/general.restore') }}
- @endif
@if ($model->note)
@@ -337,22 +338,32 @@
@can('create', \App\Models\AssetModel::class)
@endcan
@can('delete', \App\Models\AssetModel::class)
@if ($model->assets_count > 0)
-
-
+
@else
-
-
- {{ trans('general.delete') }}
-
+
@endif
+
+
+
+ @if ($model->deleted_at!='')
+
+ @else
+
+ {{ trans('general.delete') }}
+ @endif
+
+
@endcan