Formatting

More acceptable translation to opt-in (es)

.eslintignore

@@ -0,0 +1,7 @@
+.travis/*
+.idea/*
+.vscode/*
+node_modules/*
+public/*
+gulpfile.js
+webpack.mix.js

.eslintrc

@@ -0,0 +1,25 @@
+{
+  "extends": "airbnb",
+  "env": {
+    "es6": true,
+    "mocha": true
+  },
+  "parserOptions": {
+    "ecmaVersion": 8
+  },
+  "rules": {
+    "camelcase": 0,
+    "no-param-reassign": [
+      2,
+      {
+        "props": false
+      }
+    ],
+    "import/no-extraneous-dependencies": [
+      "error",
+      {
+        "devDependencies": true
+      }
+    ]
+  }
+}

.gitignore

@@ -3,7 +3,8 @@ _ide_helper.php
 /vendor
 node_modules/
 npm-debug.log
-
+composer.phar
+yarn-error.log
 *.bak
 
 # Laravel 4 specific

.styleci.yml

@@ -0,0 +1,31 @@
+preset: recommended
+risky: true
+enabled:
+  - align_double_arrow_minimal
+  # - align_equals_minimal
+  # - date_time_immutable
+  - ereg_to_preg
+  - function_to_constant
+  # - mb_str_functions
+  - modernize_types_casting
+  # - native_function_invocation
+  - no_blank_lines_after_return
+  - no_homoglyph_names
+  - no_php4_constructor
+  - no_useless_else
+  - phpdoc_add_missing_param_annotation
+disabled:
+  - align_double_arrow
+  - blank_line_before_return
+  # - hash_to_slash_comment
+  - phpdoc_summary
+  - phpdoc_var_without_name
+  # - unalign_equals
+finder:
+  exclude:
+  - modules
+  - node_modules
+  - storage
+  - vendor
+  name: "*.php"
+  not-name: "*.blade.php"

.travis.yml

@@ -1,8 +1,8 @@
 language: php
 php:
-- '7.0'
+#- '7.0'
 - '7.1'
-#- '7.2'
+- '7.2'
 #- nightly
 
 cache:
@@ -12,11 +12,10 @@ cache:
 
 services:
 - mysql
-#- redis-server
 
 before_script:
   - cp .travis/env.travis.php env.php
-  - composer install --no-interaction --verbose
+  - composer install --dev --no-interaction --verbose
 
 script:
 - php artisan database:create --reset
@@ -39,7 +38,7 @@ jobs:
           script: ./.travis/deploy_script.sh
           on:
             all_branches: true
-            php: '7.0'
+            php: '7.1'
     - stage: release
       script: skip
       before_deploy:
@@ -55,4 +54,4 @@ jobs:
         on:
           tags: true
           repo: nabeelio/phpvms
-          php: '7.0'
+          php: '7.1'

.travis/Formatting.xml

@@ -0,0 +1,27 @@
+<code_scheme name="PHPVMS" version="173">
+  <option name="RIGHT_MARGIN" value="100" />
+  <PHPCodeStyleSettings>
+    <option name="ALIGN_KEY_VALUE_PAIRS" value="true" />
+    <option name="LOWER_CASE_BOOLEAN_CONST" value="true" />
+    <option name="LOWER_CASE_NULL_CONST" value="true" />
+    <option name="ALIGN_CLASS_CONSTANTS" value="true" />
+    <option name="FORCE_SHORT_DECLARATION_ARRAY_STYLE" value="true" />
+  </PHPCodeStyleSettings>
+  <XML>
+    <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+  </XML>
+  <codeStyleSettings language="JAVA">
+    <indentOptions>
+      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+    </indentOptions>
+  </codeStyleSettings>
+  <codeStyleSettings language="JSON">
+    <indentOptions>
+      <option name="INDENT_SIZE" value="4" />
+    </indentOptions>
+  </codeStyleSettings>
+  <codeStyleSettings language="PHP">
+    <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+    <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
+  </codeStyleSettings>
+</code_scheme>

.travis/deploy_script.sh

@@ -28,40 +28,92 @@ if [ "$TRAVIS" = "true" ]; then
 
     echo "Cleaning files"
 
-    make clean
+    rm -rf vendor
+    composer install --no-dev --prefer-dist --no-interaction --verbose
+
+    # Clean up the dependencies to remove some of the dev packages
+#    declare -a remove_packages=(
+#        'barryvdh/laravel-ide-helper'
+#        'bpocallaghan/generators'
+#        'codedungeon/phpunit-result-printer'
+#        'fzaninotto/faker'
+#        'nikic/php-parser'
+#        'phpstan/phpstan'
+#        'phpunit/phpunit',
+#        'weebly/phpstan-laravel'
+#    )
+#
+#    for pkg in "${remove_packages[@]}"
+#    do
+#        composer --optimize-autoloader --no-interaction remove $pkg
+#    done
+
+    # Leftover individual files to delete
+    declare -a remove_files=(
+        .git
+        .sass-cache
+        .idea
+        .travis
+        tests
+        _ide_helper.php
+        .dpl
+        .eslintignore
+        .eslintrc
+        .phpstorm.meta.php
+        .styleci.yml
+        env.php
+        config.php
+        Makefile
+        phpunit.xml
+        phpvms.iml
+        Procfile
+        phpstan.neon
+        node_modules
+        composer.phar
+        vendor/willdurand/geocoder/tests
+    )
+
+    for file in "${remove_files[@]}"
+    do
+        rm -rf $file
+    done
 
-    rm -rf env.php config.php
     find ./vendor -type d -name ".git" -print0 | xargs rm -rf
     find . -type d -name "sass-cache" -print0 | xargs rm -rf
 
     # clear any app specific stuff that might have been loaded in
+    find storage/app -mindepth 1 -not -name '.gitignore' -not -name public -not -name import -print0 -exec rm -rf {} +
     find storage/app/public -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
-    find storage/app -mindepth 1 -not -name '.gitignore' -not -name public -print0 -exec rm -rf {} +
+    find storage/framework/cache -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
+    find storage/framework/sessions -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
+    find storage/framework/views -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
+    find storage/logs -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
 
-    # Remove any development files
-    rm -rf .sass-cache
-    rm -rf .idea phpvms.iml .travis .dpl
-    rm -rf .phpstorm.meta.php _ide_helper.php phpunit.xml Procfile
+    make clean
 
-    # remove large sized files
-    rm -rf .git
-    rm -rf node_modules
-    rm -rf composer.phar
-
-    # delete files in vendor that are rather large
-    rm -rf vendor/willdurand/geocoder/tests
-
-    echo "creating tarball"
+    echo "Creating Tarball"
     cd /tmp
     tar -czf $TAR_NAME -C $TRAVIS_BUILD_DIR/../ phpvms
     sha256sum $TAR_NAME > "$TAR_NAME.sha256"
 
-    echo "uploading to s3"
+    echo "Uploading to S3"
     mkdir -p $TRAVIS_BUILD_DIR/build
     cd $TRAVIS_BUILD_DIR/build
 
     mv "/tmp/$TAR_NAME" "/tmp/$TAR_NAME.sha256" .
     artifacts upload --target-paths "/" $TAR_NAME $TRAVIS_BUILD_DIR/VERSION $TAR_NAME.sha256
 
+    # Upload the version for a tagged release. Move to a version file in different
+    # tags. Within phpVMS, we have an option of which version to track in the admin
+    if test "$TRAVIS_TAG"; then
+        echo "Uploading release version file"
+        cp "$TRAVIS_BUILD_DIR/VERSION" release_version
+        artifacts upload --target-paths "/" release_version
+    else
+        echo "Uploading ${TRAVIS_BRANCH}_version file"
+        cp $TRAVIS_BUILD_DIR/VERSION ${TRAVIS_BRANCH}_version
+        artifacts upload --target-paths "/" ${TRAVIS_BRANCH}_version
+    fi
+
     curl -X POST --data "{\"content\": \"A new build is available at http://downloads.phpvms.net/$TAR_NAME ($VERSION)\"}" -H "Content-Type: application/json"  $DISCORD_WEBHOOK_URL
 fi

.travis/phpunit.travis.xml

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

CHANGELOG.md

@@ -1,8 +1,72 @@
-# Changelog
+## Alpha 3
 
-## [Unreleased]
+!! Please do a complete reinstall, with a new database
 
-## 7.0.0-alpha1
+- Finances! The finance portions have been implemented, you can [read about them here](http://docs.phpvms.net/concepts/finances)
+- Awards! Added the award plugin system. [see docs](http://docs.phpvms.net/customizing/awards)
+- Import/Export in admin panel for aircraft, airports, expenses, fares, flights and subfleets
+- Changed theme system to using [laravel-theme](https://github.com/igaster/laravel-theme), there are changes to making theming much simpler with much more flexibility.
+- Added cron task for background tasks
+- Expanded on flight types to match IATA SIMM format
+- Added subfleet `cost_block_hour`
+- Fixed several security vulnerabilities (thanks magicflyer!)
+- Fuel units changed to lbs/kgs [#193](https://github.com/nabeelio/phpvms/issues/193)
+- Airports can be restricted to only hubs on registration/user profile
+- Cleaned up a lot unused icons and files [#195](https://github.com/nabeelio/phpvms/issues/195)
+- Rank restrictions for PIREPs are respected [#170](https://github.com/nabeelio/phpvms/issues/170)
+- API: Added the ability to get/update/delete user bids [#172](https://github.com/nabeelio/phpvms/issues/172)
+- API: Added `block_time` parameter for PIREP prefile/update/file calls
+- API: Added `block_on_time` and `block_off_time` for PIREP prefile/update/file calls
+- Artisan: Added a `phpvms:csv-import [table] [file]` to import from CSV
+- Artisan: Added a `phpvms:yaml-export [tables]` to export tables to YAML files which can be re-imported using `phpvms:yaml-import`
+- Numerous bug fixes
 
-### Added
-- Initial release
+## Alpha 2 (2018-02-23, v7.0.0-alpha2)
+
+!! Please do a full reinstall, with recreating the database
+
+- Bump minimum PHP version to 7.1, since 7.0 is already deprecated - [#166](https://github.com/nabeelio/phpvms/issues/166)
+- Upgraded to Laravel 5.6
+- Installer: Updated to create `config.php` file, to override config file values without having to modify the config files themselves
+- Installer: Moved most options into the `config.php`, out of the `env.php` file
+- Admin: Set the country for the airline [#191](https://github.com/nabeelio/phpvms/issues/191)
+- Admin: Add ranks from the subfleet edit page
+- Admin: Added flight time field to flight add/edit page
+- Admin: PIREP hours can't be changed after it's no longer in a pending state
+- Admin: Removed the tail number field
+- DB: `airport.tz` to `airport.timezone`
+- DB: Removed `aircaft.tail_number`
+- DB: Decimal type field sizes shrunk to the default sizes
+- DB: Removed the `raw_data` field from the PIREPs table
+- API: All units expected in imperial (distance in nautical miles, fuel in lbs, mass in lbs)
+- API: Added ability to add/remove bids for users
+- API: Added a setting to only show aircraft that are at the departure airport of a flight [#171](https://github.com/nabeelio/phpvms/issues/171)
+- API: Most calls, with exception of ACARS, are now private and require an API key to access [#173](https://github.com/nabeelio/phpvms/issues/173)
+- API: Create an `/api/flight/:id/route` call to return the route information for a flight [#183](https://github.com/nabeelio/phpvms/issues/183)
+- API: Allow a `fields` object to set custom PIREP fields, also returns the current values
+- API: `level` not required in prefile anymore
+- Setting: Restrict to aircraft that are at a flight's departure airport [#171](https://github.com/nabeelio/phpvms/issues/171)
+- Setting: Implementation of filtering flights that are only at the user's current airport [#174](https://github.com/nabeelio/phpvms/issues/174)
+- Templates: Add a `SKIN_NAME` template variable to reference the current skin, vs hardcoding the skin name in the templates
+- Console: Added `php artisan phpvms:dev-install` command which creates the config files and creates the database/inserts sample data in one command [#176](https://github.com/nabeelio/phpvms/issues/176)
+- Rank aircraft restrictions are properly working now [#170](https://github.com/nabeelio/phpvms/issues/170)
+
+#### Fixes
+
+- PIREP fields being set when filing manually is working
+- ACARS data wasn't being ordered properly, causing issues on the map [77055991](https://github.com/nabeelio/phpvms/commit/77055991af36877552e1921466987d3066774d6b)
+- Field for the rank's image changed to string input [b5dbde8](https://github.com/nabeelio/phpvms/commit/b5dbde84c4c786799f474117381b8227642f0777)
+- Set a default value for a setting [#106](https://github.com/nabeelio/phpvms/issues/106)
+- Admin: Rank image field fixed
+- API: Only active airlines are returned
+- API; Return errors if user isn't allowed on the submitted aircraft [#170](https://github.com/nabeelio/phpvms/issues/170)
+- API: Fixed typo from `subfleet` to `subfleets` in the `/api/flights` call(s) [f6b2102](https://github.com/nabeelio/phpvms/commit/f6b2102e4827da6177eb4eee0c3ce0d38eb78ce3)
+- API: Wrapped all calls in a `data` field
+- API: `planned_distance` and `planned_flight_time` fields are now optional
+- Setting: Subfleets returned in the flight calls respect the `pireps.restrict_aircraft_to_rank` setting [#170](https://github.com/nabeelio/phpvms/issues/170)
+
+------
+
+## Alpha 1 (2018-02-04, v7.0.0-alpha1)
+
+- Initial Release

CODE_OF_CONDUCT.md

@@ -1,46 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at gm@nabs.io. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/

LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2017, phpvms
+Copyright (c) 2017, phpvms - http://www.phpvms.net
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Makefile

@@ -36,8 +36,7 @@ build:
 # This is to build all the stylesheets, etc
 .PHONY: build-assets
 build-assets:
-	npm update
-	npm run dev
+	yarn run dev
 
 .PHONY: install
 install: build
@@ -53,16 +52,13 @@ update: build
 	@echo "Done!"
 
 .PHONY: reset
-reset: clean
+reset: cleanapp/Models/Traits/JournalTrait.php
 	@php $(COMPOSER) dump-autoload
 	@make reload-db
 
 .PHONY: reload-db
 reload-db:
-	@php artisan database:create --reset
-	@php artisan migrate:refresh --seed
-	@php artisan phpvms:import app/Database/seeds/sample.yml
-	#php artisan phpvms:navdata
+	@php artisan phpvms:dev-install --reset-db
 
 .PHONY: tests
 tests: test
@@ -72,6 +68,10 @@ test:
 	#php artisan database:create --reset
 	vendor/bin/phpunit --debug --verbose
 
+.PHONY:
+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

README.md

@@ -1,6 +1,6 @@
 # phpvms <sup>7</sup>
 
-[![Build Status](https://travis-ci.org/nabeelio/phpvms.svg)](https://travis-ci.org/nabeelio/phpvms) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/d668bebb0a3c46bda381af16ce3d9450)](https://www.codacy.com/app/nabeelio/phpvms?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=nabeelio/phpvms&amp;utm_campaign=Badge_Grade) [![Total Downloads](https://poser.pugx.org/nabeel/phpvms/downloads)](https://packagist.org/packages/nabeel/phpvms) [![Latest Stable Version](https://poser.pugx.org/nabeel/phpvms/v/stable)](https://packagist.org/packages/nabeel/phpvms) [![Latest Unstable Version](https://poser.pugx.org/nabeel/phpvms/v/unstable)](https://packagist.org/packages/nabeel/phpvms) [![License](https://poser.pugx.org/nabeel/phpvms/license)](https://packagist.org/packages/nabeel/phpvms)
+[![Build Status](https://travis-ci.org/nabeelio/phpvms.svg)](https://travis-ci.org/nabeelio/phpvms) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/d668bebb0a3c46bda381af16ce3d9450)](https://www.codacy.com/app/nabeelio/phpvms?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=nabeelio/phpvms&amp;utm_campaign=Badge_Grade) [![Latest Stable Version](https://poser.pugx.org/nabeel/phpvms/v/stable)](https://packagist.org/packages/nabeel/phpvms) ![StyleCI](https://github.styleci.io/repos/93688482/shield?branch=dev) [![License](https://poser.pugx.org/nabeel/phpvms/license)](https://packagist.org/packages/nabeel/phpvms)
 
 The next phpvms version built on the laravel framework. work in progress. If you're looking for 
 the old, phpVMS classic, it's [available here](https://github.com/nabeelio/phpvms_v2).
@@ -15,7 +15,7 @@ The latest documentation, with installation instructions is available
 
 ## Requirements
 
-- PHP 7.0+, extensions:
+- PHP 7.1+, extensions:
   - cURL
   - JSON
   - mbstring
@@ -25,11 +25,11 @@ The latest documentation, with installation instructions is available
 - Database:
   - MySQL 5.5+ (or MySQL variant, including MariaDB and Percona)
 
-[View more details on requirements](http://docs.phpvms.net/basics/requirements)
+[View more details on requirements](http://docs.phpvms.net/setup/requirements)
 
 ## Installer
 
 1. Upload to your server
 2. Visit the site, and follow the link to the installer
 
-[View installation details](http://docs.phpvms.net/basics/installation)
+[View installation details](http://docs.phpvms.net/setup/installation)

app/Awards/PilotFlightAwards.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Awards;
+
+use App\Interfaces\Award;
+
+/**
+ * Simple example of an awards class, where you can apply an award when a user
+ * has 100 flights. All award classes need to extend the AwardInterface
+ */
+class PilotFlightAwards extends Award
+{
+    /**
+     * Set the name of this award class to make it easier to see when
+     * assigning to a specific award
+     *
+     * @var string
+     */
+    public $name = 'Pilot Flights';
+
+    /**
+     * The description to show under the parameters field, so the admin knows
+     * what the parameter actually controls. You can leave this blank if there
+     * isn't a parameter.
+     *
+     * @var string
+     */
+    public $param_description = 'The number of flights at which to give this award';
+
+    /**
+     * If the user has over N flights, then we can give them this award. This method
+     * only needs to return a true or false of whether it should be awarded or not.
+     *
+     * If no parameter is passed in, just default it to 100. You should check if there
+     * is a parameter or not. You can call it whatever you want, since that would make
+     * sense with the $param_description.
+     *
+     * @param int|null $number_of_flights The parameters passed in from the UI
+     *
+     * @return bool
+     */
+    public function check($number_of_flights = null): bool
+    {
+        if (!$number_of_flights) {
+            $number_of_flights = 100;
+        }
+
+        return $this->user->flights >= $number_of_flights;
+    }
+}

app/Bootstrap/LoadConfiguration.php

@@ -2,36 +2,27 @@
 
 namespace App\Bootstrap;
 
