A free open source IT asset/license management system
Updated controllers to use tag_color
snipeb4f5260dda87
diff --git a/app/Http/Controllers/Api/CompaniesController.php b/app/Http/Controllers/Api/CompaniesController.phpindex e4525cd87e..51492e824a 100644--- a/app/Http/Controllers/Api/CompaniesController.php+++ b/app/Http/Controllers/Api/CompaniesController.php@@ -197,6 +197,7 @@ class CompaniesController extends Controller'companies.name','companies.email','companies.image',+ 'companies.tag_color',]);diff --git a/app/Http/Controllers/Api/DepartmentsController.php b/app/Http/Controllers/Api/DepartmentsController.phpindex b03a755616..21975d3463 100644--- a/app/Http/Controllers/Api/DepartmentsController.php+++ b/app/Http/Controllers/Api/DepartmentsController.php@@ -191,6 +191,7 @@ class DepartmentsController extends Controller'id','name','image',+ 'tag_color',]);if ($request->filled('search')) {diff --git a/app/Http/Controllers/Api/LocationsController.php b/app/Http/Controllers/Api/LocationsController.phpindex 7d175ba32e..e9508bbedf 100644--- a/app/Http/Controllers/Api/LocationsController.php+++ b/app/Http/Controllers/Api/LocationsController.php@@ -409,6 +409,7 @@ class LocationsController extends Controller'locations.name','locations.parent_id','locations.image',+ 'locations.tag_color',]);// Only scope locations if the setting is enableddiff --git a/app/Http/Controllers/Api/ManufacturersController.php b/app/Http/Controllers/Api/ManufacturersController.phpindex 749ebf70d2..2269f1afbe 100644--- a/app/Http/Controllers/Api/ManufacturersController.php+++ b/app/Http/Controllers/Api/ManufacturersController.php@@ -264,6 +264,7 @@ class ManufacturersController extends Controller'id','name','image',+ 'tag_color',]);if ($request->filled('search')) {diff --git a/app/Http/Controllers/Api/SuppliersController.php b/app/Http/Controllers/Api/SuppliersController.phpindex d098b5944a..ea134f6008 100644--- a/app/Http/Controllers/Api/SuppliersController.php+++ b/app/Http/Controllers/Api/SuppliersController.php@@ -252,6 +252,7 @@ class SuppliersController extends Controller'id','name','image',+ 'tag_color',]);if ($request->filled('search')) {diff --git a/app/Http/Transformers/ComponentsTransformer.php b/app/Http/Transformers/ComponentsTransformer.phpindex 82e4448277..a87176f31f 100644--- a/app/Http/Transformers/ComponentsTransformer.php+++ b/app/Http/Transformers/ComponentsTransformer.php@@ -30,15 +30,25 @@ class ComponentsTransformer'location' => ($component->location) ? ['id' => (int) $component->location->id,'name' => e($component->location->name),+ 'tag_color' => $component->location->tag_color ? e($component->location->tag_color) : null,] : null,'qty' => ($component->qty != '') ? (int) $component->qty : null,'min_amt' => ($component->min_amt != '') ? (int) $component->min_amt : null,'category' => ($component->category) ? ['id' => (int) $component->category->id,'name' => e($component->category->name),+ 'tag_color' => $component->category->tag_color ? e($component->category->tag_color) : null,+ ] : null,+ 'supplier' => ($component->supplier) ? [+ 'id' => $component->supplier->id,+ 'name'=> e($component->supplier->name),+ 'tag_color' => $component->supplier->tag_color ? e($component->supplier->tag_color) : null,+ ] : null,+ 'manufacturer' => ($component->manufacturer) ? [+ 'id' => $component->manufacturer->id,+ 'name'=> e($component->manufacturer->name),+ 'tag_color' => $component->manufacturer->tag_color ? e($component->manufacturer->tag_color) : null,] : null,- 'supplier' => ($component->supplier) ? ['id' => $component->supplier->id, 'name'=> e($component->supplier->name)] : null,- 'manufacturer' => ($component->manufacturer) ? ['id' => $component->manufacturer->id, 'name'=> e($component->manufacturer->name)] : null,'model_number' => ($component->model_number) ? e($component->model_number) : null,'order_number' => e($component->order_number),'purchase_date' => Helper::getFormattedDateObject($component->purchase_date, 'date'),@@ -48,6 +58,7 @@ class ComponentsTransformer'company' => ($component->company) ? ['id' => (int) $component->company->id,'name' => e($component->company->name),+ 'tag_color' => $component->company->tag_color ? e($component->company->tag_color) : null,] : null,'notes' => ($component->notes) ? Helper::parseEscapedMarkedownInline($component->notes) : null,'created_by' => ($component->adminuser) ? [diff --git a/app/Http/Transformers/ConsumablesTransformer.php b/app/Http/Transformers/ConsumablesTransformer.phpindex 2739b3b8f0..c31754d5b5 100644--- a/app/Http/Transformers/ConsumablesTransformer.php+++ b/app/Http/Transformers/ConsumablesTransformer.php@@ -26,12 +26,32 @@ class ConsumablesTransformer'id' => (int) $consumable->id,'name' => e($consumable->name),'image' => ($consumable->getImageUrl()) ? ($consumable->getImageUrl()) : null,- 'category' => ($consumable->category) ? ['id' => $consumable->category->id, 'name' => e($consumable->category->name)] : null,- 'company' => ($consumable->company) ? ['id' => (int) $consumable->company->id, 'name' => e($consumable->company->name)] : null,+ 'category' => ($consumable->category) ? [+ 'id' => $consumable->category->id,+ 'name' => e($consumable->category->name),+ 'tag_color' => $consumable->category->tag_color ? e($consumable->category->tag_color) : null,+ ] : null,+ 'company' => ($consumable->company) ? [+ 'id' => (int) $consumable->company->id,+ 'name' => e($consumable->company->name),+ 'tag_color' => $consumable->company->tag_color ? e($consumable->company->tag_color) : null,+ ] : null,'item_no' => e($consumable->item_no),- 'location' => ($consumable->location) ? ['id' => (int) $consumable->location->id, 'name' => e($consumable->location->name)] : null,- 'manufacturer' => ($consumable->manufacturer) ? ['id' => (int) $consumable->manufacturer->id, 'name' => e($consumable->manufacturer->name)] : null,- 'supplier' => ($consumable->supplier) ? ['id' => $consumable->supplier->id, 'name'=> e($consumable->supplier->name)] : null,+ 'location' => ($consumable->location) ? [+ 'id' => (int) $consumable->location->id,+ 'name' => e($consumable->location->name),+ 'tag_color' => $consumable->location->tag_color ? e($consumable->location->tag_color) : null,+ ] : null,+ 'manufacturer' => ($consumable->manufacturer) ? [+ 'id' => (int) $consumable->manufacturer->id,+ 'name' => e($consumable->manufacturer->name),+ 'tag_color' => $consumable->manufacturer->tag_color ? e($consumable->manufacturer->tag_color) : null,+ ] : null,+ 'supplier' => ($consumable->supplier) ? [+ 'id' => $consumable->supplier->id,+ 'name'=> e($consumable->supplier->name),+ 'tag_color' => $consumable->supplier->tag_color ? e($consumable->supplier->tag_color) : null,+ ] : null,'min_amt' => (int) $consumable->min_amt,'model_number' => ($consumable->model_number != '') ? e($consumable->model_number) : null,'remaining' => $consumable->numRemaining(),diff --git a/app/Http/Transformers/DepartmentsTransformer.php b/app/Http/Transformers/DepartmentsTransformer.phpindex b999089159..d230180184 100644--- a/app/Http/Transformers/DepartmentsTransformer.php+++ b/app/Http/Transformers/DepartmentsTransformer.php@@ -32,6 +32,7 @@ class DepartmentsTransformer'company' => ($department->company) ? ['id' => (int) $department->company->id,'name'=> e($department->company->name),+ 'tag_color' => $department->company->tag_color ? e($department->company->tag_color) : null,] : null,'manager' => ($department->manager) ? ['id' => (int) $department->manager->id,@@ -42,6 +43,7 @@ class DepartmentsTransformer'location' => ($department->location) ? ['id' => (int) $department->location->id,'name' => e($department->location->name),+ 'tag_color' => $department->location->tag_color ? e($department->location->tag_color) : null,] : null,'users_count' => (int) ($department->users_count),'tag_color' => $department->tag_color ? e($department->tag_color) : null,diff --git a/app/Http/Transformers/LicenseSeatsTransformer.php b/app/Http/Transformers/LicenseSeatsTransformer.phpindex c518c67d22..f06536da20 100644--- a/app/Http/Transformers/LicenseSeatsTransformer.php+++ b/app/Http/Transformers/LicenseSeatsTransformer.php@@ -34,12 +34,14 @@ class LicenseSeatsTransformer['id' => (int) $seat->user->department->id,'name' => e($seat->user->department->name),+ 'tag_color' => $seat->user->department->tag_color ? e($seat->user->department->tag_color) : null,] : null,'company'=> ($seat->user->company) ?['id' => (int) $seat->user->company->id,'name' => e($seat->user->company->name),+ 'tag_color' => $seat->user->company->tag_color ? e($seat->user->company->tag_color) : null,] : null,'created_at' => Helper::getFormattedDateObject($seat->created_at, 'datetime'),@@ -52,6 +54,7 @@ class LicenseSeatsTransformer'location' => ($seat->location()) ? ['id' => (int) $seat->location()->id,'name'=> e($seat->location()->name),+ 'tag_color' => $seat->location()->tag_color ? e($seat->location()->tag_color) : null,'created_at' => Helper::getFormattedDateObject($seat->created_at, 'datetime'),] : null,'reassignable' => (bool) $seat->license->reassignable,diff --git a/app/Http/Transformers/SelectlistTransformer.php b/app/Http/Transformers/SelectlistTransformer.phpindex 363d92126a..6972be262c 100644--- a/app/Http/Transformers/SelectlistTransformer.php+++ b/app/Http/Transformers/SelectlistTransformer.php@@ -26,6 +26,7 @@ class SelectlistTransformer'id' => (int) $select_item->id,'text' => ($select_item->use_text) ? $select_item->use_text : $select_item->name,'image' => ($select_item->use_image) ? $select_item->use_image : null,+ 'tag_color' => ($select_item->tag_color) ? $select_item->tag_color : null,];}diff --git a/app/Http/Transformers/UsersTransformer.php b/app/Http/Transformers/UsersTransformer.phpindex 6058bd8d7a..a717e0afc5 100644--- a/app/Http/Transformers/UsersTransformer.php+++ b/app/Http/Transformers/UsersTransformer.php@@ -57,6 +57,7 @@ class UsersTransformer'department' => ($user->department) ? ['id' => (int) $user->department->id,'name'=> e($user->department->name),+ 'tag_color' => ($user->department->tag_color) ? e($user->department->tag_color) : null,] : null,'department_manager' => ($user->department?->manager) ? ['id' => (int) $user->department->manager->id,