mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-24 21:24:13 -08:00
removed references to archived
This commit is contained in:
parent
133c469e36
commit
88b6a541ee
|
@ -545,7 +545,6 @@ class AssetsController extends Controller
|
|||
// @todo: verify eol is working as expected - move to request? or do I want this at all?
|
||||
// might just remove this and then use the method from here https://github.com/snipe/snipe-it/pull/13846
|
||||
$asset->asset_eol_date = $request->validated()['asset_eol_date'] ?? $asset->present()->eol_date(); // so this isn't really necessary, because it's happening on the observer - but that might change?
|
||||
$asset->archived = false;
|
||||
$asset->physical = '1';
|
||||
$asset->depreciate = '0';
|
||||
|
||||
|
|
|
@ -131,7 +131,6 @@ class AssetsController extends Controller
|
|||
$asset->order_number = $request->input('order_number');
|
||||
$asset->notes = $request->input('notes');
|
||||
$asset->user_id = Auth::id();
|
||||
$asset->archived = '0';
|
||||
$asset->physical = '1';
|
||||
$asset->depreciate = '0';
|
||||
$asset->status_id = request('status_id');
|
||||
|
|
|
@ -70,7 +70,6 @@ class Asset extends Depreciable
|
|||
protected $injectUniqueIdentifier = true;
|
||||
|
||||
protected $casts = [
|
||||
'archived' => 'boolean',
|
||||
'physical' => 'boolean',
|
||||
'purchase_date' => 'date',
|
||||
'eol_explicit' => 'boolean',
|
||||
|
@ -743,7 +742,7 @@ class Asset extends Depreciable
|
|||
{
|
||||
$days = (is_null($days)) ? 30 : $days;
|
||||
|
||||
return self::where('archived', '=', '0')
|
||||
return self::where('archived', '=', '0') // this can stay for right now, as `archived` defaults to 0 at the db level, but should probably be replaced with assetstatus->archived?
|
||||
->whereNotNull('warranty_months')
|
||||
->whereNotNull('purchase_date')
|
||||
->whereNull('deleted_at')
|
||||
|
|
|
@ -37,7 +37,6 @@ class AssetStoreTest extends TestCase
|
|||
|
||||
$response = $this->actingAsForApi($user)
|
||||
->postJson(route('api.assets.store'), [
|
||||
'archived' => false, // set explicitly in controller
|
||||
'asset_eol_date' => '2024-06-02',
|
||||
'asset_tag' => 'random_string',
|
||||
'assigned_user' => $userAssigned->id, // assigned_to is set in the request, assigned_to isn't set through the api request
|
||||
|
@ -67,8 +66,6 @@ class AssetStoreTest extends TestCase
|
|||
|
||||
$this->assertTrue($asset->adminuser->is($user));
|
||||
|
||||
// @todo: this is explicitly set 0 in the controller but they docs say they are customizable
|
||||
$this->assertFalse($asset->archived);
|
||||
$this->assertTrue($asset->physical);
|
||||
// @todo: This isn't in the docs but it's in the controller
|
||||
$this->assertEquals('2024-06-02', $asset->asset_eol_date);
|
||||
|
|
Loading…
Reference in a new issue