Merge branch 'develop' into add-display-name-to-users-fixed

app/Http/Transformers/AssetsTransformer.php

@@ -58,6 +58,13 @@ class AssetsTransformer
                 'id' => (int) $asset->model->manufacturer->id,
                 'name'=> e($asset->model->manufacturer->name),
             ] : null,
+            'depreciation' => (($asset->model) && ($asset->model->depreciation)) ? [
+                'id' => (int) $asset->model->depreciation->id,
+                'name'=> e($asset->model->depreciation->name),
+                'months'=> (int) $asset->model->depreciation->months,
+                'type'=>  e($asset->model->depreciation->depreciation_type),
+                'minimum'=> ($asset->model->depreciation->depreciation_min) ? (int) $asset->model->depreciation->depreciation_min : null,
+            ] : null,
             'supplier' => ($asset->supplier) ? [
                 'id' => (int) $asset->supplier->id,
                 'name'=> e($asset->supplier->name),

app/Http/Transformers/UploadedFilesTransformer.php

@@ -45,7 +45,7 @@ class UploadedFilesTransformer
             ] : null,
             'created_at' => Helper::getFormattedDateObject($file->created_at, 'datetime'),
             'deleted_at' => Helper::getFormattedDateObject($file->deleted_at, 'datetime'),
-            'inlineable' => StorageHelper::allowSafeInline($file->uploads_file_path()),
+            'inlineable' => StorageHelper::allowSafeInline($file->uploads_file_path()) ?? false,
             'exists_on_disk' => (Storage::exists($file->uploads_file_path()) ? true : false),
         ];
 

app/Http/Transformers/UsersTransformer.php

@@ -31,6 +31,7 @@ class UsersTransformer
         $array = [
                 'id' => (int) $user->id,
                 'avatar' => e($user->present()->gravatar) ?? null,
+
                 'name' => e($user->getFullNameAttribute()) ?? null,
                 'first_name' => e($user->first_name) ?? null,
                 'last_name' => e($user->last_name) ?? null,
@@ -139,7 +140,6 @@ class UsersTransformer
             'first_name' => e($user->first_name),
             'last_name' => e($user->last_name),
             'username' => e($user->username),
-            'display_name' => e($user->display_name),
             'created_by' => $user->adminuser ? [
                 'id' => (int) $user->adminuser->id,
                 'name'=> e($user->adminuser->present()->fullName),