FGFS-4.1/phpvms
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply fixes from StyleCI

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-08-26 16:40:04 +00:00
committed by StyleCI Bot
parent 20f46adbc4
commit 9596d88b48
407 changed files with 4032 additions and 3286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
app/Http/Controllers/Admin/AircraftController.php
View File

@@ -16,20 +16,19 @@ use App\Services\ImportService;
use Flash;
use Illuminate\Http\Request;
use Log;
use Prettus\Repository\Criteria\RequestCriteria;
use Storage;
/**
* Class AircraftController
* @package App\Http\Controllers\Admin
*/
class AircraftController extends Controller
{
private $aircraftRepo,
$importSvc;
private $aircraftRepo;
private $importSvc;
/**
* AircraftController constructor.
*
* @param AircraftRepository $aircraftRepo
* @param ImportService $importSvc
*/
@@ -43,16 +42,19 @@ class AircraftController extends Controller
/**
* Display a listing of the Aircraft.
*
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*
* @throws \Prettus\Repository\Exceptions\RepositoryException
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function index(Request $request)
{
// If subfleet ID is passed part of the query string, then only
// show the aircraft that are in that subfleet
$w = [];
if($request->filled('subfleet')) {
if ($request->filled('subfleet')) {
$w['subfleet_id'] = $request->input('subfleet');
}
@@ -60,27 +62,30 @@ class AircraftController extends Controller
$aircraft = $aircraft->all();
return view('admin.aircraft.index', [
'aircraft' => $aircraft,
'aircraft' => $aircraft,
'subfleet_id' => $request->input('subfleet'),
]);
}
/**
* Show the form for creating a new Aircraft.
*
* @param Request $request
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function create(Request $request)
{
return view('admin.aircraft.create', [
'subfleets' => Subfleet::all()->pluck('name', 'id'),
'statuses' => AircraftStatus::select(true),
'subfleet_id' => $request->query('subfleet')
'subfleets' => Subfleet::all()->pluck('name', 'id'),
'statuses' => AircraftStatus::select(true),
'subfleet_id' => $request->query('subfleet'),
]);
}
/**
* Store a newly created Aircraft in storage.
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*/
public function store(CreateAircraftRequest $request)
@@ -94,6 +99,8 @@ class AircraftController extends Controller
/**
* Display the specified Aircraft.
*
* @param mixed $id
*/
public function show($id)
{
@@ -111,6 +118,8 @@ class AircraftController extends Controller
/**
* Show the form for editing the specified Aircraft.
*
* @param mixed $id
*/
public function edit($id)
{
@@ -130,6 +139,9 @@ class AircraftController extends Controller
/**
* Update the specified Aircraft in storage.
*
* @param mixed $id
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*/
public function update($id, UpdateAircraftRequest $request)
@@ -150,6 +162,8 @@ class AircraftController extends Controller
/**
* Remove the specified Aircraft from storage.
*
* @param mixed $id
*/
public function destroy($id)
{
@@ -168,9 +182,12 @@ class AircraftController extends Controller
/**
* Run the aircraft exporter
*
* @param Request $request
* @return \Symfony\Component\HttpFoundation\BinaryFileResponse
*
* @throws \League\Csv\Exception
*
* @return \Symfony\Component\HttpFoundation\BinaryFileResponse
*/
public function export(Request $request)
{
@@ -187,8 +204,10 @@ class AircraftController extends Controller
/**
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*
* @throws \Illuminate\Validation\ValidationException
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function import(Request $request)
{
@@ -215,6 +234,7 @@ class AircraftController extends Controller
/**
* @param Aircraft|null $aircraft
*
* @return mixed
*/
protected function return_expenses_view(Aircraft $aircraft)
@@ -228,10 +248,13 @@ class AircraftController extends Controller
/**
* Operations for associating ranks to the subfleet
*
* @param $id
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*
* @throws \Exception
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function expenses($id, Request $request)
{

26
app/Http/Controllers/Admin/AirlinesController.php
View File

@@ -14,7 +14,6 @@ use Response;
/**
* Class AirlinesController
* @package App\Http\Controllers\Admin
*/
class AirlinesController extends Controller
{
@@ -22,14 +21,17 @@ class AirlinesController extends Controller
/**
* AirlinesController constructor.
*
* @param AirlineRepository $airlinesRepo
*/
public function __construct(AirlineRepository $airlinesRepo) {
public function __construct(AirlineRepository $airlinesRepo)
{
$this->airlineRepo = $airlinesRepo;
}
/**
* Display a listing of the Airlines.
*
* @throws \Prettus\Repository\Exceptions\RepositoryException
*/
public function index(Request $request)
@@ -54,6 +56,7 @@ class AirlinesController extends Controller
/**
* Store a newly created Airlines in storage.
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*/
public function store(CreateAirlineRequest $request)
@@ -67,7 +70,9 @@ class AirlinesController extends Controller
/**
* Display the specified Airlines.
* @param int $id
*
* @param int $id
*
* @return mixed
*/
public function show($id)
@@ -86,7 +91,9 @@ class AirlinesController extends Controller
/**
* Show the form for editing the specified Airlines.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function edit($id)
@@ -106,10 +113,13 @@ class AirlinesController extends Controller
/**
* Update the specified Airlines in storage.
* @param int $id
*
* @param int $id
* @param UpdateAirlineRequest $request
* @return Response
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
*/
public function update($id, UpdateAirlineRequest $request)
{
@@ -128,7 +138,9 @@ class AirlinesController extends Controller
/**
* Remove the specified Airlines from storage.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function destroy($id)

53
app/Http/Controllers/Admin/AirportController.php
View File

@@ -21,12 +21,11 @@ use Storage;
/**
* Class AirportController
* @package App\Http\Controllers\Admin
*/
class AirportController extends Controller
{
private $airportRepo,
$importSvc;
private $airportRepo;
private $importSvc;
/**
* @param AirportRepository $airportRepo
@@ -42,9 +41,12 @@ class AirportController extends Controller
/**
* Display a listing of the Airport.
*
* @param Request $request
* @return Response
*
* @throws \Prettus\Repository\Exceptions\RepositoryException
*
* @return Response
*/
public function index(Request $request)
{
@@ -65,6 +67,7 @@ class AirportController extends Controller
/**
* Show the form for creating a new Airport.
*
* @return Response
*/
public function create()
@@ -76,9 +79,12 @@ class AirportController extends Controller
/**
* Store a newly created Airport in storage.
*
* @param CreateAirportRequest $request
* @return Response
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
*/
public function store(CreateAirportRequest $request)
{
@@ -93,7 +99,9 @@ class AirportController extends Controller
/**
* Display the specified Airport.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function show($id)
@@ -112,7 +120,9 @@ class AirportController extends Controller
/**
* Show the form for editing the specified Airport.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function edit($id)
@@ -132,10 +142,13 @@ class AirportController extends Controller
/**
* Update the specified Airport in storage.
* @param int $id
*
* @param int $id
* @param UpdateAirportRequest $request
* @return Response
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
*/
public function update($id, UpdateAirportRequest $request)
{
@@ -157,7 +170,9 @@ class AirportController extends Controller
/**
* Remove the specified Airport from storage.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function destroy($id)
@@ -177,9 +192,12 @@ class AirportController extends Controller
/**
* Run the airport exporter
*
* @param Request $request
* @return \Symfony\Component\HttpFoundation\BinaryFileResponse
*
* @throws \League\Csv\Exception
*
* @return \Symfony\Component\HttpFoundation\BinaryFileResponse
*/
public function export(Request $request)
{
@@ -195,10 +213,11 @@ class AirportController extends Controller
}
/**
*
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*
* @throws \Illuminate\Validation\ValidationException
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function import(Request $request)
{
@@ -225,6 +244,7 @@ class AirportController extends Controller
/**
* @param Airport $airport
*
* @return mixed
*/
protected function return_expenses_view(Airport $airport)
@@ -237,10 +257,13 @@ class AirportController extends Controller
/**
* Operations for associating ranks to the subfleet
*
* @param $id
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*
* @throws \Exception
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function expenses($id, Request $request)
{
@@ -273,7 +296,9 @@ class AirportController extends Controller
/**
* Set fuel prices for this airport
*
* @param Request $request
*
* @return mixed
*/
public function fuel(Request $request)

38
app/Http/Controllers/Admin/AwardController.php
View File

@@ -14,20 +14,20 @@ use Response;
class AwardController extends Controller
{
/** @var AwardRepository */
private $awardRepository,
$awardSvc;
/** @var AwardRepository */
private $awardRepository;
private $awardSvc;
/**
* AwardController constructor.
*
* @param AwardRepository $awardRepo
* @param AwardService $awardSvc
*/
public function __construct(
AwardRepository $awardRepo,
AwardService $awardSvc
)
{
) {
$this->awardRepository = $awardRepo;
$this->awardSvc = $awardSvc;
}
@@ -57,9 +57,12 @@ class AwardController extends Controller
/**
* Display a listing of the Fare.
*
* @param Request $request
* @return Response
*
* @throws \Prettus\Repository\Exceptions\RepositoryException
*
* @return Response
*/
public function index(Request $request)
{
@@ -73,6 +76,7 @@ class AwardController extends Controller
/**
* Show the form for creating a new Fare.
*
* @return Response
*/
public function create()
@@ -87,9 +91,12 @@ class AwardController extends Controller
/**
* Store a newly created Fare in storage.
*
* @param CreateAwardRequest $request
* @return Response
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
*/
public function store(CreateAwardRequest $request)
{
@@ -102,7 +109,9 @@ class AwardController extends Controller
/**
* Display the specified Fare.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function show($id)
@@ -121,7 +130,9 @@ class AwardController extends Controller
/**
* Show the form for editing the specified award.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function edit($id)
@@ -144,10 +155,13 @@ class AwardController extends Controller
/**
* Update the specified award in storage.
* @param int $id
*
* @param int $id
* @param UpdateAwardRequest $request
* @return Response
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
*/
public function update($id, UpdateAwardRequest $request)
{
@@ -167,7 +181,7 @@ class AwardController extends Controller
/**
* Remove the specified Fare from storage.
*
* @param int $id
* @param int $id
*
* @return Response
*/

14
app/Http/Controllers/Admin/DashboardController.php
View File

@@ -16,16 +16,16 @@ use vierbergenlars\SemVer\version as semver;
/**
* Class DashboardController
* @package App\Http\Controllers\Admin
*/
class DashboardController extends Controller
{
private $newsRepo,
$pirepRepo,
$userRepo;
private $newsRepo;
private $pirepRepo;
private $userRepo;
/**
* DashboardController constructor.
*
* @param NewsRepository $newsRepo
* @param PirepRepository $pirepRepo
* @param UserRepository $userRepo
@@ -44,6 +44,7 @@ class DashboardController extends Controller
* Check if a new version is available by checking the VERSION file from
* S3 and then using the semver library to do the comparison. Just show
* a session flash file on this page that'll get cleared right away
*
* @throws \RuntimeException
*/
protected function checkNewVersion()
@@ -63,6 +64,7 @@ class DashboardController extends Controller
/**
* Show the admin dashboard
*
* @throws \RuntimeException
*/
public function index(Request $request)
@@ -78,8 +80,10 @@ class DashboardController extends Controller
/**
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function news(Request $request)
{

51
app/Http/Controllers/Admin/ExpenseController.php
View File

@@ -19,16 +19,16 @@ use Storage;
/**
* Class ExpenseController
* @package App\Http\Controllers\Admin
*/
class ExpenseController extends Controller
{
private $airlineRepo,
$expenseRepo,
$importSvc;
private $airlineRepo;
private $expenseRepo;
private $importSvc;
/**
* expensesController constructor.
*
* @param AirlineRepository $airlineRepo
* @param ExpenseRepository $expenseRepo
* @param ImportService $importSvc
@@ -45,19 +45,22 @@ class ExpenseController extends Controller
/**
* Display a listing of the expenses.
*
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*
* @throws \Prettus\Repository\Exceptions\RepositoryException
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function index(Request $request)
{
$this->expenseRepo->pushCriteria(new RequestCriteria($request));
$expenses = $this->expenseRepo->findWhere([
'ref_model' => Expense::class
'ref_model' => Expense::class,
]);
return view('admin.expenses.index', [
'expenses' => $expenses
'expenses' => $expenses,
]);
}
@@ -74,9 +77,12 @@ class ExpenseController extends Controller
/**
* Store a newly created expenses in storage.
*
* @param Request $request
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function store(Request $request)
{
@@ -91,7 +97,9 @@ class ExpenseController extends Controller
/**
* Display the specified expenses.
* @param int $id
*
* @param int $id
*
* @return mixed
*/
public function show($id)
@@ -111,7 +119,9 @@ class ExpenseController extends Controller
/**
* Show the form for editing the specified expenses.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function edit($id)
@@ -133,10 +143,13 @@ class ExpenseController extends Controller
/**
* Update the specified expenses in storage.
* @param int $id
*
* @param int $id
* @param Request $request
* @return Response
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
*/
public function update($id, Request $request)
{
@@ -157,7 +170,9 @@ class ExpenseController extends Controller
/**
* Remove the specified expenses from storage.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function destroy($id)
@@ -177,9 +192,12 @@ class ExpenseController extends Controller
/**
* Run the airport exporter
*
* @param Request $request
* @return \Symfony\Component\HttpFoundation\BinaryFileResponse
*
* @throws \League\Csv\Exception
*
* @return \Symfony\Component\HttpFoundation\BinaryFileResponse
*/
public function export(Request $request)
{
@@ -195,10 +213,11 @@ class ExpenseController extends Controller
}
/**
*
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*
* @throws \Illuminate\Validation\ValidationException
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function import(Request $request)
{

45
app/Http/Controllers/Admin/FareController.php
View File

@@ -18,15 +18,15 @@ use Storage;
/**
* Class FareController
* @package App\Http\Controllers\Admin
*/
class FareController extends Controller
{
private $fareRepo,
$importSvc;
private $fareRepo;
private $importSvc;
/**
* FareController constructor.
*
* @param FareRepository $fareRepo
* @param ImportService $importSvc
*/
@@ -40,9 +40,12 @@ class FareController extends Controller
/**
* Display a listing of the Fare.
*
* @param Request $request
* @return Response
*
* @throws \Prettus\Repository\Exceptions\RepositoryException
*
* @return Response
*/
public function index(Request $request)
{
@@ -65,9 +68,12 @@ class FareController extends Controller
/**
* Store a newly created Fare in storage.
*
* @param CreateFareRequest $request
* @return Response
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
*/
public function store(CreateFareRequest $request)
{
@@ -80,7 +86,9 @@ class FareController extends Controller
/**
* Display the specified Fare.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function show($id)
@@ -96,7 +104,9 @@ class FareController extends Controller
/**
* Show the form for editing the specified Fare.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function edit($id)
@@ -112,10 +122,13 @@ class FareController extends Controller
/**
* Update the specified Fare in storage.
* @param int $id
*
* @param int $id
* @param UpdateFareRequest $request
* @return Response
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
*/
public function update($id, UpdateFareRequest $request)
{
@@ -133,7 +146,9 @@ class FareController extends Controller
/**
* Remove the specified Fare from storage.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function destroy($id)
@@ -152,9 +167,12 @@ class FareController extends Controller
/**
* Run the aircraft exporter
*
* @param Request $request
* @return \Symfony\Component\HttpFoundation\BinaryFileResponse
*
* @throws \League\Csv\Exception
*
* @return \Symfony\Component\HttpFoundation\BinaryFileResponse
*/
public function export(Request $request)
{
@@ -170,10 +188,11 @@ class FareController extends Controller
}
/**
*
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*
* @throws \Illuminate\Validation\ValidationException
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function import(Request $request)
{

14
app/Http/Controllers/Admin/FileController.php
View File

@@ -14,7 +14,6 @@ use Validator;
/**
* Class FileController
* @package App\Http\Controllers\Admin
*/
class FileController extends Controller
{
@@ -27,9 +26,12 @@ class FileController extends Controller
/**
* Store a newly file
*
* @param Request $request
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*
* @throws \Hashids\HashidsException
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function store(Request $request)
{
@@ -41,7 +43,7 @@ class FileController extends Controller
$validator = Validator::make($request->all(), [
'filename' => 'required',
'file_description' => 'nullable',
'file' => 'required|file'
'file' => 'required|file',
]);
if ($validator->fails()) {
@@ -50,7 +52,6 @@ class FileController extends Controller
Log::info('Uploading files', $attrs);
$file = $request->file('file');
$this->fileSvc->saveFile($file, 'files', [
'name' => $attrs['filename'],
@@ -65,9 +66,12 @@ class FileController extends Controller
/**
* Remove the file from storage.
*
* @param $id
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*
* @throws \Exception
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function destroy($id)
{

18
app/Http/Controllers/Admin/FinanceController.php
View File

@@ -13,14 +13,13 @@ use Illuminate\Http\Request;
/**
* Class FinanceController
* @package App\Http\Controllers\Admin
*/
class FinanceController extends Controller
{
private $airlineRepo;
/**
* @param AirlineRepository $airlineRepo
* @param AirlineRepository $airlineRepo
*/
public function __construct(
AirlineRepository $airlineRepo
@@ -30,10 +29,13 @@ class FinanceController extends Controller
/**
* Display the summation tables for a given month by airline
*
* @param Request $request
* @return mixed
*
* @throws \UnexpectedValueException
* @throws \InvalidArgumentException
*
* @return mixed
*/
public function index(Request $request)
{
@@ -48,15 +50,15 @@ class FinanceController extends Controller
$transaction_groups = [];
$airlines = $this->airlineRepo->orderBy('icao')->all();
# group by the airline
// group by the airline
foreach ($airlines as $airline) {
# Return all the transactions, grouped by the transaction group
// Return all the transactions, grouped by the transaction group
$transactions = JournalTransaction::groupBy('transaction_group', 'currency')
->selectRaw('transaction_group, currency,
SUM(credit) as sum_credits,
SUM(debit) as sum_debits')
->where([
'journal_id' => $airline->journal->id
'journal_id' => $airline->journal->id,
])
->whereBetween('created_at', $between, 'AND')
->orderBy('sum_credits', 'desc')
@@ -64,7 +66,7 @@ class FinanceController extends Controller
->orderBy('transaction_group', 'asc')
->get();
# Summate it so we can show it on the footer of the table
// Summate it so we can show it on the footer of the table
$sum_all_credits = 0;
$sum_all_debits = 0;
foreach ($transactions as $ta) {
@@ -89,6 +91,8 @@ class FinanceController extends Controller
/**
* Show a month
*
* @param mixed $id
*/
public function show($id)
{

83
app/Http/Controllers/Admin/FlightController.php
View File

@@ -30,22 +30,22 @@ use Storage;
/**
* Class FlightController
* @package App\Http\Controllers\Admin
*/
class FlightController extends Controller
{
private $airlineRepo,
$airportRepo,
$fareRepo,
$flightRepo,
$flightFieldRepo,
$fareSvc,
$flightSvc,
$importSvc,
$subfleetRepo;
private $airlineRepo;
private $airportRepo;
private $fareRepo;
private $flightRepo;
private $flightFieldRepo;
private $fareSvc;
private $flightSvc;
private $importSvc;
private $subfleetRepo;
/**
* FlightController constructor.
*
* @param AirlineRepository $airlineRepo
* @param AirportRepository $airportRepo
* @param FareRepository $fareRepo
@@ -80,6 +80,7 @@ class FlightController extends Controller
/**
* Save any custom fields found
*
* @param Flight $flight
* @param Request $request
*/
@@ -93,8 +94,8 @@ class FlightController extends Controller
}
$custom_fields[] = [
'name' => $field->name,
'value' => $request->input($field->slug)
'name' => $field->name,
'value' => $request->input($field->slug),
];
}
@@ -104,6 +105,7 @@ class FlightController extends Controller
/**
* @param $flight
*
* @return array
*/
protected function getAvailSubfleets($flight)
@@ -123,8 +125,10 @@ class FlightController extends Controller
/**
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*
* @throws \Prettus\Repository\Exceptions\RepositoryException
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function index(Request $request)
{
@@ -142,6 +146,7 @@ class FlightController extends Controller
/**
* Show the form for creating a new Flight.
*
* @return Response
*/
public function create()
@@ -159,8 +164,10 @@ class FlightController extends Controller
/**
* @param CreateFlightRequest $request
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function store(CreateFlightRequest $request)
{
@@ -190,6 +197,7 @@ class FlightController extends Controller
/**
* @param $id
*
* @return mixed
*/
public function show($id)
@@ -212,6 +220,7 @@ class FlightController extends Controller
/**
* @param $id
*
* @return mixed
*/
public function edit($id)
@@ -244,8 +253,10 @@ class FlightController extends Controller
/**
* @param $id
* @param UpdateFlightRequest $request
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function update($id, UpdateFlightRequest $request)
{
@@ -258,11 +269,11 @@ class FlightController extends Controller
$input = $request->all();
# apply the updates here temporarily, don't save
# the repo->update() call will actually do it
// apply the updates here temporarily, don't save
// the repo->update() call will actually do it
$flight->fill($input);
if($this->flightSvc->isFlightDuplicate($flight)) {
if ($this->flightSvc->isFlightDuplicate($flight)) {
Flash::error('Duplicate flight with same number/code/leg found, please change to proceed');
return redirect()->back()->withInput($request->all());
}
@@ -285,8 +296,10 @@ class FlightController extends Controller
/**
* @param $id
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*
* @throws \Exception
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function destroy($id)
{
@@ -305,9 +318,12 @@ class FlightController extends Controller
/**
* Run the flight exporter
*
* @param Request $request
* @return \Symfony\Component\HttpFoundation\BinaryFileResponse
*
* @throws \League\Csv\Exception
*
* @return \Symfony\Component\HttpFoundation\BinaryFileResponse
*/
public function export(Request $request)
{
@@ -323,16 +339,17 @@ class FlightController extends Controller
}
/**
*
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*
* @throws \Illuminate\Validation\ValidationException
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function import(Request $request)
{
$logs = [
'success' => [],
'errors' => [],
'errors' => [],
];
if ($request->isMethod('post')) {
@@ -352,6 +369,7 @@ class FlightController extends Controller
/**
* @param $flight
*
* @return mixed
*/
protected function return_fields_view($flight)
@@ -366,6 +384,7 @@ class FlightController extends Controller
/**
* @param $flight_id
* @param Request $request
*
* @return mixed
*/
public function field_values($flight_id, Request $request)
@@ -388,11 +407,11 @@ class FlightController extends Controller
} elseif ($request->isMethod('put')) {
Log::info('Updating flight field, flight: '.$flight_id, $request->input());
$field = FlightFieldValue::where([
'name' => $request->input('name'),
'name' => $request->input('name'),
'flight_id' => $flight_id,
])->first();
if(!$field) {
if (!$field) {
Log::info('Field not found, creating new');
$field = new FlightFieldValue();
$field->name = $request->input('name');
@@ -401,11 +420,11 @@ class FlightController extends Controller
$field->flight_id = $flight_id;
$field->value = $request->input('value');
$field->save();
// update the field value
// update the field value
} // remove custom field from flight
elseif ($request->isMethod('delete')) {
Log::info('Deleting flight field, flight: '.$flight_id, $request->input());
if($flight_id && $request->input('field_id')) {
if ($flight_id && $request->input('field_id')) {
FlightFieldValue::destroy($request->input('field_id'));
}
}
@@ -415,6 +434,7 @@ class FlightController extends Controller
/**
* @param $flight
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
protected function return_subfleet_view($flight)
@@ -430,6 +450,7 @@ class FlightController extends Controller
/**
* @param $id
* @param Request $request
*
* @return mixed
*/
public function subfleets($id, Request $request)
@@ -444,7 +465,7 @@ class FlightController extends Controller
// add aircraft to flight
$subfleet = $this->subfleetRepo->findWithoutFail($request->subfleet_id);
if(!$subfleet) {
if (!$subfleet) {
return $this->return_subfleet_view($flight);
}
@@ -460,6 +481,8 @@ class FlightController extends Controller
/**
* Get all the fares that haven't been assigned to a given subfleet
*
* @param mixed $flight
*/
protected function getAvailFares($flight)
{
@@ -475,6 +498,7 @@ class FlightController extends Controller
/**
* @param Flight $flight
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
protected function return_fares_view(Flight $flight)
@@ -489,6 +513,7 @@ class FlightController extends Controller
/**
* @param Request $request
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function fares(Request $request)
@@ -515,7 +540,7 @@ class FlightController extends Controller
'value' => 'nullable', // regex:/([\d%]*)/
]);
/**
/*
* update specific fare data
*/
if ($request->isMethod('post')) {

30
app/Http/Controllers/Admin/FlightFieldController.php
View File

@@ -11,7 +11,6 @@ use Response;
/**
* Class FlightFieldController
* @package App\Http\Controllers\Admin
*/
class FlightFieldController extends Controller
{
@@ -19,6 +18,7 @@ class FlightFieldController extends Controller
/**
* FlightFieldController constructor.
*
* @param FlightFieldRepository $flightFieldRepository
*/
public function __construct(
@@ -29,9 +29,12 @@ class FlightFieldController extends Controller
/**
* Display a listing of the FlightField.
*
* @param Request $request
* @return Response
*
* @throws \Prettus\Repository\Exceptions\RepositoryException
*
* @return Response
*/
public function index(Request $request)
{
@@ -45,6 +48,7 @@ class FlightFieldController extends Controller
/**
* Show the form for creating a new FlightField.
*
* @return Response
*/
public function create()
@@ -54,9 +58,12 @@ class FlightFieldController extends Controller
/**
* Store a newly created FlightField in storage.
*
* @param Request $request
* @return Response
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
*/
public function store(Request $request)
{
@@ -71,7 +78,9 @@ class FlightFieldController extends Controller
/**
* Display the specified FlightField.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function show($id)
@@ -90,7 +99,9 @@ class FlightFieldController extends Controller
/**
* Show the form for editing the specified FlightField.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function edit($id)
@@ -109,10 +120,13 @@ class FlightFieldController extends Controller
/**
* Update the specified FlightField in storage.
*
* @param $id
* @param Request $request
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function update($id, Request $request)
{
@@ -133,7 +147,9 @@ class FlightFieldController extends Controller
/**
* Remove the specified FlightField from storage.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function destroy($id)

83
app/Http/Controllers/Admin/PirepController.php
View File

@@ -8,7 +8,6 @@ use App\Http\Requests\UpdatePirepRequest;
use App\Interfaces\Controller;
use App\Models\Enums\PirepSource;
use App\Models\Enums\PirepState;
use App\Models\Enums\PirepStatus;
use App\Models\Pirep;
use App\Models\PirepComment;
use App\Repositories\AircraftRepository;
@@ -31,23 +30,23 @@ use Response;
/**
* Class PirepController
* @package App\Http\Controllers\Admin
*/
class PirepController extends Controller
{
private $airportRepo,
$airlineRepo,
$aircraftRepo,
$fareSvc,
$journalRepo,
$pirepSvc,
$pirepRepo,
$pirepFieldRepo,
$subfleetRepo,
$userSvc;
private $airportRepo;
private $airlineRepo;
private $aircraftRepo;
private $fareSvc;
private $journalRepo;
private $pirepSvc;
private $pirepRepo;
private $pirepFieldRepo;
private $subfleetRepo;
private $userSvc;
/**
* PirepController constructor.
*
* @param AirportRepository $airportRepo
* @param AirlineRepository $airlineRepo
* @param AircraftRepository $aircraftRepo
@@ -85,7 +84,9 @@ class PirepController extends Controller
/**
* Dropdown with aircraft grouped by subfleet
*
* @param null $user
*
* @return array
*/
public function aircraftList($user = null)
@@ -112,6 +113,7 @@ class PirepController extends Controller
/**
* Save any custom fields found
*
* @param Pirep $pirep
* @param Request $request
*/
@@ -127,7 +129,7 @@ class PirepController extends Controller
$custom_fields[] = [
'name' => $field->name,
'value' => $request->input($field->slug),
'source' => PirepSource::MANUAL
'source' => PirepSource::MANUAL,
];
}
@@ -137,8 +139,10 @@ class PirepController extends Controller
/**
* Save the fares that have been specified/saved
*
* @param Pirep $pirep
* @param Request $request
*
* @throws \Exception
*/
protected function saveFares(Pirep $pirep, Request $request)
@@ -163,7 +167,9 @@ class PirepController extends Controller
/**
* Return the fares form for a given aircraft
*
* @param Request $request
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function fares(Request $request)
@@ -182,8 +188,10 @@ class PirepController extends Controller
/**
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*
* @throws \Prettus\Repository\Exceptions\RepositoryException
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function index(Request $request)
{
@@ -194,19 +202,21 @@ class PirepController extends Controller
->whereNotInOrder('state', [
PirepState::CANCELLED,
PirepState::DRAFT,
PirepState::IN_PROGRESS
PirepState::IN_PROGRESS,
], 'created_at', 'desc')
->paginate();
return view('admin.pireps.index', [
'pireps' => $pireps
'pireps' => $pireps,
]);
}
/**
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*
* @throws \Prettus\Repository\Exceptions\RepositoryException
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function pending(Request $request)
{
@@ -219,12 +229,13 @@ class PirepController extends Controller
->paginate();
return view('admin.pireps.index', [
'pireps' => $pireps
'pireps' => $pireps,
]);
}
/**
* Show the form for creating a new Pirep.
*
* @return Response
*/
public function create()
@@ -238,9 +249,11 @@ class PirepController extends Controller
/**
* @param CreatePirepRequest $request
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
* @throws \Exception
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function store(CreatePirepRequest $request)
{
@@ -261,7 +274,9 @@ class PirepController extends Controller
/**
* Display the specified Pirep.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function show($id)
@@ -280,9 +295,12 @@ class PirepController extends Controller
/**
* Show the form for editing the specified Pirep.
* @param int $id
* @return Response
*
* @param int $id
*
* @throws \InvalidArgumentException
*
* @return Response
*/
public function edit($id)
{
@@ -296,13 +314,13 @@ class PirepController extends Controller
$pirep->hours = $time->hours;
$pirep->minutes = $time->minutes;
# set the custom fields
// set the custom fields
foreach ($pirep->fields as $field) {
$field_name = 'field_'.$field->slug;
$pirep->{$field_name} = $field->value;
}
# set the fares
// set the fares
foreach ($pirep->fares as $fare) {
$field_name = 'fare_'.$fare->fare_id;
$pirep->{$field_name} = $fare->count;
@@ -323,9 +341,11 @@ class PirepController extends Controller
/**
* @param $id
* @param UpdatePirepRequest $request
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
* @throws \Exception
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function update($id, UpdatePirepRequest $request)
{
@@ -341,7 +361,7 @@ class PirepController extends Controller
$attrs = $request->all();
# Fix the time
// Fix the time
$attrs['flight_time'] = Time::init(
$attrs['minutes'],
$attrs['hours'])->getMinutes();
@@ -362,7 +382,9 @@ class PirepController extends Controller
/**
* Remove the specified Pirep from storage.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function destroy($id)
@@ -382,7 +404,9 @@ class PirepController extends Controller
/**
* Change or update the PIREP status. Just return the new actionbar
*
* @param Request $request
*
* @return \Illuminate\View\View
*/
public function status(Request $request)
@@ -402,10 +426,13 @@ class PirepController extends Controller
/**
* Add a comment to the Pirep
*
* @param $id
* @param Request $request
* @return mixed
*
* @throws \Exception
*
* @return mixed
*/
public function comments($id, Request $request)
{

28
app/Http/Controllers/Admin/PirepFieldController.php
View File

@@ -13,7 +13,6 @@ use Response;
/**
* Class PirepFieldController
* @package App\Http\Controllers\Admin
*/
class PirepFieldController extends Controller
{
@@ -21,6 +20,7 @@ class PirepFieldController extends Controller
/**
* PirepFieldController constructor.
*
* @param PirepFieldRepository $pirepFieldRepo
*/
public function __construct(
@@ -31,9 +31,12 @@ class PirepFieldController extends Controller
/**
* Display a listing of the PirepField.
*
* @param Request $request
* @return Response
*
* @throws \Prettus\Repository\Exceptions\RepositoryException
*
* @return Response
*/
public function index(Request $request)
{
@@ -47,6 +50,7 @@ class PirepFieldController extends Controller
/**
* Show the form for creating a new PirepField.
*
* @return Response
*/
public function create()
@@ -56,9 +60,12 @@ class PirepFieldController extends Controller
/**
* Store a newly created PirepField in storage.
*
* @param CreatePirepFieldRequest $request
* @return Response
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
*/
public function store(CreatePirepFieldRequest $request)
{
@@ -75,7 +82,9 @@ class PirepFieldController extends Controller
/**
* Display the specified PirepField.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function show($id)
@@ -95,7 +104,9 @@ class PirepFieldController extends Controller
/**
* Show the form for editing the specified PirepField.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function edit($id)
@@ -115,6 +126,9 @@ class PirepFieldController extends Controller
/**
* Update the specified PirepField in storage.
*
* @param mixed $id
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*/
public function update($id, UpdatePirepFieldRequest $request)
@@ -139,7 +153,9 @@ class PirepFieldController extends Controller
/**
* Remove the specified PirepField from storage.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function destroy($id)

44
app/Http/Controllers/Admin/RankController.php
View File

@@ -16,16 +16,16 @@ use Response;
/**
* Class RankController
* @package App\Http\Controllers\Admin
*/
class RankController extends Controller
{
private $fleetSvc,
$rankRepository,
$subfleetRepo;
private $fleetSvc;
private $rankRepository;
private $subfleetRepo;
/**
* RankController constructor.
*
* @param FleetService $fleetSvc
* @param RankRepository $rankingRepo
* @param SubfleetRepository $subfleetRepo
@@ -42,7 +42,9 @@ class RankController extends Controller
/**
* Get the available subfleets for a rank
*
* @param $rank
*
* @return array
*/
protected function getAvailSubfleets($rank)
@@ -60,9 +62,12 @@ class RankController extends Controller
/**
* Display a listing of the Ranking.
*
* @param Request $request
* @return Response
*
* @throws \Prettus\Repository\Exceptions\RepositoryException
*
* @return Response
*/
public function index(Request $request)
{
@@ -86,9 +91,12 @@ class RankController extends Controller
/**
* Store a newly created Ranking in storage.
*
* @param CreateRankRequest $request
* @return Response
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
*/
public function store(CreateRankRequest $request)
{
@@ -104,7 +112,9 @@ class RankController extends Controller
/**
* Display the specified Ranking.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function show($id)
@@ -118,13 +128,15 @@ class RankController extends Controller
}
return view('admin.ranks.show', [
'rank' => $rank
'rank' => $rank,
]);
}
/**
* Show the form for editing the specified Ranking.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function edit($id)
@@ -147,10 +159,13 @@ class RankController extends Controller
/**
* Update the specified Ranking in storage.
* @param int $id
*
* @param int $id
* @param UpdateRankRequest $request
* @return Response
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
*/
public function update($id, UpdateRankRequest $request)
{
@@ -172,7 +187,9 @@ class RankController extends Controller
/**
* Remove the specified Ranking from storage.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function destroy($id)
@@ -194,6 +211,7 @@ class RankController extends Controller
/**
* @param $rank
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
protected function return_subfleet_view($rank)
@@ -208,8 +226,10 @@ class RankController extends Controller
/**
* Subfleet operations on a rank
*
* @param $id
* @param Request $request
*
* @return mixed
*/
public function subfleets($id, Request $request)

3
app/Http/Controllers/Admin/SettingsController.php
View File

@@ -9,7 +9,6 @@ use Log;
/**
* Class SettingsController
* @package App\Http\Controllers\Admin
*/
class SettingsController extends Controller
{
@@ -28,7 +27,9 @@ class SettingsController extends Controller
/**
* Update the specified setting in storage.
*
* @param Request $request
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function update(Request $request)

79
app/Http/Controllers/Admin/SubfleetController.php
View File

@@ -27,20 +27,20 @@ use Storage;
/**
* Class SubfleetController
* @package App\Http\Controllers\Admin
*/
class SubfleetController extends Controller
{
private $aircraftRepo,
$fareRepo,
$fareSvc,
$fleetSvc,
$importSvc,
$rankRepo,
$subfleetRepo;
private $aircraftRepo;
private $fareRepo;
private $fareSvc;
private $fleetSvc;
private $importSvc;
private $rankRepo;
private $subfleetRepo;
/**
* SubfleetController constructor.
*
* @param AircraftRepository $aircraftRepo
* @param FleetService $fleetSvc
* @param FareRepository $fareRepo
@@ -69,7 +69,9 @@ class SubfleetController extends Controller
/**
* Get the ranks that are available to the subfleet
*
* @param $subfleet
*
* @return array
*/
protected function getAvailRanks($subfleet)
@@ -86,6 +88,8 @@ class SubfleetController extends Controller
/**
* Get all the fares that haven't been assigned to a given subfleet
*
* @param mixed $subfleet
*/
protected function getAvailFares($subfleet)
{
@@ -104,9 +108,12 @@ class SubfleetController extends Controller
/**
* Display a listing of the Subfleet.
*
* @param Request $request
* @return Response
*
* @throws \Prettus\Repository\Exceptions\RepositoryException
*
* @return Response
*/
public function index(Request $request)
{
@@ -120,6 +127,7 @@ class SubfleetController extends Controller
/**
* Show the form for creating a new Subfleet.
*
* @return Response
*/
public function create()
@@ -132,9 +140,12 @@ class SubfleetController extends Controller
/**
* Store a newly created Subfleet in storage.
*
* @param CreateSubfleetRequest $request
* @return Response
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
*/
public function store(CreateSubfleetRequest $request)
{
@@ -147,7 +158,9 @@ class SubfleetController extends Controller
/**
* Display the specified Subfleet.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function show($id)
@@ -168,7 +181,9 @@ class SubfleetController extends Controller
/**
* Show the form for editing the specified Subfleet.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function edit($id)
@@ -194,10 +209,13 @@ class SubfleetController extends Controller
/**
* Update the specified Subfleet in storage.
* @param int $id
*
* @param int $id
* @param UpdateSubfleetRequest $request
* @return Response
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
*/
public function update($id, UpdateSubfleetRequest $request)
{
@@ -216,7 +234,9 @@ class SubfleetController extends Controller
/**
* Remove the specified Subfleet from storage.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function destroy($id)
@@ -228,8 +248,8 @@ class SubfleetController extends Controller
return redirect(route('admin.subfleets.index'));
}
# Make sure no aircraft are assigned to this subfleet
# before trying to delete it, or else things might go boom
// Make sure no aircraft are assigned to this subfleet
// before trying to delete it, or else things might go boom
$aircraft = $this->aircraftRepo->findWhere(['subfleet_id' => $id], ['id']);
if ($aircraft->count() > 0) {
Flash::error('There are aircraft still assigned to this subfleet, you can\'t delete it!')->important();
@@ -244,7 +264,9 @@ class SubfleetController extends Controller
/**
* Run the subfleet exporter
*
* @param Request $request
*
* @return \Symfony\Component\HttpFoundation\BinaryFileResponse
*/
public function export(Request $request)
@@ -261,10 +283,11 @@ class SubfleetController extends Controller
}
/**
*
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*
* @throws \Illuminate\Validation\ValidationException
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function import(Request $request)
{
@@ -292,6 +315,7 @@ class SubfleetController extends Controller
/**
* @param Subfleet $subfleet
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
protected function return_ranks_view(?Subfleet $subfleet)
@@ -307,6 +331,7 @@ class SubfleetController extends Controller
/**
* @param Subfleet $subfleet
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
protected function return_fares_view(?Subfleet $subfleet)
@@ -322,8 +347,10 @@ class SubfleetController extends Controller
/**
* Operations for associating ranks to the subfleet
*
* @param $id
* @param Request $request
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function ranks($id, Request $request)
@@ -337,7 +364,7 @@ class SubfleetController extends Controller
return $this->return_ranks_view($subfleet);
}
/**
/*
* update specific rank data
*/
if ($request->isMethod('post')) {
@@ -362,6 +389,7 @@ class SubfleetController extends Controller
/**
* @param Subfleet $subfleet
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
protected function return_expenses_view(?Subfleet $subfleet)
@@ -374,10 +402,13 @@ class SubfleetController extends Controller
/**
* Operations for associating ranks to the subfleet
*
* @param $id
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*
* @throws \Exception
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function expenses($id, Request $request)
{
@@ -390,7 +421,7 @@ class SubfleetController extends Controller
return $this->return_expenses_view($subfleet);
}
/**
/*
* update specific rank data
*/
if ($request->isMethod('post')) {
@@ -413,8 +444,10 @@ class SubfleetController extends Controller
/**
* Operations on fares to the subfleet
*
* @param $id
* @param Request $request
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function fares($id, Request $request)
@@ -428,7 +461,7 @@ class SubfleetController extends Controller
return $this->return_fares_view($subfleet);
}
/**
/*
* update specific fare data
*/
if ($request->isMethod('post')) {

45
app/Http/Controllers/Admin/UserController.php
View File

@@ -25,18 +25,18 @@ use Response;
/**
* Class UserController
* @package App\Http\Controllers\Admin
*/
class UserController extends Controller
{
private $airlineRepo,
$airportRepo,
$pirepRepo,
$userRepo,
$userSvc;
private $airlineRepo;
private $airportRepo;
private $pirepRepo;
private $userRepo;
private $userSvc;
/**
* UserController constructor.
*
* @param AirlineRepository $airlineRepo
* @param AirportRepository $airportRepo
* @param PirepRepository $pirepRepo
@@ -59,6 +59,7 @@ class UserController extends Controller
/**
* @param Request $request
*
* @return mixed
*/
public function index(Request $request)
@@ -78,6 +79,7 @@ class UserController extends Controller
/**
* Show the form for creating a new User.
*
* @return Response
*/
public function create()
@@ -99,9 +101,12 @@ class UserController extends Controller
/**
* Store a newly created User in storage.
*
* @param CreateUserRequest $request
* @return Response
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
*/
public function store(CreateUserRequest $request)
{
@@ -114,7 +119,9 @@ class UserController extends Controller
/**
* Display the specified User.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function show($id)
@@ -148,7 +155,9 @@ class UserController extends Controller
/**
* Show the form for editing the specified User.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function edit($id)
@@ -165,7 +174,7 @@ class UserController extends Controller
->whereOrder(['user_id' => $id], 'created_at', 'desc')
->paginate();
$countries = collect((new \League\ISO3166\ISO3166)->all())
$countries = collect((new \League\ISO3166\ISO3166())->all())
->mapWithKeys(function ($item, $key) {
return [strtolower($item['alpha2']) => $item['name']];
});
@@ -187,10 +196,13 @@ class UserController extends Controller
/**
* Update the specified User in storage.
*
* @param int $id
* @param UpdateUserRequest $request
* @return Response
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return Response
*/
public function update($id, UpdateUserRequest $request)
{
@@ -211,7 +223,7 @@ class UserController extends Controller
if ($request->filled('avatar_upload')) {
/**
* @var $file \Illuminate\Http\UploadedFile
* @var $file \Illuminate\Http\UploadedFile
*/
$file = $request->file('avatar_upload');
$file_path = $file->storeAs(
@@ -223,7 +235,6 @@ class UserController extends Controller
$user->avatar = $file_path;
}
$original_user_state = $user->state;
$user = $this->userRepo->update($req_data, $id);
@@ -232,7 +243,7 @@ class UserController extends Controller
$this->userSvc->changeUserState($user, $original_user_state);
}
# Delete all of the roles and then re-attach the valid ones
// Delete all of the roles and then re-attach the valid ones
DB::table('role_user')->where('user_id', $id)->delete();
foreach ($request->input('roles') as $key => $value) {
$user->attachRole($value);
@@ -245,7 +256,9 @@ class UserController extends Controller
/**
* Remove the specified User from storage.
* @param int $id
*
* @param int $id
*
* @return Response
*/
public function destroy($id)
@@ -267,8 +280,10 @@ class UserController extends Controller
/**
* Regenerate the user's API key
*
* @param $id
* @param Request $request
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function regen_apikey($id, Request $request)