diff --git a/app/Console/Commands/SendAcceptanceReminder.php b/app/Console/Commands/SendAcceptanceReminder.php index c1cf4ffda2..67efecbb34 100644 --- a/app/Console/Commands/SendAcceptanceReminder.php +++ b/app/Console/Commands/SendAcceptanceReminder.php @@ -77,7 +77,7 @@ class SendAcceptanceReminder extends Command if(!$email){ $no_email_list[] = [ 'id' => $acceptance->assignedTo?->id, - 'name' => $acceptance->assignedTo?->present()->fullName(), + 'name' => $acceptance->assignedTo?->display_name, ]; } else { $count++; diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php index f0fadb84c4..0c2260cfd3 100644 --- a/app/Http/Controllers/Api/AssetsController.php +++ b/app/Http/Controllers/Api/AssetsController.php @@ -609,7 +609,7 @@ class AssetsController extends Controller $asset->use_text = $asset->present()->fullName; if (($asset->checkedOutToUser()) && ($asset->assigned)) { - $asset->use_text .= ' → ' . $asset->assigned->getFullNameAttribute(); + $asset->use_text .= ' → ' . $asset->assigned->display_name; } diff --git a/app/Http/Controllers/Api/ConsumablesController.php b/app/Http/Controllers/Api/ConsumablesController.php index 35fb08470a..e163f080aa 100644 --- a/app/Http/Controllers/Api/ConsumablesController.php +++ b/app/Http/Controllers/Api/ConsumablesController.php @@ -230,13 +230,13 @@ class ConsumablesController extends Controller 'avatar' => ($consumable_assignment->user) ? e($consumable_assignment->user->present()->gravatar) : '', 'user' => ($consumable_assignment->user) ? [ 'id' => (int) $consumable_assignment->user->id, - 'name'=> e($consumable_assignment->user->present()->fullName()), + 'name'=> e($consumable_assignment->user->display_name), ] : null, 'created_at' => Helper::getFormattedDateObject($consumable_assignment->created_at, 'datetime'), 'note' => ($consumable_assignment->note) ? e($consumable_assignment->note) : null, 'created_by' => ($consumable_assignment->adminuser) ? [ 'id' => (int) $consumable_assignment->adminuser->id, - 'name'=> e($consumable_assignment->adminuser->present()->fullName()), + 'name'=> e($consumable_assignment->adminuser->display_name), ] : null, ]; } diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index 133937ed75..ac9c6add7b 100644 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -361,6 +361,7 @@ class UsersController extends Controller 'users.employee_num', 'users.first_name', 'users.last_name', + 'users.display_name', 'users.gravatar', 'users.avatar', 'users.email', @@ -371,20 +372,17 @@ class UsersController extends Controller $users = $users->where(function ($query) use ($request) { $query->SimpleNameSearch($request->get('search')) ->orWhere('username', 'LIKE', '%'.$request->get('search').'%') + ->orWhere('display_name', 'LIKE', '%'.$request->get('search').'%') ->orWhere('email', 'LIKE', '%'.$request->get('search').'%') ->orWhere('employee_num', 'LIKE', '%'.$request->get('search').'%'); }); } - $users = $users->orderBy('last_name', 'asc')->orderBy('first_name', 'asc'); + $users = $users->orderBy('display_name', 'asc')->orderBy('last_name', 'asc')->orderBy('first_name', 'asc'); $users = $users->paginate(50); foreach ($users as $user) { - $name_str = ''; - if ($user->last_name != '') { - $name_str .= $user->last_name.', '; - } - $name_str .= $user->first_name; + $name_str = $user->display_name; if ($user->username != '') { $name_str .= ' ('.$user->username.')'; diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php index 67b6bfb4e0..afc16a73ca 100755 --- a/app/Http/Controllers/Assets/AssetsController.php +++ b/app/Http/Controllers/Assets/AssetsController.php @@ -797,7 +797,7 @@ class AssetsController extends Controller 'item_id' => $asset->id, 'item_type' => Asset::class, 'created_by' => auth()->id(), - 'note' => 'Checkout imported by '.auth()->user()->present()->fullName().' from history importer', + 'note' => 'Checkout imported by '.auth()->user()->display_name.' from history importer', 'target_id' => $item[$asset_tag][$batch_counter]['user_id'], 'target_type' => User::class, 'created_at' => $item[$asset_tag][$batch_counter]['checkout_date'], @@ -825,7 +825,7 @@ class AssetsController extends Controller 'item_id' => $item[$asset_tag][$batch_counter]['asset_id'], 'item_type' => Asset::class, 'created_by' => auth()->id(), - 'note' => 'Checkin imported by '.auth()->user()->present()->fullName().' from history importer', + 'note' => 'Checkin imported by '.auth()->user()->display_name.' from history importer', 'target_id' => null, 'created_at' => $checkin_date, 'action_type' => 'checkin', diff --git a/app/Http/Controllers/Licenses/LicensesController.php b/app/Http/Controllers/Licenses/LicensesController.php index d67f2a0be1..98a65f5ad4 100755 --- a/app/Http/Controllers/Licenses/LicensesController.php +++ b/app/Http/Controllers/Licenses/LicensesController.php @@ -364,7 +364,7 @@ class LicensesController extends Controller $license->order_number, $license->free_seat_count, $license->seats, - ($license->adminuser ? $license->adminuser->present()->fullName() : trans('admin/reports/general.deleted_user')), + ($license->adminuser ? $license->adminuser->display_name : trans('admin/reports/general.deleted_user')), $license->depreciation ? $license->depreciation->name: '', $license->updated_at, $license->deleted_at, diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index 954b7cb64c..6883e8cea3 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -275,7 +275,7 @@ class ReportsController extends Controller if ($actionlog->target) { if ($actionlog->targetType() == 'user') { - $target_name = $actionlog->target->getFullNameAttribute(); + $target_name = $actionlog->target->display_name; } else { $target_name = $actionlog->target->getDisplayNameAttribute(); } @@ -289,7 +289,7 @@ class ReportsController extends Controller $row = [ $actionlog->created_at, - ($actionlog->adminuser) ? e($actionlog->adminuser->getFullNameAttribute()) : '', + ($actionlog->adminuser) ? e($actionlog->adminuser->display_name) : '', $actionlog->present()->actionType(), e($actionlog->itemType()), ($actionlog->itemType() == 'user') ? $actionlog->filename : $item_name, @@ -856,7 +856,7 @@ class ReportsController extends Controller } if ($request->filled('assigned_to')) { - $row[] = ($asset->checkedOutToUser() && $asset->assigned) ? $asset->assigned->getFullNameAttribute() : ($asset->assigned ? $asset->assigned->display_name : ''); + $row[] = ($asset->checkedOutToUser() && $asset->assigned) ?? $asset->assigned->display_name; $row[] = ($asset->checkedOutToUser() && $asset->assigned) ? 'user' : $asset->assignedType(); } diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php index 35ef7d3e68..ec87d3ec99 100755 --- a/app/Http/Controllers/Users/UsersController.php +++ b/app/Http/Controllers/Users/UsersController.php @@ -564,10 +564,10 @@ class UsersController extends Controller $user->employee_num, $user->first_name, $user->last_name, - $user->present()->fullName(), + $user->display_name, $user->username, $user->email, - ($user->manager) ? $user->manager->present()->fullName() : '', + ($user->manager) ? $user->manager->display_name : '', ($user->userloc) ? $user->userloc->name : '', ($user->department) ? $user->department->name : '', $user->assets->count(), diff --git a/app/Http/Controllers/ViewAssetsController.php b/app/Http/Controllers/ViewAssetsController.php index c4e72971b4..2b767650ad 100755 --- a/app/Http/Controllers/ViewAssetsController.php +++ b/app/Http/Controllers/ViewAssetsController.php @@ -185,7 +185,7 @@ class ViewAssetsController extends Controller $logaction->target_type = User::class; $data['item_quantity'] = $request->has('request-quantity') ? e($request->input('request-quantity')) : 1; - $data['requested_by'] = $user->present()->fullName(); + $data['requested_by'] = $user->display_name; $data['item'] = $item; $data['item_type'] = $itemType; $data['target'] = auth()->user(); diff --git a/app/Http/Transformers/AccessoriesTransformer.php b/app/Http/Transformers/AccessoriesTransformer.php index b502490884..491871e122 100644 --- a/app/Http/Transformers/AccessoriesTransformer.php +++ b/app/Http/Transformers/AccessoriesTransformer.php @@ -44,7 +44,7 @@ class AccessoriesTransformer 'checkouts_count' => $accessory->checkouts_count, 'created_by' => ($accessory->adminuser) ? [ 'id' => (int) $accessory->adminuser->id, - 'name'=> e($accessory->adminuser->present()->fullName()), + 'name'=> e($accessory->adminuser->display_name), ] : null, 'created_at' => Helper::getFormattedDateObject($accessory->created_at, 'datetime'), 'updated_at' => Helper::getFormattedDateObject($accessory->updated_at, 'datetime'), diff --git a/app/Http/Transformers/ActionlogsTransformer.php b/app/Http/Transformers/ActionlogsTransformer.php index 64086ca46e..5f0007310c 100644 --- a/app/Http/Transformers/ActionlogsTransformer.php +++ b/app/Http/Transformers/ActionlogsTransformer.php @@ -150,7 +150,7 @@ class ActionlogsTransformer 'item' => ($actionlog->item) ? [ 'id' => (int) $actionlog->item->id, - 'name' => ($actionlog->itemType()=='user') ? e($actionlog->item->getFullNameAttribute()) : e($actionlog->item->getDisplayNameAttribute()), + 'name' => e($actionlog->item->display_name) ?? null, 'type' => e($actionlog->itemType()), 'serial' =>e($actionlog->item->serial) ? e($actionlog->item->serial) : null ] : null, @@ -165,19 +165,19 @@ class ActionlogsTransformer 'action_type' => $actionlog->present()->actionType(), 'admin' => ($actionlog->adminuser) ? [ 'id' => (int) $actionlog->adminuser->id, - 'name' => e($actionlog->adminuser->getFullNameAttribute()), + 'name' => e($actionlog->adminuser->display_name), 'first_name'=> e($actionlog->adminuser->first_name), 'last_name'=> e($actionlog->adminuser->last_name) ] : null, 'created_by' => ($actionlog->adminuser) ? [ 'id' => (int) $actionlog->adminuser->id, - 'name' => e($actionlog->adminuser->getFullNameAttribute()), + 'name' => e($actionlog->adminuser->display_name), 'first_name'=> e($actionlog->adminuser->first_name), 'last_name'=> e($actionlog->adminuser->last_name) ] : null, 'target' => ($actionlog->target) ? [ 'id' => (int) $actionlog->target->id, - 'name' => ($actionlog->targetType()=='user') ? e($actionlog->target->getFullNameAttribute()) : e($actionlog->target->getDisplayNameAttribute()), + 'name' => ($actionlog->target->display_name) ?? null, 'type' => e($actionlog->targetType()), ] : null, diff --git a/app/Http/Transformers/AssetModelsTransformer.php b/app/Http/Transformers/AssetModelsTransformer.php index 2d47ca47db..81814c5ee1 100644 --- a/app/Http/Transformers/AssetModelsTransformer.php +++ b/app/Http/Transformers/AssetModelsTransformer.php @@ -68,7 +68,7 @@ class AssetModelsTransformer 'notes' => Helper::parseEscapedMarkedownInline($assetmodel->notes), 'created_by' => ($assetmodel->adminuser) ? [ 'id' => (int) $assetmodel->adminuser->id, - 'name'=> e($assetmodel->adminuser->present()->fullName()), + 'name'=> e($assetmodel->adminuser->display_name), ] : null, 'created_at' => Helper::getFormattedDateObject($assetmodel->created_at, 'datetime'), 'updated_at' => Helper::getFormattedDateObject($assetmodel->updated_at, 'datetime'), diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.php index 976aff94f1..af33a42694 100644 --- a/app/Http/Transformers/AssetsTransformer.php +++ b/app/Http/Transformers/AssetsTransformer.php @@ -84,7 +84,7 @@ class AssetsTransformer 'warranty_expires' => ($asset->warranty_months > 0) ? Helper::getFormattedDateObject($asset->warranty_expires, 'date') : null, 'created_by' => ($asset->adminuser) ? [ 'id' => (int) $asset->adminuser->id, - 'name'=> e($asset->adminuser->present()->fullName()), + 'name'=> e($asset->adminuser->display_name), ] : null, 'created_at' => Helper::getFormattedDateObject($asset->created_at, 'datetime'), 'updated_at' => Helper::getFormattedDateObject($asset->updated_at, 'datetime'), @@ -280,7 +280,7 @@ class AssetsTransformer 'id' => (int) $asset->id, 'image' => ($asset->getImageUrl()) ? $asset->getImageUrl() : null, 'type' => 'asset', - 'name' => e($asset->present()->fullName()), + 'name' => e($asset->display_name), 'model' => ($asset->model) ? e($asset->model->name) : null, 'model_number' => (($asset->model) && ($asset->model->model_number)) ? e($asset->model->model_number) : null, 'asset_tag' => e($asset->asset_tag), diff --git a/app/Http/Transformers/CategoriesTransformer.php b/app/Http/Transformers/CategoriesTransformer.php index 0d1834649d..348c5d4552 100644 --- a/app/Http/Transformers/CategoriesTransformer.php +++ b/app/Http/Transformers/CategoriesTransformer.php @@ -64,7 +64,7 @@ class CategoriesTransformer 'licenses_count' => (int) $category->licenses_count, 'created_by' => ($category->adminuser) ? [ 'id' => (int) $category->adminuser->id, - 'name'=> e($category->adminuser->present()->fullName()), + 'name'=> e($category->adminuser->display_name), ] : null, 'notes' => Helper::parseEscapedMarkedownInline($category->notes), 'created_at' => Helper::getFormattedDateObject($category->created_at, 'datetime'), diff --git a/app/Http/Transformers/CompaniesTransformer.php b/app/Http/Transformers/CompaniesTransformer.php index 8ca5344de6..13f9a05e27 100644 --- a/app/Http/Transformers/CompaniesTransformer.php +++ b/app/Http/Transformers/CompaniesTransformer.php @@ -38,7 +38,7 @@ class CompaniesTransformer 'users_count' => (int) $company->users_count, 'created_by' => ($company->adminuser) ? [ 'id' => (int) $company->adminuser->id, - 'name'=> e($company->adminuser->present()->fullName()), + 'name'=> e($company->adminuser->display_name), ] : null, 'notes' => Helper::parseEscapedMarkedownInline($company->notes), 'created_at' => Helper::getFormattedDateObject($company->created_at, 'datetime'), diff --git a/app/Http/Transformers/ComponentsTransformer.php b/app/Http/Transformers/ComponentsTransformer.php index 90d10ba9a5..969a137f5c 100644 --- a/app/Http/Transformers/ComponentsTransformer.php +++ b/app/Http/Transformers/ComponentsTransformer.php @@ -51,7 +51,7 @@ class ComponentsTransformer 'notes' => ($component->notes) ? Helper::parseEscapedMarkedownInline($component->notes) : null, 'created_by' => ($component->adminuser) ? [ 'id' => (int) $component->adminuser->id, - 'name'=> e($component->adminuser->present()->fullName()), + 'name'=> e($component->adminuser->display_name), ] : null, 'created_at' => Helper::getFormattedDateObject($component->created_at, 'datetime'), 'updated_at' => Helper::getFormattedDateObject($component->updated_at, 'datetime'), diff --git a/app/Http/Transformers/ConsumablesTransformer.php b/app/Http/Transformers/ConsumablesTransformer.php index 8a40606c87..4c7dbf9cc5 100644 --- a/app/Http/Transformers/ConsumablesTransformer.php +++ b/app/Http/Transformers/ConsumablesTransformer.php @@ -42,7 +42,7 @@ class ConsumablesTransformer 'notes' => ($consumable->notes) ? Helper::parseEscapedMarkedownInline($consumable->notes) : null, 'created_by' => ($consumable->adminuser) ? [ 'id' => (int) $consumable->adminuser->id, - 'name'=> e($consumable->adminuser->present()->fullName()), + 'name'=> e($consumable->adminuser->display_name), ] : null, 'created_at' => Helper::getFormattedDateObject($consumable->created_at, 'datetime'), 'updated_at' => Helper::getFormattedDateObject($consumable->updated_at, 'datetime'), diff --git a/app/Http/Transformers/DepartmentsTransformer.php b/app/Http/Transformers/DepartmentsTransformer.php index 3d1e4c6f90..e072585a12 100644 --- a/app/Http/Transformers/DepartmentsTransformer.php +++ b/app/Http/Transformers/DepartmentsTransformer.php @@ -35,7 +35,7 @@ class DepartmentsTransformer ] : null, 'manager' => ($department->manager) ? [ 'id' => (int) $department->manager->id, - 'name' => e($department->manager->getFullNameAttribute()), + 'name' => e($department->manager->display_name), 'first_name'=> e($department->manager->first_name), 'last_name'=> e($department->manager->last_name), ] : null, diff --git a/app/Http/Transformers/DepreciationsTransformer.php b/app/Http/Transformers/DepreciationsTransformer.php index af153539e2..3b0d68392c 100644 --- a/app/Http/Transformers/DepreciationsTransformer.php +++ b/app/Http/Transformers/DepreciationsTransformer.php @@ -33,7 +33,7 @@ class DepreciationsTransformer 'licenses_count' => ($depreciation->licenses_count > 0) ? (int) $depreciation->licenses_count : 0, 'created_by' => ($depreciation->adminuser) ? [ 'id' => (int) $depreciation->adminuser->id, - 'name'=> e($depreciation->adminuser->present()->fullName()), + 'name'=> e($depreciation->adminuser->display_name), ] : null, 'created_at' => Helper::getFormattedDateObject($depreciation->created_at, 'datetime'), 'updated_at' => Helper::getFormattedDateObject($depreciation->updated_at, 'datetime') diff --git a/app/Http/Transformers/GroupsTransformer.php b/app/Http/Transformers/GroupsTransformer.php index 9495aeeecc..7593926155 100644 --- a/app/Http/Transformers/GroupsTransformer.php +++ b/app/Http/Transformers/GroupsTransformer.php @@ -29,7 +29,7 @@ class GroupsTransformer 'notes' => Helper::parseEscapedMarkedownInline($group->notes), 'created_by' => ($group->adminuser) ? [ 'id' => (int) $group->adminuser->id, - 'name'=> e($group->adminuser->present()->fullName()), + 'name'=> e($group->adminuser->display_name), ] : null, 'created_at' => Helper::getFormattedDateObject($group->created_at, 'datetime'), 'updated_at' => Helper::getFormattedDateObject($group->updated_at, 'datetime'), diff --git a/app/Http/Transformers/LicensesTransformer.php b/app/Http/Transformers/LicensesTransformer.php index af2e902087..678c491257 100644 --- a/app/Http/Transformers/LicensesTransformer.php +++ b/app/Http/Transformers/LicensesTransformer.php @@ -48,7 +48,7 @@ class LicensesTransformer 'category' => ($license->category) ? ['id' => (int) $license->category->id, 'name'=> e($license->category->name)] : null, 'created_by' => ($license->adminuser) ? [ 'id' => (int) $license->adminuser->id, - 'name'=> e($license->adminuser->present()->fullName()), + 'name'=> e($license->adminuser->display_name), ] : null, 'created_at' => Helper::getFormattedDateObject($license->created_at, 'datetime'), 'updated_at' => Helper::getFormattedDateObject($license->updated_at, 'datetime'), diff --git a/app/Http/Transformers/MaintenancesTransformer.php b/app/Http/Transformers/MaintenancesTransformer.php index c2fc8a0e14..c20c254869 100644 --- a/app/Http/Transformers/MaintenancesTransformer.php +++ b/app/Http/Transformers/MaintenancesTransformer.php @@ -73,11 +73,11 @@ class MaintenancesTransformer 'completion_date' => Helper::getFormattedDateObject($assetmaintenance->completion_date, 'date'), 'user_id' => ($assetmaintenance->adminuser) ? [ 'id' => $assetmaintenance->adminuser->id, - 'name'=> e($assetmaintenance->adminuser->present()->fullName()) + 'name'=> e($assetmaintenance->adminuser->display_name) ] : null, // legacy to not change the shape of the API 'created_by' => ($assetmaintenance->adminuser) ? [ 'id' => (int) $assetmaintenance->adminuser->id, - 'name'=> e($assetmaintenance->adminuser->present()->fullName()), + 'name'=> e($assetmaintenance->adminuser->display_name), ] : null, 'created_at' => Helper::getFormattedDateObject($assetmaintenance->created_at, 'datetime'), 'updated_at' => Helper::getFormattedDateObject($assetmaintenance->updated_at, 'datetime'), diff --git a/app/Http/Transformers/ManufacturersTransformer.php b/app/Http/Transformers/ManufacturersTransformer.php index cf17eb7764..0d1373414c 100644 --- a/app/Http/Transformers/ManufacturersTransformer.php +++ b/app/Http/Transformers/ManufacturersTransformer.php @@ -40,7 +40,7 @@ class ManufacturersTransformer 'notes' => Helper::parseEscapedMarkedownInline($manufacturer->notes), 'created_by' => ($manufacturer->adminuser) ? [ 'id' => (int) $manufacturer->adminuser->id, - 'name'=> e($manufacturer->adminuser->present()->fullName()), + 'name'=> e($manufacturer->adminuser->display_name), ] : null, 'created_at' => Helper::getFormattedDateObject($manufacturer->created_at, 'datetime'), 'updated_at' => Helper::getFormattedDateObject($manufacturer->updated_at, 'datetime'), diff --git a/app/Http/Transformers/PredefinedKitsTransformer.php b/app/Http/Transformers/PredefinedKitsTransformer.php index 61c9e476a9..3660ff269e 100644 --- a/app/Http/Transformers/PredefinedKitsTransformer.php +++ b/app/Http/Transformers/PredefinedKitsTransformer.php @@ -34,7 +34,7 @@ class PredefinedKitsTransformer 'name' => e($kit->name), 'created_by' => ($kit->adminuser) ? [ 'id' => (int) $kit->adminuser->id, - 'name'=> e($kit->adminuser->present()->fullName()), + 'name'=> e($kit->adminuser->display_name), ] : null, 'created_at' => Helper::getFormattedDateObject($kit->created_at, 'datetime'), 'updated_at' => Helper::getFormattedDateObject($kit->updated_at, 'datetime'), diff --git a/app/Http/Transformers/ProfileTransformer.php b/app/Http/Transformers/ProfileTransformer.php index 9b1104515c..a0c07e699f 100644 --- a/app/Http/Transformers/ProfileTransformer.php +++ b/app/Http/Transformers/ProfileTransformer.php @@ -26,7 +26,7 @@ class ProfileTransformer 'id' => (int) $file->id, 'icon' => Helper::filetype_icon($file->filename), 'item' => ($file->item) ? [ - 'name' => ($file->itemType()=='user') ? e($file->item->getFullNameAttribute()) : e($file->item->getDisplayNameAttribute()), + 'name' => ($file->itemType()=='user') ? e($file->item->display_name) : e($file->item->getDisplayNameAttribute()), 'type' => e($file->itemType()), ] : null, 'filename' => e($file->filename), diff --git a/app/Http/Transformers/StatuslabelsTransformer.php b/app/Http/Transformers/StatuslabelsTransformer.php index 751edb7016..6409795994 100644 --- a/app/Http/Transformers/StatuslabelsTransformer.php +++ b/app/Http/Transformers/StatuslabelsTransformer.php @@ -32,7 +32,7 @@ class StatuslabelsTransformer 'notes' => e($statuslabel->notes), 'created_by' => ($statuslabel->adminuser) ? [ 'id' => (int) $statuslabel->adminuser->id, - 'name'=> e($statuslabel->adminuser->present()->fullName()), + 'name'=> e($statuslabel->adminuser->display_name), ] : null, 'created_at' => Helper::getFormattedDateObject($statuslabel->created_at, 'datetime'), 'updated_at' => Helper::getFormattedDateObject($statuslabel->updated_at, 'datetime'), diff --git a/app/Http/Transformers/UsersTransformer.php b/app/Http/Transformers/UsersTransformer.php index a4c1cdfbc6..bef81320a5 100644 --- a/app/Http/Transformers/UsersTransformer.php +++ b/app/Http/Transformers/UsersTransformer.php @@ -34,14 +34,14 @@ class UsersTransformer 'name' => e($user->getFullNameAttribute()) ?? null, 'first_name' => e($user->first_name) ?? null, 'last_name' => e($user->last_name) ?? null, - 'display_name' => e($user->display_name) ?? null, + 'display_name' => e($user->getRawOriginal('display_name')) ?? null, 'username' => e($user->username) ?? null, 'remote' => ($user->remote == '1') ? true : false, 'locale' => ($user->locale) ? e($user->locale) : null, 'employee_num' => ($user->employee_num) ? e($user->employee_num) : null, 'manager' => ($user->manager) ? [ 'id' => (int) $user->manager->id, - 'name'=> e($user->manager->first_name).' '.e($user->manager->last_name), + 'name'=> e($user->manager->display_name), ] : null, 'jobtitle' => ($user->jobtitle) ? e($user->jobtitle) : null, 'vip' => ($user->vip == '1') ? true : false, @@ -83,7 +83,7 @@ class UsersTransformer 'company' => ($user->company) ? ['id' => (int) $user->company->id, 'name'=> e($user->company->name)] : null, 'created_by' => ($user->createdBy) ? [ 'id' => (int) $user->createdBy->id, - 'name'=> e($user->createdBy->present()->fullName), + 'name'=> e($user->createdBy->display_name), ] : null, 'created_at' => Helper::getFormattedDateObject($user->created_at, 'datetime'), 'updated_at' => Helper::getFormattedDateObject($user->updated_at, 'datetime'), diff --git a/app/Mail/CheckoutAssetMail.php b/app/Mail/CheckoutAssetMail.php index fae935ceb7..72a96ee271 100644 --- a/app/Mail/CheckoutAssetMail.php +++ b/app/Mail/CheckoutAssetMail.php @@ -38,10 +38,10 @@ class CheckoutAssetMail extends Mailable // Location is a target option, but there are no emails currently associated with locations. if($this->target instanceof User){ - $this->target = $this->target->present()?->fullName(); + $this->target = $this->target->display_name; } else if($this->target instanceof Asset){ - $this->target = $this->target->assignedto?->present()?->fullName(); + $this->target = $this->target->assignedto?->display_name; } $this->last_checkout = ''; diff --git a/app/Mail/CheckoutLicenseMail.php b/app/Mail/CheckoutLicenseMail.php index e0701413e7..f3688bae5a 100644 --- a/app/Mail/CheckoutLicenseMail.php +++ b/app/Mail/CheckoutLicenseMail.php @@ -31,10 +31,10 @@ class CheckoutLicenseMail extends Mailable $this->target = $checkedOutTo; if($this->target instanceof User){ - $this->target = $this->target->present()?->fullName(); + $this->target = $this->target->display_name; } elseif($this->target instanceof Asset){ - $this->target = $this->target->assignedto?->present()?->fullName(); + $this->target = $this->target->display_name; } } diff --git a/app/Models/Labels/FieldOption.php b/app/Models/Labels/FieldOption.php index 916707b21d..cf65af57ba 100644 --- a/app/Models/Labels/FieldOption.php +++ b/app/Models/Labels/FieldOption.php @@ -30,10 +30,10 @@ class FieldOption if ($asset->relationLoaded('assignedTo')) { // If the "assignedTo" relationship was eager loaded then the way to get the // relationship changes from $asset->assignedTo to $asset->assigned. - return $asset->assigned ? $asset->assigned->present()->fullName() : null; + return $asset->assigned ? $asset->assigned->display_name : null; } - return $asset->assignedTo ? $asset->assignedTo->present()->fullName() : null; + return $asset->assignedTo ? $asset->assignedTo->display_name : null; } // Handle Laravel's stupid Carbon datetime casting diff --git a/app/Notifications/AuditNotification.php b/app/Notifications/AuditNotification.php index a7056e8cbd..6a09986030 100644 --- a/app/Notifications/AuditNotification.php +++ b/app/Notifications/AuditNotification.php @@ -64,7 +64,7 @@ use NotificationChannels\MicrosoftTeams\MicrosoftTeamsMessage; $item = $this->params['item']; $admin_user = $this->params['admin']; $fields = [ - 'By' => '<'.$admin_user->present()->viewUrl().'|'.$admin_user->present()->fullName().'>', + 'By' => '<'.$admin_user->present()->viewUrl().'|'.$admin_user->display_name.'>', ]; array_key_exists('note', $this->params) && $fields['Notes'] = $this->params['note']; array_key_exists('location', $this->params) && $fields['Location'] = $this->params['location']; @@ -89,9 +89,9 @@ use NotificationChannels\MicrosoftTeams\MicrosoftTeamsMessage; ->title(class_basename(get_class($params['item'])) . ' Audited') ->addStartGroupToSection('activityText') ->fact(trans('mail.asset'), $item) - ->fact(trans('general.administrator'), $admin_user->present()->viewUrl() . '|' . $admin_user->present()->fullName()); + ->fact(trans('general.administrator'), $admin_user->present()->viewUrl() . '|' . $admin_user->display_name); } - $message = class_basename(get_class($params['item'])) . ' Audited By '.$admin_user->present()->fullName(); + $message = class_basename(get_class($params['item'])) . ' Audited By '.$admin_user->display_name; $details = [ trans('mail.asset') => htmlspecialchars_decode($item->present()->name), trans('mail.notes') => $note ?: '', diff --git a/app/Notifications/CheckinAccessoryNotification.php b/app/Notifications/CheckinAccessoryNotification.php index 5354775d7e..b1ce3be29e 100644 --- a/app/Notifications/CheckinAccessoryNotification.php +++ b/app/Notifications/CheckinAccessoryNotification.php @@ -73,8 +73,8 @@ class CheckinAccessoryNotification extends Notification $channel = ($this->settings->webhook_channel) ? $this->settings->webhook_channel : ''; $fields = [ - trans('general.from') => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>', - trans('general.by') => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>', + trans('general.from') => '<'.$target->present()->viewUrl().'|'.$target->display_name.'>', + trans('general.by') => '<'.$admin->present()->viewUrl().'|'.$admin->display_name.'>', ]; if ($item->location) { @@ -109,7 +109,7 @@ class CheckinAccessoryNotification extends Notification ->addStartGroupToSection('activityText') ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityTitle') ->fact(trans('mail.checked_into'), $item->location->name ? $item->location->name : '') - ->fact(trans('mail.Accessory_Checkin_Notification')." by ", $admin->present()->fullName()) + ->fact(trans('mail.Accessory_Checkin_Notification')." by ", $admin->display_name) ->fact(trans('admin/consumables/general.remaining'), $item->numRemaining()) ->fact(trans('mail.notes'), $note ?: ''); } @@ -118,7 +118,7 @@ class CheckinAccessoryNotification extends Notification $details = [ trans('mail.accessory_name') => htmlspecialchars_decode($item->present()->name), trans('mail.checked_into') => $item->location->name ? $item->location->name : '', - trans('mail.Accessory_Checkin_Notification'). ' by' => $admin->present()->fullName(), + trans('mail.Accessory_Checkin_Notification'). ' by' => $admin->display_name, trans('admin/consumables/general.remaining')=> $item->numRemaining(), trans('mail.notes') => $note ?: '', ]; diff --git a/app/Notifications/CheckinAssetNotification.php b/app/Notifications/CheckinAssetNotification.php index 5de3ff1be8..2ff65134a9 100644 --- a/app/Notifications/CheckinAssetNotification.php +++ b/app/Notifications/CheckinAssetNotification.php @@ -78,7 +78,7 @@ class CheckinAssetNotification extends Notification $channel = ($this->settings->webhook_channel) ? $this->settings->webhook_channel : ''; $fields = [ - trans('general.administrator') => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>', + trans('general.administrator') => '<'.$admin->present()->viewUrl().'|'.$admin->display_name.'>', trans('general.status') => $item->assetstatus?->name, trans('general.location') => ($item->location) ? $item->location->name : '', ]; @@ -116,7 +116,7 @@ class CheckinAssetNotification extends Notification ->addStartGroupToSection('activityText') ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityText') ->fact(trans('mail.checked_into'), ($item->location) ? $item->location->name : '') - ->fact(trans('mail.Asset_Checkin_Notification') . " by ", $admin->present()->fullName()) + ->fact(trans('mail.Asset_Checkin_Notification') . " by ", $admin->display_name) ->fact(trans('admin/hardware/form.status'), $item->assetstatus?->name) ->fact(trans('mail.notes'), $note ?: ''); } @@ -126,7 +126,7 @@ class CheckinAssetNotification extends Notification $details = [ trans('mail.asset') => htmlspecialchars_decode($item->present()->name), trans('mail.checked_into') => ($item->location) ? $item->location->name : '', - trans('mail.Asset_Checkin_Notification')." by " => $admin->present()->fullName(), + trans('mail.Asset_Checkin_Notification')." by " => $admin->display_name, trans('admin/hardware/form.status') => $item->assetstatus?->name, trans('mail.notes') => $note ?: '', ]; diff --git a/app/Notifications/CheckinComponentNotification.php b/app/Notifications/CheckinComponentNotification.php index 4057c26812..1532d507c7 100644 --- a/app/Notifications/CheckinComponentNotification.php +++ b/app/Notifications/CheckinComponentNotification.php @@ -76,8 +76,8 @@ class CheckinComponentNotification extends Notification if ($admin) { $fields = [ - trans('general.from') => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>', - trans('general.by') => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>', + trans('general.from') => '<'.$target->present()->viewUrl().'|'.$target->display_name.'>', + trans('general.by') => '<'.$admin->present()->viewUrl().'|'.$admin->display_name.'>', ]; if ($item->location) { @@ -90,7 +90,7 @@ class CheckinComponentNotification extends Notification } else { $fields = [ - 'To' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>', + 'To' => '<'.$target->present()->viewUrl().'|'.$target->display_name.'>', 'By' => 'CLI tool', ]; } @@ -119,16 +119,16 @@ class CheckinComponentNotification extends Notification ->title(trans('mail.Component_checkin_notification')) ->addStartGroupToSection('activityText') ->fact(htmlspecialchars_decode($item->present()->name), '', 'header') - ->fact(trans('mail.Component_checkin_notification')." by ", $admin->present()->fullName() ?: 'CLI tool') - ->fact(trans('mail.checkedin_from'), $target->present()->fullName()) + ->fact(trans('mail.Component_checkin_notification')." by ", $admin->display_name ?: 'CLI tool') + ->fact(trans('mail.checkedin_from'), $target->display_name) ->fact(trans('admin/consumables/general.remaining'), $item->numRemaining()) ->fact(trans('mail.notes'), $note ?: ''); } $message = trans('mail.Component_checkin_notification'); $details = [ - trans('mail.checkedin_from')=> $target->present()->fullName(), - trans('mail.Component_checkin_notification')." by " => $admin->present()->fullName() ?: 'CLI tool', + trans('mail.checkedin_from')=> $target->display_name, + trans('mail.Component_checkin_notification')." by " => $admin->display_name ?: 'CLI tool', trans('admin/consumables/general.remaining') => $item->numRemaining(), trans('mail.notes') => $note ?: '', ]; @@ -153,7 +153,7 @@ class CheckinComponentNotification extends Notification Section::create( KeyValue::create( trans('mail.checkedin_from') ?: '', - $target->present()->fullName() ?: '', + $target->display_name ?: '', trans('admin/consumables/general.remaining').': '.$item->numRemaining(), ) ->onClick(route('components.show', $item->id)) diff --git a/app/Notifications/CheckinLicenseSeatNotification.php b/app/Notifications/CheckinLicenseSeatNotification.php index 07c3308dbc..f0110db8ba 100644 --- a/app/Notifications/CheckinLicenseSeatNotification.php +++ b/app/Notifications/CheckinLicenseSeatNotification.php @@ -77,8 +77,8 @@ class CheckinLicenseSeatNotification extends Notification if ($admin) { $fields = [ - trans('general.from') => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>', - trans('general.by') => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>', + trans('general.from') => '<'.$target->present()->viewUrl().'|'.$target->display_name.'>', + trans('general.by') => '<'.$admin->present()->viewUrl().'|'.$admin->display_name.'>', ]; if ($item->location) { @@ -91,7 +91,7 @@ class CheckinLicenseSeatNotification extends Notification } else { $fields = [ - 'To' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>', + 'To' => '<'.$target->present()->viewUrl().'|'.$target->display_name.'>', 'By' => 'CLI tool', ]; } @@ -120,17 +120,17 @@ class CheckinLicenseSeatNotification extends Notification ->title(trans('mail.License_Checkin_Notification')) ->addStartGroupToSection('activityText') ->fact(htmlspecialchars_decode($item->present()->name), '', 'header') - ->fact(trans('mail.License_Checkin_Notification')." by ", $admin->present()->fullName() ?: 'CLI tool') - ->fact(trans('mail.checkedin_from'), $target->present()->fullName()) + ->fact(trans('mail.License_Checkin_Notification')." by ", $admin->display_name ?: 'CLI tool') + ->fact(trans('mail.checkedin_from'), $target->display_name) ->fact(trans('admin/consumables/general.remaining'), $item->availCount()->count()) ->fact(trans('mail.notes'), $note ?: ''); } $message = trans('mail.License_Checkin_Notification'); $details = [ - trans('mail.checkedin_from')=> $target->present()->fullName(), + trans('mail.checkedin_from')=> $target->display_name, trans('mail.license_for') => htmlspecialchars_decode($item->present()->name), - trans('mail.License_Checkin_Notification')." by " => $admin->present()->fullName() ?: 'CLI tool', + trans('mail.License_Checkin_Notification')." by " => $admin->display_name ?: 'CLI tool', trans('admin/consumables/general.remaining') => $item->availCount()->count(), trans('mail.notes') => $note ?: '', ]; @@ -155,7 +155,7 @@ class CheckinLicenseSeatNotification extends Notification Section::create( KeyValue::create( trans('mail.checkedin_from') ?: '', - $target->present()->fullName() ?: '', + $target->display_name ?: '', trans('admin/consumables/general.remaining').': '.$item->availCount()->count(), ) ->onClick(route('licenses.show', $item->id)) diff --git a/app/Notifications/CheckoutAccessoryNotification.php b/app/Notifications/CheckoutAccessoryNotification.php index 016bfc526c..22dc78b2b3 100644 --- a/app/Notifications/CheckoutAccessoryNotification.php +++ b/app/Notifications/CheckoutAccessoryNotification.php @@ -100,8 +100,8 @@ class CheckoutAccessoryNotification extends Notification $channel = ($this->settings->webhook_channel) ? $this->settings->webhook_channel : ''; $fields = [ - trans('general.to') => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>', - trans('general.by') => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>', + trans('general.to') => '<'.$target->present()->viewUrl().'|'.$target->display_name.'>', + trans('general.by') => '<'.$admin->present()->viewUrl().'|'.$admin->display_name.'>', ]; if ($item->location) { @@ -140,7 +140,7 @@ class CheckoutAccessoryNotification extends Notification ->fact(trans('mail.assigned_to'), $target->present()->name) ->fact(trans('general.qty'), $this->checkout_qty) ->fact(trans('mail.checkedout_from'), $item->location->name ? $item->location->name : '') - ->fact(trans('mail.Accessory_Checkout_Notification') . " by ", $admin->present()->fullName()) + ->fact(trans('mail.Accessory_Checkout_Notification') . " by ", $admin->display_name) ->fact(trans('admin/consumables/general.remaining'), $item->numRemaining()) ->fact(trans('mail.notes'), $note ?: ''); } @@ -151,7 +151,7 @@ class CheckoutAccessoryNotification extends Notification trans('mail.accessory_name') => htmlspecialchars_decode($item->present()->name), trans('general.qty') => $this->checkout_qty, trans('mail.checkedout_from') => $item->location->name ? $item->location->name : '', - trans('mail.Accessory_Checkout_Notification'). ' by' => $admin->present()->fullName(), + trans('mail.Accessory_Checkout_Notification'). ' by' => $admin->display_name, trans('admin/consumables/general.remaining')=> $item->numRemaining(), trans('mail.notes') => $note ?: '', ]; diff --git a/app/Notifications/CheckoutAssetNotification.php b/app/Notifications/CheckoutAssetNotification.php index 8cdfbdd046..70ab74c60e 100644 --- a/app/Notifications/CheckoutAssetNotification.php +++ b/app/Notifications/CheckoutAssetNotification.php @@ -93,8 +93,8 @@ class CheckoutAssetNotification extends Notification $channel = ($this->settings->webhook_channel) ? $this->settings->webhook_channel : ''; $fields = [ - trans('general.to') => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>', - trans('general.by') => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>', + trans('general.to') => '<'.$target->present()->viewUrl().'|'.$target->display_name.'>', + trans('general.by') => '<'.$admin->present()->viewUrl().'|'.$admin->display_name.'>', ]; if ($item->location) { @@ -135,7 +135,7 @@ class CheckoutAssetNotification extends Notification ->addStartGroupToSection('activityText') ->fact(trans('mail.assigned_to'), $target->present()->name) ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityText') - ->fact(trans('mail.Asset_Checkout_Notification') . " by ", $admin->present()->fullName()) + ->fact(trans('mail.Asset_Checkout_Notification') . " by ", $admin->display_name) ->fact(trans('mail.notes'), $note ?: ''); } @@ -143,7 +143,7 @@ class CheckoutAssetNotification extends Notification $details = [ trans('mail.assigned_to') => $target->present()->name, trans('mail.asset') => htmlspecialchars_decode($item->present()->name), - trans('mail.Asset_Checkout_Notification'). ' by' => $admin->present()->fullName(), + trans('mail.Asset_Checkout_Notification'). ' by' => $admin->display_name, trans('mail.notes') => $note ?: '', ]; return array($message, $details); diff --git a/app/Notifications/CheckoutComponentNotification.php b/app/Notifications/CheckoutComponentNotification.php index fab303fb52..11f77e9d47 100644 --- a/app/Notifications/CheckoutComponentNotification.php +++ b/app/Notifications/CheckoutComponentNotification.php @@ -80,8 +80,8 @@ class CheckoutComponentNotification extends Notification $channel = ($this->settings->webhook_channel) ? $this->settings->webhook_channel : ''; $fields = [ - trans('general.to') => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>', - trans('general.by') => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>', + trans('general.to') => '<'.$target->present()->viewUrl().'|'.$target->display_name.'>', + trans('general.by') => '<'.$admin->present()->viewUrl().'|'.$admin->display_name.'>', ]; if ($item->location) { @@ -117,17 +117,17 @@ class CheckoutComponentNotification extends Notification ->title(trans('mail.Component_checkout_notification')) ->addStartGroupToSection('activityText') ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityTitle') - ->fact(trans('mail.Component_checkout_notification')." by ", $admin->present()->fullName()) - ->fact(trans('mail.assigned_to'), $target->present()->fullName()) + ->fact(trans('mail.Component_checkout_notification')." by ", $admin->display_name) + ->fact(trans('mail.assigned_to'), $target->display_name) ->fact(trans('admin/consumables/general.remaining'), $item->numRemaining()) ->fact(trans('mail.notes'), $note ?: ''); } $message = trans('mail.Component_checkout_notification'); $details = [ - trans('mail.assigned_to') => $target->present()->fullName(), + trans('mail.assigned_to') => $target->display_name, trans('mail.item') => htmlspecialchars_decode($item->present()->name), - trans('mail.Component_checkout_notification').' by' => $admin->present()->fullName(), + trans('mail.Component_checkout_notification').' by' => $admin->display_name, trans('admin/consumables/general.remaining') => $item->numRemaining(), trans('mail.notes') => $note ?: '', ]; @@ -152,7 +152,7 @@ class CheckoutComponentNotification extends Notification Section::create( KeyValue::create( trans('mail.assigned_to') ?: '', - $target->present()->fullName() ?: '', + $target->display_name ?: '', trans('admin/consumables/general.remaining').': '.$item->numRemaining(), ) ->onClick(route('api.assets.show', $target->id)) diff --git a/app/Notifications/CheckoutConsumableNotification.php b/app/Notifications/CheckoutConsumableNotification.php index e8db8b8bd1..0274bbeecf 100644 --- a/app/Notifications/CheckoutConsumableNotification.php +++ b/app/Notifications/CheckoutConsumableNotification.php @@ -80,8 +80,8 @@ class CheckoutConsumableNotification extends Notification $channel = ($this->settings->webhook_channel) ? $this->settings->webhook_channel : ''; $fields = [ - trans('general.to') => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>', - trans('general.by') => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>', + trans('general.to') => '<'.$target->present()->viewUrl().'|'.$target->display_name.'>', + trans('general.by') => '<'.$admin->present()->viewUrl().'|'.$admin->display_name.'>', ]; if ($item->location) { @@ -117,17 +117,17 @@ class CheckoutConsumableNotification extends Notification ->title(trans('mail.Consumable_checkout_notification')) ->addStartGroupToSection('activityText') ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityTitle') - ->fact(trans('mail.Consumable_checkout_notification')." by ", $admin->present()->fullName()) - ->fact(trans('mail.assigned_to'), $target->present()->fullName()) + ->fact(trans('mail.Consumable_checkout_notification')." by ", $admin->display_name) + ->fact(trans('mail.assigned_to'), $target->display_name) ->fact(trans('admin/consumables/general.remaining'), $item->numRemaining()) ->fact(trans('mail.notes'), $note ?: ''); } $message = trans('mail.Consumable_checkout_notification'); $details = [ - trans('mail.assigned_to') => $target->present()->fullName(), + trans('mail.assigned_to') => $target->display_name, trans('mail.item') => htmlspecialchars_decode($item->present()->name), - trans('mail.Consumable_checkout_notification').' by' => $admin->present()->fullName(), + trans('mail.Consumable_checkout_notification').' by' => $admin->display_name, trans('admin/consumables/general.remaining') => $item->numRemaining(), trans('mail.notes') => $note ?: '', ]; @@ -152,7 +152,7 @@ class CheckoutConsumableNotification extends Notification Section::create( KeyValue::create( trans('mail.assigned_to') ?: '', - $target->present()->fullName() ?: '', + $target->display_name ?: '', trans('admin/consumables/general.remaining').': '.$item->numRemaining(), ) ->onClick(route('users.show', $target->id)) diff --git a/app/Notifications/CheckoutLicenseSeatNotification.php b/app/Notifications/CheckoutLicenseSeatNotification.php index fa00421885..4fc2ab7def 100644 --- a/app/Notifications/CheckoutLicenseSeatNotification.php +++ b/app/Notifications/CheckoutLicenseSeatNotification.php @@ -78,8 +78,8 @@ class CheckoutLicenseSeatNotification extends Notification $channel = ($this->settings->webhook_channel) ? $this->settings->webhook_channel : ''; $fields = [ - trans('general.to') => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>', - trans('general.by') => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>', + trans('general.to') => '<'.$target->present()->viewUrl().'|'.$target->display_name.'>', + trans('general.by') => '<'.$admin->present()->viewUrl().'|'.$admin->display_name.'>', ]; if ($item->location) { @@ -115,17 +115,17 @@ class CheckoutLicenseSeatNotification extends Notification ->title(trans('mail.License_Checkout_Notification')) ->addStartGroupToSection('activityText') ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityTitle') - ->fact(trans('mail.License_Checkout_Notification')." by ", $admin->present()->fullName()) - ->fact(trans('mail.assigned_to'), $target->present()->fullName()) + ->fact(trans('mail.License_Checkout_Notification')." by ", $admin->display_name) + ->fact(trans('mail.assigned_to'), $target->display_name) ->fact(trans('admin/consumables/general.remaining'), $item->availCount()->count()) ->fact(trans('mail.notes'), $note ?: ''); } $message = trans('mail.License_Checkout_Notification'); $details = [ - trans('mail.assigned_to') => $target->present()->fullName(), + trans('mail.assigned_to') => $target->display_name, trans('mail.license_for') => htmlspecialchars_decode($item->present()->name), - trans('mail.License_Checkout_Notification').' by' => $admin->present()->fullName(), + trans('mail.License_Checkout_Notification').' by' => $admin->display_name, trans('admin/consumables/general.remaining') => $item->availCount()->count(), trans('mail.notes') => $note ?: '', ]; diff --git a/app/Notifications/RequestAssetCancelation.php b/app/Notifications/RequestAssetCancelation.php index 6c06ede3ca..0211b17e4e 100644 --- a/app/Notifications/RequestAssetCancelation.php +++ b/app/Notifications/RequestAssetCancelation.php @@ -79,7 +79,7 @@ class RequestAssetCancelation extends Notification $fields = [ 'QTY' => $qty, - 'Canceled By' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>', + 'Canceled By' => '<'.$target->present()->viewUrl().'|'.$target->display_name.'>', ]; if (($this->expected_checkin) && ($this->expected_checkin != '')) { diff --git a/app/Notifications/RequestAssetNotification.php b/app/Notifications/RequestAssetNotification.php index d2001f2e13..e3c99c56f6 100644 --- a/app/Notifications/RequestAssetNotification.php +++ b/app/Notifications/RequestAssetNotification.php @@ -78,7 +78,7 @@ class RequestAssetNotification extends Notification $fields = [ 'QTY' => $qty, - 'Requested By' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>', + 'Requested By' => '<'.$target->present()->viewUrl().'|'.$target->display_name.'>', ]; return (new SlackMessage) diff --git a/app/Presenters/Presenter.php b/app/Presenters/Presenter.php index 85fe2338ae..13bae66ecd 100644 --- a/app/Presenters/Presenter.php +++ b/app/Presenters/Presenter.php @@ -3,6 +3,7 @@ namespace App\Presenters; use App\Models\SnipeModel; +use Illuminate\Database\Eloquent\Casts\Attribute; abstract class Presenter { @@ -69,10 +70,30 @@ abstract class Presenter return ''; } - public function name() - { - return $this->model->name; - } +// public function name() +// { +// return $this->model->name; +// } +// +// public function display_name() +// { +// return $this->model->display_name; +// } + + +// protected function displayName(): Attribute +// { +// // This override should only kick in if the model has a display_name prope +// if ($this->getRawOriginal('display_name')) { +// return Attribute:: make ( +// get: fn(mixed $value) => 'Poop:'.$this->display_name +// ); +// } +// +// return Attribute:: make( +// get: fn(mixed $value) => 'Fart: '.$this->name, +// ); +// } public function __get($property) { @@ -80,7 +101,7 @@ abstract class Presenter return $this->{$property}(); } - return e($this->model->{$property}); + return $this->model->{$property}; } public function __call($method, $args) diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php index 8eb28091c5..296fafe568 100644 --- a/app/Presenters/UserPresenter.php +++ b/app/Presenters/UserPresenter.php @@ -456,23 +456,23 @@ class UserPresenter extends Presenter * * @return string */ - public function fullName() - { - if ($this->display_name) { - return html_entity_decode($this->display_name, ENT_QUOTES | ENT_XML1, 'UTF-8'); - } - return html_entity_decode($this->first_name.' '.$this->last_name, ENT_QUOTES | ENT_XML1, 'UTF-8'); - } +// public function fullName() +// { +// if ($this->display_name) { +// return 'kjdfh'.html_entity_decode($this->display_name, ENT_QUOTES | ENT_XML1, 'UTF-8'); +// } +// return 'roieuoe'.html_entity_decode($this->first_name.' '.$this->last_name, ENT_QUOTES | ENT_XML1, 'UTF-8'); +// } - /** - * Standard accessor. - * @TODO Remove presenter::fullName() entirely? - * @return string - */ - public function name() - { - return $this->fullName(); - } +// /** +// * Standard accessor. +// * @TODO Remove presenter::fullName() entirely? +// * @return string +// */ +// public function name() +// { +// return $this->fullName(); +// } diff --git a/app/Providers/BreadcrumbsServiceProvider.php b/app/Providers/BreadcrumbsServiceProvider.php index e7b41a8fca..a5092b3ded 100644 --- a/app/Providers/BreadcrumbsServiceProvider.php +++ b/app/Providers/BreadcrumbsServiceProvider.php @@ -74,12 +74,12 @@ class BreadcrumbsServiceProvider extends ServiceProvider Breadcrumbs::for('hardware.show', fn (Trail $trail, Asset $asset) => $trail->parent('hardware.index', route('hardware.index')) - ->push($asset->present()->fullName(), route('hardware.show', $asset)) + ->push($asset->display_name, route('hardware.show', $asset)) ); Breadcrumbs::for('hardware.edit', fn (Trail $trail, Asset $asset) => $trail->parent('hardware.index', route('hardware.index')) - ->push($asset->present()->fullName(), route('hardware.show', $asset)) + ->push($asset->display_name, route('hardware.show', $asset)) ->push(trans('admin/hardware/general.edit')) ); @@ -579,7 +579,7 @@ class BreadcrumbsServiceProvider extends ServiceProvider Breadcrumbs::for('users.show', fn (Trail $trail, User $user) => $trail->parent('users.index', route('users.index')) - ->push($user->getFullNameAttribute() ?? 'Missing Username!', route('users.show', $user)) + ->push($user->display_name ?? 'Missing Username!', route('users.show', $user)) ); Breadcrumbs::for('users.edit', fn (Trail $trail, User $user) => diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index b9326fd83a..989fad08f2 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -28,8 +28,9 @@ class UserFactory extends Factory 'email' => $this->faker->safeEmail(), 'employee_num' => $this->faker->numberBetween(3500, 35050), 'first_name' => $this->faker->firstName(), - 'jobtitle' => $this->faker->jobTitle(), 'last_name' => $this->faker->lastName(), + 'display_name' => null, + 'jobtitle' => $this->faker->jobTitle(), 'locale' => 'en-US', 'notes' => 'Created by DB seeder', 'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password diff --git a/resources/views/account/profile.blade.php b/resources/views/account/profile.blade.php index abf463ad94..b4aea49918 100755 --- a/resources/views/account/profile.blade.php +++ b/resources/views/account/profile.blade.php @@ -139,7 +139,7 @@ {!! $errors->first('gravatar', '') !!}

- {{ $user->present()->fullName() }} avatar image + {{ $user->display_name }} avatar image {!! trans('general.gravatar_url') !!}

diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php index 8fa949869e..f71ac7d5df 100755 --- a/resources/views/account/view-assets.blade.php +++ b/resources/views/account/view-assets.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') -{{ trans('general.hello_name', array('name' => $user->present()->getFullNameAttribute())) }} +{{ trans('general.hello_name', array('name' => $user->display_name)) }} @parent @stop @@ -37,7 +37,7 @@ {{ $user->present()->fullName() }} + {{ $user->email }} diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index c38393a246..a4dc6b40cb 100755 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -3,7 +3,7 @@ @section('title') @if ($user->id) {{ trans('admin/users/table.updateuser') }} - {{ $user->present()->fullName() }} + {{ $user->display_name }} @else {{ trans('admin/users/table.createuser') }} @endif @@ -322,7 +322,7 @@ maxlength="191" name="display_name" id="display_name" - value="{{ old('display_name', $user->display_name) }}" + value="{{ old('display_name', $user->getRawOriginal('display_name')) }}" /> {!! $errors->first('display_name', '') !!} diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php index abd6c53912..935959a400 100644 --- a/resources/views/users/print.blade.php +++ b/resources/views/users/print.blade.php @@ -3,7 +3,7 @@ @if ((isset($users) && count($users) === 1)) - {{ trans('general.assigned_to', ['name' => $users[0]->present()->fullName()]) }} - {{ date('Y-m-d H:i', time()) }} + {{ trans('general.assigned_to', ['name' => $users[0]->display_name]) }} - {{ date('Y-m-d H:i', time()) }} @else {{ trans('admin/users/general.print_assigned') }} - {{ date('Y-m-d H:i', time()) }} @endisset @@ -96,10 +96,10 @@
{{-- used for page breaks when printing --}}

@if ($show_user->company) - {{ trans('admin/companies/table.name') }}: {{ $show_user->company->name }} + {{ trans('admin/companies/table.name') }}: {{ $show_user->company->name }}
@endif - {{ trans('general.assigned_to', ['name' => $show_user->present()->fullName()]) }} + {{ trans('general.assigned_to', ['name' => $show_user->display_name]) }} {{ ($show_user->employee_num!='') ? ' (#'.$show_user->employee_num.') ' : '' }} {{ ($show_user->jobtitle!='' ? ' - '.$show_user->jobtitle : '') }}

diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index ea0017869d..6ce7118791 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') -{{ trans('admin/users/general.view_user', ['name' => $user->present()->fullName()]) }} +{{ trans('admin/users/general.view_user', ['name' => $user->display_name]) }} @parent @stop @@ -179,7 +179,7 @@
- {{ $user->present()->fullName() }} + {{ $user->display_name }}
@can('update', $user) @@ -266,7 +266,7 @@ @if ($user->deleted_at=='')
@if ($user->isDeletable()) - + {{ trans('button.delete')}} @@ -353,7 +353,7 @@ {{ trans('admin/users/table.display_name') }}
- {{ $user->display_name }} + {{ $user->getRawOriginal('display_name') }}
@endif @@ -490,7 +490,7 @@
- {{ $user->manager->getFullNameAttribute() }} + {{ $user->manager->display_name }}
@@ -613,7 +613,7 @@ @if ($user->createdBy) - @if ($user->createdBy->deleted_at=='') - {{ $user->createdBy->present()->fullName }} + {{ $user->createdBy->display_name }} @else {{ $user->createdBy->present()->fullName }} @endif @@ -838,7 +838,7 @@ class="table table-striped snipe-table" data-url="{{ route('api.assets.index',['assigned_to' => e($user->id), 'assigned_type' => 'App\Models\User']) }}" data-export-options='{ - "fileName": "export-{{ str_slug($user->present()->fullName()) }}-assets-{{ date('Y-m-d') }}", + "fileName": "export-{{ str_slug($user->username) }}-assets-{{ date('Y-m-d') }}", "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"] }'> diff --git a/tests/Feature/Console/SendAcceptanceReminderTest.php b/tests/Feature/Console/SendAcceptanceReminderTest.php index ee28e09355..6d0a51dd5d 100644 --- a/tests/Feature/Console/SendAcceptanceReminderTest.php +++ b/tests/Feature/Console/SendAcceptanceReminderTest.php @@ -45,7 +45,7 @@ class SendAcceptanceReminderTest extends TestCase ]); $headers = ['ID', 'Name']; $rows = [ - [$userA->id, $userA->present()->fullName()], + [$userA->id, $userA->display_name], ]; $this->artisan('snipeit:acceptance-reminder') ->expectsOutput("The following users do not have an email address:") diff --git a/tests/Unit/BladeComponents/UserFullNameTest.php b/tests/Unit/BladeComponents/UserFullNameTest.php index bbd74c7fa1..feb88ff71d 100644 --- a/tests/Unit/BladeComponents/UserFullNameTest.php +++ b/tests/Unit/BladeComponents/UserFullNameTest.php @@ -17,7 +17,7 @@ class UserFullNameTest extends TestCase function () { return [ 'actor' => User::factory()->viewUsers()->create(), - 'user' => User::factory()->create(['first_name' => 'Jim', 'last_name' => 'Bagg']), + 'user' => User::factory()->create(['first_name' => 'Jim', 'last_name' => 'Bagg', 'display_name' => null]), 'assertions' => function ($rendered) { Assert::assertStringContainsString(' User::factory()->viewUsers()->create(), - 'user' => User::factory()->deleted()->create(['first_name' => 'Jim', 'last_name' => 'Bagg']), + 'user' => User::factory()->deleted()->create(['first_name' => 'Jim', 'last_name' => 'Bagg', 'display_name' => 'Jim Baggins']), 'assertions' => function ($rendered) { Assert::assertStringContainsString(' User::factory()->create(), - 'user' => User::factory()->create(['first_name' => 'Jim', 'last_name' => 'Bagg']), + 'user' => User::factory()->create(['first_name' => 'Jim', 'last_name' => 'Bagg', 'display_name' => 'Jim Bagg']), 'assertions' => function ($rendered) { Assert::assertStringContainsString('Jim Bagg', $rendered); Assert::assertStringNotContainsString(' User::factory()->create(), - 'user' => User::factory()->deleted()->create(['first_name' => 'Jim', 'last_name' => 'Bagg']), + 'user' => User::factory()->deleted()->create(['first_name' => 'Jim', 'last_name' => 'Bagg', 'display_name' => 'Jim Bagg']), 'assertions' => function ($rendered) { Assert::assertStringContainsString('Jim Bagg', $rendered); }, @@ -82,6 +82,10 @@ class UserFullNameTest extends TestCase { ['actor' => $actor, 'user' => $user, 'assertions' => $assertions] = $provided(); + // $user->displayName(); + + // \Log::error($user->toArray()); + $this->actingAs($actor); $renderedTemplateString = View::make('blade.full-user-name', ['user' => $user])->render();