mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-26 06:04:08 -08:00
296de34e8a
I'm going ahead and merging this, since the upgrade doesn't break Flysystem any worse than the current develop is broken, so far as I can tell. * Upgraded framework to Laravel 6 ### TO DO: - Fix password restriction rules- the old library isn’t compatible with Laravel 6 :( - Figure out why in-app API calls are returning “Unauthorized” * More updates from Input:: to Request:: helper * Switch to Request:: from Input * Added passport config * Fixed goofy password minimum in seeder * Added laravel/helpers * Changed ($item) to ($item->id) in forms I have no idea why this is necessary * Changed ($item) to ($item->id) in forms * Updated API middleware to auth:api * Updated with added laravel auth.php values * FIxed *&!^$%^&$^%!!!! ajax issue * Switch to Request::get from Input::get * Switched to Request facade * Added password security minimums back in The package we were using has not been updated to Laravel v6, so I created custom validators instead * Added language strings for error messages for password rules * Fixed `($item)` issue in formActions for partials
106 lines
3.8 KiB
PHP
106 lines
3.8 KiB
PHP
<?php
|
|
|
|
namespace App\Http\Controllers\Licenses;
|
|
|
|
use App\Events\CheckoutableCheckedIn;
|
|
use App\Http\Controllers\Controller;
|
|
use App\Models\License;
|
|
use App\Models\LicenseSeat;
|
|
use App\Models\User;
|
|
use Illuminate\Http\Request;
|
|
use Illuminate\Support\Facades\Auth;
|
|
use Illuminate\Support\Facades\Input;
|
|
use Illuminate\Support\Facades\Session;
|
|
use Illuminate\Support\Facades\Validator;
|
|
|
|
class LicenseCheckinController extends Controller
|
|
{
|
|
|
|
/**
|
|
* Makes the form view to check a license seat back into inventory.
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v1.0]
|
|
* @param int $seatId
|
|
* @param string $backTo
|
|
* @return \Illuminate\Contracts\View\View
|
|
* @throws \Illuminate\Auth\Access\AuthorizationException
|
|
*/
|
|
public function create($seatId = null, $backTo = null)
|
|
{
|
|
// Check if the asset exists
|
|
if (is_null($licenseSeat = LicenseSeat::find($seatId)) || is_null($license = License::find($licenseSeat->license_id))) {
|
|
// Redirect to the asset management page with error
|
|
return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.not_found'));
|
|
}
|
|
|
|
$this->authorize('checkout', $license);
|
|
return view('licenses/checkin', compact('licenseSeat'))->with('backto', $backTo);
|
|
}
|
|
|
|
|
|
/**
|
|
* Validates and stores the license checkin action.
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @see LicenseCheckinController::create() method that provides the form view
|
|
* @since [v1.0]
|
|
* @param int $seatId
|
|
* @param string $backTo
|
|
* @return \Illuminate\Http\RedirectResponse
|
|
* @throws \Illuminate\Auth\Access\AuthorizationException
|
|
*/
|
|
public function store(Request $request, $seatId = null, $backTo = null)
|
|
{
|
|
// Check if the asset exists
|
|
if (is_null($licenseSeat = LicenseSeat::find($seatId))) {
|
|
// Redirect to the asset management page with error
|
|
return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.not_found'));
|
|
}
|
|
|
|
$license = License::find($licenseSeat->license_id);
|
|
$this->authorize('checkout', $license);
|
|
|
|
if (!$license->reassignable) {
|
|
// Not allowed to checkin
|
|
Session::flash('error', 'License not reassignable.');
|
|
return redirect()->back()->withInput();
|
|
}
|
|
|
|
// Declare the rules for the form validation
|
|
$rules = [
|
|
'note' => 'string',
|
|
'notes' => 'string',
|
|
];
|
|
|
|
// Create a new validator instance from our validation rules
|
|
$validator = Validator::make($request->all(), $rules);
|
|
|
|
// If validation fails, we'll exit the operation now.
|
|
if ($validator->fails()) {
|
|
// Ooops.. something went wrong
|
|
return redirect()->back()->withInput()->withErrors($validator);
|
|
}
|
|
$return_to = User::find($licenseSeat->assigned_to);
|
|
|
|
// Update the asset data
|
|
$licenseSeat->assigned_to = null;
|
|
$licenseSeat->asset_id = null;
|
|
|
|
// Was the asset updated?
|
|
if ($licenseSeat->save()) {
|
|
|
|
event(new CheckoutableCheckedIn($licenseSeat, $return_to, Auth::user(), $request->input('note')));
|
|
|
|
if ($backTo=='user') {
|
|
return redirect()->route("users.show", $return_to->id)->with('success', trans('admin/licenses/message.checkin.success'));
|
|
}
|
|
return redirect()->route("licenses.show", $licenseSeat->license_id)->with('success', trans('admin/licenses/message.checkin.success'));
|
|
}
|
|
|
|
// Redirect to the license page with error
|
|
return redirect()->route("licenses.index")->with('error', trans('admin/licenses/message.checkin.error'));
|
|
}
|
|
|
|
}
|