A free open source IT asset/license management system
Apply pint to Presenters directory
snipe55d46cbefec5
diff --git a/app/Presenters/AccessoryPresenter.php b/app/Presenters/AccessoryPresenter.phpindex da474f339f..b438cab22d 100644--- a/app/Presenters/AccessoryPresenter.php+++ b/app/Presenters/AccessoryPresenter.php@@ -9,6 +9,7 @@ class AccessoryPresenter extends Presenter{/*** Json Column Layout for bootstrap table+ ** @return string*/public static function dataTableLayout()@@ -101,7 +102,7 @@ class AccessoryPresenter extends Presenter'title' => trans('admin/accessories/general.remaining'),'footerFormatter' => 'qtySumFormatter','class' => 'text-right text-padding-number-cell',- ],[+ ], ['field' => 'checkouts_count','searchable' => false,'sortable' => true,@@ -135,13 +136,13 @@ class AccessoryPresenter extends Presenter'sortable' => true,'visible' => false,'title' => trans('general.order_number'),- ],[+ ], ['field' => 'notes','searchable' => true,'sortable' => true,'visible' => false,'title' => trans('general.notes'),- 'formatter' => 'notesFormatter'+ 'formatter' => 'notesFormatter',], ['field' => 'created_by','searchable' => false,@@ -188,7 +189,6 @@ class AccessoryPresenter extends Presenterreturn json_encode($layout);}-public static function assignedDataTableLayout(){$layout = [@@ -260,12 +260,13 @@ class AccessoryPresenter extends Presenter/*** Pregenerated link to this accessories view page.+ ** @return string*/public function nameUrl(){if (auth()->user()->can('view', ['\App\Models\Accessory', $this])) {- return '<a href="' . route('accessories.show', $this->id) . '">' . e($this->display_name) . '</a>';+ return '<a href="'.route('accessories.show', $this->id).'">'.e($this->display_name).'</a>';} else {return e($this->display_name);}@@ -273,6 +274,7 @@ class AccessoryPresenter extends Presenter/*** Url to view this item.+ ** @return string*/public function viewUrl()diff --git a/app/Presenters/ActionlogPresenter.php b/app/Presenters/ActionlogPresenter.phpindex 0f85e30ea5..665a7fe706 100644--- a/app/Presenters/ActionlogPresenter.php+++ b/app/Presenters/ActionlogPresenter.php@@ -13,6 +13,7 @@ class ActionlogPresenter extends Presenterif (empty($user->deleted_at)) {return $user->present()->nameUrl();}+// The user was deletedreturn '<del>'.$user->display_name.'</del> (deleted)';}@@ -26,6 +27,7 @@ class ActionlogPresenter extends Presenterif (empty($item->deleted_at)) {return $this->model->item->present()->nameUrl();}+// The item was deletedreturn '<del>'.$item->name.'</del> (deleted)';}@@ -67,7 +69,7 @@ class ActionlogPresenter extends Presenterreturn 'fa-solid fa-user-pen';}- return 'fa-solid fa-user';+ return 'fa-solid fa-user';}// Everything elsediff --git a/app/Presenters/AssetAuditPresenter.php b/app/Presenters/AssetAuditPresenter.phpindex 1863f3b28b..dd7cd60b78 100644--- a/app/Presenters/AssetAuditPresenter.php+++ b/app/Presenters/AssetAuditPresenter.php@@ -3,7 +3,6 @@namespace App\Presenters;use App\Models\CustomField;-use DateTime;/*** Class AssetPresenter@@ -12,18 +11,19 @@ class AssetAuditPresenter extends Presenter{/*** Json Column Layout for bootstrap table+ ** @return string*/public static function dataTableLayout(){$layout = [- [+ ['field' => 'checkbox','checkbox' => true,'titleTooltip' => trans('general.select_all_none'),- 'printIgnore' => true,- ],- [+ 'printIgnore' => true,+ ],+ ['field' => 'id','searchable' => false,'sortable' => true,diff --git a/app/Presenters/AssetModelPresenter.php b/app/Presenters/AssetModelPresenter.phpindex ab6a53472e..7bf2b9e88b 100644--- a/app/Presenters/AssetModelPresenter.php+++ b/app/Presenters/AssetModelPresenter.php@@ -223,6 +223,7 @@ class AssetModelPresenter extends Presenter/*** Formatted note for this model+ ** @return string*/public function note()@@ -243,6 +244,7 @@ class AssetModelPresenter extends Presenter/*** Pretty name for this model+ ** @return string*/public function modelName()@@ -262,15 +264,17 @@ class AssetModelPresenter extends Presenter/*** Standard url for use to view page.+ ** @return string*/public function nameUrl(){- return '<a href="' . route('models.show', $this->id) . '">' . e($this->name) . '</a>';+ return '<a href="'.route('models.show', $this->id).'">'.e($this->name).'</a>';}/*** Generate img tag to this models image.+ ** @return string*/public function imageUrl()@@ -284,6 +288,7 @@ class AssetModelPresenter extends Presenter/*** Generate img tag to this models image.+ ** @return string*/public function imageSrc()@@ -297,6 +302,7 @@ class AssetModelPresenter extends Presenter/*** Url to view this item.+ ** @return string*/public function viewUrl()@@ -304,12 +310,13 @@ class AssetModelPresenter extends Presenterreturn route('models.show', $this->id);}- public function formattedNameLink() {+ public function formattedNameLink()+ {if (auth()->user()->can('view', ['\App\Models\AssetModel', $this])) {- return '<a href="'.route('models.show', e($this->id)).'" class="'. (($this->deleted_at!='') ? 'deleted' : '').'">'.e($this->display_name).'</a>';+ return '<a href="'.route('models.show', e($this->id)).'" class="'.(($this->deleted_at != '') ? 'deleted' : '').'">'.e($this->display_name).'</a>';}- return '<span class="'. (($this->deleted_at!='') ? 'deleted' : '').'">'.e($this->display_name).'</span>';+ return '<span class="'.(($this->deleted_at != '') ? 'deleted' : '').'">'.e($this->display_name).'</span>';}}diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.phpindex 72d009846f..4598840605 100644--- a/app/Presenters/AssetPresenter.php+++ b/app/Presenters/AssetPresenter.php@@ -3,6 +3,7 @@namespace App\Presenters;use App\Models\CustomField;+use App\Models\Setting;use Carbon\CarbonImmutable;use DateTime;@@ -13,6 +14,7 @@ class AssetPresenter extends Presenter{/*** Json Column Layout for bootstrap table+ ** @return string*/public static function dataTableLayout()@@ -23,7 +25,7 @@ class AssetPresenter extends Presenter'checkbox' => true,'titleTooltip' => trans('general.select_all_none'),'printIgnore' => true,- 'class' => 'hidden-print'+ 'class' => 'hidden-print',], ['field' => 'id','searchable' => false,@@ -62,7 +64,7 @@ class AssetPresenter extends Presenter'title' => trans('admin/hardware/table.image'),'visible' => true,'formatter' => 'imageFormatter',- ],[+ ], ['field' => 'serial','searchable' => true,'sortable' => true,@@ -110,7 +112,7 @@ class AssetPresenter extends Presenter'title' => trans('general.employee_number'),'visible' => false,'formatter' => 'employeeNumFormatter',- ],[+ ], ['field' => 'jobtitle','searchable' => true,'sortable' => true,@@ -153,14 +155,14 @@ class AssetPresenter extends Presenter'title' => trans('general.purchase_date'),'formatter' => 'dateDisplayFormatter',],-// [-// 'field' => 'first_checkout',-// 'searchable' => true,-// 'sortable' => true,-// 'visible' => false,-// 'title' => trans('general.first_checkout'),-// 'formatter' => 'dateDisplayFormatter',-// ],+ // [+ // 'field' => 'first_checkout',+ // 'searchable' => true,+ // 'sortable' => true,+ // 'visible' => false,+ // 'title' => trans('general.first_checkout'),+ // 'formatter' => 'dateDisplayFormatter',+ // ],['field' => 'age','searchable' => false,@@ -175,13 +177,13 @@ class AssetPresenter extends Presenter'footerFormatter' => 'sumFormatter','class' => 'text-right',], [- "field" => "book_value",- "searchable" => false,- "sortable" => false,- "title" => trans('admin/hardware/table.book_value'),- "footerFormatter" => 'sumFormatter',- "class" => "text-right",- ],[+ 'field' => 'book_value',+ 'searchable' => false,+ 'sortable' => false,+ 'title' => trans('admin/hardware/table.book_value'),+ 'footerFormatter' => 'sumFormatter',+ 'class' => 'text-right',+ ], ['field' => 'order_number','searchable' => true,'sortable' => true,@@ -343,7 +345,7 @@ class AssetPresenter extends Presenter'sortable' => true,'switchable' => true,'title' => $field->name,- 'formatter'=> 'customFieldsFormatter',+ 'formatter' => 'customFieldsFormatter','escape' => true,'class' => ($field->field_encrypted == '1') ? 'css-padlock' : '','visible' => ($field->show_in_listview == '1') ? true : false,@@ -376,7 +378,6 @@ class AssetPresenter extends Presenterreturn json_encode($layout);}-public static function assignedAccessoriesDataTableLayout(){$layout = [@@ -447,12 +448,13 @@ class AssetPresenter extends Presenter/*** Generate html link to this items name.+ ** @return string*/public function nameUrl(){if (auth()->user()->can('view', ['\App\Models\Asset', $this])) {- return '<a href="' . route('hardware.show', $this->id) . '">' . e($this->display_name) . '</a>';+ return '<a href="'.route('hardware.show', $this->id).'">'.e($this->display_name).'</a>';} else {return e($this->display_name);}@@ -469,6 +471,7 @@ class AssetPresenter extends Presenter/*** Generate img tag to this items image.+ ** @return mixed|string*/public function imageUrl()@@ -491,6 +494,7 @@ class AssetPresenter extends Presenter/*** Generate img tag to this items image.+ ** @return mixed|string*/public function imageSrc()@@ -510,6 +514,7 @@ class AssetPresenter extends Presenter/*** Get Displayable Name+ ** @return string** @todo this should be factored out - it should be subsumed by fullName (below)@@ -522,6 +527,7 @@ class AssetPresenter extends Presenter/*** Helper for notification polymorphism.+ ** @return mixed*/public function fullName()@@ -548,6 +554,7 @@ class AssetPresenter extends Presenter/*** Returns the date this item hits EOL.+ ** @return false|string*/public function eol_date()@@ -559,6 +566,7 @@ class AssetPresenter extends Presenter/*** How many months until this asset hits EOL.+ ** @return null*/public function months_until_eol()@@ -578,8 +586,8 @@ class AssetPresenter extends Presenter/*** @return string- * This handles the status label "meta" status of "deployed" if- * it's assigned. Should maybe deprecate.+ * This handles the status label "meta" status of "deployed" if+ * it's assigned. Should maybe deprecate.*/public function statusMeta(){@@ -592,8 +600,8 @@ class AssetPresenter extends Presenter/*** @return string- * This handles the status label "meta" status of "deployed" if- * it's assigned. Should maybe deprecate.+ * This handles the status label "meta" status of "deployed" if+ * it's assigned. Should maybe deprecate.*/public function statusText(){@@ -606,8 +614,8 @@ class AssetPresenter extends Presenter/*** @return string- * This handles the status label "meta" status of "deployed" if- * it's assigned. Results look like:+ * This handles the status label "meta" status of "deployed" if+ * it's assigned. Results look like:** (if assigned and the status label is "Ready to Deploy"):* (Deployed)@@ -648,6 +656,7 @@ class AssetPresenter extends Presenter/*** Date the warranty expires.+ ** @return false|string*/public function warranty_expires()@@ -664,19 +673,22 @@ class AssetPresenter extends Presenter/*** Used to take user created URL and dynamically fill in the needed values per asset+ ** @return string*/public function dynamicUrl($dynamic_url){- $url = (str_replace('{LOCALE}',\App\Models\Setting::getSettings()->locale, $dynamic_url));+ $url = (str_replace('{LOCALE}', Setting::getSettings()->locale, $dynamic_url));$url = (str_replace('{SERIAL}', urlencode($this->model->serial), $url));$url = (str_replace('{MODEL_NAME}', urlencode($this->model->model->name), $url));$url = (str_replace('{MODEL_NUMBER}', urlencode($this->model->model->model_number), $url));+return $url;}/*** Url to view this item.+ ** @return string*/public function viewUrl()diff --git a/app/Presenters/CategoryPresenter.php b/app/Presenters/CategoryPresenter.phpindex d3ab2c24f3..bf3433effe 100644--- a/app/Presenters/CategoryPresenter.php+++ b/app/Presenters/CategoryPresenter.php@@ -9,14 +9,15 @@ class CategoryPresenter extends Presenter{/*** Json Column Layout for bootstrap table+ ** @return string*/public static function dataTableLayout(){$layout = [[- 'field' => 'checkbox',- 'checkbox' => true,+ 'field' => 'checkbox',+ 'checkbox' => true,'titleTooltip' => trans('general.select_all_none'),'printIgnore' => true,'class' => 'hidden-print',@@ -78,12 +79,12 @@ class CategoryPresenter extends Presenter'visible' => true,'formatter' => 'trueFalseFormatter',], [- "field" => "use_default_eula",- "searchable" => false,- "sortable" => true,- "title" => trans('admin/categories/general.use_default_eula_column'),+ 'field' => 'use_default_eula',+ 'searchable' => false,+ 'sortable' => true,+ 'title' => trans('admin/categories/general.use_default_eula_column'),'visible' => true,- "formatter" => 'trueFalseFormatter',+ 'formatter' => 'trueFalseFormatter',], ['field' => 'tag_color','searchable' => true,@@ -127,7 +128,7 @@ class CategoryPresenter extends Presenter'sortable' => false,'switchable' => false,'title' => trans('table.actions'),- 'formatter' => 'categoriesActionsFormatter',+ 'formatter' => 'categoriesActionsFormatter','printIgnore' => true,'class' => 'hidden-print',],@@ -138,12 +139,13 @@ class CategoryPresenter extends Presenter/*** Link to this categories name+ ** @return string*/public function nameUrl(){if (auth()->user()->can('view', ['\App\Models\Category', $this])) {- return '<a href="' . route('categories.show', $this->id) . '">' . e($this->display_name) . '</a>';+ return '<a href="'.route('categories.show', $this->id).'">'.e($this->display_name).'</a>';} else {return e($this->display_name);}@@ -151,6 +153,7 @@ class CategoryPresenter extends Presenter/*** Url to view this item.+ ** @return string*/public function viewUrl()@@ -158,18 +161,19 @@ class CategoryPresenter extends Presenterreturn route('categories.show', $this->id);}- public function formattedNameLink() {+ public function formattedNameLink()+ {// We use soft-deletes for categories, but we don't give you a way to restore them right now. This would be the method we'd use when that happens-// if (auth()->user()->can('view', ['\App\Models\Category', $this])) {-// return ($this->tag_color ? "<i class='fa-solid fa-fw fa-square' style='color: ".e($this->tag_color)."' aria-hidden='true'></i>" : '').'<a href="'.route('models.show', e($this->id)).'" class="'. (($this->deleted_at!='') ? 'deleted' : '').'">'.e($this->display_name).'</a>';-// }+ // if (auth()->user()->can('view', ['\App\Models\Category', $this])) {+ // return ($this->tag_color ? "<i class='fa-solid fa-fw fa-square' style='color: ".e($this->tag_color)."' aria-hidden='true'></i>" : '').'<a href="'.route('models.show', e($this->id)).'" class="'. (($this->deleted_at!='') ? 'deleted' : '').'">'.e($this->display_name).'</a>';+ // }- if ((auth()->user()->can('view', ['\App\Models\Category', $this])) && ($this->deleted_at=='')) {- return ($this->tag_color ? "<i class='fa-solid fa-fw fa-square' style='color: ".e($this->tag_color)."' aria-hidden='true'></i>" : '').'<a href="'.route('categories.show', e($this->id)).'">'.e($this->name).'</a>';+ if ((auth()->user()->can('view', ['\App\Models\Category', $this])) && ($this->deleted_at == '')) {+ return ($this->tag_color ? "<i class='fa-solid fa-fw fa-square' style='color: ".e($this->tag_color)."' aria-hidden='true'></i>" : '').'<a href="'.route('categories.show', e($this->id)).'">'.e($this->name).'</a>';}- return ($this->tag_color ? "<i class='fa-solid fa-fw fa-square' style='color: ".e($this->tag_color)."' aria-hidden='true'></i>" : '').'<span class="'. (($this->deleted_at!='') ? 'deleted' : '').'">'.e($this->display_name).'</span>';+ return ($this->tag_color ? "<i class='fa-solid fa-fw fa-square' style='color: ".e($this->tag_color)."' aria-hidden='true'></i>" : '').'<span class="'.(($this->deleted_at != '') ? 'deleted' : '').'">'.e($this->display_name).'</span>';}}diff --git a/app/Presenters/CompanyPresenter.php b/app/Presenters/CompanyPresenter.phpindex e1a0c777bc..6d2af89291 100644--- a/app/Presenters/CompanyPresenter.php+++ b/app/Presenters/CompanyPresenter.php@@ -9,6 +9,7 @@ class CompanyPresenter extends Presenter{/*** Json Column Layout for bootstrap table+ ** @return string*/public static function dataTableLayout()@@ -36,7 +37,7 @@ class CompanyPresenter extends Presenter'switchable' => true,'title' => trans('admin/users/table.phone'),'visible' => false,- 'formatter' => 'phoneFormatter',+ 'formatter' => 'phoneFormatter',], ['field' => 'fax','searchable' => true,@@ -44,7 +45,7 @@ class CompanyPresenter extends Presenter'switchable' => true,'title' => trans('admin/suppliers/table.fax'),'visible' => false,- 'formatter' => 'phoneFormatter',+ 'formatter' => 'phoneFormatter',], ['field' => 'email','searchable' => true,@@ -52,7 +53,7 @@ class CompanyPresenter extends Presenter'switchable' => true,'title' => trans('admin/suppliers/table.email'),'visible' => true,- 'formatter' => 'emailFormatter',+ 'formatter' => 'emailFormatter',], ['field' => 'image','searchable' => false,@@ -161,12 +162,13 @@ class CompanyPresenter extends Presenter/*** Link to this companies name+ ** @return string*/public function nameUrl(){if (auth()->user()->can('view', ['\App\Models\Company', $this])) {- return '<a href="' . route('companies.show', $this->id) . '">' . e($this->display_name) . '</a>';+ return '<a href="'.route('companies.show', $this->id).'">'.e($this->display_name).'</a>';} else {return e($this->display_name);}@@ -174,6 +176,7 @@ class CompanyPresenter extends Presenter/*** Url to view this item.+ ** @return string*/public function viewUrl()@@ -181,7 +184,8 @@ class CompanyPresenter extends Presenterreturn route('companies.show', $this->id);}- public function formattedNameLink() {+ public function formattedNameLink()+ {if (auth()->user()->can('view', ['\App\Models\Company', $this])) {return ($this->tag_color ? "<i class='fa-solid fa-fw fa-square' style='color: ".e($this->tag_color)."' aria-hidden='true'></i>" : '').'<a href="'.route('companies.show', e($this->id)).'">'.e($this->display_name).'</a>';diff --git a/app/Presenters/ComponentPresenter.php b/app/Presenters/ComponentPresenter.phpindex 76d98f9376..5d5e97136d 100644--- a/app/Presenters/ComponentPresenter.php+++ b/app/Presenters/ComponentPresenter.php@@ -9,6 +9,7 @@ class ComponentPresenter extends Presenter{/*** Json Column Layout for bootstrap table+ ** @return string*/public static function dataTableLayout()@@ -38,7 +39,7 @@ class ComponentPresenter extends Presenter'visible' => false,'formatter' => 'companiesLinkObjFormatter',],- [+ ['field' => 'image','searchable' => false,'sortable' => true,@@ -143,14 +144,14 @@ class ComponentPresenter extends Presenter'visible' => false,'title' => trans('general.notes'),'formatter' => 'notesFormatter',- ],[+ ], ['field' => 'created_by','searchable' => false,'sortable' => true,'title' => trans('general.created_by'),'visible' => false,'formatter' => 'usersLinkObjFormatter',- ],[+ ], ['field' => 'created_at','searchable' => false,'sortable' => true,@@ -192,7 +193,8 @@ class ComponentPresenter extends Presenterreturn json_encode($layout);}- public static function checkedOut() {+ public static function checkedOut()+ {$layout = [['field' => 'id',@@ -225,7 +227,7 @@ class ComponentPresenter extends Presenter'visible' => true,'title' => trans('general.notes'),'formatter' => 'notesFormatter',- ],[+ ], ['field' => 'created_at','searchable' => false,'sortable' => true,@@ -252,12 +254,13 @@ class ComponentPresenter extends Presenter/*** Generate html link to this items name.+ ** @return string*/public function nameUrl(){if (auth()->user()->can('view', ['\App\Models\Component', $this])) {- return '<a href="' . route('components.show', $this->id) . '">' . e($this->display_name) . '</a>';+ return '<a href="'.route('components.show', $this->id).'">'.e($this->display_name).'</a>';} else {return e($this->display_name);}@@ -265,6 +268,7 @@ class ComponentPresenter extends Presenter/*** Url to view this item.+ ** @return string*/public function viewUrl()diff --git a/app/Presenters/ConsumablePresenter.php b/app/Presenters/ConsumablePresenter.phpindex 0e129a0714..56e2e1a50d 100644--- a/app/Presenters/ConsumablePresenter.php+++ b/app/Presenters/ConsumablePresenter.php@@ -9,6 +9,7 @@ class ConsumablePresenter extends Presenter{/*** Json Column Layout for bootstrap table+ ** @return string*/public static function dataTableLayout()@@ -150,7 +151,7 @@ class ConsumablePresenter extends Presenter'title' => trans('general.created_by'),'visible' => false,'formatter' => 'usersLinkObjFormatter',- ],[+ ], ['field' => 'created_at','searchable' => false,'sortable' => true,@@ -234,7 +235,6 @@ class ConsumablePresenter extends Presenter'formatter' => 'usersLinkObjFormatter',],-];return json_encode($layout);@@ -242,6 +242,7 @@ class ConsumablePresenter extends Presenter/*** Url to view this item.+ ** @return string*/public function viewUrl()@@ -251,10 +252,11 @@ class ConsumablePresenter extends Presenter/*** Generate html link to this items name.+ ** @return string*/public function nameUrl(){- return '<a href="' . route('consumables.show', $this->id) . '">' . e($this->name) . '</a>';+ return '<a href="'.route('consumables.show', $this->id).'">'.e($this->name).'</a>';}}diff --git a/app/Presenters/CustomFieldsetPresenter.php b/app/Presenters/CustomFieldsetPresenter.phpindex 15abead059..2b757a5500 100644--- a/app/Presenters/CustomFieldsetPresenter.php+++ b/app/Presenters/CustomFieldsetPresenter.php@@ -7,16 +7,12 @@ namespace App\Presenters;*/class CustomFieldsetPresenter extends Presenter{--public function nameUrl(){if (auth()->user()->can('view', ['\App\Models\CustomFieldset', $this])) {- return '<a href="' . route('fieldsets.show', $this->id) . '">' . e($this->display_name) . '</a>';+ return '<a href="'.route('fieldsets.show', $this->id).'">'.e($this->display_name).'</a>';} else {return e($this->display_name);}}--}diff --git a/app/Presenters/DepartmentPresenter.php b/app/Presenters/DepartmentPresenter.phpindex 035d761a3b..55605d08d2 100644--- a/app/Presenters/DepartmentPresenter.php+++ b/app/Presenters/DepartmentPresenter.php@@ -7,9 +7,9 @@ namespace App\Presenters;*/class DepartmentPresenter extends Presenter{-/*** Json Column Layout for bootstrap table+ ** @return string*/public static function dataTableLayout()@@ -37,7 +37,7 @@ class DepartmentPresenter extends Presenter'switchable' => true,'title' => trans('general.company'),'visible' => false,- 'formatter' => 'companiesLinkObjFormatter'+ 'formatter' => 'companiesLinkObjFormatter',], ['field' => 'image','searchable' => false,@@ -54,7 +54,7 @@ class DepartmentPresenter extends Presenter'title' => trans('admin/departments/table.manager'),'visible' => true,'formatter' => 'usersLinkObjFormatter',- ],[+ ], ['field' => 'location','searchable' => false,'sortable' => true,@@ -67,8 +67,8 @@ class DepartmentPresenter extends Presenter'searchable' => false,'sortable' => true,'switchable' => true,- 'title' => trans('general.people'),- 'titleTooltip' => trans('general.people'),+ 'title' => trans('general.people'),+ 'titleTooltip' => trans('general.people'),'visible' => true,'class' => 'css-house-user',], [@@ -102,7 +102,7 @@ class DepartmentPresenter extends Presenter'title' => trans('general.created_by'),'visible' => false,'formatter' => 'usersLinkObjFormatter',- ],[+ ], ['field' => 'actions','searchable' => false,'sortable' => false,@@ -118,21 +118,22 @@ class DepartmentPresenter extends Presenterreturn json_encode($layout);}-/*** Url to view this item.+ ** @return string*/public function viewUrl(){if (auth()->user()->can('view', ['\App\Models\Department', $this])) {- return '<a href="' . route('departments.show', $this->id) . '">' . e($this->display_name) . '</a>';+ return '<a href="'.route('departments.show', $this->id).'">'.e($this->display_name).'</a>';} else {return $this->display_name;}}- public function formattedNameLink() {+ public function formattedNameLink()+ {if (auth()->user()->can('view', ['\App\Models\Department', $this])) {return ($this->tag_color ? "<i class='fa-solid fa-fw fa-square' style='color: ".e($this->tag_color)."' aria-hidden='true'></i>" : '').'<a href="'.route('departments.show', e($this->id)).'">'.e($this->name).'</a>';diff --git a/app/Presenters/DepreciationPresenter.php b/app/Presenters/DepreciationPresenter.phpindex c179b443a6..6bbb1fa3f6 100644--- a/app/Presenters/DepreciationPresenter.php+++ b/app/Presenters/DepreciationPresenter.php@@ -9,6 +9,7 @@ class DepreciationPresenter extends Presenter{/*** Json Column Layout for bootstrap table+ ** @return string*/public static function dataTableLayout()@@ -35,37 +36,37 @@ class DepreciationPresenter extends Presenter'field' => 'months','searchable' => true,'sortable' => true,- 'title' => trans('admin/depreciations/table.term'),+ 'title' => trans('admin/depreciations/table.term'),'visible' => true,],[- "field" => 'depreciation_min',- "searchable" => false,- "sortable" => true,- "title" => trans('admin/depreciations/table.depreciation_min'),- "visible" => true,+ 'field' => 'depreciation_min',+ 'searchable' => false,+ 'sortable' => true,+ 'title' => trans('admin/depreciations/table.depreciation_min'),+ 'visible' => true,],['field' => 'assets_count','searchable' => false,'sortable' => true,- 'title' => trans('general.assets'),+ 'title' => trans('general.assets'),'visible' => true,],['field' => 'models_count','searchable' => false,'sortable' => true,- 'title' => trans('general.asset_models'),+ 'title' => trans('general.asset_models'),'visible' => true,], ['field' => 'licenses_count','searchable' => false,'sortable' => true,- 'title' => trans('general.licenses'),+ 'title' => trans('general.licenses'),'visible' => true,- ],[+ ], ['field' => 'created_by','searchable' => false,'sortable' => true,@@ -104,14 +105,15 @@ class DepreciationPresenter extends Presenterreturn json_encode($layout);}- public function formattedNameLink() {+ public function formattedNameLink()+ {return ($this->tag_color ? "<i class='fa-solid fa-fw fa-square' style='color: ".e($this->tag_color)."' aria-hidden='true'></i> " : '').e($this->display_name);}public function nameUrl(){if (auth()->user()->can('view', ['\App\Models\Depreciation', $this])) {- return '<a href="' . route('depreciations.show', $this->id) . '">' . e($this->display_name) . '</a>';+ return '<a href="'.route('depreciations.show', $this->id).'">'.e($this->display_name).'</a>';} else {return e($this->display_name);}diff --git a/app/Presenters/DepreciationReportPresenter.php b/app/Presenters/DepreciationReportPresenter.phpindex 975e84a4be..32ab6b11a1 100644--- a/app/Presenters/DepreciationReportPresenter.php+++ b/app/Presenters/DepreciationReportPresenter.php@@ -1,187 +1,186 @@<?php+namespace App\Presenters;use DateTime;/*** Class DepreciationReportPresenter- * @package App\Presenters*/class DepreciationReportPresenter extends Presenter{-/*** Json Column Layout for bootstrap table+ ** @return string*/public static function dataTableLayout(){$layout = [- [- "field" => "company",- "searchable" => true,- "sortable" => true,- "switchable" => true,- "title" => trans('general.company'),- "visible" => false,+ [+ 'field' => 'company',+ 'searchable' => true,+ 'sortable' => true,+ 'switchable' => true,+ 'title' => trans('general.company'),+ 'visible' => false,], [- "field" => "category",- "searchable" => true,- "sortable" => true,- "title" => trans('general.category'),- "visible" => true,+ 'field' => 'category',+ 'searchable' => true,+ 'sortable' => true,+ 'title' => trans('general.category'),+ 'visible' => true,], [- "field" => "name",- "searchable" => true,- "sortable" => true,+ 'field' => 'name',+ 'searchable' => true,+ 'sortable' => true,'switchable' => false,- "title" => trans('admin/hardware/form.name'),- "visible" => false,+ 'title' => trans('admin/hardware/form.name'),+ 'visible' => false,+ ], [+ 'field' => 'asset_tag',+ 'searchable' => true,+ 'sortable' => true,+ 'title' => trans('general.asset_tag'),+ 'visible' => true,], [- "field" => "asset_tag",- "searchable" => true,- "sortable" => true,- "title" => trans('general.asset_tag'),- "visible" => true,- ],[- "field" => "model",- "searchable" => true,- "sortable" => true,- "title" => trans('general.asset_model'),- "visible" => true,+ 'field' => 'model',+ 'searchable' => true,+ 'sortable' => true,+ 'title' => trans('general.asset_model'),+ 'visible' => true,], [- "field" => "model_number",- "searchable" => true,- "sortable" => true,- "title" => trans('admin/models/table.modelnumber'),- "visible" => false+ 'field' => 'model_number',+ 'searchable' => true,+ 'sortable' => true,+ 'title' => trans('admin/models/table.modelnumber'),+ 'visible' => false,], [- "field" => "serial",- "searchable" => true,- "sortable" => true,- "title" => trans('admin/hardware/form.serial'),- "visible" => true,+ 'field' => 'serial',+ 'searchable' => true,+ 'sortable' => true,+ 'title' => trans('admin/hardware/form.serial'),+ 'visible' => true,], [- "field" => "depreciation",- "searchable" => true,- "sortable" => true,- "title" => trans('general.depreciation'),- "visible" => true,+ 'field' => 'depreciation',+ 'searchable' => true,+ 'sortable' => true,+ 'title' => trans('general.depreciation'),+ 'visible' => true,], [- "field" => "number_of_months",- "searchable" => true,- "sortable" => true,- "title" => trans('admin/depreciations/general.number_of_months'),- "visible" => true,+ 'field' => 'number_of_months',+ 'searchable' => true,+ 'sortable' => true,+ 'title' => trans('admin/depreciations/general.number_of_months'),+ 'visible' => true,], [- "field" => "status",- "searchable" => true,- "sortable" => true,- "title" => trans('admin/hardware/table.status'),- "visible" => true,+ 'field' => 'status',+ 'searchable' => true,+ 'sortable' => true,+ 'title' => trans('admin/hardware/table.status'),+ 'visible' => true,], [- "field" => "checked_out_to",- "searchable" => true,- "sortable" => true,- "title" => trans('admin/hardware/table.checkoutto'),- "visible" => false,+ 'field' => 'checked_out_to',+ 'searchable' => true,+ 'sortable' => true,+ 'title' => trans('admin/hardware/table.checkoutto'),+ 'visible' => false,], [- "field" => "location",- "searchable" => true,- "sortable" => true,- "title" => trans('admin/hardware/table.location'),- "visible" => true,+ 'field' => 'location',+ 'searchable' => true,+ 'sortable' => true,+ 'title' => trans('admin/hardware/table.location'),+ 'visible' => true,], [- "field" => "manufacturer",- "searchable" => true,- "sortable" => true,- "title" => trans('general.manufacturer'),- "visible" => false,- ],[- "field" => "supplier",- "searchable" => true,- "sortable" => true,- "title" => trans('general.supplier'),- "visible" => false,+ 'field' => 'manufacturer',+ 'searchable' => true,+ 'sortable' => true,+ 'title' => trans('general.manufacturer'),+ 'visible' => false,], [- "field" => "purchase_date",- "searchable" => true,- "sortable" => true,- "visible" => true,- "title" => trans('general.purchase_date'),- "formatter" => "dateDisplayFormatter"+ 'field' => 'supplier',+ 'searchable' => true,+ 'sortable' => true,+ 'title' => trans('general.supplier'),+ 'visible' => false,], [- "field" => "currency",- "searchable" => false,- "sortable" => false,- "visible" => false,- "title" => 'Currency',+ 'field' => 'purchase_date',+ 'searchable' => true,+ 'sortable' => true,+ 'visible' => true,+ 'title' => trans('general.purchase_date'),+ 'formatter' => 'dateDisplayFormatter',], [- "field" => "purchase_cost",- "searchable" => true,- "sortable" => true,- "visible" => true,- "title" => trans('general.purchase_cost'),- "footerFormatter" => 'sumFormatter',- "class" => "text-right",+ 'field' => 'currency',+ 'searchable' => false,+ 'sortable' => false,+ 'visible' => false,+ 'title' => 'Currency',], [- "field" => "order_number",- "searchable" => true,- "sortable" => true,- "visible" => false,- "title" => trans('general.order_number'),+ 'field' => 'purchase_cost',+ 'searchable' => true,+ 'sortable' => true,+ 'visible' => true,+ 'title' => trans('general.purchase_cost'),+ 'footerFormatter' => 'sumFormatter',+ 'class' => 'text-right',+ ], [+ 'field' => 'order_number',+ 'searchable' => true,+ 'sortable' => true,+ 'visible' => false,+ 'title' => trans('general.order_number'),], [- "field" => "eol",- "searchable" => false,- "sortable" => false,- "visible" => false,- "title" => trans('general.eol'),- "formatter" => "dateDisplayFormatter"+ 'field' => 'eol',+ 'searchable' => false,+ 'sortable' => false,+ 'visible' => false,+ 'title' => trans('general.eol'),+ 'formatter' => 'dateDisplayFormatter',+ ], [+ 'field' => 'book_value',+ 'searchable' => true,+ 'sortable' => false,+ 'visible' => true,+ 'title' => trans('admin/hardware/table.book_value'),+ 'footerFormatter' => 'sumFormatter',+ 'class' => 'text-right',+ ], [+ 'field' => 'monthly_depreciation',+ 'searchable' => true,+ 'sortable' => true,+ 'visible' => true,+ 'title' => trans('admin/hardware/table.monthly_depreciation'),], [- "field" => "book_value",- "searchable" => true,- "sortable" => false,- "visible" => true,- "title" => trans('admin/hardware/table.book_value'),- "footerFormatter" => 'sumFormatter',- "class" => "text-right",+ 'field' => 'diff',+ 'searchable' => false,+ 'sortable' => false,+ 'visible' => true,+ 'title' => trans('admin/hardware/table.diff'),+ 'footerFormatter' => 'sumFormatter',+ 'class' => 'text-right',], [- "field" => "monthly_depreciation",- "searchable" => true,- "sortable" => true,- "visible" => true,- "title" => trans('admin/hardware/table.monthly_depreciation')- ],[- "field" => "diff",- "searchable" => false,- "sortable" => false,- "visible" => true,- "title" => trans('admin/hardware/table.diff'),- "footerFormatter" => 'sumFormatter',- "class" => "text-right",- ],[- "field" => "warranty_expires",- "searchable" => false,- "sortable" => false,- "visible" => false,- "title" => trans('admin/hardware/form.warranty_expires'),- "formatter" => "dateDisplayFormatter"- ],+ 'field' => 'warranty_expires',+ 'searchable' => false,+ 'sortable' => false,+ 'visible' => false,+ 'title' => trans('admin/hardware/form.warranty_expires'),+ 'formatter' => 'dateDisplayFormatter',+ ],];return json_encode($layout);}--/*** Generate html link to this items name.+ ** @return string*/public function nameUrl(){if (auth()->user()->can('view', ['\App\Models\Depreciation', $this])) {- return '<a href="' . route('depreciations.show', $this->id) . '">' . e($this->display_name) . '</a>';+ return '<a href="'.route('depreciations.show', $this->id).'">'.e($this->display_name).'</a>';} else {return e($this->display_name);}@@ -192,50 +191,56 @@ class DepreciationReportPresenter extends Presenterif ($this->model->model) {return $this->model->model->present()->nameUrl();}+return '';}/*** Generate img tag to this items image.+ ** @return mixed|string*/public function imageUrl(){$imagePath = '';- if ($this->image && !empty($this->image)) {+ if ($this->image && ! empty($this->image)) {$imagePath = $this->image;$imageAlt = $this->name;- } elseif ($this->model && !empty($this->model->image)) {+ } elseif ($this->model && ! empty($this->model->image)) {$imagePath = $this->model->image;$imageAlt = $this->model->name;}$url = config('app.url');- if (!empty($imagePath)) {+ if (! empty($imagePath)) {$imagePath = '<img src="'.$url.'/uploads/assets/'.$imagePath.' height="50" width="50" alt="'.$imageAlt.'">';}+return $imagePath;}/*** Generate img tag to this items image.+ ** @return mixed|string*/public function imageSrc(){$imagePath = '';- if ($this->image && !empty($this->image)) {+ if ($this->image && ! empty($this->image)) {$imagePath = $this->image;- } elseif ($this->model && !empty($this->model->image)) {+ } elseif ($this->model && ! empty($this->model->image)) {$imagePath = $this->model->image;}- if (!empty($imagePath)) {+ if (! empty($imagePath)) {return config('app.url').'/uploads/assets/'.$imagePath;}+return $imagePath;}/*** Get Displayable Name+ ** @return string** @todo this should be factored out - it should be subsumed by fullName (below)@@ -248,6 +253,7 @@ class DepreciationReportPresenter extends Presenter/*** Helper for notification polymorphism.+ ** @return mixed*/public function fullName()@@ -268,18 +274,22 @@ class DepreciationReportPresenter extends Presenterif ($this->model->model) {$str .= ' - '.$this->model->model->name;}+return $str;}+/*** Returns the date this item hits EOL.+ ** @return false|string*/public function eol_date(){- if (( $this->purchase_date ) && ( $this->model->model ) && ($this->model->model->eol) ) {+ if (($this->purchase_date) && ($this->model->model) && ($this->model->model->eol)) {$date = date_create($this->purchase_date);- date_add($date, date_interval_create_from_date_string($this->model->model->eol . ' months'));+ date_add($date, date_interval_create_from_date_string($this->model->model->eol.' months'));+return date_format($date, 'Y-m-d');}@@ -287,14 +297,15 @@ class DepreciationReportPresenter extends Presenter/*** How many months until this asset hits EOL.+ ** @return null*/public function months_until_eol(){- $today = date("Y-m-d");- $d1 = new DateTime($today);- $d2 = new DateTime($this->eol_date());+ $today = date('Y-m-d');+ $d1 = new DateTime($today);+ $d2 = new DateTime($this->eol_date());if ($this->eol_date() > $today) {$interval = $d2->diff($d1);@@ -307,34 +318,36 @@ class DepreciationReportPresenter extends Presenter/*** @return string- * This handles the status label "meta" status of "deployed" if- * it's assigned. Should maybe deprecate.+ * This handles the status label "meta" status of "deployed" if+ * it's assigned. Should maybe deprecate.*/public function statusMeta(){if ($this->model->assigned) {return 'deployed';}+return $this->model->assetstatus->getStatuslabelType();}/*** @return string- * This handles the status label "meta" status of "deployed" if- * it's assigned. Should maybe deprecate.+ * This handles the status label "meta" status of "deployed" if+ * it's assigned. Should maybe deprecate.*/public function statusText(){if ($this->model->assigned) {return trans('general.deployed');}+return $this->model->assetstatus->name;}/*** @return string- * This handles the status label "meta" status of "deployed" if- * it's assigned. Results look like:+ * This handles the status label "meta" status of "deployed" if+ * it's assigned. Results look like:** (if assigned and the status label is "Ready to Deploy"):* (Deployed)@@ -345,7 +358,8 @@ class DepreciationReportPresenter extends Presenter* (if not deployed:)* Another Status Label*/- public function fullStatusText() {+ public function fullStatusText()+ {// Make sure the status is validif ($this->assetstatus) {@@ -354,7 +368,7 @@ class DepreciationReportPresenter extends Presenter// If it's assigned and not set to the default "ready to deploy" statusif ($this->assetstatus->name != trans('general.ready_to_deploy')) {- return trans('general.deployed'). ' (' . $this->model->assetstatus->name.')';+ return trans('general.deployed').' ('.$this->model->assetstatus->name.')';}// If it's assigned to the default "ready to deploy" status, just@@ -374,13 +388,15 @@ class DepreciationReportPresenter extends Presenter/*** Date the warantee expires.+ ** @return false|string*/public function warranty_expires(){if (($this->purchase_date) && ($this->warranty_months)) {$date = date_create($this->purchase_date);- date_add($date, date_interval_create_from_date_string($this->warranty_months . ' months'));+ date_add($date, date_interval_create_from_date_string($this->warranty_months.' months'));+return date_format($date, 'Y-m-d');}@@ -389,6 +405,7 @@ class DepreciationReportPresenter extends Presenter/*** Url to view this item.+ ** @return string*/public function viewUrl()diff --git a/app/Presenters/GroupPresenter.php b/app/Presenters/GroupPresenter.phpindex 836b8934c9..d8838e2e7e 100644--- a/app/Presenters/GroupPresenter.php+++ b/app/Presenters/GroupPresenter.php@@ -35,7 +35,7 @@ class GroupPresenter extends Presenter'searchable' => false,'sortable' => true,'switchable' => true,- 'title' => trans('admin/groups/table.users'),+ 'title' => trans('admin/groups/table.users'),'visible' => true,'class' => 'css-users',], [@@ -75,5 +75,4 @@ class GroupPresenter extends Presenterreturn json_encode($layout);}-}diff --git a/app/Presenters/HistoryPresenter.php b/app/Presenters/HistoryPresenter.phpindex 2a2a7bc28a..0a09cfb3fe 100644--- a/app/Presenters/HistoryPresenter.php+++ b/app/Presenters/HistoryPresenter.php@@ -9,6 +9,7 @@ class HistoryPresenter extends Presenter{/*** Json Column Layout for bootstrap table+ ** @return string*/public static function dataTableLayout($serial = false)@@ -78,14 +79,13 @@ class HistoryPresenter extends Presenter],];-if ($serial) {- $extra = [+ $extra = [[- 'field' => 'item.serial',- 'title' => trans('admin/hardware/table.serial'),- 'visible' => false,- ]+ 'field' => 'item.serial',+ 'title' => trans('admin/hardware/table.serial'),+ 'visible' => false,+ ],];}@@ -130,7 +130,7 @@ class HistoryPresenter extends Presenter'sortable' => true,'visible' => true,'title' => trans('general.notes'),- 'formatter' => 'notesFormatter'+ 'formatter' => 'notesFormatter',],['field' => 'signature_file',@@ -173,7 +173,7 @@ class HistoryPresenter extends Presenter];$merged = array_merge($layout_start, $extra, $layout_end);+return json_encode($merged);}-}diff --git a/app/Presenters/LabelPresenter.php b/app/Presenters/LabelPresenter.phpindex db919e659a..de7cd70a18 100644--- a/app/Presenters/LabelPresenter.php+++ b/app/Presenters/LabelPresenter.php@@ -9,6 +9,7 @@ class LabelPresenter extends Presenter{/*** Json Column Layout for bootstrap table+ ** @return string*/public static function dataTableLayout()@@ -17,7 +18,7 @@ class LabelPresenter extends Presenter['field' => 'radio','radio' => true,- 'formatter' => 'labelRadioFormatter'+ 'formatter' => 'labelRadioFormatter',], ['field' => 'name','searchable' => true,@@ -32,7 +33,7 @@ class LabelPresenter extends Presenter'switchable' => true,'title' => trans('admin/settings/table.size'),'visible' => true,- 'formatter' => 'labelSizeFormatter'+ 'formatter' => 'labelSizeFormatter',], ['field' => 'labels_per_page','searchable' => false,@@ -40,14 +41,14 @@ class LabelPresenter extends Presenter'switchable' => true,'title' => trans('admin/labels/table.labels_per_page'),'visible' => true,- 'formatter' => 'labelPerPageFormatter'+ 'formatter' => 'labelPerPageFormatter',], ['field' => 'support_fields','searchable' => false,'sortable' => false,'switchable' => true,'title' => trans('admin/labels/table.support_fields'),- 'visible' => true+ 'visible' => true,], ['field' => 'support_asset_tag','searchable' => false,@@ -55,7 +56,7 @@ class LabelPresenter extends Presenter'switchable' => true,'title' => trans('admin/labels/table.support_asset_tag'),'visible' => true,- 'formatter' => 'trueFalseFormatter'+ 'formatter' => 'trueFalseFormatter',], ['field' => 'support_1d_barcode','searchable' => false,@@ -63,7 +64,7 @@ class LabelPresenter extends Presenter'switchable' => true,'title' => trans('admin/labels/table.support_1d_barcode'),'visible' => true,- 'formatter' => 'trueFalseFormatter'+ 'formatter' => 'trueFalseFormatter',], ['field' => 'support_2d_barcode','searchable' => false,@@ -71,7 +72,7 @@ class LabelPresenter extends Presenter'switchable' => true,'title' => trans('admin/labels/table.support_2d_barcode'),'visible' => true,- 'formatter' => 'trueFalseFormatter'+ 'formatter' => 'trueFalseFormatter',], ['field' => 'support_logo','searchable' => false,@@ -79,7 +80,7 @@ class LabelPresenter extends Presenter'switchable' => true,'title' => trans('admin/labels/table.support_logo'),'visible' => true,- 'formatter' => 'trueFalseFormatter'+ 'formatter' => 'trueFalseFormatter',], ['field' => 'support_title','searchable' => false,@@ -87,8 +88,8 @@ class LabelPresenter extends Presenter'switchable' => true,'title' => trans('admin/labels/table.support_title'),'visible' => true,- 'formatter' => 'trueFalseFormatter'- ]+ 'formatter' => 'trueFalseFormatter',+ ],];return json_encode($layout);diff --git a/app/Presenters/LicensePresenter.php b/app/Presenters/LicensePresenter.phpindex 248845570b..eb8a5db7b7 100644--- a/app/Presenters/LicensePresenter.php+++ b/app/Presenters/LicensePresenter.php@@ -9,6 +9,7 @@ class LicensePresenter extends Presenter{/*** Json Column Layout for bootstrap table+ ** @return string*/public static function dataTableLayout()@@ -221,6 +222,7 @@ class LicensePresenter extends Presenter/*** Json Column Layout for bootstrap table+ ** @return string*/public static function dataTableLayoutSeats()@@ -233,7 +235,7 @@ class LicensePresenter extends Presenter'switchable' => true,'title' => trans('general.id'),'visible' => false,- ],[+ ], ['field' => 'assigned_user','searchable' => false,'sortable' => false,@@ -298,7 +300,7 @@ class LicensePresenter extends Presenter'sortable' => false,'visible' => false,'title' => trans('general.notes'),- 'formatter' => 'notesFormatter'+ 'formatter' => 'notesFormatter',],['field' => 'checkincheckout',@@ -318,20 +320,22 @@ class LicensePresenter extends Presenter/*** Link to this licenses Name+ ** @return string*/public function nameUrl(){if (auth()->user()->can('view', ['\App\Models\License', $this])) {- return '<a href="' . route('licenses.show', $this->id) . '">' . e($this->display_name) . '</a>';+ return '<a href="'.route('licenses.show', $this->id).'">'.e($this->display_name).'</a>';} else {return e($this->display_name);}-+}/*** Link to this licenses Name+ ** @return string*/public function fullName()@@ -341,6 +345,7 @@ class LicensePresenter extends Presenter/*** Url to view this item.+ ** @return string*/public function viewUrl()diff --git a/app/Presenters/LocationPresenter.php b/app/Presenters/LocationPresenter.phpindex 4412bec648..a0e1dae480 100644--- a/app/Presenters/LocationPresenter.php+++ b/app/Presenters/LocationPresenter.php@@ -9,6 +9,7 @@ class LocationPresenter extends Presenter{/*** Json Column Layout for bootstrap table+ ** @return string*/public static function dataTableLayout()@@ -36,7 +37,7 @@ class LocationPresenter extends Presenter'switchable' => true,'title' => trans('general.company'),'visible' => false,- 'formatter' => 'companiesLinkObjFormatter'+ 'formatter' => 'companiesLinkObjFormatter',],['field' => 'name',@@ -67,8 +68,8 @@ class LocationPresenter extends Presenter'searchable' => false,'sortable' => true,'switchable' => true,- 'title' => trans('general.people'),- 'titleTooltip' => trans('general.people'),+ 'title' => trans('general.people'),+ 'titleTooltip' => trans('general.people'),'visible' => true,'class' => 'css-house-user',], [@@ -76,7 +77,7 @@ class LocationPresenter extends Presenter'searchable' => false,'sortable' => true,'switchable' => true,- 'title' => trans('admin/locations/message.current_location'),+ 'title' => trans('admin/locations/message.current_location'),'titleTooltip' => trans('admin/locations/message.current_location'),'visible' => true,'class' => 'css-house-laptop',@@ -85,7 +86,7 @@ class LocationPresenter extends Presenter'searchable' => false,'sortable' => true,'switchable' => true,- 'title' => trans('admin/hardware/form.default_location'),+ 'title' => trans('admin/hardware/form.default_location'),'titleTooltip' => trans('admin/hardware/form.default_location'),'tooltip' => 'true','visible' => false,@@ -95,8 +96,8 @@ class LocationPresenter extends Presenter'searchable' => false,'sortable' => true,'switchable' => true,- 'title' => trans('admin/locations/message.assigned_assets'),- 'titleTooltip' => trans('admin/locations/message.assigned_assets'),+ 'title' => trans('admin/locations/message.assigned_assets'),+ 'titleTooltip' => trans('admin/locations/message.assigned_assets'),'visible' => true,'class' => 'css-house-laptop',], [@@ -104,17 +105,17 @@ class LocationPresenter extends Presenter'searchable' => false,'sortable' => true,'switchable' => true,- 'title' => trans('general.accessories'),- 'titleTooltip' => trans('general.accessories'),+ 'title' => trans('general.accessories'),+ 'titleTooltip' => trans('general.accessories'),'visible' => true,'class' => 'css-accessory',- ],[+ ], ['field' => 'assigned_accessories_count','searchable' => false,'sortable' => true,'switchable' => true,- 'title' => trans('general.accessories_assigned'),- 'titleTooltip' => trans('general.accessories_assigned'),+ 'title' => trans('general.accessories_assigned'),+ 'titleTooltip' => trans('general.accessories_assigned'),'visible' => true,'class' => 'css-accessory-alt',], [@@ -122,8 +123,8 @@ class LocationPresenter extends Presenter'searchable' => false,'sortable' => true,'switchable' => true,- 'title' => trans('general.components'),- 'titleTooltip' => trans('general.components'),+ 'title' => trans('general.components'),+ 'titleTooltip' => trans('general.components'),'visible' => true,'class' => 'css-component',],@@ -132,8 +133,8 @@ class LocationPresenter extends Presenter'searchable' => false,'sortable' => true,'switchable' => true,- 'title' => trans('general.consumables'),- 'titleTooltip' => trans('general.consumables'),+ 'title' => trans('general.consumables'),+ 'titleTooltip' => trans('general.consumables'),'visible' => true,'class' => 'css-consumable',],@@ -142,8 +143,8 @@ class LocationPresenter extends Presenter'searchable' => false,'sortable' => true,'switchable' => true,- 'title' => trans('general.child_locations'),- 'titleTooltip' => trans('general.child_locations'),+ 'title' => trans('general.child_locations'),+ 'titleTooltip' => trans('general.child_locations'),'visible' => true,'class' => 'css-child-locations',], [@@ -151,8 +152,8 @@ class LocationPresenter extends Presenter'searchable' => true,'sortable' => true,'switchable' => true,- 'title' => trans('general.currency_text'),- 'titleTooltip' => trans('general.currency_text'),+ 'title' => trans('general.currency_text'),+ 'titleTooltip' => trans('general.currency_text'),'visible' => true,'class' => 'css-currency',], [@@ -160,42 +161,42 @@ class LocationPresenter extends Presenter'searchable' => true,'sortable' => true,'switchable' => true,- 'title' => trans('admin/locations/table.address'),+ 'title' => trans('admin/locations/table.address'),'visible' => true,], ['field' => 'address2','searchable' => true,'sortable' => true,'switchable' => true,- 'title' => trans('admin/locations/table.address2'),+ 'title' => trans('admin/locations/table.address2'),'visible' => false,], ['field' => 'city','searchable' => true,'sortable' => true,'switchable' => true,- 'title' => trans('admin/locations/table.city'),+ 'title' => trans('admin/locations/table.city'),'visible' => true,], ['field' => 'state','searchable' => true,'sortable' => true,'switchable' => true,- 'title' => trans('admin/locations/table.state'),+ 'title' => trans('admin/locations/table.state'),'visible' => true,], ['field' => 'zip','searchable' => true,'sortable' => true,'switchable' => true,- 'title' => trans('admin/locations/table.zip'),+ 'title' => trans('admin/locations/table.zip'),'visible' => false,], ['field' => 'country','searchable' => true,'sortable' => true,'switchable' => true,- 'title' => trans('admin/locations/table.country'),+ 'title' => trans('admin/locations/table.country'),'visible' => false,], ['field' => 'phone',@@ -204,7 +205,7 @@ class LocationPresenter extends Presenter'switchable' => true,'title' => trans('admin/users/table.phone'),'visible' => false,- 'formatter' => 'phoneFormatter',+ 'formatter' => 'phoneFormatter',], ['field' => 'fax','searchable' => true,@@ -212,20 +213,20 @@ class LocationPresenter extends Presenter'switchable' => true,'title' => trans('admin/suppliers/table.fax'),'visible' => false,- 'formatter' => 'phoneFormatter',+ 'formatter' => 'phoneFormatter',], ['field' => 'ldap_ou','searchable' => true,'sortable' => true,'switchable' => true,- 'title' => trans('admin/locations/table.ldap_ou'),+ 'title' => trans('admin/locations/table.ldap_ou'),'visible' => false,], ['field' => 'manager','searchable' => false,'sortable' => true,'switchable' => true,- 'title' => trans('admin/users/table.manager'),+ 'title' => trans('admin/users/table.manager'),'visible' => false,'formatter' => 'usersLinkObjFormatter',], [@@ -259,7 +260,7 @@ class LocationPresenter extends Presenter'title' => trans('general.created_by'),'visible' => false,'formatter' => 'usersLinkObjFormatter',- ],[+ ], ['field' => 'actions','searchable' => false,'sortable' => false,@@ -346,12 +347,13 @@ class LocationPresenter extends Presenter/*** Link to this locations name+ ** @return string*/public function nameUrl(){if (auth()->user()->can('view', ['\App\Models\Location', $this])) {- return '<a href="' . route('locations.show', $this->id) . '">' . e($this->display_name) . '</a>';+ return '<a href="'.route('locations.show', $this->id).'">'.e($this->display_name).'</a>';} else {return e($this->display_name);}@@ -359,6 +361,7 @@ class LocationPresenter extends Presenter/*** Getter for Polymorphism.+ ** @return mixed*/public function name()@@ -368,6 +371,7 @@ class LocationPresenter extends Presenter/*** Url to view this item.+ ** @return string*/public function viewUrl()@@ -375,7 +379,6 @@ class LocationPresenter extends Presenterreturn route('locations.show', $this->id);}-public function glyph(){return '<x-icon type="locations" />';@@ -386,7 +389,8 @@ class LocationPresenter extends Presenterreturn $this->name;}- public function formattedNameLink() {+ public function formattedNameLink()+ {if (auth()->user()->can('view', ['\App\Models\Location', $this])) {return ($this->tag_color ? "<i class='fa-solid fa-fw fa-square' style='color: ".e($this->tag_color)."' aria-hidden='true'></i>" : '').'<a href="'.route('locations.show', e($this->id)).'">'.e($this->display_name).'</a>';diff --git a/app/Presenters/MaintenancesPresenter.php b/app/Presenters/MaintenancesPresenter.phpindex 2438f61c16..ce98f5b1fe 100644--- a/app/Presenters/MaintenancesPresenter.php+++ b/app/Presenters/MaintenancesPresenter.php@@ -9,6 +9,7 @@ class MaintenancesPresenter extends Presenter{/*** Json Column Layout for bootstrap table+ ** @return string*/public static function dataTableLayout()@@ -135,7 +136,7 @@ class MaintenancesPresenter extends Presenter'searchable' => true,'sortable' => true,'title' => trans('admin/maintenances/table.is_warranty'),- 'formatter' => 'trueFalseFormatter'+ 'formatter' => 'trueFalseFormatter',], ['field' => 'cost','searchable' => true,@@ -165,7 +166,7 @@ class MaintenancesPresenter extends Presenter'title' => trans('general.updated_at'),'visible' => false,'formatter' => 'dateDisplayFormatter',- ],[+ ], ['field' => 'actions','searchable' => false,'sortable' => false,diff --git a/app/Presenters/ManufacturerPresenter.php b/app/Presenters/ManufacturerPresenter.phpindex 059a250ee3..2332ab9215 100644--- a/app/Presenters/ManufacturerPresenter.php+++ b/app/Presenters/ManufacturerPresenter.php@@ -9,14 +9,15 @@ class ManufacturerPresenter extends Presenter{/*** Json Column Layout for bootstrap table+ ** @return string*/public static function dataTableLayout(){$layout = [[- 'field' => 'checkbox',- 'checkbox' => true,+ 'field' => 'checkbox',+ 'checkbox' => true,'titleTooltip' => trans('general.select_all_none'),'printIgnore' => true,'class' => 'hidden-print',@@ -179,12 +180,13 @@ class ManufacturerPresenter extends Presenter/*** Link to this manufacturers name+ ** @return string*/public function nameUrl(){if (auth()->user()->can('view', ['\App\Models\Manufacturer', $this])) {- return '<a href="' . route('manufacturers.show', $this->id) . '">' . e($this->display_name) . '</a>';+ return '<a href="'.route('manufacturers.show', $this->id).'">'.e($this->display_name).'</a>';} else {return e($this->display_name);}@@ -192,6 +194,7 @@ class ManufacturerPresenter extends Presenter/*** Url to view this item.+ ** @return string*/public function viewUrl()@@ -199,7 +202,8 @@ class ManufacturerPresenter extends Presenterreturn route('manufacturers.show', $this->id);}- public function formattedNameLink() {+ public function formattedNameLink()+ {if (auth()->user()->can('view', ['\App\Models\Manufacturer', $this])) {return ($this->tag_color ? "<i class='fa-solid fa-fw fa-square' style='color: ".e($this->tag_color)."' aria-hidden='true'></i>" : '').'<a href="'.route('manufacturers.show', e($this->id)).'">'.e($this->display_name).'</a>';@@ -207,5 +211,4 @@ class ManufacturerPresenter extends Presenterreturn ($this->tag_color ? "<i class='fa-solid fa-fw fa-square' style='color: ".e($this->tag_color)."' aria-hidden='true'></i>" : '').e($this->display_name);}-}diff --git a/app/Presenters/PredefinedKitPresenter.php b/app/Presenters/PredefinedKitPresenter.phpindex 70f2edd5e5..970cd1113c 100644--- a/app/Presenters/PredefinedKitPresenter.php+++ b/app/Presenters/PredefinedKitPresenter.php@@ -9,6 +9,7 @@ class PredefinedKitPresenter extends Presenter{/*** Json Column Layout for bootstrap table of kits+ ** @return string*/public static function dataTableLayout()@@ -79,6 +80,7 @@ class PredefinedKitPresenter extends Presenter/*** Json Column Layout for bootstrap table of kit models+ ** @return string*/public static function dataTableModels()@@ -132,6 +134,7 @@ class PredefinedKitPresenter extends Presenter/*** Json Column Layout for bootstrap table of kit licenses+ ** @return string*/public static function dataTableLicenses()@@ -185,6 +188,7 @@ class PredefinedKitPresenter extends Presenter/*** Json Column Layout for bootstrap table of kit accessories+ ** @return string*/public static function dataTableAccessories()@@ -238,6 +242,7 @@ class PredefinedKitPresenter extends Presenter/*** Json Column Layout for bootstrap table of kit consumables+ ** @return string*/public static function dataTableConsumables()@@ -291,12 +296,13 @@ class PredefinedKitPresenter extends Presenter/*** Link to this kit Name+ ** @return string*/public function nameUrl(){if (auth()->user()->can('view', ['\App\Models\PredefinedKit', $this])) {- return '<a href="' . route('kits.show', $this->id) . '">' . e($this->display_name) . '</a>';+ return '<a href="'.route('kits.show', $this->id).'">'.e($this->display_name).'</a>';} else {return e($this->display_name);}@@ -313,6 +319,7 @@ class PredefinedKitPresenter extends Presenter/*** Url to view this item.+ ** @return string*/public function viewUrl()diff --git a/app/Presenters/Presenter.php b/app/Presenters/Presenter.phpindex dc50f5406a..f461937fd3 100644--- a/app/Presenters/Presenter.php+++ b/app/Presenters/Presenter.php@@ -3,7 +3,6 @@namespace App\Presenters;use App\Models\SnipeModel;-use Illuminate\Database\Eloquent\Casts\Attribute;abstract class Presenter{@@ -14,14 +13,14 @@ abstract class Presenter/*** Presenter constructor.- * @param SnipeModel $model*/public function __construct(SnipeModel $model){$this->model = $model;}- public function displayAddress() {+ public function displayAddress()+ {$address = '';if ($this->model->address) {$address .= e($this->model->address)."\n";@@ -99,8 +98,6 @@ abstract class Presenterreturn '';}--public function __get($property){if (method_exists($this, $property)) {@@ -114,6 +111,4 @@ abstract class Presenter{return $this->model->$method($args);}--}diff --git a/app/Presenters/StatusLabelPresenter.php b/app/Presenters/StatusLabelPresenter.phpindex 4b53225123..141037c167 100644--- a/app/Presenters/StatusLabelPresenter.php+++ b/app/Presenters/StatusLabelPresenter.php@@ -9,6 +9,7 @@ class StatusLabelPresenter extends Presenter{/*** Json Column Layout for bootstrap table+ ** @return string*/public static function dataTableLayout()@@ -29,7 +30,7 @@ class StatusLabelPresenter extends Presenter'title' => trans('general.name'),'visible' => true,'formatter' => 'statuslabelsLinkFormatter',- ],[+ ], ['field' => 'type','searchable' => false,'sortable' => false,@@ -68,7 +69,7 @@ class StatusLabelPresenter extends Presenter'title' => trans('admin/statuslabels/table.default_label'),'visible' => true,'formatter' => 'trueFalseFormatter',- ],[+ ], ['field' => 'notes','searchable' => true,'sortable' => true,@@ -111,6 +112,4 @@ class StatusLabelPresenter extends Presenterreturn json_encode($layout);}--}diff --git a/app/Presenters/SupplierPresenter.php b/app/Presenters/SupplierPresenter.phpindex 682a903a26..914d546a57 100644--- a/app/Presenters/SupplierPresenter.php+++ b/app/Presenters/SupplierPresenter.php@@ -14,13 +14,13 @@ class SupplierPresenter extends Presenter{$layout = [[- 'field' => 'checkbox',- 'checkbox' => true,+ 'field' => 'checkbox',+ 'checkbox' => true,'titleTooltip' => trans('general.select_all_none'),'printIgnore' => true,- 'class' => 'hidden-print'+ 'class' => 'hidden-print',],- [+ ['field' => 'id','searchable' => false,'sortable' => true,@@ -50,8 +50,8 @@ class SupplierPresenter extends Presenter'searchable' => false,'sortable' => true,'switchable' => true,- 'title' => trans('general.assets'),- 'titleTooltip' => trans('general.assets'),+ 'title' => trans('general.assets'),+ 'titleTooltip' => trans('general.assets'),'visible' => true,'class' => 'css-barcode',], [@@ -59,8 +59,8 @@ class SupplierPresenter extends Presenter'searchable' => false,'sortable' => true,'switchable' => true,- 'title' => trans('general.accessories'),- 'titleTooltip' => trans('general.accessories'),+ 'title' => trans('general.accessories'),+ 'titleTooltip' => trans('general.accessories'),'visible' => true,'class' => 'css-accessory',],@@ -69,8 +69,8 @@ class SupplierPresenter extends Presenter'searchable' => false,'sortable' => true,'switchable' => true,- 'title' => trans('general.licenses'),- 'titleTooltip' => trans('general.licenses'),+ 'title' => trans('general.licenses'),+ 'titleTooltip' => trans('general.licenses'),'visible' => true,'class' => 'css-license',], [@@ -78,8 +78,8 @@ class SupplierPresenter extends Presenter'searchable' => false,'sortable' => true,'switchable' => true,- 'title' => trans('general.components'),- 'titleTooltip' => trans('general.components'),+ 'title' => trans('general.components'),+ 'titleTooltip' => trans('general.components'),'visible' => true,'class' => 'css-component',], [@@ -87,8 +87,8 @@ class SupplierPresenter extends Presenter'searchable' => false,'sortable' => true,'switchable' => true,- 'title' => trans('general.consumables'),- 'titleTooltip' => trans('general.consumables'),+ 'title' => trans('general.consumables'),+ 'titleTooltip' => trans('general.consumables'),'visible' => true,'class' => 'css-consumable',], [@@ -104,42 +104,42 @@ class SupplierPresenter extends Presenter'searchable' => true,'sortable' => true,'switchable' => true,- 'title' => trans('admin/locations/table.address'),+ 'title' => trans('admin/locations/table.address'),'visible' => true,], ['field' => 'address2','searchable' => true,'sortable' => true,'switchable' => true,- 'title' => trans('admin/locations/table.address2'),+ 'title' => trans('admin/locations/table.address2'),'visible' => false,], ['field' => 'city','searchable' => true,'sortable' => true,'switchable' => true,- 'title' => trans('admin/locations/table.city'),+ 'title' => trans('admin/locations/table.city'),'visible' => true,], ['field' => 'state','searchable' => true,'sortable' => true,'switchable' => true,- 'title' => trans('admin/locations/table.state'),+ 'title' => trans('admin/locations/table.state'),'visible' => true,], ['field' => 'zip','searchable' => true,'sortable' => true,'switchable' => true,- 'title' => trans('admin/locations/table.zip'),+ 'title' => trans('admin/locations/table.zip'),'visible' => false,], ['field' => 'country','searchable' => true,'sortable' => true,'switchable' => true,- 'title' => trans('admin/locations/table.country'),+ 'title' => trans('admin/locations/table.country'),'visible' => false,], ['field' => 'phone',@@ -148,7 +148,7 @@ class SupplierPresenter extends Presenter'switchable' => true,'title' => trans('admin/users/table.phone'),'visible' => false,- 'formatter' => 'phoneFormatter',+ 'formatter' => 'phoneFormatter',], ['field' => 'fax','searchable' => true,@@ -156,7 +156,7 @@ class SupplierPresenter extends Presenter'switchable' => true,'title' => trans('admin/suppliers/table.fax'),'visible' => false,- 'formatter' => 'phoneFormatter',+ 'formatter' => 'phoneFormatter',], ['field' => 'tag_color','searchable' => true,@@ -165,7 +165,7 @@ class SupplierPresenter extends Presenter'title' => trans('general.tag_color'),'visible' => false,'formatter' => 'colorTagFormatter',- ],[+ ], ['field' => 'notes','searchable' => true,'sortable' => true,@@ -201,16 +201,16 @@ class SupplierPresenter extends Presenterreturn json_encode($layout);}-/*** Link to this supplier name+ ** @return string*/public function nameUrl(){if (auth()->user()->can('view', ['\App\Models\Supplier', $this])) {- return '<a href="' . route('suppliers.show', $this->id) . '">' . e($this->display_name) . '</a>';+ return '<a href="'.route('suppliers.show', $this->id).'">'.e($this->display_name).'</a>';} else {return e($this->display_name);}@@ -218,6 +218,7 @@ class SupplierPresenter extends Presenter/*** Getter for Polymorphism.+ ** @return mixed*/public function name()@@ -227,12 +228,13 @@ class SupplierPresenter extends Presenter/*** Url to view this item.+ ** @return string*/public function viewUrl(){if (auth()->user()->can('view', ['\App\Models\Supplier', $this])) {- return '<a href="' . route('suppliers.show', $this->id) . '">' . e($this->display_name) . '</a>';+ return '<a href="'.route('suppliers.show', $this->id).'">'.e($this->display_name).'</a>';} else {return e($this->display_name);}@@ -248,7 +250,8 @@ class SupplierPresenter extends Presenterreturn $this->name;}- public function formattedNameLink() {+ public function formattedNameLink()+ {if (auth()->user()->can('view', ['\App\Models\Supplier', $this])) {return ($this->tag_color ? "<i class='fa-solid fa-square fa-fw' style='color: ".e($this->tag_color)."' aria-hidden='true'></i> " : '').'<a href="'.route('suppliers.show', e($this->id)).'">'.e($this->name).'</a>';diff --git a/app/Presenters/UploadedFilesPresenter.php b/app/Presenters/UploadedFilesPresenter.phpindex 97fa9d4dec..207d7df54d 100644--- a/app/Presenters/UploadedFilesPresenter.php+++ b/app/Presenters/UploadedFilesPresenter.php@@ -101,5 +101,4 @@ class UploadedFilesPresenter extends Presenterreturn json_encode($layout);}--}\ No newline at end of file+}diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.phpindex 0f2d378b84..9fea331323 100644--- a/app/Presenters/UserPresenter.php+++ b/app/Presenters/UserPresenter.php@@ -2,12 +2,8 @@namespace App\Presenters;-use App\Helpers\Helper;use App\Models\Setting;-use Illuminate\Support\Facades\Auth;-use Illuminate\Support\Facades\Gate;use Illuminate\Support\Facades\Storage;-use Illuminate\Support\Str;/*** Class UserPresenter@@ -16,6 +12,7 @@ class UserPresenter extends Presenter{/*** Json Column Layout for bootstrap table+ ** @return string*/public static function dataTableLayout()@@ -145,7 +142,7 @@ class UserPresenter extends Presenter'switchable' => true,'title' => trans('admin/users/table.phone'),'visible' => false,- 'formatter' => 'phoneFormatter',+ 'formatter' => 'phoneFormatter',],['field' => 'mobile',@@ -154,7 +151,7 @@ class UserPresenter extends Presenter'switchable' => true,'title' => trans('admin/users/table.mobile'),'visible' => false,- 'formatter' => 'mobileFormatter',+ 'formatter' => 'mobileFormatter',],['field' => 'website',@@ -163,7 +160,7 @@ class UserPresenter extends Presenter'switchable' => true,'title' => trans('general.website'),'visible' => false,- 'formatter' => 'externalLinkFormatter',+ 'formatter' => 'externalLinkFormatter',],['field' => 'address',@@ -455,25 +452,23 @@ class UserPresenter extends Presenter** @return string*/-// 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();-// }-+ // 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();+ // }/*** Returns the user Gravatar image url.@@ -495,7 +490,6 @@ class UserPresenter extends Presenterreturn Storage::disk('public')->url('avatars/'.e($this->avatar));}-// If the default is system defaultif (Setting::getSettings()->default_avatar == 'default.png') {return Storage::disk('public')->url('default.png');@@ -511,10 +505,12 @@ class UserPresenter extends Presenterif ($this->model->gravatar != '') {$gravatar = md5(strtolower(trim($this->model->gravatar)));+return '//gravatar.com/avatar/'.$gravatar;} elseif ($this->email != '') {$gravatar = md5(strtolower(trim($this->email)));+return '//gravatar.com/avatar/'.$gravatar;}}@@ -524,12 +520,13 @@ class UserPresenter extends Presenter/*** Formatted url for use in tables.+ ** @return string*/public function nameUrl(){if (auth()->user()->can('view', ['\App\Models\User', $this])) {- return '<a href="' . route('users.show', $this->id) . '">' . e($this->display_name) . '</a>';+ return '<a href="'.route('users.show', $this->id).'">'.e($this->display_name).'</a>';} else {return e($this->display_name);}@@ -538,6 +535,7 @@ class UserPresenter extends Presenter/*** Url to view this item.+ ** @return string*/public function viewUrl()@@ -550,12 +548,13 @@ class UserPresenter extends Presenterreturn '<x-icon type="user"/>';}- public function formattedNameLink() {+ public function formattedNameLink()+ {if (auth()->user()->can('view', ['\App\Models\User', $this])) {- return '<a href="'.route('users.show', e($this->id)).'" class="'. (($this->deleted_at!='') ? 'deleted' : '').'">'.e($this->display_name).'</a>';+ return '<a href="'.route('users.show', e($this->id)).'" class="'.(($this->deleted_at != '') ? 'deleted' : '').'">'.e($this->display_name).'</a>';}- return '<span class="'. (($this->deleted_at!='') ? 'deleted' : '').'">'.e($this->display_name).'</span>';+ return '<span class="'.(($this->deleted_at != '') ? 'deleted' : '').'">'.e($this->display_name).'</span>';}}