Skip to content

A free open source IT asset/license management system

Added redirects

snipe264347e3234c
diff --git a/app/Http/Controllers/Account/AcceptanceController.php b/app/Http/Controllers/Account/AcceptanceController.php
index 4ebcdb1a6a..80eb1853e7 100644
--- a/app/Http/Controllers/Account/AcceptanceController.php
+++ b/app/Http/Controllers/Account/AcceptanceController.php
@@ -30,7 +30,8 @@ class AcceptanceController extends Controller
*/
public function index(): View
{
- $acceptances = CheckoutAcceptance::forUser(auth()->user())->pending()->get();
+ $currentUser = $this->currentUser();
+ $acceptances = CheckoutAcceptance::forUser($currentUser)->pending()->get();
return view('account/accept.index', compact('acceptances'));
}
@@ -42,7 +43,9 @@ class AcceptanceController extends Controller
*/
public function create($id): View|RedirectResponse
{
+ $currentUser = $this->currentUser();
$acceptance = CheckoutAcceptance::find($id);
+ $isSignInPlaceAdminFlow = false;
if (is_null($acceptance)) {
return redirect()->route('account.accept')->with('error', trans('admin/hardware/message.does_not_exist'));
@@ -52,7 +55,9 @@ class AcceptanceController extends Controller
return redirect()->route('account.accept')->with('error', trans('admin/users/message.error.asset_already_accepted'));
}
- if (! $acceptance->isCheckedOutTo(auth()->user())) {
+ $isSignInPlaceAdminFlow = $this->isSignInPlaceAdminFlow($acceptance);
+
+ if (! $acceptance->isCheckedOutTo($currentUser) && (! $isSignInPlaceAdminFlow)) {
return redirect()->route('account.accept')->with('error', trans('admin/users/message.error.incorrect_user_accepted'));
}
@@ -60,7 +65,7 @@ class AcceptanceController extends Controller
return redirect()->route('account.accept')->with('error', trans('general.error_user_company'));
}
- return view('account/accept.create', compact('acceptance'));
+ return view('account/accept.create', compact('acceptance', 'isSignInPlaceAdminFlow'));
}
/**
@@ -70,6 +75,7 @@ class AcceptanceController extends Controller
*/
public function store(Request $request, $id): RedirectResponse
{
+ $currentUser = $this->currentUser();
if (! $acceptance = CheckoutAcceptance::find($id)) {
return redirect()->route('account.accept')->with('error', trans('admin/hardware/message.does_not_exist'));
@@ -83,7 +89,9 @@ class AcceptanceController extends Controller
return redirect()->route('account.accept')->with('error', trans('admin/users/message.error.asset_already_accepted'));
}
- if (! $acceptance->isCheckedOutTo(auth()->user())) {
+ $isSignInPlaceAdminFlow = $this->isSignInPlaceAdminFlow($acceptance);
+
+ if (! $acceptance->isCheckedOutTo($currentUser) && (! $isSignInPlaceAdminFlow)) {
return redirect()->route('account.accept')->with('error', trans('admin/users/message.error.incorrect_user_accepted'));
}
@@ -223,7 +231,44 @@ class AcceptanceController extends Controller
}
}
+ if ($isSignInPlaceAdminFlow) {
+ $request->request->add(['assigned_user' => $assigned_user?->id]);
+
+ $redirect = Helper::getRedirectOption(
+ $request,
+ session('sign_in_place_item_id'),
+ session('sign_in_place_table'),
+ );
+
+ session()->forget([
+ 'sign_in_place_acceptance_id',
+ 'sign_in_place_item_id',
+ 'sign_in_place_table',
+ ]);
+
+ return $redirect->with('success', $return_msg);
+ }
+
return redirect()->to('account/accept')->with('success', $return_msg);
}
+
+ private function isSignInPlaceAdminFlow(CheckoutAcceptance $acceptance): bool
+ {
+ $currentUser = auth()->user();
+
+ return ((int) session('sign_in_place_acceptance_id') === (int) $acceptance->id)
+ && ($currentUser?->can('checkout', $acceptance->checkoutable));
+ }
+
+ private function currentUser(): User
+ {
+ $user = auth()->user();
+
+ if (! $user instanceof User) {
+ abort(403, trans('general.insufficient_permissions'));
+ }
+
+ return $user;
+ }
}
diff --git a/app/Http/Controllers/Assets/AssetCheckoutController.php b/app/Http/Controllers/Assets/AssetCheckoutController.php
index ea28066489..23289e32a0 100644
--- a/app/Http/Controllers/Assets/AssetCheckoutController.php
+++ b/app/Http/Controllers/Assets/AssetCheckoutController.php
@@ -8,7 +8,9 @@ use App\Http\Controllers\CheckInOutRequest;
use App\Http\Controllers\Controller;
use App\Http\Requests\AssetCheckoutRequest;
use App\Models\Asset;
+use App\Models\CheckoutAcceptance;
use App\Models\Setting;
+use App\Models\User;
use Illuminate\Contracts\View\View;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Http\RedirectResponse;
@@ -125,6 +127,36 @@ class AssetCheckoutController extends Controller
session()->put(['redirect_option' => $request->input('redirect_option'), 'checkout_to_type' => $request->input('checkout_to_type')]);
if ($asset->checkOut($target, $admin, $checkout_at, $expected_checkin, $request->input('note'), $request->input('name'))) {
+
+ // When sign_in_place is requested and the target is a user, redirect to the
+ // acceptance/signature page so the user can sign in person. The signature is
+ // attributed to the target user, not the admin.
+ if ($request->boolean('sign_in_place') && $target instanceof User) {
+ $acceptance = CheckoutAcceptance::where('checkoutable_type', Asset::class)
+ ->where('checkoutable_id', $asset->id)
+ ->where('assigned_to_id', $target->id)
+ ->pending()
+ ->latest()
+ ->first();
+
+ // If requireAcceptance() is false the listener won't have created one; create it now.
+ if (! $acceptance) {
+ $acceptance = new CheckoutAcceptance;
+ $acceptance->checkoutable()->associate($asset);
+ $acceptance->assignedTo()->associate($target);
+ $acceptance->save();
+ }
+
+ session([
+ 'sign_in_place_acceptance_id' => $acceptance->id,
+ 'sign_in_place_item_id' => $asset->id,
+ 'sign_in_place_table' => 'Assets',
+ ]);
+
+ return redirect()->route('account.accept.item', $acceptance->id)
+ ->with('success', trans('admin/hardware/message.checkout.success'));
+ }
+
return Helper::getRedirectOption($request, $asset->id, 'Assets')
->with('success', trans('admin/hardware/message.checkout.success'));
}
diff --git a/app/Http/Controllers/Consumables/ConsumableCheckoutController.php b/app/Http/Controllers/Consumables/ConsumableCheckoutController.php
index dd1115ef53..81fbd22749 100644
--- a/app/Http/Controllers/Consumables/ConsumableCheckoutController.php
+++ b/app/Http/Controllers/Consumables/ConsumableCheckoutController.php
@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Consumables;
use App\Events\CheckoutableCheckedOut;
use App\Helpers\Helper;
use App\Http\Controllers\Controller;
+use App\Models\CheckoutAcceptance;
use App\Models\Consumable;
use App\Models\User;
use Illuminate\Auth\Access\AuthorizationException;
@@ -123,6 +124,35 @@ class ConsumableCheckoutController extends Controller
session()->put(['redirect_option' => $request->input('redirect_option'), 'checkout_to_type' => $request->input('checkout_to_type')]);
+ // When sign_in_place is requested, redirect to the acceptance/signature page
+ // so the user can sign in person. The signature is attributed to the target user.
+ if ($request->boolean('sign_in_place')) {
+ $acceptance = CheckoutAcceptance::where('checkoutable_type', Consumable::class)
+ ->where('checkoutable_id', $consumable->id)
+ ->where('assigned_to_id', $user->id)
+ ->pending()
+ ->latest()
+ ->first();
+
+ // If requireAcceptance() is false the listener won't have created one; create it now.
+ if (! $acceptance) {
+ $acceptance = new CheckoutAcceptance;
+ $acceptance->checkoutable()->associate($consumable);
+ $acceptance->assignedTo()->associate($user);
+ $acceptance->qty = $quantity;
+ $acceptance->save();
+ }
+
+ session([
+ 'sign_in_place_acceptance_id' => $acceptance->id,
+ 'sign_in_place_item_id' => $consumable->id,
+ 'sign_in_place_table' => 'Consumables',
+ ]);
+
+ return redirect()->route('account.accept.item', $acceptance->id)
+ ->with('success', trans('admin/consumables/message.checkout.success'));
+ }
+
// Redirect to the new consumable page
return Helper::getRedirectOption($request, $consumable->id, 'Consumables')
->with('success', trans('admin/consumables/message.checkout.success'));
diff --git a/app/Http/Controllers/Licenses/LicenseCheckoutController.php b/app/Http/Controllers/Licenses/LicenseCheckoutController.php
index 569de2b502..1fa5620143 100644
--- a/app/Http/Controllers/Licenses/LicenseCheckoutController.php
+++ b/app/Http/Controllers/Licenses/LicenseCheckoutController.php
@@ -7,6 +7,7 @@ use App\Helpers\Helper;
use App\Http\Controllers\Controller;
use App\Http\Requests\LicenseCheckoutRequest;
use App\Models\Asset;
+use App\Models\CheckoutAcceptance;
use App\Models\License;
use App\Models\LicenseSeat;
use App\Models\User;
@@ -112,6 +113,34 @@ class LicenseCheckoutController extends Controller
if ($checkoutTarget) {
+ // When sign_in_place is requested and the target is a user, redirect to the
+ // acceptance/signature page so the user can sign in person.
+ if ($request->boolean('sign_in_place') && $checkoutTarget instanceof User) {
+ $acceptance = CheckoutAcceptance::where('checkoutable_type', LicenseSeat::class)
+ ->where('checkoutable_id', $licenseSeat->id)
+ ->where('assigned_to_id', $checkoutTarget->id)
+ ->pending()
+ ->latest()
+ ->first();
+
+ // If requireAcceptance() is false the listener won't have created one; create it now.
+ if (! $acceptance) {
+ $acceptance = new CheckoutAcceptance;
+ $acceptance->checkoutable()->associate($licenseSeat);
+ $acceptance->assignedTo()->associate($checkoutTarget);
+ $acceptance->save();
+ }
+
+ session([
+ 'sign_in_place_acceptance_id' => $acceptance->id,
+ 'sign_in_place_item_id' => $license->id,
+ 'sign_in_place_table' => 'Licenses',
+ ]);
+
+ return redirect()->route('account.accept.item', $acceptance->id)
+ ->with('success', trans('admin/licenses/message.checkout.success'));
+ }
+
return Helper::getRedirectOption($request, $license->id, 'Licenses')
->with('success', trans('admin/licenses/message.checkout.success'));
}