mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-20 04:24:23 -08:00
64d649be7f
* Extract a handlesimages trait to centralize logic for parsing/storing images on upload in create/edit methods. * Use same image upload/layout in accessories as consum+components. * Monster: Cleanup/Refactor http controllers. This cleans up docblocks, pulls most non-crudy actions into their own controllers, and does general cleanup/logic refactoring. There /should/ be no functional changes, but we all know how should works.. Extract checkin/checkout functions to a separate controller for accessories. Move controllers to subdirectory. Cleanup AssetModelsController Extract component checkin/checkout Assorted cleanups/doc/formatting in controllers. Refactor LicenseController. Refactor UsersController Update viewassetscontroller. * Codacy cleanups * More codacy cleanups. Extract a LicenseCheckout Form request as well. * A bit more refactor/cleaning of the license checkout method. * Review Related Cleanups * Fix most of the item_not_found translations. In many cases, the string being generated did not even use the id parameter. Where it does, pass it as id instead of as a different value. * Remove some old $data arrays from when we manually sent emails from the controllers. This has been superseeded by the notification system (yay!) * Bugfix: Only log the checkin of an accessory if the checkin completes sucessfully.
54 lines
1.4 KiB
PHP
54 lines
1.4 KiB
PHP
<?php
|
|
|
|
namespace App\Http\Requests;
|
|
|
|
use App\Models\LicenseSeat;
|
|
use Illuminate\Foundation\Http\FormRequest;
|
|
|
|
class LicenseCheckoutRequest extends FormRequest
|
|
{
|
|
/**
|
|
* Determine if the user is authorized to make this request.
|
|
*
|
|
* @return bool
|
|
*/
|
|
public function authorize()
|
|
{
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* Get the validation rules that apply to the request.
|
|
*
|
|
* @return array
|
|
*/
|
|
public function rules()
|
|
{
|
|
return [
|
|
'note' => 'string|nullable',
|
|
'asset_id' => 'required_without:assigned_to',
|
|
];
|
|
}
|
|
|
|
public function findLicenseSeatToCheckout($license, $seatId)
|
|
{
|
|
// This returns null if seatId is null
|
|
if (!$licenseSeat = LicenseSeat::find($seatId)) {
|
|
$licenseSeat = $license->freeSeat();
|
|
}
|
|
|
|
if (!$licenseSeat) {
|
|
if ($seatId) {
|
|
return 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');
|
|
}
|
|
|
|
if(!$licenseSeat->license->is($license)) {
|
|
return redirect()->route('licenses.index')->with('error', 'The license seat provided does not match the license.');
|
|
}
|
|
|
|
return $licenseSeat;
|
|
}
|
|
}
|