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

Merge pull request #11857 from inietov/fixes/throw_exception_instead_of_redirect_when_no_available_licenseseats

Browse source 
Fixed #11827 Throw exception when there are no available seats for checkout.
This commit is contained in:
snipe 2022-09-26 13:43:57 -07:00 committed by GitHub
parent 091ef62cbe c0f83a7927
commit d91d226652
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/Http/Controllers/Licenses/LicenseCheckoutController.php
View file

@ -62,6 +62,7 @@ class LicenseCheckoutController extends Controller
$licenseSeat = $this->findLicenseSeatToCheckout($license, $seatId); $licenseSeat = $this->findLicenseSeatToCheckout($license, $seatId);
$licenseSeat->user_id = Auth::id(); $licenseSeat->user_id = Auth::id();
$checkoutMethod = 'checkoutTo'.ucwords(request('checkout_to_type')); $checkoutMethod = 'checkoutTo'.ucwords(request('checkout_to_type'));
if ($this->$checkoutMethod($licenseSeat)) { if ($this->$checkoutMethod($licenseSeat)) {
return redirect()->route('licenses.index')->with('success', trans('admin/licenses/message.checkout.success')); return redirect()->route('licenses.index')->with('success', trans('admin/licenses/message.checkout.success'));
@ -76,14 +77,14 @@ class LicenseCheckoutController extends Controller
if (! $licenseSeat) { if (! $licenseSeat) {
if ($seatId) { if ($seatId) {
return redirect()->route('licenses.index')->with('error', 'This Seat is not available for checkout.'); throw new \Illuminate\Http\Exceptions\HttpResponseException(redirect()->route('licenses.index')->with('error', 'This Seat is not available for checkout.'));
} }
return redirect()->route('licenses.index')->with('error', 'There are no available seats for this license'); throw new \Illuminate\Http\Exceptions\HttpResponseException(redirect()->route('licenses.index')->with('error', 'There are no available seats for this license.'));
} }
if (! $licenseSeat->license->is($license)) { if (! $licenseSeat->license->is($license)) {
return redirect()->route('licenses.index')->with('error', 'The license seat provided does not match the license.'); throw new \Illuminate\Http\Exceptions\HttpResponseException(redirect()->route('licenses.index')->with('error', 'The license seat provided does not match the license.'));
} }
return $licenseSeat; return $licenseSeat;