lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

cancel action finished

Browse source
This commit is contained in:
spencerrlongg 2024-10-22 22:44:28 -05:00
parent 79e6eafafa
commit b0d7eb2168
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -165,7 +165,7 @@ class ViewAssetsController extends Controller
public function destroy(Asset $asset): RedirectResponse public function destroy(Asset $asset): RedirectResponse
{ {
CancelCheckoutRequest::run($asset, auth()->user()); CancelCheckoutRequest::run($asset, auth()->user());
return redirect()->route('requestable-assets')->with('success')->with('success', trans('admin/hardware/message.requests.success')); return redirect()->route('requestable-assets')->with('success')->with('success', trans('admin/hardware/message.requests.canceled'));
} }

2
resources/views/partials/bootstrap-table.blade.php
View file

@ -480,7 +480,7 @@
if (value.assigned_to_self == true){ if (value.assigned_to_self == true){
return '<button class="btn btn-danger btn-sm disabled" data-tooltip="true" title="Cancel this item request">{{ trans('button.cancel') }}</button>'; return '<button class="btn btn-danger btn-sm disabled" data-tooltip="true" title="Cancel this item request">{{ trans('button.cancel') }}</button>';
} else if (value.available_actions.cancel == true) { } else if (value.available_actions.cancel == true) {
return '<form action="{{ config('app.url') }}/account/request-asset/'+ value.id + '" method="POST">@csrf<button class="btn btn-danger btn-sm" data-tooltip="true" title="Cancel this item request">{{ trans('button.cancel') }}</button></form>'; return '<form action="{{ config('app.url') }}/account/request-asset/' + value.id + '/cancel" method="POST">@csrf<button class="btn btn-danger btn-sm" data-tooltip="true" title="Cancel this item request">{{ trans('button.cancel') }}</button></form>';
} else if (value.available_actions.request == true) { } else if (value.available_actions.request == true) {
return '<form action="{{ config('app.url') }}/account/request-asset/'+ value.id + '" method="POST">@csrf<button class="btn btn-primary btn-sm" data-tooltip="true" title="{{ trans('general.request_item') }}">{{ trans('button.request') }}</button></form>'; return '<form action="{{ config('app.url') }}/account/request-asset/'+ value.id + '" method="POST">@csrf<button class="btn btn-primary btn-sm" data-tooltip="true" title="{{ trans('general.request_item') }}">{{ trans('button.request') }}</button></form>';
} }

2
routes/web.php
View file

@ -294,7 +294,7 @@ Route::group(['prefix' => 'account', 'middleware' => ['auth']], function () {
Route::get('api', [ProfileController::class, 'api'])->name('user.api'); Route::get('api', [ProfileController::class, 'api'])->name('user.api');
// View Assets // View Assets
Route::get('view-assets', [ViewAssetsController::class, 'index'])->name('view-assets'); Route::get('view-assets', [ViewAssetsController::class, 'getIndex'])->name('view-assets');
Route::get('requested', [ViewAssetsController::class, 'getRequestedAssets'])->name('account.requested'); Route::get('requested', [ViewAssetsController::class, 'getRequestedAssets'])->name('account.requested');