From f01b205486c3bdf57adf12b993ca29319f53e181 Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Wed, 13 Mar 2024 15:10:51 -0500 Subject: [PATCH] some changes --- app/Models/Asset.php | 108 +++++++++++++++++++++---------------------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/app/Models/Asset.php b/app/Models/Asset.php index 9eeb8c59c3..c1ab89cb7d 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -89,61 +89,61 @@ class Asset extends Depreciable 'deleted_at' => 'datetime', ]; - //protected $rules = [ - // 'model_id' => 'required|integer|exists:models,id,deleted_at,NULL|not_array', - // 'status_id' => 'required|integer|exists:status_labels,id', - // 'asset_tag' => ['required', 'min:1', 'max:255', 'unique_undeleted:assets,asset_tag', 'not_array', Rule::unique('assets')->ignore($this->id)->withoutTrashed()], - // 'name' => 'nullable|max:255', - // 'company_id' => 'nullable|integer|exists:companies,id', - // 'warranty_months' => 'nullable|numeric|digits_between:0,240', - // 'last_checkout' => 'nullable|date_format:Y-m-d H:i:s', - // 'expected_checkin' => 'nullable|date', - // 'location_id' => 'nullable|exists:locations,id', - // 'rtd_location_id' => 'nullable|exists:locations,id', - // 'purchase_date' => 'nullable|date|date_format:Y-m-d', - // 'serial' => 'nullable|unique_undeleted:assets,serial', - // 'purchase_cost' => 'nullable|numeric|gte:0', - // 'supplier_id' => 'nullable|exists:suppliers,id', - // 'asset_eol_date' => 'nullable|date', - // 'eol_explicit' => 'nullable|boolean', - // 'byod' => 'nullable|boolean', - // 'order_number' => 'nullable|string|max:191', - // 'notes' => 'nullable|string|max:65535', - // 'assigned_to' => 'nullable|integer', - // 'requestable' => 'nullable|boolean', - //]; + protected $rules = [ + 'model_id' => 'required|integer|exists:models,id,deleted_at,NULL|not_array', + 'status_id' => 'required|integer|exists:status_labels,id', + 'asset_tag' => 'required|min:1|max:255|not_array|unique:assets,asset_tag,asset,id,deleted_at,"NULL"', + 'name' => 'nullable|max:255', + 'company_id' => 'nullable|integer|exists:companies,id', + 'warranty_months' => 'nullable|numeric|digits_between:0,240', + 'last_checkout' => 'nullable|date_format:Y-m-d H:i:s', + 'expected_checkin' => 'nullable|date', + 'location_id' => 'nullable|exists:locations,id', + 'rtd_location_id' => 'nullable|exists:locations,id', + 'purchase_date' => 'nullable|date|date_format:Y-m-d', + 'serial' => 'nullable|unique_undeleted:assets,serial', + 'purchase_cost' => 'nullable|numeric|gte:0', + 'supplier_id' => 'nullable|exists:suppliers,id', + 'asset_eol_date' => 'nullable|date', + 'eol_explicit' => 'nullable|boolean', + 'byod' => 'nullable|boolean', + 'order_number' => 'nullable|string|max:191', + 'notes' => 'nullable|string|max:65535', + 'assigned_to' => 'nullable|integer', + 'requestable' => 'nullable|boolean', + ]; - public function getRulesAttribute() - { - return [ - 'model_id' => 'required|integer|exists:models,id,deleted_at,NULL|not_array', - 'status_id' => 'required|integer|exists:status_labels,id', - 'asset_tag' => [ - 'required', - 'min:1', - 'max:255', - Rule::unique('assets')->ignore(15)->withoutTrashed() - ], - 'name' => 'nullable|max:255', - 'company_id' => 'nullable|integer|exists:companies,id', - 'warranty_months' => 'nullable|numeric|digits_between:0,240', - 'last_checkout' => 'nullable|date_format:Y-m-d H:i:s', - 'expected_checkin' => 'nullable|date', - 'location_id' => 'nullable|exists:locations,id', - 'rtd_location_id' => 'nullable|exists:locations,id', - 'purchase_date' => 'nullable|date|date_format:Y-m-d', - 'serial' => 'nullable|unique_undeleted:assets,serial', - 'purchase_cost' => 'nullable|numeric|gte:0', - 'supplier_id' => 'nullable|exists:suppliers,id', - 'asset_eol_date' => 'nullable|date', - 'eol_explicit' => 'nullable|boolean', - 'byod' => 'nullable|boolean', - 'order_number' => 'nullable|string|max:191', - 'notes' => 'nullable|string|max:65535', - 'assigned_to' => 'nullable|integer', - 'requestable' => 'nullable|boolean', - ]; - } + //public function getRulesAttribute() + //{ + // return [ + // 'model_id' => 'required|integer|exists:models,id,deleted_at,NULL|not_array', + // 'status_id' => 'required|integer|exists:status_labels,id', + // 'asset_tag' => [ + // 'required', + // 'min:1', + // 'max:255', + // Rule::unique('assets')->ignore(15)->withoutTrashed() + // ], + // 'name' => 'nullable|max:255', + // 'company_id' => 'nullable|integer|exists:companies,id', + // 'warranty_months' => 'nullable|numeric|digits_between:0,240', + // 'last_checkout' => 'nullable|date_format:Y-m-d H:i:s', + // 'expected_checkin' => 'nullable|date', + // 'location_id' => 'nullable|exists:locations,id', + // 'rtd_location_id' => 'nullable|exists:locations,id', + // 'purchase_date' => 'nullable|date|date_format:Y-m-d', + // 'serial' => 'nullable|unique_undeleted:assets,serial', + // 'purchase_cost' => 'nullable|numeric|gte:0', + // 'supplier_id' => 'nullable|exists:suppliers,id', + // 'asset_eol_date' => 'nullable|date', + // 'eol_explicit' => 'nullable|boolean', + // 'byod' => 'nullable|boolean', + // 'order_number' => 'nullable|string|max:191', + // 'notes' => 'nullable|string|max:65535', + // 'assigned_to' => 'nullable|integer', + // 'requestable' => 'nullable|boolean', + // ]; + //} /** * The attributes that are mass assignable.