Skip to content

A free open source IT asset/license management system

More cleanup

snipe83adcc61bc00
diff --git a/resources/views/account/accept/create.blade.php b/resources/views/account/accept/create.blade.php
index 5d1deb0959..2fa3e441d8 100644
--- a/resources/views/account/accept/create.blade.php
+++ b/resources/views/account/accept/create.blade.php
@@ -47,7 +47,7 @@
<div class="col-sm-12 col-sm-offset-1 col-md-10 col-md-offset-1">
<div class="panel box box-default">
<div class="box-header with-border">
- <h2 class="box-title">
+ <h2 class="box-title" style="line-height: 25px;">
{{ $acceptance->checkoutable->display_name }}
@if ($acceptance->qty > 1)
<strong>×{{ $acceptance->qty }}</strong>
diff --git a/routes/web.php b/routes/web.php
index 2709f422aa..e8588d7745 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -427,9 +427,79 @@ Route::group(['prefix' => 'account', 'middleware' => ['auth']], function () {
Route::get('accept/{id}', [Account\AcceptanceController::class, 'create'])
->name('account.accept.item')
- ->breadcrumbs(fn (Trail $trail, $id) => $trail->parent('home')
- ->push(trans('general.profile'), route('account'))
- ->push(trans('general.accept_item'), route('account.accept.item', $id)));
+ ->breadcrumbs(function (Trail $trail, $id) {
+ $trail->parent('home');
+
+ if ((int) session('sign_in_place_acceptance_id') === (int) $id) {
+ $resourceType = session('sign_in_place_resource_type');
+ $itemId = session('sign_in_place_item_id');
+
+ if ($resourceType && $itemId) {
+ $item = null;
+ $indexRoute = null;
+ $showRoute = null;
+ $checkoutRoute = null;
+ $resourceLabel = null;
+
+ switch ($resourceType) {
+ case 'Assets':
+ $item = \App\Models\Asset::find($itemId);
+ $resourceLabel = trans('general.assets');
+ $indexRoute = route('hardware.index');
+ if ($item) {
+ $showRoute = route('hardware.show', $item);
+ $checkoutRoute = route('hardware.checkout.create', $item);
+ }
+ break;
+ case 'Licenses':
+ $item = \App\Models\License::find($itemId);
+ $resourceLabel = trans('general.licenses');
+ $indexRoute = route('licenses.index');
+ if ($item) {
+ $showRoute = route('licenses.show', $item);
+ $checkoutRoute = route('licenses.checkout', $item);
+ }
+ break;
+ case 'Consumables':
+ $item = \App\Models\Consumable::find($itemId);
+ $resourceLabel = trans('general.consumables');
+ $indexRoute = route('consumables.index');
+ if ($item) {
+ $showRoute = route('consumables.show', $item);
+ $checkoutRoute = route('consumables.checkout.show', $item);
+ }
+ break;
+ case 'Accessories':
+ $item = \App\Models\Accessory::find($itemId);
+ $resourceLabel = trans('general.accessories');
+ $indexRoute = route('accessories.index');
+ if ($item) {
+ $showRoute = route('accessories.show', $item);
+ $checkoutRoute = route('accessories.checkout.show', $item);
+ }
+ break;
+ }
+
+ if ($resourceLabel && $indexRoute) {
+ $trail->push($resourceLabel, $indexRoute);
+ }
+
+ if ($item && $showRoute) {
+ $trail->push($item->display_name ?? $item->name ?? trans('general.item'), $showRoute);
+ }
+
+ if ($checkoutRoute) {
+ $trail->push(trans('general.checkout'));
+ }
+ }
+
+ $trail->push(trans('general.sign_in_place'));
+ } else {
+ $trail->push(trans('general.profile'), route('account'));
+ $trail->push(trans('general.accept_items'), route('account.accept'));
+ $trail->push(trans('general.accept_item'), route('account.accept.item', $id));
+ }
+ });
Route::post('accept/{id}', [Account\AcceptanceController::class, 'store'])
->name('account.store-acceptance');
diff --git a/tests/Feature/CheckoutAcceptances/Ui/AssetAcceptanceTest.php b/tests/Feature/CheckoutAcceptances/Ui/AssetAcceptanceTest.php
index 2fd5df3915..9263471f4d 100644
--- a/tests/Feature/CheckoutAcceptances/Ui/AssetAcceptanceTest.php
+++ b/tests/Feature/CheckoutAcceptances/Ui/AssetAcceptanceTest.php
@@ -192,4 +192,36 @@ class AssetAcceptanceTest extends TestCase
$this->assertNotNull($checkoutAcceptance->refresh()->accepted_at);
Event::assertDispatched(CheckoutAccepted::class);
}
+
+ public function test_sign_in_place_acceptance_page_uses_checkout_flow_breadcrumbs()
+ {
+ $assignee = User::factory()->create();
+ $admin = User::factory()->admin()->create();
+ $asset = Asset::factory()->create();
+
+ $checkoutAcceptance = CheckoutAcceptance::factory()
+ ->pending()
+ ->for($assignee, 'assignedTo')
+ ->for($asset, 'checkoutable')
+ ->create();
+
+ $response = $this->actingAs($admin)
+ ->withSession([
+ 'sign_in_place_acceptance_id' => $checkoutAcceptance->id,
+ 'sign_in_place_item_id' => $asset->id,
+ 'sign_in_place_resource_type' => 'Assets',
+ ])
+ ->get(route('account.accept.item', $checkoutAcceptance));
+
+ $response->assertOk()
+ ->assertSeeInOrder([
+ trans('general.assets'),
+ $asset->display_name,
+ trans('general.checkout'),
+ trans('general.sign_in_place'),
+ ], false)
+ ->assertSee(route('hardware.index'), false)
+ ->assertSee(route('hardware.show', $asset), false)
+ ->assertDontSee(route('hardware.checkout.create', $asset), false);
+ }
}