Merge branch 'develop' into bug/sc-15034

2023-04-05 11:49:53 -07:00
parent 524249d4d7 ead5293ee0
commit 6df8f0f35c
7 changed files with 50 additions and 27 deletions
@@ -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
     *