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

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

.github/scripts/build.sh

@@ -15,7 +15,10 @@ declare -a remove_files=(
   .idea
   .travis
   docker
+  node_modules
+  vendor/willdurand/geocoder/tests
   _ide_helper.php
+  .env
   .dockerignore
   .dpl
   .editorconfig
@@ -23,6 +26,7 @@ declare -a remove_files=(
   .eslintrc
   .php_cs
   .php_cs.cache
+  .php-cs-fixer.php
   .phpstorm.meta.php
   .styleci.yml
   .phpunit.result.cache
@@ -37,9 +41,8 @@ declare -a remove_files=(
   phpvms.iml
   Procfile
   phpstan.neon
-  node_modules
+  symfony.lock
   composer.phar
-  vendor/willdurand/geocoder/tests
 )
 
 for file in "${remove_files[@]}"; do
@@ -70,14 +73,22 @@ mkdir -p storage/framework/views
 
 cd /tmp
 
+echo "Current directory contents"
+ls -al $BASE_DIR
+
+echo "Parent directory contents"
 ls -al $BASE_DIR/../
 
-tar -czf $TAR_NAME -C $BASE_DIR .
+echo "Calling find"
+find $BASE_DIR/../ -type d -maxdepth 2
+
+tar -czf $TAR_NAME -C $BASE_DIR --xform 's:^\./::' . [--show-transformed-names|--show-stored-names]
 sha256sum $TAR_NAME >"$TAR_NAME.sha256"
 
 cd $BASE_DIR;
-zip -r $ZIP_NAME *
+zip -r $ZIP_NAME ./
 sha256sum $ZIP_NAME >"$ZIP_NAME.sha256"
+
 mv $ZIP_NAME /tmp
 mv "$ZIP_NAME.sha256" /tmp
 

.github/workflows/build.yml

@@ -2,12 +2,12 @@ name: 'Build'
 on: ['push', 'pull_request', 'workflow_dispatch', 'release']
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     if: github.repository == 'nabeelio/phpvms'
     strategy:
       fail-fast: true
       matrix:
-        php-versions: ['7.3', '7.4', '8.0']
+        php-versions: ['7.3', '7.4', '8.0', '8.1']
     name: PHP ${{ matrix.php-versions }}
     env:
       extensions: intl, pcov, mbstring
@@ -78,7 +78,8 @@ jobs:
 
     - name: Run Tests
       run: |
-        vendor/bin/php-cs-fixer fix --config=.php_cs -v --dry-run --diff --using-cache=no
+        export PHP_CS_FIXER_IGNORE_ENV=1
+        vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php -v --dry-run --diff --using-cache=no
         vendor/bin/phpunit --debug --verbose
 
   # This runs after all of the tests, run have run. Creates a cleaned up version of the
@@ -116,7 +117,6 @@ jobs:
       - name: 'Install Release Dependencies'
         run: |
           rm -rf vendor
-          sudo npm i tar-to-zip -g
           composer install --no-dev --prefer-dist --no-interaction --verbose
           sudo chmod +x ./.github/scripts/*
 
@@ -179,7 +179,6 @@ jobs:
       - name: 'Install Release Dependencies'
         run: |
           rm -rf vendor
-          sudo npm i tar-to-zip -g
           composer install --no-dev --prefer-dist --no-interaction --verbose
           sudo chmod +x ./.github/scripts/*
 

.gitignore

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

.php-cs-fixer.php

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

.php_cs

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

Dockerfile

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

LICENSE

@@ -1,5 +1,3 @@
-BSD 3-Clause License
-
 Copyright (c) 2017, phpvms - http://www.phpvms.net
 All rights reserved.
 
@@ -17,6 +15,9 @@ modification, are permitted provided that the following conditions are met:
   contributors may be used to endorse or promote products derived from
   this software without specific prior written permission.
 
+* A "powered by phpvms" is required in page footers, unless the license has 
+  purchased to omit it.
+
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

Makefile

@@ -82,10 +82,6 @@ test:
 phpcs:
 	@vendor/bin/php-cs-fixer fix --config=.php_cs -v --diff --diff-format=udiff --dry-run
 
-#.PHONY: phpstan
-#phpstan:
-#	vendor/bin/phpstan analyse -c phpstan.neon -v --level 2 app
-
 .PHONY: replay-acars
 replay-acars:
 	#@php artisan phpvms:replay AAL10,AAL3113,BAW172,DAL988,FIN6,MSR986 --manual
@@ -95,11 +91,6 @@ replay-acars:
 sass-watch:
 	sass --watch public/assets/admin/sass/paper-dashboard.scss:public/assets/admin/css/paper-dashboard.css
 
-.PHONY: schema
-schema:
-	#php artisan infyom:scaffold Aircraft --fieldsFile=database/schema/aircraft.json
-	echo ""
-
 .PHONY: deploy-package
 deploy-package:
 	./.travis/deploy_script.sh
@@ -111,7 +102,7 @@ reset-installer:
 
 .PHONY: docker-test
 docker-test:
-	@docker-compose -f docker-compose.yml -f docker-compose.local.yml up
+	@docker compose -f docker-compose.yml -f docker-compose.local.yml up
 
 .PHONY: docker-clean
 docker-clean:

app/Console/Commands/ProcessQueue.php

@@ -22,7 +22,11 @@ class ProcessQueue extends Command
             '--stop-when-empty' => null,
         ]);
 
-        Log::info(Artisan::output());
+        $jobOutput = trim(Artisan::output());
+        if (!empty($jobOutput)) {
+            Log::info($jobOutput);
+        }
+
         ///** @var App\Support\WorkCommand $queueWorker */
         //$queueWorker = new App\Support\WorkCommand(app('queue.worker'), app('cache.store'));
 

app/Console/Cron.php

@@ -0,0 +1,90 @@
+<?php
+/**
+ * This runs any of the cron tasks that are set to run according to the Laravel schedule
+ */
+
+namespace App\Console;
+
+use App\Console\Cron\FifteenMinute;
+use App\Console\Cron\FiveMinute;
+use App\Console\Cron\Hourly;
+use App\Console\Cron\JobQueue;
+use App\Console\Cron\Monthly;
+use App\Console\Cron\Nightly;
+use App\Console\Cron\ThirtyMinute;
+use App\Console\Cron\Weekly;
+use App\Contracts\Command;
+use Illuminate\Console\Scheduling\Schedule;
+
+class Cron
+{
+    /** @var Schedule */
+    private $scheduler;
+
+    /**
+     * @var string[] The cron tasks which get called/run
+     */
+    private $cronTasks = [
+        JobQueue::class,
+        FiveMinute::class,
+        FifteenMinute::class,
+        ThirtyMinute::class,
+        Hourly::class,
+        Nightly::class,
+        Weekly::class,
+        Monthly::class,
+    ];
+
+    /**
+     * @var array Stores the instantiated cron tasks
+     */
+    private $cronRunners = [];
+
+    /**
+     * @param Schedule $scheduler
+     */
+    public function __construct(Schedule $scheduler)
+    {
+        $this->scheduler = $scheduler;
+        foreach ($this->cronTasks as $task) {
+            /** @var Command $cronTask */
+            $cronTask = app($task);
+            $signature = $cronTask->getSignature();
+
+            if (empty($signature)) {
+                continue;
+            }
+
+            $this->cronRunners[$signature] = $cronTask;
+        }
+    }
+
+    /**
+     * Try to figure out which commands are supposed to run right now
+     *
+     * @return array string of tasks that were run
+     */
+    public function run(): array
+    {
+        $events = $this->scheduler->dueEvents(app());
+        if (empty($events)) {
+            return [];
+        }
+
+        $run = [];
+
+        /** @var \Illuminate\Console\Scheduling\Event $event */
+        foreach ($events as $event) {
+            foreach ($this->cronRunners as $signature => $task) {
+                if (!str_contains($event->command, $signature)) {
+                    continue;
+                }
+
+                $task->callEvent();
+                $run[] = $signature;
+            }
+        }
+
+        return $run;
+    }
+}

app/Console/Cron/FifteenMinute.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Console\Cron;
+
+use App\Contracts\CronCommand;
+use App\Events\CronFifteenMinute;
+
+/**
+ * The actual cron tasks are in app/Cron
+ */
+class FifteenMinute extends CronCommand
+{
+    protected $signature = 'cron:fifteen';
+    protected $description = 'Run the 15 minute cron tasks';
+    protected $schedule;
+
+    public function handle(): void
+    {
+        $this->callEvent();
+    }
+
+    public function callEvent()
+    {
+        event(new CronFifteenMinute());
+    }
+}

app/Console/Cron/FiveMinute.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Console\Cron;
+
+use App\Contracts\CronCommand;
+use App\Events\CronFiveMinute;
+
+/**
+ * This just calls the CronNightly event, so all of the
+ * listeners, etc can just be called to run those tasks
+ *
+ * The actual cron tasks are in app/Cron
+ */
+class FiveMinute extends CronCommand
+{
+    protected $signature = 'cron:five';
+    protected $description = 'Run the 5 minute cron tasks';
+    protected $schedule;
+
+    public function handle(): void
+    {
+        $this->callEvent();
+    }
+
+    public function callEvent()
+    {
+        event(new CronFiveMinute());
+    }
+}

app/Console/Cron/Hourly.php

@@ -2,14 +2,14 @@
 
 namespace App\Console\Cron;
 
-use App\Contracts\Command;
+use App\Contracts\CronCommand;
 use App\Events\CronHourly;
 
 /**
  * This just calls the CronHourly event, so all of the
  * listeners, etc can just be called to run those tasks
  */
-class Hourly extends Command
+class Hourly extends CronCommand
 {
     protected $signature = 'cron:hourly';
     protected $description = 'Run the hourly cron tasks';
@@ -17,7 +17,11 @@ class Hourly extends Command
 
     public function handle(): void
     {
-        $this->redirectLoggingToFile('cron');
+        $this->callEvent();
+    }
+
+    public function callEvent()
+    {
         event(new CronHourly());
     }
 }

app/Console/Cron/JobQueue.php

@@ -2,14 +2,14 @@
 
 namespace App\Console\Cron;
 
-use App\Contracts\Command;
+use App\Contracts\CronCommand;
 use Illuminate\Support\Facades\Artisan;
 
 /**
  * This just calls the CronHourly event, so all of the
  * listeners, etc can just be called to run those tasks
  */
-class JobQueue extends Command
+class JobQueue extends CronCommand
 {
     protected $signature = 'cron:queue';
     protected $description = 'Run the cron queue tasks';
@@ -17,9 +17,16 @@ class JobQueue extends Command
 
     public function handle(): void
     {
-        $this->redirectLoggingToFile('cron');
-        Artisan::call('queue:cron');
+        $this->callEvent();
 
-        $this->info(Artisan::output());
+        $queueOutput = trim(Artisan::output());
+        if (!empty($queueOutput)) {
+            $this->info($queueOutput);
+        }
+    }
+
+    public function callEvent()
+    {
+        Artisan::call('queue:cron');
     }
 }

app/Console/Cron/Monthly.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Cron;
 
-use App\Contracts\Command;
+use App\Contracts\CronCommand;
 use App\Events\CronMonthly;
 
 /**
@@ -11,7 +11,7 @@ use App\Events\CronMonthly;
  *
  * The actual cron tasks are in app/Cron
  */
-class Monthly extends Command
+class Monthly extends CronCommand
 {
     protected $signature = 'cron:monthly';
     protected $description = 'Run the monthly cron tasks';
@@ -19,7 +19,11 @@ class Monthly extends Command
 
     public function handle(): void
     {
-        $this->redirectLoggingToFile('cron');
+        $this->callEvent();
+    }
+
+    public function callEvent()
+    {
         event(new CronMonthly());
     }
 }

app/Console/Cron/Nightly.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Cron;
 
-use App\Contracts\Command;
+use App\Contracts\CronCommand;
 use App\Events\CronNightly;
 
 /**
@@ -11,7 +11,7 @@ use App\Events\CronNightly;
  *
  * The actual cron tasks are in app/Cron
  */
-class Nightly extends Command
+class Nightly extends CronCommand
 {
     protected $signature = 'cron:nightly';
     protected $description = 'Run the nightly cron tasks';
@@ -19,7 +19,11 @@ class Nightly extends Command
 
     public function handle(): void
     {
-        $this->redirectLoggingToFile('cron');
+        $this->callEvent();
+    }
+
+    public function callEvent()
+    {
         event(new CronNightly());
     }
 }

app/Console/Cron/ThirtyMinute.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Console\Cron;
+
+use App\Contracts\CronCommand;
+use App\Events\CronThirtyMinute;
+
+/**
+ * The actual cron tasks are in app/Cron
+ */
+class ThirtyMinute extends CronCommand
+{
+    protected $signature = 'cron:thirty';
+    protected $description = 'Run the 30 minute cron tasks';
+    protected $schedule;
+
+    public function handle(): void
+    {
+        $this->callEvent();
+    }
+
+    public function callEvent()
+    {
+        event(new CronThirtyMinute());
+    }
+}

app/Console/Cron/Weekly.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Cron;
 
-use App\Contracts\Command;
+use App\Contracts\CronCommand;
 use App\Events\CronWeekly;
 
 /**
@@ -11,7 +11,7 @@ use App\Events\CronWeekly;
  *
  * The actual cron tasks are in app/Cron
  */
-class Weekly extends Command
+class Weekly extends CronCommand
 {
     protected $signature = 'cron:weekly';
     protected $description = 'Run the weekly cron tasks';
@@ -19,7 +19,11 @@ class Weekly extends Command
 
     public function handle(): void
     {
-        $this->redirectLoggingToFile('cron');
+        $this->callEvent();
+    }
+
+    public function callEvent()
+    {
         event(new CronWeekly());
     }
 }

app/Console/Kernel.php

@@ -2,10 +2,13 @@
 
 namespace App\Console;
 
+use App\Console\Cron\FifteenMinute;
+use App\Console\Cron\FiveMinute;
 use App\Console\Cron\Hourly;
 use App\Console\Cron\JobQueue;
 use App\Console\Cron\Monthly;
 use App\Console\Cron\Nightly;
+use App\Console\Cron\ThirtyMinute;
 use App\Console\Cron\Weekly;
 use App\Services\CronService;
 use Illuminate\Console\Scheduling\Schedule;
@@ -33,10 +36,16 @@ class Kernel extends ConsoleKernel
                 ->withoutOverlapping();
         }
 
+        /*
+         * NOTE: IF MORE TASKS ARE ADDED, THEY ALSO MUST BE ADDED TO THE CRON.PHP
+         */
+        $schedule->command(FiveMinute::class)->everyFiveMinutes();
+        $schedule->command(FifteenMinute::class)->everyFifteenMinutes();
+        $schedule->command(ThirtyMinute::class)->everyThirtyMinutes();
         $schedule->command(Nightly::class)->dailyAt('01:00');
+        $schedule->command(Hourly::class)->hourly();
         $schedule->command(Weekly::class)->weeklyOn(0);
         $schedule->command(Monthly::class)->monthlyOn(1);
-        $schedule->command(Hourly::class)->hourly();
 
         // When spatie-backups runs
         /*if (config('backup.backup.enabled', false) === true) {

app/Contracts/Command.php

@@ -29,6 +29,16 @@ abstract class Command extends \Illuminate\Console\Command
         }*/
     }
 
