fix: package.json & package-lock.json to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-ANSIREGEX-1583908

.github/scripts/build.sh

@@ -23,7 +23,6 @@ declare -a remove_files=(
   .eslintrc
   .php_cs
   .php_cs.cache
-  .php-cs-fixer.php
   .phpstorm.meta.php
   .styleci.yml
   .phpunit.result.cache

.github/workflows/build.yml

@@ -2,12 +2,12 @@ name: 'Build'
 on: ['push', 'pull_request', 'workflow_dispatch', 'release']
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-18.04
     if: github.repository == 'nabeelio/phpvms'
     strategy:
       fail-fast: true
       matrix:
-        php-versions: ['7.3', '7.4', '8.0', '8.1']
+        php-versions: ['7.3', '7.4', '8.0']
     name: PHP ${{ matrix.php-versions }}
     env:
       extensions: intl, pcov, mbstring
@@ -78,8 +78,7 @@ jobs:
 
     - name: Run Tests
       run: |
-        export PHP_CS_FIXER_IGNORE_ENV=1
+        vendor/bin/php-cs-fixer fix --config=.php_cs -v --dry-run --diff --using-cache=no
-        vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php -v --dry-run --diff --using-cache=no
         vendor/bin/phpunit --debug --verbose
 
   # This runs after all of the tests, run have run. Creates a cleaned up version of the

.gitignore

@@ -76,4 +76,3 @@ error_log
 /config.php
 /config.bak.php
 /VERSION
-sync.sh

.php-cs-fixer.php

@@ -1,69 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of PHP CS Fixer.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *     Dariusz Rumiński <dariusz.ruminski@gmail.com>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-$header = <<<'EOF'
-This file is part of PHP CS Fixer.
-(c) Fabien Potencier <fabien@symfony.com>
-    Dariusz Rumiński <dariusz.ruminski@gmail.com>
-This source file is subject to the MIT license that is bundled
-with this source code in the file LICENSE.
-EOF;
-
-$finder = PhpCsFixer\Finder::create()
-    ->ignoreVCSIgnored(true)
-    ->exclude('tests/data')
-    ->exclude('storage')
-    ->exclude('resources')
-    ->in(__DIR__)
-    ->append([
-        __DIR__.'/dev-tools/doc.php',
-        // __DIR__.'/php-cs-fixer', disabled, as we want to be able to run bootstrap file even on lower PHP version, to show nice message
-        __FILE__,
-    ])
-;
-
-$config = new PhpCsFixer\Config();
-$config
-    ->setRiskyAllowed(true)
-    ->setRules([
-        '@PSR2'                             => true,
-        'strict_param'                      => true,
-        'no_php4_constructor'               => true,
-        'no_extra_blank_lines'              => true,
-        'no_superfluous_elseif'             => true,
-        'single_line_comment_style'         => false,
-        'simple_to_complex_string_variable' => true,
-        'array_syntax'                      => [
-            'syntax' => 'short',
-        ],
-        'binary_operator_spaces' => [
-            'operators' => [
-                '=>' => 'align_single_space_minimal'
-            ]
-        ],
-        /*
-        'blank_line_before_statement'       => [
-            'statements' => [
-                'declare',
-                'for',
-                'return',
-                'throw',
-                'try',
-            ],
-        ],
-        */
-    ])
-    ->setFinder($finder);
-
-return $config;

.php_cs

@@ -0,0 +1,37 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->in('app')
+    ->in('config');
+
+return PhpCsFixer\Config::create()
+    ->setHideProgress(true)
+    ->setUsingCache(false)
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@PSR2'                             => true,
+        'strict_param'                      => true,
+        'no_php4_constructor'               => true,
+        'no_extra_blank_lines'              => true,
+        'no_superfluous_elseif'             => true,
+        'single_line_comment_style'         => false,
+        'simple_to_complex_string_variable' => true,
+        'array_syntax'                      => [
+            'syntax' => 'short',
+        ],
+        'binary_operator_spaces'            => [
+            'align_double_arrow' => true,
+        ],
+        /*
+        'blank_line_before_statement'       => [
+            'statements' => [
+                'declare',
+                'for',
+                'return',
+                'throw',
+                'try',
+            ],
+        ],
+        */
+    ])
+    ->setFinder($finder);

.shift

@@ -1,4 +0,0 @@
-This file was added by Shift #54503 in order to open a
-Pull Request since no other commits were made.
-
-You should remove this file.

Dockerfile

@@ -1,11 +1,8 @@
-FROM php:8.0.9-fpm-alpine3.14
+FROM php:7.4-fpm-alpine
 
 WORKDIR /var/www/
 
-# Setup composer
+RUN apk add gmp-dev icu-dev zlib-dev libpng-dev
-COPY --from=composer:2.1.5 /usr/bin/composer /usr/local/bin/composer
-
-RUN apk add gmp-dev icu-dev zlib-dev libpng-dev libzip-dev zip
 RUN curl --silent --show-error https://getcomposer.org/installer | php
 
 # Copy any config files in
@@ -19,19 +16,17 @@ RUN docker-php-ext-install \
   pdo_mysql \
   gd \
   gmp \
-  bcmath \
+  opcache && \
-  opcache \
+  docker-php-ext-enable pdo_mysql opcache
-  zip && \
-  docker-php-ext-enable pdo_mysql opcache bcmath zip
 
 COPY . /var/www/
-RUN composer install \
+RUN php composer.phar install \
     --ignore-platform-reqs \
     --no-interaction \
     --no-plugins \
     --no-scripts \
     --prefer-dist
 
-#RUN chown -R www-data:www-data /var/www
+RUN chown -R www-data:www-data /var/www
 
 EXPOSE 9000

Makefile

@@ -102,7 +102,7 @@ reset-installer:
 
 .PHONY: docker-test
 docker-test:
-	@docker compose -f docker-compose.yml -f docker-compose.local.yml up
+	@docker-compose -f docker-compose.yml -f docker-compose.local.yml up
 
 .PHONY: docker-clean
 docker-clean:

app/Contracts/ImportExport.php

@@ -166,27 +166,6 @@ class ImportExport
                 return [];
             }
 
-            if (strpos($split_values[0], '?') !== false) {
-                // This contains the query string, which turns it into a multi-level array
-                $query_str = explode('?', $split_values[0]);
-                $parent = trim($query_str[0]);
-
-                $children = [];
-                $kvp = explode('&', trim($query_str[1]));
-                foreach ($kvp as $items) {
-                    if (!$items) {
-                        continue;
-                    }
-
-                    $this->kvpToArray($items, $children);
-                }
-
-                $ret[$parent] = $children;
-
-                return $ret;
-            }
-
-            // This is not a query string, return it back untouched
             return [$split_values[0]];
         }
 

app/Database/migrations/2021_11_23_184532_add_type_rating_tables.php

@@ -1,53 +0,0 @@
-<?php
-
-use App\Contracts\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class AddTypeRatingTables extends Migration
-{
-    public function up()
-    {
-        if (!Schema::hasTable('typeratings')) {
-            Schema::create('typeratings', function (Blueprint $table) {
-                $table->increments('id');
-                $table->string('name');
-                $table->string('type');
-                $table->string('description')->nullable();
-                $table->string('image_url')->nullable();
-                $table->boolean('active')->default(true);
-                $table->timestamps();
-
-                $table->unique('id');
-                $table->unique('name');
-            });
-        }
-
-        if (!Schema::hasTable('typerating_user')) {
-            Schema::create('typerating_user', function (Blueprint $table) {
-                $table->unsignedInteger('typerating_id');
-                $table->unsignedInteger('user_id');
-
-                $table->primary(['typerating_id', 'user_id']);
-                $table->index(['typerating_id', 'user_id']);
-            });
-        }
-
-        if (!Schema::hasTable('typerating_subfleet')) {
-            Schema::create('typerating_subfleet', function (Blueprint $table) {
-                $table->unsignedInteger('typerating_id');
-                $table->unsignedInteger('subfleet_id');
-
-                $table->primary(['typerating_id', 'subfleet_id']);
-                $table->index(['typerating_id', 'subfleet_id']);
-            });
-        }
-    }
-
-    public function down()
-    {
-        Schema::dropIfExists('typeratings');
-        Schema::dropIfExists('typerating_user');
-        Schema::dropIfExists('typerating_subfleet');
-    }
-}

app/Database/migrations/2021_11_27_132418_add_hub_to_aircraft.php

@@ -1,15 +0,0 @@
-<?php
-
-use App\Contracts\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class AddHubToAircraft extends Migration
-{
-    public function up()
-    {
-        Schema::table('aircraft', function (Blueprint $table) {
-            $table->string('hub_id', 5)->nullable()->after('airport_id');
-        });
-    }
-}

app/Database/migrations/2022_01_10_131604_update_awards_add_active.php

@@ -1,15 +0,0 @@
-<?php
-
-use App\Contracts\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class UpdateAwardsAddActive extends Migration
-{
-    public function up()
-    {
-        Schema::table('awards', function (Blueprint $table) {
-            $table->boolean('active')->default(true)->nullable()->after('ref_model_params');
-        });
-    }
-}

app/Database/seeds/dev/in_progress.yml

@@ -36,8 +36,7 @@ acars:
     sim_time: now
     created_at: 'now'
     updated_at: 'now'
-  - id: 9aAN4mxlK9zb1
+  - pirep_id: b68R5gwVzpVe
-    pirep_id: b68R5gwVzpVe
     type: '0'
     nav_type: null
     order: '0'
@@ -55,8 +54,7 @@ acars:
     sim_time: now
     created_at: 'now'
     updated_at: 'now'
-  - id: 9aAN4mxlK9zb2
+  - pirep_id: b68R5gwVzpVe
-    pirep_id: b68R5gwVzpVe
     type: '0'
     nav_type: null
     order: '0'
@@ -74,8 +72,7 @@ acars:
     sim_time: now
     created_at: 'now'
     updated_at: 'now'
-  - id: 9aAN4mxlK9zb3
+  - pirep_id: b68R5gwVzpVe
-    pirep_id: b68R5gwVzpVe
     type: '0'
     nav_type: null
     order: '0'
@@ -93,8 +90,7 @@ acars:
     sim_time: now
     created_at: 'now'
     updated_at: 'now'
-  - id: 9aAN4mxlK9zb34
+  - pirep_id: b68R5gwVzpVe
-    pirep_id: b68R5gwVzpVe
     type: '0'
     nav_type: null
     order: '0'
@@ -112,8 +108,7 @@ acars:
     sim_time: now
     created_at: 'now'
     updated_at: 'now'
-  - id: 9aAN4mxlK9zb35
+  - pirep_id: b68R5gwVzpVe
-    pirep_id: b68R5gwVzpVe
     type: '0'
     nav_type: null
     order: '0'
@@ -131,8 +126,7 @@ acars:
     sim_time: now
     created_at: 'now'
     updated_at: 'now'
-  - id: 9aAN4mxlK9zb36
+  - pirep_id: b68R5gwVzpVe
-    pirep_id: b68R5gwVzpVe
     type: '0'
     nav_type: null
     order: '0'
@@ -150,8 +144,7 @@ acars:
     sim_time: now
     created_at: 'now'
     updated_at: 'now'
-  - id: 9aAN4mxlK9zb37
+  - pirep_id: b68R5gwVzpVe
-    pirep_id: b68R5gwVzpVe
     type: '0'
     nav_type: null
     order: '0'
@@ -169,8 +162,7 @@ acars:
     sim_time: now
     created_at: 'now'
     updated_at: 'now'
-  - id: 9aAN4mxlK9zb38
+  - pirep_id: b68R5gwVzpVe
-    pirep_id: b68R5gwVzpVe
     type: '0'
     nav_type: null
     order: '0'
@@ -188,8 +180,7 @@ acars:
     sim_time: now
     created_at: 'now'
     updated_at: 'now'
-  - id: 9aAN4mxlK9zb39
+  - pirep_id: b68R5gwVzpVe
-    pirep_id: b68R5gwVzpVe
     type: '0'
     nav_type: null
     order: '0'

app/Database/seeds/dev/sample.yml

@@ -34,17 +34,6 @@ airports:
     lon: -97.6698889
     hub: 1
     ground_handling_cost: 100
-  - id: KPHN
-    iata: HPN
-    icao: KPHN
-    name: Westchester County Airport
-    location: White Plains
-    country: United States
-    timezone: America/New_York
-    lat: 41.067
-    lon: -73.7076
-    hub: 1
-    ground_handling_cost: 100
   - id: KJFK
     iata: JFK
     icao: KJFK
@@ -459,21 +448,6 @@ flights:
   - id: flightid_1
     airline_id: 1
     flight_number: 100
-    dpt_airport_id: KHPN
-    arr_airport_id: KJFK
-    route: DCT CMK V374 DENNA V44 BELTT/N0346F140 V44 DPK DCT
-    distance: 113
-    level: 110
-    dpt_time: 6PM CST
-    arr_time: 11PM EST
-    flight_time: 240
-    flight_type: J
-    load_factor: 100
-    created_at: NOW
-    updated_at: NOW
-  - id: flightid_2
-    airline_id: 1
-    flight_number: 101
     dpt_airport_id: KAUS
     arr_airport_id: KJFK
     route: KAUS SID TNV J87 IAH J2 LCH J22 MEI J239 ATL J52 AJFEB J14 BYJAC Q60 JAXSN J14 COLIN J61 HUBBS J55 SIE STAR KJFK

app/Database/seeds/permissions.yml

@@ -42,9 +42,6 @@
 - name: ranks
   display_name: Ranks
   description: Create/edit ranks
-- name: typeratings
-  display_name: Type Ratings
-  description: Create/edit type ratings
 - name: users
   display_name: Users
   description: Create/edit users

app/Database/seeds/settings.yml

@@ -137,13 +137,6 @@
   options: ''
   type: int
   description: 'Initial zoom level on the map'
-- key: acars.update_interval
-  name: 'Refresh Interval'
-  group: acars
-  value: 60
-  options: ''
-  type: int
-  description: 'How often the live map updates its data'
 - key: airports.default_ground_handling_cost
   name: 'Default Ground Handling Cost'
   group: airports
@@ -290,14 +283,7 @@
   value: true
   options: ''
   type: boolean
-  description: 'Aircraft restricted to user''s rank'
+  description: 'Aircraft that can be flown are restricted to a user''s rank'
-- key: pireps.restrict_aircraft_to_typerating
-  name: 'Restrict Aircraft by Type Ratings'
-  group: pireps
-  value: false
-  options: ''
-  type: boolean
-  description: 'Aircraft restricted to user type ratings'
 - key: pireps.only_aircraft_at_dpt_airport
   name: 'Restrict Aircraft At Departure'
   group: pireps

app/Events/Fares.php

