DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 21:54:14 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #14516 from snipe/fixes/fixed_sorting_on_last_checkin_assets_api

Browse source 
Fixes/fixed sorting on last checkin assets api
This commit is contained in:
snipe 2024-03-27 20:39:12 +00:00 committed by GitHub
parent cf8cb8521b 0d3d172108
commit e5800a2dac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Http/Controllers/Api/AssetsController.php
View file

@ -94,6 +94,7 @@ class AssetsController extends Controller
'serial', 'serial',
'model_number', 'model_number',
'last_checkout', 'last_checkout',
'last_checkin',
'notes', 'notes',
'expected_checkin', 'expected_checkin',
'order_number', 'order_number',

3
app/Models/Asset.php
View file

@ -96,6 +96,7 @@ class Asset extends Depreciable
'company_id' => 'nullable|integer|exists:companies,id', 'company_id' => 'nullable|integer|exists:companies,id',
'warranty_months' => 'nullable|numeric|digits_between:0,240', 'warranty_months' => 'nullable|numeric|digits_between:0,240',
'last_checkout' => 'nullable|date_format:Y-m-d H:i:s', 'last_checkout' => 'nullable|date_format:Y-m-d H:i:s',
'last_checkin' => 'nullable|date_format:Y-m-d H:i:s',
'expected_checkin' => 'nullable|date', 'expected_checkin' => 'nullable|date',
'last_audit_date' => 'nullable|date_format:Y-m-d H:i:s', 'last_audit_date' => 'nullable|date_format:Y-m-d H:i:s',
'next_audit_date' => 'nullable|date|after:last_audit_date', 'next_audit_date' => 'nullable|date|after:last_audit_date',
@ -169,6 +170,8 @@ class Asset extends Depreciable
'expected_checkin', 'expected_checkin',
'next_audit_date', 'next_audit_date',
'last_audit_date', 'last_audit_date',
'last_checkin',
'last_checkout',
'asset_eol_date', 'asset_eol_date',
]; ];