Merge branch 'develop' into bug/sc-24812

2024-02-28 17:22:16 -05:00
parent c5e8d1c276 b1cd44341b
commit eb0657c953
147 changed files with 2213 additions and 287145 deletions
@@ -37,6 +37,7 @@ class AssetsTransformer
                'name'=> e($asset->model->name),
            ] : 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 != '')) ? Carbon::parse($asset->asset_eol_date)->diffInMonths($asset->purchase_date).' months' : null,