Include manufacturer_id

Signed-off-by: snipe <snipe@snipe.net>

app/Http/Transformers/AssetsTransformer.php

@@ -40,7 +40,6 @@ class AssetsTransformer
             ] : null,
             'byod' => ($asset->byod ? true : false),
             'requestable' => ($asset->requestable ? true : false),
-
             'model_number' => (($asset->model) && ($asset->model->model_number)) ? e($asset->model->model_number) : null,
             'eol' => (($asset->asset_eol_date != '') && ($asset->purchase_date != '')) ? (int) Carbon::parse($asset->asset_eol_date)->diffInMonths($asset->purchase_date, true) . ' months' : null,
             'asset_eol_date' => ($asset->asset_eol_date != '') ? Helper::getFormattedDateObject($asset->asset_eol_date, 'date') : null,

app/Http/Transformers/UsersTransformer.php

@@ -121,22 +121,24 @@ class UsersTransformer
      */
     public function transformUserCompact(User $user) : array
     {
-
+        $array = [];
-        $array = [
+        if (Gate::allows('view', $user) && ($user->deleted_at == '')) {
-            'id' => (int) $user->id,
+            $array = [
-            'image' => e($user->present()->gravatar) ?? null,
+                'id' => (int) $user->id,
-            'type' => 'user',
+                'image' => e($user->present()->gravatar) ?? null,
-            'name' => e($user->getFullNameAttribute()),
+                'type' => 'user',
-            'first_name' => e($user->first_name),
+                'name' => e($user->getFullNameAttribute()),
-            'last_name' => e($user->last_name),
+                'first_name' => e($user->first_name),
-            'username' => e($user->username),
+                'last_name' => e($user->last_name),
-            'created_by' => $user->adminuser ? [
+                'username' => e($user->username),
-                'id' => (int) $user->adminuser->id,
+                'created_by' => $user->adminuser ? [
-                'name'=> e($user->adminuser->present()->fullName),
+                    'id' => (int) $user->adminuser->id,
-            ]: null,
+                    'name'=> e($user->adminuser->present()->fullName),
-            'created_at' => Helper::getFormattedDateObject($user->created_at, 'datetime'),
+                ]: null,
-            'deleted_at' => ($user->deleted_at) ? Helper::getFormattedDateObject($user->deleted_at, 'datetime') : null,
+                'created_at' => Helper::getFormattedDateObject($user->created_at, 'datetime'),
-        ];
+                'deleted_at' => ($user->deleted_at) ? Helper::getFormattedDateObject($user->deleted_at, 'datetime') : null,
+            ];
+        }
 
         return $array;
     }

app/Models/Asset.php

@@ -747,7 +747,7 @@ class Asset extends Depreciable
      */
     public function adminuser()
     {
-        return $this->belongsTo(\App\Models\User::class, 'created_by');
+        return $this->belongsTo(\App\Models\User::class, 'created_by')->select(['id', 'first_name', 'last_name', 'username', 'created_at', 'created_by'])->withTrashed();
     }
 
 
@@ -773,7 +773,7 @@ class Asset extends Depreciable
      */
     public function model()
     {
-        return $this->belongsTo(\App\Models\AssetModel::class, 'model_id')->withTrashed();
+        return $this->belongsTo(\App\Models\AssetModel::class, 'model_id')->select(['id', 'name', 'model_number', 'manufacturer_id', 'category_id', 'created_at', 'created_by'])->withTrashed();
     }
 
     /**

resources/views/hardware/view.blade.php

@@ -955,7 +955,7 @@
                                                 </strong>
                                             </div>
                                             <div class="col-md-9">
-                                                @if ($asset->purchase_date)
+                                                @if (($asset->purchase_date) && $asset->depreciated_date()))
                                                     {{ Helper::getFormattedDateObject($asset->depreciated_date()->format('Y-m-d'), 'date', false) }}
                                                     -
                                                     {{ Carbon::parse($asset->depreciated_date())->diffForHumans(['parts' => 2]) }}