diff --git a/app/Http/Controllers/Api/CategoriesController.php b/app/Http/Controllers/Api/CategoriesController.php index f299d09e92..944f049f6f 100644 --- a/app/Http/Controllers/Api/CategoriesController.php +++ b/app/Http/Controllers/Api/CategoriesController.php @@ -22,7 +22,7 @@ class CategoriesController extends Controller $this->authorize('view', Category::class); $allowed_columns = ['id', 'name','category_type','use_default_eula','require_acceptance','checkin_email']; - $categories = Category::select(['id', 'name','category_type','use_default_eula','require_acceptance','checkin_email']) + $categories = Category::select(['id', 'created_at', 'updated_at', 'name','category_type','use_default_eula','require_acceptance','checkin_email']) ->withCount('assets', 'accessories', 'consumables', 'components'); if ($request->has('search')) { @@ -75,7 +75,8 @@ class CategoriesController extends Controller { $this->authorize('view', Category::class); $category = Category::findOrFail($id); - return $category; + return (new CategoriesTransformer)->transformCategory($category); + } diff --git a/app/Http/Transformers/CategoriesTransformer.php b/app/Http/Transformers/CategoriesTransformer.php index 45c2e3b379..67433da0ce 100644 --- a/app/Http/Transformers/CategoriesTransformer.php +++ b/app/Http/Transformers/CategoriesTransformer.php @@ -4,6 +4,7 @@ namespace App\Http\Transformers; use App\Models\Category; use Illuminate\Database\Eloquent\Collection; use Gate; +use App\Helpers\Helper; class CategoriesTransformer { @@ -26,11 +27,14 @@ class CategoriesTransformer 'name' => e($category->name), 'type' => e($category->category_type), 'use_default_eula' => ($category->use_default_eula =='1') ? true : false, + 'checkin_email' => ($category->checkin_email =='1') ? true : false, 'require_acceptance' => ($category->require_acceptance =='1') ? true : false, 'assets_count' => $category->assets_count, 'accessories_count' => $category->accessories_count, 'consumables_count' => $category->consumables_count, 'components_count' => $category->components_count, + 'created_at' => Helper::getFormattedDateObject($category->created_at, 'datetime'), + 'updated_at' => Helper::getFormattedDateObject($category->updated_at, 'datetime'), ]; $permissions_array['available_actions'] = [