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

The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-AXIOS-1038255
Update User.php (#968 )
2020-12-24 02:26:09 +00:00 · 2020-12-23 11:27:01 -05:00 · 2020-12-21 11:30:44 -05:00 · 2020-12-21 10:53:50 -05:00 · 2020-12-18 14:34:05 -05:00 · 2020-12-07 10:19:43 -05:00
292 changed files with 34179 additions and 7464 deletions
@@ -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
@@ -28,6 +28,8 @@ services:
 install:
  - php --version
  - mysql --version
+  # Downgrade composer version to 1.x
+  - composer self-update --1
  - composer install --dev --no-interaction --verbose
  - npm i tar-to-zip -g
  - cp .travis/env.travis.php env.php
@@ -1,18 +1,15 @@
-# phpvms <sup>7</sup>
+# phpVMS <sup>7</sup>

 [![Build Status](https://travis-ci.org/nabeelio/phpvms.svg)](https://travis-ci.org/nabeelio/phpvms) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/d668bebb0a3c46bda381af16ce3d9450)](https://www.codacy.com/app/nabeelio/phpvms?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=nabeelio/phpvms&amp;utm_campaign=Badge_Grade) [![Latest Stable Version](https://poser.pugx.org/nabeel/phpvms/v/stable)](https://packagist.org/packages/nabeel/phpvms) ![StyleCI](https://github.styleci.io/repos/93688482/shield?branch=dev) [![License](https://poser.pugx.org/nabeel/phpvms/license)](https://packagist.org/packages/nabeel/phpvms)

-The next phpvms version built on the laravel framework. work in progress. The latest documentation, with installation instructions is available 
-                                                                          [on the phpVMS documentation](http://docs.phpvms.net/) page.
+The next phpvms version built on the laravel framework. work in progress. The latest documentation, with installation instructions is available [on the phpVMS documentation](https://docs.phpvms.net/) page.

-# installation
+## Installation

 A full distribution, with all of the composer dependencies, is available at this 
 [GitHub Releases](https://github.com/nabeelio/phpvms/releases) link. 

-
-
-## Requirements
+### Requirements

 - PHP 7.3+, extensions:
  - cURL
@@ -24,16 +21,16 @@ A full distribution, with all of the composer dependencies, is available at this
 - Database:
  - MySQL 5.5+ (or MySQL variant, including MariaDB and Percona)

-[View more details on requirements](http://docs.phpvms.net/setup/requirements)
+[View more details on requirements](https://docs.phpvms.net/requirements)

-## Installer
+### Installer

 1. Upload to your server
 1. Visit the site, and follow the link to the installer

-[View installation details](http://docs.phpvms.net/setup/installation)
+[View installation details](https://docs.phpvms.net/installation/installation)

-# development environment
+## Development Environment

 A full development environment can be brought up using Docker:

@@ -50,7 +47,7 @@ Then go to `http://localhost`. If you're using dnsmasq, the `app` container is l
 127.0.0.1   phpvms.test
 ```

-## Building JS/CSS assets
+### Building JS/CSS assets

 Yarn is required, run:

@@ -92,8 +92,9 @@ class CreateDatabase extends Command
        }

        if ($this->option('reset') === true) {
-            $cmd = ['rm', '-rf', config($dbkey.'database')];
-            $this->runCommand($cmd);
+            if (file_exists($dbPath)) {
+                unlink(config($dbkey.'database'));
+            }
        }

        if (!file_exists($dbPath)) {
@@ -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
 {
@@ -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] = [];
@@ -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)
@@ -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,
@@ -3,8 +3,11 @@
 namespace App\Contracts;

 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 +28,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 +61,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 +78,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 +86,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();
+    }
 }
@@ -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 [];
+    }
+}
@@ -5,11 +5,6 @@ use Illuminate\Database\Schema\Blueprint;

 class RolesPermissionsTables extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
    public function up()
    {
        // Create table for storing roles
@@ -79,11 +74,6 @@ class RolesPermissionsTables extends Migration
        $this->addData('roles', $roles);
    }

-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
    public function down()
    {
        Schema::dropIfExists('permission_user');
@@ -6,11 +6,6 @@ use Illuminate\Support\Facades\Schema;

 class CreatePasswordResetsTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
    public function up()
    {
        Schema::create('password_resets', function (Blueprint $table) {
@@ -20,11 +15,6 @@ class CreatePasswordResetsTable extends Migration
        });
    }

-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
    public function down()
    {
        Schema::dropIfExists('password_resets');
@@ -6,11 +6,6 @@ use Illuminate\Support\Facades\Schema;

 class CreateSessionsTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
    public function up()
    {
        Schema::create('sessions', function (Blueprint $table) {
@@ -23,11 +18,6 @@ class CreateSessionsTable extends Migration
        });
    }

-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
    public function down()
    {
        Schema::dropIfExists('sessions');
@@ -5,11 +5,6 @@ use Illuminate\Database\Schema\Blueprint;

 class CreateAirlinesTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
    public function up()
    {
        Schema::create('airlines', function (Blueprint $table) {
@@ -32,11 +27,6 @@ class CreateAirlinesTable extends Migration
        });
    }

-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
    public function down()
    {
        Schema::dropIfExists('airlines');
@@ -5,11 +5,6 @@ use Illuminate\Database\Schema\Blueprint;

 class CreateFaresTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
    public function up()
    {
        Schema::create('fares', function (Blueprint $table) {
@@ -25,11 +20,6 @@ class CreateFaresTable extends Migration
        });
    }

-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
    public function down()
    {
        Schema::dropIfExists('fares');
@@ -7,11 +7,6 @@ use Illuminate\Database\Schema\Blueprint;

 class CreateFlightTables extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
    public function up()
    {
        Schema::create('flights', function (Blueprint $table) {
@@ -5,11 +5,6 @@ use Illuminate\Database\Schema\Blueprint;

 class CreateRanksTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
    public function up()
    {
        Schema::create('ranks', function (Blueprint $table) {
@@ -30,11 +25,6 @@ class CreateRanksTable extends Migration
        });
    }

-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
    public function down()
    {
        Schema::dropIfExists('ranks');
@@ -3,9 +3,6 @@
 use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;

-/**
- * Class CreateSubfleetTables
- */
 class CreateSubfleetTables extends Migration
 {
    public function up()
@@ -48,11 +45,6 @@ class CreateSubfleetTables extends Migration
        });
    }

-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
    public function down()
    {
        Schema::dropIfExists('subfleets');
@@ -7,11 +7,6 @@ use Illuminate\Support\Facades\Schema;

 class CreateBidsTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
    public function up()
    {
        Schema::create('bids', function (Blueprint $table) {
@@ -25,11 +20,6 @@ class CreateBidsTable extends Migration
        });
    }

-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
    public function down()
    {
        Schema::dropIfExists('bids');
@@ -6,11 +6,6 @@ use Illuminate\Support\Facades\Schema;

 class CreateJobsTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
    public function up()
    {
        Schema::create('jobs', function (Blueprint $table) {
@@ -24,11 +19,6 @@ class CreateJobsTable extends Migration
        });
    }

-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
    public function down()
    {
        Schema::dropIfExists('jobs');
@@ -6,11 +6,6 @@ use Illuminate\Support\Facades\Schema;

 class CreateFailedJobsTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
    public function up()
    {
        Schema::create('failed_jobs', function (Blueprint $table) {
@@ -23,11 +18,6 @@ class CreateFailedJobsTable extends Migration
        });
    }

-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
    public function down()
    {
        Schema::dropIfExists('failed_jobs');
@@ -6,11 +6,6 @@ use Illuminate\Support\Facades\Schema;

 class CreateNavdataTables extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
    public function up()
    {
        /*
@@ -31,11 +26,6 @@ class CreateNavdataTables extends Migration
        });
    }

-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
    public function down()
    {
        Schema::dropIfExists('navdata');
@@ -7,11 +7,6 @@ use Illuminate\Support\Facades\Schema;

 class CreateAcarsTables extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
    public function up()
    {
        Schema::create('acars', function (Blueprint $table) {
@@ -44,11 +39,6 @@ class CreateAcarsTables extends Migration
        });
    }

-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
    public function down()
    {
        Schema::dropIfExists('acars');
@@ -6,11 +6,6 @@ use Illuminate\Support\Facades\Schema;

 class CreateStatsTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
    public function up()
    {
        Schema::create('stats', function (Blueprint $table) {
@@ -25,11 +20,6 @@ class CreateStatsTable extends Migration
        });
    }

-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
    public function down()
    {
        Schema::dropIfExists('stats');
@@ -17,11 +17,6 @@ class CreateNewsTable extends Migration
        });
    }

-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
    public function down()
    {
        Schema::drop('news');
@@ -3,14 +3,10 @@
 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.
-     *
-     * @return void
-     */
    public function up()
    {
        Schema::create('awards', function (Blueprint $table) {
@@ -23,7 +19,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,13 +33,20 @@ 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);
    }

-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
    public function down()
    {
        Schema::dropIfExists('awards');
@@ -6,11 +6,6 @@ use Illuminate\Support\Facades\Schema;

 class CreateJournalTransactionsTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
    public function up()
    {
        Schema::create('journal_transactions', function (Blueprint $table) {
@@ -34,11 +29,6 @@ class CreateJournalTransactionsTable extends Migration
        });
    }

-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
    public function down()
    {
        Schema::dropIfExists('journal_transactions');
@@ -6,11 +6,6 @@ use Illuminate\Support\Facades\Schema;

 class CreateJournalsTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
    public function up()
    {
        Schema::create('journals', function (Blueprint $table) {
@@ -24,11 +19,6 @@ class CreateJournalsTable extends Migration
        });
    }

-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
    public function down()
    {
        Schema::dropIfExists('journals');
@@ -1,6 +1,7 @@
 <?php

 use App\Contracts\Migration;
+use App\Contracts\Model;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

@@ -14,7 +15,7 @@ class CreateFilesTable extends Migration
    public function up()
    {
        Schema::create('files', function (Blueprint $table) {
-            $table->string('id', \App\Contracts\Model::ID_MAX_LENGTH);
+            $table->string('id', Model::ID_MAX_LENGTH);
            $table->string('name');
            $table->string('description')->nullable();
            $table->string('disk')->nullable();
@@ -1,17 +1,12 @@
 <?php

-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;

 class AddReadonlyToRoles extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
    public function up(): void
    {
        Schema::table('roles', static function (Blueprint $table) {
@@ -24,11 +19,6 @@ class AddReadonlyToRoles extends Migration
            ->update(['read_only' => true]);
    }

-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
    public function down(): void
    {
        Schema::table('roles', static function (Blueprint $table) {
@@ -1,21 +1,19 @@
 <?php

-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;

+/**
+ * Kinda of gross operations to change the pilot ID column
+ * 1. Add an `pilot_id` column, which will get populated with the current ID
+ * 2. Drop the `id` column, and then recreate it as a string field
+ * 3. Iterate through all of the users and set their `id` to the `pilot_id`
+ * 4. Change the other tables column types that reference `user_id`
+ */
 class UsersAddPilotId extends Migration
 {
-    /**
-     * Kinda of gross operations to change the pilot ID column
-     * 1. Add an `pilot_id` column, which will get populated with the current ID
-     * 2. Drop the `id` column, and then recreate it as a string field
-     * 3. Iterate through all of the users and set their `id` to the `pilot_id`
-     * 4. Change the other tables column types that reference `user_id`
-     *
-     * @return void
-     */
    public function up()
    {
        Schema::table('users', static function (Blueprint $table) {
@@ -29,11 +27,6 @@ class UsersAddPilotId extends Migration
        DB::table('users')->update(['pilot_id' => DB::raw('`id`')]);
    }

-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
    public function down()
    {
        Schema::table('users', function (Blueprint $table) {
@@ -1,16 +1,11 @@
 <?php

-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

 class CreateNotificationsTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
    public function up()
    {
        Schema::create('notifications', function (Blueprint $table) {
@@ -23,11 +18,6 @@ class CreateNotificationsTable extends Migration
        });
    }

-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
    public function down()
    {
        Schema::dropIfExists('notifications');
@@ -1,18 +1,16 @@
 <?php

+use App\Contracts\Migration;
 use App\Models\Enums\PirepState;
-use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;

+/**
+ * Change the PIREP state column to be a TINYINT
+ */
 class PirepsChangeStateType extends Migration
 {
-    /**
-     * Change the PIREP state column to be a TINYINT
-     *
-     * @return void
-     */
    public function up()
    {
        // Migrate the old rejected state
@@ -25,13 +23,4 @@ class PirepsChangeStateType extends Migration
            $table->unsignedSmallInteger('state')->change();
        });
    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-    }
 }
@@ -5,27 +5,15 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

+/**
+ * Add a `flight_id` column to the PIREPs table
+ */
 class PirepsAddFlightId extends Migration
 {
-    /**
-     * Add a `flight_id` column to the PIREPs table
-     */
    public function up()
    {
        Schema::table('pireps', function (Blueprint $table) {
            $table->string('flight_id', Model::ID_MAX_LENGTH)->nullable()->after('aircraft_id');
        });
    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('pireps', function (Blueprint $table) {
-            $table->dropColumn('flight_id');
-        });
-    }
 }
@@ -4,11 +4,11 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

+/**
+ * Add a `flight_type` column to the expenses table
+ */
 class ExpensesAddFlightType extends Migration
 {
-    /**
-     * Add a `flight_type` column to the expenses table
-     */
    public function up()
    {
        Schema::table('expenses', function (Blueprint $table) {
@@ -18,11 +18,6 @@ class ExpensesAddFlightType extends Migration
        });
    }

-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
    public function down()
    {
        Schema::table('expenses', function (Blueprint $table) {
@@ -1,6 +1,6 @@
 <?php

-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\Migration;
 use Illuminate\Support\Facades\Schema;

 /**
@@ -25,13 +25,4 @@ class ModifyAirportsCoordinates extends Migration
            $table->decimal('lon', 11, 5)->change()->default(0.0)->nullable();
        });
    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-    }
 }
@@ -1,6 +1,6 @@
 <?php

-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\Migration;
 use Illuminate\Support\Facades\Schema;

 /**
@@ -8,24 +8,10 @@ use Illuminate\Support\Facades\Schema;
 */
 class FlightFieldNullable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
    public function up()
    {
        Schema::table('flight_field_values', function ($table) {
            $table->text('value')->change()->nullable();
        });
    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-    }
 }
@@ -1,14 +1,14 @@
 <?php

-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

+/**
+ * Add a `load_factor` and `load_factor_variance` columns to the expenses table
+ */
 class FlightsAddLoadFactor extends Migration
 {
-    /**
-     * Add a `load_factor` and `load_factor_variance` columns to the expenses table
-     */
    public function up()
    {
        Schema::table('flights', function (Blueprint $table) {
@@ -22,11 +22,6 @@ class FlightsAddLoadFactor extends Migration
        });
    }

-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
    public function down()
    {
        Schema::table('flights', function (Blueprint $table) {
@@ -1,14 +1,14 @@
 <?php

-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

+/**
+ * Add a `pilot_pay` column for a fixed amount to pay to a pilot for a flight
+ */
 class FlightsAddPilotPay extends Migration
 {
-    /**
-     * Add a `pilot_pay` column for a fixed amount to pay to a pilot for a flight
-     */
    public function up()
    {
        Schema::table('flights', function (Blueprint $table) {
@@ -18,11 +18,6 @@ class FlightsAddPilotPay extends Migration
        });
    }

-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
    public function down()
    {
        Schema::table('flights', function (Blueprint $table) {
@@ -1,15 +1,15 @@
 <?php

+use App\Contracts\Migration;
 use App\Models\Enums\FareType;
-use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

+/**
+ * Add a `pilot_pay` column for a fixed amount to pay to a pilot for a flight
+ */
 class FaresAddType extends Migration
 {
-    /**
-     * Add a `pilot_pay` column for a fixed amount to pay to a pilot for a flight
-     */
    public function up()
    {
        Schema::table('fares', function (Blueprint $table) {
@@ -19,16 +19,4 @@ class FaresAddType extends Migration
                ->after('capacity');
        });
    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('fares', function (Blueprint $table) {
-            $table->dropColumn('type');
-        });
-    }
 }
@@ -1,6 +1,6 @@
 <?php

-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

@@ -33,13 +33,4 @@ class IncreaseIdLengths extends Migration
            });
        }
    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-    }
 }
@@ -1,6 +1,6 @@
 <?php

-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

@@ -15,13 +15,4 @@ class RemoveSubfleetTypeIndex extends Migration
            $table->dropUnique(['type']);
        });
    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-    }
 }
@@ -1,6 +1,6 @@
 <?php

-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

@@ -1,7 +1,7 @@
 <?php

+use App\Contracts\Migration;
 use App\Models\Enums\PageType;
-use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

@@ -11,11 +11,6 @@ use Illuminate\Support\Facades\Schema;
 */
 class CreatePages extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
    public function up()
    {
        Schema::create('pages', function (Blueprint $table) {
@@ -33,11 +28,6 @@ class CreatePages extends Migration
        });
    }

-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
    public function down()
    {
        Schema::dropIfExists('pages');
@@ -1,6 +1,6 @@
 <?php

-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

@@ -9,11 +9,7 @@ class AirlineRemoveNullable extends Migration
    public function up()
    {
        Schema::table('airlines', function (Blueprint $table) {
-            $table->dropUnique('airlines_iata_unique');
+            $table->dropUnique(['iata']);
        });
    }
-
-    public function down()
-    {
-    }
 }
@@ -1,6 +1,6 @@
 <?php

-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

@@ -12,8 +12,4 @@ class PageIconNullable extends Migration
            $table->string('icon')->change()->nullable();
        });
    }
-
-    public function down()
-    {
-    }
 }
@@ -1,15 +1,15 @@
 <?php

-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

+/**
+ * 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
+ */
 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) {
@@ -23,9 +23,6 @@ class PagesAddLink extends Migration
        });
    }

-    /**
-     * @return void
-     */
    public function down()
    {
        Schema::table('fares', function (Blueprint $table) {
@@ -5,11 +5,11 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

+/**
+ * Add two tables for holding user fields and the values
+ */
 class CreateUserFields extends Migration
 {
-    /**
-     * Add two tables for holding user fields and the values
-     */
    public function up()
    {
        /*
@@ -39,11 +39,4 @@ class CreateUserFields extends Migration
            $table->index(['user_field_id', 'user_id']);
        });
    }
-
-    /**
-     * @return void
-     */
-    public function down()
-    {
-    }
 }
@@ -1,6 +1,6 @@
 <?php

-use Illuminate\Database\Migrations\Migration;
+use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

@@ -19,11 +19,6 @@ class AircraftAddMtow extends Migration
        });
    }

-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
    public function down()
    {
        Schema::table('aircraft', function (Blueprint $table) {
@@ -0,0 +1,29 @@
+<?php
+
+use App\Contracts\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateModulesTable extends Migration
+{
+    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']);
+    }
+
+    public function down()
+    {
+        Schema::dropIfExists('modules');
+    }
+}
@@ -0,0 +1,18 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+/**
+ * Change the pages body column type to a Medium Text, max size of 16MB
+ */
+class ModifyPagesSize extends Migration
+{
+    public function up()
+    {
+        Schema::table('pages', function (Blueprint $table) {
+            $table->mediumText('body')->change()->nullable();
+        });
+    }
+}
@@ -0,0 +1,19 @@
+<?php
+
+use App\Contracts\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+/**
+ * Change the downloads link size
+ */
+class ModifyDownloadLinkSize extends Migration
+{
+    public function up()
+    {
+        Schema::table('files', function (Blueprint $table) {
+            $table->mediumText('disk')->change()->nullable();
+            $table->mediumText('path')->change()->nullable();
+        });
+    }
+}
@@ -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();
    }
 }
@@ -1 +1,2 @@
 local.yml
+vmsacars.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
-    registration:
+    landing_time: null
+    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
-    ground_handling_multiplier: 200
-  - id: 2
+    name: '747-43X RB211-524G'
+    cost_block_hour: '1000.00'
+    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
-    ground_handling_multiplier: 150
-  - id: 3
+    name: '777-222ER GE90-76B'
+    cost_block_hour: '500.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: 3
    airline_id: 1
-    name: 777-367 ER GE90-115B
    type: 772-36ER-GE90-115B
-    cost_block_hour: 100
-    ground_handling_multiplier: 150
+    name: '777-367 ER GE90-115B'
+    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
-    capacity: 400
-  - subfleet_id: 1
+    price: '200'
+    cost: null
+    capacity: '400'
+    created_at: null
+    updated_at: null
+  -
+    subfleet_id: 1
    fare_id: 2
    price: 120%
-  - subfleet_id: 1
-    fare_id: 3
-    price: 1000
-    capacity: 110%
-
-  # Fare classes on the 777
-  - subfleet_id: 2
-    fare_id: 1
-  - subfleet_id: 2
-    fare_id: 3
-    capacity: 10
-
-subfleet_rank:
-  - rank_id: 1
+    cost: null
+    capacity: null
+    created_at: null
+    updated_at: null
+  -
    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
@@ -92,3 +92,10 @@ user_field_values:
    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
@@ -0,0 +1,10 @@
+- name: 'Awards'
+  enabled: 1
+- name: 'Sample'
+  enabled: 1
+- name: 'VMSAcars'
+  enabled: 1
+- name: 'Vacentral'
+  enabled: 1
+- name: 'TestModule'
+  enabled: 1
@@ -51,3 +51,6 @@
 - name: maintenance
  display_name: Maintenance
  description: Run maintenance tasks
+- name: modules
+  display_name: Modules
+  description: Add/Edit Modules
@@ -130,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
@@ -18,7 +18,7 @@ class ValidationException extends AbstractHttpException

        parent::__construct(
            400,
-            'Validation exception'
+            'Validation Error'
        );
    }

@@ -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 [];
+    }
+}
@@ -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 [];
+    }
+}
@@ -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 [];
+    }
+}
@@ -160,6 +160,7 @@ class AircraftController extends Controller
     */
    public function update($id, UpdateAircraftRequest $request)
    {
+        /** @var \App\Models\Aircraft $aircraft */
        $aircraft = $this->aircraftRepo->findWithoutFail($id);

        if (empty($aircraft)) {
@@ -171,7 +172,7 @@ class AircraftController extends Controller
        $this->aircraftRepo->update($attrs, $id);

        Flash::success('Aircraft updated successfully.');
-        return redirect(route('admin.aircraft.index'));
+        return redirect(route('admin.aircraft.index').'?subfleet='.$aircraft->subfleet_id);
    }

    /**
@@ -183,6 +184,7 @@ class AircraftController extends Controller
     */
    public function destroy($id)
    {
+        /** @var \App\Models\Aircraft $aircraft */
        $aircraft = $this->aircraftRepo->findWithoutFail($id);

        if (empty($aircraft)) {
@@ -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.');
@@ -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));
+    }
+}
@@ -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);
-
-        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'),
-        ]);
+        return $this->edit($id);
    }

    /**
@@ -154,12 +137,14 @@ class UserController extends Controller
     *
     * @param int $id
     *
+     * @throws RepositoryException
+     *
     * @return mixed
     */
    public function edit($id)
    {
        $user = $this->userRepo
-            ->with(['fields', 'rank'])
+            ->with(['awards', 'fields', 'rank'])
            ->findWithoutFail($id);

        if (empty($user)) {
@@ -171,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']];
            });
@@ -182,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,
@@ -280,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
     *
@@ -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);
    }
@@ -109,6 +122,7 @@ class FlightController extends Controller
            $flights = $this->flightRepo
                ->with([
                    'airline',
+                    'fares',
                    'subfleets',
                    'subfleets.aircraft',
                    'subfleets.fares',
@@ -124,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);
@@ -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
-            ->with(['airline', 'bids', 'rank'])
-            ->find($id);
-
+        $user = $this->userSvc->getUser($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')) {
@@ -42,7 +42,14 @@ class DownloadController extends Controller
            $category = explode('\\', $class);
            $category = end($category);

-            $group_name = $category.' - '.$obj->name;
+            if ($category == 'Aircraft') {
+                $group_name = $category.' > '.$obj->icao.' '.$obj->registration;
+            } elseif ($category == 'Airport') {
+                $group_name = $category.' > '.$obj->icao.' : '.$obj->name.' ('.$obj->country.')';
+            } else {
+                $group_name = $category.' > '.$obj->name;
+            }
+
            $regrouped_files[$group_name] = $files;
        }

@@ -181,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();

@@ -61,27 +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()
    {
-        /** @var User $user */
-        $user = Auth::user();
-
-        if (setting('pilots.home_hubs_only')) {
-            $airports = $this->airportRepo->findWhere(['hub' => true]);
-        } else {
-            $airports = $this->airportRepo->all();
-        }
-
-        $userFields = $this->userRepo->getUserFields($user);
-
-        return view('profile.index', [
-            'acars'      => $this->acarsEnabled(),
-            'user'       => $user,
-            'airports'   => $airports,
-            'userFields' => $userFields,
-        ]);
+        return $this->show(Auth::user()->id);
    }

    /**
@@ -91,7 +78,8 @@ class ProfileController extends Controller
     */
    public function show($id)
    {
-        $user = User::with(['fields', 'fields.field'])
+        /** @var \App\Models\User $user */
+        $user = User::with(['awards', 'fields', 'fields.field'])
            ->where('id', $id)
            ->first();

@@ -208,6 +196,7 @@ class ProfileController extends Controller
            });

            $canvas->insert($image);
+            Log::info('Uploading avatar into folder '.public_path('uploads/avatars'));
            $canvas->save(public_path('uploads/avatars/'.$file_name));

            $req_data['avatar'] = $path;
@@ -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('/');
    }
 }
@@ -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 Modules\Installer\Services\RequirementsService;
+use RuntimeException;

 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 \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @return Factory|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 \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @return Factory|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 \Prettus\Validator\Exceptions\ValidatorException
-     * @throws \Exception
+     * @throws RuntimeException
+     * @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 \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @return RedirectResponse|Redirector
     */
-    public function complete(Request $request)
+    public function complete()
    {
-        $installerSvc = app(InstallerService::class);
-        $installerSvc->disableInstallerModules();
-
        return redirect('/login');
    }
 }
@@ -1,6 +1,6 @@
 <?php

-namespace Modules\Updater\Http\Controllers;
+namespace App\Http\Controllers\System;

 use App\Contracts\Controller;
 use App\Repositories\KvpRepository;
@@ -10,8 +10,10 @@ 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
 {
@@ -51,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();

@@ -70,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');
    }

    /**
@@ -87,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,
        ]);
    }
@@ -101,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 \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @return Factory|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,
        ]);
    }
@@ -129,15 +125,13 @@ 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');
        if (empty($version)) {
-            return view('updater::steps/step1-no-update');
+            return view('system.updater.steps.step1-no-update');
        }

        $release = $this->updateManager->source('github')->fetch($version);
@@ -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',
@@ -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,
@@ -18,17 +18,17 @@ class Flight extends Resource
    private function setFields()
    {
        /** @var \Illuminate\Support\Collection $field_values */
+        $return_values = new stdClass();
        $field_values = $this->field_values;
        if (empty($field_values) || $field_values->count() === 0) {
-            return new stdClass();
+            return $return_values;
        }

-        $fields = [];
        foreach ($field_values as $field) {
-            $fields[$field->name] = $field->value;
+            $return_values->{$field->name} = $field->value;
        }

-        return $fields;
+        return $return_values;
    }

    /**
@@ -16,6 +16,7 @@ class User extends Resource
            'pilot_id'      => $this->pilot_id,
            'ident'         => $this->ident,
            'name'          => $this->name,
+            'name_private'  => $this->name_private,
            'email'         => $this->email,
            'avatar'        => $this->resolveAvatarUrl(),
            'rank_id'       => $this->rank_id,
@@ -31,6 +32,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;
    }
@@ -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();
+            }
+        }
+    }
+}
@@ -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();
-            }
-        }
-    }
-}
@@ -25,6 +25,10 @@ use Illuminate\Support\Collection;
 * @property int        distance
 * @property int        flight_time
 * @property string     route
+ * @property string     dpt_time
+ * @property string     arr_time
+ * @property string     flight_type
+ * @property string     notes
 * @property int        level
 * @property float      load_factor
 * @property float      load_factor_variance
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Models;
+
+use App\Contracts\Model;
+use Carbon\Carbon;
+
+/**
+ * @property string name
+ * @property bool   enabled
+ * @property Carbon created_at
+ * @property Carbon updated_at
+ */
+class Module extends Model
+{
+    public $table = 'modules';
+
+    public $fillable = [
+        'name',
+        'enabled',
+        'created_at',
+        'updated_at',
+    ];
+
+    protected $casts = [
+        'enabled' => 'boolean',
+    ];
+
+    public static $rules = [
+        'name' => 'required',
+    ];
+}
@@ -75,6 +75,7 @@ class Pirep extends Model
        'flight_number',
        'route_code',
        'route_leg',
+        'flight_id',
        'dpt_airport_id',
        'arr_airport_id',
        'alt_airport_id',
@@ -31,7 +31,6 @@ class Subfleet extends Model
        'airline_id',
        'type',
        'name',
-        'turn_time',
        'fuel_type',
        'cost_block_hour',
        'cost_delay_minute',
@@ -36,6 +36,7 @@ use Laratrust\Traits\LaratrustUserTrait;
 * @property int              state
 * @property bool             opt_in
 * @property string           last_pirep_id
+ * @property Pirep            last_pirep
 * @property UserFieldValue[] fields
 *
 * @mixin \Illuminate\Database\Eloquent\Builder
@@ -208,9 +209,12 @@ class User extends Authenticatable
        return $this->belongsTo(Airline::class, 'airline_id');
    }

+    /**
+     * @return \App\Models\Award[]|mixed
+     */
    public function awards()
    {
-        return $this->hasMany(UserAward::class, 'user_id');
+        return $this->belongsToMany(Award::class, 'user_awards');
    }

    /**
@@ -5,7 +5,7 @@ namespace App\Providers;
 use App\Events\Expenses;
 use App\Events\PirepFiled;
 use App\Events\UserStatsChanged;
-use App\Listeners\AwardListener;
+use App\Listeners\AwardHandler;
 use App\Listeners\BidEventHandler;
 use App\Listeners\ExpenseListener;
 use App\Listeners\FinanceEventHandler;
@@ -33,7 +33,7 @@ class EventServiceProvider extends ServiceProvider
        ],

        UserStatsChanged::class => [
-            AwardListener::class,
+
        ],

        UpdateAvailable::class => [],
@@ -44,5 +44,6 @@ class EventServiceProvider extends ServiceProvider
        BidEventHandler::class,
        FinanceEventHandler::class,
        EventHandler::class,
+        AwardHandler::class,
    ];
 }
@@ -27,6 +27,74 @@ class RouteServiceProvider extends ServiceProvider
        $this->mapWebRoutes();
        $this->mapAdminRoutes();
        $this->mapApiRoutes();
+        $this->mapImporterRoutes();
+        $this->mapInstallerRoutes();
+        $this->mapUpdaterRoutes();
+    }
+
+    private function mapImporterRoutes()
+    {
+        Route::group([
+            'as'         => 'importer.',
+            'prefix'     => 'importer',
+            'middleware' => ['web'],
+            'namespace'  => 'App\Http\Controllers\System',
+        ], function () {
+            Route::get('/', 'ImporterController@index')->name('index');
+            Route::post('/config', 'ImporterController@config')->name('config');
+            Route::post('/dbtest', 'ImporterController@dbtest')->name('dbtest');
+
+            // Run the actual importer process. Additional middleware
+            Route::post('/run', 'ImporterController@run')->middleware('api')->name('run');
+            Route::post('/complete', 'ImporterController@complete')->name('complete');
+        });
+    }
+
+    private function mapInstallerRoutes()
+    {
+        Route::group([
+            'as'         => 'installer.',
+            'prefix'     => 'install',
+            'middleware' => ['web'],
+            'namespace'  => 'App\Http\Controllers\System',
+        ], function () {
+            Route::get('/', 'InstallerController@index')->name('index');
+            Route::post('/dbtest', 'InstallerController@dbtest')->name('dbtest');
+
+            Route::get('/step1', 'InstallerController@step1')->name('step1');
+            Route::post('/step1', 'InstallerController@step1')->name('step1post');
+
+            Route::get('/step2', 'InstallerController@step2')->name('step2');
+            Route::post('/envsetup', 'InstallerController@envsetup')->name('envsetup');
+            Route::get('/dbsetup', 'InstallerController@dbsetup')->name('dbsetup');
+
+            Route::get('/step3', 'InstallerController@step3')->name('step3');
+            Route::post('/usersetup', 'InstallerController@usersetup')->name('usersetup');
+
+            Route::get('/complete', 'InstallerController@complete')->name('complete');
+        });
+    }
+
+    protected function mapUpdaterRoutes()
+    {
+        Route::group([
+            'as'         => 'update.',
+            'prefix'     => 'update',
+            'middleware' => ['web', 'auth', 'ability:admin,admin-access'],
+            'namespace'  => 'App\Http\Controllers\System',
+        ], function () {
+            Route::get('/', 'UpdateController@index')->name('index');
+
+            Route::get('/step1', 'UpdateController@step1')->name('step1');
+            Route::post('/step1', 'UpdateController@step1')->name('step1post');
+
+            Route::post('/run-migrations', 'UpdateController@run_migrations')->name('run_migrations');
+            Route::get('/complete', 'UpdateController@complete')->name('complete');
+
+            // Routes for the update downloader
+            Route::get('/downloader', 'UpdateController@updater')->name('updater');
+            Route::post('/downloader', 'UpdateController@update_download')->name('update_download');
+        });
    }

    /**
@@ -41,7 +109,7 @@ class RouteServiceProvider extends ServiceProvider
        Route::group([
            'middleware' => ['web'],
            'namespace'  => $this->namespace,
-        ], function ($router) {
+        ], function () {
            Route::group([
                'namespace'  => 'Frontend',
                'prefix'     => '',
@@ -356,10 +424,17 @@ class RouteServiceProvider extends ServiceProvider

            Route::resource('subfleets', 'SubfleetController')->middleware('ability:admin,fleet');

-            Route::resource('users', 'UserController')->middleware('ability:admin,users');
+            /**
+             * USERS
+             */
+            Route::delete('users/{id}/award/{award_id}', 'UserController@destroy_user_award')
+                ->name('users.destroy_user_award')->middleware('ability:admin,users');
+
            Route::get('users/{id}/regen_apikey', 'UserController@regen_apikey')
                ->name('users.regen_apikey')->middleware('ability:admin,users');

+            Route::resource('users', 'UserController')->middleware('ability:admin,users');
+
            // defaults
            Route::get('', ['uses' => 'DashboardController@index'])
                ->middleware('update_pending', 'ability:admin,admin-access');
@@ -378,6 +453,35 @@ class RouteServiceProvider extends ServiceProvider
                'delete',
            ], 'dashboard/news', ['uses' => 'DashboardController@news'])
                ->name('dashboard.news')->middleware('update_pending', 'ability:admin,admin-access');
+
+            //Modules
+            Route::group([
+                'as'         => 'modules.',
+                'prefix'     => 'modules',
+                'middleware' => ['ability:admin, modules'],
+            ], function () {
+
+                //Modules Index
+                Route::get('/', 'ModulesController@index')->name('index');
+
+                //Add Module
+                Route::get('/create', 'ModulesController@create')->name('create');
+
+                //Store Module
+                Route::post('/create', 'ModulesController@store')->name('store');
+
+                //Enable Module
+                Route::post('/enable', 'ModulesController@enable')->name('enable');
+
+                //Edit Module
+                Route::get('/{id}/edit', 'ModulesController@edit')->name('edit');
+
+                //Update Module
+                Route::post('/{id}', 'ModulesController@update')->name('update');
+
+                //Delete Module
+                Route::delete('/{id}', 'ModulesController@destroy')->name('destroy');
+            });
        });
    }

@@ -395,7 +499,7 @@ class RouteServiceProvider extends ServiceProvider
            'namespace'  => $this->namespace.'\\Api',
            'prefix'     => 'api',
            'as'         => 'api.',
-        ], function ($router) {
+        ], function () {
            Route::group([], function () {
                Route::get('acars', 'AcarsController@live_flights');
                Route::get('acars/geojson', 'AcarsController@pireps_geojson');
@@ -476,6 +580,7 @@ class RouteServiceProvider extends ServiceProvider
                Route::post('user/bids', 'UserController@bids');
                Route::delete('user/bids', 'UserController@bids');

+                Route::get('users/me', 'UserController@index');
                Route::get('users/{id}', 'UserController@get');
                Route::get('users/{id}/fleet', 'UserController@fleet');
                Route::get('users/{id}/pireps', 'UserController@pireps');
@@ -8,9 +8,6 @@ use Illuminate\Support\Collection;
 use Prettus\Repository\Contracts\CacheableInterface;
 use Prettus\Repository\Traits\CacheableRepository;

-/**
- * Class ExpenseRepository
- */
 class ExpenseRepository extends Repository implements CacheableInterface
 {
    use CacheableRepository;
@@ -24,17 +21,18 @@ class ExpenseRepository extends Repository implements CacheableInterface
     * Get all of the expenses for a given type, and also
     * include expenses for a given airline ID
     *
-     * @param        $type
-     * @param int    $airline_id
-     * @param string $ref_model
-     * @param mixed  $ref_model_id
+     * @param       $type
+     * @param null  $airline_id
+     * @param null  $ref_model
+     * @param mixed $ref_model_id
     *
     * @return Collection
     */
    public function getAllForType($type, $airline_id = null, $ref_model = null, $ref_model_id = null)
    {
        $where = [
-            'type' => $type,
+            'type'   => $type,
+            'active' => true,
            ['airline_id', '=', null],
        ];

@@ -59,6 +57,7 @@ class ExpenseRepository extends Repository implements CacheableInterface
        if ($airline_id) {
            $where = [
                'type'       => $type,
+                'active'     => true,
                'airline_id' => $airline_id,
            ];

@@ -13,12 +13,24 @@ use Illuminate\Support\Facades\Log;

 class BidService extends Service
 {
+    /** @var FareService */
+    private $fareSvc;
+
+    /** @var FlightService */
+    private $flightSvc;
+
+    public function __construct(FareService $fareSvc, FlightService $flightSvc)
+    {
+        $this->fareSvc = $fareSvc;
+        $this->flightSvc = $flightSvc;
+    }
+
    /**
     * Get a specific bid for a user
     *
     * @param $bid_id
     *
-     * @return \App\Models\Bid|\Illuminate\Database\Eloquent\Model|object|null
+     * @return \App\Models\Bid|\Illuminate\Database\Eloquent\Model|tests/ImporterTest.php:521object|null
     */
    public function getBid($bid_id)
    {
@@ -35,8 +47,22 @@ class BidService extends Service
     */
    public function findBidsForUser(User $user)
    {
-        return Bid::with(['flight', 'flight.simbrief'])
+        $bids = Bid::with([
+            'flight',
+            'flight.fares',
+            'flight.simbrief',
+            'flight.subfleets',
+            'flight.subfleets.aircraft',
+            'flight.subfleets.fares',
+        ])
            ->where(['user_id' => $user->id])->get();
+
+        foreach ($bids as $bid) {
+            $bid->flight = $this->flightSvc->filterSubfleets($user, $bid->flight);
+            $bid->flight = $this->fareSvc->getReconciledFaresForFlight($bid->flight);
+        }
+
+        return $bids;
    }

    /**
@@ -38,10 +38,9 @@ class CronService extends Service
        }

        $path = [
-            'cd '.base_path(),
-            '&&',
            $php_exec,
-            'artisan schedule:run',
+            base_path('artisan'),
+            'schedule:run',
        ];

        return implode(' ', $path);
@@ -9,17 +9,99 @@ use App\Models\Pirep;
 use App\Models\PirepFare;
 use App\Models\Subfleet;
 use App\Support\Math;
+use function count;
+use Illuminate\Database\Eloquent\Relations\Pivot;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
+use InvalidArgumentException;

 class FareService extends Service
 {
    /**
-     * Get the fares for a particular flight, with an optional subfleet
-     * This will go through if there are any fares assigned to the flight,
-     * and then check the fares assigned on the subfleet, and give the
-     * final "authoritative" list of the fares for a flight.
+     * @param Collection[Fare] $subfleet_fares The fare for a subfleet
+     * @param Collection[Fare] $flight_fares   The fares on a flight
     *
-     * If a subfleet is passed in,
+     * @return Collection[Fare] Collection of Fare
+     */
+    public function getFareWithOverrides($subfleet_fares, $flight_fares): Collection
+    {
+        /**
+         * Make sure we've got something in terms of fares on the subfleet or the flight
+         */
+        if (empty($subfleet_fares) && empty($flight_fares)) {
+            return collect();
+        }
+
+        /**
+         * Check to see if there are any subfleet fares. This might only have fares on the
+         * flight, no matter how rare that might be
+         */
+        if ($subfleet_fares === null || count($subfleet_fares) === 0) {
+            return $flight_fares->map(function ($fare, $_) {
+                return $this->getFareWithPivot($fare, $fare->pivot);
+            });
+        }
+
+        return $subfleet_fares->map(function ($sf_fare, $_) use ($flight_fares) {
+            /**
+             * Get the fare, using the subfleet's pivot values. This will return
+             * the fares with all the costs, etc, that are overridden for the given subfleet
+             */
+            $fare = $this->getFareWithPivot($sf_fare, $sf_fare->pivot);
+
+            /**
+             * Now, using the fares that have already been used from the subfleet
+             * now pass those fares in for the flight to override.
+             *
+             * First look to see that there actually is an override for that fare that's on
+             * the flight
+             */
+            $flight_fare = $flight_fares->whereStrict('id', $fare->id)->first();
+            if ($flight_fare === null) {
+                return $fare;
+            }
+
+            /**
+             * Found an override on the flight for the given fare. Check to see if we
+             * have values there that can be used to override or act as a pivot
+             */
+            $fare = $this->getFareWithPivot($fare, $flight_fare->pivot);
+
+            /**
+             * Finally return the fare that we have, it should have gone through the
+             * multiple levels of reconciliation that were required
+             */
+            return $fare;
+        });
+    }
+
+    /**
+     * This will return the flight but all of the subfleets will have the corrected fares with the
+     * right amounts based on the pivots, and with the correct "inheritence" for the flights
+     *
+     * @param Flight $flight
+     *
+     * @return \App\Models\Flight
+     */
+    public function getReconciledFaresForFlight(Flight $flight): Flight
+    {
+        $subfleets = $flight->subfleets;
+        $flight_fares = $flight->fares;
+
+        /**
+         * @var int      $key
+         * @var Subfleet $subfleet
+         */
+        foreach ($subfleets as $key => $subfleet) {
+            $subfleet->fares = $this->getFareWithOverrides($subfleet->fares, $flight_fares);
+        }
+
+        $flight->subfleets = $subfleets;
+        return $flight;
+    }
+
+    /**
+     * Get the fares for a particular flight, with the subfleet that is in use being passed in
     *
     * @param Flight|null   $flight
     * @param Subfleet|null $subfleet
@@ -31,62 +113,59 @@ class FareService extends Service
        if (!$flight) {
            $flight_fares = collect();
        } else {
-            $flight_fares = $this->getForFlight($flight);
+            $flight_fares = $flight->fares;
        }

        if (empty($subfleet)) {
-            return $flight_fares;
+            throw new InvalidArgumentException('Subfleet argument missing');
        }

-        $subfleet_fares = $this->getForSubfleet($subfleet);
-        if (empty($subfleet_fares) || $subfleet_fares->count() === 0) {
-            return $flight_fares;
-        }
-
-        // Go through all of the fares assigned by the subfleet
-        // See if any of the same fares are assigned to the flight
-        $fares = $subfleet_fares->map(function ($fare, $idx) use ($flight_fares) {
-            $flight_fare = $flight_fares->whereStrict('id', $fare->id)->first();
-            if (!$flight_fare) {
-                return $fare;
-            }
-
-            return $flight_fare;
-        });
-
-        return $fares;
+        return $this->getFareWithOverrides($subfleet->fares, $flight_fares);
    }

    /**
-     * Get fares
+     * Get a fare with the proper prices/costs populated in the pivot
     *
     * @param $fare
     *
     * @return mixed
     */
-    protected function getFares($fare)
+    public function getFares($fare)
    {
-        if (filled($fare->pivot->price)) {
-            if (strpos($fare->pivot->price, '%', -1) !== false) {
-                $fare->price = Math::addPercent($fare->price, $fare->pivot->price);
+        return $this->getFareWithPivot($fare, $fare->pivot);
+    }
+
+    /**
+     * Get the correct price of something supplied with the correct pivot
+     *
+     * @param Fare  $fare
+     * @param Pivot $pivot
+     *
+     * @return \App\Models\Fare
+     */
+    public function getFareWithPivot(Fare $fare, Pivot $pivot)
+    {
+        if (filled($pivot->price)) {
+            if (strpos($pivot->price, '%', -1) !== false) {
+                $fare->price = Math::getPercent($fare->price, $pivot->price);
            } else {
-                $fare->price = $fare->pivot->price;
+                $fare->price = $pivot->price;
            }
        }

-        if (filled($fare->pivot->cost)) {
-            if (strpos($fare->pivot->cost, '%', -1) !== false) {
-                $fare->cost = Math::addPercent($fare->cost, $fare->pivot->cost);
+        if (filled($pivot->cost)) {
+            if (strpos($pivot->cost, '%', -1) !== false) {
+                $fare->cost = Math::getPercent($fare->cost, $pivot->cost);
            } else {
-                $fare->cost = $fare->pivot->cost;
+                $fare->cost = $pivot->cost;
            }
        }

-        if (filled($fare->pivot->capacity)) {
-            if (strpos($fare->pivot->capacity, '%', -1) !== false) {
-                $fare->capacity = Math::addPercent($fare->capacity, $fare->pivot->capacity);
+        if (filled($pivot->capacity)) {
+            if (strpos($pivot->capacity, '%', -1) !== false) {
+                $fare->capacity = floor(Math::getPercent($fare->capacity, $pivot->capacity));
            } else {
-                $fare->capacity = $fare->pivot->capacity;
+                $fare->capacity = floor($pivot->capacity);
            }
        }

@@ -104,16 +183,12 @@ class FareService extends Service
     */
    public function setForFlight(Flight $flight, Fare $fare, array $override = []): Flight
    {
+        Log::info('Setting fare "'.$fare->name.'" to flight "'.$flight->ident.'"');
+
        $flight->fares()->syncWithoutDetaching([$fare->id]);

-        foreach ($override as $key => $item) {
-            if (!$item) {
-                unset($override[$key]);
-            }
-        }
-
        // modify any pivot values?
-        if (\count($override) > 0) {
+        if (count($override) > 0) {
            $flight->fares()->updateExistingPivot($fare->id, $override);
        }

@@ -123,24 +198,6 @@ class FareService extends Service
        return $flight;
    }

-    /**
-     * return all the fares for a flight. check the pivot
-     * table to see if the price/cost/capacity has been overridden
-     * and return the correct amounts.
-     *
-     * @param Flight $flight
-     *
-     * @return Collection
-     */
-    public function getForFlight(Flight $flight)
-    {
-        $fares = $flight->fares->map(function ($fare) {
-            return $this->getFares($fare);
-        });
-
-        return $fares;
-    }
-
    /**
     * @param Flight $flight
     * @param Fare   $fare
@@ -149,6 +206,8 @@ class FareService extends Service
     */
    public function delFareFromFlight(Flight $flight, Fare $fare)
    {
+        Log::info('Removing fare "'.$fare->name.'" to flight "'.$flight->ident.'"');
+
        $flight->fares()->detach($fare->id);
        $flight->refresh();

@@ -166,10 +225,12 @@ class FareService extends Service
     */
    public function setForSubfleet(Subfleet $subfleet, Fare $fare, array $override = []): Subfleet
    {
+        Log::info('Setting fare "'.$fare->name.'" to subfleet "'.$subfleet->name.'"');
+
        $subfleet->fares()->syncWithoutDetaching([$fare->id]);

        // modify any pivot values?
-        if (\count($override) > 0) {
+        if (count($override) > 0) {
            $subfleet->fares()->updateExistingPivot($fare->id, $override);
        }

@@ -207,6 +268,8 @@ class FareService extends Service
     */
    public function delFareFromSubfleet(Subfleet &$subfleet, Fare &$fare)
    {
+        Log::info('Removing fare "'.$fare->name.'" from subfleet "'.$subfleet->name.'"');
+
        $subfleet->fares()->detach($fare->id);
        $subfleet->refresh();

@@ -223,7 +286,6 @@ class FareService extends Service
     */
    public function getForPirep(Pirep $pirep)
    {
-        $fares = [];
        $found_fares = PirepFare::where('pirep_id', $pirep->id)->get();

        return $found_fares;
@@ -152,7 +152,7 @@ class PirepFinanceService extends Service
    public function payFuelCosts(Pirep $pirep): void
    {
        $ap = $pirep->dpt_airport;
-        $fuel_used = $pirep->block_fuel;
+        $fuel_used = $pirep->fuel_used;

        $debit = Money::createFromAmount($fuel_used * $ap->fuel_jeta_cost);
        Log::info('Finance: Fuel cost, (fuel='.$fuel_used.', cost='.$ap->fuel_jeta_cost.') D='
@@ -8,6 +8,7 @@ use App\Models\Bid;
 use App\Models\Enums\Days;
 use App\Models\Flight;
 use App\Models\FlightFieldValue;
+use App\Models\User;
 use App\Repositories\FlightRepository;
 use App\Repositories\NavdataRepository;
 use App\Support\Units\Time;
@@ -15,6 +16,7 @@ use App\Support\Units\Time;
 class FlightService extends Service
 {
    private $airportSvc;
+    private $fareSvc;
    private $flightRepo;
    private $navDataRepo;
    private $userSvc;
@@ -23,17 +25,20 @@ class FlightService extends Service
     * FlightService constructor.
     *
     * @param AirportService    $airportSvc
+     * @param FareService       $fareSvc
     * @param FlightRepository  $flightRepo
     * @param NavdataRepository $navdataRepo
     * @param UserService       $userSvc
     */
    public function __construct(
        AirportService $airportSvc,
+        FareService $fareSvc,
        FlightRepository $flightRepo,
        NavdataRepository $navdataRepo,
        UserService $userSvc
    ) {
        $this->airportSvc = $airportSvc;
+        $this->fareSvc = $fareSvc;
        $this->flightRepo = $flightRepo;
        $this->navDataRepo = $navdataRepo;
        $this->userSvc = $userSvc;
@@ -123,12 +128,12 @@ class FlightService extends Service
    /**
     * Filter out subfleets to only include aircraft that a user has access to
     *
-     * @param $user
-     * @param $flight
+     * @param User   $user
+     * @param Flight $flight
     *
     * @return mixed
     */
-    public function filterSubfleets($user, $flight)
+    public function filterSubfleets(User $user, Flight $flight)
    {
        /** @var \Illuminate\Support\Collection $subfleets */
        $subfleets = $flight->subfleets;
@@ -45,8 +45,20 @@ class AirportImporter extends ImportExport
        $row['id'] = $row['icao'];
        $row['hub'] = get_truth_state($row['hub']);

+        if ($row['ground_handling_cost'] === null && $row['ground_handling_cost'] !== 0.0) {
+            $row['ground_handling_cost'] = (float) setting('airports.default_ground_handling_cost');
+        } else {
+            $row['ground_handling_cost'] = (float) $row['ground_handling_cost'];
+        }
+
+        if ($row['fuel_jeta_cost'] === null && $row['fuel_jeta_cost'] !== 0.0) {
+            $row['fuel_jeta_cost'] = (float) setting('airports.default_jet_a_fuel_cost');
+        } else {
+            $row['fuel_jeta_cost'] = (float) $row['fuel_jeta_cost'];
+        }
+
        try {
-            $airport = Airport::updateOrCreate([
+            Airport::updateOrCreate([
                'id' => $row['icao'],
            ], $row);
        } catch (\Exception $e) {
@@ -44,6 +44,10 @@ class ExpenseExporter extends ImportExport
            $ret['airline'] = $expense->airline->icao;
        }

+        if ($ret['flight_type']) {
+            $ret['flight_type'] = $ret['flight_type'][0];
+        }
+
        // For the different expense types, instead of exporting
        // the ID, export a specific column
        if ($expense->ref_model === Expense::class) {
@@ -67,6 +71,6 @@ class ExpenseExporter extends ImportExport
        // And convert the ref_model into the shorter name
        $ret['ref_model'] = str_replace('App\Models\\', '', $ret['ref_model']);

-        return $ret;
+        return array_values($ret);
    }
 }
@@ -3,6 +3,7 @@
 namespace App\Services\ImportExport;

 use App\Contracts\ImportExport;
+use App\Models\Airport;
 use App\Models\Enums\Days;
 use App\Models\Enums\FlightType;
 use App\Models\Fare;
@@ -11,7 +12,7 @@ use App\Models\Subfleet;
 use App\Services\AirportService;
 use App\Services\FareService;
 use App\Services\FlightService;
-use Log;
+use Illuminate\Support\Facades\Log;

 /**
 * The flight importer can be imported or export. Operates on rows
@@ -77,25 +78,14 @@ class FlightImporter extends ImportExport
        // Get the airline ID from the ICAO code
        $airline = $this->getAirline($row['airline']);

-        // Check if the imported flight is a duplicate
-        /*$temp_flight = new Flight([
-            'airline_id'    => $airline->id,
-            'flight_number' => $row['flight_number'],
-            'route_code'    => $row['route_code'],
-            'route_leg'     => $row['route_leg'],
-        ]);
-
-        if($this->flightSvc->isFlightDuplicate($temp_flight)) {
-            $this->errorLog('Error in row '.$index.': Duplicate flight number detected');
-            return false;
-        }*/
-
        // Try to find this flight
+        /** @var Flight $flight */
        $flight = Flight::firstOrNew([
            'airline_id'    => $airline->id,
            'flight_number' => $row['flight_number'],
            'route_code'    => $row['route_code'],
            'route_leg'     => $row['route_leg'],
+            'visible'       => true,
        ], $row);

        $row['dpt_airport'] = strtoupper($row['dpt_airport']);
@@ -200,9 +190,9 @@ class FlightImporter extends ImportExport
     *
     * @param $airport
     *
-     * @return \Illuminate\Database\Eloquent\Model
+     * @return Airport
     */
-    protected function processAirport($airport)
+    protected function processAirport($airport): Airport
    {
        return $this->airportSvc->lookupAirportIfNotFound($airport);
    }
@@ -19,10 +19,17 @@ class SubfleetImporter extends ImportExport
     * Should match the database fields, for the most part
     */
    public static $columns = [
-        'airline' => 'required',
-        'type'    => 'required',
-        'name'    => 'required',
-        'fares'   => 'nullable',
+        'airline'                    => 'required',
+        'type'                       => 'required',
+        'name'                       => 'required',
+        'fuel_type'                  => 'nullable',
+        'cost_block_hour'            => 'nullable',
+        'cost_delay_minute'          => 'nullable',
+        'ground_handling_multiplier' => 'nullable',
+        'cargo_capacity'             => 'nullable',
+        'fuel_capacity'              => 'nullable',
+        'gross_weight'               => 'nullable',
+        'fares'                      => 'nullable',
    ];

    private $fareSvc;
@@ -1,25 +1,25 @@
 <?php

-namespace Modules\Importer\Services;
+namespace App\Services;

 use App\Contracts\Service;
 use App\Repositories\KvpRepository;
+use App\Services\Importers\AircraftImporter;
+use App\Services\Importers\AirlineImporter;
+use App\Services\Importers\AirportImporter;
+use App\Services\Importers\ClearDatabase;
+use App\Services\Importers\ExpenseImporter;
+use App\Services\Importers\FinalizeImporter;
+use App\Services\Importers\FlightImporter;
+use App\Services\Importers\GroupImporter;
+use App\Services\Importers\LedgerImporter;
+use App\Services\Importers\PirepImporter;
+use App\Services\Importers\RankImport;
+use App\Services\Importers\SettingsImporter;
+use App\Services\Importers\UserImport;
 use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
-use Modules\Importer\Services\Importers\AircraftImporter;
-use Modules\Importer\Services\Importers\AirlineImporter;
-use Modules\Importer\Services\Importers\AirportImporter;
-use Modules\Importer\Services\Importers\ClearDatabase;
-use Modules\Importer\Services\Importers\ExpenseImporter;
-use Modules\Importer\Services\Importers\FinalizeImporter;
-use Modules\Importer\Services\Importers\FlightImporter;
-use Modules\Importer\Services\Importers\GroupImporter;
-use Modules\Importer\Services\Importers\LedgerImporter;
-use Modules\Importer\Services\Importers\PirepImporter;
-use Modules\Importer\Services\Importers\RankImport;
-use Modules\Importer\Services\Importers\SettingsImporter;
-use Modules\Importer\Services\Importers\UserImport;

 class ImporterService extends Service
 {
@@ -110,7 +110,7 @@ class ImporterService extends Service
        $manifest = [];

        foreach ($this->importList as $importerKlass) {
-            /** @var \Modules\Importer\Services\BaseImporter $importer */
+            /** @var BaseImporter $importer */
            $importer = new $importerKlass();
            $manifest = array_merge($manifest, $importer->getManifest());
        }
@@ -130,11 +130,11 @@ class ImporterService extends Service
     */
    public function run($importer, $start = 0)
    {
-        if (!in_array($importer, $this->importList)) {
+        if (!in_array($importer, $this->importList, true)) {
            throw new Exception('Unknown importer "'.$importer.'"');
        }

-        /** @var $importerInst \Modules\Importer\Services\BaseImporter */
+        /** @var $importerInst BaseImporter */
        $importerInst = new $importer();

        try {
@@ -1,11 +1,10 @@
 <?php

-namespace Modules\Importer\Services\Importers;
+namespace App\Services\Importers;

 use App\Models\Aircraft;
 use App\Models\Airline;
 use App\Models\Subfleet;
-use Modules\Importer\Services\BaseImporter;

 class AircraftImporter extends BaseImporter
 {
@@ -26,11 +25,11 @@ class AircraftImporter extends BaseImporter

        // See if there is an airline column
        $columns = $this->db->getColumns($this->table);
-        if (in_array('airline', $columns)) {
+        if (in_array('airline', $columns, true)) {
            $fields[] = 'airline';
        }

-        if (in_array('location', $columns)) {
+        if (in_array('location', $columns, true)) {
            $fields[] = 'location';
        }

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
snyk-bot	077b9aa491	fix: package.json & package-lock.json to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-AXIOS-1038255	2020-12-24 02:26:09 +00:00
B.Fatih KOZ	18e1d63760	Update User.php (#968 ) We should be able to send the private name with the api too.	2020-12-23 11:27:01 -05:00
Nabeel S	4bda494c6b	Add helpers kvp() and kvp_save() (#966 )	2020-12-21 11:30:44 -05:00
B.Fatih KOZ	a5513b6fbb	Fixes for reported pressure in METAR parsing (#965 ) * Update Metar.php The reported pressure was always being assigned as hPa thus resulting display and conversion errors when the reported pressure was inHg. Also the VFR/IFR (VMC/IMC) determination was using minimum 5 nmi and 3000 ft cloud base, it must be 5 km and 3000 ft. With this state, this PR should fix issue #948 and partly fixes issue #963 * MetarTest Fix for inHg/hPa	2020-12-21 10:53:50 -05:00
B.Fatih KOZ	e4972eaae3	Download screen enhancements Changed the group name according to its category , aircrafts will show icao type and registration , airports will be displayed with their icao codes names and countries. Rest will be showed with their names (exp airlines) This will result a much better look on the downloads page for end users while looking for a specific type's files (like a repaint for a B738).	2020-12-18 14:34:05 -05:00
Nabeel Shahzad	e95e61d4b4	Fix tests #807	2020-12-07 10:19:43 -05:00
Nabeel Shahzad	f92912dff4	Fix test	2020-12-07 09:50:00 -05:00
Nabeel Shahzad	f62c607138	Change fuel calculation to fuel used #807	2020-12-07 09:46:07 -05:00
B.Fatih KOZ	d1a3155653	Fixed EET and ENDURANCE values at IVAO & VATSIM prefile (#954 ) Fixed wrong EET and ENDURANCE values at IVAO & VATSIM prefile forms with a php function converting seconds to HHmm format. Also added View Route At SkyVector link (uses auto zoom to fpl route on High Enroute Charts) , thx Maco for his idea and original link.	2020-12-06 17:18:55 -05:00
B.Fatih KOZ	883e8786e0	Formatting on admin pirep page #952 * Fix For Issue #952 / Admin Pirep Display Removed unnecessary div tags to fix the broken display problem, defined the div class with a php code * Fix and Update for Admin Pirep Index Fixed the page width problem and search error , added the ability to also search for Rejected and Accepted pireps.	2020-12-05 20:27:03 -05:00
B.Fatih KOZ	fb44b73f44	Fix METAR decoding (text correction only) (#950 ) * Update Metar Decoding (Text Correction Only) SKC means Sky Clear or Clear Skies. Rest is ok * Update MetarTest.php	2020-12-04 12:47:42 -05:00
B.Fatih KOZ	7379e93c46	Update simbrief_briefing.blade.php (#944 ) 1. Added ATC Prefile options for IVAO and VATSIM 2. Added TAF reports for Orig, Dest and Altn airports. (Technically TAF reports are required for flights more than 1 hour, so we need to see them on the briefing page too) 3. Adjusted the height of OFP division to match the page with the WX section changes	2020-12-04 11:20:12 -05:00
B.Fatih KOZandNabeel S	d4bb5605de	Update search.blade.php (#943 ) Added the ability to select and search an airline's flights. Will be usefull in multiple airline installations/configs. Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>	2020-12-04 11:12:41 -05:00
B.Fatih KOZ	8ecc096bf7	Update Latest Pireps Widget (#945 ) Added flight number, used aircraft registration (and icao type) instead of name	2020-12-04 11:04:47 -05:00
Nabeel S	6b5cf38224	Calculate percentage properly instead of adding to the base value #925 (#942 ) * Calculate percentage properly instead of adding to the base value #925	2020-11-26 16:44:57 -05:00
Nabeel S	2ecf366670	Add missing columns from subfleet export #926 (#941 )	2020-11-26 13:34:04 -05:00
Nabeel Shahzad	a7981c0a87	Redirect to the subfleet aircraft list on save #932	2020-11-26 13:15:56 -05:00
Nabeel Shahzad	9cf07c47c7	Fix notifications error for collect() #937	2020-11-26 13:08:32 -05:00
Nabeel S	8f4219bc95	Download path size too small; fix migrations #935 (#940 )	2020-11-26 13:03:59 -05:00
Nabeel Shahzad	eae345efa7	Fix dropping of unique index when table prefix is present #934	2020-11-26 12:27:26 -05:00
Nabeel Shahzad	be15426b5b	Fix public path in application bootstrap #887	2020-11-23 13:39:26 -05:00
Nabeel Shahzad	7e4c652330	Log for avatar upload	2020-11-22 09:59:09 -05:00
Nabeel S	ced2c150b7	Change the body size to medium text #920 (#930 ) Change the body size to medium text (16MB) #920	2020-11-20 12:00:37 -05:00
Nabeel Shahzad	a2de532f72	Merge branch 'dev' of https://github.com/nabeelio/phpvms into dev	2020-11-02 11:57:27 -05:00
Nabeel Shahzad	a52d844719	Set flight_id to be fillable	2020-11-02 11:57:25 -05:00
Timothy Sturm	fd814bc79e	* Fixed broken links on README * Fixed broken links on README * Misc. edits to markdown formatting, Title Grammer, and Stylizing the phpVMS brand.	2020-10-31 18:43:00 -04:00
Nabeel Shahzad	0fa00206ce	Make sure stdclass is returned in flight fields	2020-10-29 12:38:40 -04:00
Nabeel Shahzad	a58237b04b	Allow flight_id to be nullable	2020-10-27 21:47:19 -04:00
Nabeel S	dc7efc981c	Refactor fares inheritance #905 (#906 )	2020-10-27 18:46:15 -04:00
Yash Govekar	060bebf8fe	Accept Pirep button not changing row inline #598 (#880 )	2020-10-26 10:18:00 -04:00
Nabeel Shahzad	aaaf2e7c00	Make sure capacity is an integer	2020-10-24 16:04:09 -04:00
Nabeel S	1be68d1e63	Flight/Subfleet fares not returning in API #899 (#900 ) Make sure proper fares are returned from the API #899	2020-10-24 15:11:08 -04:00
Nabeel Shahzad	b83f7dcac8	Updated seed data for dev	2020-10-24 09:26:14 -04:00
Nabeel S	c5de2fd8b1	Fix for base map/providers #895 (#897 )	2020-10-23 08:08:41 -04:00
Nabeel S	b85d0e6a3e	Expose Leaflet base options to templates #895 (#896 )	2020-10-23 07:35:44 -04:00
Nabeel S	b37bd2cd7b	Change award events handler to subscription #888 (#894 )	2020-10-23 07:28:22 -04:00
Nabeel S	584d37f230	FlightRouteAwards - fix if last pirep is empty/other error conditions (#886 )	2020-10-22 16:25:52 -04:00
Nabeel Shahzad	1c9d1c1733	Extra logs/skip module seed pending	2020-10-21 14:12:38 -04:00
Nabeel S	cd18442207	Fixes for installer/modules race condition (#883 )	2020-10-21 13:28:54 -04:00
Yash Govekar	716ba38b6d	Default values for automatically added airports #829 (#878 )	2020-10-20 15:25:13 -04:00
Yash Govekar	c0514b381b	Fixed exporting expenses (#877 )	2020-10-19 15:22:06 -04:00
Yash Govekar	5803487d51	Installing and managing modules from admin panel (#847 )	2020-10-19 10:10:28 -04:00
Snyk bot	ca220f1cdf	fix: package.json & package-lock.json to reduce vulnerabilities (#873 ) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-AJV-584908 - https://snyk.io/vuln/SNYK-JS-JQUERY-565129 - https://snyk.io/vuln/SNYK-JS-JQUERY-567880 - https://snyk.io/vuln/SNYK-JS-SELECT2-456562 - https://snyk.io/vuln/SNYK-JS-SOCKJS-575261 - https://snyk.io/vuln/SNYK-JS-WEBPACKDEVSERVER-72405 - https://snyk.io/vuln/SNYK-JS-YARGSPARSER-560381 - https://snyk.io/vuln/npm:mem:20180117	2020-10-16 11:01:24 -04:00
Nabeel Shahzad	75a0a4c87a	Update FareService.php	2020-10-13 18:12:52 -04:00
Nabeel Shahzad	3b6800077f	Preload fares with PIREP	2020-10-13 18:12:14 -04:00
Nabeel Shahzad	bf878a98a4	Extra logging around fares	2020-10-13 18:10:31 -04:00
DaGeek	d001704880	Adding a new AwardClass for Flight Time (#869 ) Adding a new AwardClass for Flight Time	2020-10-13 17:07:12 -04:00
DaGeek	5371989921	Cosmetic Fix to display Award Images in Admin View (#870 ) Fix to correctly display the Award image in the admin UI	2020-10-13 15:41:16 -04:00
DaGeek	6c553569bf	Create FlightRouteAwards.php (#865 ) Award - FlightRoute- this allows the Admins to create an Award that will be granted if a Pilot completes a flight with a defined Departure and Arrival Airport	2020-10-12 18:54:42 -04:00
Nabeel Shahzad	9eb7dd6913	Update doc links	2020-10-12 15:15:05 -04:00
Nabeel S	dc007f6d9e	Bids are missing subfleets in API response #867 (#868 ) Bids are missing subfleets in API response #867	2020-10-12 12:49:11 -04:00
Nabeel S	193fbd369d	Show awards on user profile #703 (#866 )	2020-10-11 16:06:09 -04:00
Botric	151f188886	Update pirep_card.blade.php (#857 ) Update pirep_card.blade.php	2020-10-10 15:24:28 -04:00
Nabeel S	69d89511be	Inherited value can't be removed #811 (#863 ) Inherited value can't be removed #811	2020-10-10 15:24:10 -04:00
Nabeel S	48087fb05f	Metar: TEMPO and trend causing issue with values being overwritten (#862 ) Metar: TEMPO and trend causing issue with values being overwritten	2020-10-10 14:55:12 -04:00
Nabeel S	c702b01a87	Add tests that rank shouldn't auto change (#840 )	2020-10-10 14:50:00 -04:00
DaGeek	0a5194b92e	Small Cosmetic Change to Rank & Home Airport Display (#852 ) Cosmetic Change to Rank & Home Airport Display	2020-10-09 17:45:16 -04:00
Nabeel Shahzad	24aca506fc	Update UserController.php	2020-10-06 19:26:52 -04:00
Nabeel Shahzad	365e33f5f8	Redirect show() to edit()	2020-10-06 19:10:42 -04:00
Nabeel Shahzad	7a75e0f5ad	Fix missing $countries	2020-10-06 18:52:34 -04:00
Botric	93da2ca061	Cosmetic change to standardise boxes on profile (#853 )	2020-10-04 12:48:12 -04:00
vgpastor	5363e4aa0f	Add API Key visual protection (#851 ) Add API Key visual protection	2020-10-03 11:13:28 -04:00
Nabeel S	95a40d3565	Make sure proper subfleets are returned as part of the user profile #848 (#849 ) * Make sure proper subfleets are returned as part of the user profile #848 * Formatting	2020-09-30 12:58:45 -04:00
Nabeel S	98aa362935	Fix subfleets not returning proper fare counts #831 (#846 ) Fix subfleets not returning proper fare counts #831	2020-09-29 13:21:24 -04:00
Yash Govekar	b6603bd178	Updated Route Service Provider that was mismatching API and ADMIN Section (#845 )	2020-09-29 13:09:00 -04:00
Yash Govekar	2c539d349d	Fix controller namespace in module generation #714 Updated Module Files	2020-09-28 16:04:51 -04:00
Nabeel Shahzad	5df28eb027	Fix module main service provider name	2020-09-27 12:13:24 -04:00
yashris	0dbf8b8652	Public JS files Updated! (#839 )	2020-09-27 09:03:46 -04:00
yashris	5856f88a0c	Updated index.js inside Map folder (#837 )	2020-09-24 09:56:52 -04:00
Nabeel Shahzad	5f9b9399e9	Use $current_airport	2020-09-23 14:39:10 -04:00
Nabeel S	77fe6679ce	Update module generation #714 (#716 ) * Update module generation #714 * Fix method signatures * Fix paths within stubs, use single provider.stub file * Add separate index controller * Update module generation #714 * Fix method signatures * Fix paths within stubs, use single provider.stub file * Update module generation Disable/lower the cache time as found as a workaround in https://github.com/nWidart/laravel-modules/issues/995 * Update editorconfig for line endings * Formatting * Formatting	2020-09-20 19:10:52 -04:00
Nabeel Shahzad	435fa32663	Fix aircraft field name #824	2020-09-15 15:41:53 -04:00
Nabeel Shahzad	78ca06e9dc	Add optional() around aircraft info #824	2020-09-14 16:17:03 -04:00
Nabeel Shahzad	2dd3dd5814	Make sure we're getting only active expenses	2020-09-12 15:17:10 -04:00
Nabeel Shahzad	ac7a5a65e5	Update cron path	2020-09-11 16:57:50 -04:00
Nabeel Shahzad	c5ab0978db	Force visible flag to true for imports #818	2020-09-11 09:18:27 -04:00
dependabot[bot]	8398d94c0a	Bump js-yaml from 3.11.0 to 3.13.1 (#810 ) Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 3.11.0 to 3.13.1. - [Release notes](https://github.com/nodeca/js-yaml/releases) - [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md) - [Commits](https://github.com/nodeca/js-yaml/compare/3.11.0...3.13.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-09-10 17:06:01 -04:00
Nabeel S	1db3295213	Disable autocomplete in admin forms #816 (#817 )	2020-09-10 16:42:11 -04:00