diff --git a/app/Http/Transformers/AssetMaintenancesTransformer.php b/app/Http/Transformers/AssetMaintenancesTransformer.php index 81b4a9eabb..7e8da00248 100644 --- a/app/Http/Transformers/AssetMaintenancesTransformer.php +++ b/app/Http/Transformers/AssetMaintenancesTransformer.php @@ -26,17 +26,18 @@ class AssetMaintenancesTransformer 'id' => (int) $assetmaintenance->id, 'asset' => ($assetmaintenance->asset) ? [ 'id' => (int) $assetmaintenance->asset->id, - 'name'=> ($assetmaintenance->asset->name) ? e($assetmaintenance->asset->name) : null, + 'name'=> (($assetmaintenance->asset) && ($assetmaintenance->asset->name)) ? e($assetmaintenance->asset->name) : null, 'asset_tag'=> e($assetmaintenance->asset->asset_tag), 'serial'=> e($assetmaintenance->asset->serial), - 'deleted_at'=> e($assetmaintenance->asset->deleted_at), - 'created_at'=> e($assetmaintenance->asset->created_at), + 'deleted_at'=> ($assetmaintenance->asset) ? Helper::getFormattedDateObject($assetmaintenance->asset->deleted_at, 'datetime') : null, + 'created_at' => ($assetmaintenance->asset) ? Helper::getFormattedDateObject($assetmaintenance->asset->created_at, 'datetime') : null, + 'updated_at' => ($assetmaintenance->asset) ? Helper::getFormattedDateObject($assetmaintenance->asset->updated_at, 'datetime') : null, ] : null, 'model' => (($assetmaintenance->asset) && ($assetmaintenance->asset->model)) ? [ 'id' => (int) $assetmaintenance->asset->model->id, 'name'=> ($assetmaintenance->asset->model->name) ? e($assetmaintenance->asset->model->name).' '.e($assetmaintenance->asset->model->model_number) : null, ] : null, - 'status_label' => ($assetmaintenance->asset->assetstatus) ? [ + 'status_label' => (($assetmaintenance->asset) && ($assetmaintenance->asset->assetstatus)) ? [ 'id' => (int) $assetmaintenance->asset->assetstatus->id, 'name'=> e($assetmaintenance->asset->assetstatus->name), 'status_type'=> e($assetmaintenance->asset->assetstatus->getStatuslabelType()), @@ -79,7 +80,7 @@ class AssetMaintenancesTransformer ]; $permissions_array['available_actions'] = [ - 'update' => (Gate::allows('update', Asset::class) && ($assetmaintenance->asset->deleted_at=='')) ? true : false, + 'update' => (Gate::allows('update', Asset::class) && ((($assetmaintenance->asset) && $assetmaintenance->asset->deleted_at==''))) ? true : false, 'delete' => Gate::allows('delete', Asset::class), ];