mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-13 00:54:07 -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.
103 lines
3.6 KiB
PHP
103 lines
3.6 KiB
PHP
<?php
|
|
|
|
namespace App\Http\Controllers\Licenses;
|
|
|
|
use App\Models\Asset;
|
|
use App\Models\License;
|
|
use App\Models\LicenseSeat;
|
|
use App\Models\User;
|
|
use Illuminate\Http\Request;
|
|
use App\Http\Controllers\Controller;
|
|
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($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(Input::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()) {
|
|
$licenseSeat->logCheckin($return_to, e(request('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'));
|
|
}
|
|
|
|
}
|