DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Allow null values for asset dates in update action

Browse source 
This commit improves the asset update functionality by allowing null values for purchase date, next audit date, and expected check-in date when specified in the request. Additionally, minor corrections were made in the test code to enhance readability and correctness.
This commit is contained in:
spencerrlongg 2024-11-20 09:58:13 -06:00
parent 94e7310cd9
commit 1704a07663
3 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/Actions/Assets/UpdateAssetAction.php
View file

@ -55,8 +55,21 @@ class UpdateAssetAction
$asset->status_id = $status_id ?? $asset->status_id; $asset->status_id = $status_id ?? $asset->status_id;
$asset->warranty_months = $warranty_months ?? $asset->warranty_months; $asset->warranty_months = $warranty_months ?? $asset->warranty_months;
$asset->purchase_cost = $purchase_cost ?? $asset->purchase_cost; $asset->purchase_cost = $purchase_cost ?? $asset->purchase_cost;
$asset->purchase_date = $purchase_date ?? $asset->purchase_date?->format('Y-m-d'); if ($request->input('null_purchase_date') === '1') {
$asset->next_audit_date = $next_audit_date ?? $asset->next_audit_date; dump('filled');
$asset->purchase_date = null;
if (!($asset->eol_explicit)) {
$asset->asset_eol_date = null;
}
} else {
$asset->purchase_date = $purchase_date ?? $asset->purchase_date?->format('Y-m-d');
}
if ($request->input('null_next_audit_date') == '1') {
$asset->next_audit_date = null;
} else {
$asset->next_audit_date = $next_audit_date ?? $asset->next_audit_date;
}
$asset->last_audit_date = $last_audit_date ?? $asset->last_audit_date; $asset->last_audit_date = $last_audit_date ?? $asset->last_audit_date;
if ($purchase_date && !$asset_eol_date && ($asset->model->eol > 0)) { if ($purchase_date && !$asset_eol_date && ($asset->model->eol > 0)) {
$asset->purchase_date = $purchase_date ?? $asset->purchase_date?->format('Y-m-d'); $asset->purchase_date = $purchase_date ?? $asset->purchase_date?->format('Y-m-d');
@ -79,7 +92,11 @@ class UpdateAssetAction
$asset->eol_explicit = false; $asset->eol_explicit = false;
} }
$asset->supplier_id = $supplier_id; $asset->supplier_id = $supplier_id;
$asset->expected_checkin = $expected_checkin; if ($request->input('null_expected_checkin_date') == '1') {
$asset->expected_checkin = null;
} else {
$asset->expected_checkin = $expected_checkin ?? $asset->expected_checkin;
}
$asset->requestable = $requestable; $asset->requestable = $requestable;
$asset->location_id = $location_id; $asset->location_id = $location_id;

2
tests/Feature/Assets/Ui/BulkEditAssetsTest.php
View file

@ -221,7 +221,7 @@ class BulkEditAssetsTest extends TestCase
}); });
} }
public function testBulkEditAssetsRequiresadminToUpdateEncryptedCustomFields() public function testBulkEditAssetsRequiresAdminToUpdateEncryptedCustomFields()
{ {
$this->markIncompleteIfMySQL('Custom Fields tests do not work on mysql'); $this->markIncompleteIfMySQL('Custom Fields tests do not work on mysql');
$edit_user = User::factory()->editAssets()->create(); $edit_user = User::factory()->editAssets()->create();

6
tests/Unit/DepreciationTest.php
View file

@ -38,7 +38,8 @@ class DepreciationTest extends TestCase
->laptopMbp() ->laptopMbp()
->create( ->create(
[ [
'category_id' => Category::factory()->assetLaptopCategory()->create(), //not sure how this ever worked... do these need a category??
//'category_id' => Category::factory()->assetLaptopCategory()->create(),
'purchase_date' => now()->subDecade()->format("Y-m-d"), 'purchase_date' => now()->subDecade()->format("Y-m-d"),
'purchase_cost' => 4000, 'purchase_cost' => 4000,
]); ]);
@ -62,7 +63,8 @@ class DepreciationTest extends TestCase
->laptopMbp() ->laptopMbp()
->create( ->create(
[ [
'category_id' => Category::factory()->assetLaptopCategory()->create(), //not sure how this ever worked...
//'category_id' => Category::factory()->assetLaptopCategory()->create(),
'purchase_date' => now()->subDecade()->format("Y-m-d"), 'purchase_date' => now()->subDecade()->format("Y-m-d"),
'purchase_cost' => 4000, 'purchase_cost' => 4000,
]); ]);