diff --git a/app/Models/User.php b/app/Models/User.php index f75a2be8b..df9780091 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -73,18 +73,11 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo 'location_id' => 'integer', 'company_id' => 'integer', 'vip' => 'boolean', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', ]; - - protected $dates = [ - 'created_at', - 'updated_at', - 'deleted_at', - 'start_date' => 'date_format:Y-m-d', - 'end_date' => 'date_format:Y-m-d', - ]; - - /** * Model validation rules * @@ -122,7 +115,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo /** * The relations and their attributes that should be included when searching the model. - * + * * @var array */ protected $searchableRelations = [ @@ -272,7 +265,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo { // At this point the endpoint is the same for everything. // In the future this may want to be adapted for individual notifications. - $this->endpoint = \App\Models\Setting::getSettings()->slack_endpoint; + $this->endpoint = \App\Models\Setting::getSettings()->webhook_endpoint; return $this->endpoint; } @@ -354,11 +347,11 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo $licensesCount = $this->licenses()->count(); $accessoriesCount = $this->accessories()->count(); $consumablesCount = $this->consumables()->count(); - + $totalCount = $assetsCount + $licensesCount + $accessoriesCount + $consumablesCount; - + return (int) $totalCount; - } + } /** * Establishes the user -> actionlogs relationship @@ -512,7 +505,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo /** * Generate email from full name - * + * * @author A. Gianotto * @since [v2.0] * @@ -560,7 +553,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo $username = str_slug($first_name).str_slug($last_name); } elseif ($format == 'firstnamelastinitial') { $username = str_slug(($first_name.substr($last_name, 0, 1))); - } + } } $user['first_name'] = $first_name; @@ -657,9 +650,9 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo */ public function scopeSimpleNameSearch($query, $search) { - $query = $query->where('first_name', 'LIKE', '%'.$search.'%') - ->orWhere('last_name', 'LIKE', '%'.$search.'%') - ->orWhereRaw('CONCAT('.DB::getTablePrefix().'users.first_name," ",'.DB::getTablePrefix().'users.last_name) LIKE ?', ["%{$search}%"]); + $query = $query->where('first_name', 'LIKE', '%'.$search.'%') + ->orWhere('last_name', 'LIKE', '%'.$search.'%') + ->orWhereRaw('CONCAT('.DB::getTablePrefix().'users.first_name," ",'.DB::getTablePrefix().'users.last_name) LIKE ?', ["%{$search}%"]); return $query; } @@ -770,4 +763,4 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo { return $this->locale; } -} \ No newline at end of file +}