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

Added feature to cancel requests from the Requested Assets view

Browse source
This commit is contained in:
Ivan Nieto Vivanco 2023-06-27 18:11:10 -06:00
parent eb4d764601
commit 1c29bd37a6
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Controllers/ViewAssetsController.php
View file

@ -82,7 +82,7 @@ class ViewAssetsController extends Controller
return view('account/requestable-assets', compact('assets', 'models')); return view('account/requestable-assets', compact('assets', 'models'));
} }
public function getRequestItem(Request $request, $itemType, $itemId = null) public function getRequestItem(Request $request, $itemType, $itemId = null, $cancel_by_admin = false, $requestingUser = null)
{ {
$item = null; $item = null;
$fullItemType = 'App\\Models\\'.studly_case($itemType); $fullItemType = 'App\\Models\\'.studly_case($itemType);
@ -119,8 +119,8 @@ class ViewAssetsController extends Controller
$settings = Setting::getSettings(); $settings = Setting::getSettings();
if ($item_request = $item->isRequestedBy($user)) { if (($item_request = $item->isRequestedBy($user)) || $cancel_by_admin) {
$item->cancelRequest(); $item->cancelRequest($requestingUser);
$data['item_quantity'] = $item_request->qty; $data['item_quantity'] = $item_request->qty;
$logaction->logaction('request_canceled'); $logaction->logaction('request_canceled');

2
resources/views/hardware/requested.blade.php
View file

@ -106,7 +106,7 @@
<td> <td>
{{ Form::open([ {{ Form::open([
'method' => 'POST', 'method' => 'POST',
'route' => ['account/request-asset', $request->requestable->id], 'route' => ['account/request-item', $request->itemType(), $request->requestable->id, true, $request->requestingUser()->id],
]) }} ]) }}
<button class="btn btn-danger btn-sm" data-tooltip="true" title="Cancel this item request">{{ trans('button.cancel') }}</button> <button class="btn btn-danger btn-sm" data-tooltip="true" title="Cancel this item request">{{ trans('button.cancel') }}</button>
{{ Form::close() }} {{ Form::close() }}

2
routes/web.php
View file

@ -281,7 +281,7 @@ Route::group(['prefix' => 'account', 'middleware' => ['auth']], function () {
)->name('account/request-asset'); )->name('account/request-asset');
Route::post( Route::post(
'request/{itemType}/{itemId}', 'request/{itemType}/{itemId}/{cancel_by_admin?}/{requestingUser?}',
[ViewAssetsController::class, 'getRequestItem'] [ViewAssetsController::class, 'getRequestItem']
)->name('account/request-item'); )->name('account/request-item');