+    /**
+     * Return the signature of the command
+     *
+     * @return string
+     */
+    public function getSignature(): string
+    {
+        return $this->signature;
+    }
+
     /**
      * Splice the logger and replace the active handlers with the handlers from the
      * a stack in config/logging.php

app/Contracts/Controller.php

@@ -87,16 +87,17 @@ abstract class Controller extends \Illuminate\Routing\Controller
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function message($message, $count = null)
+    public function message($message, $count = null, $attrs = [])
     {
-        $attrs = [
+        $ret = [
             'message' => $message,
+            'attrs'   => $attrs,
         ];
 
         if ($count !== null) {
-            $attrs['count'] = $count;
+            $ret['count'] = $count;
         }
 
-        return response()->json($attrs);
+        return response()->json($ret);
     }
 }

app/Contracts/CronCommand.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Contracts;
+
+abstract class CronCommand extends Command
+{
+    /**
+     * @return mixed
+     */
+    abstract public function callEvent();
+
+    /**
+     * Adjust the logging depending on where we're running from
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->redirectLoggingToFile('cron');
+    }
+}

app/Contracts/ImportExport.php

@@ -166,10 +166,36 @@ class ImportExport
                 return [];
             }
 
+            if (strpos($split_values[0], '?') !== false) {
+                // This contains the query string, which turns it into a multi-level array
+                $query_str = explode('?', $split_values[0]);
+                $parent = trim($query_str[0]);
+
+                $children = [];
+                $kvp = explode('&', trim($query_str[1]));
+                foreach ($kvp as $items) {
+                    if (!$items) {
+                        continue;
+                    }
+
+                    $this->kvpToArray($items, $children);
+                }
+
+                $ret[$parent] = $children;
+
+                return $ret;
+            }
+
+            // This is not a query string, return it back untouched
             return [$split_values[0]];
         }
 
         foreach ($split_values as $value) {
+            $value = trim($value);
+            if ($value === '') {
+                continue;
+            }
+
             // This isn't in the query string format, so it's
             // just a straight key-value pair set
             if (strpos($value, '?') === false) {

app/Contracts/Notification.php

@@ -2,7 +2,6 @@
 
 namespace App\Contracts;
 
-use App\Notifications\Channels\Discord\DiscordMessage;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 
@@ -26,24 +25,4 @@ class Notification extends \Illuminate\Notifications\Notification implements Sho
 
         $this->channels = $notif_config[$klass];*/
     }
-
-    /**
-     * Get the notification's delivery channels.
-     *
-     * @param mixed $notifiable
-     *
-     * @return array
-     */
-    /*public function via($notifiable)
-    {
-        return $this->channels;
-    }*/
-
-    /**
-     * @return DiscordMessage|null
-     */
-    public function toDiscordChannel($notifiable): ?DiscordMessage
-    {
-        return null;
-    }
 }

app/Cron/Hourly/ClearExpiredSimbrief.php

@@ -20,7 +20,7 @@ class ClearExpiredSimbrief extends Listener
     }
 
     /**
-     * @param \App\Events\CronNightly $event
+     * @param CronHourly $event
      */
     public function handle(CronHourly $event): void
     {

app/Cron/Hourly/DeletePireps.php

@@ -5,6 +5,7 @@ namespace App\Cron\Hourly;
 use App\Contracts\Listener;
 use App\Events\CronHourly;
 use App\Models\Enums\PirepState;
+use App\Models\Enums\PirepStatus;
 use App\Models\Pirep;
 use App\Services\PirepService;
 use Carbon\Carbon;
@@ -38,7 +39,10 @@ class DeletePireps extends Listener
     protected function deletePireps(int $expire_time_hours, int $state)
     {
         $dt = Carbon::now('UTC')->subHours($expire_time_hours);
-        $pireps = Pirep::where('created_at', '<', $dt)->where(['state' => $state])->get();
+        $pireps = Pirep::where('created_at', '<', $dt)
+            ->where(['state' => $state])
+            ->where('status', '<>', PirepStatus::PAUSED)
+            ->get();
 
         /** @var PirepService $pirepSvc */
         $pirepSvc = app(PirepService::class);

app/Cron/Hourly/RemoveExpiredLiveFlights.php

@@ -6,6 +6,7 @@ use App\Contracts\Listener;
 use App\Events\CronHourly;
 use App\Events\PirepCancelled;
 use App\Models\Enums\PirepState;
+use App\Models\Enums\PirepStatus;
 use App\Models\Pirep;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Log;
@@ -31,7 +32,9 @@ class RemoveExpiredLiveFlights extends Listener
         $date = Carbon::now('UTC')->subHours(setting('acars.live_time'));
         $pireps = Pirep::where('updated_at', '<', $date)
             ->where('state', PirepState::IN_PROGRESS)
+            ->where('status', '<>', PirepStatus::PAUSED)
             ->get();
+
         foreach ($pireps as $pirep) {
             event(new PirepCancelled($pirep));
             Log::info('Cron: Deleting Expired Live PIREP id='.$pirep->id.', state='.PirepState::label($pirep->state));

app/Database/migrations/2021_11_23_184532_add_type_rating_tables.php

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

app/Database/migrations/2021_11_27_132418_add_hub_to_aircraft.php

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

app/Database/migrations/2022_01_10_131604_update_awards_add_active.php

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

app/Database/migrations/2022_02_11_124926_update_users_add_notes.php

@@ -0,0 +1,15 @@
+<?php
+
+use App\Contracts\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class UpdateUsersAddNotes extends Migration
+{
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->mediumText('notes')->nullable()->after('remember_token');
+        });
+    }
+}

app/Database/seeds/dev/in_progress.yml

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

app/Database/seeds/dev/sample.yml

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

app/Database/seeds/permissions.yml

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

app/Database/seeds/settings.yml

@@ -137,6 +137,13 @@
   options: ''
   type: int
   description: 'Initial zoom level on the map'
+- key: acars.update_interval
+  name: 'Refresh Interval'
+  group: acars
+  value: 60
+  options: ''
+  type: int
+  description: 'How often the live map updates its data'
 - key: airports.default_ground_handling_cost
   name: 'Default Ground Handling Cost'
   group: airports
