- {!! trans('admin/settings/general.backups_path', ['path'=> 'storage/app/backup']) !!}
+ {!! trans('admin/settings/general.backups_path', ['path'=> 'storage/app/backups']) !!}
@if (config('app.lock_passwords')===true)
diff --git a/resources/views/statuslabels/view.blade.php b/resources/views/statuslabels/view.blade.php
index f80bfa5782..46d356c3ef 100644
--- a/resources/views/statuslabels/view.blade.php
+++ b/resources/views/statuslabels/view.blade.php
@@ -24,6 +24,7 @@
data-bulk-button-id="#bulkAssetEditButton"
data-bulk-form-id="#assetsBulkForm"
id="assetsListingTable"
+ data-show-columns-search="true"
data-buttons="assetButtons"
class="table table-striped snipe-table"
data-url="{{route('api.assets.index', ['status_id' => $statuslabel->id]) }}"
diff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.php
index 9cf7d6e147..bc216a964e 100755
--- a/resources/views/suppliers/view.blade.php
+++ b/resources/views/suppliers/view.blade.php
@@ -114,6 +114,7 @@
'v1', 'middleware' => ['api', 'api-throttle:api']], fu
// the model name to be the parameter - and i think it's a good differentiation in the code while we convert the others.
Route::patch('/hardware/{asset}', [Api\AssetsController::class, 'update'])->name('api.assets.update');
Route::put('/hardware/{asset}', [Api\AssetsController::class, 'update'])->name('api.assets.put-update');
-
- Route::put('/hardware/{asset}', [Api\AssetsController::class, 'update'])->name('api.assets.put-update');
-
+
Route::resource('hardware',
Api\AssetsController::class,
['names' => [
diff --git a/routes/web.php b/routes/web.php
index a68923c4b2..30d11e9a96 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -725,7 +725,7 @@ Route::group(['middleware' => 'web'], function () {
'destroy'
]
)->name('ui.files.destroy')
- ->where(['object_type' => 'assets|hardware|models|users|locations|accessories|consumables|licenses|components']);
+ ->where(['object_type' => 'assets|maintenances|hardware|models|users|locations|accessories|consumables|licenses|components']);
});
diff --git a/tests/Feature/Checkouts/Ui/BulkAssetCheckoutTest.php b/tests/Feature/Checkouts/Ui/BulkAssetCheckoutTest.php
index f05c4389e6..6f6f250b90 100644
--- a/tests/Feature/Checkouts/Ui/BulkAssetCheckoutTest.php
+++ b/tests/Feature/Checkouts/Ui/BulkAssetCheckoutTest.php
@@ -4,8 +4,11 @@ namespace Tests\Feature\Checkouts\Ui;
use App\Mail\CheckoutAssetMail;
use App\Models\Asset;
+use App\Models\Company;
+use App\Models\Location;
use App\Models\User;
use Illuminate\Support\Facades\Mail;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\ExpectationFailedException;
use Tests\TestCase;
@@ -89,4 +92,99 @@ class BulkAssetCheckoutTest extends TestCase
$this->fail('Asset checkout email was sent when the entire checkout failed.');
}
}
+
+ public static function checkoutTargets()
+ {
+ yield 'Checkout to user' => [
+ function () {
+ return [
+ 'type' => 'user',
+ 'target' => User::factory()->forCompany()->create(),
+ ];
+ }
+ ];
+
+ yield 'Checkout to asset' => [
+ function () {
+ return [
+ 'type' => 'asset',
+ 'target' => Asset::factory()->forCompany()->create(),
+ ];
+ }
+ ];
+
+ yield 'Checkout to location' => [
+ function () {
+ return [
+ 'type' => 'location',
+ 'target' => Location::factory()->forCompany()->create(),
+ ];
+ }
+ ];
+ }
+
+ #[DataProvider('checkoutTargets')]
+ public function test_adheres_to_full_multiple_company_support($data)
+ {
+ ['type' => $type, 'target' => $target] = $data();
+
+ $this->settings->enableMultipleFullCompanySupport();
+
+ // create two companies
+ [$companyA, $companyB] = Company::factory()->count(2)->create();
+
+ // create an asset for each company
+ $assetForCompanyA = Asset::factory()->for($companyA)->create();
+ $assetForCompanyB = Asset::factory()->for($companyB)->create();
+
+ $this->assertNull($assetForCompanyA->assigned_to, 'Asset should not be assigned before attempting this test case.');
+ $this->assertNull($assetForCompanyB->assigned_to, 'Asset should not be assigned before attempting this test case.');
+
+ // attempt to bulk checkout both items to the target
+ $response = $this->actingAs(User::factory()->superuser()->create())
+ ->post(route('hardware.bulkcheckout.store'), [
+ 'selected_assets' => [
+ $assetForCompanyA->id,
+ $assetForCompanyB->id,
+ ],
+ 'checkout_to_type' => $type,
+ "assigned_$type" => $target->id,
+ ]);
+
+ // ensure bulk checkout is blocked
+ $this->assertNull($assetForCompanyA->fresh()->assigned_to, 'Asset was checked out across companies.');
+ $this->assertNull($assetForCompanyB->fresh()->assigned_to, 'Asset was checked out across companies.');
+
+ // ensure redirected back
+ $response->assertRedirectToRoute('hardware.bulkcheckout.show');
+ }
+
+ #[DataProvider('checkoutTargets')]
+ public function test_prevents_checkouts_of_checked_out_items($data)
+ {
+ ['type' => $type, 'target' => $target] = $data();
+
+ $asset = Asset::factory()->create();
+ $checkedOutAsset = Asset::factory()->assignedToUser()->create();
+ $existingUserId = $checkedOutAsset->assigned_to;
+
+ $response = $this->actingAs(User::factory()->superuser()->create())
+ ->post(route('hardware.bulkcheckout.store'), [
+ 'selected_assets' => [
+ $asset->id,
+ $checkedOutAsset->id,
+ ],
+ 'checkout_to_type' => $type,
+ "assigned_$type" => $target->id,
+ ]);
+
+ $this->assertEquals(
+ $existingUserId,
+ $checkedOutAsset->fresh()->assigned_to,
+ 'Asset was checked out when it should have been prevented.'
+ );
+
+ // ensure redirected back
+ $response->assertRedirectToRoute('hardware.bulkcheckout.show');
+ }
}