-use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\Config\Repository as RepositoryContract;
+use Illuminate\Contracts\Foundation\Application;
 
 /**
  * Class LoadConfiguration
- * @package App\Bootstrap
- *
- * I'm overriding this to take advantage of the configuration caching
- * and not needing to read the files from disk every time.
- *
- * Hopefully it won't affect anything within core framework but this
- * should be ok. Will just have to be cognizant of any changes to the
- * LoadConfiguration parent class, or if the Kernel changes the boot
- * order -NS
  */
 class LoadConfiguration extends \Illuminate\Foundation\Bootstrap\LoadConfiguration
 {
     /**
      * Load the configuration items from all of the files.
      *
-     * @param  \Illuminate\Contracts\Foundation\Application $app
-     * @param  \Illuminate\Contracts\Config\Repository $repository
-     * @return void
+     * @param \Illuminate\Contracts\Foundation\Application $app
+     * @param \Illuminate\Contracts\Config\Repository      $repository
+     *
      * @throws \Exception
      */
     protected function loadConfigurationFiles(Application $app, RepositoryContract $repository)
     {
         parent::loadConfigurationFiles($app, $repository);
 
-        /**
+        /*
          * Read in the base config, only if it exists
          */
         if (file_exists($app->basePath().'/config.php')) {

app/Console/BaseCommand.php

@@ -1,65 +0,0 @@
-<?php
-
-namespace App\Console;
-
-use Illuminate\Console\Command;
-use Symfony\Component\Process\Process;
-
-class BaseCommand extends Command
-{
-
-    /**
-     * Streaming file read
-     * @param $filename
-     * @return \Generator
-     */
-    public function readFile($filename)
-    {
-        $fp = fopen($filename, 'rb');
-
-        while (($line = fgets($fp)) !== false) {
-            $line = rtrim($line, "\r\n");
-            if ($line[0] === ';') {
-                continue;
-            }
-
-            yield $line;
-        }
-
-        fclose($fp);
-    }
-
-    /**
-     * @param $cmd
-     * @param bool $return
-     * @return string
-     */
-    public function runCommand($cmd, $return=false, $verbose=true)
-    {
-        if (\is_array($cmd)) {
-            $cmd = join(' ', $cmd);
-        }
-
-        if($verbose) {
-            $this->info('Running "' . $cmd . '"');
-        }
-
-        $val = '';
-        $process = new Process($cmd);
-        $process->run(function ($type, $buffer) use ($return, $val) {
-            if ($return) {
-                $val .= $buffer;
-            } else {
-                echo $buffer;
-            }
-
-            /*if (Process::ERR === $type) {
-                echo $buffer;
-            } else {
-                echo $buffer;
-            }*/
-        });
-
-        return $val;
-    }
-}

app/Console/Command.php

@@ -0,0 +1,106 @@
+<?php
+
+namespace App\Console;
+
+use Log;
+use Symfony\Component\Process\Process;
+
+/**
+ * Class BaseCommand
+ */
+abstract class Command extends \Illuminate\Console\Command
+{
+    /**
+     * @return mixed
+     */
+    abstract public function handle();
+
+    /**
+     * Splice the logger and replace the active handlers with
+     * the handlers from the "cron" stack in config/logging.php
+     *
+     * Close out any of the existing handlers so we don't leave
+     * file descriptors leaking around
+     *
+     * @param string $channel_name Channel name to grab the handlers from
+     */
+    public function redirectLoggingToStdout($channel_name): void
+    {
+        $logger = app(\Illuminate\Log\Logger::class);
+
+        // Close the existing loggers
+        try {
+            $handlers = $logger->getHandlers();
+            foreach ($handlers as $handler) {
+                $handler->close();
+            }
+        } catch (\Exception $e) {
+            $this->error('Error closing handlers: '.$e->getMessage());
+        }
+
+        // Open the handlers for the channel name,
+        // and then set them to the main logger
+        try {
+            $logger->setHandlers(
+                Log::channel($channel_name)->getHandlers()
+            );
+        } catch (\Exception $e) {
+            $this->error('Couldn\'t splice the logger: '.$e->getMessage());
+        }
+    }
+
+    /**
+     * Streaming file reader
+     *
+     * @param $filename
+     *
+     * @return \Generator
+     */
+    public function readFile($filename): ?\Generator
+    {
+        $fp = fopen($filename, 'rb');
+        while (($line = fgets($fp)) !== false) {
+            $line = rtrim($line, "\r\n");
+            if ($line[0] === ';') {
+                continue;
+            }
+
+            yield $line;
+        }
+
+        fclose($fp);
+    }
+
+    /**
+     * @param       $cmd
+     * @param bool  $return
+     * @param mixed $verbose
+     *
+     * @throws \Symfony\Component\Process\Exception\RuntimeException
+     * @throws \Symfony\Component\Process\Exception\LogicException
+     *
+     * @return string
+     */
+    public function runCommand($cmd, $return = false, $verbose = true): string
+    {
+        if (\is_array($cmd)) {
+            $cmd = implode(' ', $cmd);
+        }
+
+        if ($verbose) {
+            $this->info('Running "'.$cmd.'"');
+        }
+
+        $val = '';
+        $process = new Process($cmd);
+        $process->run(function ($type, $buffer) use ($return, &$val) {
+            if ($return) {
+                $val .= $buffer;
+            } else {
+                echo $buffer;
+            }
+        });
+
+        return $val;
+    }
+}

app/Console/Commands/AcarsReplay.php

@@ -2,25 +2,29 @@
 
 namespace App\Console\Commands;
 
-use Illuminate\Database\Eloquent\Collection;
-use GuzzleHttp\Client;
-
-use App\Console\BaseCommand;
+use App\Console\Command;
 use App\Facades\Utils;
+use GuzzleHttp\Client;
+use Illuminate\Database\Eloquent\Collection;
 
-class AcarsReplay extends BaseCommand
+/**
+ * Class AcarsReplay
+ */
+class AcarsReplay extends Command
 {
     protected $signature = 'phpvms:replay {files} {--manual} {--write-all} {--no-submit}';
     protected $description = 'Replay an ACARS file';
 
     /**
      * API Key to post as
+     *
      * @var string
      */
     protected $apiKey = 'testadminapikey';
 
     /**
      * For automatic updates, how many seconds to sleep between updates
+     *
      * @var int
      */
     protected $sleepTime = 10;
@@ -36,7 +40,6 @@ class AcarsReplay extends BaseCommand
      */
     protected $httpClient;
 
-
     /**
      * Return an instance of an HTTP client all ready to post
      */
@@ -46,148 +49,159 @@ class AcarsReplay extends BaseCommand
 
         $this->httpClient = new Client([
             'base_uri' => config('app.url'),
-            'headers' => [
+            'headers'  => [
                 'Authorization' => $this->apiKey,
-            ]
+            ],
         ]);
     }
 
-    /*protected function getArguments()
-    {
-        return [
-            ['--files', InputOption::VALUE_OPTIONAL]
-        ];
-    }*/
-
     /**
      * Make a request to start a PIREP
+     *
      * @param \stdClass $flight
+     *
+     * @throws \RuntimeException
+     *
      * @return string
      */
     protected function startPirep($flight): string
     {
-        # convert the planned flight time to be completely in minutes
-        $pft = Utils::hoursToMinutes($flight->planned_hrsenroute,
-                                     $flight->planned_minenroute);
+        // convert the planned flight time to be completely in minutes
+        $pft = Utils::hoursToMinutes(
+            $flight->planned_hrsenroute,
+            $flight->planned_minenroute
+        );
 
         $flight_number = substr($flight->callsign, 3);
 
         $response = $this->httpClient->post('/api/pireps/prefile', [
             'json' => [
-                'airline_id'            => 1,
-                'flight_number'         => $flight_number,
-                'aircraft_id'           => 1,
-                'dpt_airport_id'        => $flight->planned_depairport,
-                'arr_airport_id'        => $flight->planned_destairport,
-                'level'                 => $flight->planned_altitude,
-                'planned_flight_time'   => $pft,
-                'route'                 => $flight->planned_route,
-            ]
+                'airline_id'          => 1,
+                'flight_number'       => $flight_number,
+                'aircraft_id'         => 1,
+                'dpt_airport_id'      => $flight->planned_depairport,
+                'arr_airport_id'      => $flight->planned_destairport,
+                'level'               => $flight->planned_altitude,
+                'planned_flight_time' => $pft,
+                'route'               => $flight->planned_route,
+            ],
         ]);
 
         $body = \json_decode($response->getBody()->getContents());
+
         return $body->id;
     }
 
     /**
      * Mark the PIREP as filed
+     *
      * @param $pirep_id
+     *
+     * @throws \RuntimeException
+     *
      * @return mixed
      */
     protected function filePirep($pirep_id)
     {
         $response = $this->httpClient->post('/api/pireps/'.$pirep_id.'/file', [
-            'json'=> []
+            'json' => [],
         ]);
 
         $body = \json_decode($response->getBody()->getContents());
+
         return $body;
     }
 
     /**
      * @param $pirep_id
      * @param $data
+     *
+     * @throws \RuntimeException
+     *
      * @return array
      */
     protected function postUpdate($pirep_id, $data)
     {
-        $uri = '/api/pireps/' . $pirep_id . '/acars/position';
+        $uri = '/api/pireps/'.$pirep_id.'/acars/position';
 
         $position = [
-            'log' => '',
-            'lat' => $data->latitude,
-            'lon' => $data->longitude,
-            'heading' => $data->heading,
-            'altitude' => $data->altitude,
-            'gs' => $data->groundspeed,
+            'log'         => '',
+            'lat'         => $data->latitude,
+            'lon'         => $data->longitude,
+            'heading'     => $data->heading,
+            'altitude'    => $data->altitude,
+            'gs'          => $data->groundspeed,
             'transponder' => $data->transponder,
         ];
 
         $upd = [
             'positions' => [
-                $position
-            ]
+                $position,
+            ],
         ];
 
         $this->info("Update: $data->callsign, $position[lat] x $position[lon] \t\t"
-                    . "hdg: $position[heading]\t\talt: $position[altitude]\t\tgs: $position[gs]");
+            ."hdg: $position[heading]\t\talt: $position[altitude]\t\tgs: $position[gs]");
 
         $response = $this->httpClient->post($uri, [
-            'json' => $upd
+            'json' => $upd,
         ]);
 
         $body = \json_decode($response->getBody()->getContents());
+
         return [
             $data->callsign,
             $position['lat'],
             $position['lon'],
             $position['heading'],
             $position['altitude'],
-            $position['gs']
+            $position['gs'],
         ];
     }
 
     /**
      * Parse this file and run the updates
+     *
      * @param array $files
+     *
+     * @throws \RuntimeException
      */
     protected function updatesFromFile(array $files)
     {
         /**
          * @var $flights Collection
          */
-        $flights = collect($files)->transform(function ($f)
-        {
-            $file = storage_path('/replay/' . $f . '.json');
+        $flights = collect($files)->transform(function ($f) {
+            $file = storage_path('/replay/'.$f.'.json');
             if (file_exists($file)) {
-                $this->info('Loading ' . $file);
+                $this->info('Loading '.$file);
                 $contents = file_get_contents($file);
                 $contents = \json_decode($contents);
+
                 return collect($contents->updates);
-            } else {
-                $this->error($file . ' not found, skipping');
-                return false;
             }
+            $this->error($file.' not found, skipping');
+
+            return false;
         })
-            # remove any of errored file entries
+            // remove any of errored file entries
             ->filter(function ($value, $key) {
                 return $value !== false;
             });
 
         $this->info('Starting playback');
 
-        /**
+        /*
          * File the initial pirep to get a "preflight" status
          */
-        $flights->each(function ($updates, $idx)
-        {
+        $flights->each(function ($updates, $idx) {
             $update = $updates->first();
             $pirep_id = $this->startPirep($update);
             $this->pirepList[$update->callsign] = $pirep_id;
-            $this->info('Prefiled ' . $update->callsign . ', ID: ' . $pirep_id);
+            $this->info('Prefiled '.$update->callsign.', ID: '.$pirep_id);
         });
 
-        /**
+        /*
          * Iterate through all of the flights, retrieving the updates
          * from each individual flight. Remove the update. Continue through
          * until there are no updates left, at which point we remove the flight
@@ -202,15 +216,15 @@ class AcarsReplay extends BaseCommand
 
                 $this->postUpdate($pirep_id, $update);
 
-                # we're done and don't put the "no-submit" option
-                if($updates->count() === 0 && !$this->option('no-submit')) {
+                // we're done and don't put the "no-submit" option
+                if ($updates->count() === 0 && !$this->option('no-submit')) {
                     $this->filePirep($pirep_id);
                 }
             })->filter(function ($updates, $idx) {
                 return $updates->count() > 0;
             });
 
-            if(!$this->option('write-all')) {
+            if (!$this->option('write-all')) {
                 if (!$this->option('manual')) {
                     sleep($this->sleepTime);
                 } else {
@@ -223,9 +237,11 @@ class AcarsReplay extends BaseCommand
     /**
      * Execute the console command.
      *
+     * @throws \RuntimeException
+     *
      * @return mixed
      */
-    public function handle()
+    public function handle(): void
     {
         $files = $this->argument('files');
         $manual_mode = $this->option('manual');
@@ -233,6 +249,7 @@ class AcarsReplay extends BaseCommand
         if ($this->option('write-all')) {
             $this->info('In "dump-all" mode, just writing it all in');
         } else {
+            /* @noinspection NestedPositiveIfStatementsInspection */
             if (!$manual_mode) {
                 $this->info('Going to send updates every 10s');
             } else {

app/Console/Commands/ComposerCommand.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Console\Command;
+use Artisan;
+
+/**
+ * Class ComposerCommand
+ */
+class ComposerCommand extends Command
+{
+    protected $signature = 'phpvms:composer {cmd}';
+    protected $description = 'Composer related tasks';
+
+    /**
+     * Run composer update related commands
+     */
+    public function handle()
+    {
+        switch (trim($this->argument('cmd'))) {
+            case 'post-update':
+                $this->postUpdate();
+                break;
+            default:
+                $this->error('Command exists');
+        }
+    }
+
+    /**
+     * Any composer post update tasks
+     */
+    protected function postUpdate(): void
+    {
+        if (config('app.env') === 'dev') {
+            /* @noinspection NestedPositiveIfStatementsInspection */
+            if (class_exists(\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class)) {
+                Artisan::call('ide-helper:generate');
+                Artisan::call('ide-helper:meta');
+            }
+        }
+    }
+}

app/Console/Commands/CreateDatabase.php

@@ -2,16 +2,21 @@
 
 namespace App\Console\Commands;
 
+use App\Console\Command;
 use Log;
 
-use App\Console\BaseCommand;
-
-class CreateDatabase extends BaseCommand
+/**
+ * Class CreateDatabase
+ */
+class CreateDatabase extends Command
 {
     protected $signature = 'database:create {--reset} {--conn=?}';
     protected $description = 'Create a database';
     protected $os;
 
+    /**
+     * CreateDatabase constructor.
+     */
     public function __construct()
     {
         parent::__construct();
@@ -20,31 +25,35 @@ class CreateDatabase extends BaseCommand
 
     /**
      * Create the mysql database
+     *
      * @param $dbkey
+     *
      * @return bool
      */
     protected function create_mysql($dbkey)
     {
-        $host = config($dbkey . 'host');
-        $port = config($dbkey . 'port');
-        $name = config($dbkey . 'database');
-        $user = config($dbkey . 'username');
-        $pass = config($dbkey . 'password');
+        $host = config($dbkey.'host');
+        $port = config($dbkey.'port');
+        $name = config($dbkey.'database');
+        $user = config($dbkey.'username');
+        $pass = config($dbkey.'password');
 
         $dbSvc = new \App\Console\Services\Database();
 
         $dsn = $dbSvc->createDsn($host, $port);
-        Log::info('Connection string: ' . $dsn);
+        Log::info('Connection string: '.$dsn);
 
         try {
             $conn = $dbSvc->createPDO($dsn, $user, $pass);
         } catch (\PDOException $e) {
             Log::error($e);
+
             return false;
         }
 
         if ($this->option('reset') === true) {
             $sql = "DROP DATABASE IF EXISTS `$name`";
+
             try {
                 Log::info('Dropping database: '.$sql);
                 $conn->exec($sql);
@@ -60,12 +69,14 @@ class CreateDatabase extends BaseCommand
             $conn->exec($sql);
         } catch (\PDOException $e) {
             Log::error($e);
+
             return false;
         }
     }
 
     /**
      * Create the sqlite database
+     *
      * @param $dbkey
      */
     protected function create_sqlite($dbkey)
@@ -76,14 +87,14 @@ class CreateDatabase extends BaseCommand
         }
 
         if ($this->option('reset') === true) {
-            $cmd = ['rm', '-rf', config($dbkey . 'database')];
+            $cmd = ['rm', '-rf', config($dbkey.'database')];
             $this->runCommand($cmd);
         }
 
-        if (!file_exists(config($dbkey . 'database'))) {
+        if (!file_exists(config($dbkey.'database'))) {
             $cmd = [
                 $exec,
-                config($dbkey . 'database'),
+                config($dbkey.'database'),
                 '""',
             ];
 
@@ -109,21 +120,17 @@ class CreateDatabase extends BaseCommand
             }
         }*/
 
-        $this->info('Using connection "' . config('database.default') . '"');
+        $this->info('Using connection "'.config('database.default').'"');
 
         $conn = config('database.default');
-        $dbkey = 'database.connections.' . $conn . '.';
+        $dbkey = 'database.connections.'.$conn.'.';
 
-        if (config($dbkey . 'driver') === 'mysql') {
+        if (config($dbkey.'driver') === 'mysql') {
             $this->create_mysql($dbkey);
-        }
-
-        elseif (config($dbkey . 'driver') === 'sqlite') {
+        } elseif (config($dbkey.'driver') === 'sqlite') {
             $this->create_sqlite($dbkey);
-        }
-
-        // TODO: Eventually
-        elseif (config($dbkey . 'driver') === 'postgres') {
+        } // TODO: Eventually
+        elseif (config($dbkey.'driver') === 'postgres') {
             $this->create_postgres($dbkey);
         }
     }

app/Console/Commands/DevCommands.php

@@ -2,20 +2,36 @@
 
 namespace App\Console\Commands;
 
+use App\Console\Command;
+use App\Models\Acars;
+use App\Models\Airline;
+use App\Models\Pirep;
+use App\Models\User;
+use App\Services\AwardService;
+use App\Services\DatabaseService;
 use DB;
 use PDO;
+use Symfony\Component\Yaml\Yaml;
 
-use App\Models\Airline;
-use App\Models\User;
-
-use App\Console\BaseCommand;
-use App\Models\Acars;
-use App\Models\Pirep;
-
-class DevCommands extends BaseCommand
+/**
+ * Class DevCommands
+ */
+class DevCommands extends Command
 {
-    protected $signature = 'phpvms {cmd}';
+    protected $signature = 'phpvms {cmd} {param?}';
     protected $description = 'Developer commands';
+    protected $dbSvc;
+
+    /**
+     * DevCommands constructor.
+     *
+     * @param DatabaseService $dbSvc
+     */
+    public function __construct(DatabaseService $dbSvc)
+    {
+        parent::__construct();
+        $this->dbSvc = $dbSvc;
+    }
 
     /**
      * Run dev related commands
@@ -30,13 +46,16 @@ class DevCommands extends BaseCommand
         }
 
         $commands = [
-            'clear-acars' => 'clearAcars',
-            'clear-users' => 'clearUsers',
+            'list-awards'    => 'listAwardClasses',
+            'clear-acars'    => 'clearAcars',
+            'clear-users'    => 'clearUsers',
             'compile-assets' => 'compileAssets',
-            'db-attrs' => 'dbAttrs',
+            'db-attrs'       => 'dbAttrs',
+            'manual-insert'  => 'manualInsert',
+            'xml-to-yaml'    => 'xmlToYaml',
         ];
 
-        if(!array_key_exists($command, $commands)) {
+        if (!array_key_exists($command, $commands)) {
             $this->error('Command not found!');
             exit();
         }
@@ -44,12 +63,29 @@ class DevCommands extends BaseCommand
         $this->{$commands[$command]}();
     }
 
+    /**
+     * List all award classes
+     */
+    protected function listAwardClasses()
+    {
+        $awardSvc = app(AwardService::class);
+        $awards = $awardSvc->findAllAwardClasses();
+
+        $headers = ['Award Name', 'Class'];
+        $formatted_awards = [];
+        foreach ($awards as $award) {
+            $formatted_awards[] = [$award->name, \get_class($award)];
+        }
+
+        $this->table($headers, $formatted_awards);
+    }
+
     /**
      * Delete all the data from the ACARS and PIREP tables
      */
     protected function clearAcars()
     {
-        if(config('database.default') === 'mysql') {
+        if (config('database.default') === 'mysql') {
             DB::statement('SET foreign_key_checks=0');
         }
 
@@ -103,9 +139,77 @@ class DevCommands extends BaseCommand
         $server_version = $pdo->getAttribute(PDO::ATTR_SERVER_VERSION);
         $emulate_prepares = version_compare($server_version, $emulate_prepares_below_version, '<');
 
-        $this->info('Server Version: '. $server_version);
+        $this->info('Server Version: '.$server_version);
         $this->info('Emulate Prepares: '.$emulate_prepares);
 
         $pdo->setAttribute(PDO::ATTR_EMULATE_PREPARES, $emulate_prepares);
     }
+
+    /**
+     * Convert the sequelpro xml export to yaml
+     */
+    protected function xmlToYaml()
+    {
+        $file = $this->argument('param');
+        $this->info('Reading '.$file);
+
+        $xml_str = file_get_contents($file);
+        $xml = new \SimpleXMLElement($xml_str);
+
+        $yaml = [];
+        $table_name = (string) $xml->database->table_data['name'];
+        $this->info('Writing table "'.$table_name.'"');
+
+        $count = 0;
+        $yaml[$table_name] = [];
+
+        foreach ($xml->database->table_data->row as $row) {
+            $yaml_row = [];
+            foreach ($row->field as $field) {
+                $fname = (string) $field['name'];
+                $fvalue = (string) $field;
+
+                $yaml_row[$fname] = $fvalue;
+            }
+
+            $yaml[$table_name][] = $yaml_row;
+            $count++;
+        }
+
+        $this->info('Exporting '.$count.' rows');
+
+        $file_name = $table_name.'.yml';
+        file_put_contents(storage_path($file_name), Yaml::dump($yaml, 4, 2));
+        $this->info('Writing yaml to storage: '.$file_name);
+    }
+
+    /**
+     * Insert the rows from the file, manually advancing each row
+     */
+    protected function manualInsert(): void
+    {
+        $file = $this->argument('param');
+        $this->info('Reading '.$file);
+
+        if (!file_exists($file)) {
+            $this->error('File '.$file.' doesn\'t exist');
+            exit;
+        }
+
+        $yml = Yaml::parse(file_get_contents($file));
+        foreach ($yml as $table => $rows) {
+            $this->info('Importing table '.$table);
+            $this->info('Number of rows: '.\count($rows));
+
+            foreach ($rows as $row) {
+                try {
+                    $this->dbSvc->insert_row($table, $row);
+                } catch (\Exception $e) {
+                    $this->error($e);
+                }
+
+                $this->confirm('Insert next row?', true);
+            }
+        }
+    }
 }

app/Console/Commands/DevInstall.php

@@ -0,0 +1,98 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Console\Command;
+use Modules\Installer\Services\ConfigService;
+
+/**
+ * Create a fresh development install
+ */
+class DevInstall extends Command
+{
+    protected $signature = 'phpvms:dev-install {--reset-db} {--reset-configs}';
+    protected $description = 'Run a developer install and run the sample migration';
+
+    /**
+     * The YAML files with sample data to import
+     */
+    protected $yaml_imports = [
+        'sample.yml',
+        'acars.yml',
+    ];
+
+    /**
+     * Run dev related commands
+     *
+     * @throws \Symfony\Component\HttpFoundation\File\Exception\FileException
+     */
+    public function handle()
+    {
+        if ($this->option('reset-configs')) {
+            $this->rewriteConfigs();
+        }
+
+        // Reload the configuration
+        \App::boot();
+
+        $this->info('Recreating database');
+        $this->call('database:create', [
+            '--reset' => true,
+        ]);
+
+        $this->info('Running migrations');
+        $this->call('migrate:fresh', [
+            '--seed' => true,
+        ]);
+
+        //
+        //
+
+        $this->info('Importing sample data');
+        foreach ($this->yaml_imports as $yml) {
+            $this->call('phpvms:yaml-import', [
+                'files' => ['app/Database/seeds/'.$yml],
+            ]);
+        }
+
+        $this->info('Done!');
+    }
+
+    /**
+     * Rewrite the configuration files
+     *
+     * @throws \Symfony\Component\HttpFoundation\File\Exception\FileException
+     */
+    protected function rewriteConfigs()
+    {
+        $cfgSvc = app(ConfigService::class);
+
+        $this->info('Removing the old config files');
+
+        // Remove the old files
+        $config_file = base_path('config.php');
+        if (file_exists($config_file)) {
+            unlink($config_file);
+        }
+
+        $env_file = base_path('env.php');
+        if (file_exists($env_file)) {
+            unlink($env_file);
+        }
+
+        $this->info('Removing the sqlite db');
+        $db_file = storage_path('db.sqlite');
+        if (file_exists($db_file)) {
+            unlink($db_file);
+        }
+
+        $this->info('Regenerating the config files');
+        $cfgSvc->createConfigFiles([
+            'APP_ENV'   => 'dev',
+            'SITE_NAME' => 'phpvms test',
+            'DB_CONN'   => 'sqlite',
+        ]);
+
+        $this->info('Config files generated!');
+    }
+}

app/Console/Commands/ImportCsv.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Console\Command;
+use App\Services\ImportService;
+
+/**
+ * Class ImportCsv
+ */
+class ImportCsv extends Command
+{
+    protected $signature = 'phpvms:csv-import {type} {file}';
+    protected $description = 'Import from a CSV file';
+
+    private $importer;
+
+    /**
+     * Import constructor.
+     *
+     * @param ImportService $importer
+     */
+    public function __construct(ImportService $importer)
+    {
+        parent::__construct();
+        $this->importer = $importer;
+    }
+
+    /**
+     * @throws \Illuminate\Validation\ValidationException
+     *
+     * @return mixed|void
+     */
+    public function handle()
+    {
+        $type = $this->argument('type');
+        $file = $this->argument('file');
+
+        if (\in_array($type, ['flight', 'flights'])) {
+            $status = $this->importer->importFlights($file);
+        } elseif ($type === 'aircraft') {
+            $status = $this->importer->importAircraft($file);
+        } elseif (\in_array($type, ['airport', 'airports'])) {
+            $status = $this->importer->importAirports($file);
+        } elseif ($type === 'subfleet') {
+            $status = $this->importer->importSubfleets($file);
+        }
+
+        foreach ($status['success'] as $line) {
+            $this->info($line);
+        }
+
+        foreach ($status['errors'] as $line) {
+            $this->error($line);
+        }
+    }
+}

app/Console/Commands/ImportFromClassic.php

@@ -2,10 +2,9 @@
 
 namespace App\Console\Commands;
 
-use DB;
-use App\Console\BaseCommand;
+use App\Console\Command;
 
-class Importer extends BaseCommand
+class ImportFromClassic extends Command
 {
     protected $signature = 'phpvms:importer {db_host} {db_name} {db_user} {db_pass?} {table_prefix=phpvms_}';
     protected $description = 'Import from an older version of phpVMS';
@@ -16,11 +15,11 @@ class Importer extends BaseCommand
     public function handle()
     {
         $db_creds = [
-            'host' => $this->argument('db_host'),
-            'name' => $this->argument('db_name'),
-            'user' => $this->argument('db_user'),
-            'pass' => $this->argument('db_pass'),
-            'table_prefix' => $this->argument('table_prefix')
+            'host'         => $this->argument('db_host'),
+            'name'         => $this->argument('db_name'),
+            'user'         => $this->argument('db_user'),
+            'pass'         => $this->argument('db_pass'),
+            'table_prefix' => $this->argument('table_prefix'),
         ];
 
         $importerSvc = new \App\Console\Services\Importer($db_creds);

app/Console/Commands/Install.php

@@ -1,77 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Console\BaseCommand;
-
-class Install extends BaseCommand
-{
-    protected $signature = 'phpvms:install 
-                                {--update}
-                                {--airline-name?} 
-                                {--airline-code?}';
-
-    protected $description = 'Install or update phpVMS';
-
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    public function handle()
-    {
-        $this->info('Installing phpVMS...');
-
-        $this->setupDatabase();
-
-        # Only run these if we're doing an initial install
-        if(!$this->option('update')) {
-            $this->writeLocalConfig();
-            $this->initialData();
-        }
-    }
-
-    /**
-     * Setup the database and run the migrations
-     * Only call the database creation if we're not
-     * explicitly trying to upgrade
-     */
-    protected function setupDatabase()
-    {
-        if(!$this->option('update')) {
-            $this->call('database:create');
-        }
-
-        $this->info('Running database migrations...');
-        $this->call('migrate');
-
-        # TODO: Call initial seed data, for the groups and other supporting data
-    }
-
-    /**
-     * Write a local config file
-     */
-    protected function writeLocalConfig()
-    {
-
-    }
-
-    /**
-     * Set an initial airline and admin user/password
-     */
-    protected function initialData()
-    {
-        # TODO: Prompt for initial airline info
-        $airline_name = $this->option('airline-name');
-        if(!$airline_name) {
-            $airline_name = $this->ask('Enter your airline name');
-        }
-
-        $airline_code = $this->option('airline-code');
-        if(!$airline_code) {
-            $airline_code = $this->ask('Enter your airline code');
-        }
-
-        # TODO: Prompt for admin user/password
-    }
-}

app/Console/Commands/NavdataImport.php

@@ -2,21 +2,41 @@
 
 namespace App\Console\Commands;
 
-use App\Console\BaseCommand;
-use App\Models\Navdata;
+use App\Console\Command;
 use App\Models\Enums\NavaidType;
+use App\Models\Navdata;
 
-
-class NavdataCommand extends BaseCommand
+/**
+ * Class NavdataImport
+ */
+class NavdataImport extends Command
 {
     protected $signature = 'phpvms:navdata';
     protected $description = '';
 
     /**
-     * Read and parse in the navaid file
      * @throws \League\Geotools\Exception\InvalidArgumentException
+     *
+     * @return void
      */
-    public function read_wp_nav_aid()
+    public function handle()
+    {
+        $this->info('Emptying the current navdata...');
+        Navdata::query()->truncate();
+
+        $this->info('Looking for nav files...');
+        $this->read_wp_nav_aid();
+        $this->read_wp_nav_fix();
+    }
+
+    /**
+     * Read and parse in the navaid file
+     *
+     * @throws \League\Geotools\Exception\InvalidArgumentException
+     *
+     * @return void
+     */
+    public function read_wp_nav_aid(): void
     {
         /*
          * ....,....1....,....2....,....3....,....4....,....5....,....6..
@@ -50,7 +70,7 @@ class NavdataCommand extends BaseCommand
         $file_path = storage_path('/navdata/WPNAVAID.txt');
         if (!file_exists($file_path)) {
             $this->error('WPNAVAID.txt not found in storage/navdata');
-            return false;
+            return;
         }
 
         $this->info('Importing navaids (WPNAVAID.txt) ...');
@@ -58,10 +78,9 @@ class NavdataCommand extends BaseCommand
 
         $imported = 0;
 
-        foreach($generator as $line) {
-
+        foreach ($generator as $line) {
             $navaid = [
-                'id' => trim(substr($line, 24, 4)), // ident column
+                'id'    => trim(substr($line, 24, 4)), // ident column
                 'name'  => trim(substr($line, 0, 24)),
                 'type'  => trim(substr($line, 29, 4)),
                 'lat'   => trim(substr($line, 33, 9)),
@@ -70,9 +89,8 @@ class NavdataCommand extends BaseCommand
                 'class' => trim($line[60]),
             ];
 
-            # Map to the Navaid enum
-            switch($navaid['type'])
-            {
+            // Map to the Navaid enum
+            switch ($navaid['type']) {
                 case 'ILS':
                     $navaid['type'] = NavaidType::LOC;
                     break;
@@ -101,22 +119,22 @@ class NavdataCommand extends BaseCommand
             }*/
 
             Navdata::updateOrCreate([
-                'id' => $navaid['id'], 'name' => $navaid['name']
+                'id' => $navaid['id'], 'name' => $navaid['name'],
             ], $navaid);
 
             $imported++;
-            if($imported % 100 === 0) {
-                $this->info('Imported ' . $imported . ' entries...');
+            if ($imported % 100 === 0) {
+                $this->info('Imported '.$imported.' entries...');
             }
         }
 
-        $this->info('Imported a total of ' . $imported . ' nav aids');
+        $this->info('Imported a total of '.$imported.' nav aids');
     }
 
     /**
-     *
+     * @return void
      */
-    public function read_wp_nav_fix()
+    public function read_wp_nav_fix(): void
     {
         /*
          * ....,....1....,....2....,...3....,....4....,....
@@ -138,9 +156,9 @@ class NavdataCommand extends BaseCommand
          */
 
         $file_path = storage_path('/navdata/WPNAVFIX.txt');
-        if(!file_exists($file_path)) {
+        if (!file_exists($file_path)) {
             $this->error('WPNAVFIX.txt not found in storage/navdata');
-            return false;
+            return;
         }
 
         $this->info('Importing navaids (WPNAVFIX.txt) ...');
@@ -149,37 +167,23 @@ class NavdataCommand extends BaseCommand
         $imported = 0;
         foreach ($generator as $line) {
             $navfix = [
-                'id' => trim(substr($line, 0, 4)), // ident column
+                'id'   => trim(substr($line, 0, 4)), // ident column
                 'name' => trim(substr($line, 24, 6)),
                 'type' => NavaidType::FIX,
-                'lat' => trim(substr($line, 30, 10)),
-                'lon' => trim(substr($line, 40, 11)),
+                'lat'  => trim(substr($line, 30, 10)),
+                'lon'  => trim(substr($line, 40, 11)),
             ];
 
-            switch ($navfix['type']) {
-                default:
-                    $navfix['type'] = NavaidType::UNKNOWN;
-                    break;
-            }
-
-            Navdata::updateOrCreate(['id' => $navfix['id']], $navfix);
+            Navdata::updateOrCreate([
+                'id' => $navfix['id'], 'name' => $navfix['name'],
+            ], $navfix);
 
             $imported++;
             if ($imported % 100 === 0) {
-                $this->info('Imported ' . $imported . ' entries...');
+                $this->info('Imported '.$imported.' entries...');
             }
         }
 
-        $this->info('Imported a total of ' . $imported . ' nav fixes');
-    }
-
-    public function handle()
-    {
-        $this->info('Emptying the current navdata...');
-        Navdata::query()->truncate();
-
-        $this->info('Looking for nav files...');
-        $this->read_wp_nav_aid();
-        $this->read_wp_nav_fix();
+        $this->info('Imported a total of '.$imported.' nav fixes');
     }
 }

app/Console/Commands/TestApi.php

@@ -2,13 +2,15 @@
 
 namespace App\Console\Commands;
 
+use App\Console\Command;
 use GuzzleHttp\Client;
-use App\Console\BaseCommand;
 
-class TestApi extends BaseCommand
+/**
+ * Class TestApi
+ */
+class TestApi extends Command
 {
     protected $signature = 'phpvms:test-api {apikey} {url}';
-
     protected $httpClient;
 
     /**
@@ -17,11 +19,11 @@ class TestApi extends BaseCommand
     public function handle()
     {
         $this->httpClient = new Client([
-           'headers' => [
-               'Authorization' => $this->argument('apikey'),
-               'Content-type' => 'application/json',
-               'X-API-Key' => $this->argument('apikey'),
-           ]
+            'headers' => [
+                'Authorization' => $this->argument('apikey'),
+                'Content-type'  => 'application/json',
+                'X-API-Key'     => $this->argument('apikey'),
+            ],
         ]);
 
         $result = $this->httpClient->get($this->argument('url'));

app/Console/Commands/Version.php

@@ -2,24 +2,30 @@
 
 namespace App\Console\Commands;
 
-use App\Console\BaseCommand;
+use App\Console\Command;
 use Symfony\Component\Yaml\Yaml;
 
-class Version extends BaseCommand
+/**
+ * Class Version
+ */
+class Version extends Command
 {
     protected $signature = 'phpvms:version {--write} {--base-only}';
 
     /**
      * Create the version number that gets written out
+     *
+     * @param mixed $cfg
+     *
+     * @return bool|string
      */
     protected function createVersionNumber($cfg)
     {
         exec($cfg['git']['git-local'], $version);
         $version = substr($version[0], 0, $cfg['build']['length']);
 
-        # prefix with the date in YYMMDD format
+        // prefix with the date in YYMMDD format
         $date = date('ymd');
-
         $version = $date.'-'.$version;
 
         return $version;
@@ -27,6 +33,7 @@ class Version extends BaseCommand
 
     /**
      * Run dev related commands
+     *
      * @throws \Symfony\Component\Yaml\Exception\ParseException
      */
     public function handle()
@@ -34,24 +41,24 @@ class Version extends BaseCommand
         $version_file = config_path('version.yml');
         $cfg = Yaml::parse(file_get_contents($version_file));
 
-        if($this->option('write')) {
-            $version = $this->createVersionNumber($cfg);
-            $cfg['build']['number'] = $version;
+        // Get the current build id
+        $build_number = $this->createVersionNumber($cfg);
+        $cfg['build']['number'] = $build_number;
+
+        $c = $cfg['current'];
+        $version = "v{$c['major']}.{$c['minor']}.{$c['patch']}-{$build_number}";
+
+        if ($this->option('write')) {
             file_put_contents($version_file, Yaml::dump($cfg, 4, 2));
         }
 
-        # Only show the major.minor.patch version
-        if($this->option('base-only')) {
-            $version = 'v'.$cfg['current']['major'] . '.'
-                       .$cfg['current']['minor'] . '.'
-                       .$cfg['current']['patch'];
-
-            print $version;
-        } else {
-            $this->call('version:show', [
-                '--format' => 'compact',
-                '--suppress-app-name' => true
-            ]);
+        // Only show the major.minor.patch version
+        if ($this->option('base-only')) {
+            $version = 'v'.$cfg['current']['major'].'.'
+                .$cfg['current']['minor'].'.'
+                .$cfg['current']['patch'];
         }
+
+        echo $version."\n";
     }
 }

app/Console/Commands/YamlExport.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Console\Command;
+use App\Services\DatabaseService;
+use DB;
+use Symfony\Component\Yaml\Yaml;
+
+/**
+ * Class YamlExport
+ */
+class YamlExport extends Command
+{
+    protected $signature = 'phpvms:yaml-export {tables*}';
+    protected $description = 'YAML table export';
+
+    /**
+     * YamlExport constructor.
+     *
+     * @param DatabaseService $dbSvc
+     */
+    public function __construct(DatabaseService $dbSvc)
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Run dev related commands
+     */
+    public function handle()
+    {
+        $tables = $this->argument('tables');
+        if (empty($tables)) {
+            $this->error('No tables specified');
+            exit();
+        }
+
+        $export_tables = [];
+        foreach ($tables as $table) {
+            $export_tables[$table] = [];
+
+            $rows = DB::table($table)->get();
+            foreach ($rows as $row) {
+                $export_tables[$table][] = (array) $row;
+            }
+        }
+
+        $yaml = Yaml::dump($export_tables, 4, 2);
+        echo $yaml;
+    }
+}

app/Console/Commands/YamlImport.php

@@ -2,17 +2,23 @@
 
 namespace App\Console\Commands;
 
-use DB;
-use App\Console\BaseCommand;
+use App\Console\Command;
 use App\Services\DatabaseService;
 
-class ImportCommand extends BaseCommand
+/**
+ * Class YamlImport
+ */
+class YamlImport extends Command
 {
-    protected $signature = 'phpvms:import {files*}';
+    protected $signature = 'phpvms:yaml-import {files*}';
     protected $description = 'Developer commands';
-
     protected $dbSvc;
 
+    /**
+     * YamlImport constructor.
+     *
+     * @param DatabaseService $dbSvc
+     */
     public function __construct(DatabaseService $dbSvc)
     {
         parent::__construct();
@@ -21,31 +27,29 @@ class ImportCommand extends BaseCommand
 
     /**
      * Run dev related commands
+     *
+     * @throws \Exception
      */
     public function handle()
     {
         $files = $this->argument('files');
-        if(empty($files)) {
+        if (empty($files)) {
             $this->error('No files to import specified!');
             exit();
         }
 
         $ignore_errors = true;
-        /*$ignore_errors = $this->option('ignore_errors');
-        if(!$ignore_errors) {
-            $ignore_errors = false;
-        }*/
 
-        foreach($files as $file) {
-            if(!file_exists($file)) {
-                $this->error('File ' . $file .' doesn\'t exist');
+        foreach ($files as $file) {
+            if (!file_exists($file)) {
+                $this->error('File '.$file.' doesn\'t exist');
                 exit;
             }
 
-            $this->info('Importing ' . $file);
+            $this->info('Importing '.$file);
 
             $imported = $this->dbSvc->seed_from_yaml_file($file, $ignore_errors);
-            foreach($imported as $table => $count) {
+            foreach ($imported as $table => $count) {
                 $this->info('Imported '.$count.' records from "'.$table.'"');
             }
         }

app/Console/Cron/Hourly.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Console\Cron;
+
+use App\Console\Command;
+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
+{
+    protected $signature = 'cron:hourly';
+    protected $description = 'Run the hourly cron tasks';
+    protected $schedule;
+
+    public function handle(): void
+    {
+        $this->redirectLoggingToStdout('cron');
+        event(new CronHourly());
+    }
+}

app/Console/Cron/Monthly.php

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

app/Console/Cron/Nightly.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Console\Cron;
+
+use App\Console\Command;
+use App\Events\CronNightly;
+
+/**
+ * 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 Nightly extends Command
+{
+    protected $signature = 'cron:nightly';
+    protected $description = 'Run the nightly cron tasks';
+    protected $schedule;
+
+    public function handle(): void
+    {
+        $this->redirectLoggingToStdout('cron');
+        event(new CronNightly());
+    }
+}

app/Console/Cron/Weekly.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Console\Cron;
+
+use App\Console\Command;
+use App\Events\CronWeekly;
+
+/**
+ * This just calls the CronWeekly event, so all of the
+ * listeners, etc can just be called to run those tasks.
+ *
+ * The actual cron tasks are in app/Cron
+ */
+class Weekly extends Command
+{
+    protected $signature = 'cron:weekly';
+    protected $description = 'Run the weekly cron tasks';
+    protected $schedule;
+
+    public function handle(): void
+    {
+        $this->redirectLoggingToStdout('cron');
+        event(new CronWeekly());
+    }
+}

app/Console/Kernel.php

@@ -2,37 +2,31 @@
 
 namespace App\Console;
 
+use App\Console\Cron\Hourly;
+use App\Console\Cron\Monthly;
+use App\Console\Cron\Nightly;
+use App\Console\Cron\Weekly;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
+/**
+ * Class Kernel
+ */
 class Kernel extends ConsoleKernel
 {
-    /**
-     * The Artisan commands provided by your application.
-     *
-     * @var array
-     */
-    protected $commands = [
-        Commands\AcarsReplay::class,
-        Commands\CreateDatabase::class,
-        Commands\DevCommands::class,
-        Commands\ImportCommand::class,
-        Commands\Importer::class,
-        Commands\Install::class,
-        Commands\NavdataCommand::class,
-        Commands\TestApi::class,
-    ];
-
     /**
      * Define the application's command schedule.
      *
-     * @param  \Illuminate\Console\Scheduling\Schedule  $schedule
+     * @param \Illuminate\Console\Scheduling\Schedule $schedule
+     *
      * @return void
      */
-    protected function schedule(Schedule $schedule)
+    protected function schedule(Schedule $schedule): void
     {
-        // $schedule->command('inspire')
-        //          ->hourly();
+        $schedule->command(Nightly::class)->dailyAt('01:00');
+        $schedule->command(Weekly::class)->weeklyOn(0);
+        $schedule->command(Monthly::class)->monthlyOn(1);
+        $schedule->command(Hourly::class)->hourly();
     }
 
     /**
@@ -40,9 +34,10 @@ class Kernel extends ConsoleKernel
      *
      * @return void
      */
-    protected function commands()
+    protected function commands(): void
     {
         require app_path('Routes/console.php');
-        $this->load(__DIR__ . '/Commands');
+        $this->load(__DIR__.'/Commands');
+        $this->load(__DIR__.'/Cron');
     }
 }

app/Console/Logger.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Console;
+
+use Monolog\Handler\StreamHandler;
+
+/**
+ * Just a simple custom logger that dumps to the console
+ */
+class Logger
+{
+    public function __invoke(array $config)
+    {
+        $logger = new \Monolog\Logger('console');
+
+        try {
+            $logger->pushHandler(new StreamHandler('php://stdout'));
+        } catch (\Exception $e) {
+        }
+
+        return $logger;
+    }
+}

app/Console/Services/Database.php

@@ -3,26 +3,26 @@
 namespace App\Console\Services;
 
 use PDO;
-use Doctrine\DBAL\Driver\PDOException;
 
 /**
  * Class Database
- * @package App\Console\Services
  */
 class Database
 {
     /**
      * Create the base connection DSN, optionally include the DB name
-     * @param $host
-     * @param $port
+     *
+     * @param      $host
+     * @param      $port
      * @param null $name
+     *
      * @return string
      */
-    public function createDsn($host, $port, $name=null)
+    public function createDsn($host, $port, $name = null)
     {
         $conn = config('database.default');
         $dsn = "$conn:host=$host;port=$port";
-        if(filled($name)) {
+        if (filled($name)) {
             $dsn .= ';dbname='.$name;
         }
 
@@ -33,8 +33,10 @@ class Database
      * @param $dsn
      * @param $user
      * @param $pass
-     * @return PDO
+     *
      * @throws \PDOException
+     *
+     * @return PDO
      */
     public function createPDO($dsn, $user, $pass)
     {

app/Console/Services/Importer.php

@@ -2,31 +2,29 @@
 
 namespace App\Console\Services;
 
-use PDO;
-use Carbon\Carbon;
-use Doctrine\DBAL\Driver\PDOException;
-use Illuminate\Support\Str;
-use Illuminate\Database\QueryException;
-use Illuminate\Support\Facades\Hash;
-use Symfony\Component\Console\Output\ConsoleOutput;
-
-use App\Models\Enums\FlightType;
-use App\Models\Enums\PirepSource;
-use App\Models\Pirep;
+use App\Facades\Utils;
 use App\Models\Aircraft;
 use App\Models\Airline;
 use App\Models\Airport;
+use App\Models\Enums\FlightType;
+use App\Models\Enums\PirepSource;
+use App\Models\Enums\UserState;
 use App\Models\Flight;
+use App\Models\Pirep;
 use App\Models\Rank;
 use App\Models\Subfleet;
 use App\Models\User;
-use App\Models\Enums\UserState;
-use App\Facades\Utils;
+use Carbon\Carbon;
+use Illuminate\Database\QueryException;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Str;
+use PDO;
+use PDOException;
+use Symfony\Component\Console\Output\ConsoleOutput;
 
 /**
  * Class Importer
  * TODO: Batch import
- * @package App\Console\Services
  */
 class Importer
 {
@@ -37,6 +35,7 @@ class Importer
 
     /**
      * Hold the PDO connection to the old database
+     *
      * @var
      */
     private $conn;
@@ -44,10 +43,11 @@ class Importer
     /**
      * @var array
      */
-    private $creds = [];
+    private $creds;
 
     /**
      * Hold the instance of the console logger
+     *
      * @var
      */
     private $log;
@@ -55,12 +55,12 @@ class Importer
     /**
      * CONSTANTS
      */
-
-    const BATCH_READ_ROWS = 300;
-    const SUBFLEET_NAME = 'Imported Aircraft';
+    public const BATCH_READ_ROWS = 300;
+    public const SUBFLEET_NAME = 'Imported Aircraft';
 
     /**
      * Importer constructor.
+     *
      * @param $db_creds
      */
     public function __construct($db_creds)
@@ -68,14 +68,14 @@ class Importer
         // Setup the logger
         $this->log = new ConsoleOutput();
 
-        # The db credentials
+        // The db credentials
         $this->creds = array_merge([
-            'host' => '127.0.0.1',
-            'port' => 3306,
-            'name' => '',
-            'user' => '',
-            'pass' => '',
-            'table_prefix' => 'phpvms_'
+            'host'         => '127.0.0.1',
+            'port'         => 3306,
+            'name'         => '',
+            'user'         => '',
+            'pass'         => '',
+            'table_prefix' => 'phpvms_',
         ], $db_creds);
     }
 
@@ -86,7 +86,7 @@ class Importer
     {
         $this->reconnect();
 
-        # Import all the different parts
+        // Import all the different parts
         $this->importRanks();
         $this->importAirlines();
         $this->importAircraft();
@@ -96,7 +96,7 @@ class Importer
         $this->importFlights();
         $this->importPireps();
 
-        # Finish up
+        // Finish up
         $this->findLastPireps();
         $this->recalculateRanks();
     }
@@ -106,13 +106,13 @@ class Importer
      */
     protected function reconnect()
     {
-        $dsn = 'mysql:' . implode(';', [
-               'host=' . $this->creds['host'],
-               'port=' . $this->creds['port'],
-               'dbname=' . $this->creds['name']
+        $dsn = 'mysql:'.implode(';', [
+                'host='.$this->creds['host'],
+                'port='.$this->creds['port'],
+                'dbname='.$this->creds['name'],
             ]);
 
-        $this->info('Connection string: ' . $dsn);
+        $this->info('Connection string: '.$dsn);
 
         try {
             $this->conn = new PDO($dsn, $this->creds['user'], $this->creds['pass']);
@@ -128,37 +128,40 @@ class Importer
      */
     protected function comment($message)
     {
-        $this->log->writeln('<comment>' . $message . '</comment>');
+        $this->log->writeln('<comment>'.$message.'</comment>');
     }
 
     /**
      * @param $message
      */
-    protected function error($message) {
-        $this->log->writeln('<error>' . $message . '</error>');
+    protected function error($message)
+    {
+        $this->log->writeln('<error>'.$message.'</error>');
     }
 
     /**
-     * @param string $message
+     * @param string|array $message
      */
     protected function info($message)
     {
-        if(\is_array($message)) {
+        if (\is_array($message)) {
+            /* @noinspection ForgottenDebugOutputInspection */
             print_r($message);
-        }
-        else {
+        } else {
             $this->log->writeln('<info>'.$message.'</info>');
         }
     }
 
     /**
      * Return the table name with the prefix
+     *
      * @param $table
+     *
      * @return string
      */
     protected function tableName($table)
     {
-        if($this->creds['table_prefix'] !== false) {
+        if ($this->creds['table_prefix'] !== false) {
             return $this->creds['table_prefix'].$table;
         }
 
@@ -166,17 +169,18 @@ class Importer
     }
 
     /**
-     *
      * @param \Illuminate\Database\Eloquent\Model $model
+     *
      * @return bool
      */
     protected function saveModel($model)
     {
         try {
             $model->save();
+
             return true;
         } catch (QueryException $e) {
-            if($e->getCode() !== '23000') {
+            if ($e->getCode() !== '23000') {
                 $this->error($e);
             }
 
@@ -186,13 +190,14 @@ class Importer
 
     /**
      * Create a new mapping between an old ID and the new one
+     *
      * @param $entity
      * @param $old_id
      * @param $new_id
      */
     protected function addMapping($entity, $old_id, $new_id)
     {
-        if(!array_key_exists($entity, $this->mappedEntities)) {
+        if (!array_key_exists($entity, $this->mappedEntities)) {
             $this->mappedEntities[$entity] = [];
         }
 
@@ -201,18 +206,20 @@ class Importer
 
     /**
      * Return the ID for a mapping
+     *
      * @param $entity
      * @param $old_id
+     *
      * @return bool
      */
     protected function getMapping($entity, $old_id)
     {
-        if(!array_key_exists($entity, $this->mappedEntities)) {
+        if (!array_key_exists($entity, $this->mappedEntities)) {
             return 0;
         }
 
         $entity = $this->mappedEntities[$entity];
-        if(array_key_exists($old_id, $entity)) {
+        if (array_key_exists($old_id, $entity)) {
             return $entity[$old_id];
         }
 
@@ -221,27 +228,31 @@ class Importer
 
     /**
      * @param $date
+     *
      * @return Carbon
      */
     protected function parseDate($date)
     {
         $carbon = Carbon::parse($date);
+
         return $carbon;
     }
 
     /**
      * Take a decimal duration and convert it to minutes
+     *
      * @param $duration
+     *
      * @return float|int
      */
     protected function convertDuration($duration)
     {
-        if(strpos($duration, '.') !== false) {
+        if (strpos($duration, '.') !== false) {
             $delim = '.';
-        } elseif(strpos($duration, ':')) {
+        } elseif (strpos($duration, ':')) {
             $delim = ':';
         } else {
-            # no delimiter, assume it's just a straight hour
+            // no delimiter, assume it's just a straight hour
             return (int) $duration * 60;
         }
 
@@ -254,58 +265,61 @@ class Importer
 
     /**
      * @param $table
+     *
      * @return mixed
      */
     protected function getTotalRows($table)
     {
         $table = $this->tableName($table);
 
-        $sql = 'SELECT COUNT(*) FROM ' . $table;
+        $sql = 'SELECT COUNT(*) FROM '.$table;
         $rows = $this->conn->query($sql)->fetchColumn();
 
         $this->info('Found '.$rows.' rows in '.$table);
+
         return (int) $rows;
     }
 
     /**
      * Read all the rows in a table, but read them in a batched manner
-     * @param string $table The name of the table
-     * @param null $read_rows Number of rows to read
+     *
+     * @param string $table     The name of the table
+     * @param null   $read_rows Number of rows to read
+     *
      * @return \Generator
      */
-    protected function readRows($table, $read_rows=null)
+    protected function readRows($table, $read_rows = null)
     {
         // Set the table prefix if it has been entered
         $this->tableName($table);
 
         $offset = 0;
-        if($read_rows === null) {
+        if ($read_rows === null) {
             $read_rows = self::BATCH_READ_ROWS;
         }
 
         $total_rows = $this->getTotalRows($table);
 
-        while($offset < $total_rows)
-        {
+        while ($offset < $total_rows) {
             $rows_to_read = $offset + $read_rows;
-            if($rows_to_read > $total_rows) {
+            if ($rows_to_read > $total_rows) {
                 $rows_to_read = $total_rows;
             }
 
             $this->info('Reading '.$offset.' to '.$rows_to_read.' of '.$total_rows);
 
-            $sql = 'SELECT * FROM ' . $this->tableName($table)
-                 . ' LIMIT ' . self::BATCH_READ_ROWS . ' OFFSET ' . $offset;
+            $sql = 'SELECT * FROM '.$this->tableName($table)
+                .' LIMIT '.self::BATCH_READ_ROWS.' OFFSET '.$offset;
 
             try {
                 foreach ($this->conn->query($sql) as $row) {
                     yield $row;
                 }
-            } catch(PDOException $e) {
+            } catch (PDOException $e) {
                 // Without incrementing the offset, it should re-run the same query
                 $this->error($e);
 
-                if(strpos($e->getMessage(), 'server has gone away') !== false) {
+                if (strpos($e->getMessage(), 'server has gone away') !== false) {
                     $this->reconnect();
                     continue;
                 }
@@ -317,6 +331,7 @@ class Importer
 
     /**
      * Return the subfleet
+     *
      * @return mixed
      */
     protected function getSubfleet()
@@ -331,10 +346,8 @@ class Importer
     }
 
     /**
-     *
      * All the individual importers, done on a per-table basis
      * Some tables get saved locally for tables that use FK refs
-     *
      */
 
     /**
@@ -345,22 +358,21 @@ class Importer
         $this->comment('--- RANK IMPORT ---');
 
         $count = 0;
-        foreach ($this->readRows('ranks') as $row)
-        {
+        foreach ($this->readRows('ranks') as $row) {
             $rank = Rank::firstOrCreate(
                 ['name' => $row->rank],
-                ['image_link' => $row->rankimage, 'hours'=>$row->minhours]
+                ['image_url' => $row->rankimage, 'hours' => $row->minhours]
             );
 
             $this->addMapping('ranks', $row->rankid, $rank->id);
             $this->addMapping('ranks', $row->rank, $rank->id);
 
-            if($rank->wasRecentlyCreated) {
-                ++$count;
+            if ($rank->wasRecentlyCreated) {
+                $count++;
             }
         }
 
-        $this->info('Imported ' . $count . ' ranks');
+        $this->info('Imported '.$count.' ranks');
     }
 
     /**
@@ -372,8 +384,7 @@ class Importer
         $this->comment('--- AIRLINE IMPORT ---');
 
         $count = 0;
-        foreach ($this->readRows('airlines') as $row)
-        {
+        foreach ($this->readRows('airlines') as $row) {
             $airline = Airline::firstOrCreate(
                 ['icao' => $row->code],
                 ['iata' => $row->code, 'name' => $row->name, 'active' => $row->enabled]
@@ -383,11 +394,11 @@ class Importer
             $this->addMapping('airlines', $row->code, $airline->id);
 
             if ($airline->wasRecentlyCreated) {
-                ++$count;
+                $count++;
             }
         }
 
-        $this->info('Imported '. $count.' airlines');
+        $this->info('Imported '.$count.' airlines');
     }
 
     /**
@@ -402,23 +413,22 @@ class Importer
         $this->info('Subfleet ID is '.$subfleet->id);
 
         $count = 0;
-        foreach($this->readRows('aircraft') as $row)
-        {
+        foreach ($this->readRows('aircraft') as $row) {
             $aircraft = Aircraft::firstOrCreate(
                 ['name' => $row->fullname, 'registration' => $row->registration],
-                ['icao' => $row->icao,
+                ['icao'        => $row->icao,
                  'subfleet_id' => $subfleet->id,
-                 'active' => $row->enabled
+                 'active'      => $row->enabled,
                 ]);
 
             $this->addMapping('aircraft', $row->id, $aircraft->id);
 
-            if($aircraft->wasRecentlyCreated) {
-                ++$count;
+            if ($aircraft->wasRecentlyCreated) {
+                $count++;
             }
         }
 
-        $this->info('Imported ' . $count . ' aircraft');
+        $this->info('Imported '.$count.' aircraft');
     }
 
     /**
@@ -429,16 +439,15 @@ class Importer
         $this->comment('--- AIRPORT IMPORT ---');
 
         $count = 0;
-        foreach ($this->readRows('airports') as $row)
-        {
+        foreach ($this->readRows('airports') as $row) {
             $attrs = [
-                'id' => trim($row->icao),
-                'icao' => trim($row->icao),
-                'name' => $row->name,
+                'id'      => trim($row->icao),
+                'icao'    => trim($row->icao),
+                'name'    => $row->name,
                 'country' => $row->country,
-                'lat' => $row->lat,
-                'lon' => $row->lng,
-                'hub' => $row->hub,
+                'lat'     => $row->lat,
+                'lon'     => $row->lng,
+                'hub'     => $row->hub,
             ];
 
             $airport = Airport::updateOrCreate(
@@ -446,12 +455,12 @@ class Importer
                 $attrs
             );
 
-            if($airport->wasRecentlyCreated) {
-                ++$count;
+            if ($airport->wasRecentlyCreated) {
+                $count++;
             }
         }
 
-        $this->info('Imported ' . $count . ' airports');
+        $this->info('Imported '.$count.' airports');
     }
 
     /**
@@ -462,8 +471,7 @@ class Importer
         $this->comment('--- FLIGHT SCHEDULE IMPORT ---');
 
         $count = 0;
-        foreach ($this->readRows('schedules') as $row)
-        {
+        foreach ($this->readRows('schedules') as $row) {
             $airline_id = $this->getMapping('airlines', $row->code);
 
             $flight_num = trim($row->flightnum);
@@ -471,14 +479,14 @@ class Importer
             $attrs = [
                 'dpt_airport_id' => $row->depicao,
                 'arr_airport_id' => $row->arricao,
-                'route' => $row->route ?: '',
-                'distance' => round($row->distance ?: 0, 2),
-                'level' => $row->flightlevel ?: 0,
-                'dpt_time' => $row->deptime ?: '',
-                'arr_time' => $row->arrtime ?: '',
-                'flight_time' => $this->convertDuration($row->flighttime) ?: '',
-                'notes' => $row->notes ?: '',
-                'active' => $row->enabled ?: true,
+                'route'          => $row->route ?: '',
+                'distance'       => round($row->distance ?: 0, 2),
+                'level'          => $row->flightlevel ?: 0,
+                'dpt_time'       => $row->deptime ?: '',
+                'arr_time'       => $row->arrtime ?: '',
+                'flight_time'    => $this->convertDuration($row->flighttime) ?: '',
+                'notes'          => $row->notes ?: '',
+                'active'         => $row->enabled ?: true,
             ];
 
             try {
@@ -487,19 +495,19 @@ class Importer
                     $attrs
                 );
             } catch (\Exception $e) {
-                #$this->error($e);
+                //$this->error($e);
             }
 
             $this->addMapping('flights', $row->id, $flight->id);
 
             // TODO: deserialize route_details into ACARS table
 
-            if($flight->wasRecentlyCreated) {
-                ++$count;
+            if ($flight->wasRecentlyCreated) {
+                $count++;
             }
         }
 
-        $this->info('Imported ' . $count . ' flights');
+        $this->info('Imported '.$count.' flights');
     }
 
     /**
@@ -510,57 +518,56 @@ class Importer
         $this->comment('--- PIREP IMPORT ---');
 
         $count = 0;
-        foreach ($this->readRows('pireps') as $row)
-        {
+        foreach ($this->readRows('pireps') as $row) {
             $pirep_id = $row->pirepid;
             $user_id = $this->getMapping('users', $row->pilotid);
             $airline_id = $this->getMapping('airlines', $row->code);
             $aircraft_id = $this->getMapping('aircraft', $row->aircraft);
 
             $attrs = [
-                #'id' => $pirep_id,
-                'user_id' => $user_id,
-                'airline_id' => $airline_id,
-                'aircraft_id' => $aircraft_id,
-                'flight_number' => $row->flightnum ?: '',
+                //'id' => $pirep_id,
+                'user_id'        => $user_id,
+                'airline_id'     => $airline_id,
+                'aircraft_id'    => $aircraft_id,
+                'flight_number'  => $row->flightnum ?: '',
                 'dpt_airport_id' => $row->depicao,
                 'arr_airport_id' => $row->arricao,
-                'block_fuel' => $row->fuelused,
-                'route' => $row->route ?: '',
-                'source_name' => $row->source,
-                'created_at' => $this->parseDate($row->submitdate),
-                'updated_at' => $this->parseDate($row->modifieddate),
+                'block_fuel'     => $row->fuelused,
+                'route'          => $row->route ?: '',
+                'source_name'    => $row->source,
+                'created_at'     => $this->parseDate($row->submitdate),
+                'updated_at'     => $this->parseDate($row->modifieddate),
             ];
 
-            # Set the distance
+            // Set the distance
             $distance = round($row->distance ?: 0, 2);
             $attrs['distance'] = $distance;
             $attrs['planned_distance'] = $distance;
 
-            # Set the flight time properly
+            // Set the flight time properly
             $duration = $this->convertDuration($row->flighttime_stamp);
             $attrs['flight_time'] = $duration;
             $attrs['planned_flight_time'] = $duration;
 
-            # Set how it was filed
-            if(strtoupper($row->source) === 'MANUAL') {
+            // Set how it was filed
+            if (strtoupper($row->source) === 'MANUAL') {
                 $attrs['source'] = PirepSource::MANUAL;
             } else {
                 $attrs['source'] = PirepSource::ACARS;
             }
 
-            # Set the flight type
+            // Set the flight type
             $row->flighttype = strtoupper($row->flighttype);
-            if($row->flighttype === 'P') {
-                $attrs['flight_type'] = FlightType::PASSENGER;
-            } elseif($row->flighttype === 'C') {
-                $attrs['flight_type'] = FlightType::CARGO;
+            if ($row->flighttype === 'P') {
+                $attrs['flight_type'] = FlightType::SCHED_PAX;
+            } elseif ($row->flighttype === 'C') {
+                $attrs['flight_type'] = FlightType::SCHED_CARGO;
             } else {
-                $attrs['flight_type'] = FlightType::CHARTER;
+                $attrs['flight_type'] = FlightType::CHARTER_PAX_ONLY;
             }
 
-            # Set the flight level of the PIREP is set
-            if(property_exists($row, 'flightlevel')) {
+            // Set the flight level of the PIREP is set
+            if (property_exists($row, 'flightlevel')) {
                 $attrs['level'] = $row->flightlevel;
             } else {
                 $attrs['level'] = 0;
@@ -572,23 +579,23 @@ class Importer
             );
 
             $source = strtoupper($row->source);
-            if($source === 'SMARTCARS') {
-                # TODO: Parse smartcars log into the acars table
-            } elseif($source === 'KACARS') {
-                # TODO: Parse kACARS log into acars table
-            } elseif($source === 'XACARS') {
-                # TODO: Parse XACARS log into acars table
+            if ($source === 'SMARTCARS') {
+                // TODO: Parse smartcars log into the acars table
+            } elseif ($source === 'KACARS') {
+                // TODO: Parse kACARS log into acars table
+            } elseif ($source === 'XACARS') {
+                // TODO: Parse XACARS log into acars table
             }
 
-            # TODO: Add extra fields in as PIREP fields
+            // TODO: Add extra fields in as PIREP fields
             $this->addMapping('pireps', $row->pirepid, $pirep->id);
 
             if ($pirep->wasRecentlyCreated) {
-                ++$count;
+                $count++;
             }
         }
 
-        $this->info('Imported ' . $count . ' pireps');
+        $this->info('Imported '.$count.' pireps');
     }
 
     protected function importUsers()
@@ -597,10 +604,9 @@ class Importer
 
         $count = 0;
         foreach ($this->readRows('pilots', 50) as $row) {
+            // TODO: What to do about pilot ids
 
-            # TODO: What to do about pilot ids
-
-            $name = $row->firstname . ' ' . $row->lastname;
+            $name = $row->firstname.' '.$row->lastname;
 
             $airline_id = $this->getMapping('airlines', $row->code);
             $rank_id = $this->getMapping('ranks', $row->rank);
@@ -609,17 +615,17 @@ class Importer
             $new_password = Str::random(60);
 
             $attrs = [
-                'name' => $name,
-                'password' => Hash::make($new_password),
-                'api_key' => Utils::generateApiKey(),
-                'airline_id' => $airline_id,
-                'rank_id' => $rank_id,
+                'name'            => $name,
+                'password'        => Hash::make($new_password),
+                'api_key'         => Utils::generateApiKey(),
+                'airline_id'      => $airline_id,
+                'rank_id'         => $rank_id,
                 'home_airport_id' => $row->hub,
                 'curr_airport_id' => $row->hub,
-                'flights' => (int)$row->totalflights,
-                'flight_time' => Utils::hoursToMinutes($row->totalhours),
-                'state' => $state,
-                'created_at' => $this->parseDate($row->joindate),
+                'flights'         => (int) $row->totalflights,
+                'flight_time'     => Utils::hoursToMinutes($row->totalhours),
+                'state'           => $state,
+                'created_at'      => $this->parseDate($row->joindate),
             ];
 
             $user = User::updateOrCreate(
@@ -630,11 +636,11 @@ class Importer
             $this->addMapping('users', $row->pilotid, $user->id);
 
             if ($user->wasRecentlyCreated) {
-                ++$count;
+                $count++;
             }
         }
 
-        $this->info('Imported ' . $count . ' users');
+        $this->info('Imported '.$count.' users');
     }
 
     /**
@@ -642,7 +648,6 @@ class Importer
      */
     protected function findLastPireps()
     {
-
     }
 
     /**
@@ -655,7 +660,9 @@ class Importer
 
     /**
      * Get the user's new state from their original state
+     *
      * @param $state
+     *
      * @return int
      */
     protected function getUserState($state)
@@ -666,24 +673,23 @@ class Importer
 
         // Declare array of classic states
         $phpvms_classic_states = [
-            'ACTIVE' => 0,
+            'ACTIVE'   => 0,
             'INACTIVE' => 1,
-            'BANNED' => 2,
-            'ON_LEAVE' => 3
+            'BANNED'   => 2,
+            'ON_LEAVE' => 3,
         ];
 
         // Decide which state they will be in accordance with v7
         if ($state === $phpvms_classic_states['ACTIVE']) {
             return UserState::ACTIVE;
         } elseif ($state === $phpvms_classic_states['INACTIVE']) {
-            # TODO: Make an inactive state?
+            // TODO: Make an inactive state?
             return UserState::REJECTED;
         } elseif ($state === $phpvms_classic_states['BANNED']) {
             return UserState::SUSPENDED;
         } elseif ($state === $phpvms_classic_states['ON_LEAVE']) {
             return UserState::ON_LEAVE;
-        } else {
-            $this->error('Unknown status: '. $state);
         }
+        $this->error('Unknown status: '.$state);
     }
 }

app/Cron/Hourly/RemoveExpiredBids.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Cron\Hourly;
+
+use App\Events\CronHourly;
+use App\Interfaces\Listener;
+use App\Models\Bid;
+use Carbon\Carbon;
+
+/**
+ * Remove expired bids
+ */
+class RemoveExpiredBids extends Listener
+{
+    /**
+     * Remove expired bids
+     *
+     * @param CronHourly $event
+     *
+     * @throws \Exception
+     */
+    public function handle(CronHourly $event): void
+    {
+        if (setting('bids.expire_time') === 0) {
+            return;
+        }
+
+        $date = Carbon::now()->subHours(setting('bids.expire_time'));
+        Bid::whereDate('created_at', '<', $date)->delete();
+    }
+}

app/Cron/Hourly/RemoveExpiredLiveFlights.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Cron\Hourly;
+
+use App\Events\CronHourly;
+use App\Interfaces\Listener;
+use App\Models\Pirep;
+use Carbon\Carbon;
+
+/**
+ * Remove expired live flights
+ */
+class RemoveExpiredLiveFlights extends Listener
+{
+    /**
+     * Remove expired live flights
+     *
+     * @param CronHourly $event
+     *
+     * @throws \Exception
+     */
+    public function handle(CronHourly $event): void
+    {
+        if (setting('acars.live_time') === 0) {
+            return;
+        }
+
+        $date = Carbon::now()->subHours(setting('acars.live_time'));
+        Pirep::whereDate('created_at', '<', $date)
+            ->where('state', PirepState::IN_PROGRESS)
+            ->delete();
+    }
+}

app/Cron/Monthly/ApplyExpenses.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Cron\Monthly;
+
+use App\Events\CronMonthly;
+use App\Interfaces\Listener;
+use App\Models\Enums\ExpenseType;
+use App\Services\Finance\RecurringFinanceService;
+
+/**
+ * Go through and apply any finances that are daily
+ */
+class ApplyExpenses extends Listener
+{
+    private $financeSvc;
+
+    /**
+     * ApplyExpenses constructor.
+     *
+     * @param RecurringFinanceService $financeSvc
+     */
+    public function __construct(RecurringFinanceService $financeSvc)
+    {
+        $this->financeSvc = $financeSvc;
+    }
+
+    /**
+     * Apply all of the expenses for a month
+     *
+     * @param CronMonthly $event
+     *
+     * @throws \UnexpectedValueException
+     * @throws \InvalidArgumentException
+     * @throws \Prettus\Validator\Exceptions\ValidatorException
+     */
+    public function handle(CronMonthly $event): void
+    {
+        $this->financeSvc->processExpenses(ExpenseType::MONTHLY);
+    }
+}

app/Cron/Nightly/ApplyExpenses.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Cron\Nightly;
+
+use App\Events\CronNightly;
+use App\Interfaces\Listener;
+use App\Models\Enums\ExpenseType;
+use App\Services\Finance\RecurringFinanceService;
+
+/**
+ * Go through and apply any finances that are daily
+ */
+class ApplyExpenses extends Listener
+{
+    private $financeSvc;
+
+    /**
+     * ApplyExpenses constructor.
+     *
+     * @param RecurringFinanceService $financeSvc
+     */
+    public function __construct(RecurringFinanceService $financeSvc)
+    {
+        $this->financeSvc = $financeSvc;
+    }
+
+    /**
+     * Apply all of the expenses for a day
+     *
+     * @param CronNightly $event
+     *
+     * @throws \UnexpectedValueException
+     * @throws \InvalidArgumentException
+     * @throws \Prettus\Validator\Exceptions\ValidatorException
+     */
+    public function handle(CronNightly $event): void
+    {
+        $this->financeSvc->processExpenses(ExpenseType::DAILY);
+    }
+}

app/Cron/Nightly/PilotLeave.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Cron\Nightly;
+
+use App\Events\CronNightly;
+use App\Interfaces\Listener;
+use App\Models\Enums\UserState;
+use App\Models\User;
+use App\Services\UserService;
+use Carbon\Carbon;
+
+/**
+ * Determine if any pilots should be set to ON LEAVE status
+ */
+class PilotLeave extends Listener
+{
+    private $userSvc;
+
+    /**
+     * PilotLeave constructor.
+     */
+    public function __construct(UserService $userSvc)
+    {
+        $this->userSvc = $userSvc;
+    }
+
+    /**
+     * Set any users to being on leave after X days
+     *
+     * @param CronNightly $event
+     *
+     * @throws \UnexpectedValueException
+     * @throws \InvalidArgumentException
+     */
+    public function handle(CronNightly $event): void
+    {
+        if (setting('pilots.auto_leave_days') === 0) {
+            return;
+        }
+
+        $date = Carbon::now()->subDay(setting('pilots.auto_leave_days'));
+        $users = User::where('status', UserState::ACTIVE)
+           ->whereDate('updated_at', '<', $date);
+
+        foreach ($users as $user) {
+            Log::info('Setting user '.$user->ident.' to ON LEAVE status');
+            $this->userSvc->setStatusOnLeave($user);
+        }
+    }
+}

app/Cron/Nightly/RecalculateBalances.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Cron\Nightly;
+
+use App\Events\CronNightly;
+use App\Interfaces\Listener;
+use App\Models\Journal;
+use App\Repositories\JournalRepository;
+use Log;
+
+/**
+ * This recalculates the balances on all of the journals
+ */
+class RecalculateBalances extends Listener
+{
+    private $journalRepo;
+
+    /**
+     * Nightly constructor.
+     *
+     * @param JournalRepository $journalRepo
+     */
+    public function __construct(JournalRepository $journalRepo)
+    {
+        $this->journalRepo = $journalRepo;
+    }
+
+    /**
+     * Recalculate all the balances for the different ledgers
+     *
+     * @param CronNightly $event
+     *
+     * @throws \UnexpectedValueException
+     * @throws \InvalidArgumentException
+     */
+    public function handle(CronNightly $event): void
+    {
+        Log::info('Recalculating balances');
+
+        $journals = Journal::all();
+        foreach ($journals as $journal) {
+            $old_balance = $journal->balance;
+
+            $this->journalRepo->recalculateBalance($journal);
+            $journal->refresh();
+
+            Log::info('Adjusting balance on '.
+                $journal->morphed_type.':'.$journal->morphed_id
+                .' from '.$old_balance.' to '.$journal->balance);
+        }
+
+        Log::info('Done calculating balances');
+    }
+}

app/Cron/Nightly/RecalculateStats.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Cron\Nightly;
+
+use App\Events\CronNightly;
+use App\Interfaces\Listener;
+use App\Models\Enums\UserState;
+use App\Repositories\UserRepository;
+use App\Services\UserService;
+use Log;
+
+/**
+ * This recalculates the balances on all of the journals
+ */
+class RecalculateStats extends Listener
+{
+    private $userRepo;
+    private $userSvc;
+
+    public function __construct(UserRepository $userRepo, UserService $userService)
+    {
+        $this->userRepo = $userRepo;
+        $this->userSvc = $userService;
+    }
+
+    /**
+     * Recalculate the stats for active users
+     *
+     * @param CronNightly $event
+     *
+     * @throws \UnexpectedValueException
+     * @throws \InvalidArgumentException
+     */
+    public function handle(CronNightly $event): void
+    {
+        Log::info('Recalculating balances');
+
+        $w = [
+            ['state', '!=', UserState::REJECTED],
+        ];
+
+        $users = $this->userRepo->findWhere($w, ['id', 'name', 'airline_id']);
+        foreach ($users as $user) {
+            $this->userSvc->recalculateStats($user);
+        }
+
+        Log::info('Done recalculating stats');
+    }
+}

app/Cron/Nightly/SetActiveFlights.php

@@ -0,0 +1,97 @@
+<?php
+
+namespace App\Cron\Nightly;
+
+use App\Events\CronNightly;
+use App\Interfaces\Listener;
+use App\Models\Enums\Days;
+use App\Models\Flight;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\Log;
+
+/**
+ * Figure out what flights need to be active for today
+ */
+class SetActiveFlights extends Listener
+{
+    /**
+     * @param CronNightly $event
+     */
+    public function handle(CronNightly $event): void
+    {
+        $this->checkFlights();
+    }
+
+    /**
+     * Look through every single flight, check the start/end dates,
+     * as well of the days of week if this flight is active on this day
+     *
+     * TODO: Option to check the flight active/inactive against departure TZ
+     * TODO: Move to FlightService
+     */
+    public function checkFlights(): void
+    {
+        $today = Carbon::now('UTC');
+        $flights = Flight::all();
+
+        /**
+         * @var Flight $flight
+         */
+        foreach ($flights as $flight) {
+            if (!$flight->active) {
+                continue;
+            }
+
+            // dates aren't set, so just save if there were any changes above
+            // and move onto the next one
+            if ($flight->start_date === null || $flight->end_date === null) {
+                if ($flight->days !== null && $flight->days > 0) {
+                    $visible = Days::isToday($flight->days);
+                    if ($flight->visible !== $visible) {
+                        Log::info('Flight '.$flight->ident.' to '.($visible ? 'shown' : 'hidden'));
+
+                        $flight->visible = $visible;
+                        if ($visible === false) {
+                            Log::info('Today='.date('N').', start=no, mask='.$flight->days.', in='
+                                .Days::in($flight->days, Days::$isoDayMap[(int) date('N')]));
+                        }
+                    }
+                } else {
+                    Log::info('Toggling flight '.$flight->ident.' to visible');
+                    $flight->visible = true;
+                }
+
+                $flight->save();
+                continue;
+            }
+
+            // Check the day of week now first
+
+            // Start/end date is set, so make sure today is valid for it to be alive
+            // and then make sure if days of the week are specified, check that too
+            if ($today->gte($flight->start_date) && $today->lte($flight->end_date)) {
+                if ($flight->days !== null && $flight->days > 0) {
+                    $visible = Days::isToday($flight->days);
+                    if ($flight->visible !== $visible) {
+                        Log::info('Toggling flight '.$flight->ident.' to '.($visible ? 'shown' : 'hidden').'');
+
+                        $flight->visible = $visible;
+                        if ($visible === false) {
+                            Log::info('Today='.date('N').', start='.$flight->start_date
+                                .', end='.$flight->end_date.', mask='.$flight->days.', in='
+                                .Days::in($flight->days, Days::$isoDayMap[(int) date('N')]));
+                        }
+                    }
+                } else {
+                    Log::info('Toggling flight '.$flight->ident.' to visible');
+                    $flight->visible = true;
+                }
+            } else {
+                $flight->visible = false;
+                Log::info('Toggling flight '.$flight->ident.' to hidden, outside of start/end boundary');
+            }
+
+            $flight->save();
+        }
+    }
+}

app/Database/factories/AcarsFactory.php

@@ -4,18 +4,20 @@ use Faker\Generator as Faker;
 
 $factory->define(App\Models\Acars::class, function (Faker $faker) {
     return [
-        'id' => null,
-        'pirep_id' => null,
-        'log' => $faker->text(100),
-        'lat' => $faker->latitude,
-        'lon' => $faker->longitude,
-        'heading' => $faker->numberBetween(0, 359),
-        'altitude' => $faker->numberBetween(20, 400),
-        'vs' => $faker->numberBetween(-5000, 5000),
-        'gs' => $faker->numberBetween(300, 500),
+        'id'          => null,
+        'pirep_id'    => null,
+        'log'         => $faker->text(100),
+        'lat'         => $faker->latitude,
+        'lon'         => $faker->longitude,
+        'distance'    => $faker->randomFloat(2, 0, 6000),
+        'heading'     => $faker->numberBetween(0, 359),
+        'altitude'    => $faker->numberBetween(20, 400),
+        'vs'          => $faker->numberBetween(-5000, 5000),
+        'gs'          => $faker->numberBetween(300, 500),
         'transponder' => $faker->numberBetween(200, 9999),
-        'autopilot' => $faker->text(10),
-        'fuel_flow' => $faker->randomFloat(2, 100, 1000),
-        'sim_time' => $faker->dateTime('now', 'UTC'),
+        'autopilot'   => $faker->text(10),
+        'fuel'        => $faker->randomFloat(2, 100, 1000),
+        'fuel_flow'   => $faker->randomFloat(2, 100, 1000),
+        'sim_time'    => $faker->dateTime('now', 'UTC'),
     ];
 });

app/Database/factories/AircraftFactory.php

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

app/Database/factories/AirlineFactory.php

@@ -3,20 +3,23 @@
 use Faker\Generator as Faker;
 use Hashids\Hashids;
 
-/**
+/*
  * Add any number of airports. Don't really care if they're real or not
  */
 $factory->define(App\Models\Airline::class, function (Faker $faker) {
     return [
-        #'id' => $faker->unique()->numberBetween(10, 10000),
+        'id'   => null,
         'icao' => function (array $apt) use ($faker) {
             $hashids = new Hashids(microtime(), 5);
             $mt = str_replace('.', '', microtime(true));
+
             return $hashids->encode($mt);
         },
-        'iata' => function (array $apt) { return $apt['icao']; },
-        'name' => $faker->sentence(3),
+        'iata' => function (array $apt) {
+            return $apt['icao'];
+        },
+        'name'    => $faker->sentence(3),
         'country' => $faker->country,
-        'active' => 1
+        'active'  => 1,
     ];
 });

app/Database/factories/AirportFactory.php

@@ -1,37 +1,55 @@
 <?php
 
-use Hashids\Hashids;
 use Faker\Generator as Faker;
 
-/**
+/*
+ * Create an ICAO for use in the factory.
+ */
+if (!function_exists('createFactoryICAO')) {
+    function createFactoryICAO(): string
+    {
+        $characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+        $max = strlen($characters) - 1;
+        $string = '';
+        for ($i = 0; $i < 4; $i++) {
+            try {
+                $string .= $characters[random_int(0, $max)];
+            } catch (Exception $e) {
+            }
+        }
+
+        return $string;
+    }
+}
+
+/*
  * Add any number of airports. Don't really care if they're real or not
  */
 $factory->define(App\Models\Airport::class, function (Faker $faker) {
-
+    $used = [];
     return [
-        'id' => function(array $apt) use ($faker) {
-            $characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-            $string = '';
-            $max = strlen($characters) - 1;
-            for ($i = 0; $i < 5; $i++) {
-                $string .= $characters[random_int(0, $max)];
-            }
+        'id' => function () use ($used) {
+            do {
+                $string = createFactoryICAO();
+            } while (in_array($string, $used, true));
 
             return $string;
-            #return $faker->unique()->text(5);
-            /*$hashids = new Hashids(microtime(), 5);
-            $mt = str_replace('.', '', microtime(true));
-            return $hashids->encode($mt);*/
         },
-        'icao' => function(array $apt) { return $apt['id']; },
-        'iata' => function (array $apt) { return $apt['id']; },
-        'name' => $faker->sentence(3),
-        'country' => $faker->country,
-        'tz' => $faker->timezone,
-        'lat' => $faker->latitude,
-        'lon' => $faker->longitude,
-        'fuel_100ll_cost' => $faker->randomFloat(2),
-        'fuel_jeta_cost' => $faker->randomFloat(2),
-        'fuel_mogas_cost' => $faker->randomFloat(2),
+        'icao' => function (array $apt) {
+            return $apt['id'];
+        },
+        'iata' => function (array $apt) {
+            return $apt['id'];
+        },
+        'name'                 => $faker->sentence(3),
+        'country'              => $faker->country,
+        'timezone'             => $faker->timezone,
+        'lat'                  => $faker->latitude,
+        'lon'                  => $faker->longitude,
+        'hub'                  => false,
+        'ground_handling_cost' => $faker->randomFloat(2, 0, 500),
+        'fuel_100ll_cost'      => $faker->randomFloat(2, 0, 100),
+        'fuel_jeta_cost'       => $faker->randomFloat(2, 0, 100),
+        'fuel_mogas_cost'      => $faker->randomFloat(2, 0, 100),
     ];
 });

app/Database/factories/AwardsFactory.php

@@ -0,0 +1,13 @@
+<?php
+
+use Faker\Generator as Faker;
+
+$factory->define(App\Models\Award::class, function (Faker $faker) {
+    return [
+        'id'               => null,
+        'name'             => $faker->name,
+        'description'      => $faker->text(10),
+        'ref_model'        => null,
+        'ref_model_params' => null,
+    ];
+});

app/Database/factories/ExpenseFactory.php

@@ -0,0 +1,18 @@
+<?php
+
+use App\Models\Enums\ExpenseType;
+use Faker\Generator as Faker;
+
+$factory->define(App\Models\Expense::class, function (Faker $faker) {
+    return [
+        'id'           => null,
+        'airline_id'   => null,
+        'name'         => $faker->text(20),
+        'amount'       => $faker->randomFloat(2, 100, 1000),
+        'type'         => ExpenseType::FLIGHT,
+        'multiplier'   => false,
+        'ref_model'    => \App\Models\Expense::class,
+        'ref_model_id' => null,
+        'active'       => true,
+    ];
+});

app/Database/factories/FareFactory.php

@@ -4,10 +4,13 @@ use Faker\Generator as Faker;
 
 $factory->define(App\Models\Fare::class, function (Faker $faker) {
     return [
-        #'id' => $faker->unique()->numberBetween(10, 10000),
-        'code' => $faker->text(5),
-        'name' => $faker->text(20),
+        'id'    => null,
+        'code'  => $faker->unique()->text(50),
+        'name'  => $faker->text(50),
         'price' => $faker->randomFloat(2, 100, 1000),
+        'cost'  => function (array $fare) {
+            return round($fare['price'] / 2);
+        },
         'capacity' => $faker->randomFloat(0, 20, 500),
     ];
 });

app/Database/factories/FlightFactory.php

@@ -1,19 +1,19 @@
 <?php
-
+/**
+ * Create flights
+ */
 use Faker\Generator as Faker;
 
-# Match the list available in tests/data/*.yml
-
-$airlinesAvailable = [1];
-
-$factory->define(App\Models\Flight::class, function (Faker $faker) use ($airlinesAvailable) {
+$factory->define(App\Models\Flight::class, function (Faker $faker) {
     return [
-        'id' => substr($faker->unique()->sha1, 28, 12),
-        'airline_id' => $faker->randomElement($airlinesAvailable),
-        'flight_number' => $faker->unique()->numberBetween(10, 1000000),
-        'route_code' => $faker->randomElement(['', $faker->text(5)]),
-        'route_leg' => $faker->randomElement(['', $faker->text(5)]),
-        'dpt_airport_id' => function() {
+        'id'         => $faker->unique()->numberBetween(10, 10000000),
+        'airline_id' => function () {
+            return factory(App\Models\Airline::class)->create()->id;
+        },
+        'flight_number'  => $faker->unique()->numberBetween(10, 1000000),
+        'route_code'     => $faker->randomElement(['', $faker->text(5)]),
+        'route_leg'      => $faker->randomElement(['', $faker->numberBetween(0, 1000)]),
+        'dpt_airport_id' => function () {
             return factory(App\Models\Airport::class)->create()->id;
         },
         'arr_airport_id' => function () {
@@ -22,15 +22,21 @@ $factory->define(App\Models\Flight::class, function (Faker $faker) use ($airline
         'alt_airport_id' => function () {
             return factory(App\Models\Airport::class)->create()->id;
         },
-        'route' => $faker->randomElement(['', $faker->text(5)]),
-        'dpt_time' => $faker->time(),
-        'arr_time' => $faker->time(),
-        'flight_time' => $faker->randomFloat(2),
-        'has_bid' => false,
-        'active' => true,
-        'created_at' => $faker->dateTimeBetween('-1 week', 'now'),
-        'updated_at' => function (array $pirep) {
-            return $pirep['created_at'];
+        'distance'    => $faker->numberBetween(0, 3000),
+        'route'       => null,
+        'level'       => 0,
+        'dpt_time'    => $faker->time(),
+        'arr_time'    => $faker->time(),
+        'flight_time' => $faker->numberBetween(60, 360),
+        'has_bid'     => false,
+        'active'      => true,
+        'visible'     => true,
+        'days'        => 0,
+        'start_date'  => null,
+        'end_date'    => null,
+        'created_at'  => $faker->dateTimeBetween('-1 week', 'now'),
+        'updated_at'  => function (array $flight) {
+            return $flight['created_at'];
         },
     ];
 });

app/Database/factories/JournalFactory.php

@@ -0,0 +1,9 @@
+<?php
+
+use Faker\Generator as Faker;
+
+$factory->define(App\Models\Journal::class, function (Faker $faker) {
+    return [
+        'currency' => 'USD',
+    ];
+});

app/Database/factories/JournalTransactionsFactory.php

@@ -0,0 +1,17 @@
+<?php
+
+use Faker\Generator as Faker;
+
+$factory->define(App\Models\JournalTransactions::class, function (Faker $faker) {
+    return [
+        'transaction_group' => \Ramsey\Uuid\Uuid::uuid4()->toString(),
+        'journal_id'        => function () {
+            return factory(App\Models\Journal::class)->create()->id;
+        },
+        'credit'    => $faker->numberBetween(100, 10000),
+        'debit'     => $faker->numberBetween(100, 10000),
+        'currency'  => 'USD',
+        'memo'      => $faker->sentence(6),
+        'post_date' => \Carbon\Carbon::now(),
+    ];
+});

app/Database/factories/NavdataFactory.php

@@ -1,15 +1,15 @@
 <?php
 
+use App\Models\Enums\NavaidType;
 use Faker\Generator as Faker;
-use \App\Models\Enums\NavaidType;
 
 $factory->define(App\Models\Navdata::class, function (Faker $faker) {
     return [
-        'id' => str_replace(' ', '', str_replace('.', '', $faker->unique()->text(5))),
-        'name' => $faker->unique()->text(10),
+        'id'   => str_replace(' ', '', str_replace('.', '', $faker->unique()->text(5))),
+        'name' => str_replace('.', '', $faker->unique()->word),
         'type' => $faker->randomElement([NavaidType::VOR, NavaidType::NDB]),
-        'lat' => $faker->latitude,
-        'lon' => $faker->longitude,
+        'lat'  => $faker->latitude,
+        'lon'  => $faker->longitude,
         'freq' => $faker->randomFloat(2, 100, 1000),
     ];
 });

app/Database/factories/NewsFactory.php

@@ -0,0 +1,14 @@
+<?php
+
+use Faker\Generator as Faker;
+
+$factory->define(App\Models\News::class, function (Faker $faker) {
+    return [
+        'id'      => null,
+        'user_id' => function () {
+            return factory(App\Models\User::class)->create()->id;
+        },
+        'subject' => $faker->text(),
+        'body'    => $faker->sentence,
+    ];
+});

app/Database/factories/PirepFactory.php

@@ -3,56 +3,55 @@
 use Carbon\Carbon;
 use Faker\Generator as Faker;
 
-/**
+/*
  * Create a new PIREP
  */
 $factory->define(App\Models\Pirep::class, function (Faker $faker) {
-
-    static $raw_data;
-
     return [
-        'id' => null,
-        'airline_id' => function () { # OVERRIDE THIS IF NEEDED
+        'id'         => $faker->unique()->numberBetween(10, 10000000),
+        'airline_id' => function () {
             return factory(App\Models\Airline::class)->create()->id;
         },
-        'user_id' => function () { # OVERRIDE THIS IF NEEDED
+        'user_id' => function () {
             return factory(App\Models\User::class)->create()->id;
         },
         'aircraft_id' => function () {
             return factory(App\Models\Aircraft::class)->create()->id;
         },
-        'flight_number' => function () {
-            return factory(App\Models\Flight::class)->create()->flight_number;
-        },
-        'route_code' => function(array $pirep) {
-            //return App\Models\Flight::where(['flight_number' => $pirep['flight_number']])->first()->route_code;
-        },
-        'route_leg' => function (array $pirep) {
-            //return App\Models\Flight::where('flight_number', $pirep['flight_number'])->first()->route_leg;
+        'flight_number' => function (array $pirep) {
+            return factory(App\Models\Flight::class)->create([
+                'airline_id' => $pirep['airline_id'],
+            ])->flight_number;
         },
+        'route_code'     => null,
+        'route_leg'      => null,
         'dpt_airport_id' => function () {
             return factory(App\Models\Airport::class)->create()->id;
         },
         'arr_airport_id' => function () {
             return factory(App\Models\Airport::class)->create()->id;
         },
-        'level' => $faker->numberBetween(20, 400),
-        'distance' => $faker->randomFloat(2),
-        'planned_distance' => $faker->randomFloat(2),
-        'flight_time' => $faker->randomFloat(2),
-        'planned_flight_time' => $faker->randomFloat(2),
-        'zfw' => $faker->randomFloat(2),
-        'block_fuel' => $faker->randomFloat(2),
-        'fuel_used' => $faker->randomFloat(2),
-        'route' => $faker->text(200),
-        'notes' => $faker->text(200),
-        'source' => $faker->randomElement([PirepSource::MANUAL, PirepSource::ACARS]),
-        'source_name' => 'Test Factory',
-        'state' => PirepState::PENDING,
-        'status' => PirepStatus::SCHEDULED,
-        'raw_data' => $raw_data ?: $raw_data = json_encode(['key' => 'value']),
-        'created_at' => Carbon::now()->toDateTimeString(),
-        'updated_at' => function(array $pirep) {
+        'level'               => $faker->numberBetween(20, 400),
+        'distance'            => $faker->randomFloat(2, 0, 6000),
+        'planned_distance'    => $faker->randomFloat(2, 0, 6000),
+        'flight_time'         => $faker->numberBetween(60, 360),
+        'planned_flight_time' => $faker->numberBetween(60, 360),
+        'zfw'                 => $faker->randomFloat(2),
+        'block_fuel'          => $faker->randomFloat(2, 0, 30000),
+        'fuel_used'           => $faker->randomFloat(2, 0, 30000),
+        'block_on_time'       => Carbon::now('UTC'),
+        'block_off_time'      => function (array $pirep) {
+            return $pirep['block_on_time']->subMinutes($pirep['flight_time']);
+        },
+        'route'        => $faker->text(200),
+        'notes'        => $faker->text(200),
+        'source'       => $faker->randomElement([PirepSource::MANUAL, PirepSource::ACARS]),
+        'source_name'  => 'Test Factory',
+        'state'        => PirepState::PENDING,
+        'status'       => PirepStatus::SCHEDULED,
+        'submitted_at' => Carbon::now('UTC')->toDateTimeString(),
+        'created_at'   => Carbon::now('UTC')->toDateTimeString(),
+        'updated_at'   => function (array $pirep) {
             return $pirep['created_at'];
         },
     ];

app/Database/factories/RankFactory.php

@@ -11,11 +11,13 @@ use Faker\Generator as Faker;
  */
 $factory->define(App\Models\Rank::class, function (Faker $faker) {
     return [
-        #'id' => $faker->unique()->numberBetween(10, 10000),
-        'name' => $faker->unique()->text(50),
-        'hours' => $faker->numberBetween(10, 50),
-        'auto_approve_acars' => 0,
-        'auto_approve_manual' => 0,
-        'auto_promote' => 0,
+        'id'                   => null,
+        'name'                 => $faker->unique()->text(50),
+        'hours'                => $faker->numberBetween(10, 50),
+        'acars_base_pay_rate'  => $faker->numberBetween(10, 100),
+        'manual_base_pay_rate' => $faker->numberBetween(10, 100),
+        'auto_approve_acars'   => 0,
+        'auto_approve_manual'  => 0,
+        'auto_promote'         => 0,
     ];
 });

app/Database/factories/SubfleetFactory.php

@@ -4,9 +4,12 @@ use Faker\Generator as Faker;
 
 $factory->define(App\Models\Subfleet::class, function (Faker $faker) {
     return [
-        #'id' => $faker->unique()->numberBetween(10, 10000),
-        'airline_id' => 1,
-        'name' => $faker->unique()->text(50),
-        'type' => $faker->unique()->text(7),
+        'id'         => null,
+        'airline_id' => function () {
+            return factory(App\Models\Airline::class)->create()->id;
+        },
+        'name'                       => $faker->unique()->text(50),
+        'type'                       => $faker->unique()->text(7),
+        'ground_handling_multiplier' => $faker->numberBetween(50, 200),
     ];
 });

app/Database/factories/UserFactory.php

@@ -1,26 +1,25 @@
 <?php
 
-use Faker\Generator as Faker;
 use App\Models\Enums\UserState;
+use Faker\Generator as Faker;
 
-$factory->define(App\Models\User::class, function (Faker $faker)
-{
+$factory->define(App\Models\User::class, function (Faker $faker) {
     static $password;
 
     return [
-        #'id' => $faker->unique()->numberBetween(10, 10000),
-        'name' => $faker->name,
-        'email' => $faker->safeEmail,
-        'password' => $password ?: $password = Hash::make('secret'),
-        'api_key' => $faker->sha1,
+        'id'         => null,
+        'name'       => $faker->name,
+        'email'      => $faker->safeEmail,
+        'password'   => $password ?: $password = Hash::make('secret'),
+        'api_key'    => $faker->sha1,
         'airline_id' => function () {
             return factory(App\Models\Airline::class)->create()->id;
         },
-        'rank_id' => 1,
-        'flights' => $faker->numberBetween(0, 1000),
-        'flight_time' => $faker->numberBetween(0, 10000),
-        'transfer_time' => $faker->numberBetween(0, 10000),
-        'state' => UserState::ACTIVE,
+        'rank_id'        => 1,
+        'flights'        => $faker->numberBetween(0, 1000),
+        'flight_time'    => $faker->numberBetween(0, 10000),
+        'transfer_time'  => $faker->numberBetween(0, 10000),
+        'state'          => UserState::ACTIVE,
         'remember_token' => $faker->unique()->text(5),
     ];
 });

app/Database/migrations/2017_06_07_014930_create_settings_table.php

@@ -1,10 +1,17 @@
 <?php
 
-use App\Models\Migrations\Migration;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
 class CreateSettingsTable extends Migration
 {
+    private $migrationSvc;
+
+    public function __construct()
+    {
+        $this->migrationSvc = new \Modules\Installer\Services\MigrationService();
+    }
+
     /**
      * Run the migrations.
      *
@@ -14,229 +21,23 @@ class CreateSettingsTable extends Migration
     {
         Schema::create('settings', function (Blueprint $table) {
             $table->string('id');
+            $table->unsignedInteger('offset')->default(0);
             $table->unsignedInteger('order')->default(99);
+            $table->string('key');
             $table->string('name');
             $table->string('value');
             $table->string('default')->nullable();
             $table->string('group')->nullable();
             $table->string('type')->nullable();
-            $table->string('options')->nullable();
+            $table->text('options')->nullable();
             $table->string('description')->nullable();
 
             $table->primary('id');
+            $table->index('key');
             $table->timestamps();
         });
 
-        $this->addCounterGroups([
-            'general' => 1,
-            'flights' => 20,
-            'finances' => 40,
-            'bids' => 60,
-            'pireps' => 80,
-            'pilots' => 100,
-        ]);
-
-        /**
-         * Initial default settings
-         */
-        $settings = [
-            [
-                'id' => $this->formatSettingId('general.start_date'),
-                'order' => $this->getNextOrderNumber('general'),
-                'name' => 'Start Date',
-                'group' => 'general',
-                'value' => '',
-                'type' => 'date',
-                'description' => 'The date your VA started',
-            ],
-            [
-                'id' => $this->formatSettingId('general.admin_email'),
-                'order' => $this->getNextOrderNumber('general'),
-                'name' => 'Admin Email',
-                'group' => 'general',
-                'value' => '',
-                'type' => 'text',
-                'description' => 'Email where notices, etc are sent',
-            ],
-            [
-                'id' => $this->formatSettingId('general.currency'),
-                'order' => $this->getNextOrderNumber('general'),
-                'name' => 'Currency to Use',
-                'group' => 'general',
-                'value' => 'dollar',
-                'type' => 'select',
-                'options' => 'dollar,euro,gbp,yen,jpy,rupee,ruble',
-                'description' => 'Currency to show in the interface',
-            ],
-            [
-                'id' => $this->formatSettingId('general.distance_unit'),
-                'order' => $this->getNextOrderNumber('general'),
-                'name' => 'Distance Units',
-                'group' => 'general',
-                'value' => 'nm',
-                'type' => 'select',
-                'options' => 'km,mi,nm',
-                'description' => 'The distance unit to show',
-            ],
-            [
-                'id' => $this->formatSettingId('general.weight_unit'),
-                'order' => $this->getNextOrderNumber('general'),
-                'name' => 'Weight Units',
-                'group' => 'general',
-                'value' => 'kg',
-                'type' => 'select',
-                'options' => 'lbs, kg',
-                'description' => 'The weight unit',
-            ],
-            [
-                'id' => $this->formatSettingId('general.speed_unit'),
-                'order' => $this->getNextOrderNumber('general'),
-                'name' => 'Speed Units',
-                'group' => 'general',
-                'value' => 'Km/H',
-                'type' => 'select',
-                'options' => 'Km/H,kts',
-                'description' => 'The speed unit',
-            ],
-            [
-                'id' => $this->formatSettingId('general.altitude_unit'),
-                'order' => $this->getNextOrderNumber('general'),
-                'name' => 'Altitude Units',
-                'group' => 'general',
-                'value' => 'ft',
-                'type' => 'select',
-                'options' => 'ft,m',
-                'description' => 'The altitude units',
-            ],
-            [
-                'id' => $this->formatSettingId('general.liquid_unit'),
-                'order' => $this->getNextOrderNumber('general'),
-                'name' => 'Liquid Units',
-                'group' => 'general',
-                'value' => 'lbs',
-                'type' => 'select',
-                'options' => 'liters,gal,kg,lbs',
-                'description' => 'The liquid units',
-            ],
-
-            /**
-             * BIDS
-             */
-
-            [
-                'id' => $this->formatSettingId('bids.disable_flight_on_bid'),
-                'order' => $this->getNextOrderNumber('bids'),
-                'name' => 'Disable flight on bid',
-                'group' => 'bids',
-                'value' => true,
-                'type' => 'boolean',
-                'description' => 'When a flight is bid on, no one else can bid on it',
-            ],
-            [
-                'id' => $this->formatSettingId('bids.allow_multiple_bids'),
-                'order' => $this->getNextOrderNumber('bids'),
-                'name' => 'Allow multiple bids',
-                'group' => 'bids',
-                'value' => true,
-                'type' => 'boolean',
-                'description' => 'Whether or not someone can bid on multiple flights',
-            ],
-
-            /**
-             * FINANCES
-             */
-
-            /**
-             * PIREPS
-             */
-
-            [
-                'id' => $this->formatSettingId('pireps.duplicate_check_time'),
-                'order' => $this->getNextOrderNumber('pireps'),
-                'name' => 'PIREP duplicate time check',
-                'group' => 'pireps',
-                'value' => 10,
-                'default' => 10,
-                'type' => 'int',
-                'description' => 'The time in minutes to check for a duplicate PIREP',
-            ],
-            [
-                'id' => $this->formatSettingId('pireps.hide_cancelled_pireps'),
-                'order' => $this->getNextOrderNumber('pireps'),
-                'name' => 'Hide Cancelled PIREPs',
-                'group' => 'pireps',
-                'value' => true,
-                'default' => true,
-                'type' => 'boolean',
-                'description' => 'Hide any cancelled PIREPs in the front-end',
-            ],
-
-            [
-                'id' => $this->formatSettingId('pireps.restrict_aircraft_to_rank'),
-                'order' => $this->getNextOrderNumber('pireps'),
-                'name' => 'Restrict Aircraft to Ranks',
-                'group' => 'pireps',
-                'value' => true,
-                'default' => true,
-                'type' => 'boolean',
-                'description' => 'Aircraft that can be flown are restricted to a user\'s rank',
-            ],
-
-
-            /**
-             * PILOTS
-             */
-
-            [
-                'id' => $this->formatSettingId('pilots.id_length'),
-                'order' => $this->getNextOrderNumber('pilots'),
-                'name' => 'Pilot ID Length',
-                'group' => 'pilots',
-                'value' => 4,
-                'default' => 4,
-                'type' => 'int',
-                'description' => 'The length of a pilot\'s ID',
-            ],
-            [
-                'id' => $this->formatSettingId('pilot.auto_accept'),
-                'order' => $this->getNextOrderNumber('pilots'),
-                'name' => 'Auto Accept New Pilot',
-                'group' => 'pilots',
-                'value' => true,
-                'type' => 'boolean',
-                'description' => 'Automatically accept a pilot when they register',
-            ],
-            [
-                'id' => $this->formatSettingId('pilots.only_flights_from_current'),
-                'order' => $this->getNextOrderNumber('pilots'),
-                'name' => 'Flights from Current',
-                'group' => 'pilots',
-                'value' => false,
-                'type' => 'boolean',
-                'description' => 'Only show/allow flights from their current location',
-            ],
-            [
-                'id' => $this->formatSettingId('pilot.auto_leave_days'),
-                'order' => $this->getNextOrderNumber('pilots'),
-                'name' => 'Pilot to ON LEAVE days',
-                'group' => 'pilots',
-                'value' => 30,
-                'default' => 30,
-                'type' => 'int',
-                'description' => 'Automatically set a pilot to ON LEAVE status after N days of no activity',
-            ],
-            [
-                'id' => $this->formatSettingId('pilots.hide_inactive'),
-                'order' => $this->getNextOrderNumber('pilots'),
-                'name' => 'Hide Inactive Pilots',
-                'group' => 'pilots',
-                'value' => true,
-                'type' => 'boolean',
-                'description' => 'Don\'t show inactive pilots in the public view',
-            ],
-        ];
-
-        $this->addData('settings', $settings);
+        $this->migrationSvc->updateAllSettings();
     }
 
     /**

app/Database/migrations/2017_06_08_0000_create_users_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use App\Models\Migrations\Migration;
-use Illuminate\Support\Facades\Schema;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateUsersTable extends Migration
 {
@@ -24,14 +24,16 @@ class CreateUsersTable extends Migration
             $table->string('country', 2)->nullable();
             $table->string('home_airport_id', 5)->nullable();
             $table->string('curr_airport_id', 5)->nullable();
-            $table->string('last_pirep_id', 12)->nullable();
+            $table->string('last_pirep_id', \App\Models\Pirep::ID_MAX_LENGTH)->nullable();
             $table->unsignedBigInteger('flights')->default(0);
             $table->unsignedBigInteger('flight_time')->nullable()->default(0);
             $table->unsignedBigInteger('transfer_time')->nullable()->default(0);
-            $table->decimal('balance', 19)->nullable();
+            $table->string('avatar')->nullable();
             $table->string('timezone', 64)->nullable();
             $table->unsignedTinyInteger('status')->nullable()->default(0);
             $table->unsignedTinyInteger('state')->nullable()->default(0);
+            $table->boolean('toc_accepted')->nullable();
+            $table->boolean('opt_in')->nullable();
             $table->boolean('active')->nullable();
             $table->ipAddress('last_ip')->nullable();
             $table->rememberToken();

app/Database/migrations/2017_06_08_0001_roles_permissions_tables.php

@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Migrations\Migration;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
 class RolesPermissionsTables extends Migration
@@ -8,7 +8,7 @@ class RolesPermissionsTables extends Migration
     /**
      * Run the migrations.
      *
-     * @return  void
+     * @return void
      */
     public function up()
     {
@@ -67,28 +67,27 @@ class RolesPermissionsTables extends Migration
             $table->primary(['permission_id', 'role_id']);
         });
 
-        # create a default user/role
+        // create a default user/role
         $roles = [
             [
-                'id' => 1,
-                'name' => 'admin',
+                'id'           => 1,
+                'name'         => 'admin',
                 'display_name' => 'Administrators',
             ],
             [
-                'id' => 2,
-                'name' => 'user',
-                'display_name' => 'Pilot'
+                'id'           => 2,
+                'name'         => 'user',
+                'display_name' => 'Pilot',
             ],
         ];
 
-
         $this->addData('roles', $roles);
     }
 
     /**
      * Reverse the migrations.
      *
-     * @return  void
+     * @return void
      */
     public function down()
     {

app/Database/migrations/2017_06_08_0005_create_password_resets_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Schema;
 
 class CreatePasswordResetsTable extends Migration
 {

app/Database/migrations/2017_06_08_0006_create_sessions_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Schema;
 
 class CreateSessionsTable extends Migration
 {

app/Database/migrations/2017_06_08_191703_create_airlines_table.php

@@ -1,11 +1,10 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
 class CreateAirlinesTable extends Migration
 {
-
     /**
      * Run the migrations.
      *

app/Database/migrations/2017_06_09_010621_create_aircrafts_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use \App\Models\Enums\AircraftState;
-
-use Illuminate\Database\Migrations\Migration;
+use App\Interfaces\Migration;
+use App\Models\Enums\AircraftState;
+use App\Models\Enums\AircraftStatus;
 use Illuminate\Database\Schema\Blueprint;
 
 class CreateAircraftsTable extends Migration
@@ -13,22 +13,21 @@ class CreateAircraftsTable extends Migration
             $table->increments('id');
             $table->unsignedInteger('subfleet_id');
             $table->string('icao', 4)->nullable();
+            $table->string('iata', 4)->nullable();
             $table->string('airport_id', 5)->nullable();
             $table->timestamp('landing_time')->nullable();
-            $table->string('hex_code', 10)->nullable();
             $table->string('name', 50);
             $table->string('registration', 10)->nullable();
-            $table->string('tail_number', 10)->nullable();
-            $table->unsignedDecimal('zfw', 12)->nullable()->default(0);
+            $table->string('hex_code', 10)->nullable();
+            $table->unsignedDecimal('zfw')->nullable()->default(0);
             $table->unsignedBigInteger('flight_time')->nullable()->default(0);
-            $table->boolean('active')->default(true);
+            $table->char('status', 1)->default(AircraftStatus::ACTIVE);
             $table->unsignedTinyInteger('state')->default(AircraftState::PARKED);
             $table->timestamps();
 
             $table->unique('registration');
             $table->index('airport_id');
         });
-
     }
 
     public function down()

app/Database/migrations/2017_06_10_040335_create_fares_table.php

@@ -1,11 +1,10 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
 class CreateFaresTable extends Migration
 {
-
     /**
      * Run the migrations.
      *
@@ -15,10 +14,10 @@ class CreateFaresTable extends Migration
     {
         Schema::create('fares', function (Blueprint $table) {
             $table->increments('id');
-            $table->string('code', 50);
+            $table->string('code', 50)->unique();
             $table->string('name', 50);
-            $table->unsignedDecimal('price', 19)->nullable()->default(0.00);
-            $table->unsignedDecimal('cost', 19)->nullable()->default(0.00);
+            $table->unsignedDecimal('price')->nullable()->default(0.00);
+            $table->unsignedDecimal('cost')->nullable()->default(0.00);
             $table->unsignedInteger('capacity')->nullable()->default(0);
             $table->string('notes')->nullable();
             $table->boolean('active')->default(true);

app/Database/migrations/2017_06_11_135707_create_airports_table.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
 class CreateAirportsTable extends Migration
@@ -8,19 +8,24 @@ class CreateAirportsTable extends Migration
     public function up()
     {
         Schema::create('airports', function (Blueprint $table) {
-            $table->string('id', 5)->primary();
-            $table->string('iata', 5)->nullable();
-            $table->string('icao', 5);
+            $table->string('id', 4)->primary();
+            $table->string('iata', 4)->nullable();
+            $table->string('icao', 4);
             $table->string('name', 100);
             $table->string('location', 100)->nullable();
             $table->string('country', 64)->nullable();
-            $table->string('tz', 64)->nullable();
+            $table->string('timezone', 64)->nullable();
             $table->boolean('hub')->default(false);
-            $table->unsignedDecimal('fuel_100ll_cost', 8)->nullable()->default(0);
-            $table->unsignedDecimal('fuel_jeta_cost', 8)->nullable()->default(0);
-            $table->unsignedDecimal('fuel_mogas_cost', 8)->nullable()->default(0);
             $table->float('lat', 7, 4)->nullable()->default(0.0);
             $table->float('lon', 7, 4)->nullable()->default(0.0);
+            $table->unsignedDecimal('ground_handling_cost')->nullable()->default(0);
+            $table->unsignedDecimal('fuel_100ll_cost')->nullable()->default(0);
+            $table->unsignedDecimal('fuel_jeta_cost')->nullable()->default(0);
+            $table->unsignedDecimal('fuel_mogas_cost')->nullable()->default(0);
+
+            $table->index('icao');
+            $table->index('iata');
+            $table->index('hub');
         });
     }
 

app/Database/migrations/2017_06_17_214650_create_flight_tables.php

@@ -1,13 +1,11 @@
 <?php
 
+use App\Interfaces\Migration;
 use App\Models\Enums\FlightType;
-
-use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
 class CreateFlightTables extends Migration
 {
-
     /**
      * Run the migrations.
      *
@@ -16,37 +14,40 @@ class CreateFlightTables extends Migration
     public function up()
     {
         Schema::create('flights', function (Blueprint $table) {
-            $table->string('id', 12);
+            $table->string('id', \App\Interfaces\Model::ID_MAX_LENGTH);
             $table->unsignedInteger('airline_id');
-            $table->string('flight_number', 10);
+            $table->unsignedInteger('flight_number');
             $table->string('route_code', 5)->nullable();
-            $table->string('route_leg', 5)->nullable();
-            $table->string('dpt_airport_id', 5);
-            $table->string('arr_airport_id', 5);
-            $table->string('alt_airport_id', 5)->nullable();
+            $table->unsignedInteger('route_leg')->nullable();
+            $table->string('dpt_airport_id', 4);
+            $table->string('arr_airport_id', 4);
+            $table->string('alt_airport_id', 4)->nullable();
             $table->string('dpt_time', 10)->nullable();
             $table->string('arr_time', 10)->nullable();
             $table->unsignedInteger('level')->nullable()->default(0);
-            $table->unsignedDecimal('distance', 19)->nullable()->default(0.0);
-            $table->unsignedDecimal('flight_time', 19)->nullable();
-            $table->tinyInteger('flight_type')->default(FlightType::PASSENGER);
+            $table->unsignedDecimal('distance')->nullable()->default(0.0);
+            $table->unsignedInteger('flight_time')->nullable();
+            $table->char('flight_type', 1)->default(FlightType::SCHED_PAX);
             $table->text('route')->nullable();
             $table->text('notes')->nullable();
+            $table->boolean('scheduled')->default(false)->nullable();
+            $table->unsignedTinyInteger('days')->nullable();
+            $table->date('start_date')->nullable();
+            $table->date('end_date')->nullable();
             $table->boolean('has_bid')->default(false);
             $table->boolean('active')->default(true);
+            $table->boolean('visible')->default(true); // used by the cron
             $table->timestamps();
 
             $table->primary('id');
 
-            #$table->unique('flight_number');
-
             $table->index('flight_number');
             $table->index('dpt_airport_id');
             $table->index('arr_airport_id');
         });
 
         Schema::create('flight_fare', function (Blueprint $table) {
-            $table->string('flight_id', 12);
+            $table->string('flight_id', \App\Interfaces\Model::ID_MAX_LENGTH);
             $table->unsignedInteger('fare_id');
             $table->string('price', 10)->nullable();
             $table->string('cost', 10)->nullable();
@@ -56,15 +57,37 @@ class CreateFlightTables extends Migration
             $table->primary(['flight_id', 'fare_id']);
         });
 
+        /*
+         * Hold a master list of fields
+         */
         Schema::create('flight_fields', function (Blueprint $table) {
             $table->increments('id');
-            $table->string('flight_id', 12);
             $table->string('name', 50);
+            $table->string('slug', 50)->nullable();
+        });
+
+        /*
+         * The values for the actual fields
+         */
+        Schema::create('flight_field_values', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->string('flight_id', \App\Interfaces\Model::ID_MAX_LENGTH);
+            $table->string('name', 50);
+            $table->string('slug', 50)->nullable();
             $table->text('value');
             $table->timestamps();
 
             $table->index('flight_id');
         });
+
+        Schema::create('flight_subfleet', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->unsignedInteger('subfleet_id');
+            $table->string('flight_id', \App\Interfaces\Model::ID_MAX_LENGTH);
+
+            $table->index(['subfleet_id', 'flight_id']);
+            $table->index(['flight_id', 'subfleet_id']);
+        });
     }
 
     /**
@@ -76,6 +99,7 @@ class CreateFlightTables extends Migration
     {
         Schema::drop('flight_fields');
         Schema::drop('flight_fare');
+        Schema::drop('flight_subfleet');
         Schema::drop('flights');
     }
 }

app/Database/migrations/2017_06_21_165410_create_ranks_table.php

@@ -1,11 +1,10 @@
 <?php
 
-use App\Models\Migrations\Migration;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
 class CreateRanksTable extends Migration
 {
-
     /**
      * Run the migrations.
      *
@@ -16,11 +15,15 @@ class CreateRanksTable extends Migration
         Schema::create('ranks', function (Blueprint $table) {
             $table->increments('id');
             $table->string('name', 50);
-            $table->string('image_link')->nullable();
+            $table->string('image_url')->nullable();
             $table->unsignedInteger('hours')->default(0);
+            $table->unsignedDecimal('acars_base_pay_rate')->nullable()->default(0);
+            $table->unsignedDecimal('manual_base_pay_rate')->nullable()->default(0);
             $table->boolean('auto_approve_acars')->nullable()->default(false);
             $table->boolean('auto_approve_manual')->nullable()->default(false);
             $table->boolean('auto_promote')->nullable()->default(true);
+            $table->boolean('auto_approve_above_score')->nullable()->default(false);
+            $table->smallInteger('auto_approve_score')->nullable();
             $table->timestamps();
 
             $table->unique('name');
@@ -31,10 +34,12 @@ class CreateRanksTable extends Migration
          */
         $ranks = [
             [
-                'id' => 1,
-                'name' => 'New Pilot',
-                'hours' => 0,
-            ]
+                'id'                   => 1,
+                'name'                 => 'New Pilot',
+                'hours'                => 0,
+                'acars_base_pay_rate'  => 50,
+                'manual_base_pay_rate' => 25,
+            ],
         ];
 
         $this->addData('ranks', $ranks);

app/Database/migrations/2017_06_23_011011_create_subfleet_tables.php

@@ -1,63 +1,47 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
+/**
+ * Class CreateSubfleetTables
+ */
 class CreateSubfleetTables extends Migration
 {
-
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
         Schema::create('subfleets', function (Blueprint $table) {
             $table->increments('id');
             $table->unsignedInteger('airline_id')->nullable();
+            $table->string('type', 50)->unique();
             $table->string('name', 50);
-            $table->string('type', 50);
+            $table->unsignedDecimal('cost_block_hour')->default(0)->nullable();
+            $table->unsignedDecimal('cost_delay_minute')->default(0)->nullable();
             $table->unsignedTinyInteger('fuel_type')->nullable();
-            $table->unsignedDecimal('cargo_capacity', 19)->nullable();
-            $table->unsignedDecimal('fuel_capacity', 19)->nullable();
-            $table->unsignedDecimal('gross_weight', 19)->nullable();
+            $table->unsignedDecimal('ground_handling_multiplier')->nullable()->default(100);
+            $table->unsignedDecimal('cargo_capacity')->nullable();
+            $table->unsignedDecimal('fuel_capacity')->nullable();
+            $table->unsignedDecimal('gross_weight')->nullable();
             $table->timestamps();
         });
 
-        Schema::create('subfleet_expenses', function(Blueprint $table) {
-            $table->unsignedBigInteger('subfleet_id');
-            $table->string('name', 50);
-            $table->unsignedDecimal('cost', 19);
-
-            $table->primary(['subfleet_id', 'name']);
-        });
-
         Schema::create('subfleet_fare', function (Blueprint $table) {
             $table->unsignedInteger('subfleet_id');
             $table->unsignedInteger('fare_id');
-            $table->unsignedDecimal('price', 19)->nullable();
-            $table->unsignedDecimal('cost', 19)->nullable();
-            $table->unsignedInteger('capacity')->nullable();
+            $table->string('price')->nullable();
+            $table->string('cost')->nullable();
+            $table->string('capacity')->nullable();
             $table->timestamps();
 
             $table->primary(['subfleet_id', 'fare_id']);
             $table->index(['fare_id', 'subfleet_id']);
         });
 
-        Schema::create('subfleet_flight', function(Blueprint $table) {
-            $table->unsignedInteger('subfleet_id');
-            $table->string('flight_id', 12);
-
-            $table->primary(['subfleet_id', 'flight_id']);
-            $table->index(['flight_id', 'subfleet_id']);
-        });
-
-        Schema::create('subfleet_rank', function(Blueprint $table) {
+        Schema::create('subfleet_rank', function (Blueprint $table) {
             $table->unsignedInteger('rank_id');
             $table->unsignedInteger('subfleet_id');
-            $table->unsignedDecimal('acars_pay', 19)->nullable();
-            $table->unsignedDecimal('manual_pay', 19)->nullable();
+            $table->string('acars_pay')->nullable();
+            $table->string('manual_pay')->nullable();
 
             $table->primary(['rank_id', 'subfleet_id']);
             $table->index(['subfleet_id', 'rank_id']);
@@ -72,9 +56,7 @@ class CreateSubfleetTables extends Migration
     public function down()
     {
         Schema::dropIfExists('subfleets');
-        Schema::dropIfExists('subfleet_expenses');
         Schema::dropIfExists('subfleet_fare');
-        Schema::dropIfExists('subfleet_flight');
         Schema::dropIfExists('subfleet_rank');
     }
 }

app/Database/migrations/2017_06_28_195426_create_pirep_tables.php

@@ -1,15 +1,13 @@
 <?php
 
+use App\Interfaces\Migration;
 use App\Models\Enums\FlightType;
 use App\Models\Enums\PirepState;
 use App\Models\Enums\PirepStatus;
-
-use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
 class CreatePirepTables extends Migration
 {
-
     /**
      * Run the migrations.
      *
@@ -18,76 +16,64 @@ class CreatePirepTables extends Migration
     public function up()
     {
         Schema::create('pireps', function (Blueprint $table) {
-            $table->string('id', 12);
+            $table->string('id', \App\Interfaces\Model::ID_MAX_LENGTH);
             $table->unsignedInteger('user_id');
             $table->unsignedInteger('airline_id');
             $table->unsignedInteger('aircraft_id')->nullable();
-            $table->string('flight_id', 12)->nullable();
             $table->string('flight_number', 10)->nullable();
             $table->string('route_code', 5)->nullable();
             $table->string('route_leg', 5)->nullable();
-            $table->string('dpt_airport_id', 5);
-            $table->string('arr_airport_id', 5);
+            $table->char('flight_type', 1)->default(FlightType::SCHED_PAX);
+            $table->string('dpt_airport_id', 4);
+            $table->string('arr_airport_id', 4);
+            $table->string('alt_airport_id', 4)->nullable();
             $table->unsignedInteger('level')->nullable();
             $table->unsignedDecimal('distance')->nullable();
             $table->unsignedDecimal('planned_distance')->nullable();
-            $table->unsignedDecimal('flight_time', 19)->nullable();
-            $table->unsignedDecimal('planned_flight_time', 19)->nullable();
-            $table->unsignedDecimal('zfw', 19)->nullable();
-            $table->unsignedDecimal('block_fuel', 19)->nullable();
-            $table->unsignedDecimal('fuel_used', 19)->nullable();
-            $table->decimal('landing_rate', 8)->nullable();
+            $table->unsignedInteger('flight_time')->nullable();
+            $table->unsignedInteger('planned_flight_time')->nullable();
+            $table->unsignedDecimal('zfw')->nullable();
+            $table->unsignedDecimal('block_fuel')->nullable();
+            $table->unsignedDecimal('fuel_used')->nullable();
+            $table->decimal('landing_rate')->nullable();
+            $table->smallInteger('score')->nullable();
             $table->text('route')->nullable();
             $table->text('notes')->nullable();
             $table->unsignedTinyInteger('source')->nullable()->default(0);
-            $table->string('source_name', 25)->nullable();
-            $table->tinyInteger('flight_type')->default(FlightType::PASSENGER);
+            $table->string('source_name', 50)->nullable();
             $table->tinyInteger('state')->default(PirepState::PENDING);
-            $table->tinyInteger('status')->default(PirepStatus::SCHEDULED);
-            $table->longText('raw_data')->nullable();
+            $table->char('status', 3)->default(PirepStatus::SCHEDULED);
+            $table->dateTime('submitted_at')->nullable();
+            $table->dateTime('block_off_time')->nullable();
+            $table->dateTime('block_on_time')->nullable();
             $table->timestamps();
 
             $table->primary('id');
             $table->index('user_id');
-            $table->index('flight_id');
+            $table->index('flight_number');
             $table->index('dpt_airport_id');
             $table->index('arr_airport_id');
         });
 
         Schema::create('pirep_comments', function (Blueprint $table) {
             $table->bigIncrements('id');
-            $table->string('pirep_id', 12);
+            $table->string('pirep_id', \App\Interfaces\Model::ID_MAX_LENGTH);
             $table->unsignedInteger('user_id');
             $table->text('comment');
             $table->timestamps();
         });
 
-        /*
-         * Financial tables/fields
-         */
-        Schema::create('pirep_expenses', function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->string('pirep_id', 12);
-            $table->string('name');
-            $table->double('value', 19, 2)->nullable();
-
-            $table->index('pirep_id');
-        });
-
         Schema::create('pirep_fares', function (Blueprint $table) {
             $table->bigIncrements('id');
-            $table->string('pirep_id', 12);
-            $table->unsignedBigInteger('fare_id');
-            $table->unsignedInteger('count')->nullable();
+            $table->string('pirep_id', \App\Interfaces\Model::ID_MAX_LENGTH);
+            $table->unsignedInteger('fare_id');
+            $table->unsignedInteger('count')->nullable()->default(0);
 
             $table->index('pirep_id');
         });
 
-        /*
-         * Additional PIREP data
-         */
         Schema::create('pirep_fields', function (Blueprint $table) {
-            $table->bigIncrements('id');
+            $table->increments('id');
             $table->string('name', 50);
             $table->string('slug', 50)->nullable();
             $table->boolean('required')->nullable()->default(false);
@@ -95,10 +81,11 @@ class CreatePirepTables extends Migration
 
         Schema::create('pirep_field_values', function (Blueprint $table) {
             $table->bigIncrements('id');
-            $table->string('pirep_id', 12);
+            $table->string('pirep_id', \App\Interfaces\Model::ID_MAX_LENGTH);
             $table->string('name', 50);
+            $table->string('slug', 50)->nullable();
             $table->string('value')->nullable();
-            $table->string('source')->nullable();
+            $table->unsignedTinyInteger('source');
             $table->timestamps();
 
             $table->index('pirep_id');
@@ -114,7 +101,6 @@ class CreatePirepTables extends Migration
     {
         Schema::dropIfExists('pireps');
         Schema::dropIfExists('pirep_comments');
-        Schema::dropIfExists('pirep_expenses');
         Schema::dropIfExists('pirep_fares');
         Schema::dropIfExists('pirep_fields');
         Schema::dropIfExists('pirep_field_values');

app/Database/migrations/2017_12_12_174519_create_bids_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Schema;
 
 class CreateBidsTable extends Migration
 {
@@ -13,10 +13,10 @@ class CreateBidsTable extends Migration
      */
     public function up()
     {
-        Schema::create('user_bids', function (Blueprint $table) {
+        Schema::create('bids', function (Blueprint $table) {
             $table->increments('id');
             $table->unsignedInteger('user_id');
-            $table->string('flight_id', 12);
+            $table->string('flight_id', \App\Interfaces\Model::ID_MAX_LENGTH);
             $table->timestamps();
 
             $table->index('user_id');
@@ -31,6 +31,6 @@ class CreateBidsTable extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('user_bids');
+        Schema::dropIfExists('bids');
     }
 }

app/Database/migrations/2017_12_14_225241_create_jobs_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Schema;
 
 class CreateJobsTable extends Migration
 {

app/Database/migrations/2017_12_14_225337_create_failed_jobs_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Schema;
 
 class CreateFailedJobsTable extends Migration
 {

app/Database/migrations/2017_12_20_004147_create_navdata_tables.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Schema;
 
 class CreateNavdataTables extends Migration
 {
@@ -13,7 +13,7 @@ class CreateNavdataTables extends Migration
      */
     public function up()
     {
-        /**
+        /*
          * See for defs, modify/update based on this
          * https://github.com/skiselkov/openfmc/blob/master/airac.h
          */

app/Database/migrations/2017_12_20_005147_create_acars_tables.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Schema;
 
 class CreateAcarsTables extends Migration
 {
@@ -15,20 +15,23 @@ class CreateAcarsTables extends Migration
     {
         Schema::create('acars', function (Blueprint $table) {
             $table->string('id', 12);
-            $table->string('pirep_id', 12);
+            $table->string('pirep_id', \App\Interfaces\Model::ID_MAX_LENGTH);
             $table->unsignedTinyInteger('type');
             $table->unsignedInteger('nav_type')->nullable();
             $table->unsignedInteger('order')->default(0);
             $table->string('name')->nullable();
+            $table->char('status', 3)->default(PirepStatus::SCHEDULED);
             $table->string('log')->nullable();
             $table->float('lat', 7, 4)->nullable()->default(0.0);
             $table->float('lon', 7, 4)->nullable()->default(0.0);
+            $table->unsignedInteger('distance')->nullable();
             $table->unsignedInteger('heading')->nullable();
             $table->unsignedInteger('altitude')->nullable();
             $table->integer('vs')->nullable();
             $table->unsignedInteger('gs')->nullable();
             $table->unsignedInteger('transponder')->nullable();
             $table->string('autopilot')->nullable();
+            $table->decimal('fuel')->nullable();
             $table->decimal('fuel_flow')->nullable();
             $table->string('sim_time')->nullable();
 

app/Database/migrations/2018_01_03_014930_create_stats_table.php

@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Migrations\Migration;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
 class CreateStatsTable extends Migration
@@ -22,14 +22,10 @@ class CreateStatsTable extends Migration
             $table->primary('id');
             $table->timestamps();
         });
-
-        $this->addCounterGroups([
+        /*$this->addCounterGroups([
             'flights' => 1,
         ]);
 
-        /**
-         * Initial default settings
-         */
         $stats = [
             [
                 'id' => $this->formatSettingId('flights.total_flights'),
@@ -47,7 +43,7 @@ class CreateStatsTable extends Migration
             ],
         ];
 
-        $this->addData('stats', $stats);
+        $this->addData('stats', $stats);*/
     }
 
     /**

app/Database/migrations/2018_01_08_142204_create_news_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
+use App\Interfaces\Migration;
 use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Schema;
 
 class CreateNewsTable extends Migration
 {

app/Database/migrations/2018_01_28_180522_create_awards_table.php

@@ -0,0 +1,53 @@
+<?php
+
+use App\Interfaces\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateAwardsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('awards', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->text('description')->nullable();
+            $table->text('image_url')->nullable();
+
+            // ref fields are expenses tied to some model object
+            // EG, the airports has an internal expense for gate costs
+            $table->string('ref_model')->nullable();
+            $table->text('ref_model_params')->nullable();
+            //$table->string('ref_model_id', 36)->nullable();
+
+            $table->timestamps();
+
+            $table->index(['ref_model']);
+        });
+
+        Schema::create('user_awards', function (Blueprint $table) {
+            $table->increments('id');
+            $table->unsignedInteger('user_id');
+            $table->unsignedInteger('award_id');
+            $table->timestamps();
+
+            $table->index(['user_id', 'award_id']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('awards');
+        Schema::dropIfExists('user_awards');
+    }
+}

app/Database/migrations/2018_02_26_185121_create_expenses_table.php

@@ -0,0 +1,37 @@
+<?php
+
+use App\Interfaces\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateExpensesTable extends Migration
+{
+    public function up()
+    {
+        Schema::create('expenses', function (Blueprint $table) {
+            $table->increments('id');
+            $table->unsignedInteger('airline_id')->nullable();
+
+            $table->string('name');
+            $table->unsignedInteger('amount');
+            $table->char('type');
+            $table->boolean('charge_to_user')->nullable()->default(false);
+            $table->boolean('multiplier')->nullable()->default(0);
+            $table->boolean('active')->nullable()->default(true);
+
+            // ref fields are expenses tied to some model object
+            // EG, the airports has an internal expense for gate costs
+            $table->string('ref_model')->nullable();
+            $table->string('ref_model_id', 36)->nullable();
+
+            $table->timestamps();
+
+            $table->index(['ref_model', 'ref_model_id']);
+        });
+    }
+
+    public function down()
+    {
+        Schema::dropIfExists('expenses');
+    }
+}

app/Database/migrations/2018_02_28_231807_create_journal_transactions_table.php

@@ -0,0 +1,46 @@
+<?php
+
+use App\Interfaces\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateJournalTransactionsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('journal_transactions', function (Blueprint $table) {
+            $table->char('id', 36)->unique();
+            $table->string('transaction_group')->nullable();
+            $table->integer('journal_id');
+            $table->unsignedBigInteger('credit')->nullable();
+            $table->unsignedBigInteger('debit')->nullable();
+            $table->char('currency', 5);
+            $table->text('memo')->nullable();
+            $table->string('tags')->nullable();
+            $table->string('ref_model', 50)->nullable();
+            $table->string('ref_model_id', 36)->nullable();
+            $table->timestamps();
+            $table->date('post_date');
+
+            $table->primary('id');
+            $table->index('journal_id');
+            $table->index('transaction_group');
+            $table->index(['ref_model', 'ref_model_id']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('journal_transactions');
+    }
+}

app/Database/migrations/2018_02_28_231813_create_journals_table.php

@@ -0,0 +1,36 @@
+<?php
+
+use App\Interfaces\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateJournalsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('journals', function (Blueprint $table) {
+            $table->increments('id');
+            $table->unsignedInteger('ledger_id')->nullable();
+            $table->unsignedTinyInteger('type')->default(0);
+            $table->bigInteger('balance')->default(0);
+            $table->string('currency', 5);
+            $table->nullableMorphs('morphed');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('journals');
+    }
+}

app/Database/migrations/2018_02_28_232438_create_ledgers_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use App\Interfaces\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateLedgersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('ledgers', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->enum('type', ['asset', 'liability', 'equity', 'income', 'expense']);
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('ledgers');
+    }
+}

app/Database/migrations/2018_04_01_193443_create_files_table.php

@@ -0,0 +1,42 @@
+<?php
+
+use App\Interfaces\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateFilesTable extends Migration
+{
+    /**
+     * Create the files table. Acts as a morphable
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('files', function (Blueprint $table) {
+            $table->string('id', \App\Interfaces\Model::ID_MAX_LENGTH);
+            $table->string('name');
+            $table->string('description')->nullable();
+            $table->string('disk')->nullable();
+            $table->string('path');
+            $table->boolean('public')->default(true);
+            $table->unsignedInteger('download_count')->default(0);
+            $table->string('ref_model', 50)->nullable();
+            $table->string('ref_model_id', 36)->nullable();
+            $table->timestamps();
+
+            $table->primary('id');
+            $table->index(['ref_model', 'ref_model_id']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('files');
+    }
+}

app/Database/seeds/DatabaseSeeder.php

@@ -1,36 +1,40 @@
 <?php
 
+use App\Services\DatabaseService;
 use Illuminate\Database\Seeder;
 
 class DatabaseSeeder extends Seeder
 {
     /**
      * Map these other environments to a specific seed file
+     *
      * @var array
      */
     public static $seed_mapper = [
-        'local' =>      'dev',
-        'qa' =>         'dev',
-        'staging' =>    'dev',
+        'local'   => 'dev',
+        'qa'      => 'dev',
+        'staging' => 'dev',
     ];
 
     /**
      * Run the database seeds.
+     *
+     * @throws Exception
      */
     public function run()
     {
         $env = App::environment();
-        if(array_key_exists($env, self::$seed_mapper)) {
+        if (array_key_exists($env, self::$seed_mapper)) {
             $env = self::$seed_mapper[$env];
         }
 
         $path = database_path('seeds/'.$env.'.yml');
 
-        if(!file_exists($path)) {
+        if (!file_exists($path)) {
             $path = database_path('seeds/prod.yml');
         }
 
-        $svc = app('App\Services\DatabaseService');
+        $svc = app(DatabaseService::class);
         $svc->seed_from_yaml_file($path);
     }
 }

app/Database/seeds/acars.yml

@@ -0,0 +1,49 @@
+acars:
+  - pirep_id: pirepid_1
+    type: 1
+    nav_type: 2
+    name: TNV
+    lat: 30.28852
+    lon: -96.058239
+    created_at: now
+    updated_at: now
+  - pirep_id: pirepid_1
+    type: 1
+    nav_type: 2
+    name: IAH
+    lat: 29.95691
+    lon: -95.345719
+    created_at: now
+    updated_at: now
+  - pirep_id: pirepid_1
+    type: 1
+    nav_type: 2
+    name: LCH
+    lat: 30.14151
+    lon: -93.105569
+    created_at: now
+    updated_at: now
+  - pirep_id: pirepid_1
+    type: 1
+    nav_type: 2
+    name: MEI
+    lat: 32.37843
+    lon: -88.804267
+    created_at: now
+    updated_at: now
+  - pirep_id: pirepid_1
+    type: 1
+    nav_type: 2
+    name: ATL
+    lat: 33.62907
+    lon: -84.435064
+    created_at: now
+    updated_at: now
+  - pirep_id: pirepid_1
+    type: 1
+    nav_type: 2
+    name: SIE
+    lat: 39.0955
+    lon: -74.800344
+    created_at: now
+    updated_at: now

app/Database/seeds/dev.yml

@@ -10,7 +10,7 @@ airports:
     name: Austin-Bergstrom
     location: Austin, Texas, USA
     country: United States
+    timezone: America/Chicago
     lat: 30.1945278
     lon: -97.6698889
     hub: 1
-    tz: America/Chicago

app/Database/seeds/in_progress.yml

@@ -0,0 +1,723 @@
+acars:
+  - id: aM8QpMPEB15e
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '17.934117958358'
+    lon: '-76.77856721815'
+    heading: '124'
+    altitude: '8.1663703232199'
+    vs: '0'
+    gs: '0.0064996252497234'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: eZ6VJ3xj8vge
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '17.934117498661'
+    lon: '-76.778566516289'
+    heading: '124'
+    altitude: '8.1664622222087'
+    vs: '0'
+    gs: '0'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: bo2QqDLl2lLa
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '17.933884143334'
+    lon: '-76.778210172233'
+    heading: '124'
+    altitude: '8.1707802663933'
+    vs: '0'
+    gs: '14.419195209695'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: aM8QpM4qV2Be
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '17.933705349611'
+    lon: '-76.777936938059'
+    heading: '124'
+    altitude: '8.170089899507'
+    vs: '0'
+    gs: '15.392330039049'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: dR6oxR9qjoOd
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '17.933130691906'
+    lon: '-76.777152737985'
+    heading: '158'
+    altitude: '8.1683570286331'
+    vs: '0'
+    gs: '10.450467475023'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: erkRwJODRvEa
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '17.932580370289'
+    lon: '-76.777450200122'
+    heading: '221'
+    altitude: '8.1695896791822'
+    vs: '0'
+    gs: '12.932334300694'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: b2kv53VMy7Ad
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '17.932012550651'
+    lon: '-76.778009113329'
+    heading: '296'
+    altitude: '8.1683852467213'
+    vs: '0'
+    gs: '10.502719192825'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: eXDoE14JxAve
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '17.932052237309'
+    lon: '-76.778111495187'
+    heading: '290'
+    altitude: '8.1719753739837'
+    vs: '0'
+    gs: '12.643743277153'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: b68R5gZ5YyOe
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '17.932664026837'
+    lon: '-76.779705339967'
+    heading: '293'
+    altitude: '8.2203963962548'
+    vs: '0'
+    gs: '64.870244840054'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: bqxYvGNN5N0a
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '17.934300220408'
+    lon: '-76.783954914814'
+    heading: '293'
+    altitude: '8.3302468103811'
+    vs: '0'
+    gs: '122.78529244208'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: en5rpBKw514d
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '17.935736496556'
+    lon: '-76.78765616448'
+    heading: '293'
+    altitude: '49.554739665916'
+    vs: '21'
+    gs: '146.79677958636'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: erkRwJA29l2a
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '17.976972983585'
+    lon: '-76.896548114872'
+    heading: '297'
+    altitude: '6228.684012199'
+    vs: '62'
+    gs: '281.03976876098'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: dR6oxR3r5nwd
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '18.061360208405'
+    lon: '-77.056156629983'
+    heading: '301'
+    altitude: '12522.331716891'
+    vs: '25'
+    gs: '371.70833265547'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: e1wr82J877Zb
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '18.17373613295'
+    lon: '-77.260347185993'
+    heading: '301'
+    altitude: '16802.15636323'
+    vs: '43'
+    gs: '421.37353688139'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: bqxYvGyExN2a
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '18.193907285814'
+    lon: '-77.29810465405'
+    heading: '297'
+    altitude: '17395.953175647'
+    vs: '40'
+    gs: '425.98105291451'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: aQW0wQDQk5Md
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '18.648921231143'
+    lon: '-78.014696613517'
+    heading: '323'
+    altitude: '37108.124381987'
+    vs: '22'
+    gs: '438.52028383384'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: e9rQ5lk3p63a
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '18.796585259338'
+    lon: '-78.194734005052'
+    heading: '260'
+    altitude: '39718.178225504'
+    vs: '19'
+    gs: '432.41969107334'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: aQW0wQP8vZqd
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '18.660552760063'
+    lon: '-78.407597067994'
+    heading: '242'
+    altitude: '40998.775690971'
+    vs: '-25'
+    gs: '449.51695639627'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: bqxYvGKgp32a
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '18.592775999582'
+    lon: '-78.638711340118'
+    heading: '298'
+    altitude: '41060.297106821'
+    vs: '0'
+    gs: '427.14806185954'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: bqxYvGg2r02a
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '18.718367591656'
+    lon: '-78.840980459275'
+    heading: '284'
+    altitude: '41065.55293844'
+    vs: '1'
+    gs: '424.89060056552'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: e0RV61wPj53b
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '18.77448809677'
+    lon: '-79.082727467209'
+    heading: '283'
+    altitude: '41069.809333539'
+    vs: '0'
+    gs: '425.02780492483'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: dwpmBOo3wWwe
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '18.813031600863'
+    lon: '-79.249543355636'
+    heading: '283'
+    altitude: '41072.545805172'
+    vs: '0'
+    gs: '425.04687332464'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: ejRqlxXoZPle
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '18.840653974635'
+    lon: '-79.370042672541'
+    heading: '283'
+    altitude: '40396.200981621'
+    vs: '-16'
+    gs: '428.08364925851'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: eVOPBYw4q9Xa
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '18.868358744495'
+    lon: '-79.491434926253'
+    heading: '283'
+    altitude: '39399.093383161'
+    vs: '-16'
+    gs: '427.57826037174'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: aOYyrOmVPzEd
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '18.896191929474'
+    lon: '-79.613169477385'
+    heading: '284'
+    altitude: '36491.730092364'
+    vs: '-55'
+    gs: '429.74732238829'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: dL98oLQgyzje
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '18.9242378342'
+    lon: '-79.736368411294'
+    heading: '284'
+    altitude: '32998.644142986'
+    vs: '-61'
+    gs: '434.90864533098'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: e9rQ5lqD2o8a
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '18.952608029755'
+    lon: '-79.861339775352'
+    heading: '284'
+    altitude: '29069.168636089'
+    vs: '-68'
+    gs: '441.90475491564'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: av2oANWY1vma
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '18.981670375928'
+    lon: '-79.987960713131'
+    heading: '283'
+    altitude: '24954.890708875'
+    vs: '-56'
+    gs: '447.81957529674'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: 9aAN4mxlK9zb
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '19.01074931075'
+    lon: '-80.116947122245'
+    heading: '283'
+    altitude: '21483.90439337'
+    vs: '-57'
+    gs: '450.05461228268'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: e1wr82gp8zGb
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '19.039021032617'
+    lon: '-80.242584645189'
+    heading: '283'
+    altitude: '18000.954967422'
+    vs: '-58'
+    gs: '431.5690825604'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: dG65jDL2gK0b
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '19.066116186076'
+    lon: '-80.36338355333'
+    heading: '284'
+    altitude: '14630.153058153'
+    vs: '-55'
+    gs: '414.70845758094'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: epYQ0ENmyvXa
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '19.091238961633'
+    lon: '-80.475901417309'
+    heading: '284'
+    altitude: '11927.379697397'
+    vs: '-17'
+    gs: '381.57664353055'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: erkRwJPrVoEa
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '19.10261633392'
+    lon: '-80.527021151647'
+    heading: '284'
+    altitude: '11424.525210898'
+    vs: '-17'
+    gs: '337.58307680654'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: e1wr82gZXqZb
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '19.112886513796'
+    lon: '-80.57297038027'
+    heading: '284'
+    altitude: '10919.983208888'
+    vs: '-16'
+    gs: '307.28164751381'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: eER95AJ4XLga
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '19.122449020305'
+    lon: '-80.615560002642'
+    heading: '284'
+    altitude: '10418.227268525'
+    vs: '-16'
+    gs: '292.97011599774'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: dPNZvP0O0Gza
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '19.131746364354'
+    lon: '-80.657133675868'
+    heading: '284'
+    altitude: '9921.6695218175'
+    vs: '-16'
+    gs: '293.10586428433'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: aQW0wQYVm2Yd
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '19.141074988147'
+    lon: '-80.698952940579'
+    heading: '284'
+    altitude: '9423.0799985721'
+    vs: '-16'
+    gs: '291.77956791503'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'
+  - id: eXDoE11x32We
+    pirep_id: b68R5gwVzpVe
+    type: '0'
+    nav_type: null
+    order: '0'
+    name: null
+    log: null
+    lat: '19.150291803457'
+    lon: '-80.740363792336'
+    heading: '284'
+    altitude: '8921.7506913567'
+    vs: '-16'
+    gs: '289.03760297791'
+    transponder: null
+    autopilot: null
+    fuel_flow: null
+    sim_time: now
+    created_at: 'now'
+    updated_at: 'now'

app/Database/seeds/prod.yml

@@ -10,7 +10,7 @@ airports:
     name: Austin-Bergstrom
     location: Austin, Texas, USA
     country: United States
+    timezone: America/Chicago
     lat: 30.1945278
     lon: -97.6698889
     hub: 1
-    tz: America/Chicago

app/Database/seeds/sample.yml

@@ -4,6 +4,7 @@ airlines:
     icao: VMS
     iata: VM
     name: phpvms airlines
+    country: us
     active: 1
     created_at: now
     updated_at: now
@@ -24,6 +25,8 @@ users:
     flight_time: 0
     timezone: America/Chicago
     state: 1
+    opt_in: 1
+    toc_accepted: 1
     created_at: now
     updated_at: now
   - id: 2
@@ -40,6 +43,8 @@ users:
     created_at: now
     updated_at: now
     state: 0
+    opt_in: 1
+    toc_accepted: 1
   - id: 3
     name: Raymond Pearson
     email: raymond.pearson56@example.com
@@ -54,6 +59,8 @@ users:
     created_at: now
     updated_at: now
     state: 1
+    opt_in: 0
+    toc_accepted: 1
 
 role_user:
   - user_id: 1
@@ -74,18 +81,34 @@ ranks:
   - id: 2
     name: Junior First Officer
     hours: 10
+    acars_base_pay_rate: 100
+    manual_base_pay_rate: 90
   - id: 3
     name: First Officer
     hours: 15
+    acars_base_pay_rate: 250
+    manual_base_pay_rate: 200
     auto_approve_acars: 1
     auto_approve_manual: 1
   - id: 4
     name: Senior Captain
     hours: 20
+    acars_base_pay_rate: 500
+    manual_base_pay_rate: 400
     auto_approve_acars: 1
     auto_approve_manual: 1
     auto_promote: 0
 
+awards:
+  - id: 1
+    name: Pilot 50 flights
+    description: When a pilot has 50 flights, give this award
+    image_url:
+    ref_model: App\Awards\PilotFlightAwards
+    ref_model_params: 50
+    created_at: now
+    updated_at: now
+
 news:
   - id: 1
     user_id: 1
@@ -110,91 +133,162 @@ airports:
     name: Austin-Bergstrom
     location: Austin, Texas, USA
     country: United States
+    timezone: America/Chicago
     lat: 30.1945278
     lon: -97.6698889
     hub: 1
-    tz: America/Chicago
+    ground_handling_cost: 100
   - id: KJFK
     iata: JFK
     icao: KJFK
     name: John F Kennedy
     location: New York, New York, USA
     country: United States
+    timezone: America/New_York
     lat: 40.6399257
     lon: -73.7786950
     hub: 1
-    tz: America/New_York
-  - id: KBWI
-    iata: BWI
-    icao: KBWI
-    name: Baltimore/Washington International Thurgood Marshall Airport
-    location: Baltimore, MD
+    ground_handling_cost: 250
+  - id: KPAE
+    iata: PAE
+    icao: KPAE
+    name: Snohomish County (Paine Field) Airport
+    location: Everett
     country: United States
-    lat: 39.1754
-    lon: -76.6683
-    tz: America/New_York
-  - id: KIAH
-    iata: IAH
-    icao: KIAH
-    name: George Bush Intercontinental Houston Airport
-    location: Houston, TX
+    timezone: America/Los_Angeles
+    lat: 47.9063
+    lon: -122.282
+    hub: 0
+  - id: KSEA
+    iata: SEA
+    icao: KSEA
+    name: Seattle Tacoma International Airport
+    location: Seattle
     country: United States
-    lat: 29.9844
-    lon: -95.3414
-    tz: America/Chicago
-  - id: KORD
-    iata: ORD
-    icao: KORD
-    name: Chicago O'Hare International Airport
-    location: Chicago, IL
-    country: United States
-    lat: 41.9786
-    lon: -87.9048
-    tz: America/Chicago
-  - id: KDFW
-    iata: DFW
-    icao: KDFW
-    name: Dallas Fort Worth International Airport
-    location: Dallas, TX
-    country: United States
-    lat: 32.8968
-    lon: -97.038
-    tz: America/Chicago
-  - id: EFHK
-    iata: HEL
-    icao: EFHK
-    name: Helsinki Vantaa Airport
-    location: Helsinki
-    country: Finland
-    lat: 60.3172
-    lon: 24.9633
-    tz: Europe/Helsinki
+    timezone: America/Los_Angeles
+    lat: 47.449
+    lon: -122.309
+    hub: 0
   - id: EGLL
     iata: LHR
     icao: EGLL
     name: London Heathrow
     location: London, England
+    timezone: Europe/London
     lat: 51.4775
     lon: -0.4614
-    tz: Europe/London
+    ground_handling_cost: 500
+  - id: MKJP
+    iata: KIN
+    icao: MKJP
+    name: Norman Manley International Airport
+    location: Kingston, Jamaica
+    country:
+    timezone: America/Jamaica
+    lat: 17.9357
+    lon: -76.7875
+    ground_handling_cost: 50
+  - id: MWCR
+    iata: GCM
+    icao: MWCR
+    name: Owen Roberts International Airport
+    location: Georgetown
+    country: Cayman
+    timezone: America/Cayman
+    lat: 19.2928
+    lon: -81.3577
+    ground_handling_cost: 50
+  - id: OMDB
+    iata: DXB
+    icao: OMDB
+    name: Dubai International Airport
+    location: Dubai, UAE
+    country:
+    timezone: Asia/Dubai
+    lat: 25.2528
+    lon: 55.3644
+    ground_handling_cost: 50
 
 #
 aircraft:
   - id: 1
     subfleet_id: 1
-    name: Boeing 747-400
-    registration: NC17
-    tail_number: 17
+    airport_id: KJFK
+    name: Boeing 747-438
+    registration: 001Z
+    status: A
   - id: 2
     subfleet_id: 2
+    airport_id: LGRP
     name: Boeing 777-200
-    registration: NC20
-    tail_number: 20
+    registration: C202
+    status: A
   - id: 3
     subfleet_id: 1
+    airport_id: KAUS
     name: Boeing 747-412
-    registration: NS233
-    tail_number: 1233
+    registration: S2333
+    status: A
+  - id: 4
+    subfleet_id: 1
+    airport_id: KAUS
+    name: Boeing 747-436 RETIRED
+    registration:
+    status: R
+
+expenses:
+  - name: Per-Flight (no muliplier)
+    amount: 100
+    type: F
+    active: 1
+    ref_model: App\Models\Expense
+  - name: Per-Flight (multiplier)
+    amount: 100
+    type: F
+    multiplier: 1
+    active: 1
+    ref_model: App\Models\Expense
+  - name: Per-Flight (multiplier, on airline)
+    airline_id: 1
+    amount: 200
+    type: F
+    multiplier: 1
+    active: 1
+    ref_model: App\Models\Expense
+  - name: A daily fee
+    amount: 800
+    type: D
+    active: 1
+    ref_model: App\Models\Expense
+  - name: A monthly fee
+    amount: 5000
+    type: M
+    active: 1
+    ref_model: App\Models\Expense
+  - name: Catering
+    amount: 1000
+    type: F
+    active: 1
+    ref_model: App\Models\Subfleet
+    ref_model_id: 1
+    created_at: now
+    updated_at: now
+  - name: Catering Staff
+    amount: 1000
+    type: D
+    active: 1
+    ref_model: App\Models\Subfleet
+    ref_model_id: 1
+    created_at: now
+    updated_at: now
+  - name: Maintenance
+    amount: 1000
+    type: D
+    active: 1
+    ref_model: App\Models\Aircraft
+    ref_model_id: 1
+    created_at: now
+    updated_at: now
 
 fares:
   - id: 1
@@ -216,12 +310,22 @@ fares:
 subfleets:
   - id: 1
     airline_id: 1
-    name: 747-400 Winglets
-    type: 744W
+    name: 747-43X RB211-524G
+    type: 744-3X-RB211
+    cost_block_hour: 1000
+    ground_handling_multiplier: 200
   - id: 2
     airline_id: 1
-    name: 777-200 LR
-    type: 772-LR
+    name: 777-222ER GE90-76B
+    type: 772-22ER-GE90-76B
+    cost_block_hour: 500
+    ground_handling_multiplier: 150
+  - id: 3
+    airline_id: 1
+    name: 777-367 ER GE90-115B
+    type: 772-36ER-GE90-115B
+    cost_block_hour: 100
+    ground_handling_multiplier: 150
 
 # add a few mods to aircraft and fares
 subfleet_fare:
@@ -233,11 +337,11 @@ subfleet_fare:
     capacity: 400
   - subfleet_id: 1
     fare_id: 2
-    capacity: 20
+    price: 120%
   - subfleet_id: 1
     fare_id: 3
     price: 1000
-    capacity: 10
+    capacity: 110%
 
   # Fare classes on the 777
   - subfleet_id: 2
@@ -246,10 +350,6 @@ subfleet_fare:
     fare_id: 3
     capacity: 10
 
-subfleet_flight:
-  - subfleet_id: 1
-    flight_id: flightid_1
-
 subfleet_rank:
   - rank_id: 1
     subfleet_id: 1
@@ -265,17 +365,8 @@ flights:
     level: 360
     dpt_time: 6PM CST
     arr_time: 11PM EST
-    created_at: NOW
-    updated_at: NOW
-  - id: flightid_2
-    airline_id: 1
-    flight_number: 6028
-    route_code: A
-    dpt_airport_id: KIAH
-    arr_airport_id: KAUS
-    dpt_time: 9AM CST
-    arr_time: 1030AM CST
-    route: PITZZ4 MNURE WLEEE4
+    flight_time: 240
+    flight_type: J
     created_at: NOW
     updated_at: NOW
   - id: flightid_3
@@ -283,25 +374,59 @@ flights:
     flight_number: 6028
     route_code: A
     route_leg: 1
-    dpt_airport_id: KIAH
-    arr_airport_id: KAUS
+    dpt_airport_id: EGLL
+    arr_airport_id: KJFK
+    flight_time: 480
+    flight_type: J
     dpt_time: 9AM CST
     arr_time: 1030AM CST
     route: PITZZ4 MNURE WLEEE4
     created_at: NOW
     updated_at: NOW
+  - id: flightid_4
+    airline_id: 1
+    flight_number: 99
+    route_code:
+    route_leg:
+    dpt_airport_id: MKJP
+    arr_airport_id: MWCR
+    flight_time: 70
+    flight_type: J
+    dpt_time: 0800
+    arr_time: 0900
+    route: MLY5 KEMBO UG442 SIA UG633 OTEKO UR640 NALRO GUBEL3
+    created_at: NOW
+    updated_at: NOW
 
 flight_fields:
+  - name: Departure Terminal
+    slug: departure-terminal
+  - name: Arrival Terminal
+    slug: arrival-terminal
+
+flight_field_values:
   - id: 1
     flight_id: flightid_1
     name: cost index
+    slug: cost-index
     value: 80
   - id: 2
     flight_id: flightid_2
     name: cost index
+    slug: cost-index
     value: 100
 
-user_bids:
+flight_subfleet:
+  - subfleet_id: 1
+    flight_id: flightid_1
+  - subfleet_id: 1
+    flight_id: flightid_2
+  - subfleet_id: 1
+    flight_id: flightid_3
+  - subfleet_id: 1
+    flight_id: flightid_4
+
+bids:
   - id: 100
     user_id: 1
     flight_id: flightid_1
@@ -309,116 +434,145 @@ user_bids:
     user_id: 1
     flight_id: flightid_3
 
-acars:
-  - pirep_id: pirepid_1
-    type: 1
-    nav_type: 2
-    name: TNV
-    lat: 30.28852
-    lon: -96.058239
-    created_at: now
-    updated_at: now
-  - pirep_id: pirepid_1
-    type: 1
-    nav_type: 2
-    name: IAH
-    lat: 29.95691
-    lon: -95.345719
-    created_at: now
-    updated_at: now
-  - pirep_id: pirepid_1
-    type: 1
-    nav_type: 2
-    name: LCH
-    lat: 30.14151
-    lon: -93.105569
-    created_at: now
-    updated_at: now
-  - pirep_id: pirepid_1
-    type: 1
-    nav_type: 2
-    name: MEI
-    lat: 32.37843
-    lon: -88.804267
-    created_at: now
-    updated_at: now
-  - pirep_id: pirepid_1
-    type: 1
-    nav_type: 2
-    name: ATL
-    lat: 33.62907
-    lon: -84.435064
-    created_at: now
-    updated_at: now
-  - pirep_id: pirepid_1
-    type: 1
-    nav_type: 2
-    name: SIE
-    lat: 39.0955
-    lon: -74.800344
-    created_at: now
-    updated_at: now
-
 pireps:
   - id: pirepid_1
     user_id: 1
     airline_id: 1
-    flight_id: flightid_1
     flight_number: 100
     aircraft_id: 1
     dpt_airport_id: KAUS
     arr_airport_id: KJFK
+    block_off_time: 2018-04-04T12:42:36+00:00
+    block_on_time: 2018-04-04T16:42:36+00:00
     flight_time: 180  # 6 hours
-    state: 1
+    state: 1 # accepted
+    status: 0
+    source: 1
+    flight_type: J
     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
     notes: just a pilot report
-    created_at: NOW
-    updated_at: NOW
+    submitted_at: 2018-04-04T16:50:36+00:00
+    created_at: 2018-04-04T16:50:36+00:00
+    updated_at: 2018-04-04T17:00:36+00:00
   - id: pirepid_2
     user_id: 1
     airline_id: 1
-    flight_id: flightid_2
-    flight_number: 101
-    aircraft_id: 1
+    flight_number: 300
+    aircraft_id: 3
     dpt_airport_id: KJFK
     arr_airport_id: KAUS
     flight_time: 180  # 6 hours
-    state: 1
+    state: 5 # draft
+    source: 0 # manual
+    flight_type: J
     route: PLMMR2 SPA Q22 BEARI FAK PHLBO3
     notes: just a pilot report
+    submitted_at: NOW
     created_at: NOW
     updated_at: NOW
-  - id: pirepid_3
+  - id: b68R5gwVzpVe
+    user_id: '1'
+    airline_id: '1'
+    aircraft_id: '1'
+    flight_number: '13'
+    route_code: null
+    route_leg: null
+    flight_type: J
+    dpt_airport_id: MKJP
+    arr_airport_id: MWCR
+    level: '320'
+    distance: '249.63'
+    planned_distance: '273.09'
+    block_time: null
+    flight_time: '0'
+    planned_flight_time: '0'
+    zfw: null
+    block_fuel: '21500.25390625'
+    fuel_used: null
+    landing_rate: '0'
+    score: '0'
+    route: ''
+    notes: null
+    source: '1'
+    source_name: vmsacars
+    state: 0
+    status: ENR
+    submitted_at: null
+    block_off_time: now
+    block_on_time: null
+    created_at: now
+    updated_at: now
+  - id: pirepid_4
     user_id: 1
     airline_id: 1
-    flight_id: flightid_2
     flight_number: 101
     aircraft_id: 1
     dpt_airport_id: KJFK
     arr_airport_id: KAUS
+    block_off_time: 2018-04-04T12:42:36+00:00
+    block_on_time: 2018-04-04T16:42:36+00:00
     flight_time: 180  # 6 hours
-    state: 1
-    route: PLMMR2 SPA Q22 BEARI FAK PHLBO3
+    state: 0
+    status: 0
+    source: 1
+    flight_type: J
+    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
     notes: just a pilot report
-    created_at: NOW
-    updated_at: NOW
+    submitted_at: 2018-04-04T16:50:36+00:00
+    created_at: 2018-04-04T16:50:36+00:00
+    updated_at: 2018-04-04T17:00:36+00:00
+
+pirep_fares:
+  - id: 1
+    pirep_id: pirepid_1
+    fare_id: 1
+    count: 300
+  - id: 2
+    pirep_id: pirepid_1
+    fare_id: 2
+    count: 25
+  - id: 3
+    pirep_id: pirepid_1
+    fare_id: 3
+    count: 10
+  - id: 4
+    pirep_id: pirepid_2
+    fare_id: 1
+    count: 200
+  - id: 5
+    pirep_id: pirepid_2
+    fare_id: 3
+    count: 15
 
 pirep_fields:
   - id: 1
-    name: departure gate
-    slug: departure_gate
+    name: departure terminal
+    slug: departure-terminal
     required: 1
   - id: 2
-    name: arrival gate
-    slug: arrival_gate
+    name: arrival terminal
+    slug: arrival-terminal
     required: 0
 
 pirep_field_values:
   - id: 1
     pirep_id: pirepid_1
-    name: arrival gate
-    value: B14
-    source: manual
+    name: arrival terminal
+    slug: arrival-terminal
+    value: 10
+    source: 0
+  - id: 2
+    pirep_id: pirepid_1
+    name: departure terminal
+    slug: departure-terminal
+    value: 4
+    source: 0
+  - id: 3
+    pirep_id: pirepid_1
+    name: Landing Rate
+    slug: landing-rate
+    value: -225.3
+    source: 1
 
 pirep_comments:
   - id: 1
@@ -433,3 +587,182 @@ pirep_comments:
     comment: Another comment
     created_at: now
     updated_at: now
+
+journals:
+  -
+    id: 1
+    ledger_id: null
+    type: 0
+    balance: 7870000
+    currency: USD
+    morphed_type: App\Models\Airline
+    morphed_id: 1
+    created_at: '2018-03-06 12:33:45'
+    updated_at: '2018-03-06 12:34:15'
+  -
+    id: 2
+    ledger_id: null
+    type: 1
+    balance: 15000
+    currency: USD
+    morphed_type: App\Models\User
+    morphed_id: 1
+    created_at: '2018-03-06 12:33:45'
+    updated_at: '2018-03-06 12:34:15'
+
+journal_transactions:
+  -
+    id: 2cbb5990-c70c-40a8-8381-05b6402a96b4
+    transaction_group: 'Pilot Pay'
+    journal_id: 2
+    credit: 15000
+    debit: null
+    currency: USD
+    memo: 'Pilot Payment @ 50'
+    tags: "pilot_pay"
+    ref_model: App\Models\Pirep
+    ref_model_id: pirepid_1
+    created_at: '2018-03-06 12:34:15'
+    updated_at: '2018-03-06 12:34:15'
+    post_date: '2018-03-06 12:34:15'
+  -
+    id: 3471fb16-0afd-4815-8b0c-f92771274063
+    transaction_group: 'Expense: Per-Flight (no muliplier)'
+    journal_id: 1
+    credit: null
+    debit: 10000
+    currency: USD
+    memo: 'Expense: Per-Flight (no muliplier)'
+    tags: "expense"
+    ref_model: App\Models\Pirep
+    ref_model_id: pirepid_1
+    created_at: '2018-03-06 12:34:15'
+    updated_at: '2018-03-06 12:34:15'
+    post_date: '2018-03-06 12:34:15'
+  -
+    id: 37f21468-ebad-4850-8557-db310ca45eb4
+    transaction_group: Fares
+    journal_id: 1
+    credit: 6000000
+    debit: 0
+    currency: USD
+    memo: 'Fares Y300; price: 200, cost: 0'
+    tags: "fare"
+    ref_model: App\Models\Pirep
+    ref_model_id: pirepid_1
+    created_at: '2018-03-06 12:34:15'
+    updated_at: '2018-03-06 12:34:15'
+    post_date: '2018-03-06 12:34:15'
+  -
+    id: 3e933972-07ef-4bb2-b1e1-90ef7e8871c6
+    transaction_group: 'Expense: Per-Flight (multiplier, on airline)'
+    journal_id: 1
+    credit: null
+    debit: 20000
+    currency: USD
+    memo: 'Expense: Per-Flight (multiplier, on airline)'
+    tags: "expense"
+    ref_model: App\Models\Pirep
+    ref_model_id: pirepid_1
+    created_at: '2018-03-06 12:34:15'
+    updated_at: '2018-03-06 12:34:15'
+    post_date: '2018-03-06 12:34:15'
+  -
+    id: 522d8032-4ca0-4d6d-b7af-613be4bf281c
+    transaction_group: 'Expense: Per-Flight (multiplier)'
+    journal_id: 1
+    credit: null
+    debit: 10000
+    currency: USD
+    memo: 'Expense: Per-Flight (multiplier)'
+    tags: "expense"
+    ref_model: App\Models\Pirep
+    ref_model_id: pirepid_1
+    created_at: '2018-03-06 12:34:15'
+    updated_at: '2018-03-06 12:34:15'
+    post_date: '2018-03-06 12:34:15'
+  -
+    id: a9bca611-c251-4fde-9f28-206d4debeb01
+    transaction_group: 'Subfleet: Catering (747-43X RB211-524G)'
+    journal_id: 1
+    credit: null
+    debit: 100000
+    currency: USD
+    memo: 'Subfleet Expense: Catering (747-43X RB211-524G)'
+    tags: "subfleet"
+    ref_model: App\Models\Pirep
+    ref_model_id: pirepid_1
+    created_at: '2018-03-06 12:34:15'
+    updated_at: '2018-03-06 12:34:15'
+    post_date: '2018-03-06 12:34:15'
+  -
+    id: c3ff6a6d-03d0-4744-8678-e27329462dcb
+    transaction_group: Fares
+    journal_id: 1
+    credit: 1000000
+    debit: 0
+    currency: USD
+    memo: 'Fares F10; price: 1000, cost: 0'
+    tags: "fare"
+    ref_model: App\Models\Pirep
+    ref_model_id: pirepid_1
+    created_at: '2018-03-06 12:34:15'
+    updated_at: '2018-03-06 12:34:15'
+    post_date: '2018-03-06 12:34:15'
+  -
+    id: c4e05ec1-530f-4897-92e8-787bdec8a0a1
+    transaction_group: 'Pilot Pay'
+    journal_id: 1
+    credit: null
+    debit: 15000
+    currency: USD
+    memo: 'Pilot Payment @ 50'
+    tags: "pilot_pay"
+    ref_model: App\Models\Pirep
+    ref_model_id: pirepid_1
+    created_at: now
+    updated_at: now
+    post_date: now
+  -
+    id: ed516367-eeb9-4a09-bfb7-531ec4be2f93
+    transaction_group: Fares
+    journal_id: 1
+    credit: 1100000
+    debit: 0
+    currency: USD
+    memo: 'Fares B10; price: 1100, cost: 0'
+    tags: "fare"
+    ref_model: App\Models\Pirep
+    ref_model_id: pirepid_1
+    created_at: now
+    updated_at: now
+    post_date: now
+  -
+    id: f3f8585e-894c-4491-b19b-d07b6ad20208
+    transaction_group: 'Ground Handling'
+    journal_id: 1
+    credit: null
+    debit: 75000
+    currency: USD
+    memo: 'Ground Handling'
+    tags: "ground_handling"
+    ref_model: App\Models\Pirep
+    ref_model_id: pirepid_1
+    created_at: now
+    updated_at: now
+    post_date: now
+
+  -
+    id: 1bd1616c-eaa4-4ab9-b5c1-441004ceef14
+    transaction_group: 'Subfleet 744-3X-RB211'
+    journal_id: 1
+    credit: null
+    debit: 300000
+    currency: USD
+    memo: 'Subfleet 744-3X-RB211: Block Time Cost'
+    tags: "subfleet"
+    ref_model: App\Models\Pirep
+    ref_model_id: pirepid_1
+    created_at: now
+    updated_at: now
+    post_date: now

app/Database/seeds/settings.yml

@@ -0,0 +1,189 @@
+- key: general.start_date
+  name: 'Start Date'
+  group: general
+  value: ''
+  options: ''
+  type: date
+  description: 'The date your VA started'
+- key: general.admin_email
+  name: 'Admin Email'
+  group: general
+  value: ''
+  options: ''
+  type: text
+  description: 'Email where notices, etc are sent'
+- key: units.distance
+  name: 'Distance Units'
+  group: units
+  value: nmi
+  options: 'km=kilometers,mi=miles,nmi=nautical miles'
+  type: select
+  description: 'The distance unit for display'
+- key: units.weight
+  name: 'Weight Units'
+  group: units
+  value: lbs
+  options: 'lbs,kg'
+  type: select
+  description: 'The weight unit for display'
+- key: units.speed
+  name: 'Speed Units'
+  group: units
+  value: knot
+  options: 'km/h,knot'
+  type: select
+  description: 'The speed unit for display'
+- key: units.altitude
+  name: 'Altitude Units'
+  group: units
+  value: ft
+  options: 'ft=feet,m=meters'
+  type: select
+  description: 'The altitude unit for display'
+- key: units.fuel
+  name: 'Fuel Units'
+  group: units
+  value: lbs
+  options: 'lbs,kg'
+  type: select
+  description: 'The units for fuel for display'
+- key: units.volume
+  name: 'Volume Units'
+  group: units
+  value: gallons
+  options: 'gallons,l=liters'
+  type: select
+  description: 'The units for fuel for display'
+- key: units.temperature
+  name: 'Temperature Units'
+  group: units
+  value: F
+  options: 'F=Fahrenheit,C=Celsius'
+  type: select
+  description: 'The units for temperature'
+- key: acars.live_time
+  name: 'Live Time'
+  group: acars
+  value: 12
+  options: ''
+  type: int
+  description: 'Age of flights to show on the map in hours. Set to 0 to show only all in-progress flights'
+- key: acars.center_coords
+  name: 'Center Coords'
+  group: acars
+  value: '30.1945,-97.6699'
+  options: ''
+  type: text
+  description: 'Where to center the map; enter as LAT,LON'
+- key: acars.default_zoom
+  name: 'Default Zoom'
+  group: acars
+  value: 5
+  options: ''
+  type: int
+  description: 'Initial zoom level on the map'
+- key: bids.disable_flight_on_bid
+  name: 'Disable flight on bid'
+  group: bids
+  value: true
+  options: ''
+  type: boolean
+  description: 'When a flight is bid on, no one else can bid on it'
+- key: bids.allow_multiple_bids
+  name: 'Allow multiple bids'
+  group: bids
+  value: true
+  options: ''
+  type: boolean
+  description: 'Whether or not someone can bid on multiple flights'
+- key: bids.expire_time
+  name: 'Expire Time'
+  group: bids
+  value: 48
+  options: ''
+  type: int
+  description: 'Number of hours to expire bids after'
+- key: pireps.duplicate_check_time
+  name: 'PIREP duplicate time check'
+  group: pireps
+  value: 10
+  options: ''
+  type: int
+  description: 'The time in minutes to check for a duplicate PIREP'
+- key: pireps.restrict_aircraft_to_rank
+  name: 'Restrict Aircraft to Ranks'
+  group: pireps
+  value: true
+  options: ''
+  type: boolean
+  description: 'Aircraft that can be flown are restricted to a user''s rank'
+- key: pireps.only_aircraft_at_dpt_airport
+  name: 'Restrict Aircraft At Departure'
+  group: pireps
+  value: false
+  options: ''
+  type: boolean
+  description: 'Only allow aircraft that are at the departure airport'
+- key: pireps.remove_bid_on_accept
+  name: 'Remove bid on accept'
+  group: pireps
+  value: false
+  options: ''
+  type: boolean
+  description: 'When a PIREP is accepted, remove the bid, if it exists'
+- key: pilots.id_length
+  name: 'Pilot ID Length'
+  group: pilots
+  value: 4
+  options: ''
+  type: int
+  description: 'The length of a pilot''s ID'
+- key: pilots.auto_accept
+  name: 'Auto Accept New Pilot'
+  group: pilots
+  value: true
+  options: ''
+  type: boolean
+  description: 'Automatically accept a pilot when they register'
+- key: pilots.home_hubs_only
+  name: 'Hubs as home airport'
+  group: pilots
+  value: false
+  options: ''
+  type: boolean
+  description: 'Pilots can only select hubs as their home airport'
+- key: pilots.only_flights_from_current
+  name: 'Flights from Current'
+  group: pilots
+  value: false
+  options: ''
+  type: boolean
+  description: 'Only show/allow flights from their current location'
+- key: pilots.auto_leave_days
+  name: 'Pilot to ON LEAVE days'
+  group: pilots
+  value: 30
+  options: ''
+  type: int
+  description: 'Automatically set a pilot to ON LEAVE status after N days of no activity'
+- key: pilots.hide_inactive
+  name: 'Hide Inactive Pilots'
+  group: pilots
+  value: true
+  options: ''
+  type: boolean
+  description: 'Don''t show inactive pilots in the public view'
+- key: pilots.restrict_to_company
+  name: 'Restrict the flights to company'
+  group: pilots
+  value: false
+  options: ''
+  type: boolean
+  description: 'Restrict flights to the user''s airline'
+- key: pilots.allow_transfer_hours
+  name: 'Allow transfer hours'
+  group: pilots
+  value: true
+  options: ''
+  type: boolean
+  description: 'Allow specifying transfer hours on registration page and displayed on profile page'

app/Events/CronHourly.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Events;
+
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * This event is dispatched when the hourly cron is run
+ */
+class CronHourly
+{
+    use Dispatchable, SerializesModels;
+
+    /**
+     * CronHourly constructor.
+     */
+    public function __construct()
+    {
+    }
+}

app/Events/CronMonthly.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Events;
+
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * This event is dispatched when the monthly cron is run
+ * It happens after all of the default nightly tasks
+ */
+class CronMonthly
+{
+    use Dispatchable, SerializesModels;
+
+    /**
+     * CronMonthly constructor.
+     */
+    public function __construct()
+    {
+    }
+}

app/Events/CronNightly.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Events;
+
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * This event is dispatched when the daily cron is run
+ * It happens after all of the default nightly tasks
+ */
+class CronNightly
+{
+    use Dispatchable, SerializesModels;
+
+    /**
+     * CronNightly constructor.
+     */
+    public function __construct()
+    {
+    }
+}

app/Events/CronWeekly.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Events;
+
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * This event is dispatched when the weekly cron is run
+ * It happens after all of the default nightly tasks
+ */
+class CronWeekly
+{
+    use Dispatchable, SerializesModels;
+
+    /**
+     * CronWeekly constructor.
+     */
+    public function __construct()
+    {
+    }
+}

app/Events/Expenses.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Events;
+
+use App\Models\Pirep;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * This event is dispatched when the expenses for a flight report
+ * are collected. Your listeners should return a list of Expense
+ * models. Don't call save on the model!
+ *
+ * Example return:
+ *
+ * [
+ *   new Expense([
+ *      'airline_id':   '',    # < optional field
+ *      'name':         '',
+ *      'amount':       [DECIMAL],
+ *      'type':         int from ExpenseType enum class
+ *   ]),
+ * ]
+ *
+ * The event caller will check the 'type' to make sure that it
+ * will filter out expenses that only apply to the current process
+ *
+ * The event will have a copy of the PIREP model, if it's applicable
+ */
+class Expenses
+{
+    use Dispatchable, SerializesModels;
+    public $pirep;
+
+    /**
+     * @param Pirep|null $pirep
+     */
+    public function __construct(Pirep $pirep = null)
+    {
+        $this->pirep = $pirep;
+    }
+}