@@ -283,7 +290,14 @@
   value: true
   options: ''
   type: boolean
-  description: 'Aircraft that can be flown are restricted to a user''s rank'
+  description: 'Aircraft restricted to user''s rank'
+- key: pireps.restrict_aircraft_to_typerating
+  name: 'Restrict Aircraft by Type Ratings'
+  group: pireps
+  value: false
+  options: ''
+  type: boolean
+  description: 'Aircraft restricted to user type ratings'
 - key: pireps.only_aircraft_at_dpt_airport
   name: 'Restrict Aircraft At Departure'
   group: pireps
@@ -319,6 +333,13 @@
   options: ''
   type: int
   description: 'The length of a pilot''s ID'
+- key: pilots.id_code
+  name: 'Pilot ID Code'
+  group: pilots
+  value: ''
+  options: ''
+  type: text
+  description: 'Fixed ICAO code for pilot IDs'
 - key: pilots.auto_accept
   name: 'Auto Accept New Pilot'
   group: pilots
@@ -389,6 +410,41 @@
   options: ''
   type: text
   description: The Discord Webhook URL for private notifications
+- key: notifications.discord_pirep_status
+  name: Discord Pirep Messages (Public)
+  group: notifications
+  value: true
+  options: ''
+  type: boolean
+  description: Pirep status messages (Only key events are being sent)
+- key: notifications.mail_pirep_admin
+  name: Pirep Filed (Admin)
+  group: notifications
+  value: true
+  options: ''
+  type: boolean
+  description: Pirep filed mails sent to admins
+- key: notifications.mail_pirep_user_ack
+  name: Pirep Accepted (Pilot)
+  group: notifications
+  value: true
+  options: ''
+  type: boolean
+  description: Pirep Accepted mails sent to pilots
+- key: notifications.mail_pirep_user_rej
+  name: Pirep Rejected (Pilot)
+  group: notifications
+  value: true
+  options: ''
+  type: boolean
+  description: Pirep Rejected mails sent to pilots
+- key: notifications.mail_news
+  name: News Mails
+  group: notifications
+  value: true
+  options: ''
+  type: boolean
+  description: News mails sent to all members
 - key: 'cron.random_id'
   name: 'Cron Randomized ID'
   group: 'cron'

app/Events/CronFifteenMinute.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Events;
+
+use App\Contracts\Event;
+
+class CronFifteenMinute extends Event
+{
+}

app/Events/CronFiveMinute.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Events;
+
+use App\Contracts\Event;
+
+class CronFiveMinute extends Event
+{
+}

app/Events/CronThirtyMinute.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Events;
+
+use App\Contracts\Event;
+
+class CronThirtyMinute extends Event
+{
+}

app/Events/Fares.php

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

app/Exceptions/BidNotFound.php

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

app/Http/Controllers/Admin/AircraftController.php

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

app/Http/Controllers/Admin/AirlinesController.php

