From 1c29bd37a69b3129e62dcc3ee97bca7869eee652 Mon Sep 17 00:00:00 2001
From: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Tue, 27 Jun 2023 18:11:10 -0600
Subject: [PATCH] Added feature to cancel requests from the Requested Assets
 view

---
 app/Http/Controllers/ViewAssetsController.php | 6 +++---
 resources/views/hardware/requested.blade.php  | 2 +-
 routes/web.php                                | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/ViewAssetsController.php b/app/Http/Controllers/ViewAssetsController.php
index ee3e4b14c6..f8f72ea3a8 100755
--- a/app/Http/Controllers/ViewAssetsController.php
+++ b/app/Http/Controllers/ViewAssetsController.php
@@ -82,7 +82,7 @@ class ViewAssetsController extends Controller
         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;
         $fullItemType = 'App\\Models\\'.studly_case($itemType);
@@ -119,8 +119,8 @@ class ViewAssetsController extends Controller
 
         $settings = Setting::getSettings();
 
-        if ($item_request = $item->isRequestedBy($user)) {
-            $item->cancelRequest();
+        if (($item_request = $item->isRequestedBy($user)) || $cancel_by_admin) {
+            $item->cancelRequest($requestingUser);
             $data['item_quantity'] = $item_request->qty;
             $logaction->logaction('request_canceled');
 
diff --git a/resources/views/hardware/requested.blade.php b/resources/views/hardware/requested.blade.php
index beccf44725..25502b42c3 100644
--- a/resources/views/hardware/requested.blade.php
+++ b/resources/views/hardware/requested.blade.php
@@ -106,7 +106,7 @@
                             <td>
                                 {{ Form::open([
                                     '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>
                                 {{ Form::close() }}
diff --git a/routes/web.php b/routes/web.php
index 49998f43fc..5de6ef9025 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -281,7 +281,7 @@ Route::group(['prefix' => 'account', 'middleware' => ['auth']], function () {
     )->name('account/request-asset');
 
     Route::post(
-        'request/{itemType}/{itemId}',
+        'request/{itemType}/{itemId}/{cancel_by_admin?}/{requestingUser?}',
         [ViewAssetsController::class, 'getRequestItem']
     )->name('account/request-item');