diff --git a/app/Models/Asset.php b/app/Models/Asset.php index e992298d8..a5211e800 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -70,19 +70,6 @@ class Asset extends Depreciable */ protected $injectUniqueIdentifier = true; - // We set these as protected dates so that they will be easily accessible via Carbon - protected $dates = [ - 'created_at', - 'updated_at', - 'deleted_at', - 'purchase_date', - 'last_checkout', - 'expected_checkin', - 'last_audit_date', - 'next_audit_date' - ]; - - protected $casts = [ 'purchase_date' => 'date', 'last_checkout' => 'datetime', @@ -96,6 +83,9 @@ class Asset extends Depreciable 'rtd_company_id' => 'integer', 'supplier_id' => 'integer', 'byod' => 'boolean', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', ]; protected $rules = [ diff --git a/app/Models/User.php b/app/Models/User.php index bf40982db..c716da074 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -73,18 +73,13 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo 'location_id' => 'integer', 'company_id' => 'integer', 'vip' => 'boolean', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', + 'start_date' => 'datetime:Y-m-d', + 'end_date' => 'datetime:Y-m-d', ]; - - 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 *