@@ -38,7 +38,7 @@ class AirlinesController extends Controller
     public function index(Request $request)
     {
         $this->airlineRepo->pushCriteria(new RequestCriteria($request));
-        $airlines = $this->airlineRepo->all();
+        $airlines = $this->airlineRepo->orderby('name', 'asc')->get();
 
         return view('admin.airlines.index', [
             'airlines' => $airlines,

app/Http/Controllers/Admin/FlightController.php

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

app/Http/Controllers/Admin/ModulesController.php

@@ -9,6 +9,7 @@ use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
+use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
 
 class ModulesController extends Controller
@@ -29,6 +30,7 @@ class ModulesController extends Controller
     {
         $modules = $this->moduleSvc->getAllModules();
         $new_modules = $this->moduleSvc->scan();
+
         return view('admin.modules.index', [
             'modules'     => $modules,
             'new_modules' => $new_modules,
@@ -97,7 +99,14 @@ class ModulesController extends Controller
      */
     public function enable(Request $request)
     {
-        $this->moduleSvc->addModule($request->input('name'));
+        $moduleName = $request->input('name');
+
+        try {
+            $this->moduleSvc->addModule($moduleName);
+        } catch (\Exception $e) {
+            Log::error('Error activating module '.$moduleName);
+        }
+
         return redirect(route('admin.modules.index'));
     }
 

app/Http/Controllers/Admin/PirepController.php

@@ -9,6 +9,7 @@ use App\Models\Enums\PirepSource;
 use App\Models\Enums\PirepState;
 use App\Models\Pirep;
 use App\Models\PirepComment;
+use App\Models\PirepFare;
 use App\Repositories\AircraftRepository;
 use App\Repositories\AirlineRepository;
 use App\Repositories\AirportRepository;
@@ -151,10 +152,10 @@ class PirepController extends Controller
                 $count = $request->input($field_name);
             }
 
-            $fares[] = [
+            $fares[] = new PirepFare([
                 'fare_id' => $fare->id,
                 'count'   => $count,
-            ];
+            ]);
         }
 
         $this->fareSvc->saveForPirep($pirep, $fares);

app/Http/Controllers/Admin/SubfleetController.php

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

app/Http/Controllers/Admin/TypeRatingController.php

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

app/Http/Controllers/Admin/UserController.php

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

app/Http/Controllers/Api/AcarsController.php

@@ -148,10 +148,10 @@ class AcarsController extends Controller
         $pirep = Pirep::find($id);
         $this->checkCancelled($pirep);
 
-        Log::debug(
+        /*Log::debug(
             'Posting ACARS update (user: '.Auth::user()->ident.', pirep id :'.$id.'): ',
             $request->post()
-        );
+        );*/
 
         $count = 0;
         $positions = $request->post('positions');
@@ -193,9 +193,9 @@ class AcarsController extends Controller
         }
 
         // Change the PIREP status if it's as SCHEDULED before
-        if ($pirep->status === PirepStatus::INITIATED) {
+        /*if ($pirep->status === PirepStatus::INITIATED) {
             $pirep->status = PirepStatus::AIRBORNE;
-        }
+        }*/
 
         $pirep->save();
 
@@ -223,7 +223,7 @@ class AcarsController extends Controller
         $pirep = Pirep::find($id);
         $this->checkCancelled($pirep);
 
-        Log::debug('Posting ACARS log, PIREP: '.$id, $request->post());
+        // Log::debug('Posting ACARS log, PIREP: '.$id, $request->post());
 
         $count = 0;
         $logs = $request->post('logs');

app/Http/Controllers/Api/AirlineController.php

@@ -30,9 +30,9 @@ class AirlineController extends Controller
      */
     public function index(Request $request)
     {
-        $airports = $this->airlineRepo->whereOrder(['active' => true], 'name')->get();
+        $airlines = $this->airlineRepo->whereOrder(['active' => true], 'name')->paginate();
 
-        return AirlineResource::collection($airports);
+        return AirlineResource::collection($airlines);
     }
 
     /**

app/Http/Controllers/Api/MaintenanceController.php

@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers\Api;
 
+use App\Console\Cron;
 use App\Contracts\Controller;
 use App\Exceptions\CronInvalid;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Artisan;
 
 class MaintenanceController extends Controller
 {
@@ -24,12 +24,12 @@ class MaintenanceController extends Controller
             throw new CronInvalid();
         }
 
-        $output = '';
-        Artisan::call('schedule:run');
-        $output .= trim(Artisan::output());
+        $cron = app(Cron::class);
+        $run = $cron->run();
 
-        return response([
-            'content' => $output,
+        return response()->json([
+            'count' => count($run),
+            'tasks' => $run,
         ]);
     }
 }

app/Http/Controllers/Api/PirepController.php

@@ -25,6 +25,7 @@ use App\Models\Pirep;
 use App\Models\PirepComment;
 use App\Models\PirepFare;
 use App\Models\PirepFieldValue;
+use App\Models\User;
 use App\Repositories\JournalRepository;
 use App\Repositories\PirepRepository;
 use App\Services\Finance\PirepFinanceService;
@@ -235,8 +236,12 @@ class PirepController extends Controller
         Log::info('PIREP Update, user '.Auth::id());
         Log::info($request->getContent());
 
+        /** @var User $user */
         $user = Auth::user();
+
+        /** @var Pirep $pirep */
         $pirep = Pirep::find($pirep_id);
+
         $this->checkCancelled($pirep);
 
         $attrs = $this->parsePirep($request);
@@ -278,6 +283,7 @@ class PirepController extends Controller
     {
         Log::info('PIREP file, user '.Auth::id(), $request->post());
 
+        /** @var User $user */
         $user = Auth::user();
 
         // Check if the status is cancelled...
@@ -328,16 +334,18 @@ class PirepController extends Controller
      *
      * @throws \Prettus\Validator\Exceptions\ValidatorException
      *
-     * @return PirepResource
+     * @return mixed
      */
     public function cancel($pirep_id, Request $request)
     {
-        Log::info('PIREP Cancel, user '.Auth::id(), $request->post());
+        Log::info('PIREP '.$pirep_id.' Cancel, user '.Auth::id(), $request->post());
 
         $pirep = Pirep::find($pirep_id);
-        $this->pirepSvc->cancel($pirep);
+        if (!empty($pirep)) {
+            $this->pirepSvc->cancel($pirep);
+        }
 
-        return new PirepResource($pirep);
+        return $this->message('PIREP '.$pirep_id.' cancelled');
     }
 
     /**

app/Http/Controllers/Api/UserController.php

@@ -3,6 +3,8 @@
 namespace App\Http\Controllers\Api;
 
 use App\Contracts\Controller;
+use App\Exceptions\BidNotFound;
+use App\Exceptions\Unauthorized;
 use App\Exceptions\UserNotFound;
 use App\Http\Resources\Bid as BidResource;
 use App\Http\Resources\Pirep as PirepResource;
@@ -144,6 +146,32 @@ class UserController extends Controller
         return BidResource::collection($bids);
     }
 
+    /**
+     * Get a particular bid for a user
+     *
+     * @param                          $bid_id
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return \App\Http\Resources\Bid
+     */
+    public function get_bid($bid_id, Request $request)
+    {
+        /** @var \App\Models\User $user */
+        $user = Auth::user();
+
+        // Return the current bid
+        $bid = $this->bidSvc->getBid($user, $bid_id);
+        if ($bid === null) {
+            throw new BidNotFound($bid_id);
+        }
+
+        if ($bid->user_id !== $user->id) {
+            throw new Unauthorized(new \Exception('Bid not not belong to authenticated user'));
+        }
+
+        return new BidResource($bid);
+    }
+
     /**
      * Return the fleet that this user is allowed to
      *

app/Http/Controllers/Auth/RegisterController.php

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

app/Http/Controllers/Frontend/AirportController.php

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

app/Http/Controllers/Frontend/DashboardController.php

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

app/Http/Controllers/Frontend/DownloadController.php

@@ -41,22 +41,25 @@ class DownloadController extends Controller
             $klass = new $class();
             $obj = $klass->find($id);
 
-            $category = explode('\\', $class);
-            $category = end($category);
+            // Check if the object is there first
+            if (isset($obj)) {
+                $category = explode('\\', $class);
+                $category = end($category);
 
-            if ($category == 'Aircraft' && $airlines > 1) {
-                $group_name = $category.' > '.$obj->subfleet->airline->name.' '.$obj->icao.' '.$obj->registration;
-            } elseif ($category == 'Aircraft') {
-                $group_name = $category.' > '.$obj->icao.' '.$obj->registration;
-            } elseif ($category == 'Airport') {
-                $group_name = $category.' > '.$obj->icao.' : '.$obj->name.' ('.$obj->country.')';
-            } elseif ($category == 'Subfleet' && $airlines > 1) {
-                $group_name = $category.' > '.$obj->airline->name.' '.$obj->name;
-            } else {
-                $group_name = $category.' > '.$obj->name;
+                if ($category == 'Aircraft' && $airlines > 1) {
+                    $group_name = $category.' > '.$obj->subfleet->airline->name.' '.$obj->icao.' '.$obj->registration;
+                } elseif ($category == 'Aircraft') {
+                    $group_name = $category.' > '.$obj->icao.' '.$obj->registration;
+                } elseif ($category == 'Airport') {
+                    $group_name = $category.' > '.$obj->icao.' : '.$obj->name.' ('.$obj->country.')';
+                } elseif ($category == 'Subfleet' && $airlines > 1) {
+                    $group_name = $category.' > '.$obj->airline->name.' '.$obj->name;
+                } else {
+                    $group_name = $category.' > '.$obj->name;
+                }
+
+                $regrouped_files[$group_name] = $files;
             }
-
-            $regrouped_files[$group_name] = $files;
         }
 
         ksort($regrouped_files, SORT_STRING);

app/Http/Controllers/Frontend/FlightController.php

@@ -13,6 +13,7 @@ use App\Repositories\FlightRepository;
 use App\Repositories\SubfleetRepository;
 use App\Repositories\UserRepository;
 use App\Services\GeoService;
+use App\Services\ModuleService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
@@ -25,6 +26,7 @@ class FlightController extends Controller
     private $airlineRepo;
     private $airportRepo;
     private $flightRepo;
+    private $moduleSvc;
     private $subfleetRepo;
     private $geoSvc;
     private $userRepo;
@@ -34,6 +36,7 @@ class FlightController extends Controller
      * @param AirportRepository  $airportRepo
      * @param FlightRepository   $flightRepo
      * @param GeoService         $geoSvc
+     * @param ModuleService      $moduleSvc
      * @param SubfleetRepository $subfleetRepo
      * @param UserRepository     $userRepo
      */
@@ -42,6 +45,7 @@ class FlightController extends Controller
         AirportRepository $airportRepo,
         FlightRepository $flightRepo,
         GeoService $geoSvc,
+        ModuleService $moduleSvc,
         SubfleetRepository $subfleetRepo,
         UserRepository $userRepo
     ) {
@@ -49,6 +53,7 @@ class FlightController extends Controller
         $this->airportRepo = $airportRepo;
         $this->flightRepo = $flightRepo;
         $this->geoSvc = $geoSvc;
+        $this->moduleSvc = $moduleSvc;
         $this->subfleetRepo = $subfleetRepo;
         $this->userRepo = $userRepo;
     }
@@ -83,6 +88,7 @@ class FlightController extends Controller
 
         /** @var \App\Models\User $user */
         $user = Auth::user();
+        $user->loadMissing('current_airport');
 
         if (setting('pilots.restrict_to_company')) {
             $where['airline_id'] = $user->airline_id;
@@ -108,7 +114,12 @@ class FlightController extends Controller
 
         // Get only used Flight Types for the search form
         // And filter according to settings
-        $usedtypes = Flight::select('flight_type')->where($where)->groupby('flight_type')->orderby('flight_type', 'asc')->get();
+        $usedtypes = Flight::select('flight_type')
+            ->where($where)
+            ->groupby('flight_type')
+            ->orderby('flight_type')
+            ->get();
+
         // Build collection with type codes and labels
         $flight_types = collect('', '');
         foreach ($usedtypes as $ftype) {
@@ -117,18 +128,28 @@ class FlightController extends Controller
 
         $flights = $this->flightRepo->searchCriteria($request)
             ->with([
-                'dpt_airport',
-                'arr_airport',
                 'airline',
+                'alt_airport',
+                'arr_airport',
+                'dpt_airport',
+                'subfleets.airline',
                 'simbrief' => function ($query) use ($user) {
                     $query->where('user_id', $user->id);
                 }, ])
-            ->orderBy('flight_number', 'asc')
-            ->orderBy('route_leg', 'asc')
+            ->orderBy('flight_number')
+            ->orderBy('route_leg')
             ->paginate();
 
-        $saved_flights = Bid::where('user_id', Auth::id())
-            ->pluck('flight_id')->toArray();
+        $saved_flights = [];
+        $bids = Bid::where('user_id', Auth::id())->get();
+        foreach ($bids as $bid) {
+            if (!$bid->flight) {
+                $bid->delete();
+                continue;
+            }
+
+            $saved_flights[$bid->flight_id] = $bid->id;
+        }
 
         return view('flights.index', [
             'user'          => $user,
@@ -145,6 +166,7 @@ class FlightController extends Controller
             'subfleet_id'   => $request->input('subfleet_id'),
             'simbrief'      => !empty(setting('simbrief.api_key')),
             'simbrief_bids' => setting('simbrief.only_bids'),
+            'acars_plugin'  => $this->moduleSvc->isModuleActive('VMSAcars'),
         ]);
     }
 
@@ -171,7 +193,7 @@ class FlightController extends Controller
             }
 
             $flights->add($bid->flight);
-            $saved_flights[] = $bid->flight->id;
+            $saved_flights[$bid->flight_id] = $bid->id;
         }
 
         return view('flights.bids', [
@@ -183,6 +205,7 @@ class FlightController extends Controller
             'subfleets'     => $this->subfleetRepo->selectBoxList(true),
             'simbrief'      => !empty(setting('simbrief.api_key')),
             'simbrief_bids' => setting('simbrief.only_bids'),
+            'acars_plugin'  => $this->moduleSvc->isModuleActive('VMSAcars'),
         ]);
     }
 
@@ -195,7 +218,19 @@ class FlightController extends Controller
      */
     public function show($id)
     {
-        $flight = $this->flightRepo->find($id);
+        $user_id = Auth::id();
+        $with_flight = [
+            'airline',
+            'alt_airport',
+            'arr_airport',
+            'dpt_airport',
+            'subfleets.airline',
+            'simbrief' => function ($query) use ($user_id) {
+                $query->where('user_id', $user_id);
+            },
+        ];
+
+        $flight = $this->flightRepo->with($with_flight)->find($id);
         if (empty($flight)) {
             Flash::error('Flight not found!');
             return redirect(route('frontend.dashboard.index'));
@@ -203,9 +238,14 @@ class FlightController extends Controller
 
         $map_features = $this->geoSvc->flightGeoJson($flight);
 
+        // See if the user has a bid for this flight
+        $bid = Bid::where(['user_id' => $user_id, 'flight_id' => $flight->id])->first();
+
         return view('flights.show', [
             'flight'       => $flight,
             'map_features' => $map_features,
+            'bid'          => $bid,
+            'acars_plugin' => $this->moduleSvc->isModuleActive('VMSAcars'),
         ]);
     }
 }

app/Http/Controllers/Frontend/HomeController.php

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

app/Http/Controllers/Frontend/PirepController.php

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

app/Http/Controllers/Frontend/ProfileController.php

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

app/Http/Controllers/Frontend/SimBriefController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Frontend;
 
 use App\Exceptions\AssetNotFound;
 use App\Models\Aircraft;
+use App\Models\Bid;
 use App\Models\Enums\AircraftState;
 use App\Models\Enums\AircraftStatus;
 use App\Models\Enums\FareType;
@@ -14,6 +15,7 @@ use App\Models\SimBrief;
 use App\Models\User;
 use App\Repositories\FlightRepository;
 use App\Services\FareService;
+use App\Services\ModuleService;
 use App\Services\SimBriefService;
 use App\Services\UserService;
 use Exception;
@@ -24,17 +26,20 @@ class SimBriefController
 {
     private $fareSvc;
     private $flightRepo;
+    private $moduleSvc;
     private $simBriefSvc;
     private $userSvc;
 
     public function __construct(
         FareService $fareSvc,
         FlightRepository $flightRepo,
+        ModuleService $moduleSvc,
         SimBriefService $simBriefSvc,
         UserService $userSvc
     ) {
         $this->fareSvc = $fareSvc;
         $this->flightRepo = $flightRepo;
+        $this->moduleSvc = $moduleSvc;
         $this->simBriefSvc = $simBriefSvc;
         $this->userSvc = $userSvc;
     }
@@ -57,7 +62,7 @@ class SimBriefController
         $aircraft_id = $request->input('aircraft_id');
 
         /** @var Flight $flight */
-        $flight = $this->flightRepo->with(['fares', 'subfleets'])->find($flight_id);
+        $flight = $this->flightRepo->with(['airline', 'arr_airport', 'dpt_airport', 'fares', 'subfleets'])->find($flight_id);
 
         if (!$flight) {
             flash()->error('Unknown flight');
@@ -75,45 +80,39 @@ class SimBriefController
 
         // No aircraft selected, show selection form
         if (!$aircraft_id) {
-            // If no subfleets defined for flight get them from user
-            if ($flight->subfleets->count() > 0) {
-                $subfleets = $flight->subfleets;
-            } else {
-                $subfleets = $this->userSvc->getAllowableSubfleets($user);
-            }
 
-            // Build an array of subfleet id's from the subfleets collection
-            $sf_ids = $subfleets->map(function ($subfleets) {
-                return collect($subfleets->toArray())
-                  ->only(['id'])
-                  ->all();
-            });
+            // Get user's allowed subfleets and intersect it with flight subfleets
+            // so we will have a proper list which the user is allowed to fly
+            $user_subfleets = $this->userSvc->getAllowableSubfleets($user)->pluck('id')->toArray();
+            $flight_subfleets = $flight->subfleets->pluck('id')->toArray();
 
-            // Now we can build a proper aircrafts collection
-            // Contents will be either members of flight->subfleets
-            // or members of user's allowable subfleets
-            $aircrafts = Aircraft::whereIn('subfleet_id', $sf_ids)
-                                ->where('state', AircraftState::PARKED)
-                                ->where('status', AircraftStatus::ACTIVE)
-                                ->orderby('icao')
-                                ->orderby('registration')
-                                ->get();
+            $subfleet_ids = filled($flight_subfleets) ? array_intersect($user_subfleets, $flight_subfleets) : $user_subfleets;
+
+            // Prepare variables for single aircraft query
+            $where = [];
+            $where['state'] = AircraftState::PARKED;
+            $where['status'] = AircraftStatus::ACTIVE;
 
             if (setting('pireps.only_aircraft_at_dpt_airport')) {
-                $aircrafts = $aircrafts->where('airport_id', $flight->dpt_airport_id);
+                $where['airport_id'] = $flight->dpt_airport_id;
             }
 
-            if (setting('simbrief.block_aircraft')) {
-                // Build a list of aircraft_id's being used for active sb packs
-                $sb_aircraft = SimBrief::whereNotNull('flight_id')->pluck('aircraft_id');
-                // Filter aircraft list to non used/blocked ones
-                $aircrafts = $aircrafts->whereNotIn('id', $sb_aircraft);
-            }
+            $withCount = ['simbriefs' => function ($query) {
+                $query->whereNull('pirep_id');
+            }];
+
+            // Build proper aircraft collection considering all possible settings
+            // Flight subfleets, user subfleet restrictions, pirep restrictions, simbrief blocking etc
+            $aircraft = Aircraft::withCount($withCount)->where($where)
+                ->when(setting('simbrief.block_aircraft'), function ($query) {
+                    return $query->having('simbriefs_count', 0);
+                })->whereIn('subfleet_id', $subfleet_ids)
+                ->orderby('icao')->orderby('registration')
+                ->get();
 
             return view('flights.simbrief_aircraft', [
                 'flight'    => $flight,
-                'aircrafts' => $aircrafts,
-                'subfleets' => $subfleets,
+                'aircrafts' => $aircraft,
             ]);
         }
 
@@ -130,7 +129,7 @@ class SimBriefController
         // SimBrief profile does not exists and everything else is ok
         // Select aircraft which will be used for calculations and details
         /** @var Aircraft $aircraft */
-        $aircraft = Aircraft::where('id', $aircraft_id)->first();
+        $aircraft = Aircraft::with(['airline'])->where('id', $aircraft_id)->first();
 
         // Figure out the proper fares to use for this flight/aircraft
         $all_fares = $this->fareSvc->getFareWithOverrides($aircraft->subfleet->fares, $flight->fares);
@@ -225,7 +224,7 @@ class SimBriefController
 
         // Show the main simbrief form
         return view('flights.simbrief_form', [
-            'user'             => Auth::user(),
+            'user'             => $user,
             'flight'           => $flight,
             'aircraft'         => $aircraft,
             'pax_weight'       => $pax_weight,
@@ -253,7 +252,11 @@ class SimBriefController
      */
     public function briefing($id)
     {
-        $simbrief = SimBrief::find($id);
+        /** @var User $user */
+        $user = Auth::user();
+
+        /** @var SimBrief $simbrief */
+        $simbrief = SimBrief::with(['flight.airline', 'pirep.airline'])->find($id);
         if (!$simbrief) {
             flash()->error('SimBrief briefing not found');
             return redirect(route('frontend.flights.index'));
@@ -266,11 +269,18 @@ class SimBriefController
         $equipment = substr($str, $wc + 1, $tr - 2);
         $transponder = substr($str, $tr + 1);
 
+        // See if a bid exists for this flight
+        $bid = Bid::where(['user_id' => $user->id, 'flight_id' => $simbrief->flight_id])->first();
+
         return view('flights.simbrief_briefing', [
-            'simbrief'    => $simbrief,
-            'wakecat'     => $wakecat,
-            'equipment'   => $equipment,
-            'transponder' => $transponder,
+            'user'         => $user,
+            'simbrief'     => $simbrief,
+            'wakecat'      => $wakecat,
+            'equipment'    => $equipment,
+            'transponder'  => $transponder,
+            'bid'          => $bid,
+            'flight'       => $simbrief->flight,
+            'acars_plugin' => $this->moduleSvc->isModuleActive('VMSAcars'),
         ]);
     }
 

app/Http/Controllers/Frontend/UserController.php

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

app/Http/Requests/CreateTypeRatingRequest.php

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

app/Http/Requests/UpdateTypeRatingRequest.php

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

app/Http/Resources/Aircraft.php

@@ -4,6 +4,16 @@ namespace App\Http\Resources;
 
 use App\Contracts\Resource;
 
+/**
+ * @mixin \App\Models\Aircraft
+ */
 class Aircraft extends Resource
 {
+    public function toArray($request)
+    {
+        $res = parent::toArray($request);
+        $res['ident'] = $this->ident;
+
+        return $res;
+    }
 }

app/Listeners/AwardHandler.php

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

app/Listeners/ExpenseListener.php

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

app/Listeners/FareListener.php

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

app/Models/Aircraft.php

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

app/Models/Airline.php

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

app/Models/Award.php

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

app/Models/Bid.php

@@ -6,10 +6,12 @@ use App\Contracts\Model;
 use Carbon\Carbon;
 
 /**
- * @property string user_id
+ * @property int    user_id
  * @property string flight_id
  * @property Carbon created_at
  * @property Carbon updated_at
+ * @property Flight flight
+ * @property User   user
  */
 class Bid extends Model
 {

app/Models/Enums/AircraftStatus.php

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

app/Models/Enums/PirepState.php

@@ -4,9 +4,6 @@ namespace App\Models\Enums;
 
 use App\Contracts\Enum;
 
-/**
- * Class PirepState
- */
 class PirepState extends Enum
 {
     public const IN_PROGRESS = 0;  // flight is ongoing
@@ -16,6 +13,7 @@ class PirepState extends Enum
     public const DELETED = 4;
     public const DRAFT = 5;
     public const REJECTED = 6;
+    public const PAUSED = 7;
 
     protected static $labels = [
         self::IN_PROGRESS => 'pireps.state.in_progress',
@@ -25,5 +23,6 @@ class PirepState extends Enum
         self::DELETED     => 'pireps.state.deleted',
         self::DRAFT       => 'pireps.state.draft',
         self::REJECTED    => 'pireps.state.rejected',
+        self::PAUSED      => 'pireps.state.paused',
     ];
 }

app/Models/Enums/PirepStatus.php

@@ -34,6 +34,7 @@ class PirepStatus extends Enum
     public const ARRIVED = 'ONB'; // On block
     public const CANCELLED = 'DX';
     public const EMERG_DESCENT = 'EMG';
+    public const PAUSED = 'PSD';
 
     protected static $labels = [
         self::INITIATED     => 'pireps.status.initialized',
@@ -59,5 +60,6 @@ class PirepStatus extends Enum
         self::ARRIVED       => 'pireps.status.arrived',
         self::CANCELLED     => 'pireps.status.cancelled',
         self::EMERG_DESCENT => 'pireps.status.emerg_decent',
+        self::PAUSED        => 'pireps.status.paused',
     ];
 }

app/Models/Flight.php

@@ -24,6 +24,7 @@ use Illuminate\Support\Collection;
  * @property Collection subfleets
  * @property int        days
  * @property int        distance
+ * @property int        planned_distance
  * @property int        flight_time
  * @property string     route
  * @property string     dpt_time
@@ -136,19 +137,19 @@ class Flight extends Model
     }
 
     /**
-     * Get the flight ident, e.,g JBU1900
+     * Get the flight ident, e.,g JBU1900/C.nn/L.yy
      */
     public function getIdentAttribute(): string
     {
-        $flight_id = $this->airline->code;
+        $flight_id = optional($this->airline)->code;
         $flight_id .= $this->flight_number;
 
         if (filled($this->route_code)) {
-            $flight_id .= '-'.$this->route_code;
+            $flight_id .= '/C.'.$this->route_code;
         }
 
         if (filled($this->route_leg)) {
-            $flight_id .= '-'.$this->route_leg;
+            $flight_id .= '/L.'.$this->route_leg;
         }
 
         return $flight_id;

app/Models/Pirep.php

@@ -195,41 +195,39 @@ class Pirep extends Model
     /**
      * Create a new PIREP from a SimBrief instance
      *
-     * @param \App\Models\SimBrief $simBrief
+     * @param \App\Models\SimBrief $simbrief
      *
      * @return \App\Models\Pirep
      */
-    public static function fromSimBrief(SimBrief $simBrief): self
+    public static function fromSimBrief(SimBrief $simbrief): self
     {
         return new self([
-            'flight_id'      => $simBrief->flight->id,
-            'airline_id'     => $simBrief->flight->airline_id,
-            'flight_number'  => $simBrief->flight->flight_number,
-            'route_code'     => $simBrief->flight->route_code,
-            'route_leg'      => $simBrief->flight->route_leg,
-            'dpt_airport_id' => $simBrief->flight->dpt_airport_id,
-            'arr_airport_id' => $simBrief->flight->arr_airport_id,
-            'route'          => $simBrief->xml->getRouteString(),
-            'level'          => $simBrief->xml->getFlightLevel(),
+            'flight_id'      => $simbrief->flight->id,
+            'airline_id'     => $simbrief->flight->airline_id,
+            'flight_number'  => $simbrief->flight->flight_number,
+            'route_code'     => $simbrief->flight->route_code,
+            'route_leg'      => $simbrief->flight->route_leg,
+            'dpt_airport_id' => $simbrief->flight->dpt_airport_id,
+            'arr_airport_id' => $simbrief->flight->arr_airport_id,
+            'route'          => $simbrief->xml->getRouteString(),
+            'level'          => $simbrief->xml->getFlightLevel(),
         ]);
     }
 
     /**
-     * Get the flight ident, e.,g JBU1900
-     *
-     * @return string
+     * Get the flight ident, e.,g JBU1900/C.nn/L.yy
      */
     public function getIdentAttribute(): string
     {
-        //$flight_id = $this->airline->code;
-        $flight_id = $this->flight_number;
+        $flight_id = optional($this->airline)->code;
+        $flight_id .= $this->flight_number;
 
         if (filled($this->route_code)) {
-            $flight_id .= '/C'.$this->route_code;
+            $flight_id .= '/C.'.$this->route_code;
         }
 
         if (filled($this->route_leg)) {
-            $flight_id .= '/L'.$this->route_leg;
+            $flight_id .= '/L.'.$this->route_leg;
         }
 
         return $flight_id;

app/Models/SimBrief.php

@@ -41,6 +41,10 @@ class SimBrief extends Model
         'updated_at',
     ];
 
+    protected $casts = [
+        'user_id' => 'integer',
+    ];
+
     /** @var \App\Models\SimBriefXML Store a cached version of the XML object */
     private $xml_instance;
 
@@ -92,13 +96,12 @@ class SimBrief extends Model
 
     public function flight()
     {
-        if (!empty($this->attributes['flight_id'])) {
-            return $this->belongsTo(Flight::class, 'flight_id');
-        }
+        return $this->belongsTo(Flight::class, 'flight_id');
+    }
 
-        if (!empty($this->attributes['pirep_id'])) {
-            return $this->belongsTo(Pirep::class, 'pirep_id');
-        }
+    public function pirep()
+    {
+        return $this->belongsTo(Pirep::class, 'pirep_id');
     }
 
     public function user()

app/Models/Subfleet.php

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

app/Models/Typerating.php

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

app/Models/User.php

@@ -7,6 +7,7 @@ use App\Models\Traits\JournalTrait;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Laratrust\Traits\LaratrustUserTrait;
+use Staudenmeir\EloquentHasManyDeep\HasRelationships;
 
 /**
  * @property int              id
@@ -42,6 +43,7 @@ use Laratrust\Traits\LaratrustUserTrait;
  * @property UserFieldValue[] fields
  * @property Role[]           roles
  * @property Subfleet[]       subfleets
+ * @property TypeRating[]     typeratings
  *
  * @mixin \Illuminate\Database\Eloquent\Builder
  * @mixin \Illuminate\Notifications\Notifiable
@@ -52,6 +54,7 @@ class User extends Authenticatable
     use JournalTrait;
     use LaratrustUserTrait;
     use Notifiable;
+    use HasRelationships;
 
     public $table = 'users';
 
@@ -85,6 +88,7 @@ class User extends Authenticatable
         'toc_accepted',
         'opt_in',
         'last_ip',
+        'notes',
         'created_at',
         'updated_at',
     ];
@@ -94,10 +98,14 @@ class User extends Authenticatable
      */
     protected $hidden = [
         'api_key',
+        'email',
+        'name',
         'discord_id',
+        'discord_private_channel_id',
         'password',
         'last_ip',
         'remember_token',
+        'notes',
     ];
 
     protected $casts = [
@@ -125,8 +133,9 @@ class User extends Authenticatable
     public function getIdentAttribute(): string
     {
         $length = setting('pilots.id_length');
+        $ident_code = filled(setting('pilots.id_code')) ? setting('pilots.id_code') : optional($this->airline)->icao;
 
-        return $this->airline->icao.str_pad($this->pilot_id, $length, '0', STR_PAD_LEFT);
+        return $ident_code.str_pad($this->pilot_id, $length, '0', STR_PAD_LEFT);
     }
 
     /**
@@ -145,7 +154,7 @@ class User extends Authenticatable
         $first_name = $name_parts[0];
         $last_name = $name_parts[$count - 1];
 
-        return $first_name.' '.$last_name[0];
+        return $first_name.' '.mb_substr($last_name, 0, 1);
     }
 
     /**
@@ -191,8 +200,7 @@ class User extends Authenticatable
     {
         $default = config('gravatar.default');
 
-        $uri = config('gravatar.url')
-            .md5(strtolower(trim($this->email))).'?d='.urlencode($default);
+        $uri = config('gravatar.url').md5(strtolower(trim($this->email))).'?d='.urlencode($default);
 
         if ($size !== null) {
             $uri .= '&s='.$size;
@@ -265,4 +273,14 @@ class User extends Authenticatable
     {
         return $this->belongsTo(Rank::class, 'rank_id');
     }
+
+    public function typeratings()
+    {
+        return $this->belongsToMany(Typerating::class, 'typerating_user', 'user_id', 'typerating_id');
+    }
+
+    public function rated_subfleets()
+    {
+        return $this->hasManyDeep(Subfleet::class, ['typerating_user', Typerating::class, 'typerating_subfleet']);
+    }
 }

app/Models/UserFieldValue.php

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

app/Notifications/Channels/Discord/DiscordMessage.php

@@ -11,14 +11,16 @@ use Carbon\Carbon;
  */
 class DiscordMessage
 {
-    const COLOR_SUCCESS = '#0B6623';
-    const COLOR_WARNING = '#FD6A02';
-    const COLOR_ERROR = '#ED2939';
+    const COLOR_SUCCESS = '0B6623';
+    const COLOR_WARNING = 'FD6A02';
+    const COLOR_ERROR = 'ED2939';
 
     public $webhook_url;
 
     protected $title;
     protected $url;
+    protected $thumbnail = [];
+    protected $image = [];
     protected $description;
     protected $timestamp;
     protected $footer;
@@ -26,30 +28,43 @@ class DiscordMessage
     protected $author = [];
     protected $fields = [];
 
-    /**
-     * Supply the webhook URL that this should be going to
-     */
+    // Supply the webhook URL that this should be going to
     public function webhook(string $url): self
     {
         $this->webhook_url = $url;
         return $this;
     }
 
-    /**
-     * Title of the notification
-     */
+    // Title of the embed
     public function title(string $title): self
     {
         $this->title = $title;
         return $this;
     }
 
+    // URL of the Title
     public function url(string $url): self
     {
         $this->url = $url;
         return $this;
     }
 
+    // Thumbnail image (placed right side of embed)
+    // ['url' => '']
+    public function thumbnail(array $thumbnail): self
+    {
+        $this->thumbnail = $thumbnail;
+        return $this;
+    }
+
+    // Main image (placed bottom of embed)
+    // ['url' => '']
+    public function image(array $image): self
+    {
+        $this->image = $image;
+        return $this;
+    }
+
     /**
      * @param array|string $descriptionLines
      */
@@ -63,22 +78,15 @@ class DiscordMessage
         return $this;
     }
 
-    /**
-     * Set the author information:
-     * [
-     *    'name'     => '',
-     *    'url'      => '',
-     *    'icon_url' => '',
-     */
+    // Author details
+    // ['name' => '', 'url' => '', 'icon_url' => '']
     public function author(array $author): self
     {
         $this->author = $author;
         return $this;
     }
 
-    /**
-     * Set the fields
-     */
+    // Fields
     public function fields(array $fields): self
     {
         $this->fields = [];
@@ -99,32 +107,45 @@ class DiscordMessage
         return $this;
     }
 
+    // Fixed Success Color
     public function success(): self
     {
-        $this->color = static::COLOR_SUCCESS;
+        $this->color = hexdec('0B6623'); // static::COLOR_SUCCESS;
         return $this;
     }
 
+    // Fixed Warning
     public function warning(): self
     {
-        $this->color = static::COLOR_WARNING;
+        $this->color = hexdec('FD6A02'); // static::COLOR_WARNING;
         return $this;
     }
 
+    // Fixed Error
     public function error(): self
     {
-        $this->color = static::COLOR_ERROR;
+        $this->color = hexdec('ED2939'); // static::COLOR_ERROR;
+        return $this;
+    }
+
+    // Custom Color
+    public function color(string $embed_color): self
+    {
+        $this->color = hexdec($embed_color);
         return $this;
     }
 
     public function toArray(): array
     {
         $embeds = [
+            'type'        => 'rich',
+            'color'       => $this->color,
             'title'       => $this->title,
             'url'         => $this->url,
-            'type'        => 'rich',
+            'thumbnail'   => $this->thumbnail,
             'description' => $this->description,
             'author'      => $this->author,
+            'image'       => $this->image,
             'timestamp'   => Carbon::now('UTC'),
         ];
 

app/Notifications/Channels/Discord/DiscordWebhook.php

@@ -20,14 +20,23 @@ class DiscordWebhook
     public function send($notifiable, Notification $notification)
     {
         $message = $notification->toDiscordChannel($notifiable);
-        if ($message === null || empty($message->webhook_url)) {
-            Log::debug('Discord notifications not configured, skipping');
+        if ($message === null) {
+            //Log::debug('Discord notifications not configured, skipping');
             return;
         }
 
+        $webhook_url = $message->webhook_url;
+        if (empty($webhook_url)) {
+            $webhook_url = setting('notifications.discord_private_webhook_url');
+            if (empty($webhook_url)) {
+                //Log::debug('Discord notifications not configured, skipping');
+                return;
+            }
+        }
+
         try {
             $data = $message->toArray();
-            $this->httpClient->post($message->webhook_url, $data);
+            $this->httpClient->post($webhook_url, $data);
         } catch (RequestException $e) {
             $request = Psr7\Message::toString($e->getRequest());
             $response = Psr7\Message::toString($e->getResponse());

app/Notifications/Messages/AdminUserRegistered.php

@@ -4,8 +4,6 @@ namespace App\Notifications\Messages;
 
 use App\Contracts\Notification;
 use App\Models\User;
-use App\Notifications\Channels\Discord\DiscordMessage;
-use App\Notifications\Channels\Discord\DiscordWebhook;
 use App\Notifications\Channels\MailChannel;
 use Illuminate\Contracts\Queue\ShouldQueue;
 
@@ -32,32 +30,21 @@ class AdminUserRegistered extends Notification implements ShouldQueue
         );
     }
 
+    /**
+     * @param $notifiable
+     *
+     * @return string[]
+     */
     public function via($notifiable)
     {
-        return ['mail', DiscordWebhook::class];
+        return ['mail'];
     }
 
     /**
-     * Send a Discord notification
+     * @param $notifiable
      *
-     * @param User  $pirep
-     * @param mixed $user
-     *
-     * @return DiscordMessage|null
+     * @return array
      */
-    public function toDiscordChannel($user): ?DiscordMessage
-    {
-        if (empty(setting('notifications.discord_private_webhook_url'))) {
-            return null;
-        }
-
-        $dm = new DiscordMessage();
-        return $dm->webhook(setting('notifications.discord_private_webhook_url'))
-            ->success()
-            ->title('New User Registered: '.$user->ident)
-            ->fields([]);
-    }
-
     public function toArray($notifiable)
     {
         return [

app/Notifications/Messages/Broadcast/NewsAdded.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Notifications\Messages\Broadcast;
+
+use App\Contracts\Notification;
+use App\Models\News;
+use App\Notifications\Channels\Discord\DiscordMessage;
+use Illuminate\Contracts\Queue\ShouldQueue;
+
+class NewsAdded extends Notification implements ShouldQueue
+{
+    private $news;
+
+    public function __construct(News $news)
+    {
+        parent::__construct();
+
+        $this->news = $news;
+    }
+
+    public function via($notifiable)
+    {
+        return ['discord_webhook'];
+    }
+
+    /**
+     * @param News $news
+     *
+     * @return DiscordMessage|null
+     */
+    public function toDiscordChannel($news): ?DiscordMessage
+    {
+        $dm = new DiscordMessage();
+        return $dm->webhook(setting('notifications.discord_public_webhook_url'))
+            ->success()
+            ->title('News: '.$news->subject)
+            ->author([
+                'name'     => $news->user->ident.' - '.$news->user->name_private,
+                'url'      => '',
+                'icon_url' => $news->user->resolveAvatarUrl(),
+            ])
+            ->description($news->body);
+    }
+
+    /**
+     * Get the array representation of the notification.
+     *
+     * @param mixed $notifiable
+     *
+     * @return array
+     */
+    public function toArray($notifiable)
+    {
+        return [
+            'news_id' => $this->news->id,
+        ];
+    }
+}

app/Notifications/Messages/Broadcast/PirepFiled.php

@@ -1,22 +1,18 @@
 <?php
 
-namespace App\Notifications\Messages;
+namespace App\Notifications\Messages\Broadcast;
 
 use App\Contracts\Notification;
 use App\Models\Pirep;
 use App\Notifications\Channels\Discord\DiscordMessage;
-use App\Notifications\Channels\Discord\DiscordWebhook;
-use App\Notifications\Channels\MailChannel;
 use App\Support\Units\Distance;
 use App\Support\Units\Time;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use PhpUnitsOfMeasure\Exception\NonNumericValue;
 use PhpUnitsOfMeasure\Exception\NonStringUnitName;
 
-class PirepSubmitted extends Notification implements ShouldQueue
+class PirepFiled extends Notification implements ShouldQueue
 {
-    use MailChannel;
-
     private $pirep;
 
     /**
@@ -29,17 +25,11 @@ class PirepSubmitted extends Notification implements ShouldQueue
         parent::__construct();
 
         $this->pirep = $pirep;
-
-        $this->setMailable(
-            'New PIREP Submitted',
-            'notifications.mail.admin.pirep.submitted',
-            ['pirep' => $this->pirep]
-        );
     }
 
     public function via($notifiable)
     {
-        return ['mail', DiscordWebhook::class];
+        return ['discord_webhook'];
     }
 
     /**
@@ -51,42 +41,40 @@ class PirepSubmitted extends Notification implements ShouldQueue
      */
     public function toDiscordChannel($pirep): ?DiscordMessage
     {
-        if (empty(setting('notifications.discord_public_webhook_url'))) {
-            return null;
-        }
-
-        $title = 'Flight '.$pirep->airline->code.$pirep->ident.' Filed';
+        $title = 'Flight '.$pirep->ident.' Filed';
         $fields = [
-            'Flight'                => $pirep->airline->code.$pirep->ident,
-            'Departure Airport'     => $pirep->dpt_airport_id,
-            'Arrival Airport'       => $pirep->arr_airport_id,
-            'Equipment'             => $pirep->aircraft->ident,
-            'Flight Time (Planned)' => Time::minutesToTimeString($pirep->planned_flight_time),
+            'Dep.Airport' => $pirep->dpt_airport_id,
+            'Arr.Airport' => $pirep->arr_airport_id,
+            'Equipment'   => $pirep->aircraft->ident,
+            'Flight Time' => Time::minutesToTimeString($pirep->flight_time),
         ];
 
-        if ($pirep->planned_distance) {
+        if ($pirep->distance) {
             try {
-                $planned_distance = new Distance(
-                    $pirep->planned_distance,
+                $distance = new Distance(
+                    $pirep->distance,
                     config('phpvms.internal_units.distance')
                 );
 
-                $pd = $planned_distance[$planned_distance->unit].' '.$planned_distance->unit;
-                $fields['Distance (Planned)'] = $pd;
-            } catch (NonNumericValue | NonStringUnitName $e) {
+                $pd = $distance[$distance->unit].' '.$distance->unit;
+                $fields['Distance'] = $pd;
+            } catch (NonNumericValue|NonStringUnitName $e) {
             }
         }
 
+        // User avatar, somehow $pirep->user->resolveAvatarUrl() is not being accepted by Discord as thumbnail
+        $user_avatar = !empty($pirep->user->avatar) ? $pirep->user->avatar->url : $pirep->user->gravatar(256);
+
         $dm = new DiscordMessage();
         return $dm->webhook(setting('notifications.discord_public_webhook_url'))
             ->success()
             ->title($title)
             ->description($pirep->user->discord_id ? 'Flight by <@'.$pirep->user->discord_id.'>' : '')
-            ->url(route('frontend.pireps.show', [$pirep->id]))
+            ->thumbnail(['url' => $user_avatar])
+            ->image(['url' => $pirep->airline->logo])
             ->author([
-                'name'     => $pirep->user->ident.' - '.$pirep->user->name_private,
-                'url'      => route('frontend.profile.show', [$pirep->user_id]),
-                'icon_url' => $pirep->user->resolveAvatarUrl(),
+                'name' => $pirep->user->ident.' - '.$pirep->user->name_private,
+                'url'  => route('frontend.profile.show', [$pirep->user_id]),
             ])
             ->fields($fields);
     }

app/Notifications/Messages/Broadcast/PirepPrefiled.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Notifications\Messages;
+namespace App\Notifications\Messages\Broadcast;
 
 use App\Contracts\Notification;
 use App\Models\Pirep;
@@ -48,9 +48,9 @@ class PirepPrefiled extends Notification implements ShouldQueue
             return null;
         }
 
-        $title = 'Flight '.$pirep->airline->code.$pirep->ident.' Prefiled';
+        $title = 'Flight '.$pirep->ident.' Prefiled';
         $fields = [
-            'Flight'                => $pirep->airline->code.$pirep->ident,
+            'Flight'                => $pirep->ident,
             'Departure Airport'     => $pirep->dpt_airport_id,
             'Arrival Airport'       => $pirep->arr_airport_id,
             'Equipment'             => $pirep->aircraft->ident,

app/Notifications/Messages/Broadcast/PirepStatusChanged.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Notifications\Messages;
+namespace App\Notifications\Messages\Broadcast;
 
 use App\Contracts\Notification;
 use App\Models\Enums\PirepStatus;
@@ -44,6 +44,7 @@ class PirepStatusChanged extends Notification implements ShouldQueue
         PirepStatus::LANDED        => 'has landed',
         PirepStatus::ARRIVED       => 'has arrived',
         PirepStatus::CANCELLED     => 'is cancelled',
+        PirepStatus::PAUSED        => 'is paused',
         PirepStatus::EMERG_DESCENT => 'in emergency descent',
     ];
 
@@ -76,14 +77,12 @@ class PirepStatusChanged extends Notification implements ShouldQueue
             return null;
         }
 
-        $title = 'Flight '.$pirep->airline->code.$pirep->ident.' '.self::$verbs[$pirep->status];
-
+        $title = 'Flight '.$pirep->ident.' '.self::$verbs[$pirep->status];
         $fields = [
-            'Flight'            => $pirep->airline->code.$pirep->ident,
-            'Departure Airport' => $pirep->dpt_airport_id,
-            'Arrival Airport'   => $pirep->arr_airport_id,
-            'Equipment'         => $pirep->aircraft->ident,
-            'Flight Time'       => Time::minutesToTimeString($pirep->flight_time),
+            'Dep.Airport' => $pirep->dpt_airport_id,
+            'Arr.Airport' => $pirep->arr_airport_id,
+            'Equipment'   => $pirep->aircraft->ident,
+            'Flight Time' => Time::minutesToTimeString($pirep->flight_time),
         ];
 
         // Show the distance, but include the planned distance if it's been set
@@ -101,25 +100,38 @@ class PirepStatusChanged extends Notification implements ShouldQueue
                         $planned_distance = new Distance($pirep->planned_distance, $unit);
                         $pd = $planned_distance[$planned_distance->unit];
                         $fields['Distance'] .= '/'.$pd;
-                    } catch (NonNumericValue | NonStringUnitName $e) {
+                    } catch (NonNumericValue|NonStringUnitName $e) {
                     }
                 }
 
                 $fields['Distance'] .= ' '.$planned_distance->unit;
-            } catch (NonNumericValue | NonStringUnitName $e) {
+            } catch (NonNumericValue|NonStringUnitName $e) {
             }
         }
 
+        // User avatar, somehow $pirep->user->resolveAvatarUrl() is not being accepted by Discord as thumbnail
+        $user_avatar = !empty($pirep->user->avatar) ? $pirep->user->avatar->url : $pirep->user->gravatar(256);
+
+        // Proper coloring for the messages
+        // Pirep Filed > success, normals > warning, non-normals > error
+        $danger_types = [
+            PirepStatus::GRND_RTRN,
+            PirepStatus::DIVERTED,
+            PirepStatus::CANCELLED,
+            PirepStatus::PAUSED,
+            PirepStatus::EMERG_DESCENT,
+        ];
+        $color = in_array($pirep->status, $danger_types, true) ? 'ED2939' : 'FD6A02';
+
         $dm = new DiscordMessage();
         return $dm->webhook(setting('notifications.discord_public_webhook_url'))
-            ->success()
+            ->color($color)
             ->title($title)
             ->description($pirep->user->discord_id ? 'Flight by <@'.$pirep->user->discord_id.'>' : '')
-            ->url(route('frontend.pireps.show', [$pirep->id]))
+            ->thumbnail(['url' => $user_avatar])
             ->author([
-                'name'     => $pirep->user->ident.' - '.$pirep->user->name_private,
-                'url'      => route('frontend.profile.show', [$pirep->user_id]),
-                'icon_url' => $pirep->user->resolveAvatarUrl(),
+                'name' => $pirep->user->ident.' - '.$pirep->user->name_private,
+                'url'  => route('frontend.profile.show', [$pirep->user_id]),
             ])
             ->fields($fields);
     }

app/Notifications/Messages/Broadcast/UserRegistered.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Notifications\Messages\Broadcast;
+
+use App\Contracts\Notification;
+use App\Models\User;
+use App\Notifications\Channels\Discord\DiscordMessage;
+use App\Notifications\Channels\MailChannel;
+use Illuminate\Contracts\Queue\ShouldQueue;
+
+/**
+ * Send a message to a Discord channel that a user was registered
+ */
+class UserRegistered extends Notification implements ShouldQueue
+{
+    use MailChannel;
+
+    private $user;
+
+    /**
+     * Create a new notification instance.
+     *
+     * @param \App\Models\User $user
+     */
+    public function __construct(User $user)
+    {
+        parent::__construct();
+
+        $this->user = $user;
+    }
+
+    /**
+     * @param $notifiable
+     *
+     * @return string[]
+     */
+    public function via($notifiable)
+    {
+        return ['discord_webhook'];
+    }
+
+    /**
+     * Send a Discord notification
+     *
+     * @param $notifiable
+     *
+     * @return DiscordMessage|null
+     */
+    public function toDiscordChannel($notifiable): ?DiscordMessage
+    {
+        $dm = new DiscordMessage();
+        return $dm->webhook(setting('notifications.discord_private_webhook_url'))
+            ->success()
+            ->title('New User Registered: '.$this->user->ident)
+            ->author([
+                'name'     => $this->user->ident.' - '.$this->user->name_private,
+                'url'      => '',
+                'icon_url' => $this->user->resolveAvatarUrl(),
+            ])
+            ->fields([]);
+    }
+
+    /**
+     * @param $notifiable
+     *
+     * @return array
+     */
+    public function toArray($notifiable)
+    {
+        return [
+            'user_id' => $this->user->id,
+        ];
+    }
+}

app/Notifications/Messages/PirepFiled.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Notifications\Messages;
+
+use App\Contracts\Notification;
+use App\Models\Pirep;
+use App\Notifications\Channels\MailChannel;
+use Illuminate\Contracts\Queue\ShouldQueue;
+
+class PirepFiled extends Notification implements ShouldQueue
+{
+    use MailChannel;
+
+    private $pirep;
+
+    /**
+     * Create a new notification instance.
+     *
+     * @param \App\Models\Pirep $pirep
+     */
+    public function __construct(Pirep $pirep)
+    {
+        parent::__construct();
+
+        $this->pirep = $pirep;
+
+        $this->setMailable(
+            'New PIREP Submitted',
+            'notifications.mail.admin.pirep.submitted',
+            ['pirep' => $this->pirep]
+        );
+    }
+
+    public function via($notifiable)
+    {
+        return ['mail'];
+    }
+
+    /**
+     * Get the array representation of the notification.
+     *
+     * @param mixed $notifiable
+     *
+     * @return array
+     */
+    public function toArray($notifiable)
+    {
+        return [
+            'pirep_id' => $this->pirep->id,
+            'user_id'  => $this->pirep->user_id,
+        ];
+    }
+}

app/Notifications/NotificationEventsHandler.php

@@ -11,6 +11,7 @@ use App\Events\PirepRejected;
 use App\Events\PirepStatusChange;
 use App\Events\UserRegistered;
 use App\Events\UserStateChanged;
+use App\Models\Enums\PirepStatus;
 use App\Models\Enums\UserState;
 use App\Models\User;
 use App\Notifications\Messages\UserRejected;
@@ -58,8 +59,8 @@ class NotificationEventsHandler extends Listener
             }
 
             try {
-                $this->notifyUser($user, $notification);
-                // Notification::send([$user], $notification);
+                // $this->notifyUser($user, $notification);
+                Notification::send([$user], $notification);
             } catch (Exception $e) {
                 Log::emergency('Error emailing admin ('.$user->email.'). Error='.$e->getMessage());
             }
@@ -134,10 +135,10 @@ class NotificationEventsHandler extends Listener
          */
         $this->notifyAdmins(new Messages\AdminUserRegistered($event->user));
 
-        /**
-         * Discord and other notifications
+        /*
+         * Broadcast notifications
          */
-        Notification::send([$event->user], new Messages\AdminUserRegistered($event->user));
+        Notification::send([$event->user], new Messages\Broadcast\UserRegistered($event->user));
     }
 
     /**
@@ -161,21 +162,42 @@ class NotificationEventsHandler extends Listener
     }
 
     /**
-     * Prefile notification
+     * Prefile notification. Disabled intentionally, No need to send it to Discord
      */
     public function onPirepPrefile(PirepPrefiled $event): void
     {
         Log::info('NotificationEvents::onPirepPrefile: '.$event->pirep->id.' prefiled');
-        Notification::send([$event->pirep], new Messages\PirepPrefiled($event->pirep));
+
+        /*
+         * Broadcast notifications
+         */
+        // Notification::send([$event->pirep], new Messages\Broadcast\PirepPrefiled($event->pirep));
     }
 
     /**
-     * Status Change notification
+     * Status Change notification.
+     * Reduced the messages (Boarding, Pushback, TakeOff, Landing and non-normals only)
+     * If needed array can be tied to a setting at admin side for further customization
      */
     public function onPirepStatusChange(PirepStatusChange $event): void
     {
-        Log::info('NotificationEvents::onPirepStatusChange: '.$event->pirep->id.' prefiled');
-        Notification::send([$event->pirep], new Messages\PirepStatusChanged($event->pirep));
+        Log::info('NotificationEvents::onPirepStatusChange: '.$event->pirep->id.' status changed');
+
+        $message_types = [
+            PirepStatus::BOARDING,
+            PirepStatus::PUSHBACK_TOW,
+            PirepStatus::GRND_RTRN,
+            PirepStatus::TAKEOFF,
+            PirepStatus::LANDED,
+            PirepStatus::DIVERTED,
+            PirepStatus::CANCELLED,
+            PirepStatus::PAUSED,
+            PirepStatus::EMERG_DESCENT,
+        ];
+
+        if (setting('notifications.discord_pirep_status', true) && in_array($event->pirep->status, $message_types, true)) {
+            Notification::send([$event->pirep], new Messages\Broadcast\PirepStatusChanged($event->pirep));
+        }
     }
 
     /**
@@ -186,8 +208,14 @@ class NotificationEventsHandler extends Listener
     public function onPirepFile(PirepFiled $event): void
     {
         Log::info('NotificationEvents::onPirepFile: '.$event->pirep->id.' filed');
-        $this->notifyAdmins(new Messages\PirepSubmitted($event->pirep));
-        Notification::send([$event->pirep], new Messages\PirepSubmitted($event->pirep));
+        if (setting('notifications.mail_pirep_admin', true)) {
+            $this->notifyAdmins(new Messages\PirepFiled($event->pirep));
+        }
+
+        /*
+         * Broadcast notifications
+         */
+        Notification::send([$event->pirep], new Messages\Broadcast\PirepFiled($event->pirep));
     }
 
     /**
@@ -197,8 +225,10 @@ class NotificationEventsHandler extends Listener
      */
     public function onPirepAccepted(PirepAccepted $event): void
     {
-        Log::info('NotificationEvents::onPirepAccepted: '.$event->pirep->id.' accepted');
-        $this->notifyUser($event->pirep->user, new Messages\PirepAccepted($event->pirep));
+        if (setting('notifications.mail_pirep_user_ack', true)) {
+            Log::info('NotificationEvents::onPirepAccepted: '.$event->pirep->id.' accepted');
+            $this->notifyUser($event->pirep->user, new Messages\PirepAccepted($event->pirep));
+        }
     }
 
     /**
@@ -208,8 +238,10 @@ class NotificationEventsHandler extends Listener
      */
     public function onPirepRejected(PirepRejected $event): void
     {
-        Log::info('NotificationEvents::onPirepRejected: '.$event->pirep->id.' rejected');
-        $this->notifyUser($event->pirep->user, new Messages\PirepRejected($event->pirep));
+        if (setting('notifications.mail_pirep_user_rej', true)) {
+            Log::info('NotificationEvents::onPirepRejected: '.$event->pirep->id.' rejected');
+            $this->notifyUser($event->pirep->user, new Messages\PirepRejected($event->pirep));
+        }
     }
 
     /**
@@ -220,7 +252,13 @@ class NotificationEventsHandler extends Listener
     public function onNewsAdded(NewsAdded $event): void
     {
         Log::info('NotificationEvents::onNewsAdded');
-        $this->notifyAllUsers(new Messages\NewsAdded($event->news));
-        Notification::send([$event->news], new Messages\NewsAdded($event->news));
+        if (setting('notifications.mail_news', true)) {
+            $this->notifyAllUsers(new Messages\NewsAdded($event->news));
+        }
+
+        /*
+         * Broadcast notifications
+         */
+        Notification::send([$event->news], new Messages\Broadcast\NewsAdded($event->news));
     }
 }

app/Providers/AppServiceProvider.php

@@ -2,10 +2,12 @@
 
 namespace App\Providers;
 
+use App\Notifications\Channels\Discord\DiscordWebhook;
 use App\Services\ModuleService;
 use App\Support\ThemeViewFinder;
 use App\Support\Utils;
 use Illuminate\Pagination\Paginator;
+use Illuminate\Support\Facades\Notification;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\ServiceProvider;
@@ -15,8 +17,13 @@ class AppServiceProvider extends ServiceProvider
     public function boot(): void
     {
         Schema::defaultStringLength(191);
+
         Paginator::useBootstrap();
         View::share('moduleSvc', app(ModuleService::class));
+
+        Notification::extend('discord_webhook', function ($app) {
+            return app(DiscordWebhook::class);
+        });
     }
 
     /**

app/Providers/CronServiceProvider.php

@@ -12,9 +12,12 @@ use App\Cron\Nightly\PilotLeave;
 use App\Cron\Nightly\RecalculateBalances;
 use App\Cron\Nightly\RecalculateStats;
 use App\Cron\Nightly\SetActiveFlights;
+use App\Events\CronFifteenMinute;
+use App\Events\CronFiveMinute;
 use App\Events\CronHourly;
 use App\Events\CronMonthly;
 use App\Events\CronNightly;
+use App\Events\CronThirtyMinute;
 use App\Events\CronWeekly;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
 
@@ -24,6 +27,15 @@ use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvi
 class CronServiceProvider extends ServiceProvider
 {
     protected $listen = [
+        CronFiveMinute::class    => [],
+        CronFifteenMinute::class => [],
+        CronThirtyMinute::class  => [],
+        CronHourly::class        => [
+            DeletePireps::class,
+            RemoveExpiredBids::class,
+            RemoveExpiredLiveFlights::class,
+            ClearExpiredSimbrief::class,
+        ],
         CronNightly::class => [
             ApplyExpenses::class,
             RecalculateBalances::class,
@@ -32,19 +44,10 @@ class CronServiceProvider extends ServiceProvider
             RecalculateStats::class,
             NewVersionCheck::class,
         ],
-
         CronWeekly::class => [
         ],
-
         CronMonthly::class => [
             \App\Cron\Monthly\ApplyExpenses::class,
         ],
-
-        CronHourly::class => [
-            DeletePireps::class,
-            RemoveExpiredBids::class,
-            RemoveExpiredLiveFlights::class,
-            ClearExpiredSimbrief::class,
-        ],
     ];
 }

app/Providers/EventServiceProvider.php

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

app/Providers/RouteServiceProvider.php

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

app/Repositories/AcarsRepository.php

@@ -69,11 +69,11 @@ class AcarsRepository extends Repository
             ->where(['state' => PirepState::IN_PROGRESS]);
 
         if ($live_time !== null && $live_time > 0) {
-            $st = Carbon::now('UTC')->subHours($live_time);
-            $q = $q->whereDate('created_at', '>=', $st);
+            $st = Carbon::now()->subHours($live_time);
+            $q = $q->where('updated_at', '>=', $st);
         }
 
-        $q = $q->orderBy('created_at', 'desc');
+        $q = $q->orderBy('updated_at', 'desc');
         return $q->get();
     }
 

app/Repositories/FlightRepository.php

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