Skip to content

A free open source IT asset/license management system

Make accessories requestable

Olivier Lambert409e11dca460
diff --git a/app/Http/Controllers/Accessories/AccessoriesController.php b/app/Http/Controllers/Accessories/AccessoriesController.php
index 3e773a5591..ec7149d9fd 100755
--- a/app/Http/Controllers/Accessories/AccessoriesController.php
+++ b/app/Http/Controllers/Accessories/AccessoriesController.php
@@ -77,6 +77,7 @@ class AccessoriesController extends Controller
$accessory->created_by = auth()->id();
$accessory->supplier_id = request('supplier_id');
$accessory->notes = request('notes');
+ $accessory->requestable = request('requestable', 0);
if ($request->has('use_cloned_image')) {
$cloned_model_img = Accessory::select('image')->find($request->input('clone_image_from_id'));
@@ -183,6 +184,7 @@ class AccessoriesController extends Controller
$accessory->qty = request('qty');
$accessory->supplier_id = request('supplier_id');
$accessory->notes = request('notes');
+ $accessory->requestable = request('requestable', 0);
$accessory = $request->handleImages($accessory);
diff --git a/app/Http/Controllers/Api/ProfileController.php b/app/Http/Controllers/Api/ProfileController.php
index c261f5cf2a..f264081ce7 100644
--- a/app/Http/Controllers/Api/ProfileController.php
+++ b/app/Http/Controllers/Api/ProfileController.php
@@ -67,7 +67,7 @@ class ProfileController extends Controller
if ($checkoutRequest && $checkoutRequest->itemRequested()) {
$assets = [
'image' => e($checkoutRequest->itemRequested()->present()->getImageUrl()),
- 'name' => e($checkoutRequest->itemRequested()->display_name),
+ 'name' => e($checkoutRequest->name()),
'type' => e($checkoutRequest->itemType()),
'qty' => (int) $checkoutRequest->quantity,
'location' => ($checkoutRequest->location()) ? e($checkoutRequest->location()->name) : null,
diff --git a/app/Http/Controllers/ViewAssetsController.php b/app/Http/Controllers/ViewAssetsController.php
index ead40565e9..83fed1ef6c 100755
--- a/app/Http/Controllers/ViewAssetsController.php
+++ b/app/Http/Controllers/ViewAssetsController.php
@@ -6,6 +6,7 @@ use App\Actions\CheckoutRequests\CancelCheckoutRequestAction;
use App\Actions\CheckoutRequests\CreateCheckoutRequestAction;
use App\Enums\ActionType;
use App\Exceptions\AssetNotRequestable;
+use App\Models\Accessory;
use App\Models\Actionlog;
use App\Models\Asset;
use App\Models\AssetModel;
@@ -160,11 +161,17 @@ class ViewAssetsController extends Controller
},
])->RequestableModels()->get();
- return view('account/requestable-assets', compact('assets', 'models'));
+ $accessories = Accessory::with('category', 'location', 'requests')
+ ->withCount('checkouts as checkouts_count')
+ ->RequestableAccessories()
+ ->get();
+
+ return view('account/requestable-assets', compact('assets', 'models', 'accessories'));
}
public function getRequestItem(Request $request, $itemType, $itemId = null, $cancel_by_admin = false, $requestingUser = null): RedirectResponse
{
+ $data = [];
$item = null;
$fullItemType = 'App\\Models\\'.studly_case($itemType);
@@ -193,11 +200,12 @@ class ViewAssetsController extends Controller
$data['item_type'] = $itemType;
$data['target'] = auth()->user();
- if ($fullItemType == Asset::class) {
- $data['item_url'] = route('hardware.show', $item->id);
- } else {
- $data['item_url'] = route("view/{$itemType}", $item->id);
- }
+ $data['item_url'] = match ($fullItemType) {
+ Asset::class => route('hardware.show', $item->id),
+ AssetModel::class => route('view/model', $item->id),
+ Accessory::class => route('accessories.show', $item->id),
+ default => route("view/{$itemType}", $item->id),
+ };
$settings = Setting::getSettings();
@@ -209,7 +217,7 @@ class ViewAssetsController extends Controller
if (($item_request = $item->isRequestedBy($user)) || ($is_admin && $cancel_by_admin)) {
$item->cancelRequest($is_admin && $cancel_by_admin ? $requestingUser : null);
- $data['item_quantity'] = ($item_request) ? $item_request->qty : 1;
+ $data['item_quantity'] = ($item_request) ? $item_request->quantity : 1;
$logaction->logaction(ActionType::RequestCanceled);
if (($settings->alert_email != '') && ($settings->alerts_enabled == '1') && (! config('app.lock_passwords'))) {
@@ -222,11 +230,12 @@ class ViewAssetsController extends Controller
return redirect()->back()->with('success')->with('success', trans('admin/hardware/message.requests.canceled'));
} else {
- if ($fullItemType === Asset::class && is_null(Asset::RequestableAssets()->find($item->id))) {
+ if (($fullItemType === Asset::class && is_null(Asset::RequestableAssets()->find($item->id)))
+ || ($fullItemType === Accessory::class && is_null(Accessory::RequestableAccessories()->find($item->id)))) {
return redirect()->back()->with('error', trans('admin/hardware/message.requests.error'));
}
- $item->request();
+ $item->request($data['item_quantity']);
if (($settings->alert_email != '') && ($settings->alerts_enabled == '1') && (! config('app.lock_passwords'))) {
$logaction->logaction('requested');
try {
diff --git a/app/Models/Accessory.php b/app/Models/Accessory.php
index f828ee7fa8..a7e7169cc9 100755
--- a/app/Models/Accessory.php
+++ b/app/Models/Accessory.php
@@ -6,6 +6,7 @@ use App\Models\Traits\Acceptable;
use App\Models\Traits\CompanyableTrait;
use App\Models\Traits\HasUploads;
use App\Models\Traits\Loggable;
+use App\Models\Traits\Requestable;
use App\Models\Traits\Searchable;
use App\Presenters\AccessoryPresenter;
use App\Presenters\Presentable;
@@ -29,6 +30,7 @@ class Accessory extends SnipeModel
use HasUploads;
use Loggable;
use Presentable;
+ use Requestable;
use Searchable;
use SoftDeletes;
use ValidatingTrait;
@@ -155,6 +157,15 @@ class Accessory extends SnipeModel
$this->attributes['requestable'] = filter_var($value, FILTER_VALIDATE_BOOLEAN);
}
+ /**
+ * Scope query to only requestable accessories. Unlike assets, accessories
+ * have no deployable status to check, so the flag is all we need here.
+ */
+ public function scopeRequestableAccessories($query)
+ {
+ return $query->where('accessories.requestable', '1');
+ }
+
/**
* Establishes the accessory -> company relationship
*
diff --git a/app/Models/CheckoutRequest.php b/app/Models/CheckoutRequest.php
index e6eb73bb44..f33a89789e 100644
--- a/app/Models/CheckoutRequest.php
+++ b/app/Models/CheckoutRequest.php
@@ -11,7 +11,7 @@ class CheckoutRequest extends Model
use HasFactory;
use SoftDeletes;
- protected $fillable = ['user_id'];
+ protected $fillable = ['user_id', 'quantity'];
protected $table = 'checkout_requests';
diff --git a/app/Models/Traits/Requestable.php b/app/Models/Traits/Requestable.php
index 31990f554c..edda4aace1 100644
--- a/app/Models/Traits/Requestable.php
+++ b/app/Models/Traits/Requestable.php
@@ -33,7 +33,7 @@ trait Requestable
public function request($qty = 1)
{
$this->requests()->save(
- new CheckoutRequest(['user_id' => auth()->id(), 'qty' => $qty])
+ new CheckoutRequest(['user_id' => auth()->id(), 'quantity' => $qty])
);
}
diff --git a/resources/lang/en-US/admin/accessories/general.php b/resources/lang/en-US/admin/accessories/general.php
index 7d4653f06b..858df1d8f7 100644
--- a/resources/lang/en-US/admin/accessories/general.php
+++ b/resources/lang/en-US/admin/accessories/general.php
@@ -13,6 +13,7 @@ return [
'no_default_eula' => 'No primary default EULA found. Add one in Settings.',
'total' => 'Total',
'remaining' => 'Avail',
+ 'requestable' => 'Users may request this accessory',
'update' => 'Update Accessory',
'use_default_eula' => 'Use the <a href="#" data-toggle="modal" data-target="#eulaModal">primary default EULA</a> instead.',
'use_default_eula_disabled' => '<del>Use the primary default EULA instead.</del> No primary default EULA is set. Please add one in Settings.',
diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php
index 0a48ab53a7..5b22c36fb6 100644
--- a/resources/lang/en-US/general.php
+++ b/resources/lang/en-US/general.php
@@ -660,7 +660,7 @@ return [
'partial' => 'Deleted :success_count :object_type, but :error_count :object_type could not be deleted',
],
],
- 'no_requestable' => 'There are no requestable assets or asset models.',
+ 'no_requestable' => 'There are no requestable assets, asset models, or accessories.',
'countable' => [
'accessories' => ':count Accessory|:count Accessories',
diff --git a/resources/views/accessories/edit.blade.php b/resources/views/accessories/edit.blade.php
index b6069e62db..f70f5868af 100644
--- a/resources/views/accessories/edit.blade.php
+++ b/resources/views/accessories/edit.blade.php
@@ -100,6 +100,8 @@
@include ('partials.forms.edit.image-upload', ['image_path' => app('accessories_upload_path')])
+ @include ('partials.forms.edit.requestable', ['requestable_text' => trans('admin/accessories/general.requestable')])
+
<x-slot:customfooter>
<x-redirect_submit_options
index_route="accessories.index"
diff --git a/resources/views/account/requestable-assets.blade.php b/resources/views/account/requestable-assets.blade.php
index 72f71bf808..5d1392edae 100644
--- a/resources/views/account/requestable-assets.blade.php
+++ b/resources/views/account/requestable-assets.blade.php
@@ -16,7 +16,7 @@
<div class="col-md-12">
- @if (($assets->count() < 1) && ($models->count() < 1))
+ @if (($assets->count() < 1) && ($models->count() < 1) && ($accessories->count() < 1))
<div class="col-md-12">
<div class="alert alert-info fade in">
@@ -40,7 +40,14 @@
<li>
<a href="#models" data-toggle="tab" title="{{ trans('general.asset_models') }}">{{ trans('general.asset_models') }}
<span class="badge badge-secondary"> {{ $models->count()}}</span>
- </a>
+ </a>
+ </li>
+ @endif
+ @if ($accessories->count() > 0)
+ <li>
+ <a href="#accessories" data-toggle="tab" title="{{ trans('general.accessories') }}">{{ trans('general.accessories') }}
+ <span class="badge badge-secondary"> {{ $accessories->count()}}</span>
+ </a>
</li>
@endif
</ul>
@@ -156,6 +163,67 @@
</div>
@endif
+ @if ($accessories->count() > 0)
+ <div class="tab-pane fade in {{ (($assets->count() == 0) && ($models->count() == 0)) ? 'active' : '' }}" id="accessories">
+ <div class="row">
+ <div class="col-md-12">
+ <table
+ class="table table-striped snipe-table"
+ id="requestableAccessoriesTable"
+ data-cookie-id-table="requestableAccessories">
+ <thead>
+ <tr role="row">
+ <th class="col-md-1" data-sortable="true">{{ trans('general.image') }}</th>
+ <th class="col-md-5" data-sortable="true">{{ trans('admin/accessories/general.accessory_name') }}</th>
+ <th class="col-md-2" data-sortable="true">{{ trans('admin/hardware/table.location') }}</th>
+ <th class="col-md-2" data-sortable="true">{{ trans('admin/accessories/general.remaining') }}</th>
+ <th class="col-md-2 actions" data-sortable="false">{{ trans('table.actions') }}</th>
+ </tr>
+ </thead>
+
+ <tbody>
+ @foreach($accessories as $requestableAccessory)
+ <tr>
+ <td>
+ @if (($requestableAccessory->image) && ($requestableAccessory->getImageUrl()))
+ <a href="{{ $requestableAccessory->getImageUrl() }}" data-toggle="lightbox" data-type="image">
+ <img src="{{ $requestableAccessory->getImageUrl() }}" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive">
+ </a>
+ @endif
+ </td>
+
+ <td>
+ @can('view', \App\Models\Accessory::class)
+ <a href="{{ route('accessories.show', ['accessory' => $requestableAccessory->id]) }}">{{ $requestableAccessory->name }}</a>
+ @else
+ {{ $requestableAccessory->name }}
+ @endcan
+ </td>
+
+ <td>{{ $requestableAccessory->location->name ?? '' }}</td>
+
+ <td>{{ $requestableAccessory->numRemaining() }}</td>
+
+ <td>
+ <form action="{{ route('account/request-item', ['itemType' => 'accessory', 'itemId' => $requestableAccessory->id]) }}" method="POST" accept-charset="utf-8">
+ {{ csrf_field() }}
+ <input type="text" style="width: 70px; margin-right: 10px;" class="form-control pull-left" name="request-quantity" value="1" placeholder="{{ trans('general.qty') }}">
+ @if ($requestableAccessory->isRequestedBy(Auth::user()))
+ <input class="btn btn-danger btn-sm" type="submit" value="{{ trans('button.cancel') }}">
+ @else
+ <input class="btn btn-primary btn-sm" type="submit" value="{{ trans('button.request') }}">
+ @endif
+ </form>
+ </td>
+ </tr>
+ @endforeach
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ @endif
+
</div> <!-- .tab-content-->
</div> <!-- .nav-tabs-custom -->
diff --git a/resources/views/hardware/requested.blade.php b/resources/views/hardware/requested.blade.php
index f851145ce1..39e7c2d571 100644
--- a/resources/views/hardware/requested.blade.php
+++ b/resources/views/hardware/requested.blade.php
@@ -53,6 +53,8 @@
<a href="{{ $request->requestable->getImageUrl() }}" data-toggle="lightbox" data-type="image"><img src="{{ $request->requestable->getImageUrl() }}" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive" alt="{{ $request->requestable->name }}"></a>
@elseif (($request->itemType() == "asset_model") && ($request->requestable))
<a href="{{ Storage::disk('public')->url(app('models_upload_path') . $request->requestable->image) }}" data-toggle="lightbox" data-type="image"><img src="{{ Storage::disk('public')->url(app('models_upload_path') . $request->requestable->image) }}" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive" alt="{{ $request->requestable->name }}"></a>
+ @elseif (($request->itemType() == "accessory") && ($request->requestable) && ($request->requestable->getImageUrl()))
+ <a href="{{ $request->requestable->getImageUrl() }}" data-toggle="lightbox" data-type="image"><img src="{{ $request->requestable->getImageUrl() }}" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive" alt="{{ $request->requestable->name }}"></a>
@endif
</td>
<td>
@@ -65,6 +67,10 @@
<a href="{{ config('app.url') }}/models/{{ $request->requestable->id }}">
{{ $request->name() }}
</a>
+ @elseif ($request->itemType() == "accessory")
+ <a href="{{ config('app.url') }}/accessories/{{ $request->requestable->id }}">
+ {{ $request->name() }}
+ </a>
@endif
</td>
@@ -111,6 +117,8 @@
@else
<a href="{{ config('app.url') }}/hardware/{{ $request->requestable->id }}/checkin" class="btn btn-sm bg-purple" data-tooltip="true" title="{{ trans('general.checkin_tooltip') }}">{{ trans('general.checkin') }}</a>
@endif
+ @elseif ($request->itemType() == "accessory")
+ <a href="{{ config('app.url') }}/accessories/{{ $request->requestable->id }}/checkout" class="btn btn-sm bg-maroon" data-tooltip="true" title="{{ trans('general.checkout_user_tooltip') }}">{{ trans('general.checkout') }}</a>
@endif
</td>
diff --git a/tests/Feature/Requests/Ui/AccessoryRequestTest.php b/tests/Feature/Requests/Ui/AccessoryRequestTest.php
new file mode 100644
index 0000000000..3d810e4e9f
--- /dev/null
+++ b/tests/Feature/Requests/Ui/AccessoryRequestTest.php
@@ -0,0 +1,109 @@
+<?php
+
+namespace Tests\Feature\Requests\Ui;
+
+use App\Models\Accessory;
+use App\Models\CheckoutRequest;
+use App\Models\User;
+use Tests\TestCase;
+
+class AccessoryRequestTest extends TestCase
+{
+ public function test_requestable_index_lists_requestable_accessories(): void
+ {
+ $accessory = Accessory::factory()->create(['requestable' => true]);
+ Accessory::factory()->create(['requestable' => false]);
+
+ $this->actingAs(User::factory()->create())
+ ->get(route('requestable-assets'))
+ ->assertOk()
+ ->assertViewHas('accessories')
+ ->assertSeeText($accessory->name);
+ }
+
+ public function test_user_can_request_a_requestable_accessory(): void
+ {
+ $accessory = Accessory::factory()->create(['requestable' => true]);
+ $user = User::factory()->create();
+
+ $this->actingAs($user)
+ ->post(route('account/request-item', [
+ 'itemType' => 'accessory',
+ 'itemId' => $accessory->id,
+ ]), ['request-quantity' => 3])
+ ->assertRedirect();
+
+ $request = CheckoutRequest::where('requestable_id', $accessory->id)
+ ->where('requestable_type', Accessory::class)
+ ->where('user_id', $user->id)
+ ->first();
+
+ $this->assertNotNull($request, 'A checkout request should have been created for the accessory.');
+ $this->assertEquals(3, $request->quantity, 'The requested quantity should be persisted.');
+ $this->assertNull($request->canceled_at);
+ }
+
+ public function test_user_cannot_request_an_accessory_that_is_not_requestable(): void
+ {
+ $accessory = Accessory::factory()->create(['requestable' => false]);
+ $user = User::factory()->create();
+
+ $this->actingAs($user)
+ ->post(route('account/request-item', [
+ 'itemType' => 'accessory',
+ 'itemId' => $accessory->id,
+ ]))
+ ->assertRedirect()
+ ->assertSessionHas('error');
+
+ $this->assertNull(
+ CheckoutRequest::where('requestable_id', $accessory->id)
+ ->where('requestable_type', Accessory::class)
+ ->first()
+ );
+ }
+
+ public function test_user_can_cancel_their_own_accessory_request(): void
+ {
+ $accessory = Accessory::factory()->create(['requestable' => true]);
+ $user = User::factory()->create();
+ CheckoutRequest::factory()->create([
+ 'requestable_id' => $accessory->id,
+ 'requestable_type' => Accessory::class,
+ 'user_id' => $user->id,
+ ]);
+
+ $this->actingAs($user)
+ ->post(route('account/request-item', [
+ 'itemType' => 'accessory',
+ 'itemId' => $accessory->id,
+ ]))
+ ->assertRedirect();
+
+ $this->assertNotNull(
+ CheckoutRequest::where('requestable_id', $accessory->id)
+ ->where('requestable_type', Accessory::class)
+ ->where('user_id', $user->id)
+ ->whereNotNull('canceled_at')
+ ->first()
+ );
+ }
+
+ public function test_admin_requested_index_renders_accessory_requests(): void
+ {
+ $accessory = Accessory::factory()->create(['requestable' => true]);
+ CheckoutRequest::factory()->create([
+ 'requestable_id' => $accessory->id,
+ 'requestable_type' => Accessory::class,
+ 'user_id' => User::factory()->create()->id,
+ ]);
+
+ // The admin "Requested" queue is a polymorphic list of all checkout
+ // requests, so an accessory request should render there by name.
+ $this->actingAs(User::factory()->viewAssets()->create())
+ ->get(route('assets.requested'))
+ ->assertOk()
+ ->assertViewHas('requestedItems')
+ ->assertSeeText($accessory->name);
+ }
+}