From e126a75f7ad853ba9411d5fd2e48eeb08252b9b0 Mon Sep 17 00:00:00 2001 From: slong753 Date: Wed, 29 Mar 2023 21:37:26 -0500 Subject: [PATCH 1/2] pretty sure this was it --- app/Models/Asset.php | 21 ++++++++------------- app/Models/User.php | 15 +++++---------- 2 files changed, 13 insertions(+), 23 deletions(-) diff --git a/app/Models/Asset.php b/app/Models/Asset.php index e992298d8..bb9916d86 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,14 @@ class Asset extends Depreciable 'rtd_company_id' => 'integer', 'supplier_id' => 'integer', 'byod' => 'boolean', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'deleted_at' => 'datetime', + 'purchase_date' => 'datetime', + 'last_checkout' => 'datetime', + 'expected_checkin' => 'datetime', + 'last_audit_date' => 'datetime', + 'next_audit_date' => '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 * From 8c1c0e81b61289fa942cac20bb0c6704e3c710e1 Mon Sep 17 00:00:00 2001 From: slong753 Date: Thu, 30 Mar 2023 13:31:58 -0500 Subject: [PATCH 2/2] rm deplicates --- app/Models/Asset.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/Models/Asset.php b/app/Models/Asset.php index bb9916d86..a5211e800 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -86,11 +86,6 @@ class Asset extends Depreciable 'created_at' => 'datetime', 'updated_at' => 'datetime', 'deleted_at' => 'datetime', - 'purchase_date' => 'datetime', - 'last_checkout' => 'datetime', - 'expected_checkin' => 'datetime', - 'last_audit_date' => 'datetime', - 'next_audit_date' => 'datetime', ]; protected $rules = [