Change model

Make sure proper fares are returned from the API #899

.editorconfig

@@ -1,6 +1,10 @@
 #
 root = true
 
+[*]
+end_of_line = lf
+insert_final_newline = true
+
 [*.js]
 indent_style = space
 indent_size = 2
@@ -23,4 +27,4 @@ indent_style = tab
 # Matches the exact files either package.json or .travis.yml
 [{package.json, .travis.yml}]
 indent_style = space
-indent_size = 2
+indent_size = 2

.travis.yml

@@ -6,7 +6,6 @@ language: php
 php:
   - '7.4'
   - '7.3'
-  - '7.2'
 
 #env:
 #  - DB=mysql

.travis/phpunit.travis.xml

@@ -21,9 +21,9 @@
             <directory suffix=".php">./app</directory>
         </whitelist>
     </filter>
-    <listeners>
+    <!--<listeners>
         <listener class="NunoMaduro\Collision\Adapters\Phpunit\Listener"/>
-    </listeners>
+    </listeners>-->
     <php>
         <ini name="error_reporting" value="E_ALL"/>
         <ini name="display_errors" value="On"/>

Makefile

@@ -43,7 +43,7 @@ build:
 # This is to build all the stylesheets, etc
 .PHONY: build-assets
 build-assets:
-	yarn run production
+	npm run production
 
 .PHONY: install
 install: build
@@ -74,9 +74,9 @@ reload-db:
 tests: test
 
 .PHONY: test
-test: phpcs
+test:
-	#php artisan database:create --reset
+	@#php artisan database:create --reset
-	vendor/bin/phpunit --debug --verbose
+	@vendor/bin/phpunit --verbose
 
 .PHONY: phpcs
 phpcs:

README.md

@@ -14,7 +14,7 @@ A full distribution, with all of the composer dependencies, is available at this
 
 ## Requirements
 
-- PHP 7.1+, extensions:
+- PHP 7.3+, extensions:
   - cURL
   - JSON
   - mbstring

app/Console/Commands/CreateDatabase.php