@@ -1,39 +0,0 @@
-<?php
-
-namespace App\Events;
-
-use App\Contracts\Event;
-use App\Models\Pirep;
-
-/**
- * This event is dispatched when the fares for a flight report
- * are collected. Your listeners should return a list of Fare
- * models. Don't call save on the model!
- *
- * Example return:
- *
- *   new Fare([
- *      'name'  => '', # displayed as the memo
- *      'type'  => [INTEGER], # from FareType enum class
- *      'price' => [DECIMAL],
- *      'cost'  => [DECIMAL], # optional
- *      'notes' => '', # used as Transaction Group
- *   ]);
- *
- * The event caller will check the 'type' to make sure that it
- * will filter out fares that only apply to the current process
- *
- * The event will have a copy of the PIREP model, if it's applicable
- */
-class Fares extends Event
-{
-    public $pirep;
-
-    /**
-     * @param Pirep|null $pirep
-     */
-    public function __construct(Pirep $pirep = null)
-    {
-        $this->pirep = $pirep;
-    }
-}

app/Http/Controllers/Admin/AircraftController.php

@@ -79,7 +79,6 @@ class AircraftController extends Controller
     {
         return view('admin.aircraft.create', [
             'airports'    => $this->airportRepo->selectBoxList(),
-            'hubs'        => $this->airportRepo->selectBoxList(true, true),
             'subfleets'   => Subfleet::all()->pluck('name', 'id'),
             'statuses'    => AircraftStatus::select(false),
             'subfleet_id' => $request->query('subfleet'),
@@ -144,7 +143,6 @@ class AircraftController extends Controller
         return view('admin.aircraft.edit', [
             'aircraft'  => $aircraft,
             'airports'  => $this->airportRepo->selectBoxList(),
-            'hubs'      => $this->airportRepo->selectBoxList(true, true),
             'subfleets' => Subfleet::all()->pluck('name', 'id'),
             'statuses'  => AircraftStatus::select(false),
         ]);

app/Http/Controllers/Admin/FlightController.php

@@ -300,18 +300,14 @@ class FlightController extends Controller
     public function export(Request $request)
     {
         $exporter = app(ExportService::class);
-
+        $flights = $this->flightRepo->all();
-        $where = [];
-        $file_name = 'flights.csv';
-        if ($request->input('airline_id')) {
-            $airline_id = $request->input('airline_id');
-            $where['airline_id'] = $airline_id;
-            $file_name = 'flights-'.$airline_id.'.csv';
-        }
-        $flights = $this->flightRepo->where($where)->get();
 
         $path = $exporter->exportFlights($flights);
-        return response()->download($path, $file_name, ['content-type' => 'text/csv'])->deleteFileAfterSend(true);
+        return response()
+            ->download($path, 'flights.csv', [
+                'content-type' => 'text/csv',
+            ])
+            ->deleteFileAfterSend(true);
     }
 
     /**

app/Http/Controllers/Admin/SubfleetController.php

@@ -17,7 +17,6 @@ use App\Repositories\AircraftRepository;
 use App\Repositories\FareRepository;
 use App\Repositories\RankRepository;
 use App\Repositories\SubfleetRepository;
-use App\Repositories\TypeRatingRepository;
 use App\Services\ExportService;
 use App\Services\FareService;
 use App\Services\FleetService;
@@ -37,29 +36,26 @@ class SubfleetController extends Controller
     private $importSvc;
     private $rankRepo;
     private $subfleetRepo;
-    private $typeratingRepo;
 
     /**
      * SubfleetController constructor.
      *
-     * @param AircraftRepository   $aircraftRepo
+     * @param AircraftRepository $aircraftRepo
-     * @param FareRepository       $fareRepo
+     * @param FleetService       $fleetSvc
-     * @param FareService          $fareSvc
+     * @param FareRepository     $fareRepo
-     * @param FleetService         $fleetSvc
+     * @param FareService        $fareSvc
-     * @param ImportService        $importSvc
+     * @param ImportService      $importSvc
-     * @param RankRepository       $rankRepo
+     * @param RankRepository     $rankRepo
-     * @param SubfleetRepository   $subfleetRepo
+     * @param SubfleetRepository $subfleetRepo
-     * @param TypeRatingRepository $typeratingRepo
      */
     public function __construct(
         AircraftRepository $aircraftRepo,
+        FleetService $fleetSvc,
         FareRepository $fareRepo,
         FareService $fareSvc,
-        FleetService $fleetSvc,
         ImportService $importSvc,
         RankRepository $rankRepo,
-        SubfleetRepository $subfleetRepo,
+        SubfleetRepository $subfleetRepo
-        TypeRatingRepository $typeratingRepo
     ) {
         $this->aircraftRepo = $aircraftRepo;
         $this->fareRepo = $fareRepo;
@@ -68,7 +64,48 @@ class SubfleetController extends Controller
         $this->importSvc = $importSvc;
         $this->rankRepo = $rankRepo;
         $this->subfleetRepo = $subfleetRepo;
-        $this->typeratingRepo = $typeratingRepo;
+    }
+
+    /**
+     * Get the ranks that are available to the subfleet
+     *
+     * @param $subfleet
+     *
+     * @return array
+     */
+    protected function getAvailRanks($subfleet)
+    {
+        $retval = [];
+        $all_ranks = $this->rankRepo->all();
+        $avail_ranks = $all_ranks->except($subfleet->ranks->modelKeys());
+        foreach ($avail_ranks as $rank) {
+            $retval[$rank->id] = $rank->name;
+        }
+
+        return $retval;
+    }
+
+    /**
+     * Get all the fares that haven't been assigned to a given subfleet
+     *
+     * @param mixed $subfleet
+     *
+     * @return array
+     */
+    protected function getAvailFares($subfleet)
+    {
+        $retval = [];
+        $all_fares = $this->fareRepo->all();
+        $avail_fares = $all_fares->except($subfleet->fares->modelKeys());
+        foreach ($avail_fares as $fare) {
+            $retval[$fare->id] = $fare->name.
+                ' (price: '.$fare->price.
+                ', type: '.FareType::label($fare->type).
+                ', cost: '.$fare->cost.
+                ', capacity: '.$fare->capacity.')';
+        }
+
+        return $retval;
     }
 
     /**
@@ -115,8 +152,8 @@ class SubfleetController extends Controller
     {
         $input = $request->all();
         $subfleet = $this->subfleetRepo->create($input);
-        Flash::success('Subfleet saved successfully.');
 
+        Flash::success('Subfleet saved successfully.');
         return redirect(route('admin.subfleets.edit', [$subfleet->id]));
     }
 
@@ -135,12 +172,10 @@ class SubfleetController extends Controller
 
         if (empty($subfleet)) {
             Flash::error('Subfleet not found');
-
             return redirect(route('admin.subfleets.index'));
         }
 
         $avail_fares = $this->getAvailFares($subfleet);
-
         return view('admin.subfleets.show', [
             'subfleet'    => $subfleet,
             'avail_fares' => $avail_fares,
@@ -157,27 +192,24 @@ class SubfleetController extends Controller
     public function edit($id)
     {
         $subfleet = $this->subfleetRepo
-            ->with(['fares', 'ranks', 'typeratings'])
+            ->with(['fares', 'ranks'])
             ->findWithoutFail($id);
 
         if (empty($subfleet)) {
             Flash::error('Subfleet not found');
-
             return redirect(route('admin.subfleets.index'));
         }
 
         $avail_fares = $this->getAvailFares($subfleet);
         $avail_ranks = $this->getAvailRanks($subfleet);
-        $avail_ratings = $this->getAvailTypeRatings($subfleet);
 
         return view('admin.subfleets.edit', [
-            'airlines'      => Airline::all()->pluck('name', 'id'),
+            'airlines'    => Airline::all()->pluck('name', 'id'),
-            'hubs'          => Airport::where('hub', 1)->pluck('name', 'id'),
+            'hubs'        => Airport::where('hub', 1)->pluck('name', 'id'),
-            'fuel_types'    => FuelType::labels(),
+            'fuel_types'  => FuelType::labels(),
-            'avail_fares'   => $avail_fares,
+            'avail_fares' => $avail_fares,
-            'avail_ranks'   => $avail_ranks,
+            'avail_ranks' => $avail_ranks,
-            'avail_ratings' => $avail_ratings,
+            'subfleet'    => $subfleet,
-            'subfleet'      => $subfleet,
         ]);
     }
 
@@ -197,13 +229,12 @@ class SubfleetController extends Controller
 
         if (empty($subfleet)) {
             Flash::error('Subfleet not found');
-
             return redirect(route('admin.subfleets.index'));
         }
 
         $this->subfleetRepo->update($request->all(), $id);
-        Flash::success('Subfleet updated successfully.');
 
+        Flash::success('Subfleet updated successfully.');
         return redirect(route('admin.subfleets.index'));
     }
 
@@ -220,7 +251,6 @@ class SubfleetController extends Controller
 
         if (empty($subfleet)) {
             Flash::error('Subfleet not found');
-
             return redirect(route('admin.subfleets.index'));
         }
 
@@ -229,13 +259,12 @@ class SubfleetController extends Controller
         $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();
-
             return redirect(route('admin.subfleets.index'));
         }
 
         $this->subfleetRepo->delete($id);
-        Flash::success('Subfleet deleted successfully.');
 
+        Flash::success('Subfleet deleted successfully.');
         return redirect(route('admin.subfleets.index'));
     }
 
@@ -252,8 +281,11 @@ class SubfleetController extends Controller
         $subfleets = $this->subfleetRepo->all();
 
         $path = $exporter->exportSubfleets($subfleets);
-
+        return response()
-        return response()->download($path, 'subfleets.csv', ['content-type' => 'text/csv'])->deleteFileAfterSend(true);
+            ->download($path, 'subfleets.csv', [
+                'content-type' => 'text/csv',
+            ])
+            ->deleteFileAfterSend(true);
     }
 
     /**
@@ -280,64 +312,77 @@ class SubfleetController extends Controller
     }
 
     /**
-     * Get all the fares that haven't been assigned to a given subfleet
+     * @param Subfleet $subfleet
      *
-     * @param mixed $subfleet
+     * @return mixed
-     *
-     * @return array
      */
-    protected function getAvailFares($subfleet)
+    protected function return_ranks_view(?Subfleet $subfleet)
     {
-        $retval = [];
+        $subfleet->refresh();
-        $all_fares = $this->fareRepo->all();
-        $avail_fares = $all_fares->except($subfleet->fares->modelKeys());
-        foreach ($avail_fares as $fare) {
-            $retval[$fare->id] = $fare->name.
-                ' (price: '.$fare->price.
-                ', type: '.FareType::label($fare->type).
-                ', cost: '.$fare->cost.
-                ', capacity: '.$fare->capacity.')';
-        }
 
-        return $retval;
+        $avail_ranks = $this->getAvailRanks($subfleet);
+        return view('admin.subfleets.ranks', [
+            'subfleet'    => $subfleet,
+            'avail_ranks' => $avail_ranks,
+        ]);
     }
 
     /**
-     * Get the ranks that are available to the subfleet
+     * @param Subfleet $subfleet
      *
-     * @param $subfleet
+     * @return mixed
-     *
-     * @return array
      */
-    protected function getAvailRanks($subfleet)
+    protected function return_fares_view(?Subfleet $subfleet)
     {
-        $retval = [];
+        $subfleet->refresh();
-        $all_ranks = $this->rankRepo->all();
-        $avail_ranks = $all_ranks->except($subfleet->ranks->modelKeys());
-        foreach ($avail_ranks as $rank) {
-            $retval[$rank->id] = $rank->name;
-        }
 
-        return $retval;
+        $avail_fares = $this->getAvailFares($subfleet);
+        return view('admin.subfleets.fares', [
+            'subfleet'    => $subfleet,
+            'avail_fares' => $avail_fares,
+        ]);
     }
 
     /**
-     * Get the type ratings that are available to the subfleet
+     * Operations for associating ranks to the subfleet
      *
-     * @param $subfleet
+     * @param         $id
+     * @param Request $request
      *
-     * @return array
+     * @return mixed
      */
-    protected function getAvailTypeRatings($subfleet)
+    public function ranks($id, Request $request)
     {
-        $retval = [];
+        $subfleet = $this->subfleetRepo->findWithoutFail($id);
-        $all_ratings = $this->typeratingRepo->all();
+        if (empty($subfleet)) {
-        $avail_ratings = $all_ratings->except($subfleet->typeratings->modelKeys());
+            return $this->return_ranks_view($subfleet);
-        foreach ($avail_ratings as $tr) {
-            $retval[$tr->id] = $tr->name.' ('.$tr->type.')';
         }
 
-        return $retval;
+        if ($request->isMethod('get')) {
+            return $this->return_ranks_view($subfleet);
+        }
+
+        /*
+         * update specific rank data
+         */
+        if ($request->isMethod('post')) {
+            $rank = $this->rankRepo->find($request->input('rank_id'));
+            $this->fleetSvc->addSubfleetToRank($subfleet, $rank);
+        } elseif ($request->isMethod('put')) {
+            $override = [];
+            $rank = $this->rankRepo->find($request->input('rank_id'));
+            $override[$request->name] = $request->value;
+
+            $this->fleetSvc->addSubfleetToRank($subfleet, $rank, $override);
+        } // dissassociate fare from teh aircraft
+        elseif ($request->isMethod('delete')) {
+            $rank = $this->rankRepo->find($request->input('rank_id'));
+            $this->fleetSvc->removeSubfleetFromRank($subfleet, $rank);
+        }
+
+        $subfleet->save();
+
+        return $this->return_ranks_view($subfleet);
     }
 
     /**
@@ -353,54 +398,6 @@ class SubfleetController extends Controller
         ]);
     }
 
-    /**
-     * @param Subfleet $subfleet
-     *
-     * @return mixed
-     */
-    protected function return_fares_view(?Subfleet $subfleet)
-    {
-        $subfleet->refresh();
-        $avail_fares = $this->getAvailFares($subfleet);
-
-        return view('admin.subfleets.fares', [
-            'subfleet'    => $subfleet,
-            'avail_fares' => $avail_fares,
-        ]);
-    }
-
-    /**
-     * @param Subfleet $subfleet
-     *
-     * @return mixed
-     */
-    protected function return_ranks_view(?Subfleet $subfleet)
-    {
-        $subfleet->refresh();
-        $avail_ranks = $this->getAvailRanks($subfleet);
-
-        return view('admin.subfleets.ranks', [
-            'subfleet'    => $subfleet,
-            'avail_ranks' => $avail_ranks,
-        ]);
-    }
-
-    /**
-     * @param Subfleet $subfleet
-     *
-     * @return mixed
-     */
-    protected function return_typeratings_view(?Subfleet $subfleet)
-    {
-        $subfleet->refresh();
-        $avail_ratings = $this->getAvailTypeRatings($subfleet);
-
-        return view('admin.subfleets.type_ratings', [
-            'subfleet'      => $subfleet,
-            'avail_ratings' => $avail_ratings,
-        ]);
-    }
-
     /**
      * Operations for associating ranks to the subfleet
      *
@@ -482,79 +479,4 @@ class SubfleetController extends Controller
 
         return $this->return_fares_view($subfleet);
     }
-
-    /**
-     * Operations for associating ranks to the subfleet
-     *
-     * @param         $id
-     * @param Request $request
-     *
-     * @return mixed
-     */
-    public function ranks($id, Request $request)
-    {
-        $subfleet = $this->subfleetRepo->findWithoutFail($id);
-        if (empty($subfleet)) {
-            return $this->return_ranks_view($subfleet);
-        }
-
-        if ($request->isMethod('get')) {
-            return $this->return_ranks_view($subfleet);
-        }
-
-        // associate rank with the subfleet
-        if ($request->isMethod('post')) {
-            $rank = $this->rankRepo->find($request->input('rank_id'));
-            $this->fleetSvc->addSubfleetToRank($subfleet, $rank);
-        } // override definitions
-        elseif ($request->isMethod('put')) {
-            $override = [];
-            $rank = $this->rankRepo->find($request->input('rank_id'));
-            $override[$request->name] = $request->value;
-
-            $this->fleetSvc->addSubfleetToRank($subfleet, $rank, $override);
-        } // dissassociate rank from the subfleet
-        elseif ($request->isMethod('delete')) {
-            $rank = $this->rankRepo->find($request->input('rank_id'));
-            $this->fleetSvc->removeSubfleetFromRank($subfleet, $rank);
-        }
-
-        $subfleet->save();
-
-        return $this->return_ranks_view($subfleet);
-    }
-
-    /**
-     * Operations for associating type ratings to the subfleet
-     *
-     * @param         $id
-     * @param Request $request
-     *
-     * @return mixed
-     */
-    public function typeratings($id, Request $request)
-    {
-        $subfleet = $this->subfleetRepo->findWithoutFail($id);
-        if (empty($subfleet)) {
-            return $this->return_typeratings_view($subfleet);
-        }
-
-        if ($request->isMethod('get')) {
-            return $this->return_typeratings_view($subfleet);
-        }
-
-        // associate subfleet with type rating
-        if ($request->isMethod('post')) {
-            $typerating = $this->typeratingRepo->find($request->input('typerating_id'));
-            $this->fleetSvc->addSubfleetToTypeRating($subfleet, $typerating);
-        } // dissassociate subfleet from the type rating
-        elseif ($request->isMethod('delete')) {
-            $typerating = $this->typeratingRepo->find($request->input('typerating_id'));
-            $this->fleetSvc->removeSubfleetFromTypeRating($subfleet, $typerating);
-        }
-
-        $subfleet->save();
-
-        return $this->return_typeratings_view($subfleet);
-    }
 }

app/Http/Controllers/Admin/TypeRatingController.php

@@ -1,168 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Admin;
-
-use App\Contracts\Controller;
-use App\Http\Requests\CreateTypeRatingRequest;
-use App\Http\Requests\UpdateTypeRatingRequest;
-use App\Repositories\SubfleetRepository;
-use App\Repositories\TypeRatingRepository;
-use App\Services\FleetService;
-use Cache;
-use Illuminate\Http\Request;
-use Laracasts\Flash\Flash;
-use Prettus\Repository\Criteria\RequestCriteria;
-
-class TypeRatingController extends Controller
-{
-    private $fleetSvc;
-    private $subfleetRepo;
-    private $typeratingRepo;
-
-    public function __construct(
-        FleetService $fleetSvc,
-        SubfleetRepository $subfleetRepo,
-        TypeRatingRepository $typeratingRepo
-    ) {
-        $this->fleetSvc = $fleetSvc;
-        $this->subfleetRepo = $subfleetRepo;
-        $this->typeratingRepo = $typeratingRepo;
-    }
-
-    public function index(Request $request)
-    {
-        $this->typeratingRepo->pushCriteria(new RequestCriteria($request));
-        $typeratings = $this->typeratingRepo->all();
-
-        return view('admin.typeratings.index', [
-            'typeratings' => $typeratings,
-        ]);
-    }
-
-    public function create()
-    {
-        return view('admin.typeratings.create');
-    }
-
-    public function store(CreateTypeRatingRequest $request)
-    {
-        $input = $request->all();
-
-        $model = $this->typeratingRepo->create($input);
-        Flash::success('Type Rating saved successfully.');
-        // Cache::forget(config('cache.keys.RANKS_PILOT_LIST.key'));
-
-        return redirect(route('admin.typeratings.edit', [$model->id]));
-    }
-
-    public function show($id)
-    {
-        $typerating = $this->typeratingRepo->findWithoutFail($id);
-
-        if (empty($typerating)) {
-            Flash::error('Type Rating not found');
-
-            return redirect(route('admin.typeratings.index'));
-        }
-
-        return view('admin.typeratings.show', [
-            'typerating' => $typerating,
-        ]);
-    }
-
-    public function edit($id)
-    {
-        $typerating = $this->typeratingRepo->findWithoutFail($id);
-
-        if (empty($typerating)) {
-            Flash::error('Type Rating not found');
-
-            return redirect(route('admin.typeratings.index'));
-        }
-
-        $avail_subfleets = $this->getAvailSubfleets($typerating);
-
-        return view('admin.typeratings.edit', [
-            'typerating'      => $typerating,
-            'avail_subfleets' => $avail_subfleets,
-        ]);
-    }
-
-    public function update($id, UpdateTypeRatingRequest $request)
-    {
-        $typerating = $this->typeratingRepo->findWithoutFail($id);
-
-        if (empty($typerating)) {
-            Flash::error('Type Rating not found');
-
-            return redirect(route('admin.typeratings.index'));
-        }
-
-        $typerating = $this->typeratingRepo->update($request->all(), $id);
-        // Cache::forget(config('cache.keys.RANKS_PILOT_LIST.key'));
-        Flash::success('Type Rating updated successfully.');
-
-        return redirect(route('admin.typeratings.index'));
-    }
-
-    public function destroy($id)
-    {
-        $typerating = $this->typeratingRepo->findWithoutFail($id);
-
-        if (empty($typerating)) {
-            Flash::error('Type Rating not found');
-
-            return redirect(route('admin.typeratings.index'));
-        }
-
-        $this->typeratingRepo->delete($id);
-
-        Flash::success('Type Rating deleted successfully.');
-
-        return redirect(route('admin.typeratings.index'));
-    }
-
-    protected function getAvailSubfleets($typerating)
-    {
-        $retval = [];
-        $all_subfleets = $this->subfleetRepo->all();
-        $avail_subfleets = $all_subfleets->except($typerating->subfleets->modelKeys());
-        foreach ($avail_subfleets as $subfleet) {
-            $retval[$subfleet->id] = $subfleet->name.' (Airline: '.$subfleet->airline->code.')';
-        }
-
-        return $retval;
-    }
-
-    protected function return_subfleet_view($typerating)
-    {
-        $avail_subfleets = $this->getAvailSubfleets($typerating);
-
-        return view('admin.typeratings.subfleets', [
-            'typerating'      => $typerating,
-            'avail_subfleets' => $avail_subfleets,
-        ]);
-    }
-
-    public function subfleets($id, Request $request)
-    {
-        $typerating = $this->typeratingRepo->findWithoutFail($id);
-        if (empty($typerating)) {
-            Flash::error('Type Rating not found!');
-            return redirect(route('admin.typeratings.index'));
-        }
-
-        // add subfleet to type rating
-        if ($request->isMethod('post')) {
-            $subfleet = $this->subfleetRepo->find($request->input('subfleet_id'));
-            $this->fleetSvc->addSubfleetToTypeRating($subfleet, $typerating);
-        }
-        // remove subfleet from type rating
-        elseif ($request->isMethod('delete')) {
-            $subfleet = $this->subfleetRepo->find($request->input('subfleet_id'));
-            $this->fleetSvc->removeSubfleetFromTypeRating($subfleet, $typerating);
-        }
-
-        return $this->return_subfleet_view($typerating);
-    }
-}

app/Http/Controllers/Admin/UserController.php

@@ -12,7 +12,6 @@ use App\Repositories\AirlineRepository;
 use App\Repositories\AirportRepository;
 use App\Repositories\PirepRepository;
 use App\Repositories\RoleRepository;
-use App\Repositories\TypeRatingRepository;
 use App\Repositories\UserRepository;
 use App\Services\UserService;
 use App\Support\Timezonelist;
@@ -31,27 +30,24 @@ class UserController extends Controller
     private $airportRepo;
     private $pirepRepo;
     private $roleRepo;
-    private $typeratingRepo;
     private $userRepo;
     private $userSvc;
 
     /**
      * UserController constructor.
      *
-     * @param AirlineRepository    $airlineRepo
+     * @param AirlineRepository $airlineRepo
-     * @param AirportRepository    $airportRepo
+     * @param AirportRepository $airportRepo
-     * @param PirepRepository      $pirepRepo
+     * @param PirepRepository   $pirepRepo
-     * @param RoleRepository       $roleRepo
+     * @param RoleRepository    $roleRepo
-     * @param TypeRatingRepository $typeratingRepo
+     * @param UserRepository    $userRepo
-     * @param UserRepository       $userRepo
+     * @param UserService       $userSvc
-     * @param UserService          $userSvc
      */
     public function __construct(
         AirlineRepository $airlineRepo,
         AirportRepository $airportRepo,
         PirepRepository $pirepRepo,
         RoleRepository $roleRepo,
-        TypeRatingRepository $typeratingRepo,
         UserRepository $userRepo,
         UserService $userSvc
     ) {
@@ -59,7 +55,6 @@ class UserController extends Controller
         $this->airportRepo = $airportRepo;
         $this->pirepRepo = $pirepRepo;
         $this->roleRepo = $roleRepo;
-        $this->typeratingRepo = $typeratingRepo;
         $this->userSvc = $userSvc;
         $this->userRepo = $userRepo;
     }
@@ -154,7 +149,7 @@ class UserController extends Controller
     public function edit($id)
     {
         $user = $this->userRepo
-            ->with(['awards', 'fields', 'rank', 'typeratings'])
+            ->with(['awards', 'fields', 'rank'])
             ->findWithoutFail($id);
 
         if (empty($user)) {
@@ -174,19 +169,17 @@ class UserController extends Controller
         $airlines = $this->airlineRepo->selectBoxList();
         $airports = $this->airportRepo->selectBoxList(false);
         $roles = $this->roleRepo->selectBoxList(false, true);
-        $avail_ratings = $this->getAvailTypeRatings($user);
 
         return view('admin.users.edit', [
-            'user'          => $user,
+            'user'      => $user,
-            'pireps'        => $pireps,
+            'pireps'    => $pireps,
-            'country'       => new ISO3166(),
+            'country'   => new ISO3166(),
-            'countries'     => $countries,
+            'countries' => $countries,
-            'timezones'     => Timezonelist::toArray(),
+            'timezones' => Timezonelist::toArray(),
-            'airports'      => $airports,
+            'airports'  => $airports,
-            'airlines'      => $airlines,
+            'airlines'  => $airlines,
-            'ranks'         => Rank::all()->pluck('name', 'id'),
+            'ranks'     => Rank::all()->pluck('name', 'id'),
-            'roles'         => $roles,
+            'roles'     => $roles,
-            'avail_ratings' => $avail_ratings,
         ]);
     }
 
@@ -267,7 +260,6 @@ class UserController extends Controller
         $user = $this->userRepo->findWithoutFail($id);
         if (empty($user)) {
             Flash::error('User not found');
-
             return redirect(route('admin.users.index'));
         }
 
@@ -291,7 +283,6 @@ class UserController extends Controller
         $userAward = UserAward::where(['user_id' => $id, 'award_id' => $award_id]);
         if (empty($userAward)) {
             Flash::error('The user award could not be found');
-
             return redirect()->back();
         }
 
@@ -320,73 +311,4 @@ class UserController extends Controller
 
         return redirect(route('admin.users.edit', [$id]));
     }
-
-    /**
-     * Get the type ratings that are available to the user
-     *
-     * @param $user
-     *
-     * @return array
-     */
-    protected function getAvailTypeRatings($user)
-    {
-        $retval = [];
-        $all_ratings = $this->typeratingRepo->all();
-        $avail_ratings = $all_ratings->except($user->typeratings->modelKeys());
-        foreach ($avail_ratings as $tr) {
-            $retval[$tr->id] = $tr->name.' ('.$tr->type.')';
-        }
-
-        return $retval;
-    }
-
-    /**
-     * @param User $user
-     *
-     * @return mixed
-     */
-    protected function return_typeratings_view(?User $user)
-    {
-        $user->refresh();
-
-        $avail_ratings = $this->getAvailTypeRatings($user);
-        return view('admin.users.type_ratings', [
-            'user'          => $user,
-            'avail_ratings' => $avail_ratings,
-        ]);
-    }
-
-    /**
-     * Operations for associating type ratings to the user
-     *
-     * @param         $id
-     * @param Request $request
-     *
-     * @return mixed
-     */
-    public function typeratings($id, Request $request)
-    {
-        $user = $this->userRepo->findWithoutFail($id);
-        if (empty($user)) {
-            return $this->return_typeratings_view($user);
-        }
-
-        if ($request->isMethod('get')) {
-            return $this->return_typeratings_view($user);
-        }
-
-        // associate user with type rating
-        if ($request->isMethod('post')) {
-            $typerating = $this->typeratingRepo->find($request->input('typerating_id'));
-            $this->userSvc->addUserToTypeRating($user, $typerating);
-        } // dissassociate user from the type rating
-        elseif ($request->isMethod('delete')) {
-            $typerating = $this->typeratingRepo->find($request->input('typerating_id'));
-            $this->userSvc->removeUserFromTypeRating($user, $typerating);
-        }
-
-        $user->save();
-
-        return $this->return_typeratings_view($user);
-    }
 }

app/Http/Controllers/Api/AcarsController.php

@@ -148,10 +148,10 @@ class AcarsController extends Controller
         $pirep = Pirep::find($id);
         $this->checkCancelled($pirep);
 
-        /*Log::debug(
+        Log::debug(
             'Posting ACARS update (user: '.Auth::user()->ident.', pirep id :'.$id.'): ',
             $request->post()
-        );*/
+        );
 
         $count = 0;
         $positions = $request->post('positions');
@@ -223,7 +223,7 @@ class AcarsController extends Controller
         $pirep = Pirep::find($id);
         $this->checkCancelled($pirep);
 
-        // Log::debug('Posting ACARS log, PIREP: '.$id, $request->post());
+        Log::debug('Posting ACARS log, PIREP: '.$id, $request->post());
 
         $count = 0;
         $logs = $request->post('logs');

app/Http/Controllers/Api/PirepController.php

@@ -25,7 +25,6 @@ use App\Models\Pirep;
 use App\Models\PirepComment;
 use App\Models\PirepFare;
 use App\Models\PirepFieldValue;
-use App\Models\User;
 use App\Repositories\JournalRepository;
 use App\Repositories\PirepRepository;
 use App\Services\Finance\PirepFinanceService;
@@ -236,12 +235,8 @@ class PirepController extends Controller
         Log::info('PIREP Update, user '.Auth::id());
         Log::info($request->getContent());
 
-        /** @var User $user */
         $user = Auth::user();
-
-        /** @var Pirep $pirep */
         $pirep = Pirep::find($pirep_id);
-
         $this->checkCancelled($pirep);
 
         $attrs = $this->parsePirep($request);
@@ -283,7 +278,6 @@ class PirepController extends Controller
     {
         Log::info('PIREP file, user '.Auth::id(), $request->post());
 
-        /** @var User $user */
         $user = Auth::user();
 
         // Check if the status is cancelled...
@@ -338,7 +332,7 @@ class PirepController extends Controller
      */
     public function cancel($pirep_id, Request $request)
     {
-        Log::info('PIREP '.$pirep_id.' Cancel, user '.Auth::id(), $request->post());
+        Log::info('PIREP Cancel, user '.Auth::id(), $request->post());
 
         $pirep = Pirep::find($pirep_id);
         $this->pirepSvc->cancel($pirep);

app/Http/Controllers/Auth/RegisterController.php

@@ -62,7 +62,7 @@ class RegisterController extends Controller
     {
         $airports = $this->airportRepo->selectBoxList(false, setting('pilots.home_hubs_only'));
         $airlines = $this->airlineRepo->selectBoxList();
-        $userFields = UserField::where(['show_on_registration' => true, 'active' => true])->get();
+        $userFields = UserField::where(['show_on_registration' => true])->get();
 
         return view('auth.register', [
             'airports'   => $airports,
@@ -138,7 +138,7 @@ class RegisterController extends Controller
 
         Log::info('User registered: ', $user->toArray());
 
-        $userFields = UserField::where(['show_on_registration' => true, 'active' => true])->get();
+        $userFields = UserField::all();
         foreach ($userFields as $field) {
             $field_name = 'field_'.$field->slug;
             UserFieldValue::updateOrCreate([

app/Http/Controllers/Frontend/AirportController.php

@@ -35,23 +35,22 @@ class AirportController extends Controller
     public function show($id, Request $request)
     {
         $id = strtoupper($id);
-        $with_flights = ['airline', 'arr_airport', 'dpt_airport'];
 
-        $airport = $this->airportRepo->with('files')->where('id', $id)->first();
+        $airport = $this->airportRepo->where('id', $id)->first();
         if (!$airport) {
             Flash::error('Airport not found!');
             return redirect(route('frontend.dashboard.index'));
         }
 
         $inbound_flights = $this->flightRepo
-            ->with($with_flights)
+            ->with(['dpt_airport', 'arr_airport', 'airline'])
             ->findWhere([
                 'arr_airport_id' => $id,
                 'active'         => 1,
             ])->all();
 
         $outbound_flights = $this->flightRepo
-            ->with($with_flights)
+            ->with(['dpt_airport', 'arr_airport', 'airline'])
             ->findWhere([
                 'dpt_airport_id' => $id,
                 'active'         => 1,

app/Http/Controllers/Frontend/DashboardController.php

@@ -28,15 +28,14 @@ class DashboardController extends Controller
      */
     public function index()
     {
+        //dd(config('backup'));
         $last_pirep = null;
-        $with_pirep = ['aircraft', 'arr_airport', 'comments', 'dpt_airport'];
 
         /** @var \App\Models\User $user */
         $user = Auth::user();
-        $user->loadMissing('journal');
 
         try {
-            $last_pirep = $this->pirepRepo->with($with_pirep)->find($user->last_pirep_id);
+            $last_pirep = $this->pirepRepo->find($user->last_pirep_id);
         } catch (\Exception $e) {
         }
 

app/Http/Controllers/Frontend/FlightController.php

@@ -88,7 +88,6 @@ class FlightController extends Controller
 
         /** @var \App\Models\User $user */
         $user = Auth::user();
-        $user->loadMissing('current_airport');
 
         if (setting('pilots.restrict_to_company')) {
             $where['airline_id'] = $user->airline_id;
@@ -128,11 +127,9 @@ class FlightController extends Controller
 
         $flights = $this->flightRepo->searchCriteria($request)
             ->with([
-                'airline',
-                'alt_airport',
-                'arr_airport',
                 'dpt_airport',
-                'subfleets.airline',
+                'arr_airport',
+                'airline',
                 'simbrief' => function ($query) use ($user) {
                     $query->where('user_id', $user->id);
                 }, ])
@@ -218,19 +215,7 @@ class FlightController extends Controller
      */
     public function show($id)
     {
-        $user_id = Auth::id();
+        $flight = $this->flightRepo->find($id);
-        $with_flight = [
-            'airline',
-            'alt_airport',
-            'arr_airport',
-            'dpt_airport',
-            'subfleets.airline',
-            'simbrief' => function ($query) use ($user_id) {
-                $query->where('user_id', $user_id);
-            },
-        ];
-
-        $flight = $this->flightRepo->with($with_flight)->find($id);
         if (empty($flight)) {
             Flash::error('Flight not found!');
             return redirect(route('frontend.dashboard.index'));
@@ -239,7 +224,7 @@ class FlightController extends Controller
         $map_features = $this->geoSvc->flightGeoJson($flight);
 
         // See if the user has a bid for this flight
-        $bid = Bid::where(['user_id' => $user_id, 'flight_id' => $flight->id])->first();
+        $bid = Bid::where(['user_id' => Auth::id(), 'flight_id' => $flight->id])->first();
 
         return view('flights.show', [
             'flight'       => $flight,

app/Http/Controllers/Frontend/HomeController.php

@@ -16,7 +16,7 @@ class HomeController extends Controller
     public function index()
     {
         try {
-            $users = User::with('home_airport')->where('state', '!=', UserState::DELETED)->orderBy('created_at', 'desc')->take(4)->get();
+            $users = User::where('state', '!=', UserState::DELETED)->orderBy('created_at', 'desc')->take(4)->get();
         } catch (\PDOException $e) {
             Log::emergency($e);
             return view('system/errors/database_error', [

app/Http/Controllers/Frontend/PirepController.php

@@ -91,12 +91,8 @@ class PirepController extends Controller
      */
     public function aircraftList($add_blank = false)
     {
-        $user = Auth::user();
-        $user_loc = filled($user->curr_airport_id) ? $user->curr_airport_id : $user->home_airport_id;
-        $location_check = setting('pireps.only_aircraft_at_dpt_airport', false);
-
         $aircraft = [];
-        $subfleets = $this->userSvc->getAllowableSubfleets($user);
+        $subfleets = $this->userSvc->getAllowableSubfleets(Auth::user());
 
         if ($add_blank) {
             $aircraft[''] = '';
@@ -104,9 +100,7 @@ class PirepController extends Controller
 
         foreach ($subfleets as $subfleet) {
             $tmp = [];
-            foreach ($subfleet->aircraft->when($location_check, function ($query) use ($user_loc) {
+            foreach ($subfleet->aircraft as $ac) {
-                return $query->where('airport_id', $user_loc);
-            }) as $ac) {
                 $tmp[$ac->id] = $ac['name'].' - '.$ac['registration'];
             }
 
@@ -188,7 +182,7 @@ class PirepController extends Controller
 
         $where = [['user_id', $user->id]];
         $where[] = ['state', '<>', PirepState::CANCELLED];
-        $with = ['aircraft', 'airline', 'arr_airport', 'comments', 'dpt_airport'];
+        $with = ['airline', 'aircraft', 'dpt_airport', 'arr_airport', 'fares', 'comments'];
 
         $this->pirepRepo->with($with)
             ->pushCriteria(new WhereCriteria($request, $where));
@@ -207,20 +201,7 @@ class PirepController extends Controller
      */
     public function show($id)
     {
-        $with = [
+        $pirep = $this->pirepRepo->with(['simbrief'])->find($id);
-            'acars_logs',
-            'aircraft.airline',
-            'airline.journal',
-            'arr_airport',
-            'comments',
-            'dpt_airport',
-            'fares.fare',
-            'transactions',
-            'simbrief',
-            'user.rank',
-        ];
-
-        $pirep = $this->pirepRepo->with($with)->find($id);
         if (empty($pirep)) {
             Flash::error('Pirep not found');
             return redirect(route('frontend.pirep.index'));

app/Http/Controllers/Frontend/ProfileController.php

@@ -80,19 +80,22 @@ class ProfileController extends Controller
     public function show($id)
     {
         /** @var \App\Models\User $user */
-        $with = ['airline', 'awards', 'current_airport', 'fields.field', 'home_airport', 'last_pirep', 'rank', 'typeratings'];
+        $user = User::with(['awards', 'fields', 'fields.field'])
-        $user = User::with($with)->where('id', $id)->first();
+            ->where('id', $id)
+            ->first();
 
         if (empty($user)) {
             Flash::error('User not found!');
             return redirect(route('frontend.dashboard.index'));
         }
 
+        $airports = $this->airportRepo->all();
         $userFields = $this->userRepo->getUserFields($user, true);
 
         return view('profile.index', [
             'user'       => $user,
             'userFields' => $userFields,
+            'airports'   => $airports,
             'acars'      => $this->acarsEnabled(),
         ]);
     }
@@ -109,7 +112,9 @@ class ProfileController extends Controller
     public function edit(Request $request)
     {
         /** @var \App\Models\User $user */
-        $user = User::with('fields.field')->where('id', Auth::id())->first();
+        $user = User::with(['fields', 'fields.field'])
+            ->where('id', Auth::user()->id)
+            ->first();
 
         if (empty($user)) {
             Flash::error('User not found!');

app/Http/Controllers/Frontend/SimBriefController.php

@@ -62,7 +62,7 @@ class SimBriefController
         $aircraft_id = $request->input('aircraft_id');
 
         /** @var Flight $flight */
-        $flight = $this->flightRepo->with(['airline', 'arr_airport', 'dpt_airport', 'fares', 'subfleets'])->find($flight_id);
+        $flight = $this->flightRepo->with(['fares', 'subfleets'])->find($flight_id);
 
         if (!$flight) {
             flash()->error('Unknown flight');
@@ -80,39 +80,46 @@ class SimBriefController
 
         // No aircraft selected, show selection form
         if (!$aircraft_id) {
-
+            // If no subfleets defined for flight get them from user
-            // Get user's allowed subfleets and intersect it with flight subfleets
+            if ($flight->subfleets->count() > 0) {
-            // so we will have a proper list which the user is allowed to fly
+                $subfleets = $flight->subfleets;
-            $user_subfleets = $this->userSvc->getAllowableSubfleets($user)->pluck('id')->toArray();
+            } else {
-            $flight_subfleets = $flight->subfleets->pluck('id')->toArray();
+                $subfleets = $this->userSvc->getAllowableSubfleets($user);
-
-            $subfleet_ids = filled($flight_subfleets) ? array_intersect($user_subfleets, $flight_subfleets) : $user_subfleets;
-
-            // Prepare variables for single aircraft query
-            $where = [];
-            $where['state'] = AircraftState::PARKED;
-            $where['status'] = AircraftStatus::ACTIVE;
-
-            if (setting('pireps.only_aircraft_at_dpt_airport')) {
-                $where['airport_id'] = $flight->dpt_airport_id;
             }
 
-            $withCount = ['simbriefs' => function ($query) {
+            // Build an array of subfleet id's from the subfleets collection
-                $query->whereNull('pirep_id');
+            $sf_ids = $subfleets->map(function ($subfleets) {
-            }];
+                return collect($subfleets->toArray())
+                  ->only(['id'])
+                  ->all();
+            });
 
-            // Build proper aircraft collection considering all possible settings
+            // Now we can build a proper aircrafts collection
-            // Flight subfleets, user subfleet restrictions, pirep restrictions, simbrief blocking etc
+            // Contents will be either members of flight->subfleets
-            $aircraft = Aircraft::withCount($withCount)->where($where)
+            // or members of user's allowable subfleets
-                ->when(setting('simbrief.block_aircraft'), function ($query) {
+            $aircrafts = Aircraft::whereIn('subfleet_id', $sf_ids)
-                    return $query->having('simbriefs_count', 0);
+                                ->where('state', AircraftState::PARKED)
-                })->whereIn('subfleet_id', $subfleet_ids)
+                                ->where('status', AircraftStatus::ACTIVE)
-                ->orderby('icao')->orderby('registration')
+                                ->orderby('icao')
-                ->get();
+                                ->orderby('registration')
+                                ->get();
+
+            if (setting('pireps.only_aircraft_at_dpt_airport')) {
+                $aircrafts = $aircrafts->where('airport_id', $flight->dpt_airport_id);
+            }
+
+            if (setting('simbrief.block_aircraft')) {
+                // Build a list of aircraft_id's being used for active sb packs
+                $sb_aircraft = SimBrief::whereNotNull('flight_id')->pluck('aircraft_id');
+
+                // Filter aircraft list to non used/blocked ones
+                $aircrafts = $aircrafts->whereNotIn('id', $sb_aircraft);
+            }
 
             return view('flights.simbrief_aircraft', [
                 'flight'    => $flight,
-                'aircrafts' => $aircraft,
+                'aircrafts' => $aircrafts,
+                'subfleets' => $subfleets,
             ]);
         }
 
@@ -129,7 +136,7 @@ class SimBriefController
         // SimBrief profile does not exists and everything else is ok
         // Select aircraft which will be used for calculations and details
         /** @var Aircraft $aircraft */
-        $aircraft = Aircraft::with(['airline'])->where('id', $aircraft_id)->first();
+        $aircraft = Aircraft::where('id', $aircraft_id)->first();
 
         // Figure out the proper fares to use for this flight/aircraft
         $all_fares = $this->fareSvc->getFareWithOverrides($aircraft->subfleet->fares, $flight->fares);
@@ -256,7 +263,7 @@ class SimBriefController
         $user = Auth::user();
 
         /** @var SimBrief $simbrief */
-        $simbrief = SimBrief::with(['flight.airline', 'pirep.airline'])->find($id);
+        $simbrief = SimBrief::with(['flight'])->find($id);
         if (!$simbrief) {
             flash()->error('SimBrief briefing not found');
             return redirect(route('frontend.flights.index'));

app/Http/Controllers/Frontend/UserController.php

@@ -30,9 +30,6 @@ class UserController extends Controller
      */
     public function index(Request $request)
     {
-        $with = ['airline', 'current_airport', 'fields.field', 'home_airport', 'rank'];
-        $with_count = ['awards'];
-
         $where = [];
 
         if (setting('pilots.hide_inactive')) {
@@ -46,8 +43,7 @@ class UserController extends Controller
         }
 
         $users = $this->userRepo
-            ->withCount($with_count)
+            ->with(['airline', 'current_airport'])
-            ->with($with)
             ->orderBy('pilot_id', 'asc')
             ->paginate();
 

app/Http/Requests/CreateTypeRatingRequest.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use App\Contracts\FormRequest;
-use App\Models\Typerating;
-
-class CreateTypeRatingRequest extends FormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules(): array
-    {
-        return Typerating::$rules;
-    }
-}

app/Http/Requests/UpdateTypeRatingRequest.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use App\Contracts\FormRequest;
-use App\Models\Typerating;
-
-class UpdateTypeRatingRequest extends FormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules(): array
-    {
-        return Typerating::$rules;
-    }
-}

app/Listeners/AwardHandler.php

@@ -60,7 +60,7 @@ class AwardHandler extends Listener
      */
     public function checkForAwards($user)
     {
-        $awards = Award::where('active', 1)->get();
+        $awards = Award::all();
         foreach ($awards as $award) {
             $klass = $award->getReference($award, $user);
             if ($klass) {

app/Listeners/ExpenseListener.php

@@ -4,8 +4,6 @@ namespace App\Listeners;
 
 use App\Contracts\Listener;
 use App\Events\Expenses;
-use App\Models\Enums\ExpenseType;
-use App\Models\Expense;
 
 class ExpenseListener extends Listener
 {
@@ -25,7 +23,7 @@ class ExpenseListener extends Listener
         // The transaction group is how it will show as a line item
         /*$expenses[] = new Expense([
             'type' => ExpenseType::FLIGHT,
-            'amount' => 150,  # $150
+            'amount' => 15000,  # $150
             'transaction_group' => '',
             'charge_to_user' => true|false
         ]);*/

app/Listeners/FareListener.php

@@ -1,39 +0,0 @@
-<?php
-
-namespace App\Listeners;
-
-use App\Contracts\Listener;
-use App\Events\Fares;
-use App\Models\Enums\FareType;
-use App\Models\Fare;
-
-class FareListener extends Listener
-{
-    /**
-     * Return a list of additional fares/income items
-     *
-     * @param Fares $event
-     *
-     * @return mixed
-     */
-    public function handle(Fares $event)
-    {
-        $fares = [];
-
-        // This is an example of a fare to return
-        // You have the pirep on $event->pirep and any associated data
-        // Cost may be skipped at all if not needed
-        // Notes will be used as transaction group and it is how it will show as a line item
-        /*
-          $fares[] = new Fare([
-            'name'  => 'Duty Free Sales',
-            'type'  => FareType::PASSENGER,
-            'price' => 985,
-            'cost'  => 126,
-            'notes' => 'InFlight Sales',
-          ]);
-        */
-
-        return $fares;
-    }
-}

app/Models/Aircraft.php

@@ -7,13 +7,11 @@ use App\Models\Enums\AircraftStatus;
 use App\Models\Traits\ExpensableTrait;
 use App\Models\Traits\FilesTrait;
 use Carbon\Carbon;
-use Znck\Eloquent\Traits\BelongsToThrough;
 
 /**
  * @property int      id
  * @property mixed    subfleet_id
  * @property string   airport_id   The apt where the aircraft is
- * @property string   hub_id       The apt where the aircraft is based
  * @property string   ident
  * @property string   name
  * @property string   icao
@@ -23,7 +21,6 @@ use Znck\Eloquent\Traits\BelongsToThrough;
  * @property float    zfw
  * @property string   hex_code
  * @property Airport  airport
- * @property Airport  hub
  * @property Subfleet subfleet
  * @property int      status
  * @property int      state
@@ -34,14 +31,12 @@ class Aircraft extends Model
 {
     use ExpensableTrait;
     use FilesTrait;
-    use BelongsToThrough;
 
     public $table = 'aircraft';
 
     protected $fillable = [
         'subfleet_id',
         'airport_id',
-        'hub_id',
         'iata',
         'icao',
         'name',
@@ -105,46 +100,14 @@ class Aircraft extends Model
         $this->attributes['icao'] = strtoupper($icao);
     }
 
-    /**
-     * Return the landing time in carbon format if provided
-     *
-     * @return Carbon|null
-     */
-    public function getLandingTimeAttribute()
-    {
-        if (array_key_exists('landing_time', $this->attributes) && filled($this->attributes['landing_time'])) {
-            return new Carbon($this->attributes['landing_time']);
-        }
-    }
-
     /**
      * foreign keys
      */
-    public function airline()
-    {
-        return $this->belongsToThrough(Airline::class, Subfleet::class);
-    }
-
     public function airport()
     {
         return $this->belongsTo(Airport::class, 'airport_id');
     }
 
-    public function hub()
-    {
-        return $this->hasOne(Airport::class, 'id', 'hub_id');
-    }
-
-    public function pireps()
-    {
-        return $this->hasMany(Pirep::class, 'aircraft_id');
-    }
-
-    public function simbriefs()
-    {
-        return $this->hasMany(SimBrief::class, 'aircraft_id');
-    }
-
     public function subfleet()
     {
         return $this->belongsTo(Subfleet::class, 'subfleet_id');

app/Models/Airline.php

@@ -103,11 +103,6 @@ class Airline extends Model
         return $this->hasMany(Subfleet::class, 'airline_id');
     }
 
-    public function aircraft()
-    {
-        return $this->hasManyThrough(Aircraft::class, Subfleet::class);
-    }
-
     public function flights()
     {
         return $this->belongsTo(Flight::class, 'airline_id');

app/Models/Award.php

@@ -21,7 +21,6 @@ class Award extends Model
         'image_url',
         'ref_model',
         'ref_model_params',
-        'active',
     ];
 
     public static $rules = [
@@ -30,7 +29,6 @@ class Award extends Model
         'image_url'        => 'nullable',
         'ref_model'        => 'required',
         'ref_model_params' => 'nullable',
-        'active'           => 'nullable',
     ];
 
     /**

app/Models/Enums/AircraftStatus.php

@@ -7,7 +7,6 @@ use App\Contracts\Enum;
 class AircraftStatus extends Enum
 {
     public const ACTIVE = 'A';
-    public const MAINTENANCE = 'M';
     public const STORED = 'S';
     public const RETIRED = 'R';
     public const SCRAPPED = 'C';
@@ -15,7 +14,6 @@ class AircraftStatus extends Enum
 
     public static $labels = [
         self::ACTIVE      => 'aircraft.status.active',
-        self::MAINTENANCE => 'aircraft.status.maintenance',
         self::STORED      => 'aircraft.status.stored',
         self::RETIRED     => 'aircraft.status.retired',
         self::SCRAPPED    => 'aircraft.status.scrapped',

app/Models/Flight.php

@@ -136,19 +136,19 @@ class Flight extends Model
     }
 
     /**
-     * Get the flight ident, e.,g JBU1900/C.nn/L.yy
+     * Get the flight ident, e.,g JBU1900
      */
     public function getIdentAttribute(): string
     {
-        $flight_id = optional($this->airline)->code;
+        $flight_id = $this->airline->code;
         $flight_id .= $this->flight_number;
 
         if (filled($this->route_code)) {
-            $flight_id .= '/C.'.$this->route_code;
+            $flight_id .= '-'.$this->route_code;
         }
 
         if (filled($this->route_leg)) {
-            $flight_id .= '/L.'.$this->route_leg;
+            $flight_id .= '-'.$this->route_leg;
         }
 
         return $flight_id;

app/Models/Pirep.php

@@ -215,19 +215,21 @@ class Pirep extends Model
     }
 
     /**
-     * Get the flight ident, e.,g JBU1900/C.nn/L.yy
+     * Get the flight ident, e.,g JBU1900
+     *
+     * @return string
      */
     public function getIdentAttribute(): string
     {
-        $flight_id = optional($this->airline)->code;
+        //$flight_id = $this->airline->code;
-        $flight_id .= $this->flight_number;
+        $flight_id = $this->flight_number;
 
         if (filled($this->route_code)) {
-            $flight_id .= '/C.'.$this->route_code;
+            $flight_id .= '/C'.$this->route_code;
         }
 
         if (filled($this->route_leg)) {
-            $flight_id .= '/L.'.$this->route_leg;
+            $flight_id .= '/L'.$this->route_leg;
         }
 
         return $flight_id;

app/Models/Subfleet.php

@@ -107,9 +107,4 @@ class Subfleet extends Model
         return $this->belongsToMany(Rank::class, 'subfleet_rank')
             ->withPivot('acars_pay', 'manual_pay');
     }
-
-    public function typeratings()
-    {
-        return $this->belongsToMany(Typerating::class, 'typerating_subfleet', 'subfleet_id', 'typerating_id');
-    }
 }

app/Models/Typerating.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Contracts\Model;
-
-class Typerating extends Model
-{
-    public $table = 'typeratings';
-
-    protected $fillable = [
-        'name',
-        'type',
-        'description',
-        'image_url',
-        'active',
-    ];
-
-    // Validation
-    public static $rules = [
-        'name'        => 'required',
-        'type'        => 'required',
-        'description' => 'nullable',
-        'image_url'   => 'nullable',
-    ];
-
-    // Relationships
-    public function subfleets()
-    {
-        return $this->belongsToMany(Subfleet::class, 'typerating_subfleet', 'typerating_id', 'subfleet_id');
-    }
-
-    public function users()
-    {
-        return $this->belongsToMany(User::class, 'typerating_user', 'typerating_id', 'user_id');
-    }
-}

app/Models/User.php

@@ -7,7 +7,6 @@ use App\Models\Traits\JournalTrait;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Laratrust\Traits\LaratrustUserTrait;
-use Staudenmeir\EloquentHasManyDeep\HasRelationships;
 
 /**
  * @property int              id
@@ -43,7 +42,6 @@ use Staudenmeir\EloquentHasManyDeep\HasRelationships;
  * @property UserFieldValue[] fields
  * @property Role[]           roles
  * @property Subfleet[]       subfleets
- * @property TypeRating[]     typeratings
  *
  * @mixin \Illuminate\Database\Eloquent\Builder
  * @mixin \Illuminate\Notifications\Notifiable
@@ -54,7 +52,6 @@ class User extends Authenticatable
     use JournalTrait;
     use LaratrustUserTrait;
     use Notifiable;
-    use HasRelationships;
 
     public $table = 'users';
 
@@ -129,7 +126,7 @@ class User extends Authenticatable
     {
         $length = setting('pilots.id_length');
 
-        return optional($this->airline)->icao.str_pad($this->pilot_id, $length, '0', STR_PAD_LEFT);
+        return $this->airline->icao.str_pad($this->pilot_id, $length, '0', STR_PAD_LEFT);
     }
 
     /**
@@ -194,7 +191,8 @@ class User extends Authenticatable
     {
         $default = config('gravatar.default');
 
-        $uri = config('gravatar.url').md5(strtolower(trim($this->email))).'?d='.urlencode($default);
+        $uri = config('gravatar.url')
+            .md5(strtolower(trim($this->email))).'?d='.urlencode($default);
 
         if ($size !== null) {
             $uri .= '&s='.$size;
@@ -267,14 +265,4 @@ class User extends Authenticatable
     {
         return $this->belongsTo(Rank::class, 'rank_id');
     }
-
-    public function typeratings()
-    {
-        return $this->belongsToMany(Typerating::class, 'typerating_user', 'user_id', 'typerating_id');
-    }
-
-    public function rated_subfleets()
-    {
-        return $this->hasManyDeep(Subfleet::class, ['typerating_user', Typerating::class, 'typerating_subfleet']);
-    }
 }

app/Models/UserFieldValue.php

@@ -22,14 +22,6 @@ class UserFieldValue extends Model
 
     public static $rules = [];
 
-    /**
-     * Return related field's name along with field values
-     */
-    public function getNameAttribute(): string
-    {
-        return optional($this->field)->name;
-    }
-
     /**
      * Foreign Keys
      */

app/Notifications/Messages/PirepPrefiled.php

@@ -48,9 +48,9 @@ class PirepPrefiled extends Notification implements ShouldQueue
             return null;
         }
 
-        $title = 'Flight '.$pirep->ident.' Prefiled';
+        $title = 'Flight '.$pirep->airline->code.$pirep->ident.' Prefiled';
         $fields = [
-            'Flight'                => $pirep->ident,
+            'Flight'                => $pirep->airline->code.$pirep->ident,
             'Departure Airport'     => $pirep->dpt_airport_id,
             'Arrival Airport'       => $pirep->arr_airport_id,
             'Equipment'             => $pirep->aircraft->ident,

app/Notifications/Messages/PirepStatusChanged.php

@@ -77,10 +77,10 @@ class PirepStatusChanged extends Notification implements ShouldQueue
             return null;
         }
 
-        $title = 'Flight '.$pirep->ident.' '.self::$verbs[$pirep->status];
+        $title = 'Flight '.$pirep->airline->code.$pirep->ident.' '.self::$verbs[$pirep->status];
 
         $fields = [
-            'Flight'            => $pirep->ident,
+            'Flight'            => $pirep->airline->code.$pirep->ident,
             'Departure Airport' => $pirep->dpt_airport_id,
             'Arrival Airport'   => $pirep->arr_airport_id,
             'Equipment'         => $pirep->aircraft->ident,

app/Notifications/Messages/PirepSubmitted.php

@@ -55,9 +55,9 @@ class PirepSubmitted extends Notification implements ShouldQueue
             return null;
         }
 
-        $title = 'Flight '.$pirep->ident.' Filed';
+        $title = 'Flight '.$pirep->airline->code.$pirep->ident.' Filed';
         $fields = [
-            'Flight'                => $pirep->ident,
+            'Flight'                => $pirep->airline->code.$pirep->ident,
             'Departure Airport'     => $pirep->dpt_airport_id,
             'Arrival Airport'       => $pirep->arr_airport_id,
             'Equipment'             => $pirep->aircraft->ident,

app/Providers/EventServiceProvider.php

@@ -3,13 +3,11 @@
 namespace App\Providers;
 
 use App\Events\Expenses;
-use App\Events\Fares;
 use App\Events\PirepFiled;
 use App\Events\UserStatsChanged;
 use App\Listeners\AwardHandler;
 use App\Listeners\BidEventHandler;
 use App\Listeners\ExpenseListener;
-use App\Listeners\FareListener;
 use App\Listeners\FinanceEventHandler;
 use App\Listeners\PirepEventsHandler;
 use App\Listeners\UserStateListener;
@@ -27,10 +25,6 @@ class EventServiceProvider extends ServiceProvider
             ExpenseListener::class,
         ],
 
-        Fares::class => [
-            FareListener::class,
-        ],
-
         PirepFiled::class => [
             UserStateListener::class,
         ],

app/Providers/RouteServiceProvider.php

@@ -376,21 +376,6 @@ class RouteServiceProvider extends ServiceProvider
             ], 'settings', 'SettingsController@update')
                 ->name('settings.update')->middleware('ability:admin,settings');
 
-            // Type Ratings
-            Route::resource('typeratings', 'TypeRatingController')->middleware('ability:admin,typeratings');
-            Route::match([
-                'get',
-                'post',
-                'put',
-                'delete',
-            ], 'typeratings/{id}/subfleets', 'TypeRatingController@subfleets')->middleware('ability:admin,typeratings');
-            Route::match([
-                'get',
-                'post',
-                'put',
-                'delete',
-            ], 'typeratings/{id}/users', 'TypeRatingController@users')->middleware('ability:admin,typeratings');
-
             // maintenance
             Route::match(['get'], 'maintenance', 'MaintenanceController@index')
                 ->name('maintenance.index')->middleware('ability:admin,maintenance');
@@ -441,13 +426,6 @@ class RouteServiceProvider extends ServiceProvider
                 'delete',
             ], 'subfleets/{id}/ranks', 'SubfleetController@ranks')->middleware('ability:admin,fleet');
 
-            Route::match([
-                'get',
-                'post',
-                'put',
-                'delete',
-            ], 'subfleets/{id}/typeratings', 'SubfleetController@typeratings')->middleware('ability:admin,fleet');
-
             Route::resource('subfleets', 'SubfleetController')->middleware('ability:admin,fleet');
 
             /**
@@ -461,13 +439,6 @@ class RouteServiceProvider extends ServiceProvider
 
             Route::resource('users', 'UserController')->middleware('ability:admin,users');
 
-            Route::match([
-                'get',
-                'post',
-                'put',
-                'delete',
-            ], 'users/{id}/typeratings', 'UserController@typeratings')->middleware('ability:admin,users');
-
             // defaults
             Route::get('', ['uses' => 'DashboardController@index'])
                 ->middleware('update_pending', 'ability:admin,admin-access');

app/Repositories/FlightRepository.php

@@ -18,10 +18,8 @@ class FlightRepository extends Repository implements CacheableInterface
 
     protected $fieldSearchable = [
         'arr_airport_id',
-        'callsign',
         'distance',
         'dpt_airport_id',
-        'flight_time',
         'flight_type',
         'flight_number' => 'like',
         'route_code'    => 'like',
@@ -96,10 +94,6 @@ class FlightRepository extends Repository implements CacheableInterface
             $where['flight_number'] = $request->input('flight_number');
         }
 
-        if ($request->filled('callsign')) {
-            $where['callsign'] = $request->input('callsign');
-        }
-
         if ($request->filled('flight_type') && $request->input('flight_type') !== '0') {
             $where['flight_type'] = $request->input('flight_type');
         }
@@ -134,16 +128,6 @@ class FlightRepository extends Repository implements CacheableInterface
             $where[] = ['distance', '<=', $request->input('dlt')];
         }
 
-        // Time, greater than
-        if ($request->filled('tgt')) {
-            $where[] = ['flight_time', '>=', $request->input('tgt')];
-        }
-
-        // Time, less than
-        if ($request->filled('tlt')) {
-            $where[] = ['flight_time', '<=', $request->input('tlt')];
-        }
-
         // Do a special query for finding the child subfleets
         if ($request->filled('subfleet_id')) {
             $relations['subfleets'] = [

app/Repositories/TypeRatingRepository.php

@@ -1,43 +0,0 @@
-<?php
-
-namespace App\Repositories;
-
-use App\Contracts\Repository;
-use App\Models\Typerating;
-use Prettus\Repository\Contracts\CacheableInterface;
-use Prettus\Repository\Traits\CacheableRepository;
-
-class TypeRatingRepository extends Repository implements CacheableInterface
-{
-    use CacheableRepository;
-
-    protected $fieldSearchable = [
-        'name' => 'like',
-        'type' => 'like',
-    ];
-
-    public function model()
-    {
-        return Typerating::class;
-    }
-
-    public function selectBoxList($add_blank = false, $only_active = true): array
-    {
-        $retval = [];
-        $where = [
-            'active' => $only_active,
-        ];
-
-        $items = $this->findWhere($where);
-
-        if ($add_blank) {
-            $retval[''] = '';
-        }
-
-        foreach ($items as $i) {
-            $retval[$i->id] = $i->name;
-        }
-
-        return $retval;
-    }
-}

app/Services/Finance/PirepFinanceService.php

@@ -4,7 +4,6 @@ namespace App\Services\Finance;
 
 use App\Contracts\Service;
 use App\Events\Expenses as ExpensesEvent;
-use App\Events\Fares as FaresEvent;
 use App\Models\Aircraft;
 use App\Models\Airport;
 use App\Models\Enums\ExpenseType;
@@ -14,7 +13,6 @@ use App\Models\Enums\PirepSource;
 use App\Models\Enums\PirepState;
 use App\Models\Enums\PirepStatus;
 use App\Models\Expense;
-use App\Models\Fare;
 use App\Models\Pirep;
 use App\Models\Subfleet;
 use App\Repositories\ExpenseRepository;
@@ -83,7 +81,6 @@ class PirepFinanceService extends Service
         // Now start and pay from scratch
         $this->payFuelCosts($pirep);
         $this->payFaresForPirep($pirep);
-        $this->payFaresEventsForPirep($pirep);
         $this->payExpensesForSubfleet($pirep);
         $this->payExpensesForPirep($pirep);
         $this->payAirportExpensesForPirep($pirep);
@@ -148,53 +145,6 @@ class PirepFinanceService extends Service
         }
     }
 
-    /**
-     * Collect all of the fares from listeners and apply those to the journal
-     *
-     * @param Pirep $pirep
-     *
-     * @throws \UnexpectedValueException
-     * @throws \InvalidArgumentException
-     * @throws \Prettus\Validator\Exceptions\ValidatorException
-     */
-    public function payFaresEventsForPirep(Pirep $pirep): void
-    {
-        // Throw an event and collect any fares returned from it
-        $gathered_fares = event(new FaresEvent($pirep));
-        if (!\is_array($gathered_fares)) {
-            return;
-        }
-
-        foreach ($gathered_fares as $event_fare) {
-            if (!\is_array($event_fare)) {
-                continue;
-            }
-
-            foreach ($event_fare as $fare) {
-                // Make sure it's of type Fare Model
-                if (!($fare instanceof Fare)) {
-                    Log::info('Finance: Event Fare is not an instance of Fare Model, aborting process!');
-                    continue;
-                }
-
-                $credit = Money::createFromAmount($fare->price);
-                $debit = Money::createFromAmount($fare->cost);
-                Log::info('Finance: Income From Listener N='.$fare->name.', C='.$credit.', D='.$debit);
-
-                $this->journalRepo->post(
-                    $pirep->airline->journal,
-                    $credit,
-                    $debit,
-                    $pirep,
-                    $fare->name,
-                    null,
-                    $fare->notes,
-                    'additional-sales'
-                );
-            }
-        }
-    }
-
     /**
      * Calculate the fuel used by the PIREP and add those costs in
      *

app/Services/FleetService.php

@@ -6,7 +6,6 @@ use App\Contracts\Service;
 use App\Models\Flight;
 use App\Models\Rank;
 use App\Models\Subfleet;
-use App\Models\Typerating;
 
 class FleetService extends Service
 {
@@ -34,36 +33,7 @@ class FleetService extends Service
     public function removeSubfleetFromRank(Subfleet $subfleet, Rank $rank)
     {
         $subfleet->ranks()->detach($rank->id);
-        $subfleet->save();
-        $subfleet->refresh();
 
-        return $subfleet;
-    }
-
-    /**
-     * Add the subfleet to a type rating
-     *
-     * @param Subfleet   $subfleet
-     * @param Typerating $typerating
-     */
-    public function addSubfleetToTypeRating(Subfleet $subfleet, Typerating $typerating)
-    {
-        $subfleet->typeratings()->syncWithoutDetaching([$typerating->id]);
-        $subfleet->save();
-        $subfleet->refresh();
-
-        return $subfleet;
-    }
-
-    /**
-     * Remove the subfleet from a type rating
-     *
-     * @param Subfleet   $subfleet
-     * @param Typerating $typerating
-     */
-    public function removeSubfleetFromTypeRating(Subfleet $subfleet, Typerating $typerating)
-    {
-        $subfleet->typeratings()->detach($typerating->id);
         $subfleet->save();
         $subfleet->refresh();
 

app/Services/ImportExport/AircraftImporter.php

@@ -25,7 +25,6 @@ class AircraftImporter extends ImportExport
         'subfleet'     => 'required',
         'iata'         => 'nullable',
         'icao'         => 'nullable',
-        'hub_id'       => 'nullable',
         'airport_id'   => 'nullable',
         'name'         => 'required',
         'registration' => 'required',
@@ -54,7 +53,7 @@ class AircraftImporter extends ImportExport
     }
 
     /**
-     * Import an aircraft, parse out the different rows
+     * Import a flight, parse out the different rows
      *
      * @param array $row
      * @param int   $index

app/Services/ImportExport/FlightImporter.php

@@ -222,10 +222,7 @@ class FlightImporter extends ImportExport
 
             $subfleet = Subfleet::firstOrCreate(
                 ['type' => $subfleet_type],
-                [
+                ['name' => $subfleet_type]
-                    'name'       => $subfleet_type,
-                    'airline_id' => $flight->airline_id,
-                ]
             );
 
             $subfleet->save();
@@ -253,9 +250,8 @@ class FlightImporter extends ImportExport
                 $fare_attributes = [];
             }
 
-            $fare = Fare::firstOrCreate(['code' => $fare_code], ['name' => $fare_code]);
+            $fare = Fare::updateOrCreate(['code' => $fare_code], ['name' => $fare_code]);
             $this->fareSvc->setForFlight($flight, $fare, $fare_attributes);
-            $fare->save();
         }
     }
 

app/Services/ImportExport/SubfleetImporter.php

@@ -20,7 +20,7 @@ class SubfleetImporter extends ImportExport
      */
     public static $columns = [
         'airline'                    => 'required',
-        'hub_id'                     => 'nullable',
+        'hub_id'                     => 'required',
         'type'                       => 'required',
         'simbrief_type'              => 'nullable',
         'name'                       => 'required',
@@ -84,9 +84,8 @@ class SubfleetImporter extends ImportExport
                 $fare_attributes = [];
             }
 
-            $fare = Fare::firstOrCreate(['code' => $fare_code], ['name' => $fare_code]);
+            $fare = Fare::updateOrCreate(['code' => $fare_code], ['name' => $fare_code]);
             $this->fareSvc->setForSubfleet($subfleet, $fare, $fare_attributes);
-            $fare->save();
         }
     }
 }

app/Services/PirepService.php

@@ -460,6 +460,19 @@ class PirepService extends Service
      */
     public function submit(Pirep $pirep)
     {
+        // Figure out what default state should be. Look at the default
+        // behavior from the rank that the pilot is assigned to
+        $default_state = PirepState::PENDING;
+        if ($pirep->source === PirepSource::ACARS) {
+            if ($pirep->user->rank->auto_approve_acars) {
+                $default_state = PirepState::ACCEPTED;
+            }
+        } else {
+            if ($pirep->user->rank->auto_approve_manual) {
+                $default_state = PirepState::ACCEPTED;
+            }
+        }
+
         // Check if there is a simbrief_id, change it to be set to the PIREP
         // at the end of the flight when it's been submitted finally.
         // Prefile, Save (as draft) and File already have this but the Submit button
@@ -476,24 +489,6 @@ class PirepService extends Service
         Log::info('New PIREP filed', [$pirep]);
         event(new PirepFiled($pirep));
 
-        $pirep->refresh();
-
-        // Figure out what pirep state should be, if nothing provided yet.
-        if ($pirep->state != PirepState::ACCEPTED && $pirep->state != PirepState::REJECTED) {
-            $default_state = PirepState::PENDING;
-        } else {
-            $default_state = $pirep->state;
-        }
-
-        // If pirep is still at PENDING state decide the default behavior by looking at rank settings
-        if ($pirep->state === PirepState::PENDING) {
-            if ($pirep->source === PirepSource::ACARS && $pirep->user->rank->auto_approve_acars) {
-                $default_state = PirepState::ACCEPTED;
-            } elseif ($pirep->source === PirepSource::MANUAL && $pirep->user->rank->auto_approve_manual) {
-                $default_state = PirepState::ACCEPTED;
-            }
-        }
-
         // only update the pilot last state if they are accepted
         if ($default_state === PirepState::ACCEPTED) {
             $pirep = $this->accept($pirep);

app/Services/UserService.php

@@ -15,7 +15,6 @@ use App\Models\Enums\UserState;
 use App\Models\Pirep;
 use App\Models\Rank;
 use App\Models\Role;
-use App\Models\Typerating;
 use App\Models\User;
 use App\Models\UserFieldValue;
 use App\Repositories\AircraftRepository;
@@ -344,7 +343,7 @@ class UserService extends Service
 
     /**
      * Return the subfleets this user is allowed access to,
-     * based on their current Rank and/or by Type Rating
+     * based on their current rank
      *
      * @param $user
      *
@@ -352,31 +351,14 @@ class UserService extends Service
      */
     public function getAllowableSubfleets($user)
     {
-        $restrict_rank = setting('pireps.restrict_aircraft_to_rank', true);
+        if ($user === null || setting('pireps.restrict_aircraft_to_rank') === false) {
-        $restrict_type = setting('pireps.restrict_aircraft_to_typerating', false);
+            /** @var Collection $subfleets */
-        $restricted_to = [];
+            $subfleets = $this->subfleetRepo->with('aircraft')->all();
-
-        if ($user) {
-            $rank_sf_array = $restrict_rank ? $user->rank->subfleets()->pluck('id')->toArray() : [];
-            $type_sf_array = $restrict_type ? $user->rated_subfleets->pluck('id')->toArray() : [];
-
-            if ($restrict_rank && !$restrict_type) {
-                $restricted_to = $rank_sf_array;
-            } elseif (!$restrict_rank && $restrict_type) {
-                $restricted_to = $type_sf_array;
-            } elseif ($restrict_rank && $restrict_type) {
-                $restricted_to = array_intersect($rank_sf_array, $type_sf_array);
-            }
         } else {
-            $restrict_rank = false;
+            /** @var Collection $subfleets */
-            $restrict_type = false;
+            $subfleets = $user->rank->subfleets()->with('aircraft')->get();
         }
 
-        // @var Collection $subfleets
-        $subfleets = $this->subfleetRepo->when(($restrict_rank || $restrict_type), function ($query) use ($restricted_to) {
-            return $query->whereIn('id', $restricted_to);
-        })->with('aircraft')->get();
-
         // Map the subfleets with the proper fare information
         return $subfleets->transform(function ($sf, $key) {
             $sf->fares = $this->fareSvc->getForSubfleet($sf);
@@ -416,7 +398,9 @@ class UserService extends Service
             return $user;
         }
 
-        Log::info('User '.$user->ident.' state changing from '.UserState::label($old_state).' to '.UserState::label($user->state));
+        Log::info('User '.$user->ident.' state changing from '
+            .UserState::label($old_state).' to '
+            .UserState::label($user->state));
 
         event(new UserStateChanged($user, $old_state));
 
@@ -577,39 +561,11 @@ class UserService extends Service
         // Recalc the rank
         $this->calculatePilotRank($user);
 
-        Log::info('User '.$user->ident.' updated; pirep count='.$pirep_count.', rank='.$user->rank->name.', flight_time='.$user->flight_time.' minutes');
+        Log::info('User '.$user->ident.' updated; pirep count='.$pirep_count
+            .', rank='.$user->rank->name
+            .', flight_time='.$user->flight_time.' minutes');
 
         $user->save();
         return $user;
     }
-
-    /**
-     * Attach a type rating to the user
-     *
-     * @param User       $user
-     * @param Typerating $typerating
-     */
-    public function addUserToTypeRating(User $user, Typerating $typerating)
-    {
-        $user->typeratings()->syncWithoutDetaching([$typerating->id]);
-        $user->save();
-        $user->refresh();
-
-        return $user;
-    }
-
-    /**
-     * Detach a type rating from the user
-     *
-     * @param User       $user
-     * @param Typerating $typerating
-     */
-    public function removeUserFromTypeRating(User $user, Typerating $typerating)
-    {
-        $user->typeratings()->detach($typerating->id);
-        $user->save();
-        $user->refresh();
-
-        return $user;
-    }
 }

app/Support/Database.php

@@ -134,11 +134,6 @@ class Database
                     ->where($id_col, $row[$id_col])
                     ->update($row);
             } else {
-                // Remove ID column if it exists and its empty, let the DB set it
-                /*if (array_key_exists($id_col, $row) && empty($row[$id_col])) {
-                    unset($row[$id_col]);
-                }*/
-
                 DB::table($table)->insert($row);
             }
         } catch (QueryException $e) {

app/Widgets/LatestNews.php

@@ -23,7 +23,7 @@ class LatestNews extends Widget
 
         return view('widgets.latest_news', [
             'config' => $this->config,
-            'news'   => $newsRepo->with('user')->recent($this->config['count']),
+            'news'   => $newsRepo->recent($this->config['count']),
         ]);
     }
 }

app/Widgets/LatestPilots.php

@@ -21,7 +21,7 @@ class LatestPilots extends Widget
     public function run()
     {
         $userRepo = app(UserRepository::class);
-        $userRepo = $userRepo->with('home_airport')->where('state', '!=', UserState::DELETED)->orderby('created_at', 'desc')->take($this->config['count'])->get();
+        $userRepo = $userRepo->where('state', '!=', UserState::DELETED)->orderby('created_at', 'desc')->take($this->config['count'])->get();
 
         return view('widgets.latest_pilots', [
             'config' => $this->config,

bootstrap/application.php

@@ -39,7 +39,7 @@ class application extends Illuminate\Foundation\Application
         $bootstrappers = array_replace(
             $bootstrappers,
             array_fill_keys(
-                array_keys($bootstrappers, $find, true),
+                array_keys($bootstrappers, $find),
                 $replace
             )
         );

composer.json

@@ -20,12 +20,7 @@
         "symfony/polyfill-mbstring": "*",
         "symfony/polyfill-php74": "*",
         "symfony/polyfill-php80": "*",
-        "symfony/polyfill-php81": "*",
+        "composer/composer": "~1.0",
-        "symfony/event-dispatcher-contracts": "^2",
-        "symfony/property-info": "^5.4",
-        "symfony/string": "^5.4",
-        "psr/container": "1.1.1",
-        "composer/composer": "~2.0",
         "composer/installers": "~1.0",
         "laravel/framework": "~8.0",
         "anhskohbo/no-captcha": "^3.0",
@@ -47,7 +42,7 @@
         "laravelcollective/html": "~6.2.0",
         "jeremykendall/php-domain-parser": "~5.7.2",
         "league/commonmark": "~1.6",
-        "league/csv": "9.7.*",
+        "league/csv": "9.2.*",
         "league/geotools": "0.8.*",
         "league/iso3166": "^3.0.0",
         "markrogoyski/math-php": "^1.10",
@@ -74,16 +69,14 @@
         "wildbit/swiftmailer-postmark": "^3.3",
         "queueworker/sansdaemon": "^1.2",
         "jpkleemans/attribute-events": "^1.1",
-        "akaunting/laravel-money": "^1.2",
+        "akaunting/laravel-money": "^1.2"
-        "staudenmeir/belongs-to-through": "^2.5",
-        "staudenmeir/eloquent-has-many-deep": "1.14.3"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.5",
-        "barryvdh/laravel-ide-helper": "^2.10",
+        "barryvdh/laravel-ide-helper": "^2.9",
         "bpocallaghan/generators": "~7.0",
         "filp/whoops": "~2.0",
-        "friendsofphp/php-cs-fixer": "^3.3",
+        "friendsofphp/php-cs-fixer": "^2.16",
         "mockery/mockery": "^1.4.0",
         "nunomaduro/collision": "^5.3.0",
         "phpunit/phpunit": "~9.0",
@@ -111,10 +104,7 @@
          "installer-paths": {
              "modules/{$name}/": ["type:phpvms-module"]
          },
-         "module-dir": "modules",
+         "module-dir": "modules"
-         "symfony": {
-            "require": "^5.4"
-         }
     },
     "scripts": {
         "pre-package-uninstall": [

docker-compose.local.yml

@@ -24,8 +24,9 @@ services:
       - ./tests:/var/www/tests
       - ./composer.json:/var/www/composer.json
       - ./composer-lock.json:/var/www/composer-lock.json
-      #- ./env.php:/var/www/env.php
+      - ./env.php:/var/www/env.php
       - ./resources/docker/php/www.conf:/usr/local/etc/php-fpm.d/www.conf
+      - ./vendor:/var/www/vendor
     depends_on:
       - mysql
       - redis

docker-compose.yml

@@ -2,7 +2,7 @@
 version: '3'
 services:
   app:
-    image: nabeelio/phpvms
+    image: phpvms:latest
     environment:
       DB_HOST: mysql
       REDIS_HOST: redis

package.json

@@ -47,7 +47,7 @@
     "ssri": "^8.0.1",
     "tar": ">=4.4.2",
     "webpack": "^5.45.1",
-    "webpack-cli": "^3.3.12",
+    "webpack-cli": "^4.0.0",
     "x-editable": "1.5.1"
   },
   "devDependencies": {

resources/lang/de/aircraft.php

@@ -2,11 +2,10 @@
 
 return [
     'status' => [
-        'active'      => 'Aktiv',
+        'active'   => 'Aktiv',
-        'maintenance' => 'Instandhaltung',
+        'stored'   => 'Gelagert',
-        'stored'      => 'Gelagert',
+        'retired'  => 'Außer Dienst',
-        'retired'     => 'Außer Dienst',
+        'scrapped' => 'Verschrottet',
-        'scrapped'    => 'Verschrottet',
+        'written'  => 'Abgeschrieben',
-        'written'     => 'Abgeschrieben',
     ],
 ];

resources/lang/de/widgets.php

@@ -19,7 +19,6 @@ return [
         'nometar'    => 'METAR/TAF Daten konnten nicht abgerufen werden',
         'conditions' => 'Bedingungen',
         'visibility' => 'Sichtbarkeit',
-        'temp'       => 'Temperatur',
         'humidity'   => 'Feuchtigkeit',
         'dewpoint'   => 'Taupunkt',
         'barometer'  => 'Barometer',

resources/lang/en/aircraft.php

@@ -2,11 +2,10 @@
 
 return [
     'status' => [
-        'active'      => 'Active',
+        'active'   => 'Active',
-        'maintenance' => 'Maintenance',
+        'stored'   => 'Stored',
-        'stored'      => 'Stored',
+        'retired'  => 'Retired',
-        'retired'     => 'Retired',
+        'scrapped' => 'Scrapped',
-        'scrapped'    => 'Scrapped',
+        'written'  => 'Written Off',
-        'written'     => 'Written Off',
     ],
 ];

resources/lang/en/widgets.php

@@ -19,7 +19,6 @@ return [
         'nometar'    => 'METAR/TAF data could not be retrieved',
         'conditions' => 'Conditions',
         'visibility' => 'visibility',
-        'temp'       => 'Temperature',
         'humidity'   => 'humidity',
         'dewpoint'   => 'dew point',
         'barometer'  => 'Barometer',

resources/lang/es/aircraft.php

@@ -2,11 +2,10 @@
 
 return [
     'status' => [
-        'active'      => 'Activo',
+        'active'   => 'Activo',
-        'maintenance' => 'Mantenimiento',
+        'stored'   => 'Guardado',
-        'stored'      => 'Guardado',
+        'retired'  => 'Retirado',
-        'retired'     => 'Retirado',
+        'scrapped' => 'Desguazado',
-        'scrapped'    => 'Desguazado',
+        'written'  => 'Dado de baja',
-        'written'     => 'Dado de baja',
     ],
 ];

resources/lang/es/common.php

@@ -19,14 +19,14 @@ return [
     'download'       => 'Descarga|Descargas',
     'from'           => 'de',
     'to'             => 'a',
-    'state'          => 'Situación',
+    'state'          => 'Estado',
-    'status'         => 'Estado',
+    'status'         => 'Estatus',
     'departure'      => 'Salida',
     'arrival'        => 'Llegada',
     'aircraft'       => 'Aeronave',
     'airline'        => 'Aerolínea',
     'subfleet'       => 'Subfleet',
-    'distance'       => 'Distancia',
+    'distance'       => 'Distancía',
     'fuel'           => 'Combustible',
     'metar'          => 'METAR',
     'hour'           => 'Hora|Horas',

resources/lang/es/expenses.php

@@ -2,7 +2,7 @@
 
 return [
     'type' => [
-        'flight'  => 'Por vuelo',
+        'flight'  => 'Vuelo',
         'daily'   => 'Diario',
         'monthly' => 'Mensual',
     ],

resources/lang/es/user.php

@@ -6,7 +6,7 @@ return [
         'pending'   => 'Pendiente',
         'active'    => 'Activo',
         'rejected'  => 'Rechazado',
-        'on_leave'  => 'En excedencia',
+        'on_leave'  => 'De vacaciones',
         'suspended' => 'Suspendido',
         'deleted'   => 'Borrar',
     ],

resources/lang/es/widgets.php

@@ -11,17 +11,16 @@ return [
         'altitude'    => 'Altitud',
         'heading'     => 'Rumbo',
         'distance'    => 'Distancía',
-        'noflights'   => 'No hay vuelos',
+        'noflights'   => 'No hay vuelos.',
         'gs'          => 'GS',
     ],
 
     'weather' => [
         'nometar'    => 'No se han encontrado datos METAR/TAF',
         'conditions' => 'Condiciones',
-        'visibility' => 'Visibilidad',
+        'visibility' => 'visibilidad',
-        'temp'       => 'Temperatura',
+        'humidity'   => 'humedad',
-        'humidity'   => 'Humedad',
+        'dewpoint'   => 'punto de rocío',
-        'dewpoint'   => 'Punto de rocío',
         'barometer'  => 'Barometro',
         'clouds'     => 'Nubes',
         'wind'       => 'Viento',

resources/lang/it/aircraft.php

@@ -2,11 +2,10 @@
 
 return [
     'status' => [
-        'active'      => 'Attivo',
+        'active'   => 'Attivo',
-        'maintenance' => 'Manutenzione',
+        'stored'   => 'Immagazzinato',
-        'stored'      => 'Immagazzinato',
+        'retired'  => 'Ritirato',
-        'retired'     => 'Ritirato',
+        'scrapped' => 'Rottamato',
-        'scrapped'    => 'Rottamato',
+        'written'  => 'Stornato',
-        'written'     => 'Stornato',
     ],
 ];

resources/lang/it/widgets.php

@@ -18,10 +18,9 @@ return [
     'weather' => [
         'nometar'    => 'I dati METAR/TAF non possono essere recuperati',
         'conditions' => 'Condizioni',
-        'visibility' => 'Visibilità',
+        'visibility' => 'visibilità',
-        'temp'       => 'Temperatura',
+        'humidity'   => 'umidità',
-        'humidity'   => 'Umidità',
+        'dewpoint'   => 'punto di rugiada',
-        'dewpoint'   => 'Punto di rugiada',
         'barometer'  => 'Barometro',
         'clouds'     => 'Nuvole',
         'wind'       => 'Vento',

resources/lang/pt-br/aircraft.php

@@ -2,11 +2,10 @@
 
 return [
     'status' => [
-        'active'      => 'Ativa',
+        'active'   => 'Ativa',
-        'maintenance' => 'Manutencao',
+        'stored'   => 'Armazenada',
-        'stored'      => 'Armazenada',
+        'retired'  => 'Retirada',
-        'retired'     => 'Retirada',
+        'scrapped' => 'Sucateada',
-        'scrapped'    => 'Sucateada',
+        'written'  => 'Eliminada',
-        'written'     => 'Eliminada',
     ],
 ];

resources/lang/pt-br/widgets.php

@@ -19,7 +19,6 @@ return [
         'nometar'    => 'METAR/TAF não podem ser identificados.',
         'conditions' => 'Condições',
         'visibility' => 'Visibilidade',
-        'temp'       => 'Temperatura',
         'humidity'   => 'Umidade',
         'dewpoint'   => 'Ponto de orvalho',
         'barometer'  => 'Barômetro',

resources/views/admin/aircraft/fields.blade.php

@@ -5,7 +5,7 @@
          Subfleet and Status
       </h6>
       <div class="form-container-body row">
-        <div class="form-group col-sm-3">
+        <div class="form-group col-sm-4">
           {{ Form::label('subfleet_id', 'Subfleet:') }}
           {{ Form::select('subfleet_id', $subfleets, $subfleet_id ?? null, [
               'class' => 'form-control select2',
@@ -15,21 +15,17 @@
           <p class="text-danger">{{ $errors->first('subfleet_id') }}</p>
         </div>
 
-        <div class="form-group col-sm-3">
+        <div class="form-group col-sm-4">
           {{ Form::label('status', 'Status:') }}
           {{ Form::select('status', $statuses, null, ['class' => 'form-control select2', 'placeholder' => 'Select Status']) }}
           <p class="text-danger">{{ $errors->first('subfleet_id') }}</p>
         </div>
 
-        <div class="form-group col-sm-3">
+        <div class="form-group col-sm-4">
-          {{ Form::label('hub_id', 'Hub:') }}
-          {{ Form::select('hub_id', $hubs, null, ['class' => 'form-control select2']) }}
-          <p class="text-danger">{{ $errors->first('hub_id') }}</p>
-        </div>
-
-        <div class="form-group col-sm-3">
           {{ Form::label('airport_id', 'Location:') }}
-          {{ Form::select('airport_id', $airports, null, ['class' => 'form-control select2']) }}
+          {{ Form::select('airport_id', $airports, null, [
+              'class' => 'form-control select2'
+              ]) }}
           <p class="text-danger">{{ $errors->first('airport_id') }}</p>
         </div>
       </div>

resources/views/admin/aircraft/table.blade.php

@@ -3,7 +3,6 @@
   <th>Name</th>
   <th style="text-align: center;">Registration</th>
   <th>Subfleet</th>
-  <th style="text-align: center;">Hub</th>
   <th style="text-align: center;">Location</th>
   <th style="text-align: center;">Hours</th>
   <th style="text-align: center;">Active</th>
@@ -23,7 +22,6 @@
           -
         @endif
       </td>
-      <td style="text-align: center;">{{ $ac->hub_id }}</td>
       <td style="text-align: center;">{{ $ac->airport_id }}</td>
       <td style="text-align: center;">
         @minutestotime($ac->flight_time)

resources/views/admin/awards/edit.blade.php

@@ -1,5 +1,5 @@
 @extends('admin.app')
-@section('title', "Edit \"$award->name\" Award")
+@section('title', "Edit \"$award->title\" Award")
 @section('content')
   <div class="card border-blue-bottom">
     <div class="content">

resources/views/admin/awards/fields.blade.php

@@ -18,13 +18,17 @@
     <p class="text-danger">{{ $errors->first('name') }}</p>
   </div>
 
+
   <div class="form-group col-sm-6">
     {!! Form::label('image', 'Image:') !!}
     <div class="callout callout-info">
       <i class="icon fa fa-info">&nbsp;&nbsp;</i>
       This is the image of the award. Be creative!
     </div>
-    {!! Form::text('image_url', null, ['class' => 'form-control', 'placeholder' => 'Enter the url of the image location']) !!}
+    {!! Form::text('image_url', null, [
+            'class' => 'form-control',
+            'placeholder' => 'Enter the url of the image location'
+        ]) !!}
     <p class="text-danger">{{ $errors->first('image_url') }}</p>
   </div>
 </div>
@@ -43,31 +47,29 @@
   <div class="form-group col-sm-6">
     <div>
       {{ Form::label('ref_model', 'Award Class:') }}
-      {{ Form::select('ref_model', $award_classes, null, ['class' => 'form-control select2', 'id' => 'award_class_select']) }}
+      {{ Form::select('ref_model', $award_classes, null , [
+          'class' => 'form-control select2',
+          'id' => 'award_class_select',
+      ]) }}
       <p class="text-danger">{{ $errors->first('ref_model') }}</p>
     </div>
+
     <div>
       {{ Form::label('ref_model_params', 'Award Class parameters') }}
       {{ Form::text('ref_model_params', null, ['class' => 'form-control']) }}
       <p class="text-danger">{{ $errors->first('ref_model_params') }}</p>
-      <p id="ref_model_param_description"></p>
+
+      <p id="ref_model_param_description">
+
+      </p>
     </div>
+
   </div>
 </div>
 
 <div class="row">
-  {{-- Active/Deactive Checkbox --}}
+  <!-- Submit Field -->
-  <div class="form-group col-sm-6 text-left">
+  <div class="form-group col-sm-12">
-    <div class="checkbox">
-      <label class="checkbox-inline">
-        {{ Form::label('active', 'Active: ') }}
-        {{ Form::hidden('active', false) }}
-        {{ Form::checkbox('active') }}
-      </label>
-    </div>
-  </div>
-  {{-- Form Actions --}}
-  <div class="form-group col-sm-6">
     <div class="pull-right">
       {!! Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) !!}
       <a href="{!! route('admin.awards.index') !!}" class="btn btn-warn">Cancel</a>

resources/views/admin/awards/table.blade.php

@@ -1,47 +1,40 @@
 <table class="table table-hover table-responsive" id="awards-table">
   <thead>
-    <th>Name</th>
+  <th>Name</th>
-    <th>Description</th>
+  <th>Description</th>
-    <th>Image</th>
+  <th>Image</th>
-    <th class="text-center">Active</th>
+  <th class="text-right">Action</th>
-    <th class="text-right">Action</th>
   </thead>
   <tbody>
-    @foreach($awards->sortby('name', SORT_NATURAL) as $award)
+  @foreach($awards as $award)
-      <tr>
+    <tr>
-        <td>
+      <td>
-          <a href="{{ route('admin.awards.edit', [$award->id]) }}">{{ $award->name }}</a>
+        <a href="{{ route('admin.awards.edit', [$award->id]) }}">
-        </td>
+          {{ $award->name }}</a>
-        <td>
+      </td>
-          {{ $award->description }}
+      <td>{{ $award->description }}</td>
-        </td>
+      <td>
-        <td>
+
-          @if($award->image_url)
+        @if($award->image_url)
-            <img src="{{ $award->image_url }}" name="{{ $award->name }}" alt="No Image Available" style="height: 100px"/>
+          <img src="{{ $award->image_url }}" name="{{ $award->name }}" alt="No Image Available" style="height: 100px"/>
-          @else
+        @else
-            -
+          -
-          @endif
+        @endif
-        </td>
+      </td>
-        <td class="text-center">
+      <td class="text-right">
-          @if($award->active)
+        {{ Form::open(['route' => ['admin.awards.destroy', $award->id], 'method' => 'delete']) }}
-            <i class="fas fa-check-circle fa-2x text-success"></i>
+        <a href="{{ route('admin.awards.edit', [$award->id]) }}" class='btn btn-sm btn-success btn-icon'>
-          @else 
+          <i class="fas fa-pencil-alt"></i></a>
-            <i class="fas fa-times-circle fa-2x text-danger"></i>
+
-          @endif
+        {{ Form::button('<i class="fa fa-times"></i>', [
-        </td>
+                'type' => 'submit',
-        <td class="text-right">
+                'class' => 'btn btn-sm btn-danger btn-icon',
-          {{ Form::open(['route' => ['admin.awards.destroy', $award->id], 'method' => 'delete']) }}
+                'onclick' => "return confirm('Are you sure you want to delete this award?')"
-          <a href="{{ route('admin.awards.edit', [$award->id]) }}" class='btn btn-sm btn-success btn-icon'>
+        ]) }}
-            <i class="fas fa-pencil-alt"></i>
+
-          </a>
+        {{ Form::close() }}
-          {{ Form::button('<i class="fa fa-times"></i>', [
+      </td>
-                  'type' => 'submit',
+    </tr>
-                  'class' => 'btn btn-sm btn-danger btn-icon',
+  @endforeach
-                  'onclick' => "return confirm('Are you sure you want to delete this award?')"
-          ]) }}
-          {{ Form::close() }}
-        </td>
-      </tr>
-    @endforeach
   </tbody>
-</table>
+</table>

resources/views/admin/flights/index.blade.php

@@ -2,15 +2,8 @@
 @section('title', 'Flights')
 
 @section('actions')
-  <li>
+  <li><a href="{{ route('admin.flights.export') }}"><i class="ti-plus"></i>Export to CSV</a></li>
-    <a href="{{ route('admin.flights.export') }}@if(request()->get('airline_id')){{ '?airline_id='.request()->get('airline_id') }}@endif">
+  <li><a href="{{ route('admin.flights.import') }}"><i class="ti-plus"></i>Import from CSV</a></li>
-      <i class="ti-plus"></i>
-      Export to CSV @if(request()->get('airline_id')) (Selected Airline) @endif
-    </a>
-  </li>
-  <li>
-    <a href="{{ route('admin.flights.import') }}"><i class="ti-plus"></i>Import from CSV</a>
-  </li>
   <li>
     <a href="{{ route('admin.flights.create') }}">
       <i class="ti-plus"></i>

resources/views/admin/flights/search.blade.php

@@ -1,27 +1,25 @@
 <div class="content">
-  {{ Form::open(['route' => 'admin.flights.index', 'method' => 'GET', 'class'=>'form-group']) }}
+  <div class="row">
-    <div class="row">
+    <div class="col-sm-12">
-      <div class="form-group col-sm-2">
+      <div class="form-group">
-        {{ Form::label('airline_id', 'Airline:') }}
+        {{ Form::open(['route' => 'admin.flights.index', 'method' => 'GET', 'class'=>'form-inline pull-right']) }}
+        &nbsp;&nbsp;
+        {{ Form::label('airlines', 'Airline:') }}
         {{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }}
-      </div>
-      <div class="form-group input-group-sm col-sm-2">
         {{ Form::label('flight_number', 'Flight Number:') }}
         {{ Form::text('flight_number', null, ['class' => 'form-control']) }}
-      </div>
+        &nbsp;
-      <div class="form-group col-sm-3">
         {{ Form::label('dpt_airport_id', 'Departure:') }}
-        {{ Form::select('dpt_airport_id', $airports, null , ['class' => 'form-control select2']) }}
+        {{ Form::select('dpt_airport_id', $airports, null , ['class' => 'form-control']) }}
-      </div>
+        &nbsp;
-      <div class="form-group col-sm-3">
         {{ Form::label('arr_airport_id', 'Arrival:') }}
-        {{ Form::select('arr_airport_id', $airports, null , ['class' => 'form-control select2']) }}
+        {{ Form::select('arr_airport_id', $airports, null , ['class' => 'form-control']) }}
-      </div>
+        &nbsp;
-      <div class="form-group col-sm-2 text-center">
+        {{ Form::submit('find', ['class' => 'btn btn-primary']) }}
-        <br>
+        &nbsp;
-        {{ Form::submit('Find', ['class' => 'btn btn-primary']) }}
+        <a href="{{ route('admin.flights.index') }}">clear</a>
-        <a href="{{ route('admin.flights.index') }}" class="btn btn-secondary ml-2">Clear</a>
+        {{ Form::close() }}
       </div>
     </div>
-  {{ Form::close() }}
+  </div>
 </div>

resources/views/admin/menu.blade.php

@@ -62,10 +62,6 @@
       <li><a href="{{ url('/admin/ranks') }}"><i class="pe-7s-graph1"></i>ranks</a></li>
       @endability
 
-      @ability('admin', 'typeratings')
-      <li><a href="{{ url('/admin/typeratings') }}"><i class="pe-7s-plane"></i>type ratings</a></li>
-      @endability
-
       @ability('admin', 'awards')
       <li><a href="{!! url('/admin/awards') !!}"><i class="pe-7s-diamond"></i>awards</a></li>
       @endability

resources/views/admin/pireps/actions.blade.php

@@ -1,7 +1,7 @@
-<table class="table" style="border-style: hidden; margin-bottom: 0px;">
+<table class="">
-  <tr style="border-style: hidden;">
+  <tr>
-    @if ($pirep->state === PirepState::PENDING || $pirep->state === PirepState::REJECTED)
+    <td>
-      <td>
+      @if($pirep->state === PirepState::PENDING || $pirep->state === PirepState::REJECTED)
         {{ Form::open(['url' => route('admin.pirep.status', [$pirep->id]),
                         'method' => 'post',
                         'name' => 'accept_'.$pirep->id,
@@ -11,10 +11,11 @@
                         'class' => $on_edit_page ? 'pirep_change_status': 'pirep_submit_status']) }}
         {{ Form::button('Accept', ['type' => 'submit', 'class' => 'btn btn-success']) }}
         {{ Form::close() }}
-      </td>
+      @endif
-    @endif
+    </td>
-    @if ($pirep->state === PirepState::PENDING || $pirep->state === PirepState::ACCEPTED)
+    <td>&nbsp;</td>
-      <td>
+    <td>
+      @if($pirep->state === PirepState::PENDING || $pirep->state === PirepState::ACCEPTED)
         {{ Form::open(['url' => route('admin.pirep.status', [$pirep->id]),
                         'method' => 'post',
                         'name' => 'reject_'.$pirep->id,
@@ -24,8 +25,8 @@
                         'class' => $on_edit_page ? 'pirep_change_status': 'pirep_submit_status']) }}
         {{ Form::button('Reject', ['type' => 'submit', 'class' => 'btn btn-warning']) }}
         {{ Form::close() }}
-      </td>
+      @endif
-    @endif
+    </td>
     <td>
       {{ Form::open(['url' => route('admin.pireps.destroy', [$pirep->id]),
             'method' => 'delete',
@@ -39,18 +40,20 @@
     @if ($on_edit_page === false)
       <td>
         <form action="{{ route('admin.pireps.edit', [$pirep->id]) }}">
-          <button type="submit" class='btn btn-info'>
+          <button type="submit"
+                  class='btn btn-info'>
             <i class="fas fa-pencil-alt"></i>&nbsp;&nbsp;Edit
           </button>
         </form>
       </td>
     @endif
-    <td>
+        <td>
-      <form action="{{ route('frontend.pireps.show', [$pirep->id]) }}" target="_blank">
+        <form action="{{ route('frontend.pireps.show', [$pirep->id]) }}" target="_blank">
-        <button type="submit" class='btn btn-success'>
+          <button type="submit"
-          <i class="fas fa-eye"></i>&nbsp;&nbsp; View Pirep
+                  class='btn btn-success'>
-        </button>
+            <i class="fas fa-eye"></i>&nbsp;&nbsp; View Pirep
-      </form>
+          </button>
-    </td>
+        </form>
+      </td>
   </tr>
 </table>

resources/views/admin/pireps/pirep_card.blade.php

@@ -2,7 +2,7 @@
 	<div class="card-block" style="min-height: 0px">
 		<div class="row">
       <div class="col-sm-2 text-center">
-      <h5><a class="text-c" href="{{ route('admin.pireps.edit', [$pirep->id]) }}">{{ $pirep->ident }}</a></h5>
+      <h5><a class="text-c" href="{{ route('admin.pireps.edit', [$pirep->id]) }}">{{ $pirep->airline->code }}{{ $pirep->ident }}</a></h5>
         <div id="pirep_{{ $pirep->id }}_status_container">
 				@php 
 				$PirepStateClass = "badge badge-info" ; 
@@ -18,7 +18,7 @@
 					<div class="col-sm-6">
 						<div>
 							<span class="description">
-								<b>Pilot</b>&nbsp;{{ '('.$pirep->user_id.') '.optional($pirep->user)->name }}
+								<b>Pilot</b>&nbsp;{{ $pirep->user->name }}&nbsp;
 							</span>
 						</div>
             <div>
@@ -35,11 +35,11 @@
 						@if($pirep->aircraft)
 						<div>
 							<span class="description">
-								<b>Aircraft</b>&nbsp;{{ $pirep->aircraft->registration }} @if($pirep->aircraft->registration != $pirep->aircraft->name) '{{ $pirep->aircraft->name }}' @endif
+								<b>Aircraft</b>&nbsp;{{ $pirep->aircraft->registration }} ({{ $pirep->aircraft->name }})
 							</span>
 						</div>
 						@endif
-						@if(filled($pirep->level) && $pirep->level > 10)
+						@if(filled($pirep->level))
 						<div>
 							<span class="description">
 								<b>Flight Level</b>&nbsp;{{ $pirep->level }}

resources/views/admin/subfleets/edit.blade.php

@@ -16,12 +16,6 @@
     </div>
   </div>
 
-  <div class="card border-blue-bottom">
-    <div class="content">
-      @include('admin.subfleets.type_ratings')
-    </div>
-  </div>
-
   <div class="card border-blue-bottom">
     <div class="content">
       @include('admin.subfleets.fares')

resources/views/admin/subfleets/fields.blade.php

@@ -20,7 +20,7 @@
 
       <div class="form-group col-sm-3">
         {{ Form::label('hub_id', 'Main Hub:') }}
-        {{ Form::select('hub_id', $hubs, null , ['class' => 'form-control select2', 'placeholder' => '']) }}
+        {{ Form::select('hub_id', $hubs, null , ['class' => 'form-control select2']) }}
         <p class="text-danger">{{ $errors->first('hub_id') }}</p>
       </div>
 

resources/views/admin/subfleets/script.blade.php

@@ -114,12 +114,6 @@
         $.pjax.submit(event, '#subfleet_ranks_wrapper', {push: false});
       });
 
-      $(document).on('submit', 'form.modify_typerating', function (event) {
-        event.preventDefault();
-        console.log(event);
-        $.pjax.submit(event, '#subfleet_typeratings_wrapper', {push: false});
-      });
-
       $(document).on('submit', 'form.modify_expense', function (event) {
         event.preventDefault();
         console.log(event);

resources/views/admin/subfleets/table.blade.php

@@ -4,7 +4,6 @@
     <th>Name</th>
     <th>Airline</th>
     <th>Type</th>
-    <th>Hub</th>
     <th>Aircraft</th>
     <th></th>
     </thead>
@@ -18,7 +17,6 @@
         </td>
         <td>{{ optional($subfleet->airline)->name }}</td>
         <td>{{ $subfleet->type }}</td>
-        <td>{{ $subfleet->hub_id }}</td>
         <td>{{ $subfleet->aircraft->count() }}</td>
         <td class="text-right">
           {{ Form::open(['route' => ['admin.subfleets.destroy', $subfleet->id], 'method' => 'delete']) }}