@@ -79,21 +79,29 @@ class CreateDatabase extends Command
      */
     protected function create_sqlite($dbkey)
     {
+        $dbPath = config($dbkey.'database');
+
+        // Skip if running in memory
+        if ($dbPath === ':memory:') {
+            return;
+        }
+
         $exec = 'sqlite3';
         if ($this->os->isWindowsLike()) {
             $exec = 'sqlite3.exe';
         }
 
         if ($this->option('reset') === true) {
-            $cmd = ['rm', '-rf', config($dbkey.'database')];
+            if (file_exists($dbPath)) {
-            $this->runCommand($cmd);
+                unlink(config($dbkey.'database'));
+            }
         }
 
-        if (!file_exists(config($dbkey.'database'))) {
+        if (!file_exists($dbPath)) {
             $cmd = [
                 $exec,
-                config($dbkey.'database'),
+                $dbPath,
-                '""',
+                '".exit"',
             ];
 
             $this->runCommand($cmd);

app/Console/Commands/ImportFromClassicCommand.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Modules\Importer\Console\Commands;
+namespace App\Console\Commands;
 
 use App\Contracts\Command;
+use App\Services\ImporterService;
 use Illuminate\Support\Facades\Log;
-use Modules\Importer\Services\ImporterService;
 
 class ImportFromClassicCommand extends Command
 {

app/Console/Commands/YamlExport.php

@@ -3,7 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Contracts\Command;
-use DB;
+use Illuminate\Support\Facades\DB;
 use Symfony\Component\Yaml\Yaml;
 
 /**
@@ -25,6 +25,20 @@ class YamlExport extends Command
             exit();
         }
 
+        // A "preset" for exporting the base set of data
+        if ($tables[0] === 'base') {
+            $tables = [
+                'airlines',
+                'aircraft',
+                'subfleets',
+                'subfleet_fare',
+                'subfleet_rank',
+                'bids',
+                'fares',
+                'flights',
+            ];
+        }
+
         $export_tables = [];
         foreach ($tables as $table) {
             $export_tables[$table] = [];

app/Contracts/Award.php

@@ -36,7 +36,10 @@ abstract class Award
      * You don't really need to mess with anything below here
      */
 
+    /** @var \App\Models\Award|null */
     protected $award;
+
+    /** @var \App\Models\User|null */
     protected $user;
 
     public function __construct(AwardModel $award = null, User $user = null)

app/Contracts/Command.php

@@ -3,6 +3,7 @@
 namespace App\Contracts;
 
 use Illuminate\Support\Facades\Log;
+use function is_array;
 use Symfony\Component\Process\Process;
 
 /**
@@ -82,9 +83,9 @@ abstract class Command extends \Illuminate\Console\Command
     }
 
     /**
-     * @param       $cmd
+     * @param array|string $cmd
-     * @param bool  $return
+     * @param bool         $return
-     * @param mixed $verbose
+     * @param mixed        $verbose
      *
      * @throws \Symfony\Component\Process\Exception\RuntimeException
      * @throws \Symfony\Component\Process\Exception\LogicException
@@ -93,16 +94,16 @@ abstract class Command extends \Illuminate\Console\Command
      */
     public function runCommand($cmd, $return = false, $verbose = true): string
     {
-        if (\is_array($cmd)) {
+        if (is_array($cmd)) {
             $cmd = implode(' ', $cmd);
         }
 
         if ($verbose) {
-            $this->info('Running "'.$cmd.'"');
+            $this->info('Running '.$cmd);
         }
 
         $val = '';
-        $process = new Process($cmd);
+        $process = Process::fromShellCommandline($cmd);
         $process->run(function ($type, $buffer) use ($return, &$val) {
             if ($return) {
                 $val .= $buffer;

app/Contracts/Event.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Contracts;
+
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class Event
+{
+    use Dispatchable;
+    use SerializesModels;
+}

app/Contracts/ImportExport.php

@@ -3,9 +3,9 @@
 namespace App\Contracts;
 
 use App\Models\Airline;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\ValidationException;
-use Log;
-use Validator;
 
 /**
  * Common functionality used across all of the importers
@@ -51,9 +51,9 @@ class ImportExport
      *
      * @param $code
      *
-     * @return \Illuminate\Database\Eloquent\Model
+     * @return Airline
      */
-    public function getAirline($code)
+    public function getAirline($code): Airline
     {
         $airline = Airline::firstOrCreate([
             'icao' => $code,

app/Contracts/Listener.php

@@ -16,7 +16,7 @@ abstract class Listener
     public function subscribe(Dispatcher $events): void
     {
         foreach (static::$callbacks as $klass => $cb) {
-            $events->listen($klass, get_class($this).'@'.$cb);
+            $events->listen($klass, static::class.'@'.$cb);
         }
     }
 }

app/Contracts/Migration.php

@@ -2,9 +2,13 @@
 
 namespace App\Contracts;
 
+use App\Models\Module;
 use App\Support\Database;
-use DB;
+use Exception;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\ValidationException;
 
 /**
  * Class Migration
@@ -25,6 +29,29 @@ abstract class Migration extends \Illuminate\Database\Migrations\Migration
     {
     }
 
+    /**
+     * Add a module and enable it
+     *
+     * @param array $attrs
+     */
+    public function addModule(array $attrs)
+    {
+        $module = array_merge([
+            'enabled'    => true,
+            'created_at' => DB::raw('NOW()'),
+            'updated_at' => DB::raw('NOW()'),
+        ], $attrs);
+
+        try {
+            DB::table('modules')->insert($module);
+        } catch (Exception $e) {
+            // setting already exists, just ignore it
+            if ($e->getCode() === 23000) {
+                return;
+            }
+        }
+    }
+
     /**
      * Seed a YAML file into the database
      *
@@ -35,7 +62,7 @@ abstract class Migration extends \Illuminate\Database\Migrations\Migration
         try {
             $path = base_path($file);
             Database::seed_from_yaml_file($path, false);
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             Log::error('Unable to load '.$file.' file');
             Log::error($e);
         }
@@ -52,7 +79,7 @@ abstract class Migration extends \Illuminate\Database\Migrations\Migration
         foreach ($rows as $row) {
             try {
                 DB::table($table)->insert($row);
-            } catch (\Exception $e) {
+            } catch (Exception $e) {
                 // setting already exists, just ignore it
                 if ($e->getCode() === 23000) {
                     continue;
@@ -60,4 +87,22 @@ abstract class Migration extends \Illuminate\Database\Migrations\Migration
             }
         }
     }
+
+    /**
+     * Add an award from the migrations (for example, if you're adding an award module)
+     *
+     * @param array $award See \App\Models\Awardv
+     *
+     * @throws \Illuminate\Validation\ValidationException
+     */
+    public function addAward(array $award)
+    {
+        $validator = Validator::make($award, \App\Models\Award::$rules);
+        if ($validator->fails()) {
+            throw new ValidationException($validator);
+        }
+
+        $awardModel = new \App\Models\Award($award);
+        $awardModel->save();
+    }
 }

app/Contracts/Modules/ServiceProvider.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Contracts\Modules;
+
+/**
+ * Base class for module service providers
+ * Add-on module service providers must extend this class. Docs on Service Providers:
+ * https://laravel.com/docs/7.x/providers
+ *
+ * For a sample service provider, view the sample module one:
+ * https://github.com/nabeelio/phpvms-module/blob/master/Providers/SampleServiceProvider.php
+ */
+abstract class ServiceProvider extends \Illuminate\Support\ServiceProvider
+{
+    /**
+     * A boot method is required, even if it doesn't do anything.
+     * https://laravel.com/docs/7.x/providers#the-boot-method
+     *
+     * This is normally where you'd register the routes or other startup tasks for your module
+     */
+    public function boot(): void
+    {
+    }
+
+    /**
+     * This is required to register the links in either the public or admin toolbar
+     * For example, adding a frontend link:
+     *
+     * $this->moduleSvc->addFrontendLink('Sample', '/sample', '', $logged_in=true);
+     *
+     * Or an admin link:
+     *
+     * $this->moduleSvc->addAdminLink('Sample', '/admin/sample');
+     */
+    public function registerLinks(): void
+    {
+    }
+
+    /**
+     * Deferred providers:
+     * https://laravel.com/docs/7.x/providers#deferred-providers
+     *
+     * @return array
+     */
+    public function provides(): array
+    {
+        return [];
+    }
+}

app/Contracts/Notification.php

@@ -1,23 +1,23 @@
 <?php
 
-namespace App\Notifications;
+namespace App\Contracts;
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Notifications\Notification;
 use Illuminate\Support\Facades\Log;
 
-class BaseNotification extends Notification implements ShouldQueue
+class Notification extends \Illuminate\Notifications\Notification implements ShouldQueue
 {
     use Queueable;
 
     public $channels = [];
+    public $requires_opt_in = false;
 
     public function __construct()
     {
         // Look in the notifications.channels config and see where this particular
         // notification can go. Map it to $channels
-        $klass = get_class($this);
+        $klass = static::class;
         $notif_config = config('notifications.channels', []);
         if (!array_key_exists($klass, $notif_config)) {
             Log::error('Notification type '.$klass.' missing from notifications config, defaulting to mail');

app/Contracts/Resource.php

@@ -2,10 +2,12 @@
 
 namespace App\Contracts;
 
+use Illuminate\Http\Resources\Json\JsonResource;
+
 /**
  * Base class for a resource/response
  */
-class Resource extends \Illuminate\Http\Resources\Json\Resource
+class Resource extends JsonResource
 {
     /**
      * Iterate through the list of $fields and check if they're a "Unit"

app/Database/factories/AircraftFactory.php

@@ -1,24 +1,30 @@
 <?php
 
+use App\Models\Airport;
+use App\Models\Enums\AircraftState;
+use App\Models\Enums\AircraftStatus;
+use App\Models\Subfleet;
+use App\Support\ICAO;
 use Faker\Generator as Faker;
 
 $factory->define(App\Models\Aircraft::class, function (Faker $faker) {
     return [
         'id'          => null,
         'subfleet_id' => function () {
-            return factory(App\Models\Subfleet::class)->create()->id;
+            return factory(Subfleet::class)->create()->id;
         },
         'airport_id' => function () {
-            return factory(App\Models\Airport::class)->create()->id;
+            return factory(Airport::class)->create()->id;
         },
         'iata'         => $faker->unique()->text(5),
         'icao'         => $faker->unique()->text(5),
         'name'         => $faker->text(50),
         'registration' => $faker->unique()->text(10),
-        'hex_code'     => \App\Support\ICAO::createHexCode(),
+        'hex_code'     => ICAO::createHexCode(),
+        'mtow'         => $faker->randomFloat(2, 0, 50000),
         'zfw'          => $faker->randomFloat(2, 0, 50000),
-        'status'       => \App\Models\Enums\AircraftStatus::ACTIVE,
+        'status'       => AircraftStatus::ACTIVE,
-        'state'        => \App\Models\Enums\AircraftState::PARKED,
+        'state'        => AircraftState::PARKED,
         'created_at'   => $faker->dateTimeBetween('-1 week', 'now'),
         'updated_at'   => function (array $pirep) {
             return $pirep['created_at'];

app/Database/factories/AirlineFactory.php

@@ -9,7 +9,7 @@ use Hashids\Hashids;
 $factory->define(App\Models\Airline::class, function (Faker $faker) {
     return [
         'id'   => null,
-        'icao' => function (array $apt) use ($faker) {
+        'icao' => function (array $apt) {
             $hashids = new Hashids(microtime(), 5);
             $mt = str_replace('.', '', microtime(true));
 

app/Database/factories/FlightFactory.php

@@ -8,19 +8,19 @@ $factory->define(App\Models\Flight::class, function (Faker $faker) {
     return [
         'id'         => $faker->unique()->numberBetween(10, 10000000),
         'airline_id' => function () {
-            return factory(App\Models\Airline::class)->create()->id;
+            return factory(\App\Models\Airline::class)->create()->id;
         },
         'flight_number'  => $faker->unique()->numberBetween(10, 1000000),
         'route_code'     => $faker->randomElement(['', $faker->text(5)]),
         'route_leg'      => $faker->randomElement(['', $faker->numberBetween(0, 1000)]),
         'dpt_airport_id' => function () {
-            return factory(App\Models\Airport::class)->create()->id;
+            return factory(\App\Models\Airport::class)->create()->id;
         },
         'arr_airport_id' => function () {
-            return factory(App\Models\Airport::class)->create()->id;
+            return factory(\App\Models\Airport::class)->create()->id;
         },
         'alt_airport_id' => function () {
-            return factory(App\Models\Airport::class)->create()->id;
+            return factory(\App\Models\Airport::class)->create()->id;
         },
         'distance'             => $faker->numberBetween(1, 1000),
         'route'                => null,

app/Database/factories/JournalTransactionsFactory.php

@@ -6,7 +6,7 @@ $factory->define(App\Models\JournalTransactions::class, function (Faker $faker)
     return [
         'transaction_group' => \Ramsey\Uuid\Uuid::uuid4()->toString(),
         'journal_id'        => function () {
-            return factory(App\Models\Journal::class)->create()->id;
+            return factory(\App\Models\Journal::class)->create()->id;
         },
         'credit'    => $faker->numberBetween(100, 10000),
         'debit'     => $faker->numberBetween(100, 10000),

app/Database/factories/NewsFactory.php

@@ -6,7 +6,7 @@ $factory->define(App\Models\News::class, function (Faker $faker) {
     return [
         'id'      => null,
         'user_id' => function () {
-            return factory(App\Models\User::class)->create()->id;
+            return factory(\App\Models\User::class)->create()->id;
         },
         'subject' => $faker->text(),
         'body'    => $faker->sentence,

app/Database/factories/PirepFactory.php

@@ -10,8 +10,8 @@ use Faker\Generator as Faker;
  * Create a new PIREP
  */
 $factory->define(App\Models\Pirep::class, function (Faker $faker) {
-    $airline = factory(App\Models\Airline::class)->create();
+    $airline = factory(\App\Models\Airline::class)->create();
-    $flight = factory(App\Models\Flight::class)->create([
+    $flight = factory(\App\Models\Flight::class)->create([
         'airline_id' => $airline->id,
     ]);
 
@@ -21,10 +21,10 @@ $factory->define(App\Models\Pirep::class, function (Faker $faker) {
             return $airline->id;
         },
         'user_id' => function () {
-            return factory(App\Models\User::class)->create()->id;
+            return factory(\App\Models\User::class)->create()->id;
         },
         'aircraft_id' => function () {
-            return factory(App\Models\Aircraft::class)->create()->id;
+            return factory(\App\Models\Aircraft::class)->create()->id;
         },
         'flight_id' => function () use ($flight) {
             return $flight->id;

app/Database/factories/SubfleetFactory.php

@@ -6,7 +6,7 @@ $factory->define(App\Models\Subfleet::class, function (Faker $faker) {
     return [
         'id'         => null,
         'airline_id' => function () {
-            return factory(App\Models\Airline::class)->create()->id;
+            return factory(\App\Models\Airline::class)->create()->id;
         },
         'name'                       => $faker->unique()->text(50),
         'type'                       => $faker->unique()->text(7),

app/Database/factories/UserFactory.php

@@ -1,7 +1,9 @@
 <?php
 
+use App\Models\Airline;
 use App\Models\Enums\UserState;
 use Faker\Generator as Faker;
+use Illuminate\Support\Facades\Hash;
 
 $factory->define(App\Models\User::class, function (Faker $faker) {
     static $password;
@@ -14,7 +16,7 @@ $factory->define(App\Models\User::class, function (Faker $faker) {
         'password'   => $password ?: $password = Hash::make('secret'),
         'api_key'    => $faker->sha1,
         'airline_id' => function () {
-            return factory(App\Models\Airline::class)->create()->id;
+            return factory(Airline::class)->create()->id;
         },
         'rank_id'        => 1,
         'flights'        => $faker->numberBetween(0, 1000),

app/Database/migrations/2018_01_28_180522_create_awards_table.php

@@ -3,12 +3,15 @@
 use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
+use Modules\Awards\Awards\PilotFlightAwards;
 
 class CreateAwardsTable extends Migration
 {
     /**
      * Run the migrations.
      *
+     * @throws \Illuminate\Validation\ValidationException
+     *
      * @return void
      */
     public function up()
@@ -23,7 +26,6 @@ class CreateAwardsTable extends Migration
             // EG, the airports has an internal expense for gate costs
             $table->string('ref_model')->nullable();
             $table->text('ref_model_params')->nullable();
-            //$table->string('ref_model_id', 36)->nullable();
 
             $table->timestamps();
 
@@ -38,6 +40,18 @@ class CreateAwardsTable extends Migration
 
             $table->index(['user_id', 'award_id']);
         });
+
+        /**
+         * Add a default, sample award
+         */
+        $award = [
+            'name'             => 'Pilot 50 flights',
+            'description'      => 'When a pilot has 50 flights, give this award',
+            'ref_model'        => PilotFlightAwards::class,
+            'ref_model_params' => 50,
+        ];
+
+        $this->addAward($award);
     }
 
     /**

app/Database/migrations/2020_03_27_174238_create_pages.php

@@ -1,5 +1,6 @@
 <?php
 
+use App\Models\Enums\PageType;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -22,7 +23,7 @@ class CreatePages extends Migration
             $table->string('name');
             $table->string('slug');
             $table->string('icon');
-            $table->unsignedSmallInteger('type');
+            $table->unsignedSmallInteger('type')->default(PageType::PAGE);
             $table->boolean('public');
             $table->boolean('enabled');
             $table->mediumText('body');

app/Database/migrations/2020_06_09_141153_pages_add_link.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class PagesAddLink extends Migration
+{
+    /**
+     * Add a `link` column and make the body optional. Also add a "new_window" bool
+     * which determines if we open this link in a new window or not
+     */
+    public function up()
+    {
+        Schema::table('pages', function (Blueprint $table) {
+            $table->string('body')->change()->nullable();
+            $table->string('link')
+                ->default('')
+                ->nullable()
+                ->after('body');
+
+            $table->boolean('new_window')->default(false);
+        });
+    }
+
+    /**
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('fares', function (Blueprint $table) {
+            $table->dropColumn('link');
+            $table->dropColumn('new_window');
+        });
+    }
+}

app/Database/migrations/2020_07_21_141153_create_user_fields.php

@@ -0,0 +1,49 @@
+<?php
+
+use App\Contracts\Model;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateUserFields extends Migration
+{
+    /**
+     * Add two tables for holding user fields and the values
+     */
+    public function up()
+    {
+        /*
+         * Hold a master list of fields
+         */
+        Schema::create('user_fields', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name', 200);
+            $table->text('description')->nullable();
+            $table->boolean('show_on_registration')->default(false)->nullable();
+            $table->boolean('required')->default(false)->nullable();
+            $table->boolean('private')->default(false)->nullable();
+            $table->boolean('active')->default(true)->nullable();
+            $table->timestamps();
+        });
+
+        /*
+         * The values for the actual fields
+         */
+        Schema::create('user_field_values', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->unsignedBigInteger('user_field_id');
+            $table->string('user_id', Model::ID_MAX_LENGTH);
+            $table->text('value')->nullable();
+            $table->timestamps();
+
+            $table->index(['user_field_id', 'user_id']);
+        });
+    }
+
+    /**
+     * @return void
+     */
+    public function down()
+    {
+    }
+}

app/Database/migrations/2020_09_03_141152_aircraft_add_mtow.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+/**
+ * Add a `mtow` column for the max takeoff weight
+ */
+class AircraftAddMtow extends Migration
+{
+    public function up()
+    {
+        Schema::table('aircraft', function (Blueprint $table) {
+            $table->unsignedDecimal('mtow')
+                ->nullable()
+                ->default(0.0)
+                ->after('hex_code');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('aircraft', function (Blueprint $table) {
+            $table->dropColumn('mtow');
+        });
+    }
+}

app/Database/migrations/2020_09_30_081536_create_modules_table.php

@@ -0,0 +1,39 @@
+<?php
+
+use App\Contracts\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateModulesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('modules', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->boolean('enabled')->default(1);
+            $table->timestamps();
+        });
+
+        $this->addModule(['name' => 'Awards']);
+        $this->addModule(['name' => 'Sample']);
+        $this->addModule(['name' => 'VMSAcars']);
+        $this->addModule(['name' => 'Vacentral']);
+        $this->addModule(['name' => 'TestModule']);
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('modules');
+    }
+}

app/Database/migrations/2020_10_28_081536_modify_pirep_fares.php

@@ -0,0 +1,52 @@
+<?php
+
+use App\Contracts\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+class ModifyPirepFares extends Migration
+{
+    /**
+     * Modify the PIREP fares table so that we can save all of the fares for that particular PIREP
+     * Basically copy all of those fields over, and then use this table directly, instead of the
+     * relationship to the fares table
+     *
+     * @return void
+     */
+    public function up()
+    {
+        /*
+         * Add the columns we need from the fares table so then this is now "fixed" in time
+         */
+        Schema::table('pirep_fares', function (Blueprint $table) {
+            $table->unsignedInteger('fare_id')->change()->nullable()->default(0);
+
+            $table->string('code', 50);
+            $table->string('name', 50);
+
+            // count is already there
+
+            $table->unsignedDecimal('price')->nullable()->default(0.00);
+            $table->unsignedDecimal('cost')->nullable()->default(0.00);
+            $table->unsignedInteger('capacity')->nullable()->default(0);
+        });
+
+        /**
+         * Now iterate through the existing table and copy/update everything
+         * Some fares might already have been removed deleted so just insert some null/errored
+         * values for those
+         */
+        $parent_fares = [];
+        $fares = DB::table('pirep_fares')->get();
+        foreach ($fares as $fare) {
+            if (empty($parent_fares[$fare->fare_id])) {
+                $parent_fares[$fare->fare_id] = DB::table('fares')->where('id', $fare->fare_id)->first();
+            }
+        }
+    }
+
+    public function down()
+    {
+    }
+}

app/Database/seeds/DatabaseSeeder.php

@@ -1,15 +1,21 @@
 <?php
 
+use App\Services\Installer\MigrationService;
 use App\Services\Installer\SeederService;
 use Illuminate\Database\Seeder;
 
 class DatabaseSeeder extends Seeder
 {
-    private $seederService;
+    /** @var MigrationService */
+    private $migrationSvc;
+
+    /** @var SeederService */
+    private $seederSvc;
 
     public function __construct()
     {
-        $this->seederService = app(SeederService::class);
+        $this->migrationSvc = app(MigrationService::class);
+        $this->seederSvc = app(SeederService::class);
     }
 
     /**
@@ -19,6 +25,12 @@ class DatabaseSeeder extends Seeder
      */
     public function run()
     {
-        $this->seederService->syncAllSeeds();
+        // Make sure any migrations that need to be run are run/cleared out
+        if ($this->migrationSvc->migrationsAvailable()) {
+            $this->migrationSvc->runAllMigrations();
+        }
+
+        // Then sync all of the seeds
+        $this->seederSvc->syncAllSeeds();
     }
 }

app/Database/seeds/dev/.gitignore

@@ -1 +1,2 @@
 local.yml
+vmsacars.yml

app/Database/seeds/dev/base.yml

@@ -12,3 +12,11 @@ airlines:
     active: 1
     created_at: now
     updated_at: now
+  - id: 2
+    icao: XXX
+    iata: XX
+    name: inactive airline
+    country: us
+    active: 0
+    created_at: now
+    updated_at: now

app/Database/seeds/dev/sample.yml

@@ -1,30 +1,10 @@
 
-#airlines:
-#  - id: 1
-#    icao: VMS
-#    iata: VM
-#    name: phpvms airlines
-#    country: us
-#    active: 1
-#    created_at: now
-#    updated_at: now
-
 roles:
   id_column: name
   data:
     - name: fleet-only
       display_name: Edit Fleet
 
-awards:
-  - id: 1
-    name: Pilot 50 flights
-    description: When a pilot has 50 flights, give this award
-    image_url:
-    ref_model: Modules\Awards\Awards\PilotFlightAwards
-    ref_model_params: 50
-    created_at: now
-    updated_at: now
-
 news:
   - id: 1
     user_id: 1
@@ -136,34 +116,91 @@ airports:
     ground_handling_cost: 50
 #
 aircraft:
-  - id: 1
+  -
+    id: 1
     subfleet_id: 1
+    icao: null
+    iata: null
     airport_id: KJFK
-    name: Boeing 747-438
+    landing_time: '2020-10-23 07:50:16'
+    name: 'Boeing 747-438'
     registration: 001Z
-    flight_time: 360
+    hex_code: null
+    mtow: '0.00'
+    zfw: '0.00'
+    flight_time: 540
     status: A
-  - id: 2
+    state: 0
+    created_at: null
+    updated_at: '2020-10-23 07:50:16'
+  -
+    id: 2
     subfleet_id: 2
+    icao: null
+    iata: null
     airport_id: LGRP
-    name: Boeing 777-200
+    landing_time: null
+    name: 'Boeing 777-200'
     registration: C202
+    hex_code: null
+    mtow: '0.00'
+    zfw: '0.00'
     flight_time: 260
     status: A
-  - id: 3
+    state: 0
+    created_at: null
+    updated_at: null
+  -
+    id: 3
     subfleet_id: 1
+    icao: null
+    iata: null
     airport_id: KAUS
-    name: Boeing 747-412
+    landing_time: '2020-10-24 08:50:13'
+    name: 'Boeing 747-412'
     registration: S2333
-    flight_time: 0
+    hex_code: null
+    mtow: '0.00'
+    zfw: '0.00'
+    flight_time: 180
     status: A
-  - id: 4
+    state: 0
+    created_at: null
+    updated_at: '2020-10-24 08:50:13'
+  -
+    id: 4
     subfleet_id: 1
+    icao: null
+    iata: null
     airport_id: KAUS
-    name: Boeing 747-436 RETIRED
+    landing_time: null
-    registration:
+    name: 'Boeing 747-436 RETIRED'
+    registration: null
+    hex_code: null
+    mtow: '0.00'
+    zfw: '0.00'
     flight_time: 45
     status: R
+    state: 0
+    created_at: null
+    updated_at: null
+  -
+    id: 5
+    subfleet_id: 4
+    icao: A320
+    iata: '320'
+    airport_id: EGLL
+    landing_time: null
+    name: 'Airbus A320'
+    registration: N786DL
+    hex_code: b47165dd
+    mtow: '78800.00'
+    zfw: '62500.00'
+    flight_time: 0
+    status: A
+    state: 0
+    created_at: '2020-10-22 13:38:50'
+    updated_at: '2020-10-22 13:38:50'
 
 expenses:
   - name: Per-Flight (no muliplier)
@@ -220,68 +257,192 @@ expenses:
     updated_at: now
 
 fares:
-  - id: 1
+  -
-    code: Y
+    id: 1
+    code: 'Y'
     name: Economy
-    price: 100
+    price: '100.00'
+    cost: '0.00'
     capacity: 200
-  - id: 2
+    type: 0
+    notes: null
+    active: 1
+    created_at: null
+    updated_at: null
+  -
+    id: 2
     code: B
     name: Business
-    price: 500
+    price: '500.00'
+    cost: '0.00'
     capacity: 10
-  - id: 3
+    type: 0
+    notes: null
+    active: 1
+    created_at: null
+    updated_at: null
+  -
+    id: 3
     code: F
     name: First-Class
-    price: 800
+    price: '800.00'
+    cost: '0.00'
     capacity: 5
+    type: 0
+    notes: null
+    active: 1
+    created_at: null
+    updated_at: null
 
 subfleets:
-  - id: 1
+  -
+    id: 1
     airline_id: 1
-    name: 747-43X RB211-524G
     type: 744-3X-RB211
-    cost_block_hour: 1000
+    name: '747-43X RB211-524G'
-    ground_handling_multiplier: 200
+    cost_block_hour: '1000.00'
-  - id: 2
+    cost_delay_minute: '0.00'
+    fuel_type: null
+    ground_handling_multiplier: '200.00'
+    cargo_capacity: null
+    fuel_capacity: null
+    gross_weight: null
+    created_at: null
+    updated_at: null
+  -
+    id: 2
     airline_id: 1
-    name: 777-222ER GE90-76B
     type: 772-22ER-GE90-76B
-    cost_block_hour: 500
+    name: '777-222ER GE90-76B'
-    ground_handling_multiplier: 150
+    cost_block_hour: '500.00'
-  - id: 3
+    cost_delay_minute: '0.00'
+    fuel_type: null
+    ground_handling_multiplier: '150.00'
+    cargo_capacity: null
+    fuel_capacity: null
+    gross_weight: null
+    created_at: null
+    updated_at: null
+  -
+    id: 3
     airline_id: 1
-    name: 777-367 ER GE90-115B
     type: 772-36ER-GE90-115B
-    cost_block_hour: 100
+    name: '777-367 ER GE90-115B'
-    ground_handling_multiplier: 150
+    cost_block_hour: '100.00'
+    cost_delay_minute: '0.00'
+    fuel_type: null
+    ground_handling_multiplier: '150.00'
+    cargo_capacity: null
+    fuel_capacity: null
+    gross_weight: null
+    created_at: null
+    updated_at: null
+  -
+    id: 4
+    airline_id: 1
+    type: A320
+    name: A320
+    cost_block_hour: '2300.00'
+    cost_delay_minute: null
+    fuel_type: 1
+    ground_handling_multiplier: '100.00'
+    cargo_capacity: null
+    fuel_capacity: null
+    gross_weight: null
+    created_at: '2020-10-22 13:36:49'
+    updated_at: '2020-10-22 13:36:49'
 
-# add a few mods to aircraft and fares
 subfleet_fare:
-
+  -
-  # Fare classes on the 747
+    subfleet_id: 1
-  - subfleet_id: 1
     fare_id: 1
-    price: 200
+    price: '200'
-    capacity: 400
+    cost: null
-  - subfleet_id: 1
+    capacity: '400'
+    created_at: null
+    updated_at: null
+  -
+    subfleet_id: 1
     fare_id: 2
     price: 120%
-  - subfleet_id: 1
+    cost: null
-    fare_id: 3
+    capacity: null
-    price: 1000
+    created_at: null
-    capacity: 110%
+    updated_at: null
-
+  -
-  # Fare classes on the 777
-  - subfleet_id: 2
-    fare_id: 1
-  - subfleet_id: 2
-    fare_id: 3
-    capacity: 10
-
-subfleet_rank:
-  - rank_id: 1
     subfleet_id: 1
+    fare_id: 3
+    price: '1000'
+    cost: null
+    capacity: 110%
+    created_at: null
+    updated_at: null
+  -
+    subfleet_id: 2
+    fare_id: 1
+    price: null
+    cost: null
+    capacity: null
+    created_at: null
+    updated_at: null
+  -
+    subfleet_id: 2
+    fare_id: 3
+    price: null
+    cost: null
+    capacity: '10'
+    created_at: null
+    updated_at: null
+  -
+    subfleet_id: 4
+    fare_id: 1
+    price: null
+    cost: null
+    capacity: '123'
+    created_at: null
+    updated_at: null
+  -
+    subfleet_id: 4
+    fare_id: 2
+    price: null
+    cost: null
+    capacity: '8'
+    created_at: null
+    updated_at: null
+  -
+    subfleet_id: 4
+    fare_id: 3
+    price: null
+    cost: null
+    capacity: '2'
+    created_at: null
+    updated_at: null
+subfleet_rank:
+  -
+    rank_id: 1
+    subfleet_id: 1
+    acars_pay: null
+    manual_pay: null
+  -
+    rank_id: 1
+    subfleet_id: 4
+    acars_pay: null
+    manual_pay: null
+  -
+    rank_id: 2
+    subfleet_id: 4
+    acars_pay: null
+    manual_pay: null
+  -
+    rank_id: 3
+    subfleet_id: 4
+    acars_pay: null
+    manual_pay: null
+  -
+    rank_id: 4
+    subfleet_id: 4
+    acars_pay: null
+    manual_pay: null
 
 flights:
   - id: flightid_1
@@ -359,6 +520,35 @@ flights:
     route: 'MLY5 KEMBO UG442 SIA UG633 OTEKO UR640 NALRO GUBEL3'
     created_at: NOW
     updated_at: NOW
+  -
+    id: q8mvZ5vdExoy0mQG
+    airline_id: 1
+    flight_number: 3003
+    route_code: null
+    route_leg: null
+    dpt_airport_id: KSEA
+    arr_airport_id: KPAE
+    alt_airport_id: null
+    dpt_time: '8:00'
+    arr_time: '8:45'
+    level: null
+    distance: '27.51'
+    flight_time: 45
+    flight_type: J
+    load_factor: null
+    load_factor_variance: null
+    route: null
+    pilot_pay: null
+    notes: null
+    scheduled: 0
+    days: null
+    start_date: null
+    end_date: null
+    has_bid: 1
+    active: 1
+    visible: 1
+    created_at: now
+    updated_at: now
 
 flight_fields:
   - name: Departure Terminal
@@ -389,12 +579,24 @@ flight_subfleet:
     flight_id: flightid_4
 
 bids:
-  - id: 100
+  -
+    id: 100
     user_id: 1
     flight_id: flightid_1
-  - id: 101
+    created_at: now
+    updated_at: now
+  -
+    id: 101
     user_id: 1
     flight_id: flightid_3
+    created_at: now
+    updated_at: now
+  -
+    id: 102
+    user_id: 1
+    flight_id: q8mvZ5vdExoy0mQG
+    created_at: now
+    updated_at: now
 
 pireps:
   - id: pirepid_1

app/Database/seeds/dev/users.yml

@@ -69,3 +69,33 @@ role_user:
   - user_id: 3
     role_id: 2
     user_type: App\Models\User
+
+user_fields:
+  - id: 1
+    name: 'VATSIM ID'
+    show_on_registration: true
+    required: false
+    private: false
+  - id: 2
+    name: 'Referral'
+    description: 'Who referred you'
+    show_on_registration: true
+    required: false
+    private: true
+
+user_field_values:
+  - id: 1
+    user_field_id: 1
+    user_id: 1
+    value: 'my vatsim id'
+  - id: 2
+    user_field_id: 2
+    user_id: 1
+    value: 'Nobody did'
+
+user_awards:
+  - id: 1
+    user_id: 1
+    award_id: 1
+    created_at: now
+    updated_at: now

app/Database/seeds/modules.yml

@@ -0,0 +1,10 @@
+- name: 'Awards'
+  enabled: 1
+- name: 'Sample'
+  enabled: 1
+- name: 'VMSAcars'
+  enabled: 1
+- name: 'Vacentral'
+  enabled: 1
+- name: 'TestModule'
+  enabled: 1

app/Database/seeds/permissions.yml

@@ -3,6 +3,9 @@
 - name: admin-access
   display_name: Admin Panel
   description: Access the admin panel
+- name: aircraft
+  display_name: Aircraft
+  description: Create/edit aircraft
 - name: airlines
   display_name: Airlines
   description: Create/edit airlines
@@ -48,3 +51,6 @@
 - name: maintenance
   display_name: Maintenance
   description: Run maintenance tasks
+- name: modules
+  display_name: Modules
+  description: Add/Edit Modules

app/Database/seeds/settings.yml

@@ -26,6 +26,13 @@
   options:
   type: boolean
   description: If an airport isn't added, try to look it up when adding schedules
+- key: general.allow_unadded_airports
+  name: 'Allow unadded airports'
+  group: general
+  value: false
+  options:
+  type: boolean
+  description: If an un-added airport is used, it is looked up and added
 - key: general.check_prerelease_version
   name: 'Pre-release versions in version check'
   group: general
@@ -123,6 +130,20 @@
   options: ''
   type: int
   description: 'Initial zoom level on the map'
+- key: airports.default_ground_handling_cost
+  name: 'Default Ground Handling Cost'
+  group: airports
+  value: 250
+  options:
+  type: int
+  description: If an airport's Ground Handling Cost Cost isn't added, set this value by default
+- key: airports.default_jet_a_fuel_cost
+  name: 'Default Jet A Fuel Cost'
+  group: airports
+  value: 0.7
+  options:
+  type: text
+  description: If an airport's Jet A Fuel Cost isn't added, set this value by default
 - key: bids.disable_flight_on_bid
   name: 'Disable flight on bid'
   group: bids

app/Events/AcarsUpdate.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Events;
+
+use App\Contracts\Event;
+use App\Models\Acars;
+use App\Models\Pirep;
+
+class AcarsUpdate extends Event
+{
+    /** @var Pirep */
+    public $pirep;
+
+    /** @var Acars */
+    public $acars;
+
+    public function __construct(Pirep $pirep, Acars $acars)
+    {
+        $this->pirep = $pirep;
+        $this->acars = $acars;
+    }
+}

app/Events/BaseEvent.php

@@ -2,13 +2,11 @@
 
 namespace App\Events;
 
-use Illuminate\Broadcasting\InteractsWithSockets;
+use App\Contracts\Event;
-use Illuminate\Foundation\Events\Dispatchable;
-use Illuminate\Queue\SerializesModels;
 
-class BaseEvent
+/**
+ * @deprecated Extend App\Contracts\Event directly
+ */
+class BaseEvent extends Event
 {
-    use Dispatchable;
-    use InteractsWithSockets;
-    use SerializesModels;
 }

app/Events/CronHourly.php

@@ -2,6 +2,8 @@
 
 namespace App\Events;
 
-class CronHourly extends BaseEvent
+use App\Contracts\Event;
+
+class CronHourly extends Event
 {
 }

app/Events/CronMonthly.php

@@ -2,10 +2,12 @@
 
 namespace App\Events;
 
+use App\Contracts\Event;
+
 /**
  * This event is dispatched when the monthly cron is run
  * It happens after all of the default nightly tasks
  */
-class CronMonthly extends BaseEvent
+class CronMonthly extends Event
 {
 }

app/Events/CronNightly.php

@@ -2,10 +2,12 @@
 
 namespace App\Events;
 
+use App\Contracts\Event;
+
 /**
  * This event is dispatched when the daily cron is run
  * It happens after all of the default nightly tasks
  */
-class CronNightly extends BaseEvent
+class CronNightly extends Event
 {
 }

app/Events/CronWeekly.php

@@ -2,11 +2,13 @@
 
 namespace App\Events;
 
+use App\Contracts\Event;
+
 /**
  * This event is dispatched when the weekly cron is run
  * It happens after all of the default nightly tasks
  */
-class CronWeekly extends BaseEvent
+class CronWeekly extends Event
 {
     public function __construct()
     {

app/Events/Expenses.php

@@ -2,6 +2,7 @@
 
 namespace App\Events;
 
+use App\Contracts\Event;
 use App\Models\Pirep;
 
 /**
@@ -25,7 +26,7 @@ use App\Models\Pirep;
  *
  * The event will have a copy of the PIREP model, if it's applicable
  */
-class Expenses extends BaseEvent
+class Expenses extends Event
 {
     public $pirep;
 

app/Events/NewsAdded.php

@@ -2,9 +2,10 @@
 
 namespace App\Events;
 
+use App\Contracts\Event;
 use App\Models\News;
 
-class NewsAdded extends BaseEvent
+class NewsAdded extends Event
 {
     public $news;
 

app/Events/PirepAccepted.php

@@ -2,9 +2,10 @@
 
 namespace App\Events;
 
+use App\Contracts\Event;
 use App\Models\Pirep;
 
-class PirepAccepted extends BaseEvent
+class PirepAccepted extends Event
 {
     public $pirep;
 

app/Events/PirepCancelled.php

@@ -2,9 +2,10 @@
 
 namespace App\Events;
 
+use App\Contracts\Event;
 use App\Models\Pirep;
 
-class PirepCancelled extends BaseEvent
+class PirepCancelled extends Event
 {
     public $pirep;
 

app/Events/PirepFiled.php

@@ -2,9 +2,10 @@
 
 namespace App\Events;
 
+use App\Contracts\Event;
 use App\Models\Pirep;
 
-class PirepFiled extends BaseEvent
+class PirepFiled extends Event
 {
     public $pirep;
 

app/Events/PirepPrefiled.php

@@ -2,9 +2,10 @@
 
 namespace App\Events;
 
+use App\Contracts\Event;
 use App\Models\Pirep;
 
-class PirepPrefiled extends BaseEvent
+class PirepPrefiled extends Event
 {
     public $pirep;
 

app/Events/PirepRejected.php

@@ -2,9 +2,10 @@
 
 namespace App\Events;
 
+use App\Contracts\Event;
 use App\Models\Pirep;
 
-class PirepRejected extends BaseEvent
+class PirepRejected extends Event
 {
     public $pirep;
 

app/Events/PirepUpdated.php

@@ -2,9 +2,10 @@
 
 namespace App\Events;
 
+use App\Contracts\Event;
 use App\Models\Pirep;
 
-class PirepUpdated extends BaseEvent
+class PirepUpdated extends Event
 {
     public $pirep;
 

app/Events/TestEvent.php

@@ -2,9 +2,10 @@
 
 namespace App\Events;
 
+use App\Contracts\Event;
 use App\Models\User;
 
-class TestEvent extends BaseEvent
+class TestEvent extends Event
 {
     public $user;
 

app/Events/UserAccepted.php

@@ -2,9 +2,10 @@
 
 namespace App\Events;
 
+use App\Contracts\Event;
 use App\Models\User;
 
-class UserAccepted extends BaseEvent
+class UserAccepted extends Event
 {
     public $user;
 

app/Events/UserRegistered.php

@@ -2,9 +2,10 @@
 
 namespace App\Events;
 
+use App\Contracts\Event;
 use App\Models\User;
 
-class UserRegistered extends BaseEvent
+class UserRegistered extends Event
 {
     public $user;
 

app/Events/UserStateChanged.php

@@ -2,12 +2,13 @@
 
 namespace App\Events;
 
+use App\Contracts\Event;
 use App\Models\User;
 
 /**
  * Event triggered when a user's state changes
  */
-class UserStateChanged extends BaseEvent
+class UserStateChanged extends Event
 {
     public $old_state;
     public $user;

app/Events/UserStatsChanged.php

@@ -2,9 +2,10 @@
 
 namespace App\Events;
 
+use App\Contracts\Event;
 use App\Models\User;
 
-class UserStatsChanged extends BaseEvent
+class UserStatsChanged extends Event
 {
     public $stat_name;
     public $old_value;

app/Exceptions/AircraftInvalid.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Exceptions;
+
+use App\Models\Aircraft;
+
+class AircraftInvalid extends AbstractHttpException
+{
+    public const MESSAGE = 'The supplied aircraft is invalid';
+
+    private $aircraft;
+
+    public function __construct(Aircraft $aircraft)
+    {
+        $this->aircraft = $aircraft;
+        parent::__construct(
+            400,
+            static::MESSAGE
+        );
+    }
+
+    /**
+     * Return the RFC 7807 error type (without the URL root)
+     */
+    public function getErrorType(): string
+    {
+        return 'aircraft-invalid';
+    }
+
+    /**
+     * Get the detailed error string
+     */
+    public function getErrorDetails(): string
+    {
+        return $this->getMessage();
+    }
+
+    /**
+     * Return an array with the error details, merged with the RFC7807 response
+     */
+    public function getErrorMetadata(): array
+    {
+        return [
+            'aircraft_id' => optional($this->aircraft)->id,
+        ];
+    }
+}

app/Exceptions/Converters/GenericExceptionAbstract.php

@@ -3,13 +3,13 @@
 namespace App\Exceptions\Converters;
 
 use App\Exceptions\AbstractHttpException;
-use Exception;
+use Throwable;
 
 class GenericExceptionAbstract extends AbstractHttpException
 {
     private $exception;
 
-    public function __construct(Exception $exception)
+    public function __construct(Throwable $exception)
     {
         $this->exception = $exception;
         parent::__construct(

app/Exceptions/Handler.php

@@ -5,8 +5,7 @@ namespace App\Exceptions;
 use App\Exceptions\Converters\GenericExceptionAbstract;
 use App\Exceptions\Converters\SymfonyException;
 use App\Exceptions\Converters\ValidationException;
-use Exception;
+use App\Http\Middleware\SetActiveTheme;
-use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
@@ -15,10 +14,9 @@ use Illuminate\Http\Request;
 use Illuminate\Session\TokenMismatchException;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\ValidationException as IlluminateValidationException;
-use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\HttpException as SymfonyHttpException;
-use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Throwable;
 use Whoops\Handler\HandlerInterface;
 
 /**
@@ -42,19 +40,19 @@ class Handler extends ExceptionHandler
     /**
      * Render an exception into an HTTP response.
      *
-     * @param Request   $request
+     * @param Request    $request
-     * @param Exception $exception
+     * @param \Throwable $exception
      *
      * @return mixed
      */
-    public function render($request, Exception $exception)
+    public function render($request, Throwable $exception)
     {
         if ($request->is('api/*')) {
             return $this->handleApiError($request, $exception);
         }
 
-        if ($exception instanceof AbstractHttpException
+        (new SetActiveTheme())->setTheme($request);
-            && $exception->getStatusCode() === 403) {
+        if ($exception instanceof AbstractHttpException && $exception->getStatusCode() === 403) {
             return redirect()->guest('login');
         }
 
@@ -65,11 +63,11 @@ class Handler extends ExceptionHandler
      * Handle errors in the API
      *
      * @param            $request
-     * @param \Exception $exception
+     * @param \Throwable $exception
      *
      * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
      */
-    private function handleApiError($request, Exception $exception)
+    private function handleApiError($request, Throwable $exception)
     {
         Log::error('API Error', $exception->getTrace());
 
@@ -118,38 +116,13 @@ class Handler extends ExceptionHandler
     {
         if ($request->expectsJson() || $request->is('api/*')) {
             $error = new Unauthenticated();
+
             return $error->getResponse();
         }
 
         return redirect()->guest('login');
     }
 
-    /**
-     * Render the given HttpException.
-     *
-     * @param AbstractHttpException $e
-     *
-     * @return \Illuminate\Http\Response|Response
-     */
-    protected function renderHttpException(HttpExceptionInterface $e)
-    {
-        $status = $e->getStatusCode();
-        view()->replaceNamespace('errors', [
-            resource_path('views/layouts/'.setting('general.theme', 'default').'/errors'),
-            resource_path('views/errors'),
-            __DIR__.'/views',
-        ]);
-
-        if (view()->exists("errors::{$status}")) {
-            return response()->view("errors::{$status}", [
-                'exception' => $e,
-                'SKIN_NAME' => setting('general.theme', 'default'),
-            ], $status, $e->getHeaders());
-        }
-
-        return $this->convertExceptionToResponse($e);
-    }
-
     /**
      * Ignition error page integration
      */

app/Exceptions/ModuleExistsException.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Exceptions;
+
+class ModuleExistsException extends AbstractHttpException
+{
+    private $module_name;
+
+    public function __construct($module_name)
+    {
+        $this->module_name = $module_name;
+        parent::__construct(
+            409,
+            'Module '.$module_name.' Already Exists!'
+        );
+    }
+
+    /**
+     * Return the RFC 7807 error type (without the URL root)
+     */
+    public function getErrorType(): string
+    {
+        return 'module-already-exists';
+    }
+
+    /**
+     * Get the detailed error string
+     */
+    public function getErrorDetails(): string
+    {
+        return $this->getMessage();
+    }
+
+    /**
+     * Return an array with the error details, merged with the RFC7807 response
+     */
+    public function getErrorMetadata(): array
+    {
+        return [];
+    }
+}

app/Exceptions/ModuleInstallationError.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Exceptions;
+
+class ModuleInstallationError extends AbstractHttpException
+{
+    public function __construct()
+    {
+        parent::__construct(
+            500,
+            'Installation of Module Failed!'
+        );
+    }
+
+    /**
+     * Return the RFC 7807 error type (without the URL root)
+     */
+    public function getErrorType(): string
+    {
+        return 'module-installation-error';
+    }
+
+    /**
+     * Get the detailed error string
+     */
+    public function getErrorDetails(): string
+    {
+        return $this->getMessage();
+    }
+
+    /**
+     * Return an array with the error details, merged with the RFC7807 response
+     */
+    public function getErrorMetadata(): array
+    {
+        return [];
+    }
+}

app/Exceptions/ModuleInvalidFileType.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Exceptions;
+
+class ModuleInvalidFileType extends AbstractHttpException
+{
+    public function __construct()
+    {
+        parent::__construct(
+            415,
+            'The Module File Type is Invalid!'
+        );
+    }
+
+    /**
+     * Return the RFC 7807 error type (without the URL root)
+     */
+    public function getErrorType(): string
+    {
+        return 'module-file-type-invalid';
+    }
+
+    /**
+     * Get the detailed error string
+     */
+    public function getErrorDetails(): string
+    {
+        return $this->getMessage();
+    }
+
+    /**
+     * Return an array with the error details, merged with the RFC7807 response
+     */
+    public function getErrorMetadata(): array
+    {
+        return [];
+    }
+}

app/Exceptions/PilotIdNotFound.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Exceptions;
+
+class PilotIdNotFound extends AbstractHttpException
+{
+    private $pilot_id;
+
+    public function __construct($pilot_id)
+    {
+        $this->pilot_id = $pilot_id;
+        parent::__construct(
+            404,
+            'Pilot '.$pilot_id.' not found'
+        );
+    }
+
+    /**
+     * Return the RFC 7807 error type (without the URL root)
+     */
+    public function getErrorType(): string
+    {
+        return 'pilot-id-not-found';
+    }
+
+    /**
+     * Get the detailed error string
+     */
+    public function getErrorDetails(): string
+    {
+        return $this->getMessage();
+    }
+
+    /**
+     * Return an array with the error details, merged with the RFC7807 response
+     */
+    public function getErrorMetadata(): array
+    {
+        return [
+            'pilot_id' => $this->pilot_id,
+        ];
+    }
+}

app/Exceptions/Unauthorized.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Exceptions;
+
+use Exception;
+
+class Unauthorized extends AbstractHttpException
+{
+    private $exception;
+
+    public function __construct(Exception $exception)
+    {
+        $this->exception = $exception;
+        parent::__construct(
+            403,
+            $exception->getMessage()
+        );
+    }
+
+    /**
+     * Return the RFC 7807 error type (without the URL root)
+     */
+    public function getErrorType(): string
+    {
+        return 'unauthorized';
+    }
+
+    /**
+     * Get the detailed error string
+     */
+    public function getErrorDetails(): string
+    {
+        return $this->getMessage();
+    }
+
+    /**
+     * Return an array with the error details, merged with the RFC7807 response
+     */
+    public function getErrorMetadata(): array
+    {
+        return [];
+    }
+}

app/Exceptions/UnknownPageType.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Exceptions;
+
+use App\Models\Page;
+
+class UnknownPageType extends AbstractHttpException
+{
+    private $page;
+
+    public function __construct(Page $page)
+    {
+        $this->page = $page;
+        parent::__construct(
+            400,
+            'Unknown page type "'.$page->type.'"'
+        );
+    }
+
+    /**
+     * Return the RFC 7807 error type (without the URL root)
+     */
+    public function getErrorType(): string
+    {
+        return 'unknown-page-type';
+    }
+
+    /**
+     * Get the detailed error string
+     */
+    public function getErrorDetails(): string
+    {
+        return $this->getMessage();
+    }
+
+    /**
+     * Return an array with the error details, merged with the RFC7807 response
+     */
+    public function getErrorMetadata(): array
+    {
+        return [
+            'id'   => $this->page->id,
+            'type' => $this->page->type,
+        ];
+    }
+}

app/Http/Composers/PageLinksComposer.php

@@ -10,7 +10,10 @@ use Illuminate\View\View;
 
 class PageLinksComposer extends Composer
 {
-    protected $pageRepo;
+    private static $fields = ['id', 'name', 'slug', 'icon', 'type', 'link', 'new_window'];
+
+    /** @var \App\Repositories\PageRepository */
+    private $pageRepo;
 
     /**
      * PageLinksComposer constructor.
@@ -28,13 +31,16 @@ class PageLinksComposer extends Composer
     public function compose(View $view)
     {
         try {
+            $w = [
+                'enabled' => true,
+            ];
+
             // If not logged in, then only get the public pages
-            $w = ['enabled' => true];
             if (!Auth::check()) {
-                $w = ['public' => true];
+                $w['public'] = true;
             }
 
-            $pages = $this->pageRepo->findWhere($w, ['id', 'name', 'slug', 'icon']);
+            $pages = $this->pageRepo->findWhere($w, static::$fields);
         } catch (Exception $e) {
             $pages = [];
         }

app/Http/Controllers/Admin/FareController.php

@@ -12,6 +12,7 @@ use App\Repositories\FareRepository;
 use App\Services\ExportService;
 use App\Services\ImportService;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
 use Laracasts\Flash\Flash;
 use Prettus\Repository\Criteria\RequestCriteria;
 
@@ -162,6 +163,8 @@ class FareController extends Controller
             return redirect(route('admin.fares.index'));
         }
 
+        Log::info('Deleting fare "'.$fare->name.'", id='.$fare->id);
+
         $this->fareRepo->delete($id);
 
         Flash::success('Fare deleted successfully.');

app/Http/Controllers/Admin/MaintenanceController.php

@@ -11,6 +11,7 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Log;
 use Laracasts\Flash\Flash;
+use Nwidart\Modules\Facades\Module;
 
 class MaintenanceController extends Controller
 {
@@ -36,7 +37,7 @@ class MaintenanceController extends Controller
         return view('admin.maintenance.index', [
             'cron_path'           => $this->cronSvc->getCronExecString(),
             'cron_problem_exists' => $this->cronSvc->cronProblemExists(),
-            'new_version'         => true, //$this->kvpRepo->get('new_version_available', false),
+            'new_version'         => $this->kvpRepo->get('new_version_available', false),
             'new_version_tag'     => $this->kvpRepo->get('latest_version_tag'),
         ]);
     }
@@ -110,6 +111,10 @@ class MaintenanceController extends Controller
     {
         $new_version_tag = $this->kvpRepo->get('latest_version_tag');
         Log::info('Attempting to update to '.$new_version_tag);
+
+        $module = Module::find('updater');
+        $module->enable();
+
         return redirect('/update/downloader');
     }
 }

app/Http/Controllers/Admin/ModulesController.php

@@ -0,0 +1,122 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Contracts\Controller;
+use App\Services\ModuleService;
+use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Contracts\View\Factory;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Routing\Redirector;
+use Illuminate\View\View;
+
+class ModulesController extends Controller
+{
+    private $moduleSvc;
+
+    public function __construct(ModuleService $moduleSvc)
+    {
+        $this->moduleSvc = $moduleSvc;
+    }
+
+    /**
+     * Display a listing of the Module.
+     *
+     * @return mixed
+     */
+    public function index()
+    {
+        $modules = $this->moduleSvc->getAllModules();
+        $new_modules = $this->moduleSvc->scan();
+        return view('admin.modules.index', [
+            'modules'     => $modules,
+            'new_modules' => $new_modules,
+        ]);
+    }
+
+    /**
+     * Show the form for creating a new Module.
+     *
+     * @return Application|Factory|View
+     */
+    public function create()
+    {
+        return view('admin.modules.create');
+    }
+
+    /**
+     * Store a newly Uploaded Module in the Storage.
+     *
+     * @param Request $request
+     *
+     * @return Application|RedirectResponse|Redirector
+     */
+    public function store(Request $request)
+    {
+        $this->moduleSvc->installModule($request->file('module_file'));
+        return $this->index();
+    }
+
+    /**
+     * Show the form for editing the specified Module.
+     *
+     * @param $id
+     *
+     * @return Application|Factory|View
+     */
+    public function edit($id)
+    {
+        $module = $this->moduleSvc->getModule($id);
+        return view('admin.modules.edit', [
+            'module' => $module,
+        ]);
+    }
+
+    /**
+     * Update the specified Module in storage.
+     *
+     * @param $id
+     * @param Request $request
+     *
+     * @return Application|RedirectResponse|Redirector
+     */
+    public function update($id, Request $request)
+    {
+        $this->moduleSvc->updateModule($id, $request->has('enabled'));
+        flash()->success('Module Status Changed!');
+        return redirect(route('admin.modules.index'));
+    }
+
+    /**
+     * Enabling Module Present in the Modules Folder
+     *
+     * @param Request $request
+     *
+     * @return Application|RedirectResponse|Redirector
+     */
+    public function enable(Request $request)
+    {
+        $this->moduleSvc->addModule($request->input('name'));
+        return redirect(route('admin.modules.index'));
+    }
+
+    /**
+     * Verify and Remove the specified Module from storage.
+     *
+     * @param mixed   $id
+     * @param Request $request
+     *
+     * @return mixed
+     */
+    public function destroy($id, Request $request)
+    {
+        $delete = $this->moduleSvc->deleteModule($id, $request->all());
+        if ($delete == true) {
+            flash()->success('Module Deleted Successfully!');
+            return redirect(route('admin.modules.index'));
+        }
+        flash()->error('Verification Failed!');
+        return redirect(route('admin.modules.edit', $id));
+    }
+}

app/Http/Controllers/Admin/UserController.php

@@ -8,6 +8,7 @@ use App\Http\Requests\UpdateUserRequest;
 use App\Models\Rank;
 use App\Models\Role;
 use App\Models\User;
+use App\Models\UserAward;
 use App\Repositories\AirlineRepository;
 use App\Repositories\AirportRepository;
 use App\Repositories\PirepRepository;
@@ -20,6 +21,7 @@ use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Log;
 use Laracasts\Flash\Flash;
+use League\ISO3166\ISO3166;
 use Prettus\Repository\Exceptions\RepositoryException;
 
 class UserController extends Controller
@@ -69,7 +71,7 @@ class UserController extends Controller
 
         return view('admin.users.index', [
             'users'   => $users,
-            'country' => new \League\ISO3166\ISO3166(),
+            'country' => new ISO3166(),
         ]);
     }
 
@@ -82,13 +84,18 @@ class UserController extends Controller
     {
         $airlines = $this->airlineRepo->selectBoxList();
         $airports = $this->airportRepo->selectBoxList(false);
+        $countries = collect((new ISO3166())->all())
+            ->mapWithKeys(function ($item, $key) {
+                return [strtolower($item['alpha2']) => $item['name']];
+            });
 
         return view('admin.users.create', [
             'user'      => null,
             'pireps'    => null,
             'airlines'  => $airlines,
             'timezones' => Timezonelist::toArray(),
-            'country'   => new \League\ISO3166\ISO3166(),
+            'country'   => new ISO3166(),
+            'countries' => $countries,
             'airports'  => $airports,
             'ranks'     => Rank::all()->pluck('name', 'id'),
             'roles'     => Role::all()->pluck('name', 'id'),
@@ -122,31 +129,7 @@ class UserController extends Controller
      */
     public function show($id)
     {
-        $user = $this->userRepo->findWithoutFail($id);
+        return $this->edit($id);
-
-        if (empty($user)) {
-            Flash::error('User not found');
-
-            return redirect(route('admin.users.index'));
-        }
-
-        $pireps = $this->pirepRepo
-            ->whereOrder(['user_id' => $id], 'created_at', 'desc')
-            ->paginate();
-
-        $airlines = $this->airlineRepo->selectBoxList();
-        $airports = $this->airportRepo->selectBoxList(false);
-
-        return view('admin.users.show', [
-            'user'      => $user,
-            'pireps'    => $pireps,
-            'airlines'  => $airlines,
-            'timezones' => Timezonelist::toArray(),
-            'country'   => new \League\ISO3166\ISO3166(),
-            'airports'  => $airports,
-            'ranks'     => Rank::all()->pluck('name', 'id'),
-            'roles'     => Role::all()->pluck('name', 'id'),
-        ]);
     }
 
     /**
@@ -154,15 +137,18 @@ class UserController extends Controller
      *
      * @param int $id
      *
+     * @throws RepositoryException
+     *
      * @return mixed
      */
     public function edit($id)
     {
-        $user = $this->userRepo->findWithoutFail($id);
+        $user = $this->userRepo
+            ->with(['awards', 'fields', 'rank'])
+            ->findWithoutFail($id);
 
         if (empty($user)) {
             Flash::error('User not found');
-
             return redirect(route('admin.users.index'));
         }
 
@@ -170,7 +156,7 @@ class UserController extends Controller
             ->whereOrder(['user_id' => $id], 'created_at', 'desc')
             ->paginate();
 
-        $countries = collect((new \League\ISO3166\ISO3166())->all())
+        $countries = collect((new ISO3166())->all())
             ->mapWithKeys(function ($item, $key) {
                 return [strtolower($item['alpha2']) => $item['name']];
             });
@@ -181,6 +167,7 @@ class UserController extends Controller
         return view('admin.users.edit', [
             'user'      => $user,
             'pireps'    => $pireps,
+            'country'   => new ISO3166(),
             'countries' => $countries,
             'timezones' => Timezonelist::toArray(),
             'airports'  => $airports,
@@ -279,6 +266,28 @@ class UserController extends Controller
         return redirect(route('admin.users.index'));
     }
 
+    /**
+     * Remove the award from a user
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param mixed                    $id
+     * @param mixed                    $award_id
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy_user_award($id, $award_id, Request $request)
+    {
+        $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();
+        }
+
+        $userAward->delete();
+
+        return redirect()->back();
+    }
+
     /**
      * Regenerate the user's API key
      *

app/Http/Controllers/Admin/UserFieldController.php

@@ -0,0 +1,154 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Contracts\Controller;
+use App\Repositories\UserFieldRepository;
+use Illuminate\Http\Request;
+use Laracasts\Flash\Flash;
+use Prettus\Repository\Criteria\RequestCriteria;
+
+class UserFieldController extends Controller
+{
+    /** @var \App\Repositories\UserFieldRepository */
+    private $userFieldRepo;
+
+    /**
+     * @param UserFieldRepository $userFieldRepo
+     */
+    public function __construct(UserFieldRepository $userFieldRepo)
+    {
+        $this->userFieldRepo = $userFieldRepo;
+    }
+
+    /**
+     * Display a listing of the UserField.
+     *
+     * @param Request $request
+     *
+     * @throws \Prettus\Repository\Exceptions\RepositoryException
+     *
+     * @return mixed
+     */
+    public function index(Request $request)
+    {
+        $this->userFieldRepo->pushCriteria(new RequestCriteria($request));
+        $fields = $this->userFieldRepo->all();
+
+        return view('admin.userfields.index', ['fields' => $fields]);
+    }
+
+    /**
+     * Show the form for creating a new UserField.
+     */
+    public function create()
+    {
+        return view('admin.userfields.create');
+    }
+
+    /**
+     * Store a newly created UserField in storage.
+     *
+     * @param Request $request
+     *
+     * @throws \Prettus\Validator\Exceptions\ValidatorException
+     *
+     * @return mixed
+     */
+    public function store(Request $request)
+    {
+        $this->userFieldRepo->create($request->all());
+
+        Flash::success('Field added successfully.');
+        return redirect(route('admin.userfields.index'));
+    }
+
+    /**
+     * Display the specified UserField.
+     *
+     * @param int $id
+     *
+     * @return mixed
+     */
+    public function show($id)
+    {
+        $field = $this->userFieldRepo->findWithoutFail($id);
+
+        if (empty($field)) {
+            Flash::error('Flight field not found');
+            return redirect(route('admin.userfields.index'));
+        }
+
+        return view('admin.userfields.show', ['field' => $field]);
+    }
+
+    /**
+     * Show the form for editing the specified UserField.
+     *
+     * @param int $id
+     *
+     * @return mixed
+     */
+    public function edit($id)
+    {
+        $field = $this->userFieldRepo->findWithoutFail($id);
+
+        if (empty($field)) {
+            Flash::error('Field not found');
+            return redirect(route('admin.userfields.index'));
+        }
+
+        return view('admin.userfields.edit', ['field' => $field]);
+    }
+
+    /**
+     * Update the specified UserField in storage.
+     *
+     * @param         $id
+     * @param Request $request
+     *
+     * @throws \Prettus\Validator\Exceptions\ValidatorException
+     *
+     * @return mixed
+     */
+    public function update($id, Request $request)
+    {
+        $field = $this->userFieldRepo->findWithoutFail($id);
+
+        if (empty($field)) {
+            Flash::error('UserField not found');
+            return redirect(route('admin.userfields.index'));
+        }
+
+        $this->userFieldRepo->update($request->all(), $id);
+
+        Flash::success('Field updated successfully.');
+        return redirect(route('admin.userfields.index'));
+    }
+
+    /**
+     * Remove the specified UserField from storage.
+     *
+     * @param int $id
+     *
+     * @return mixed
+     */
+    public function destroy($id)
+    {
+        $field = $this->userFieldRepo->findWithoutFail($id);
+        if (empty($field)) {
+            Flash::error('Field not found');
+            return redirect(route('admin.userfields.index'));
+        }
+
+        if ($this->userFieldRepo->isInUse($id)) {
+            Flash::error('This field cannot be deleted, it is in use. Deactivate it instead');
+            return redirect(route('admin.userfields.index'));
+        }
+
+        $this->userFieldRepo->delete($id);
+
+        Flash::success('Field deleted successfully.');
+        return redirect(route('admin.userfields.index'));
+    }
+}

app/Http/Controllers/Api/AcarsController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Api;
 
 use App\Contracts\Controller;
+use App\Events\AcarsUpdate;
 use App\Exceptions\PirepCancelled;
 use App\Http\Requests\Acars\EventRequest;
 use App\Http\Requests\Acars\LogRequest;
@@ -198,6 +199,9 @@ class AcarsController extends Controller
 
         $pirep->save();
 
+        // Post a new update for this ACARS position
+        event(new AcarsUpdate($pirep, $pirep->position));
+
         return $this->message($count.' positions added', $count);
     }
 

app/Http/Controllers/Api/FlightController.php

@@ -9,6 +9,7 @@ use App\Http\Resources\Navdata as NavdataResource;
 use App\Models\SimBrief;
 use App\Repositories\Criteria\WhereCriteria;
 use App\Repositories\FlightRepository;
+use App\Services\FareService;
 use App\Services\FlightService;
 use Exception;
 use Illuminate\Http\Request;
@@ -18,19 +19,26 @@ use Prettus\Repository\Exceptions\RepositoryException;
 
 class FlightController extends Controller
 {
+    /** @var \App\Services\FareService */
+    private $fareSvc;
+
+    /** @var \App\Repositories\FlightRepository */
     private $flightRepo;
+
+    /** @var \App\Services\FlightService */
     private $flightSvc;
 
     /**
-     * FlightController constructor.
+     * @param FareService      $fareSvc
-     *
      * @param FlightRepository $flightRepo
      * @param FlightService    $flightSvc
      */
     public function __construct(
+        FareService $fareSvc,
         FlightRepository $flightRepo,
         FlightService $flightSvc
     ) {
+        $this->fareSvc = $fareSvc;
         $this->flightRepo = $flightRepo;
         $this->flightSvc = $flightSvc;
     }
@@ -54,9 +62,13 @@ class FlightController extends Controller
      */
     public function get($id)
     {
+        /** @var \App\Models\User $user */
         $user = Auth::user();
+
+        /** @var \App\Models\Flight $flight */
         $flight = $this->flightRepo->with([
             'airline',
+            'fares',
             'subfleets',
             'subfleets.aircraft',
             'subfleets.fares',
@@ -66,7 +78,8 @@ class FlightController extends Controller
             },
         ])->find($id);
 
-        $this->flightSvc->filterSubfleets(Auth::user(), $flight);
+        $flight = $this->flightSvc->filterSubfleets($user, $flight);
+        $flight = $this->fareSvc->getReconciledFaresForFlight($flight);
 
         return new FlightResource($flight);
     }
@@ -78,34 +91,38 @@ class FlightController extends Controller
      */
     public function search(Request $request)
     {
+        /** @var \App\Models\User $user */
         $user = Auth::user();
+
         $where = [
             'active'  => true,
             'visible' => true,
         ];
 
         // Allow the option to bypass some of these restrictions for the searches
-        if (!$request->filled('ignore_restrictions')
+        if (!$request->filled('ignore_restrictions') || $request->get('ignore_restrictions') === '0') {
-            || $request->get('ignore_restrictions') === '0'
-        ) {
             if (setting('pilots.restrict_to_company')) {
-                $where['airline_id'] = Auth::user()->airline_id;
+                $where['airline_id'] = $user->airline_id;
             }
 
             if (setting('pilots.only_flights_from_current')) {
-                $where['dpt_airport_id'] = Auth::user()->curr_airport_id;
+                $where['dpt_airport_id'] = $user->curr_airport_id;
             }
         }
 
         try {
             $this->flightRepo->resetCriteria();
             $this->flightRepo->searchCriteria($request);
-            $this->flightRepo->pushCriteria(new WhereCriteria($request, $where));
+            $this->flightRepo->pushCriteria(new WhereCriteria($request, $where, [
+                'airline' => ['active' => true],
+            ]));
+
             $this->flightRepo->pushCriteria(new RequestCriteria($request));
 
             $flights = $this->flightRepo
                 ->with([
                     'airline',
+                    'fares',
                     'subfleets',
                     'subfleets.aircraft',
                     'subfleets.fares',
@@ -121,7 +138,8 @@ class FlightController extends Controller
 
         // TODO: Remove any flights here that a user doesn't have permissions to
         foreach ($flights as $flight) {
-            $this->flightSvc->filterSubfleets(Auth::user(), $flight);
+            $this->flightSvc->filterSubfleets($user, $flight);
+            $this->fareSvc->getReconciledFaresForFlight($flight);
         }
 
         return FlightResource::collection($flights);

app/Http/Controllers/Api/UserController.php

@@ -61,7 +61,8 @@ class UserController extends Controller
      */
     protected function getUserId(Request $request)
     {
-        if ($request->get('id') === null) {
+        $id = $request->get('id');
+        if ($id === null || $id === 'me') {
             return Auth::user()->id;
         }
 
@@ -89,10 +90,7 @@ class UserController extends Controller
      */
     public function get($id)
     {
-        $user = $this->userRepo
+        $user = $this->userSvc->getUser($id);
-            ->with(['airline', 'bids', 'rank'])
-            ->find($id);
-
         return new UserResource($user);
     }
 
@@ -108,7 +106,7 @@ class UserController extends Controller
      */
     public function bids(Request $request)
     {
-        $user = $this->userRepo->find($this->getUserId($request));
+        $user = $this->userSvc->getUser($this->getUserId($request));
 
         // Add a bid
         if ($request->isMethod('PUT') || $request->isMethod('POST')) {

app/Http/Controllers/Auth/LoginController.php

@@ -3,36 +3,98 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Contracts\Controller;
+use App\Exceptions\PilotIdNotFound;
 use App\Models\Enums\UserState;
+use App\Services\UserService;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
 
-/**
- * Class LoginController
- */
 class LoginController extends Controller
 {
     use AuthenticatesUsers;
 
     protected $redirectTo = '/dashboard';
 
+    /** @var UserService */
+    private $userSvc;
+
+    /** @var string */
+    private $loginFieldValue;
+
     /**
      * LoginController constructor.
+     *
+     * @param UserService $userSvc
      */
-    public function __construct()
+    public function __construct(UserService $userSvc)
     {
         $this->redirectTo = config('phpvms.login_redirect');
         $this->middleware('guest', ['except' => 'logout']);
+        $this->userSvc = $userSvc;
     }
 
     /**
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * Get the needed authorization credentials from the request.
+     * Overriding the value from the trait
+     *
+     * @override
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return array
      */
-    public function showLoginForm()
+    protected function credentials(Request $request)
     {
-        return view('auth/login');
+        return [
+            'email'    => $this->loginFieldValue,
+            'password' => $request->input('password'),
+        ];
+    }
+
+    /**
+     * Validate the user login request.
+     *
+     * @override
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return void
+     */
+    protected function validateLogin(Request $request)
+    {
+        $id_field = $request->input('email');
+        $validations = ['required', 'string'];
+
+        /*
+         * Trying to login by email or not?
+         *
+         * If not, run a validation rule which attempts to split the user by their VA and ID
+         * Then inject that user's email into the request
+         */
+        if (strpos($id_field, '@') !== false) {
+            $validations[] = 'email';
+            $this->loginFieldValue = $request->input('email');
+        } else {
+            $validations[] = function ($attr, $value, $fail) use ($request) {
+                try {
+                    $user = $this->userSvc->findUserByPilotId($value);
+                } catch (PilotIdNotFound $ex) {
+                    Log::warning('Error logging in, pilot_id not found, id='.$value);
+                    $fail('Pilot not found');
+                    return;
+                }
+
+                $request->email = $user->email;
+                $this->loginFieldValue = $user->email;
+            };
+        }
+
+        $request->validate([
+            'email'    => $validations,
+            'password' => 'required|string',
+        ]);
     }
 
     /**
@@ -47,8 +109,7 @@ class LoginController extends Controller
         $user->last_ip = $request->ip();
         $user->save();
 
-        // TODO: How to handle ON_LEAVE?
+        if ($user->state !== UserState::ACTIVE && $user->state !== UserState::ON_LEAVE) {
-        if ($user->state !== UserState::ACTIVE) {
             Log::info('Trying to login '.$user->ident.', state '
                 .UserState::label($user->state));
 

app/Http/Controllers/Auth/RegisterController.php

@@ -3,19 +3,20 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Contracts\Controller;
-use App\Http\Requests\CreateUserRequest;
 use App\Models\Enums\UserState;
 use App\Models\User;
+use App\Models\UserField;
+use App\Models\UserFieldValue;
 use App\Repositories\AirlineRepository;
 use App\Repositories\AirportRepository;
 use App\Services\UserService;
 use App\Support\Countries;
 use App\Support\Timezonelist;
-use Illuminate\Contracts\Validation\Validator;
 use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Validator;
 
 class RegisterController extends Controller
 {
@@ -61,12 +62,14 @@ 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])->get();
 
         return view('auth.register', [
-            'airports'  => $airports,
+            'airports'   => $airports,
-            'airlines'  => $airlines,
+            'airlines'   => $airlines,
-            'countries' => Countries::getSelectList(),
+            'countries'  => Countries::getSelectList(),
-            'timezones' => Timezonelist::toArray(),
+            'timezones'  => Timezonelist::toArray(),
+            'userFields' => $userFields,
         ]);
     }
 
@@ -81,13 +84,24 @@ class RegisterController extends Controller
     {
         $rules = [
             'name'            => 'required|max:255',
-            'email'           => 'required|email|max:255|unique:users, email',
+            'email'           => 'required|email|max:255|unique:users,email',
             'airline_id'      => 'required',
             'home_airport_id' => 'required',
             'password'        => 'required|min:5|confirmed',
             'toc_accepted'    => 'accepted',
         ];
 
+        // Dynamically add the required fields
+        $userFields = UserField::where([
+            'show_on_registration' => true,
+            'required'             => true,
+            'active'               => true,
+        ])->get();
+
+        foreach ($userFields as $field) {
+            $rules['field_'.$field->slug] = 'required';
+        }
+
         if (config('captcha.enabled')) {
             $rules['g-recaptcha-response'] = 'required|captcha';
         }
@@ -119,6 +133,15 @@ class RegisterController extends Controller
 
         Log::info('User registered: ', $user->toArray());
 
+        $userFields = UserField::all();
+        foreach ($userFields as $field) {
+            $field_name = 'field_'.$field->slug;
+            UserFieldValue::updateOrCreate([
+                'user_field_id' => $field->id,
+                'user_id'       => $user->id,
+            ], ['value' => $opts[$field_name]]);
+        }
+
         return $user;
     }
 
@@ -131,8 +154,10 @@ class RegisterController extends Controller
      *
      * @return mixed
      */
-    public function register(CreateUserRequest $request)
+    public function register(Request $request)
     {
+        $this->validator($request->all())->validate();
+
         $user = $this->create($request->all());
         if ($user->state === UserState::PENDING) {
             return view('auth.pending');

app/Http/Controllers/Frontend/FlightController.php

@@ -79,20 +79,26 @@ class FlightController extends Controller
             'visible' => true,
         ];
 
+        /** @var \App\Models\User $user */
+        $user = Auth::user();
+
         if (setting('pilots.restrict_to_company')) {
-            $where['airline_id'] = Auth::user()->airline_id;
+            $where['airline_id'] = $user->airline_id;
         }
 
         // default restrictions on the flights shown. Handle search differently
         if (setting('pilots.only_flights_from_current')) {
-            $where['dpt_airport_id'] = Auth::user()->curr_airport_id;
+            $where['dpt_airport_id'] = $user->curr_airport_id;
         }
 
         $this->flightRepo->resetCriteria();
 
         try {
             $this->flightRepo->searchCriteria($request);
-            $this->flightRepo->pushCriteria(new WhereCriteria($request, $where));
+            $this->flightRepo->pushCriteria(new WhereCriteria($request, $where, [
+                'airline' => ['active' => true],
+            ]));
+
             $this->flightRepo->pushCriteria(new RequestCriteria($request));
         } catch (RepositoryException $e) {
             Log::emergency($e);

app/Http/Controllers/Frontend/PageController.php

@@ -4,8 +4,10 @@ namespace App\Http\Controllers\Frontend;
 
 use App\Contracts\Controller;
 use App\Exceptions\PageNotFound;
+use App\Exceptions\Unauthorized;
 use App\Repositories\PageRepository;
 use Exception;
+use Illuminate\Support\Facades\Auth;
 
 class PageController extends Controller
 {
@@ -28,11 +30,16 @@ class PageController extends Controller
      */
     public function show($slug)
     {
+        /** @var \App\Models\Page $page */
         $page = $this->pageRepo->findWhere(['slug' => $slug])->first();
         if (!$page) {
             throw new PageNotFound(new Exception('Page not found'));
         }
 
+        if (!$page->public && !Auth::check()) {
+            throw new Unauthorized(new Exception('You must be logged in to view this page'));
+        }
+
         return view('pages.index', ['page' => $page]);
     }
 }

app/Http/Controllers/Frontend/PirepController.php

@@ -10,6 +10,7 @@ use App\Models\Enums\PirepState;
 use App\Models\Enums\PirepStatus;
 use App\Models\Pirep;
 use App\Models\SimBrief;
+use App\Models\User;
 use App\Repositories\AircraftRepository;
 use App\Repositories\AirlineRepository;
 use App\Repositories\AirportRepository;
@@ -180,8 +181,9 @@ class PirepController extends Controller
 
         $where = [['user_id', $user->id]];
         $where[] = ['state', '<>', PirepState::CANCELLED];
+        $with = ['airline', 'aircraft', 'dpt_airport', 'arr_airport', 'fares', 'comments'];
 
-        $this->pirepRepo->with(['airline', 'aircraft', 'dpt_airport', 'arr_airport'])
+        $this->pirepRepo->with($with)
             ->pushCriteria(new WhereCriteria($request, $where));
         $pireps = $this->pirepRepo->orderBy('created_at', 'desc')->paginate();
 
@@ -280,9 +282,11 @@ class PirepController extends Controller
      */
     public function store(CreatePirepRequest $request)
     {
-        // Create the main PIREP
+        /** @var User $user */
+        $user = Auth::user();
+
         $pirep = new Pirep($request->post());
-        $pirep->user_id = Auth::user()->id;
+        $pirep->user_id = $user->id;
 
         $attrs = $request->all();
         $attrs['submit'] = strtolower($attrs['submit']);
@@ -290,8 +294,13 @@ class PirepController extends Controller
         if ($attrs['submit'] === 'submit') {
             // Are they allowed at this airport?
             if (setting('pilots.only_flights_from_current')
-                && Auth::user()->curr_airport_id !== $pirep->dpt_airport_id) {
+                && $user->curr_airport_id !== $pirep->dpt_airport_id) {
-                Log::info('Pilot '.Auth::user()->id.' not at departure airport, erroring out');
+                Log::info(
+                    'Pilot '.$user->id
+                    .' not at departure airport (curr='.$user->curr_airport_id
+                    .', dpt='.$pirep->dpt_airport_id.')'
+                );
+
                 return $this->flashError(
                     'You are currently not at the departure airport!',
                     'frontend.pireps.create'
@@ -300,8 +309,8 @@ class PirepController extends Controller
 
             // Can they fly this aircraft?
             if (setting('pireps.restrict_aircraft_to_rank', false)
-                && !$this->userSvc->aircraftAllowed(Auth::user(), $pirep->aircraft_id)) {
+                && !$this->userSvc->aircraftAllowed($user, $pirep->aircraft_id)) {
-                Log::info('Pilot '.Auth::user()->id.' not allowed to fly aircraft');
+                Log::info('Pilot '.$user->id.' not allowed to fly aircraft');
                 return $this->flashError(
                     'You are not allowed to fly this aircraft!',
                     'frontend.pireps.create'
@@ -310,9 +319,20 @@ class PirepController extends Controller
 
             // is the aircraft in the right place?
             /* @noinspection NotOptimalIfConditionsInspection */
+            // Get the aircraft
+            $aircraft = $this->aircraftRepo->findWithoutFail($pirep->aircraft_id);
+            if ($aircraft === null) {
+                Log::error('Aircraft for PIREP not found, id='.$pirep->aircraft_id);
+                return $this->flashError(
+                    'The aircraft for the PIREP hasn\'t been found',
+                    'frontend.pireps.create'
+                );
+            }
+
             if (setting('pireps.only_aircraft_at_dpt_airport')
-                && $pirep->aircraft_id !== $pirep->dpt_airport_id) {
+                && $aircraft->airport_id !== $pirep->dpt_airport_id
-                Log::info('Aircraft '.$pirep->aircraft_id.' not at departure airport '.$pirep->dpt_airport_id.', erroring out');
+            ) {
+                Log::info('Aircraft '.$pirep->aircraft_id.' not at departure airport (curr='.$pirep->aircraft->airport_id.', apt='.$pirep->dpt_airport_id.')');
                 return $this->flashError(
                     'This aircraft is not positioned at the departure airport!',
                     'frontend.pireps.create'

app/Http/Controllers/Frontend/ProfileController.php

@@ -4,6 +4,8 @@ namespace App\Http\Controllers\Frontend;
 
 use App\Contracts\Controller;
 use App\Models\User;
+use App\Models\UserField;
+use App\Models\UserFieldValue;
 use App\Repositories\AirlineRepository;
 use App\Repositories\AirportRepository;
 use App\Repositories\UserRepository;
@@ -59,21 +61,14 @@ class ProfileController extends Controller
     }
 
     /**
+     * Redirect to show() since only a single page gets shown and the template controls
+     * the other items that are/aren't shown
+     *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function index()
     {
-        if (setting('pilots.home_hubs_only')) {
+        return $this->show(Auth::user()->id);
-            $airports = $this->airportRepo->findWhere(['hub' => true]);
-        } else {
-            $airports = $this->airportRepo->all();
-        }
-
-        return view('profile.index', [
-            'acars'    => $this->acarsEnabled(),
-            'user'     => Auth::user(),
-            'airports' => $airports,
-        ]);
     }
 
     /**
@@ -83,18 +78,23 @@ class ProfileController extends Controller
      */
     public function show($id)
     {
-        $user = User::where('id', $id)->first();
+        /** @var \App\Models\User $user */
+        $user = User::with(['awards', 'fields', 'fields.field'])
+            ->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,
+            'user'       => $user,
-            'airports' => $airports,
+            'userFields' => $userFields,
+            'airports'   => $airports,
         ]);
     }
 
@@ -109,22 +109,27 @@ class ProfileController extends Controller
      */
     public function edit(Request $request)
     {
-        $user = User::where('id', Auth::user()->id)->first();
+        /** @var \App\Models\User $user */
+        $user = User::with(['fields', 'fields.field'])
+            ->where('id', Auth::user()->id)
+            ->first();
+
         if (empty($user)) {
             Flash::error('User not found!');
-
             return redirect(route('frontend.dashboard.index'));
         }
 
         $airlines = $this->airlineRepo->selectBoxList();
         $airports = $this->airportRepo->selectBoxList(false, setting('pilots.home_hubs_only'));
+        $userFields = $this->userRepo->getUserFields($user, false);
 
         return view('profile.edit', [
-            'user'      => $user,
+            'user'       => $user,
-            'airlines'  => $airlines,
+            'airlines'   => $airlines,
-            'airports'  => $airports,
+            'airports'   => $airports,
-            'countries' => Countries::getSelectList(),
+            'countries'  => Countries::getSelectList(),
-            'timezones' => Timezonelist::toArray(),
+            'timezones'  => Timezonelist::toArray(),
+            'userFields' => $userFields,
         ]);
     }
 
@@ -140,13 +145,20 @@ class ProfileController extends Controller
         $id = Auth::user()->id;
         $user = $this->userRepo->findWithoutFail($id);
 
-        $validator = Validator::make($request->toArray(), [
+        $rules = [
             'name'       => 'required',
             'email'      => 'required|unique:users,email,'.$id,
             'airline_id' => 'required',
             'password'   => 'confirmed',
             'avatar'     => 'nullable|mimes:jpeg,png,jpg',
-        ]);
+        ];
+
+        $userFields = UserField::where(['show_on_registration' => true, 'required' => true])->get();
+        foreach ($userFields as $field) {
+            $rules['field_'.$field->slug] = 'required';
+        }
+
+        $validator = Validator::make($request->toArray(), $rules);
 
         if ($validator->fails()) {
             Log::info('validator failed for user '.$user->ident);
@@ -167,6 +179,7 @@ class ProfileController extends Controller
         if (isset($req_data['avatar']) !== null) {
             Storage::delete($user->avatar);
         }
+
         if ($request->hasFile('avatar')) {
             $avatar = $request->file('avatar');
             $file_name = $user->ident.'.'.$avatar->getClientOriginalExtension();
@@ -190,6 +203,16 @@ class ProfileController extends Controller
 
         $this->userRepo->update($req_data, $id);
 
+        // Save all of the user fields
+        $userFields = UserField::all();
+        foreach ($userFields as $field) {
+            $field_name = 'field_'.$field->slug;
+            UserFieldValue::updateOrCreate([
+                'user_field_id' => $field->id,
+                'user_id'       => $id,
+            ], ['value' => $request->get($field_name)]);
+        }
+
         Flash::success('Profile updated successfully!');
 
         return redirect(route('frontend.profile.index'));

app/Http/Controllers/System/ImporterController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Modules\Importer\Http\Controllers;
+namespace App\Http\Controllers\System;
 
 use App\Contracts\Controller;
+use App\Services\ImporterService;
 use App\Services\Installer\DatabaseService;
-use App\Services\Installer\InstallerService;
 use App\Support\Utils;
+use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
-use Modules\Importer\Services\ImporterService;
 
 class ImporterController extends Controller
 {
@@ -27,13 +27,11 @@ class ImporterController extends Controller
      * Show the main page for the importer; show form for the admin email
      * and the credentials for the other database
      *
-     * @param \Illuminate\Http\Request $request
-     *
      * @return mixed
      */
-    public function index(Request $request)
+    public function index()
     {
-        return view('importer::step1-configure');
+        return view('system.importer.step1-configure');
     }
 
     protected function testDb(Request $request)
@@ -51,7 +49,7 @@ class ImporterController extends Controller
     /**
      * Check the database connection
      *
-     * @param \Illuminate\Http\Request $request
+     * @param Request $request
      *
      * @return mixed
      */
@@ -62,12 +60,12 @@ class ImporterController extends Controller
 
         try {
             $this->testDb($request);
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             $status = 'danger';
             $message = 'Failed! '.$e->getMessage();
         }
 
-        return view('importer::dbtest', [
+        return view('system.importer.dbtest', [
             'status'  => $status,
             'message' => $message,
         ]);
@@ -76,7 +74,7 @@ class ImporterController extends Controller
     /**
      * The post from the above
      *
-     * @param \Illuminate\Http\Request $request
+     * @param Request $request
      *
      * @return mixed
      */
@@ -90,17 +88,17 @@ class ImporterController extends Controller
 
             // Generate the import manifest
             $manifest = $this->importerSvc->generateImportManifest();
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             Log::error($e->getMessage());
 
             // Send it to run, step1
-            return view('importer::error', [
+            return view('system.importer.error', [
                 'error' => $e->getMessage(),
             ]);
         }
 
         // Send it to run, step1
-        return view('importer::step2-processing', [
+        return view('system.importer.step2-processing', [
             'manifest' => $manifest,
         ]);
     }
@@ -111,9 +109,9 @@ class ImporterController extends Controller
      * stage=STAGE NAME
      * start=record_start
      *
-     * @param \Illuminate\Http\Request $request
+     * @param Request $request
      *
-     * @throws \Exception
+     * @throws Exception
      *
      * @return mixed
      */
@@ -136,9 +134,6 @@ class ImporterController extends Controller
      */
     public function complete()
     {
-        $installerSvc = app(InstallerService::class);
-        $installerSvc->disableInstallerModules();
-
         return redirect('/');
     }
 }

app/Http/Controllers/System/InstallerController.php

@@ -1,25 +1,32 @@
 <?php
 
-namespace Modules\Installer\Http\Controllers;
+namespace App\Http\Controllers\System;
 
 use App\Contracts\Controller;
 use App\Services\AirlineService;
 use App\Services\AnalyticsService;
+use App\Services\Installer\ConfigService;
 use App\Services\Installer\DatabaseService;
-use App\Services\Installer\InstallerService;
 use App\Services\Installer\MigrationService;
+use App\Services\Installer\RequirementsService;
 use App\Services\Installer\SeederService;
 use App\Services\UserService;
 use App\Support\Countries;
 use App\Support\Utils;
+use Exception;
+use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Contracts\View\Factory;
 use Illuminate\Database\QueryException;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Routing\Redirector;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\View\View;
+use function in_array;
 use Laracasts\Flash\Flash;
-use Modules\Installer\Services\ConfigService;
+use RuntimeException;
-use Modules\Installer\Services\RequirementsService;
 
 class InstallerController extends Controller
 {
@@ -72,10 +79,10 @@ class InstallerController extends Controller
     public function index()
     {
         if (config('app.key') !== 'base64:zdgcDqu9PM8uGWCtMxd74ZqdGJIrnw812oRMmwDF6KY=') {
-            return view('installer::errors/already-installed');
+            return view('system.installer.errors.already-installed');
         }
 
-        return view('installer::install/index-start');
+        return view('system.installer.install.index-start');
     }
 
     protected function testDb(Request $request)
@@ -92,6 +99,10 @@ class InstallerController extends Controller
 
     /**
      * Check the database connection
+     *
+     * @param Request $request
+     *
+     * @return Application|Factory|View
      */
     public function dbtest(Request $request)
     {
@@ -100,12 +111,12 @@ class InstallerController extends Controller
 
         try {
             $this->testDb($request);
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             $status = 'danger';
             $message = 'Failed! '.$e->getMessage();
         }
 
-        return view('installer::install/dbtest', [
+        return view('system.installer.install.dbtest', [
             'status'  => $status,
             'message' => $message,
         ]);
@@ -132,11 +143,9 @@ class InstallerController extends Controller
     /**
      * Step 1. Check the modules and permissions
      *
-     * @param Request $request
+     * @return Factory|View
-     *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function step1(Request $request)
+    public function step1()
     {
         $php_version = $this->reqSvc->checkPHPVersion();
         $extensions = $this->reqSvc->checkExtensions();
@@ -150,9 +159,9 @@ class InstallerController extends Controller
         ];
 
         // Make sure there are no false values
-        $passed = !\in_array(false, $statuses, true);
+        $passed = !in_array(false, $statuses, true);
 
-        return view('installer::install/steps/step1-requirements', [
+        return view('system.installer.install.steps.step1-requirements', [
             'php'         => $php_version,
             'extensions'  => $extensions,
             'directories' => $directories,
@@ -163,14 +172,12 @@ class InstallerController extends Controller
     /**
      * Step 2. Database Setup
      *
-     * @param Request $request
+     * @return Factory|View
-     *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function step2(Request $request)
+    public function step2()
     {
         $db_types = ['mysql' => 'mysql', 'sqlite' => 'sqlite'];
-        return view('installer::install/steps/step2-db', [
+        return view('system.installer.install.steps.step2-db', [
             'db_types' => $db_types,
         ]);
     }
@@ -180,7 +187,7 @@ class InstallerController extends Controller
      *
      * @param Request $request
      *
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @return RedirectResponse|Redirector
      */
     public function envsetup(Request $request)
     {
@@ -192,7 +199,7 @@ class InstallerController extends Controller
         // Before writing out the env file, test the DB credentials
         try {
             $this->testDb($request);
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             Log::error('Testing db before writing configs failed');
             Log::error($e->getMessage());
 
@@ -220,7 +227,7 @@ class InstallerController extends Controller
          */
         try {
             $this->envSvc->createConfigFiles($attrs);
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             Log::error('Config files failed to write');
             Log::error($e->getMessage());
 
@@ -236,11 +243,9 @@ class InstallerController extends Controller
     /**
      * Step 2b. Setup the database
      *
-     * @param Request $request
-     *
      * @return mixed
      */
-    public function dbsetup(Request $request)
+    public function dbsetup()
     {
         $console_out = '';
 
@@ -250,7 +255,7 @@ class InstallerController extends Controller
             $this->seederSvc->syncAllSeeds();
         } catch (QueryException $e) {
             Log::error('Error on db setup: '.$e->getMessage());
-            dd($e);
+            //dd($e);
             $this->envSvc->removeConfigFiles();
             Flash::error($e->getMessage());
             return redirect(route('installer.step2'))->withInput();
@@ -258,7 +263,7 @@ class InstallerController extends Controller
 
         $console_out = trim($console_out);
 
-        return view('installer::install/steps/step2a-db_output', [
+        return view('system.installer.install.steps.step2a-db_output', [
             'console_output' => $console_out,
         ]);
     }
@@ -266,9 +271,9 @@ class InstallerController extends Controller
     /**
      * Step 3. Setup the admin user and initial settings
      */
-    public function step3(Request $request)
+    public function step3()
     {
-        return view('installer::install/steps/step3-user', [
+        return view('system.installer.install.steps.step3-user', [
             'countries' => Countries::getSelectList(),
         ]);
     }
@@ -278,9 +283,8 @@ class InstallerController extends Controller
      *
      * @param Request $request
      *
-     * @throws \RuntimeException
+     * @throws RuntimeException
-     * @throws \Prettus\Validator\Exceptions\ValidatorException
+     * @throws Exception
-     * @throws \Exception
      *
      * @return mixed
      */
@@ -337,21 +341,16 @@ class InstallerController extends Controller
         // Try sending telemetry info
         $this->analyticsSvc->sendInstall();
 
-        return view('installer::install/steps/step3a-completed', []);
+        return view('system.installer.install.steps.step3a-completed', []);
     }
 
     /**
      * Final step
      *
-     * @param Request $request
+     * @return RedirectResponse|Redirector
-     *
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
-    public function complete(Request $request)
+    public function complete()
     {
-        $installerSvc = app(InstallerService::class);
-        $installerSvc->disableInstallerModules();
-
         return redirect('/login');
     }
 }

app/Http/Controllers/System/UpdateController.php

@@ -1,19 +1,23 @@
 <?php
 
-namespace Modules\Updater\Http\Controllers;
+namespace App\Http\Controllers\System;
 
 use App\Contracts\Controller;
 use App\Repositories\KvpRepository;
+use App\Services\AnalyticsService;
 use App\Services\Installer\InstallerService;
 use App\Services\Installer\MigrationService;
 use App\Services\Installer\SeederService;
 use Codedge\Updater\UpdaterManager;
 use function count;
+use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
+use Illuminate\View\View;
 
 class UpdateController extends Controller
 {
+    private $analyticsSvc;
     private $installerSvc;
     private $kvpRepo;
     private $migrationSvc;
@@ -21,19 +25,22 @@ class UpdateController extends Controller
     private $updateManager;
 
     /**
+     * @param AnalyticsService $analyticsSvc
      * @param InstallerService $installerSvc
+     * @param KvpRepository    $kvpRepo
      * @param MigrationService $migrationSvc
      * @param SeederService    $seederSvc
-     * @param KvpRepository    $kvpRepo
      * @param UpdaterManager   $updateManager
      */
     public function __construct(
+        AnalyticsService $analyticsSvc,
         InstallerService $installerSvc,
         KvpRepository $kvpRepo,
         MigrationService $migrationSvc,
         SeederService $seederSvc,
         UpdaterManager $updateManager
     ) {
+        $this->analyticsSvc = $analyticsSvc;
         $this->migrationSvc = $migrationSvc;
         $this->seederSvc = $seederSvc;
         $this->installerSvc = $installerSvc;
@@ -46,18 +53,16 @@ class UpdateController extends Controller
      */
     public function index()
     {
-        return view('updater::index-start');
+        return view('system.updater.index-start');
     }
 
     /**
      * Step 1. Check if there's an update available. Check if there
      * are any unrun migrations
      *
-     * @param Request $request
-     *
      * @return mixed
      */
-    public function step1(Request $request)
+    public function step1()
     {
         $this->installerSvc->clearCaches();
 
@@ -65,7 +70,7 @@ class UpdateController extends Controller
             Log::info('Upgrade is pending');
         }
 
-        return view('updater::steps/step1-update-available');
+        return view('system.updater.steps.step1-update-available');
     }
 
     /**
@@ -82,13 +87,13 @@ class UpdateController extends Controller
         $migrations = $this->migrationSvc->migrationsAvailable();
         if (count($migrations) === 0) {
             $this->seederSvc->syncAllSeeds();
-            return view('updater::steps/step3-update-complete');
+            return view('system.updater.steps.step3-update-complete');
         }
 
         $output = $this->migrationSvc->runAllMigrations();
         $this->seederSvc->syncAllSeeds();
 
-        return view('updater::steps/step2-migrations-done', [
+        return view('system.updater.steps.step2-migrations-done', [
             'console_output' => $output,
         ]);
     }
@@ -96,27 +101,23 @@ class UpdateController extends Controller
     /**
      * Final step
      *
-     * @param Request $request
-     *
      * @return mixed
      */
-    public function complete(Request $request)
+    public function complete()
     {
-        return redirect('/login');
+        return redirect('/admin');
     }
 
     /**
      * Show the update page with the latest version
      *
-     * @param \Illuminate\Http\Request $request
+     * @return Factory|View
-     *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function updater(Request $request)
+    public function updater()
     {
         $version = $this->kvpRepo->get('latest_version_tag');
 
-        return view('updater::downloader/downloader', [
+        return view('system.updater.downloader/downloader', [
             'version' => $version,
         ]);
     }
@@ -124,14 +125,18 @@ class UpdateController extends Controller
     /**
      * Download the actual update and then forward the user to the updater page
      *
-     * @param \Illuminate\Http\Request $request
-     *
      * @return mixed
      */
-    public function update_download(Request $request)
+    public function update_download()
     {
         $version = $this->kvpRepo->get('latest_version_tag');
-        $this->updateManager->source('github')->update($version);
+        if (empty($version)) {
+            return view('system.updater.steps.step1-no-update');
+        }
+
+        $release = $this->updateManager->source('github')->fetch($version);
+        $this->updateManager->source('github')->update($release);
+        $this->analyticsSvc->sendUpdate();
 
         Log::info('Update completed to '.$version.', redirecting');
         return redirect('/update');

app/Http/Kernel.php

@@ -45,6 +45,7 @@ class Kernel extends HttpKernel
             ShareErrorsFromSession::class,
             // VerifyCsrfToken::class,
             SubstituteBindings::class,
+            SetActiveTheme::class,
         ],
     ];
 

app/Http/Middleware/SetActiveTheme.php

@@ -13,8 +13,44 @@ use Illuminate\Support\Facades\Log;
  */
 class SetActiveTheme implements Middleware
 {
+    private static $skip = [
+        'admin',
+        'admin/*',
+        'api',
+        'api/*',
+        'importer',
+        'importer/*',
+        'install',
+        'install/*',
+        'update',
+        'update/*',
+    ];
+
+    /**
+     * Handle the request
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure                 $next
+     *
+     * @return mixed
+     */
     public function handle(Request $request, Closure $next)
     {
+        $this->setTheme($request);
+        return $next($request);
+    }
+
+    /**
+     * Set the theme for the current middleware
+     *
+     * @param \Illuminate\Http\Request $request
+     */
+    public function setTheme(Request $request)
+    {
+        if ($request->is(self::$skip)) {
+            return;
+        }
+
         try {
             $theme = setting('general.theme');
         } catch (\Exception $e) {
@@ -25,7 +61,5 @@ class SetActiveTheme implements Middleware
         if (!empty($theme)) {
             Theme::set($theme);
         }
-
-        return $next($request);
     }
 }

app/Http/Requests/Acars/PrefileRequest.php

@@ -11,7 +11,7 @@ class PrefileRequest extends FormRequest
         return [
             'airline_id'          => 'required|exists:airlines,id',
             'aircraft_id'         => 'required|exists:aircraft,id',
-            'flight_id'           => 'sometimes|exists:flights,id',
+            'flight_id'           => 'sometimes|nullable|exists:flights,id',
             'flight_number'       => 'required',
             'dpt_airport_id'      => 'required',
             'arr_airport_id'      => 'required',

app/Http/Requests/UpdatePageRequest.php

@@ -19,7 +19,7 @@ class UpdatePageRequest extends FormRequest
                 'required',
                 Rule::unique('pages')->ignore($this->id, 'id'),
             ],
-            'body' => 'required',
+            'body' => 'nullable',
         ];
     }
 }

app/Http/Resources/Fare.php

@@ -15,9 +15,9 @@ class Fare extends Resource
             'id'       => $this->id,
             'code'     => $this->code,
             'name'     => $this->name,
-            'price'    => $this->price,
-            'cost'     => $this->cost,
             'capacity' => $this->capacity,
+            'cost'     => $this->cost,
+            'price'    => $this->price,
             'type'     => $this->type,
             'notes'    => $this->notes,
             'active'   => $this->active,

app/Http/Resources/SimBrief.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Resources;
 
-use Illuminate\Http\Resources\Json\Resource;
+use App\Contracts\Resource;
 
 /**
  * @mixin \App\Models\SimBrief

app/Http/Resources/User.php

@@ -31,6 +31,7 @@ class User extends Resource
         $res['airline'] = Airline::make($this->whenLoaded('airline'));
         $res['bids'] = UserBid::collection($this->whenLoaded('bids'));
         $res['rank'] = Rank::make($this->whenLoaded('rank'));
+        $res['subfleets'] = Subfleet::make($this->whenLoaded('subfleets'));
 
         return $res;
     }

app/Listeners/AwardHandler.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Listeners;
+
+use App\Contracts\Listener;
+use App\Events\PirepAccepted;
+use App\Events\UserStateChanged;
+use App\Events\UserStatsChanged;
+use App\Models\Award;
+
+/**
+ * Look for and run any of the award classes. Don't modify this.
+ * See the documentation on creating awards:
+ *
+ * @url http://docs.phpvms.net/customizing/awards
+ */
+class AwardHandler extends Listener
+{
+    /** The events and the callback */
+    public static $callbacks = [
+        PirepAccepted::class    => 'onPirepAccept',
+        UserStatsChanged::class => 'onUserStatsChanged',
+        UserStateChanged::class => 'onUserStateChanged',
+    ];
+
+    /**
+     * Called when a PIREP is accepted
+     *
+     * @param \App\Events\PirepAccepted $event
+     */
+    public function onPirepAccept(PirepAccepted $event)
+    {
+        $this->checkForAwards($event->pirep->user);
+    }
+
+    /**
+     * When the user's state has changed
+     *
+     * @param \App\Events\UserStateChanged $event
+     */
+    public function onUserStateChanged(UserStateChanged $event): void
+    {
+        $this->checkForAwards($event->user);
+    }
+
+    /**
+     * Called when any of the user's states have changed
+     *
+     * @param UserStatsChanged $event
+     */
+    public function onUserStatsChanged(UserStatsChanged $event): void
+    {
+        $this->checkForAwards($event->user);
+    }
+
+    /**
+     * Check for any awards to be run and test them against the user
+     *
+     * @param \App\Models\User $user
+     */
+    public function checkForAwards($user)
+    {
+        $awards = Award::all();
+        foreach ($awards as $award) {
+            $klass = $award->getReference($award, $user);
+            if ($klass) {
+                $klass->handle();
+            }
+        }
+    }
+}

app/Listeners/AwardListener.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Listeners;
-
-use App\Contracts\Listener;
-use App\Events\UserStatsChanged;
-use App\Models\Award;
-
-/**
- * Look for and run any of the award classes. Don't modify this.
- * See the documentation on creating awards:
- *
- * @url http://docs.phpvms.net/customizing/awards
- */
-class AwardListener extends Listener
-{
-    /**
-     * Call all of the awards
-     *
-     * @param UserStatsChanged $event
-     */
-    public function handle(UserStatsChanged $event): void
-    {
-        $awards = Award::all();
-        foreach ($awards as $award) {
-            $klass = $award->getReference($award, $event->user);
-            if ($klass) {
-                $klass->handle();
-            }
-        }
-    }
-}

app/Models/Aircraft.php

@@ -16,6 +16,8 @@ use Carbon\Carbon;
  * @property string   icao
  * @property string   registration
  * @property int      flight_time
+ * @property float    mtow
+ * @property float    zfw
  * @property string   hex_code
  * @property Airport  airport
  * @property Subfleet subfleet
@@ -39,6 +41,7 @@ class Aircraft extends Model
         'registration',
         'hex_code',
         'flight_time',
+        'mtow',
         'zfw',
         'status',
         'state',
@@ -49,6 +52,7 @@ class Aircraft extends Model
      */
     protected $casts = [
         'subfleet_id' => 'integer',
+        'mtow'        => 'float',
         'zfw'         => 'float',
         'flight_time' => 'float',
         'state'       => 'integer',
@@ -62,6 +66,8 @@ class Aircraft extends Model
         'name'         => 'required',
         'status'       => 'required',
         'registration' => 'required',
+        'mtow'         => 'nullable|numeric',
+        'zfw'          => 'nullable|numeric',
     ];
 
     /**

app/Models/Enums/AnalyticsDimensions.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Models\Enums;
-
-use App\Contracts\Enum;
-
-class AnalyticsDimensions extends Enum
-{
-    public const PHP_VERSION = 1;
-    public const DATABASE_VERSION = 2;
-    public const PHPVMS_VERSION = 3;
-}

app/Models/Enums/AnalyticsMetrics.php

@@ -1,14 +0,0 @@
-<?php
-
-namespace App\Models\Enums;
-
-use App\Contracts\Enum;
-
-/**
- * Metrics IDs used in Google Analytics
- */
-class AnalyticsMetrics extends Enum
-{
-    // Track the lookup time for airports from vaCentral
-    public const AIRPORT_LOOKUP_TIME = 1;
-}

app/Models/Enums/PageType.php

@@ -6,6 +6,11 @@ use App\Contracts\Enum;
 
 class PageType extends Enum
 {
-    public const HTML = 0;
+    public const PAGE = 0;
-    public const MARKDOWN = 1;
+    public const LINK = 1;
+
+    public static $labels = [
+        self::PAGE => 'Page',
+        self::LINK => 'Link',
+    ];
 }

app/Models/File.php

@@ -9,14 +9,14 @@ use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 
 /**
- * @property string  $name
+ * @property string $name
- * @property string  $description
+ * @property string $description
- * @property string  $disk
+ * @property string $disk
- * @property string  $path
+ * @property string $path
- * @property bool $public
+ * @property bool   $public
- * @property int     $download_count
+ * @property int    $download_count
- * @property string  $url
+ * @property string $url
- * @property string  $filename
+ * @property string $filename
  */
 class File extends Model
 {