Build new assets

7.0.0-beta.4

.dockerignore

@@ -0,0 +1 @@
+vendor

.github/ISSUE_TEMPLATE/bug_report.md

@@ -8,7 +8,7 @@ assignees: ''
 ---
 
 **Describe the bug**
-A clear and concise description of what the bug is.
+A clear and concise description of what the bug is. Please upload the Laravel logs as well from `storage/logs/laravel.log` (or the file with the correct date)
 
 **Version**
 Please enter the version

.gitignore

@@ -29,6 +29,9 @@ env.php
 #Homestead.yaml
 Homestead.json
 LocalValetDriver.php
+docker-compose-profiler.yml
+sync.sh
+.env.*
 
 # Rocketeer PHP task runner and deployment package. https://github.com/rocketeers/rocketeer
 .rocketeer/

.travis.yml

@@ -4,14 +4,13 @@
 
 language: php
 php:
-  - '7.2'
+  - '7.4'
   - '7.3'
+  - '7.2'
 
-matrix:
-  include:
-    - php: '7.2'
-    - php: '7.3'
-  fast_finish: true
+#env:
+#  - DB=mysql
+#  - DB=mariadb
 
 cache:
   # Cache lives for 10 min
@@ -24,8 +23,14 @@ cache:
 services:
 - mysql
 
+#addons:
+#  mariadb: '10.2'
+
 install:
+  - php --version
+  - mysql --version
   - composer install --dev --no-interaction --verbose
+  - npm i tar-to-zip -g
   - cp .travis/env.travis.php env.php
   - cp .travis/phpunit.travis.xml phpunit.xml
 
@@ -40,8 +45,83 @@ script:
 after_failure:
   - cat storage/logs/*.log
 
+# Refer to: https://github.com/doctrine/dbal/blob/master/.travis.yml#L39
 jobs:
   include:
+    # Different test stages
+#    - stage: Test
+#      name: PHP 7.2 + MySQL 5.7
+#      php: 7.2
+#      env: DB=mysql
+#      services:
+#        - mysql
+#    - stage: Test
+#      name: PHP 7.3 + MySQL 5.7
+#      php: 7.3
+#      env: DB=mysql
+#      services:
+#        - mysql
+#    - stage: Test
+#      name: PHP 7.4 + MySQL 5.7
+#      php: 7.4
+#      env: DB=mysql
+#      services:
+#        - mysql
+#    - stage: Test
+#      name: PHP 7.2 + MariaDB 10.1
+#      php: 7.2
+#      env: DB=mariadb
+#      addons:
+#        mariadb: '10.1'
+#    - stage: Test
+#      name: PHP 7.3 + MariaDB 10.1
+#      php: 7.3
+#      env: DB=mariadb
+#      addons:
+#        mariadb: '10.1'
+#    - stage: Test
+#      name: PHP 7.4 + MariaDB 10.1
+#      php: 7.4
+#      env: DB=mariadb MARIADB_VERSION=10.1
+#      addons:
+#        mariadb: '10.1'
+#    - stage: Test
+#      name: PHP 7.2 + MariaDB 10.2
+#      php: 7.2
+#      env: DB=mariadb
+#      addons:
+#        mariadb: '10.2'
+#    - stage: Test
+#      name: PHP 7.3 + MariaDB 10.3
+#      php: 7.3
+#      env: DB=mariadb
+#      addons:
+#        mariadb: '10.2'
+#    - stage: Test
+#      name: PHP 7.4 + MariaDB 10.2
+#      php: 7.4
+#      env: DB=mariadb
+#      addons:
+#        mariadb: '10.2'
+#    - stage: Test
+#      name: PHP 7.2 + MariaDB 10.3
+#      php: 7.2
+#      env: DB=mariadb
+#      addons:
+#        mariadb: '10.3'
+#    - stage: Test
+#      name: PHP 7.3 + MariaDB 10.3
+#      php: 7.3
+#      env: DB=mariadb
+#      addons:
+#        mariadb: '10.3'
+#    - stage: Test
+#      name: PHP 7.4 + MariaDB 10.3
+#      php: 7.4
+#      env: DB=mariadb
+#      addons:
+#        mariadb: '10.3'
+
     # Just packages up a release
     - stage: package
       script: skip
@@ -57,7 +137,7 @@ jobs:
           on:
             all_branches: true
             repo: nabeelio/phpvms
-            php: '7.2'
+            php: '7.4'
             tags: false
 
     # RELEASE STAGE
@@ -78,4 +158,4 @@ jobs:
         on:
           tags: true
           repo: nabeelio/phpvms
-          php: '7.2'
+          php: '7.4'

.travis/deploy_script.sh

@@ -1,140 +1,150 @@
 #!/usr/bin/env bash
 
-if [ "$TRAVIS" = "true" ]; then
-
-    cd $TRAVIS_BUILD_DIR
-
-    if test "$TRAVIS_TAG"; then
-        PKG_NAME=$TRAVIS_TAG
-    else
-        echo "On branch $TRAVIS_BRANCH"
-
-        if [ "$TRAVIS_BRANCH" != "master" ] && [ "$TRAVIS_BRANCH" != "dev" ]; then
-            echo "Not on valid branch, exiting"
-            exit 0;
-        fi;
-
-        BASE_VERSION=$(php artisan phpvms:version --base-only)
-        PKG_NAME=${BASE_VERSION}-${TRAVIS_BRANCH}
-    fi
-
-    FILE_NAME="phpvms-$PKG_NAME"
-    TAR_NAME="$FILE_NAME.tar.gz"
-    echo "Writing $TAR_NAME"
-
-    php artisan phpvms:version --write > VERSION
-    VERSION=$(cat VERSION)
-    echo "Version: $VERSION"
-
-    echo "Cleaning files"
-
-    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
-        .github
-        .sass-cache
-        .idea
-        .travis
-        docker
-        tests
-        _ide_helper.php
-        .dpl
-        .editorconfig
-        .eslintignore
-        .eslintrc
-        .php_cs
-        .php_cs.cache
-        .phpstorm.meta.php
-        .styleci.yml
-        .phpunit.result.cache
-        env.php
-        intellij_style.xml
-        config.php
-        docker-compose.yml
-        Makefile
-        phpcs.xml
-        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
-
-    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 -maxdepth 1 -not -name '.gitignore' -not -name public -not -name import -print0 -exec rm -rf {} +
-    find storage/app/public -mindepth 1 -maxdepth 1 -not -name '.gitignore' -not -name avatars -not -name uploads -print0 -exec rm -rf {} +
-    find storage/app/public/avatars -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
-    find storage/app/public/uploads -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
-    find storage/debugbar -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
-    find storage/docker -mindepth 1 -not -name '.gitignore' -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 {} +
-
-    mkdir -p storage/app/public/avatars
-    mkdir -p storage/app/public/uploads
-    mkdir -p storage/framework/cache
-    mkdir -p storage/framework/sessions
-    mkdir -p storage/framework/views
-
-    # Regenerate the autoloader and classes
-    composer dump-autoload
-    make clean
-
-    echo "Creating Tarball"
-    cd /tmp
-    tar -czf $TAR_NAME -C $TRAVIS_BUILD_DIR/../ phpvms
-    sha256sum $TAR_NAME > "$TAR_NAME.sha256"
-
-    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
+if [ "$TRAVIS" != "true" ]; then
+  exit 0
 fi
+
+cd $TRAVIS_BUILD_DIR
+
+if test "$TRAVIS_TAG"; then
+  VERSION=$TRAVIS_TAG
+
+  # Pass in the tag as the version to write out
+  php artisan phpvms:version --write --write-full-version "${VERSION}"
+  FULL_VERSION=$(php artisan phpvms:version)
+else
+  echo "On branch $TRAVIS_BRANCH"
+
+  if [ "$TRAVIS_BRANCH" != "master" ] && [ "$TRAVIS_BRANCH" != "dev" ]; then
+    echo "Not on valid branch, exiting"
+    exit 0
+  fi
+
+  # Write the version out but place the branch ID in there
+  # This is only for the dev branch
+  BASE_VERSION=$(php artisan phpvms:version --base-only)
+
+  # This now includes the pre-release version, so "-dev" by default
+  VERSION=${BASE_VERSION}
+
+  # Don't pass in a version here, just write out the latest hash
+  php artisan phpvms:version --write "${VERSION}"
+  FULL_VERSION=$(php artisan phpvms:version)
+fi
+
+FILE_NAME="phpvms-${VERSION}"
+TAR_NAME="$FILE_NAME.tar.gz"
+ZIP_NAME="$FILE_NAME.zip"
+
+echo "Version: ${VERSION}"
+echo "Full Version: ${FULL_VERSION}"
+echo "Package name: ${TAR_NAME}"
+
+echo "==========================="
+
+echo "Cleaning files"
+
+rm -rf vendor
+composer install --no-dev --prefer-dist --no-interaction --verbose
+
+# Leftover individual files to delete
+declare -a remove_files=(
+  .git
+  .github
+  .sass-cache
+  .idea
+  .travis
+  docker
+  _ide_helper.php
+  .dockerignore
+  .dpl
+  .editorconfig
+  .eslintignore
+  .eslintrc
+  .php_cs
+  .php_cs.cache
+  .phpstorm.meta.php
+  .styleci.yml
+  .phpunit.result.cache
+  env.php
+  intellij_style.xml
+  config.php
+  docker-compose.yml
+  Makefile
+  phpcs.xml
+  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
+
+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 bootstrap/cache -mindepth 1 -maxdepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
+find storage/app -mindepth 1 -maxdepth 1 -not -name '.gitignore' -not -name public -not -name import -print0 -exec rm -rf {} +
+find storage/app/public -mindepth 1 -maxdepth 1 -not -name '.gitignore' -not -name avatars -not -name uploads -print0 -exec rm -rf {} +
+find storage/app/public/avatars -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
+find storage/app/public/uploads -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
+find storage/debugbar -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
+find storage/docker -mindepth 1 -not -name '.gitignore' -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 {} +
+
+mkdir -p storage/app/public/avatars
+mkdir -p storage/app/public/uploads
+mkdir -p storage/framework/cache
+mkdir -p storage/framework/sessions
+mkdir -p storage/framework/views
+
+# Regenerate the autoloader and classes
+composer dump-autoload
+make clean
+
+cd /tmp
+ls -al $TRAVIS_BUILD_DIR/../
+
+tar -czf $TAR_NAME -C $TRAVIS_BUILD_DIR .
+sha256sum $TAR_NAME >"$TAR_NAME.sha256"
+tar2zip $TAR_NAME
+sha256sum $ZIP_NAME >"$ZIP_NAME.sha256"
+
+ls -al /tmp
+
+echo "Uploading to S3"
+mkdir -p $TRAVIS_BUILD_DIR/build
+cd $TRAVIS_BUILD_DIR/build
+
+mv "/tmp/$TAR_NAME" "/tmp/$ZIP_NAME" "/tmp/$TAR_NAME.sha256" "/tmp/$ZIP_NAME.sha256" .
+artifacts upload --target-paths "/" $ZIP_NAME $TAR_NAME $TRAVIS_BUILD_DIR/VERSION $TAR_NAME.sha256 $ZIP_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
+
+#if [ "$TRAVIS_BRANCH" != "master" ] && [ "$TRAVIS_BRANCH" != "dev" ]; then
+#  echo "Skipping Discord branch update broadcast"
+#else
+  curl -X POST \
+       --data "{\"content\": \"A new build is available at http://downloads.phpvms.net/$TAR_NAME (${FULL_VERSION})\"}" \
+       -H "Content-Type: application/json" \
+       $DISCORD_WEBHOOK_URL
+#fi

CHANGELOG.md

@@ -1,9 +1,706 @@
-## Beta 2 (7.0.0-beta.2)
+# Changelog
 
-- Switching to semver
-- PHP 7.2 minimum
-- Lots of fixes, view the [Github Milestone](https://github.com/nabeelio/phpvms/milestone/2?closed=1) for details
+## [7.0.0-beta.4](https://github.com/nabeelio/phpvms/tree/7.0.0-beta.4) (2020-05-09)
 
-## Beta 1 (v7.0.0-beta)
+[Full Changelog](https://github.com/nabeelio/phpvms/compare/7.0.0-beta.3...7.0.0-beta.4)
 
-- Initial Release
+**Implemented enhancements:**
+
+- Move currency selection to admin settings [\#671](https://github.com/nabeelio/phpvms/issues/671)
+- Center live map to custom location [\#661](https://github.com/nabeelio/phpvms/issues/661)
+- Pilot Names -  Pilots ID [\#656](https://github.com/nabeelio/phpvms/issues/656)
+- Simbrief sample data [\#651](https://github.com/nabeelio/phpvms/issues/651)
+- Simbrief only available for bids [\#642](https://github.com/nabeelio/phpvms/issues/642)
+- PIREP prefile download [\#634](https://github.com/nabeelio/phpvms/issues/634)
+- Importer - group imported aircraft by type [\#628](https://github.com/nabeelio/phpvms/issues/628)
+- API: When looking up flight, return the load factor [\#611](https://github.com/nabeelio/phpvms/issues/611)
+- API: On prefile, return required fields [\#610](https://github.com/nabeelio/phpvms/issues/610)
+- Center on active flights [\#605](https://github.com/nabeelio/phpvms/issues/605)
+- Profiling/performance improvments [\#602](https://github.com/nabeelio/phpvms/issues/602)
+- Aircraft stats resync [\#585](https://github.com/nabeelio/phpvms/issues/585)
+- Cron Job [\#553](https://github.com/nabeelio/phpvms/issues/553)
+- Importing a CSV with additional airports clears all previous airports [\#490](https://github.com/nabeelio/phpvms/issues/490)
+- Use continuation token instead of page/offset [\#469](https://github.com/nabeelio/phpvms/issues/469)
+- Combine the Util classes in Facade and Support [\#467](https://github.com/nabeelio/phpvms/issues/467)
+- ACARS/Live flight events [\#436](https://github.com/nabeelio/phpvms/issues/436)
+- Allow logo upload for airline [\#417](https://github.com/nabeelio/phpvms/issues/417)
+- Google Analytics Settings [\#382](https://github.com/nabeelio/phpvms/issues/382)
+- Let update only be run if logged in/admin [\#372](https://github.com/nabeelio/phpvms/issues/372)
+- Airport Lookup - possible additions [\#364](https://github.com/nabeelio/phpvms/issues/364)
+- Set flight type for expenses for flight [\#348](https://github.com/nabeelio/phpvms/issues/348)
+- Extend search schedule options [\#297](https://github.com/nabeelio/phpvms/issues/297)
+- Change currency from settings \#671 [\#672](https://github.com/nabeelio/phpvms/pull/672)
+- Add privatized version of name \#656 [\#658](https://github.com/nabeelio/phpvms/pull/658)
+- Add Simbrief entries as sample data for load \#651 [\#652](https://github.com/nabeelio/phpvms/pull/652)
+- Option for SB only on bids; add the new file type \#642 [\#643](https://github.com/nabeelio/phpvms/pull/643)
+- Account ICAO for subfleet, airline/location if columns exist \#628 [\#632](https://github.com/nabeelio/phpvms/pull/632)
+- Performance improvements \#602 [\#607](https://github.com/nabeelio/phpvms/pull/607)
+- Center on active flights \#605 [\#606](https://github.com/nabeelio/phpvms/pull/606)
+- Installer fixes, remove bcmath, fix design [\#596](https://github.com/nabeelio/phpvms/pull/596)
+- Remove airport length restrictions \#590 [\#592](https://github.com/nabeelio/phpvms/pull/592)
+- Remove 4 char restriction from ICAO; use decimal type for lat/lon \#590 [\#591](https://github.com/nabeelio/phpvms/pull/591)
+- Recalcuate aircraft stats in nightly cron and importer \#585 \#443 [\#587](https://github.com/nabeelio/phpvms/pull/587)
+- \(Importer\) Set the pay rate for the ranks \#443 [\#586](https://github.com/nabeelio/phpvms/pull/586)
+- Fix rowmapper generator, check for fields, map users \#443 [\#583](https://github.com/nabeelio/phpvms/pull/583)
+- Add bcmath to the required extensions list \#558 [\#564](https://github.com/nabeelio/phpvms/pull/564)
+- Add the argc\_argv flag for the cgi exec \#553 [\#556](https://github.com/nabeelio/phpvms/pull/556)
+- Add logo to the flights page if its set \#417 [\#550](https://github.com/nabeelio/phpvms/pull/550)
+- Add additional events for PIREP states \#436 [\#548](https://github.com/nabeelio/phpvms/pull/548)
+- Cleanup Utils \#467 [\#547](https://github.com/nabeelio/phpvms/pull/547)
+- Add checkbox to clear previous data when importing \#490 [\#546](https://github.com/nabeelio/phpvms/pull/546)
+- Distro zip file from tar file \#449 [\#543](https://github.com/nabeelio/phpvms/pull/543)
+- Spanish files translation [\#542](https://github.com/nabeelio/phpvms/pull/542)
+- Add link to download ACARS config from profile [\#539](https://github.com/nabeelio/phpvms/pull/539)
+- Format all blade templates to 2 spaces \#530 [\#531](https://github.com/nabeelio/phpvms/pull/531)
+- Add menu bar for mobile [\#529](https://github.com/nabeelio/phpvms/pull/529)
+- Fix live and route map errors \#527 [\#528](https://github.com/nabeelio/phpvms/pull/528)
+- Set PIREPs page to public [\#526](https://github.com/nabeelio/phpvms/pull/526)
+- Try to clear caches before updating [\#522](https://github.com/nabeelio/phpvms/pull/522)
+- Reduce number of queries for update check [\#520](https://github.com/nabeelio/phpvms/pull/520)
+- Add getRootDomain\(\) to Utils [\#514](https://github.com/nabeelio/phpvms/pull/514)
+- Search flights by subfleet \#484 [\#506](https://github.com/nabeelio/phpvms/pull/506)
+- Add base Dockerfile for Dockerhub upload [\#504](https://github.com/nabeelio/phpvms/pull/504)
+- Add reference to docs on doc site [\#502](https://github.com/nabeelio/phpvms/pull/502)
+- Add new command to export a specific PIREP for debugging [\#501](https://github.com/nabeelio/phpvms/pull/501)
+- Flight search for departure/arrival airports not using column names [\#496](https://github.com/nabeelio/phpvms/pull/496)
+- Split the importer module out from the installer module [\#468](https://github.com/nabeelio/phpvms/pull/468)
+
+**Fixed bugs:**
+
+- Aircraft hours not counting [\#683](https://github.com/nabeelio/phpvms/issues/683)
+- Error creating first user/airline [\#677](https://github.com/nabeelio/phpvms/issues/677)
+- submitting PIREP: Page Not Found [\#676](https://github.com/nabeelio/phpvms/issues/676)
+- Filing manual report causes SimBrief Error [\#668](https://github.com/nabeelio/phpvms/issues/668)
+- Error on finance page in admin [\#667](https://github.com/nabeelio/phpvms/issues/667)
+- API: User bids aren't loading SimBrief data for flight [\#664](https://github.com/nabeelio/phpvms/issues/664)
+- .: Links to pilot profiles :. [\#655](https://github.com/nabeelio/phpvms/issues/655)
+- Some domains \(ex, .co.uk\) not properly parsed [\#647](https://github.com/nabeelio/phpvms/issues/647)
+- API: Load bids through the bids.flight fields, not the flights field on the user [\#639](https://github.com/nabeelio/phpvms/issues/639)
+- Login page not using theme [\#638](https://github.com/nabeelio/phpvms/issues/638)
+- CSV import error says "csv not found" [\#636](https://github.com/nabeelio/phpvms/issues/636)
+- Importer - schedules not importing properly [\#630](https://github.com/nabeelio/phpvms/issues/630)
+- Disable using of php opcache [\#625](https://github.com/nabeelio/phpvms/issues/625)
+- API: Flight fields are an array when empty [\#618](https://github.com/nabeelio/phpvms/issues/618)
+- "Pending Pireps" in admin is blank [\#616](https://github.com/nabeelio/phpvms/issues/616)
+- Flight fields show all fields, not custom added ones [\#614](https://github.com/nabeelio/phpvms/issues/614)
+- Mixed content causes error [\#612](https://github.com/nabeelio/phpvms/issues/612)
+- Fares not appearing in API response for user/subfleets [\#608](https://github.com/nabeelio/phpvms/issues/608)
+- Not selecting active for aircraft shows nullable error [\#603](https://github.com/nabeelio/phpvms/issues/603)
+- Airports page repeats airport name \(infinite loop\) [\#599](https://github.com/nabeelio/phpvms/issues/599)
+- Calculate Distance button not working  [\#595](https://github.com/nabeelio/phpvms/issues/595)
+- Support Seaports with 3 letter IATA/ID codes [\#590](https://github.com/nabeelio/phpvms/issues/590)
+- Hubs only show for registration [\#580](https://github.com/nabeelio/phpvms/issues/580)
+- Error when updating user in admin [\#576](https://github.com/nabeelio/phpvms/issues/576)
+- Updater not working because Source repository \[github\] is not defined [\#575](https://github.com/nabeelio/phpvms/issues/575)
+- Flights Page Search Subfleet Column [\#574](https://github.com/nabeelio/phpvms/issues/574)
+- Duplicate key entry for ACARS data [\#572](https://github.com/nabeelio/phpvms/issues/572)
+- No hint path defined for updater [\#570](https://github.com/nabeelio/phpvms/issues/570)
+- My Bids Page Error [\#561](https://github.com/nabeelio/phpvms/issues/561)
+- I can't change Current Theme [\#554](https://github.com/nabeelio/phpvms/issues/554)
+- Pilots cannot use the dashboard or flights without admin rights [\#480](https://github.com/nabeelio/phpvms/issues/480)
+- Database prefix not being applied [\#442](https://github.com/nabeelio/phpvms/issues/442)
+- Install not working [\#411](https://github.com/nabeelio/phpvms/issues/411)
+- typo in dependency on 'leaflet.geodesic' [\#687](https://github.com/nabeelio/phpvms/pull/687)
+- Emails/notifications not sending \#675 [\#686](https://github.com/nabeelio/phpvms/pull/686)
+- Aircraft hours not showing/incrementing \#683 [\#684](https://github.com/nabeelio/phpvms/pull/684)
+- METAR: KM as unit in visibility \#680 [\#682](https://github.com/nabeelio/phpvms/pull/682)
+- Blank/null IATA code isn't unique when added \#679 [\#681](https://github.com/nabeelio/phpvms/pull/681)
+- Fix airline creation in installer \#677 [\#678](https://github.com/nabeelio/phpvms/pull/678)
+- Journal not created when airline is created \#667 [\#670](https://github.com/nabeelio/phpvms/pull/670)
+- Check for SB being avail before filing \#668 [\#669](https://github.com/nabeelio/phpvms/pull/669)
+- Load Simbrief and flight data when getting bids \#664 [\#665](https://github.com/nabeelio/phpvms/pull/665)
+- Fix pilots page not showing up \#655 [\#660](https://github.com/nabeelio/phpvms/pull/660)
+- Fix PirepComment response; 201 to 200 [\#654](https://github.com/nabeelio/phpvms/pull/654)
+- Domain detection failing for .co.uk, etc \#647 [\#648](https://github.com/nabeelio/phpvms/pull/648)
+- Auth routes not using themes \#638 [\#645](https://github.com/nabeelio/phpvms/pull/645)
+- Don't return bids by default, fix user flight column \#639 [\#640](https://github.com/nabeelio/phpvms/pull/640)
+- Account for admin role, don't error out on null rows \#632 [\#637](https://github.com/nabeelio/phpvms/pull/637)
+- Fix airline mapping for aircraft \#628 [\#633](https://github.com/nabeelio/phpvms/pull/633)
+- Increase ID column size; seed ID generator with uniqid\(\) \#630 [\#631](https://github.com/nabeelio/phpvms/pull/631)
+- Disable using apc/opcache by default if found \#625 [\#629](https://github.com/nabeelio/phpvms/pull/629)
+- Fix saving of fare \#621 [\#624](https://github.com/nabeelio/phpvms/pull/624)
+- API: Flight fields are an array when empty \#618 [\#619](https://github.com/nabeelio/phpvms/pull/619)
+- Remove the flight fields link from admin \#614 [\#615](https://github.com/nabeelio/phpvms/pull/615)
+- HTTP/HTTPS mixed content errors \#612 [\#613](https://github.com/nabeelio/phpvms/pull/613)
+- Fare information not included in subfleet response \#608 [\#609](https://github.com/nabeelio/phpvms/pull/609)
+- Aircraft status field blank causes error \#603 [\#604](https://github.com/nabeelio/phpvms/pull/604)
+- METAR parsing infinite loop bugfix \#599 [\#600](https://github.com/nabeelio/phpvms/pull/600)
+- Table prefixes not being added to indexes [\#597](https://github.com/nabeelio/phpvms/pull/597)
+- Import expense and ledger entries \#443 [\#588](https://github.com/nabeelio/phpvms/pull/588)
+- User country mapping; ignore unused groups \#443  [\#584](https://github.com/nabeelio/phpvms/pull/584)
+- Change fuel used to optional \#512 [\#582](https://github.com/nabeelio/phpvms/pull/582)
+- Respect home hubs setting for registration \#580 [\#581](https://github.com/nabeelio/phpvms/pull/581)
+- Upstream null version; build version tags not being saved properly \#575 [\#578](https://github.com/nabeelio/phpvms/pull/578)
+- Fix edit pilot error \(Facade\Utils missing\) \#576 [\#577](https://github.com/nabeelio/phpvms/pull/577)
+- Upsert on ACARS positions \#572 [\#573](https://github.com/nabeelio/phpvms/pull/573)
+- Fix the namespace path on updater templates \#570 [\#571](https://github.com/nabeelio/phpvms/pull/571)
+- Route not found error for Pirep::resource\(\) call \#559 [\#565](https://github.com/nabeelio/phpvms/pull/565)
+- Add extra check for $acars being set \#560 [\#563](https://github.com/nabeelio/phpvms/pull/563)
+- Missing $subfleet error on bids page \#561 [\#562](https://github.com/nabeelio/phpvms/pull/562)
+- Refresh theme cache on settings page load \#554 [\#557](https://github.com/nabeelio/phpvms/pull/557)
+- Fix migrations when table prefix is involved \#442 [\#555](https://github.com/nabeelio/phpvms/pull/555)
+- Use optional\(\) around the airport fields [\#537](https://github.com/nabeelio/phpvms/pull/537)
+- PIREPS resource except for show [\#536](https://github.com/nabeelio/phpvms/pull/536)
+- Fix import during flight cron \#532 [\#535](https://github.com/nabeelio/phpvms/pull/535)
+- Fix PIREP edit endpoint [\#534](https://github.com/nabeelio/phpvms/pull/534)
+- Add a public\_url\(\) helper \#513 [\#519](https://github.com/nabeelio/phpvms/pull/519)
+- Correct text for no subfleets \#507 [\#518](https://github.com/nabeelio/phpvms/pull/518)
+- Error page not showing when database isn't configured [\#517](https://github.com/nabeelio/phpvms/pull/517)
+- Check user permissions on the routes \#508 [\#516](https://github.com/nabeelio/phpvms/pull/516)
+- Show admin dropdown for admin-access ability [\#515](https://github.com/nabeelio/phpvms/pull/515)
+- New subfleet not being attached to an airline on import \#479 [\#505](https://github.com/nabeelio/phpvms/pull/505)
+- Importing not updating existing items \#486 [\#503](https://github.com/nabeelio/phpvms/pull/503)
+- Set a default model value for airports on PIREP [\#500](https://github.com/nabeelio/phpvms/pull/500)
+- Fix GeoService errors when viewing PIREP \#498 [\#499](https://github.com/nabeelio/phpvms/pull/499)
+- Properly set the distance/planned\_distance [\#497](https://github.com/nabeelio/phpvms/pull/497)
+- 491 Installation Error [\#495](https://github.com/nabeelio/phpvms/pull/495)
+- Return the flight fares if there are no subfleet fares \#488 [\#489](https://github.com/nabeelio/phpvms/pull/489)
+- Error if there are no roles when editing a user \#480 [\#483](https://github.com/nabeelio/phpvms/pull/483)
+- Allow nullable field and calculate distance if nulled [\#482](https://github.com/nabeelio/phpvms/pull/482)
+- Pilots cannot use the dashboard or flights without admin rights [\#481](https://github.com/nabeelio/phpvms/pull/481)
+- Fix BindingResolutionError when debug toolbar isn't present [\#465](https://github.com/nabeelio/phpvms/pull/465)
+- Fix CSV imports giving Storage class not found \#454 [\#462](https://github.com/nabeelio/phpvms/pull/462)
+- Use PhpExecutableFinder\(\) closes \#457 \#458 [\#460](https://github.com/nabeelio/phpvms/pull/460)
+- Avoid proc\_open use \#455 [\#456](https://github.com/nabeelio/phpvms/pull/456)
+- Stricter checks on ACARS API data [\#451](https://github.com/nabeelio/phpvms/pull/451)
+- Remove bootstrap cache [\#448](https://github.com/nabeelio/phpvms/pull/448)
+
+**Closed issues:**
+
+- Dashboard error when METAR visibility in KM [\#680](https://github.com/nabeelio/phpvms/issues/680)
+- Error adding multiple airlines without IATA codes [\#679](https://github.com/nabeelio/phpvms/issues/679)
+- Pages [\#641](https://github.com/nabeelio/phpvms/issues/641)
+- Create a "fare type" for cargo [\#621](https://github.com/nabeelio/phpvms/issues/621)
+- Split Sample module out into separate repo [\#593](https://github.com/nabeelio/phpvms/issues/593)
+- No way to add files to fleet [\#567](https://github.com/nabeelio/phpvms/issues/567)
+- Map Center Coords [\#566](https://github.com/nabeelio/phpvms/issues/566)
+- Pilot Profile Page Error [\#560](https://github.com/nabeelio/phpvms/issues/560)
+- File New Pirep [\#559](https://github.com/nabeelio/phpvms/issues/559)
+- I can't add new flight [\#558](https://github.com/nabeelio/phpvms/issues/558)
+- Pilot Pay route modifier [\#487](https://github.com/nabeelio/phpvms/issues/487)
+- Auto-update [\#449](https://github.com/nabeelio/phpvms/issues/449)
+- Setting to not automatically calculate distances [\#446](https://github.com/nabeelio/phpvms/issues/446)
+- Classic importer [\#443](https://github.com/nabeelio/phpvms/issues/443)
+- SimBrief integration - pirep prefile [\#405](https://github.com/nabeelio/phpvms/issues/405)
+- PIREP rejection doesn't move pilot back to previous airport [\#392](https://github.com/nabeelio/phpvms/issues/392)
+- Load Factor for flights [\#352](https://github.com/nabeelio/phpvms/issues/352)
+
+**Merged pull requests:**
+
+- Upgrade packages with security alerts [\#653](https://github.com/nabeelio/phpvms/pull/653)
+- Add public/private pages \#641 [\#644](https://github.com/nabeelio/phpvms/pull/644)
+- SimBrief integration \#405 [\#635](https://github.com/nabeelio/phpvms/pull/635)
+- Add fare type for pax/cargo/mixed flights \#621 [\#623](https://github.com/nabeelio/phpvms/pull/623)
+- Add fixed pilot pay for a flight \#487 [\#622](https://github.com/nabeelio/phpvms/pull/622)
+- Add load factor and variance to flights \#352 [\#620](https://github.com/nabeelio/phpvms/pull/620)
+- Module/plugin installation working \#593 [\#594](https://github.com/nabeelio/phpvms/pull/594)
+- Add Google Analytics tracking ID to settings and to main template \#382 [\#551](https://github.com/nabeelio/phpvms/pull/551)
+- Set expenses on specific flight types \#348 [\#549](https://github.com/nabeelio/phpvms/pull/549)
+- Auto update \#449 [\#545](https://github.com/nabeelio/phpvms/pull/545)
+- Auto-update functionality \#449 [\#544](https://github.com/nabeelio/phpvms/pull/544)
+- ACARS XML config file download [\#540](https://github.com/nabeelio/phpvms/pull/540)
+- Make the fuel used optional [\#512](https://github.com/nabeelio/phpvms/pull/512)
+- Add PHP 7.4 support [\#464](https://github.com/nabeelio/phpvms/pull/464)
+- Replace importer with AJAX powered; better error handling \#443 [\#447](https://github.com/nabeelio/phpvms/pull/447)
+- Fix missing newsRepo variable [\#445](https://github.com/nabeelio/phpvms/pull/445)
+- Refactor and add importer to Installer module \#443 [\#444](https://github.com/nabeelio/phpvms/pull/444)
+- 391 Notification refactorings [\#441](https://github.com/nabeelio/phpvms/pull/441)
+
+## [7.0.0-beta.3](https://github.com/nabeelio/phpvms/tree/7.0.0-beta.3) (2020-02-08)
+
+[Full Changelog](https://github.com/nabeelio/phpvms/compare/7.0.0-beta.2...7.0.0-beta.3)
+
+**Implemented enhancements:**
+
+- Fix formatting in blade files [\#530](https://github.com/nabeelio/phpvms/issues/530)
+- Make PIREP view page public [\#525](https://github.com/nabeelio/phpvms/issues/525)
+- Fix map line colors [\#523](https://github.com/nabeelio/phpvms/issues/523)
+- Null-able fuel values on PIREP [\#510](https://github.com/nabeelio/phpvms/issues/510)
+- include subfleet in search options [\#484](https://github.com/nabeelio/phpvms/issues/484)
+- PHP 7.4 in Travis [\#463](https://github.com/nabeelio/phpvms/issues/463)
+- Move cron problem report to main page [\#458](https://github.com/nabeelio/phpvms/issues/458)
+
+**Fixed bugs:**
+
+- Method GET for /pireps/\<id\>/edit not supported [\#533](https://github.com/nabeelio/phpvms/issues/533)
+- Cron error for removing expired flights [\#532](https://github.com/nabeelio/phpvms/issues/532)
+- Live map marker click not working [\#527](https://github.com/nabeelio/phpvms/issues/527)
+- Redirect to installer properly [\#513](https://github.com/nabeelio/phpvms/issues/513)
+- Admin panel link not shown for users in role group [\#509](https://github.com/nabeelio/phpvms/issues/509)
+- Users without "admin" role can modify roles [\#508](https://github.com/nabeelio/phpvms/issues/508)
+- Edit flights page - text error [\#507](https://github.com/nabeelio/phpvms/issues/507)
+- Installation error with external databases [\#494](https://github.com/nabeelio/phpvms/issues/494)
+- Pirep not in KG [\#493](https://github.com/nabeelio/phpvms/issues/493)
+- Installation Error step2 [\#491](https://github.com/nabeelio/phpvms/issues/491)
+- Fares assigned to flights not working/overwritten by Subfleet [\#488](https://github.com/nabeelio/phpvms/issues/488)
+- Status not changing when importing CSV for aircraft [\#486](https://github.com/nabeelio/phpvms/issues/486)
+- Default Theme unusable on Mobile [\#485](https://github.com/nabeelio/phpvms/issues/485)
+- Fatal Error in subfleet page when importing routes with new aircraft [\#479](https://github.com/nabeelio/phpvms/issues/479)
+- Flights CSV import fails if no distance stipulated [\#478](https://github.com/nabeelio/phpvms/issues/478)
+- Subfleet CSV import [\#476](https://github.com/nabeelio/phpvms/issues/476)
+- Cron - DateTime::construct\(\) expects parameter 2 to be DateTimeZone, int given [\#461](https://github.com/nabeelio/phpvms/issues/461)
+- if PHP\_CLI not found in cron maintenance, put generic `php` exec there [\#457](https://github.com/nabeelio/phpvms/issues/457)
+- Importing schedule bug [\#454](https://github.com/nabeelio/phpvms/issues/454)
+- The updater/installer should clear all caches [\#408](https://github.com/nabeelio/phpvms/issues/408)
+
+**Closed issues:**
+
+- Error 500 when trying to access Dashboard. [\#498](https://github.com/nabeelio/phpvms/issues/498)
+- Import multiple aircraft of different subtypes in one sheet [\#477](https://github.com/nabeelio/phpvms/issues/477)
+- Split out installer/importer from updater [\#453](https://github.com/nabeelio/phpvms/issues/453)
+- ACARS update fields can be nulled [\#450](https://github.com/nabeelio/phpvms/issues/450)
+- Retryable HTTP client [\#430](https://github.com/nabeelio/phpvms/issues/430)
+- Pireps page: 'Pending' doesn't show pending PIREPs [\#427](https://github.com/nabeelio/phpvms/issues/427)
+- Email when news sent out [\#391](https://github.com/nabeelio/phpvms/issues/391)
+- Save cron last run time [\#386](https://github.com/nabeelio/phpvms/issues/386)
+
+**Merged pull requests:**
+
+- 7.0.0-beta3 Release [\#541](https://github.com/nabeelio/phpvms/pull/541)
+
+## [7.0.0-beta.2](https://github.com/nabeelio/phpvms/tree/7.0.0-beta.2) (2019-11-19)
+
+[Full Changelog](https://github.com/nabeelio/phpvms/compare/v7.0.0-beta...7.0.0-beta.2)
+
+**Implemented enhancements:**
+
+- CSS Love needed for the Flights Page  [\#418](https://github.com/nabeelio/phpvms/issues/418)
+- Add Subfleet, Custom Fields and Fares during initial schedule entry [\#410](https://github.com/nabeelio/phpvms/issues/410)
+- PIREP from flight/bid; orig: Bid not removed after flight accepted [\#406](https://github.com/nabeelio/phpvms/issues/406)
+- Auto airport lookup [\#404](https://github.com/nabeelio/phpvms/issues/404)
+- API Changes [\#389](https://github.com/nabeelio/phpvms/issues/389)
+- "Maintenance" section in admin [\#376](https://github.com/nabeelio/phpvms/issues/376)
+- Auto-calculate Distance on Add Flight page [\#355](https://github.com/nabeelio/phpvms/issues/355)
+- Change PIREP fuel field type [\#340](https://github.com/nabeelio/phpvms/issues/340)
+- Fuel in pireps [\#295](https://github.com/nabeelio/phpvms/issues/295)
+- Add field to set aircraft location [\#277](https://github.com/nabeelio/phpvms/issues/277)
+- Suggestion: edit pilot ID [\#265](https://github.com/nabeelio/phpvms/issues/265)
+- Combine subfleet and aircraft export [\#233](https://github.com/nabeelio/phpvms/issues/233)
+- Allow URL for downloads [\#229](https://github.com/nabeelio/phpvms/issues/229)
+- Move settings into database seeder [\#224](https://github.com/nabeelio/phpvms/issues/224)
+- Allow specifying transfer hours on registration [\#129](https://github.com/nabeelio/phpvms/issues/129)
+- Backend changes separating id from pilot\_id [\#324](https://github.com/nabeelio/phpvms/pull/324)
+
+**Fixed bugs:**
+
+- Flight ID's and Airport ICAO's not clickable on airport page [\#419](https://github.com/nabeelio/phpvms/issues/419)
+- Distance lookup needs bcmath extension [\#407](https://github.com/nabeelio/phpvms/issues/407)
+- Missing flight level field on frontend [\#401](https://github.com/nabeelio/phpvms/issues/401)
+- Set distance to 0 if no value [\#400](https://github.com/nabeelio/phpvms/issues/400)
+- Upload livery via admin [\#398](https://github.com/nabeelio/phpvms/issues/398)
+- Block deleting airline if there are assets associated with it [\#367](https://github.com/nabeelio/phpvms/issues/367)
+- Cron not calculating number of flights [\#357](https://github.com/nabeelio/phpvms/issues/357)
+- Error Seeing data of pilot profile [\#351](https://github.com/nabeelio/phpvms/issues/351)
+- Fresh install doesn't create rank [\#346](https://github.com/nabeelio/phpvms/issues/346)
+- Fuel cost only allows whole numbers for price [\#342](https://github.com/nabeelio/phpvms/issues/342)
+- API calls in subfolder going to root domain [\#339](https://github.com/nabeelio/phpvms/issues/339)
+- Errors versión 7.0.0 \(compilación 181025-6f7735\) [\#332](https://github.com/nabeelio/phpvms/issues/332)
+- Error on Install [\#303](https://github.com/nabeelio/phpvms/issues/303)
+- Having a "Error 505" when trying to install PHPVMS [\#302](https://github.com/nabeelio/phpvms/issues/302)
+- Error when viewing profile or trying to add flights [\#291](https://github.com/nabeelio/phpvms/issues/291)
+- "Hubs as home airport" doesn't work [\#288](https://github.com/nabeelio/phpvms/issues/288)
+- Undocumented Extension Required - PHP 7.2 GMP [\#285](https://github.com/nabeelio/phpvms/issues/285)
+- ErrorException  Trying to get property 'name' of non-object [\#281](https://github.com/nabeelio/phpvms/issues/281)
+
+**Closed issues:**
+
+- Add settings.yaml changes to update available check [\#437](https://github.com/nabeelio/phpvms/issues/437)
+- Write current version to DB [\#428](https://github.com/nabeelio/phpvms/issues/428)
+- Message for configuring cron [\#424](https://github.com/nabeelio/phpvms/issues/424)
+- Opt in for telemetry on install [\#415](https://github.com/nabeelio/phpvms/issues/415)
+- Error when saving a PIREP without filling some fields and attempting to edit it [\#414](https://github.com/nabeelio/phpvms/issues/414)
+- Update htaccess file [\#412](https://github.com/nabeelio/phpvms/issues/412)
+- Allow typing in drop down menus [\#409](https://github.com/nabeelio/phpvms/issues/409)
+- Malformed email error on file [\#402](https://github.com/nabeelio/phpvms/issues/402)
+- Residual design issues from Bootstrap update [\#397](https://github.com/nabeelio/phpvms/issues/397)
+- Don't allow PIREP cancel if not in PENDING phase [\#395](https://github.com/nabeelio/phpvms/issues/395)
+- Pageable Criteria [\#390](https://github.com/nabeelio/phpvms/issues/390)
+- Update CSS Libraries [\#387](https://github.com/nabeelio/phpvms/issues/387)
+- Laravel 6 [\#384](https://github.com/nabeelio/phpvms/issues/384)
+- Profile menu dropdown [\#383](https://github.com/nabeelio/phpvms/issues/383)
+- Update vaCentral Library [\#380](https://github.com/nabeelio/phpvms/issues/380)
+- Implement Laravel 5.7 Notifications [\#378](https://github.com/nabeelio/phpvms/issues/378)
+- Generate random cache prefix on install [\#374](https://github.com/nabeelio/phpvms/issues/374)
+- Move transaction/journal code out of controller [\#370](https://github.com/nabeelio/phpvms/issues/370)
+- Add Contract for Airport information lookup [\#363](https://github.com/nabeelio/phpvms/issues/363)
+- RFC7807 - Standardize API error messages [\#361](https://github.com/nabeelio/phpvms/issues/361)
+- Imposible delete bid [\#360](https://github.com/nabeelio/phpvms/issues/360)
+- Change theme from settings [\#359](https://github.com/nabeelio/phpvms/issues/359)
+- Integration with PACX \[Feature\] [\#338](https://github.com/nabeelio/phpvms/issues/338)
+- Why don't you create a free ACARS for PHPVMS7 testing? [\#336](https://github.com/nabeelio/phpvms/issues/336)
+- Error add Roles [\#334](https://github.com/nabeelio/phpvms/issues/334)
+- Error during installation [\#333](https://github.com/nabeelio/phpvms/issues/333)
+- spatie - laravel-backup [\#330](https://github.com/nabeelio/phpvms/issues/330)
+- Refactor data seeding [\#329](https://github.com/nabeelio/phpvms/issues/329)
+- Notify/download latest version file as part of cron [\#327](https://github.com/nabeelio/phpvms/issues/327)
+- Notify if migration/updates are pending [\#326](https://github.com/nabeelio/phpvms/issues/326)
+- PIREP ID change [\#318](https://github.com/nabeelio/phpvms/issues/318)
+- Missing folders on install [\#316](https://github.com/nabeelio/phpvms/issues/316)
+- Pull in VMACars plugin [\#315](https://github.com/nabeelio/phpvms/issues/315)
+- Account for fuel in the finances [\#313](https://github.com/nabeelio/phpvms/issues/313)
+- Show module in the external website [\#310](https://github.com/nabeelio/phpvms/issues/310)
+- Profile picture distorted [\#309](https://github.com/nabeelio/phpvms/issues/309)
+- Implement cachable in models [\#307](https://github.com/nabeelio/phpvms/issues/307)
+- update [\#305](https://github.com/nabeelio/phpvms/issues/305)
+- Error with installer - Permission  denied [\#298](https://github.com/nabeelio/phpvms/issues/298)
+- No Staff Groups/ Authorised Permissions [\#296](https://github.com/nabeelio/phpvms/issues/296)
+- .css and .js 404 [\#294](https://github.com/nabeelio/phpvms/issues/294)
+- Error on Install [\#292](https://github.com/nabeelio/phpvms/issues/292)
+- Ability to change interval of cron jobs [\#289](https://github.com/nabeelio/phpvms/issues/289)
+- ACARS  api add response [\#287](https://github.com/nabeelio/phpvms/issues/287)
+- No bids returned in json [\#286](https://github.com/nabeelio/phpvms/issues/286)
+- Importing \*.csv with special characters [\#282](https://github.com/nabeelio/phpvms/issues/282)
+- laravel-theme doesn't seem to be respecting the theme.json extends [\#279](https://github.com/nabeelio/phpvms/issues/279)
+- Flight for current location not being restricted [\#263](https://github.com/nabeelio/phpvms/issues/263)
+- Self diagnosis [\#253](https://github.com/nabeelio/phpvms/issues/253)
+- Add /api/pireps/validate endpoint [\#247](https://github.com/nabeelio/phpvms/issues/247)
+- Cosmetic issues [\#245](https://github.com/nabeelio/phpvms/issues/245)
+- GDPR Compliance [\#244](https://github.com/nabeelio/phpvms/issues/244)
+- Read all settings into the page session [\#243](https://github.com/nabeelio/phpvms/issues/243)
+- Open Airspace [\#241](https://github.com/nabeelio/phpvms/issues/241)
+- Option to cancel PIREP [\#238](https://github.com/nabeelio/phpvms/issues/238)
+- Navdata sources [\#231](https://github.com/nabeelio/phpvms/issues/231)
+- Refactor export, use streamed response [\#227](https://github.com/nabeelio/phpvms/issues/227)
+- Add expense multiplier to subfleet [\#206](https://github.com/nabeelio/phpvms/issues/206)
+- Expenses [\#136](https://github.com/nabeelio/phpvms/issues/136)
+- Finances [\#130](https://github.com/nabeelio/phpvms/issues/130)
+- phpVMS Classic Importer [\#114](https://github.com/nabeelio/phpvms/issues/114)
+- Setup cron tasks [\#95](https://github.com/nabeelio/phpvms/issues/95)
+- Warning in admin if Installer module is still present [\#77](https://github.com/nabeelio/phpvms/issues/77)
+- flight planning [\#60](https://github.com/nabeelio/phpvms/issues/60)
+
+**Merged pull requests:**
+
+- Merge 7.0.0-beta.2 to master [\#440](https://github.com/nabeelio/phpvms/pull/440)
+- Refactor the upgrade pending check to see if there are settings/permi… [\#438](https://github.com/nabeelio/phpvms/pull/438)
+- Fixes [\#435](https://github.com/nabeelio/phpvms/pull/435)
+- \#406 Refactor bids [\#432](https://github.com/nabeelio/phpvms/pull/432)
+- fixes for issue \#419 [\#429](https://github.com/nabeelio/phpvms/pull/429)
+- Wrap values in travis env [\#426](https://github.com/nabeelio/phpvms/pull/426)
+- Show a message about setting up the cron and if there was an error ru… [\#425](https://github.com/nabeelio/phpvms/pull/425)
+- 359 Select theme in settings [\#423](https://github.com/nabeelio/phpvms/pull/423)
+- Fix blank aircraft field causing error closes \#414 [\#422](https://github.com/nabeelio/phpvms/pull/422)
+- Bundle CSS changes [\#421](https://github.com/nabeelio/phpvms/pull/421)
+- Some minor CSS fixes as discussed on Discord [\#420](https://github.com/nabeelio/phpvms/pull/420)
+- Move telemetry option into settings; checkbox in install refs \#415 [\#416](https://github.com/nabeelio/phpvms/pull/416)
+- Issue fixes [\#413](https://github.com/nabeelio/phpvms/pull/413)
+- Catch error messages in notifying [\#403](https://github.com/nabeelio/phpvms/pull/403)
+- Design and file upload issues [\#399](https://github.com/nabeelio/phpvms/pull/399)
+- Don't allow cancels from certain states [\#396](https://github.com/nabeelio/phpvms/pull/396)
+- Fix map checkout call [\#394](https://github.com/nabeelio/phpvms/pull/394)
+- 389 API Changes [\#393](https://github.com/nabeelio/phpvms/pull/393)
+- CSS Libraries and style updates [\#388](https://github.com/nabeelio/phpvms/pull/388)
+- 384 Laravel 6 changes [\#385](https://github.com/nabeelio/phpvms/pull/385)
+- 380 vacentral library [\#381](https://github.com/nabeelio/phpvms/pull/381)
+- Use Notification/Notifiable [\#379](https://github.com/nabeelio/phpvms/pull/379)
+- Add maintenance section to admin, clear caches \#376 [\#377](https://github.com/nabeelio/phpvms/pull/377)
+- Refactor all JS API calls \#360 [\#375](https://github.com/nabeelio/phpvms/pull/375)
+- Set the baseURL for ajax requests [\#373](https://github.com/nabeelio/phpvms/pull/373)
+- Move airline transaction code into service layer [\#371](https://github.com/nabeelio/phpvms/pull/371)
+- 229 url for downloads [\#369](https://github.com/nabeelio/phpvms/pull/369)
+- \#355 Calculate distance button [\#366](https://github.com/nabeelio/phpvms/pull/366)
+- Add Contract interface for airport lookup functionality [\#365](https://github.com/nabeelio/phpvms/pull/365)
+- Refactor error handling internally to follow RFC7807 [\#362](https://github.com/nabeelio/phpvms/pull/362)
+- Additional logging for the stats recalculation [\#358](https://github.com/nabeelio/phpvms/pull/358)
+- Add missing expiry time for PIREP API [\#356](https://github.com/nabeelio/phpvms/pull/356)
+- Fix/metar reading [\#354](https://github.com/nabeelio/phpvms/pull/354)
+- Fix/metar reading [\#353](https://github.com/nabeelio/phpvms/pull/353)
+- Add setting to include transfer hours in calculations [\#350](https://github.com/nabeelio/phpvms/pull/350)
+- Remove ext-cal from requirements list [\#349](https://github.com/nabeelio/phpvms/pull/349)
+- Multiple ticket crash fixes [\#347](https://github.com/nabeelio/phpvms/pull/347)
+- Issue/327 versioning [\#345](https://github.com/nabeelio/phpvms/pull/345)
+- Update issue templates [\#344](https://github.com/nabeelio/phpvms/pull/344)
+- Add step fields to enable decimal points on fields \#342 [\#343](https://github.com/nabeelio/phpvms/pull/343)
+- Issue fixes [\#341](https://github.com/nabeelio/phpvms/pull/341)
+- Issue/329 refactor seeding [\#337](https://github.com/nabeelio/phpvms/pull/337)
+- Fix issue where user stats aren't incremented on PIREP auto accept [\#335](https://github.com/nabeelio/phpvms/pull/335)
+- Account for fuel in the finance calculations \#313 [\#331](https://github.com/nabeelio/phpvms/pull/331)
+- Middleware to detect is update is pending; move Routes into HTTP [\#328](https://github.com/nabeelio/phpvms/pull/328)
+- Change exporter to use utf-8 close \#282 [\#325](https://github.com/nabeelio/phpvms/pull/325)
+- Rename Interfaces to Contracts to better match Laravel conventions [\#323](https://github.com/nabeelio/phpvms/pull/323)
+- Cleanup SI Unit classes; METAR fixes [\#322](https://github.com/nabeelio/phpvms/pull/322)
+- Bump lodash from 4.17.11 to 4.17.13 [\#321](https://github.com/nabeelio/phpvms/pull/321)
+- Update composer library versions [\#320](https://github.com/nabeelio/phpvms/pull/320)
+- Add missing folders under storage/public \#316 [\#319](https://github.com/nabeelio/phpvms/pull/319)
+- Add interface to additional roles/permissions \#296 [\#314](https://github.com/nabeelio/phpvms/pull/314)
+- Fix pax count fields; add fuel used field \#295 [\#312](https://github.com/nabeelio/phpvms/pull/312)
+- Apply fixes from StyleCI [\#311](https://github.com/nabeelio/phpvms/pull/311)
+- Laravel 5.8 Update [\#308](https://github.com/nabeelio/phpvms/pull/308)
+- Add more search criteria/dev environment via docker-compose \#297 [\#306](https://github.com/nabeelio/phpvms/pull/306)
+- Add gmp to requirements in install \#285 [\#301](https://github.com/nabeelio/phpvms/pull/301)
+- Revert "Update issue templates" [\#300](https://github.com/nabeelio/phpvms/pull/300)
+- Update issue templates [\#299](https://github.com/nabeelio/phpvms/pull/299)
+
+## [v7.0.0-beta](https://github.com/nabeelio/phpvms/tree/v7.0.0-beta) (2018-10-25)
+
+[Full Changelog](https://github.com/nabeelio/phpvms/compare/v7.0.0-alpha2...v7.0.0-beta)
+
+**Implemented enhancements:**
+
+- Follow flight checkbox on live map [\#246](https://github.com/nabeelio/phpvms/issues/246)
+- PIREP restrictions based on settings [\#221](https://github.com/nabeelio/phpvms/issues/221)
+- Save PIREP as draft [\#220](https://github.com/nabeelio/phpvms/issues/220)
+- Shorten fields on flights table [\#205](https://github.com/nabeelio/phpvms/issues/205)
+- Show bids in profile [\#203](https://github.com/nabeelio/phpvms/issues/203)
+- Don't change rank if current rank is higher than the one found [\#196](https://github.com/nabeelio/phpvms/issues/196)
+- pagination sizes [\#162](https://github.com/nabeelio/phpvms/issues/162)
+- Allow overriding templates [\#161](https://github.com/nabeelio/phpvms/issues/161)
+- Replace old pjax library with newer one [\#133](https://github.com/nabeelio/phpvms/issues/133)
+- Awards [\#113](https://github.com/nabeelio/phpvms/issues/113)
+- Setting to restrict airport selection to hubs [\#104](https://github.com/nabeelio/phpvms/issues/104)
+- Pilot leave status [\#96](https://github.com/nabeelio/phpvms/issues/96)
+- schedule import [\#15](https://github.com/nabeelio/phpvms/issues/15)
+
+**Fixed bugs:**
+
+- Error saving PIREP [\#252](https://github.com/nabeelio/phpvms/issues/252)
+- Updater with modules not working [\#249](https://github.com/nabeelio/phpvms/issues/249)
+- User registration country and timezone not saving [\#223](https://github.com/nabeelio/phpvms/issues/223)
+- Importer inserts invalid data on empty columns/rows [\#222](https://github.com/nabeelio/phpvms/issues/222)
+- Import/export - missing fields [\#219](https://github.com/nabeelio/phpvms/issues/219)
+- Country flag not showing on user list [\#218](https://github.com/nabeelio/phpvms/issues/218)
+- fares/subfleet unique field blocks saving [\#214](https://github.com/nabeelio/phpvms/issues/214)
+- module navigation not working \(admin\) [\#201](https://github.com/nabeelio/phpvms/issues/201)
+- Bid not removed when pirep if filled [\#200](https://github.com/nabeelio/phpvms/issues/200)
+- Not saving Flight Time [\#199](https://github.com/nabeelio/phpvms/issues/199)
+
+**Closed issues:**
+
+- SettingsController/Repo are saving as "on" instead of 1/true [\#272](https://github.com/nabeelio/phpvms/issues/272)
+- Auto Accept New Pilot isn't working [\#269](https://github.com/nabeelio/phpvms/issues/269)
+- Suggestion: button to copy aircraft [\#267](https://github.com/nabeelio/phpvms/issues/267)
+- Combine aircraft and subfleet import/export into one [\#256](https://github.com/nabeelio/phpvms/issues/256)
+- cron - recalculate hours [\#254](https://github.com/nabeelio/phpvms/issues/254)
+- Install Directory is missing from git repo  [\#251](https://github.com/nabeelio/phpvms/issues/251)
+- Warning: require\(C:\xampp\Virtual Airline Website\bootstrap/../vendor/autoload.php\): failed to open stream: No such file or directory in C:\xampp\Virtual Airline Website\bootstrap\autoload.php on line 17 [\#248](https://github.com/nabeelio/phpvms/issues/248)
+- Settings [\#239](https://github.com/nabeelio/phpvms/issues/239)
+- HTTP caching [\#237](https://github.com/nabeelio/phpvms/issues/237)
+- Module artisan command bug [\#234](https://github.com/nabeelio/phpvms/issues/234)
+- Add /api/news [\#232](https://github.com/nabeelio/phpvms/issues/232)
+- Start date/end date, along with day of week options [\#230](https://github.com/nabeelio/phpvms/issues/230)
+- Replace weather lookup [\#228](https://github.com/nabeelio/phpvms/issues/228)
+- File/avatar uploads [\#226](https://github.com/nabeelio/phpvms/issues/226)
+- Change fleet page to load subfleets first [\#217](https://github.com/nabeelio/phpvms/issues/217)
+- Add sort options [\#216](https://github.com/nabeelio/phpvms/issues/216)
+- Auto loader on Line 17 [\#215](https://github.com/nabeelio/phpvms/issues/215)
+- Add flight fields [\#213](https://github.com/nabeelio/phpvms/issues/213)
+- Recaptcha in registration [\#212](https://github.com/nabeelio/phpvms/issues/212)
+- Browser tests [\#211](https://github.com/nabeelio/phpvms/issues/211)
+- Axios HTTP library [\#210](https://github.com/nabeelio/phpvms/issues/210)
+- Replace skinning with laravel-theme [\#209](https://github.com/nabeelio/phpvms/issues/209)
+- Refactor getting expenses in FinanceData [\#208](https://github.com/nabeelio/phpvms/issues/208)
+- Change all money to hold in cents, not dollars [\#204](https://github.com/nabeelio/phpvms/issues/204)
+- Pilot pay - rank base and subfleet multiplier [\#197](https://github.com/nabeelio/phpvms/issues/197)
+- Flight schedule importer/exporter [\#194](https://github.com/nabeelio/phpvms/issues/194)
+- use find/replace in bootstrapWith\(\) call [\#163](https://github.com/nabeelio/phpvms/issues/163)
+- Awards [\#155](https://github.com/nabeelio/phpvms/issues/155)
+- System Changes/Additions [\#135](https://github.com/nabeelio/phpvms/issues/135)
+- Airport & Aircraft Changes [\#134](https://github.com/nabeelio/phpvms/issues/134)
+- Handle flight specific fares & multipliers [\#125](https://github.com/nabeelio/phpvms/issues/125)
+- Flight set day of week [\#122](https://github.com/nabeelio/phpvms/issues/122)
+- Airport page [\#85](https://github.com/nabeelio/phpvms/issues/85)
+- Bulk upload charts to airport [\#84](https://github.com/nabeelio/phpvms/issues/84)
+- Pull some values from existing .env file [\#79](https://github.com/nabeelio/phpvms/issues/79)
+- METAR Information [\#61](https://github.com/nabeelio/phpvms/issues/61)
+- flights page [\#57](https://github.com/nabeelio/phpvms/issues/57)
+- fuel costs to airports and fuel type on subfleet [\#41](https://github.com/nabeelio/phpvms/issues/41)
+- generate aircraft hex code on create [\#33](https://github.com/nabeelio/phpvms/issues/33)
+
+**Merged pull requests:**
+
+- More acceptable translation to opt-in \(es\) [\#284](https://github.com/nabeelio/phpvms/pull/284)
+- Fix 404s to requirements/setup in README.md [\#283](https://github.com/nabeelio/phpvms/pull/283)
+- Hide expired live flight from live map and remove from DB [\#280](https://github.com/nabeelio/phpvms/pull/280)
+- \[WIP\] Laravel 5.7 Update [\#278](https://github.com/nabeelio/phpvms/pull/278)
+- Make admin input outline darker [\#276](https://github.com/nabeelio/phpvms/pull/276)
+- capture & display pilot transfer hours [\#275](https://github.com/nabeelio/phpvms/pull/275)
+- Optimize query with eager loading [\#274](https://github.com/nabeelio/phpvms/pull/274)
+- Fix SettingsController saving boolean value as 'on' [\#273](https://github.com/nabeelio/phpvms/pull/273)
+- Hide inactive pilot from pilot list page [\#271](https://github.com/nabeelio/phpvms/pull/271)
+- Fix flight search restriction [\#270](https://github.com/nabeelio/phpvms/pull/270)
+- Apply fixes from StyleCI [\#268](https://github.com/nabeelio/phpvms/pull/268)
+- Fix METAR issue [\#264](https://github.com/nabeelio/phpvms/pull/264)
+- Apply fixes from StyleCI [\#262](https://github.com/nabeelio/phpvms/pull/262)
+- Apply fixes from StyleCI [\#261](https://github.com/nabeelio/phpvms/pull/261)
+- Enable eager loading [\#259](https://github.com/nabeelio/phpvms/pull/259)
+- Implement cron to remove expired bids [\#258](https://github.com/nabeelio/phpvms/pull/258)
+- Fix timezone list HTML Escaped [\#257](https://github.com/nabeelio/phpvms/pull/257)
+- Update 07/13/2018 es-translations [\#255](https://github.com/nabeelio/phpvms/pull/255)
+- ES translation [\#250](https://github.com/nabeelio/phpvms/pull/250)
+- flights filtered per va [\#242](https://github.com/nabeelio/phpvms/pull/242)
+- Avatar Issue [\#236](https://github.com/nabeelio/phpvms/pull/236)
+- Install bug [\#235](https://github.com/nabeelio/phpvms/pull/235)
+
+## [v7.0.0-alpha2](https://github.com/nabeelio/phpvms/tree/v7.0.0-alpha2) (2018-02-23)
+
+[Full Changelog](https://github.com/nabeelio/phpvms/compare/v7.0.0-alpha1...v7.0.0-alpha2)
+
+**Implemented enhancements:**
+
+- Get user PIREPs [\#192](https://github.com/nabeelio/phpvms/issues/192)
+- Use time conversion class [\#190](https://github.com/nabeelio/phpvms/issues/190)
+- Require inputs in Imperial units [\#189](https://github.com/nabeelio/phpvms/issues/189)
+- Make planned\_distance in prefile optional [\#185](https://github.com/nabeelio/phpvms/issues/185)
+- If there's no /pirep/route calls, when it's filed, write the route [\#184](https://github.com/nabeelio/phpvms/issues/184)
+- Create a /api/flight/{id}/route call [\#183](https://github.com/nabeelio/phpvms/issues/183)
+- Make all APIs behind auth [\#173](https://github.com/nabeelio/phpvms/issues/173)
+- Add bid [\#172](https://github.com/nabeelio/phpvms/issues/172)
+- Setting for only showing aircraft that are at the departure airport [\#171](https://github.com/nabeelio/phpvms/issues/171)
+- Font for input [\#169](https://github.com/nabeelio/phpvms/issues/169)
+- Read default value from settings table [\#106](https://github.com/nabeelio/phpvms/issues/106)
+
+**Fixed bugs:**
+
+- Volume units to lbs/kg, not gal/liter [\#193](https://github.com/nabeelio/phpvms/issues/193)
+- Add country to airline missing [\#191](https://github.com/nabeelio/phpvms/issues/191)
+- SKIN\_NAME missing on error pages [\#187](https://github.com/nabeelio/phpvms/issues/187)
+- Airport timezone not being saved [\#182](https://github.com/nabeelio/phpvms/issues/182)
+- Rank checkboxes not being saved [\#181](https://github.com/nabeelio/phpvms/issues/181)
+- Make sure cancelled PIREPs don't show [\#180](https://github.com/nabeelio/phpvms/issues/180)
+- Ignore cancelled PIREPs in duplicate check [\#179](https://github.com/nabeelio/phpvms/issues/179)
+- Make sure all fields are returned in PIREP object [\#178](https://github.com/nabeelio/phpvms/issues/178)
+- autopopulate SOURCE field in ACARS [\#177](https://github.com/nabeelio/phpvms/issues/177)
+- Make sure pireps.restrict\_aircraft\_to\_rank is respected [\#170](https://github.com/nabeelio/phpvms/issues/170)
+- Don't change rank if current rank is non-auto promoting [\#168](https://github.com/nabeelio/phpvms/issues/168)
+- PIREP hours can't be changed [\#167](https://github.com/nabeelio/phpvms/issues/167)
+- Changing a flight status does not save [\#150](https://github.com/nabeelio/phpvms/issues/150)
+- Additional PIREP fields don't save correctly [\#146](https://github.com/nabeelio/phpvms/issues/146)
+
+**Closed issues:**
+
+- Cleanup icons [\#195](https://github.com/nabeelio/phpvms/issues/195)
+- remove raw\_data field from pirep table [\#188](https://github.com/nabeelio/phpvms/issues/188)
+- Remove Resource::withoutWrapping\(\) to follow jsonapi spec [\#186](https://github.com/nabeelio/phpvms/issues/186)
+- Add an `artisan phpvms:dev-install` command [\#176](https://github.com/nabeelio/phpvms/issues/176)
+- Pagination settings [\#175](https://github.com/nabeelio/phpvms/issues/175)
+- Implement setting for flights at pilot's current airport [\#174](https://github.com/nabeelio/phpvms/issues/174)
+- Minimum PHP supported version to 7.1 [\#166](https://github.com/nabeelio/phpvms/issues/166)
+- Update to Laravel 5.6 [\#165](https://github.com/nabeelio/phpvms/issues/165)
+- Updater [\#164](https://github.com/nabeelio/phpvms/issues/164)
+- Allow adding rank in subfleet page [\#160](https://github.com/nabeelio/phpvms/issues/160)
+- Docs [\#153](https://github.com/nabeelio/phpvms/issues/153)
+
+## [v7.0.0-alpha1](https://github.com/nabeelio/phpvms/tree/v7.0.0-alpha1) (2018-02-04)
+
+[Full Changelog](https://github.com/nabeelio/phpvms/compare/f158c11dea7c0a4af27c93382333b67fdc531e3a...v7.0.0-alpha1)
+
+**Implemented enhancements:**
+
+- Widgetized components [\#127](https://github.com/nabeelio/phpvms/issues/127)
+- Set aircraft location on landing [\#112](https://github.com/nabeelio/phpvms/issues/112)
+- save user IP on login [\#110](https://github.com/nabeelio/phpvms/issues/110)
+- When rejecting PIREP, add a comment/reason [\#107](https://github.com/nabeelio/phpvms/issues/107)
+- Check for duplicate PIREPs and add setting [\#105](https://github.com/nabeelio/phpvms/issues/105)
+- create vendor.js with webpack [\#91](https://github.com/nabeelio/phpvms/issues/91)
+- move from bower to webpack [\#90](https://github.com/nabeelio/phpvms/issues/90)
+- Pilots list and profile [\#82](https://github.com/nabeelio/phpvms/issues/82)
+- pirep auto-accept for certain rankings [\#24](https://github.com/nabeelio/phpvms/issues/24)
+- Investigate removing the Repository pattern to simplify [\#6](https://github.com/nabeelio/phpvms/issues/6)
+
+**Fixed bugs:**
+
+- Error when sending /api/pireps/prefile [\#149](https://github.com/nabeelio/phpvms/issues/149)
+- Extra numbers on flights page [\#148](https://github.com/nabeelio/phpvms/issues/148)
+- Unable to select any aircraft from fleet on file PIREP page [\#147](https://github.com/nabeelio/phpvms/issues/147)
+- Error thrown when editing a saved flight [\#145](https://github.com/nabeelio/phpvms/issues/145)
+- When you delete flight from admin, filed pirep will throw error [\#144](https://github.com/nabeelio/phpvms/issues/144)
+- Avoid calling MySQL executable for creating database [\#132](https://github.com/nabeelio/phpvms/issues/132)
+- Aircraft can be added without specifying a subfleet [\#128](https://github.com/nabeelio/phpvms/issues/128)
+- Non error flash messages not showing [\#126](https://github.com/nabeelio/phpvms/issues/126)
+- Removing subfleet from flight [\#124](https://github.com/nabeelio/phpvms/issues/124)
+- User still has API access if they're not ACTIVE [\#119](https://github.com/nabeelio/phpvms/issues/119)
+- Delete bids when flight is deleted [\#103](https://github.com/nabeelio/phpvms/issues/103)
+- JSON error messages [\#92](https://github.com/nabeelio/phpvms/issues/92)
+- add subfleet to flight broken [\#88](https://github.com/nabeelio/phpvms/issues/88)
+- logout functionality not working from frontpage [\#26](https://github.com/nabeelio/phpvms/issues/26)
+
+**Closed issues:**
+
+- `fuel\_used` in pirep/file [\#159](https://github.com/nabeelio/phpvms/issues/159)
+- Add additional fields for PIREP and flights [\#158](https://github.com/nabeelio/phpvms/issues/158)
+- Stub file [\#157](https://github.com/nabeelio/phpvms/issues/157)
+- Add config.php in root on install [\#156](https://github.com/nabeelio/phpvms/issues/156)
+- New registrations are auto-accepted and put as active [\#151](https://github.com/nabeelio/phpvms/issues/151)
+- new version alert [\#143](https://github.com/nabeelio/phpvms/issues/143)
+- Footer copyright text [\#142](https://github.com/nabeelio/phpvms/issues/142)
+- Version build number to use string/assigned date [\#141](https://github.com/nabeelio/phpvms/issues/141)
+- Handle duplicate flight number [\#139](https://github.com/nabeelio/phpvms/issues/139)
+- Restrict shown aircraft to user's rank [\#138](https://github.com/nabeelio/phpvms/issues/138)
+- Docs [\#137](https://github.com/nabeelio/phpvms/issues/137)
+- Checksum for tarball [\#123](https://github.com/nabeelio/phpvms/issues/123)
+- API Items need [\#120](https://github.com/nabeelio/phpvms/issues/120)
+- ACARS API [\#118](https://github.com/nabeelio/phpvms/issues/118)
+- List of cron jobs required [\#117](https://github.com/nabeelio/phpvms/issues/117)
+- Add create/edit fields for columns [\#111](https://github.com/nabeelio/phpvms/issues/111)
+- Add PIREP cancel endpoint and cleanup job [\#109](https://github.com/nabeelio/phpvms/issues/109)
+- ACARS table should save the route [\#102](https://github.com/nabeelio/phpvms/issues/102)
+- /api/fleet and /api/user/fleet [\#101](https://github.com/nabeelio/phpvms/issues/101)
+- Assign subfleets to ranks [\#100](https://github.com/nabeelio/phpvms/issues/100)
+- show dates/times in proper timezone [\#97](https://github.com/nabeelio/phpvms/issues/97)
+- editable fields not working [\#94](https://github.com/nabeelio/phpvms/issues/94)
+- Settings page needs to be completed [\#93](https://github.com/nabeelio/phpvms/issues/93)
+- Airport page pagination & search [\#87](https://github.com/nabeelio/phpvms/issues/87)
+- Mark airport as hub [\#86](https://github.com/nabeelio/phpvms/issues/86)
+- Terms and Conditions & COPPA during registration [\#81](https://github.com/nabeelio/phpvms/issues/81)
+- Look at alternative to Entrust [\#78](https://github.com/nabeelio/phpvms/issues/78)
+- Check if .env file exists in installer [\#76](https://github.com/nabeelio/phpvms/issues/76)
+- upload travis artifact to phpvms ftp as "latest.zip" [\#75](https://github.com/nabeelio/phpvms/issues/75)
+- Track hours on airframes [\#73](https://github.com/nabeelio/phpvms/issues/73)
+- PIREP accept/reject in admin should call PIREP service [\#72](https://github.com/nabeelio/phpvms/issues/72)
+- Error with MySQL syntax when creating database. [\#71](https://github.com/nabeelio/phpvms/issues/71)
+- pirep comments [\#70](https://github.com/nabeelio/phpvms/issues/70)
+- findWithoutFail Method does not exist [\#69](https://github.com/nabeelio/phpvms/issues/69)
+- Commit error 403 [\#67](https://github.com/nabeelio/phpvms/issues/67)
+- Keep Showing 404.... [\#66](https://github.com/nabeelio/phpvms/issues/66)
+- wrap migrate command [\#65](https://github.com/nabeelio/phpvms/issues/65)
+- Create 404 page [\#63](https://github.com/nabeelio/phpvms/issues/63)
+- link to admin in nav if you have permissions [\#62](https://github.com/nabeelio/phpvms/issues/62)
+- Error while creating database [\#56](https://github.com/nabeelio/phpvms/issues/56)
+- shared hosting stuff [\#55](https://github.com/nabeelio/phpvms/issues/55)
+- gravatar url for profile [\#54](https://github.com/nabeelio/phpvms/issues/54)
+- news and notams module [\#52](https://github.com/nabeelio/phpvms/issues/52)
+- try atoum vs phpunit [\#51](https://github.com/nabeelio/phpvms/issues/51)
+- Cache Airports calls [\#49](https://github.com/nabeelio/phpvms/issues/49)
+- add custom fields table for flights [\#48](https://github.com/nabeelio/phpvms/issues/48)
+- Events system [\#43](https://github.com/nabeelio/phpvms/issues/43)
+- add fuel costs types to the airports table [\#40](https://github.com/nabeelio/phpvms/issues/40)
+- adjust "created" date for airline [\#39](https://github.com/nabeelio/phpvms/issues/39)
+- add gross\_weight to PIREPs [\#38](https://github.com/nabeelio/phpvms/issues/38)
+- subfleet to flight pivot values [\#37](https://github.com/nabeelio/phpvms/issues/37)
+- API authentication/middleware [\#36](https://github.com/nabeelio/phpvms/issues/36)
+- REST API [\#35](https://github.com/nabeelio/phpvms/issues/35)
+- use uuids on a few tables [\#34](https://github.com/nabeelio/phpvms/issues/34)
+- subfleet \(ranks, expenses\) [\#32](https://github.com/nabeelio/phpvms/issues/32)
+- How to install this? [\#31](https://github.com/nabeelio/phpvms/issues/31)
+- experiment with changing PDO mode [\#30](https://github.com/nabeelio/phpvms/issues/30)
+- forgot password [\#27](https://github.com/nabeelio/phpvms/issues/27)
+- rankings [\#23](https://github.com/nabeelio/phpvms/issues/23)
+- module system [\#22](https://github.com/nabeelio/phpvms/issues/22)
+- pireps  [\#21](https://github.com/nabeelio/phpvms/issues/21)
+- admin user management [\#20](https://github.com/nabeelio/phpvms/issues/20)
+- modify DatabaseSeeder to look at env [\#19](https://github.com/nabeelio/phpvms/issues/19)
+- look at flarum method of install [\#18](https://github.com/nabeelio/phpvms/issues/18)
+- navdata ingestion [\#17](https://github.com/nabeelio/phpvms/issues/17)
+- settings panel [\#16](https://github.com/nabeelio/phpvms/issues/16)
+- routing and scheduling [\#14](https://github.com/nabeelio/phpvms/issues/14)
+- airport details page [\#13](https://github.com/nabeelio/phpvms/issues/13)
+- currency format config [\#12](https://github.com/nabeelio/phpvms/issues/12)
+- aircraft details page [\#11](https://github.com/nabeelio/phpvms/issues/11)
+- user dashboard and profile pages [\#10](https://github.com/nabeelio/phpvms/issues/10)
+- admin panel work [\#9](https://github.com/nabeelio/phpvms/issues/9)
+- theme/skins engine [\#8](https://github.com/nabeelio/phpvms/issues/8)
+- Integrate roles and permissions [\#7](https://github.com/nabeelio/phpvms/issues/7)
+- rebuild tables [\#5](https://github.com/nabeelio/phpvms/issues/5)
+- front-end template [\#4](https://github.com/nabeelio/phpvms/issues/4)
+- Laravel 5.4 [\#3](https://github.com/nabeelio/phpvms/issues/3)
+- look up role-based permissions  [\#2](https://github.com/nabeelio/phpvms/issues/2)
+- installer [\#1](https://github.com/nabeelio/phpvms/issues/1)
+
+**Merged pull requests:**
+
+- Fixed a few field entries [\#116](https://github.com/nabeelio/phpvms/pull/116)
+- Remove unique email entry [\#115](https://github.com/nabeelio/phpvms/pull/115)
+
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

Dockerfile

@@ -0,0 +1,28 @@
+FROM php:7.4-fpm-alpine
+
+WORKDIR /var/www/
+
+RUN apk add gmp-dev
+RUN curl --silent --show-error https://getcomposer.org/installer | php
+
+# Copy any config files in
+COPY resources/docker/php/ext-opcache.ini $PHP_INI_DIR/conf.d/
+COPY resources/docker/php/www.conf /usr/local/etc/php-fpm.d/www.conf
+RUN ln -sf /dev/stderr /var/log/fpm-error.log
+
+RUN docker-php-ext-install \
+  calendar \
+  pdo_mysql \
+  gmp \
+  opcache && \
+  docker-php-ext-enable pdo_mysql opcache
+
+COPY . /var/www/
+RUN php composer.phar install \
+    --ignore-platform-reqs \
+    --no-interaction \
+    --no-plugins \
+    --no-scripts \
+    --prefer-dist
+
+EXPOSE 9000

Makefile

@@ -19,7 +19,7 @@ clean:
 	@php artisan view:clear
 	@find bootstrap/cache -type f -not -name '.gitignore' -print0 | xargs -0 rm -rf
 
-	@find storage/framework/cache/ -mindepth 1 -not -name '.gitignore' -print0 | xargs -0 rm -rf
+	@find storage/framework/cache/ -mindepth 1 -type f -not -name '.gitignore' -print0 | xargs -0 rm -rf
 	@find storage/framework/sessions/ -mindepth 1 -type f -not -name '.gitignore' -print0 | xargs -0 rm -rf
 	@find storage/framework/views/ -mindepth 1 -not -name '.gitignore' -print0 | xargs -0 rm -rf
 
@@ -43,7 +43,7 @@ build:
 # This is to build all the stylesheets, etc
 .PHONY: build-assets
 build-assets:
-	yarn run production
+	npm run production
 
 .PHONY: install
 install: build
@@ -74,13 +74,13 @@ reload-db:
 tests: test
 
 .PHONY: test
-test:
+test: phpcs
 	#php artisan database:create --reset
 	vendor/bin/phpunit --debug --verbose
 
 .PHONY: phpcs
 phpcs:
-	@vendor/bin/php-cs-fixer fix --config=.php_cs -v --diff --dry-run
+	@vendor/bin/php-cs-fixer fix --config=.php_cs -v --diff --diff-format=udiff --dry-run
 
 #.PHONY: phpstan
 #phpstan:

app/Bootstrap/LoadConfiguration.php

@@ -5,13 +5,11 @@ namespace App\Bootstrap;
 use Illuminate\Contracts\Config\Repository as RepositoryContract;
 use Illuminate\Contracts\Foundation\Application;
 
-/**
- * Class LoadConfiguration
- */
 class LoadConfiguration extends \Illuminate\Foundation\Bootstrap\LoadConfiguration
 {
     /**
-     * Load the configuration items from all of the files.
+     * Load the configuration items from all of the files. This reads the config.php from
+     * that's sitting in the root, and then recursively merges it with the current configs
      *
      * @param \Illuminate\Contracts\Foundation\Application $app
      * @param \Illuminate\Contracts\Config\Repository      $repository

app/Console/Commands/AcarsReplay.php

@@ -3,7 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Contracts\Command;
-use App\Facades\Utils;
+use App\Support\Units\Time;
 use GuzzleHttp\Client;
 use Illuminate\Database\Eloquent\Collection;
 
@@ -64,7 +64,7 @@ class AcarsReplay extends Command
     protected function startPirep($flight): string
     {
         // convert the planned flight time to be completely in minutes
-        $pft = Utils::hoursToMinutes(
+        $pft = Time::hoursToMinutes(
             $flight->planned_hrsenroute,
             $flight->planned_minenroute
         );

app/Console/Commands/ClearCaches.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Contracts\Command;
+use Nwidart\Modules\Facades\Module;
+
+class ClearCaches extends Command
+{
+    protected $signature = 'phpvms:caches';
+    protected $description = 'Clear all caches';
+
+    /**
+     * {@inheritdoc}
+     */
+    public function handle()
+    {
+        self::clearCaches();
+    }
+
+    public static function clearCaches()
+    {
+        self::clearBootstrapCache();
+        self::clearModuleCache();
+    }
+
+    /**
+     * Clear the bootstrap/cache dir
+     */
+    private static function clearBootstrapCache()
+    {
+    }
+
+    /**
+     * Rescan for new modules
+     */
+    private static function clearModuleCache()
+    {
+        Module::scan();
+    }
+}

app/Console/Commands/CreateConfigs.php

@@ -0,0 +1,95 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App;
+use App\Contracts\Command;
+use App\Services\Installer\SeederService;
+use DatabaseSeeder;
+use Modules\Installer\Services\ConfigService;
+
+/**
+ * Create the config files
+ */
+class CreateConfigs extends Command
+{
+    protected $signature = 'phpvms:config {db_host} {db_name} {db_user} {db_pass}';
+    protected $description = 'Create the config files';
+
+    private $databaseSeeder;
+    private $seederSvc;
+
+    public function __construct(DatabaseSeeder $databaseSeeder, SeederService $seederSvc)
+    {
+        parent::__construct();
+
+        $this->databaseSeeder = $databaseSeeder;
+        $this->seederSvc = $seederSvc;
+    }
+
+    /**
+     * Run dev related commands
+     *
+     * @throws \Symfony\Component\HttpFoundation\File\Exception\FileException
+     */
+    public function handle()
+    {
+        $this->writeConfigs();
+
+        // 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->seederSvc->syncAllSeeds();
+
+        $this->info('Done!');
+    }
+
+    /**
+     * Rewrite the configuration files
+     *
+     * @throws \Symfony\Component\HttpFoundation\File\Exception\FileException
+     */
+    protected function writeConfigs()
+    {
+        /** @var ConfigService $cfgSvc */
+        $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);
+        }
+
+        //{name} {db_host} {db_name} {db_user} {db_pass}
+
+        $this->info('Regenerating the config files');
+        $cfgSvc->createConfigFiles([
+            'APP_ENV'   => 'dev',
+            'SITE_NAME' => $this->argument('name'),
+            'DB_CONN'   => 'mysql',
+            'DB_HOST'   => $this->argument('db_host'),
+            'DB_NAME'   => $this->argument('db_name'),
+            'DB_USER'   => $this->argument('db_user'),
+            'DB_PASS'   => $this->argument('db_pass'),
+        ]);
+
+        $this->info('Config files generated!');
+    }
+}

app/Console/Commands/CreateDatabase.php

@@ -2,13 +2,14 @@
 
 namespace App\Console\Commands;
 
+use App\Console\Services\Database;
 use App\Contracts\Command;
 use Illuminate\Support\Facades\Log;
 use Tivie\OS\Detector;
 
 class CreateDatabase extends Command
 {
-    protected $signature = 'database:create {--reset} {--conn=?}';
+    protected $signature = 'database:create {--reset} {--migrate} {--conn=?}';
     protected $description = 'Create a database';
     protected $os;
 
@@ -36,8 +37,7 @@ class CreateDatabase extends Command
         $user = config($dbkey.'username');
         $pass = config($dbkey.'password');
 
-        $dbSvc = new \App\Console\Services\Database();
-
+        $dbSvc = new Database();
         $dsn = $dbSvc->createDsn($host, $port);
         Log::info('Connection string: '.$dsn);
 

app/Console/Commands/DevCommands.php

@@ -7,6 +7,7 @@ use App\Models\Acars;
 use App\Models\Airline;
 use App\Models\Pirep;
 use App\Models\User;
+use App\Notifications\Messages\UserRegistered;
 use App\Repositories\AcarsRepository;
 use App\Services\AirportService;
 use App\Services\AwardService;
@@ -60,6 +61,7 @@ class DevCommands extends Command
             'metar'             => 'getMetar',
             'recalculate-stats' => 'recalculateStats',
             'reset-install'     => 'resetInstall',
+            'new-user-email'    => 'newUserEmail',
             'xml-to-yaml'       => 'xmlToYaml',
         ];
 
@@ -290,6 +292,16 @@ class DevCommands extends Command
         $this->info('Done!');
     }
 
+    /**
+     * Test sending a user a registered email
+     */
+    protected function newUserEmail()
+    {
+        $user_id = $this->argument('param');
+        $user = User::find($user_id);
+        $user->notify(new UserRegistered($user));
+    }
+
     public function liveFlights(): void
     {
         $acarsRepo = app(AcarsRepository::class);

app/Console/Commands/PirepExport.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Contracts\Command;
+use Illuminate\Support\Facades\DB;
+use Symfony\Component\Yaml\Yaml;
+
+class PirepExport extends Command
+{
+    protected $signature = 'phpvms:pirep-export {id}';
+    protected $description = 'PIREP table export';
+
+    /**
+     * Run dev related commands
+     */
+    public function handle()
+    {
+        $pirep_id = $this->argument('id');
+        if (empty($pirep_id)) {
+            $this->error('No PIREP ID specified');
+            exit();
+        }
+
+        // List the tables to export and the column name for the pirep id
+        $tables = [
+            'pireps'               => 'id',
+            'acars'                => 'pirep_id',
+            'pirep_comments'       => 'pirep_id',
+            'pirep_fares'          => 'pirep_id',
+            'pirep_field_values'   => 'pirep_id',
+            'expenses'             => 'ref_model_id',
+            'journal_transactions' => 'ref_model_id',
+        ];
+
+        $export_tables = [];
+        foreach ($tables as $table => $key) {
+            $export_tables[$table] = [];
+
+            $rows = DB::table($table)
+                ->where($key, '=', $pirep_id)
+                ->get();
+
+            foreach ($rows as $row) {
+                $export_tables[$table][] = (array) $row;
+            }
+        }
+
+        $yaml = Yaml::dump($export_tables, 4, 2);
+        echo $yaml;
+    }
+}

app/Console/Commands/Version.php

@@ -8,7 +8,7 @@ use Symfony\Component\Yaml\Yaml;
 
 class Version extends Command
 {
-    protected $signature = 'phpvms:version {--write} {--base-only}';
+    protected $signature = 'phpvms:version {--write} {--base-only} {--write-full-version} {version?}';
 
     private $versionSvc;
 
@@ -26,17 +26,40 @@ class Version extends Command
      */
     public function handle()
     {
-        // Write the updated build number out to the file
         if ($this->option('write')) {
+            // Write the updated build number out to the file
             $version_file = config_path('version.yml');
             $cfg = Yaml::parse(file_get_contents($version_file));
-            $build_number = $this->versionSvc->getBuildId($cfg);
+
+            // If a version is being passed in, the update the build, etc data against this
+            if ($this->argument('version')) {
+                $version = \SemVer\SemVer\Version::fromString($this->argument('version'));
+                if ($this->option('write-full-version')) {
+                    $cfg['current']['major'] = $version->getMajor();
+                    $cfg['current']['minor'] = $version->getMinor();
+                    $cfg['current']['patch'] = $version->getPatch();
+                }
+
+                $prerelease = $version->getPreRelease();
+                if (strpos($prerelease, '.') !== false) {
+                    $prerelease = explode('.', $prerelease);
+                    $cfg['current']['prerelease'] = $prerelease[0];
+                    $cfg['current']['buildmetadata'] = $prerelease[1];
+                } else {
+                    $cfg['current']['prerelease'] = $prerelease;
+                }
+            }
+
+            // Always write out the build ID/build number which is the commit hash
+            $build_number = $this->versionSvc->generateBuildId($cfg);
+            $cfg['current']['commit'] = $build_number;
             $cfg['build']['number'] = $build_number;
 
             file_put_contents($version_file, Yaml::dump($cfg, 4, 2));
         }
 
-        $version = $this->versionSvc->getCurrentVersion(!$this->option('base-only'));
+        $incl_build = empty($this->option('base-only')) ? true : false;
+        $version = $this->versionSvc->getCurrentVersion($incl_build);
         echo $version."\n";
     }
 }

app/Console/Kernel.php

@@ -42,7 +42,6 @@ class Kernel extends ConsoleKernel
      */
     protected function commands(): void
     {
-        require app_path('Http/Routes/console.php');
         $this->load(__DIR__.'/Commands');
         $this->load(__DIR__.'/Cron');
     }

app/Console/Services/Importer.php

@@ -1,704 +0,0 @@
-<?php
-
-namespace App\Console\Services;
-
-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 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
- */
-class Importer
-{
-    /**
-     * Hold references
-     */
-    private $mappedEntities = [];
-
-    /**
-     * Hold the PDO connection to the old database
-     *
-     * @var
-     */
-    private $conn;
-
-    /**
-     * @var array
-     */
-    private $creds;
-
-    /**
-     * Hold the instance of the console logger
-     *
-     * @var
-     */
-    private $log;
-
-    /**
-     * CONSTANTS
-     */
-    public const BATCH_READ_ROWS = 300;
-    public const SUBFLEET_NAME = 'Imported Aircraft';
-
-    /**
-     * Importer constructor.
-     *
-     * @param $db_creds
-     */
-    public function __construct($db_creds)
-    {
-        // Setup the logger
-        $this->log = new ConsoleOutput();
-
-        // The db credentials
-        $this->creds = array_merge([
-            'host'         => '127.0.0.1',
-            'port'         => 3306,
-            'name'         => '',
-            'user'         => '',
-            'pass'         => '',
-            'table_prefix' => '',
-        ], $db_creds);
-    }
-
-    /**
-     * @return int|void
-     */
-    public function run()
-    {
-        $this->reconnect();
-
-        // Import all the different parts
-        $this->importRanks();
-        $this->importAirlines();
-        $this->importAircraft();
-        $this->importAirports();
-
-        $this->importUsers();
-        $this->importFlights();
-        $this->importPireps();
-
-        // Finish up
-        $this->findLastPireps();
-        $this->recalculateRanks();
-    }
-
-    /**
-     * Reconnect to the old phpVMS DB using PDO
-     */
-    protected function reconnect()
-    {
-        $dsn = 'mysql:'.implode(';', [
-                'host='.$this->creds['host'],
-                'port='.$this->creds['port'],
-                'dbname='.$this->creds['name'],
-            ]);
-
-        $this->info('Connection string: '.$dsn);
-
-        try {
-            $this->conn = new PDO($dsn, $this->creds['user'], $this->creds['pass']);
-            $this->conn->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
-        } catch (\PDOException $e) {
-            $this->error($e);
-            exit();
-        }
-    }
-
-    /**
-     * @param $message
-     */
-    protected function comment($message)
-    {
-        $this->log->writeln('<comment>'.$message.'</comment>');
-    }
-
-    /**
-     * @param $message
-     */
-    protected function error($message)
-    {
-        $this->log->writeln('<error>'.$message.'</error>');
-    }
-
-    /**
-     * @param string|array $message
-     */
-    protected function info($message)
-    {
-        if (\is_array($message)) {
-            /* @noinspection ForgottenDebugOutputInspection */
-            print_r($message);
-        } 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) {
-            return $this->creds['table_prefix'].$table;
-        }
-
-        return $table;
-    }
-
-    /**
-     * @param \Illuminate\Database\Eloquent\Model $model
-     *
-     * @return bool
-     */
-    protected function saveModel($model)
-    {
-        try {
-            $model->save();
-
-            return true;
-        } catch (QueryException $e) {
-            if ($e->getCode() !== '23000') {
-                $this->error($e);
-            }
-
-            return false;
-        }
-    }
-
-    /**
-     * 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)) {
-            $this->mappedEntities[$entity] = [];
-        }
-
-        $this->mappedEntities[$entity][$old_id] = $new_id;
-    }
-
-    /**
-     * 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)) {
-            return 0;
-        }
-
-        $entity = $this->mappedEntities[$entity];
-        if (array_key_exists($old_id, $entity)) {
-            return $entity[$old_id];
-        }
-
-        return 0;
-    }
-
-    /**
-     * @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) {
-            $delim = '.';
-        } elseif (strpos($duration, ':')) {
-            $delim = ':';
-        } else {
-            // no delimiter, assume it's just a straight hour
-            return (int) $duration * 60;
-        }
-
-        $hm = explode($delim, $duration);
-        $hours = (int) $hm[0] * 60;
-        $mins = (int) $hm[1];
-
-        return $hours + $mins;
-    }
-
-    /**
-     * @param $table
-     *
-     * @return mixed
-     */
-    protected function getTotalRows($table)
-    {
-        $table = $this->tableName($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
-     *
-     * @return \Generator
-     */
-    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) {
-            $read_rows = self::BATCH_READ_ROWS;
-        }
-
-        $total_rows = $this->getTotalRows($table);
-
-        while ($offset < $total_rows) {
-            $rows_to_read = $offset + $read_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;
-
-            try {
-                foreach ($this->conn->query($sql) as $row) {
-                    yield $row;
-                }
-            } 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) {
-                    $this->reconnect();
-                    continue;
-                }
-            }
-
-            $offset += self::BATCH_READ_ROWS;
-        }
-    }
-
-    /**
-     * Return the subfleet
-     *
-     * @return mixed
-     */
-    protected function getSubfleet()
-    {
-        $airline = Airline::first();
-        $subfleet = Subfleet::firstOrCreate(
-            ['airline_id' => $airline->id, 'name' => self::SUBFLEET_NAME],
-            ['type' => 'PHPVMS']
-        );
-
-        return $subfleet;
-    }
-
-    /**
-     * All the individual importers, done on a per-table basis
-     * Some tables get saved locally for tables that use FK refs
-     */
-
-    /**
-     * Import all of the ranks
-     */
-    protected function importRanks()
-    {
-        $this->comment('--- RANK IMPORT ---');
-
-        $count = 0;
-        foreach ($this->readRows('ranks') as $row) {
-            $rank = Rank::firstOrCreate(
-                ['name' => $row->rank],
-                ['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++;
-            }
-        }
-
-        $this->info('Imported '.$count.' ranks');
-    }
-
-    /**
-     * Import all of the airlines. Save them all in the private var $airlines
-     * They're used to lookup from other reference tables
-     */
-    protected function importAirlines()
-    {
-        $this->comment('--- AIRLINE IMPORT ---');
-
-        $count = 0;
-        foreach ($this->readRows('airlines') as $row) {
-            $airline = Airline::firstOrCreate(
-                ['icao' => $row->code],
-                ['iata' => $row->code, 'name' => $row->name, 'active' => $row->enabled]
-            );
-
-            $this->addMapping('airlines', $row->id, $airline->id);
-            $this->addMapping('airlines', $row->code, $airline->id);
-
-            if ($airline->wasRecentlyCreated) {
-                $count++;
-            }
-        }
-
-        $this->info('Imported '.$count.' airlines');
-    }
-
-    /**
-     * Imported the aircraft
-     */
-    protected function importAircraft()
-    {
-        $this->comment('--- AIRCRAFT IMPORT ---');
-
-        $subfleet = $this->getSubfleet();
-
-        $this->info('Subfleet ID is '.$subfleet->id);
-
-        $count = 0;
-        foreach ($this->readRows('aircraft') as $row) {
-            $aircraft = Aircraft::firstOrCreate(
-                ['name' => $row->fullname, 'registration' => $row->registration],
-                ['icao'        => $row->icao,
-                 'subfleet_id' => $subfleet->id,
-                 'active'      => $row->enabled,
-                ]
-            );
-
-            $this->addMapping('aircraft', $row->id, $aircraft->id);
-
-            if ($aircraft->wasRecentlyCreated) {
-                $count++;
-            }
-        }
-
-        $this->info('Imported '.$count.' aircraft');
-    }
-
-    /**
-     * Import all of the airports
-     */
-    protected function importAirports()
-    {
-        $this->comment('--- AIRPORT IMPORT ---');
-
-        $count = 0;
-        foreach ($this->readRows('airports') as $row) {
-            $attrs = [
-                'id'      => trim($row->icao),
-                'icao'    => trim($row->icao),
-                'name'    => $row->name,
-                'country' => $row->country,
-                'lat'     => $row->lat,
-                'lon'     => $row->lng,
-                'hub'     => $row->hub,
-            ];
-
-            $airport = Airport::updateOrCreate(
-                ['id' => $attrs['id']],
-                $attrs
-            );
-
-            if ($airport->wasRecentlyCreated) {
-                $count++;
-            }
-        }
-
-        $this->info('Imported '.$count.' airports');
-    }
-
-    /**
-     * Import the flights and schedules
-     */
-    protected function importFlights()
-    {
-        $this->comment('--- FLIGHT SCHEDULE IMPORT ---');
-
-        $count = 0;
-        foreach ($this->readRows('schedules') as $row) {
-            $airline_id = $this->getMapping('airlines', $row->code);
-
-            $flight_num = trim($row->flightnum);
-
-            $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,
-            ];
-
-            try {
-                $flight = Flight::updateOrCreate(
-                    ['airline_id' => $airline_id, 'flight_number' => $flight_num],
-                    $attrs
-                );
-            } catch (\Exception $e) {
-                //$this->error($e);
-            }
-
-            $this->addMapping('flights', $row->id, $flight->id);
-
-            // TODO: deserialize route_details into ACARS table
-
-            if ($flight->wasRecentlyCreated) {
-                $count++;
-            }
-        }
-
-        $this->info('Imported '.$count.' flights');
-    }
-
-    /**
-     * Import all of the PIREPs
-     */
-    protected function importPireps()
-    {
-        $this->comment('--- PIREP IMPORT ---');
-
-        $count = 0;
-        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 ?: '',
-                '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),
-            ];
-
-            // Set the distance
-            $distance = round($row->distance ?: 0, 2);
-            $attrs['distance'] = $distance;
-            $attrs['planned_distance'] = $distance;
-
-            // 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') {
-                $attrs['source'] = PirepSource::MANUAL;
-            } else {
-                $attrs['source'] = PirepSource::ACARS;
-            }
-
-            // Set the flight type
-            $row->flighttype = strtoupper($row->flighttype);
-            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_PAX_ONLY;
-            }
-
-            // Set the flight level of the PIREP is set
-            if (property_exists($row, 'flightlevel')) {
-                $attrs['level'] = $row->flightlevel;
-            } else {
-                $attrs['level'] = 0;
-            }
-
-            $pirep = Pirep::updateOrCreate(
-                ['id' => $pirep_id],
-                $attrs
-            );
-
-            $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
-            }
-
-            // TODO: Add extra fields in as PIREP fields
-            $this->addMapping('pireps', $row->pirepid, $pirep->id);
-
-            if ($pirep->wasRecentlyCreated) {
-                $count++;
-            }
-        }
-
-        $this->info('Imported '.$count.' pireps');
-    }
-
-    protected function importUsers()
-    {
-        $this->comment('--- USER IMPORT ---');
-
-        $count = 0;
-        foreach ($this->readRows('pilots', 50) as $row) {
-            // TODO: What to do about pilot ids
-
-            $name = $row->firstname.' '.$row->lastname;
-
-            $airline_id = $this->getMapping('airlines', $row->code);
-            $rank_id = $this->getMapping('ranks', $row->rank);
-            $state = $this->getUserState($row->retired);
-
-            $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,
-                '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),
-            ];
-
-            $user = User::updateOrCreate(
-                ['email' => $row->email],
-                $attrs
-            );
-
-            $this->addMapping('users', $row->pilotid, $user->id);
-
-            if ($user->wasRecentlyCreated) {
-                $count++;
-            }
-        }
-
-        $this->info('Imported '.$count.' users');
-    }
-
-    /**
-     * Go through and set the last PIREP ID for the users
-     */
-    protected function findLastPireps()
-    {
-    }
-
-    /**
-     * Recalculate all of the user ranks
-     */
-    protected function recalculateRanks()
-    {
-        /*$this->comment('--- RECALCULATING RANKS ---');*/
-    }
-
-    /**
-     * Get the user's new state from their original state
-     *
-     * @param $state
-     *
-     * @return int
-     */
-    protected function getUserState($state)
-    {
-        // TODO: This state might differ between simpilot and classic version
-
-        $state = (int) $state;
-
-        // Declare array of classic states
-        $phpvms_classic_states = [
-            'ACTIVE'   => 0,
-            'INACTIVE' => 1,
-            'BANNED'   => 2,
-            'ON_LEAVE' => 3,
-        ];
-
-        // Decide which state they will be in accordance with v7
-        if ($state === $phpvms_classic_states['ACTIVE']) {
-            return UserState::ACTIVE;
-        }
-
-        if ($state === $phpvms_classic_states['INACTIVE']) {
-            // TODO: Make an inactive state?
-            return UserState::REJECTED;
-        }
-
-        if ($state === $phpvms_classic_states['BANNED']) {
-            return UserState::SUSPENDED;
-        }
-
-        if ($state === $phpvms_classic_states['ON_LEAVE']) {
-            return UserState::ON_LEAVE;
-        }
-
-        $this->error('Unknown status: '.$state);
-        return UserState::ACTIVE;
-    }
-}

app/Contracts/Award.php

@@ -2,11 +2,12 @@
 
 namespace App\Contracts;
 
-use App\Facades\Utils;
 use App\Models\Award as AwardModel;
 use App\Models\User;
 use App\Models\UserAward;
-use Log;
+use App\Support\Utils;
+use Exception;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Base class for the Awards, you need to extend this, and implement:
@@ -38,12 +39,6 @@ abstract class Award
     protected $award;
     protected $user;
 
-    /**
-     * AwardInterface constructor.
-     *
-     * @param AwardModel $award
-     * @param User       $user
-     */
     public function __construct(AwardModel $award = null, User $user = null)
     {
         $this->award = $award;
@@ -73,7 +68,7 @@ abstract class Award
      *
      * @return bool|UserAward
      */
-    final protected function addAward()
+    protected function addAward()
     {
         $w = [
             'user_id'  => $this->user->id,
@@ -90,7 +85,7 @@ abstract class Award
 
         try {
             $award->save();
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             Log::error(
                 'Error saving award: '.$e->getMessage(),
                 $e->getTrace()

app/Contracts/Composer.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Contracts;
+
+use Illuminate\View\View;
+
+abstract class Composer
+{
+    abstract public function compose(View $view);
+}

app/Contracts/Controller.php

@@ -6,13 +6,16 @@ use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Http\Request;
+use Laracasts\Flash\Flash;
 
 /**
  * Class Controller
  */
 abstract class Controller extends \Illuminate\Routing\Controller
 {
-    use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
+    use AuthorizesRequests;
+    use DispatchesJobs;
+    use ValidatesRequests;
 
     /**
      * Write a error to the flash and redirect the user to a route
@@ -24,7 +27,7 @@ abstract class Controller extends \Illuminate\Routing\Controller
      */
     public function flashError($message, $route)
     {
-        flash()->error($message);
+        Flash::error($message);
         return redirect(route($route))->withInput();
     }
 

app/Contracts/Enum.php

@@ -46,7 +46,12 @@ abstract class Enum
     final public static function label($value)
     {
         if (isset(static::$labels[$value])) {
-            return trans(static::$labels[$value]);
+            $val = static::$labels[$value];
+            if (strpos($val, '.') !== false) {
+                return trans($val);
+            }
+
+            return $val;
         }
     }
 

app/Contracts/FormRequest.php

@@ -2,15 +2,16 @@
 
 namespace App\Contracts;
 
-/**
- * Class FormRequest
- */
+use Illuminate\Validation\Rule;
+
 class FormRequest extends \Illuminate\Foundation\Http\FormRequest
 {
     /**
+     * Authorized by default
+     *
      * @return bool
      */
-    public function authorize()
+    public function authorize(): bool
     {
         return true;
     }
@@ -18,8 +19,22 @@ class FormRequest extends \Illuminate\Foundation\Http\FormRequest
     /**
      * @return array
      */
-    public function rules()
+    public function rules(): array
     {
         return [];
     }
+
+    /**
+     * Set a given column as being unique
+     *
+     * @param $table
+     *
+     * @return array
+     */
+    public function unique($table)
+    {
+        return [
+            Rule::unique($table)->ignore($this->id, 'id'),
+        ];
+    }
 }

app/Contracts/Listener.php

@@ -2,9 +2,21 @@
 
 namespace App\Contracts;
 
-/**
- * Class Listener
- */
+use Illuminate\Contracts\Events\Dispatcher;
+
 abstract class Listener
 {
+    public static $callbacks = [];
+
+    /**
+     * Sets up any callbacks that are defined in the child class
+     *
+     * @param $events
+     */
+    public function subscribe(Dispatcher $events): void
+    {
+        foreach (static::$callbacks as $klass => $cb) {
+            $events->listen($klass, get_class($this).'@'.$cb);
+        }
+    }
 }

app/Contracts/Middleware.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Contracts;
+
+use Closure;
+use Illuminate\Http\Request;
+
+interface Middleware
+{
+    public function handle(Request $request, Closure $next);
+}

app/Contracts/Migration.php

@@ -2,7 +2,9 @@
 
 namespace App\Contracts;
 
+use App\Support\Database;
 use DB;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class Migration
@@ -23,6 +25,22 @@ abstract class Migration extends \Illuminate\Database\Migrations\Migration
     {
     }
 
+    /**
+     * Seed a YAML file into the database
+     *
+     * @param string $file Full path to yml file to seed
+     */
+    public function seedFile($file): void
+    {
+        try {
+            $path = base_path($file);
+            Database::seed_from_yaml_file($path, false);
+        } catch (\Exception $e) {
+            Log::error('Unable to load '.$file.' file');
+            Log::error($e);
+        }
+    }
+
     /**
      * Add rows to a table
      *

app/Contracts/Model.php

@@ -3,21 +3,20 @@
 namespace App\Contracts;
 
 /**
- * Class Model
- *
  * @property mixed $id
  * @property bool  $skip_mutator
  *
- * @method static where(array $array)
+ * @mixin \Illuminate\Database\Eloquent\Builder
  */
 abstract class Model extends \Illuminate\Database\Eloquent\Model
 {
-    public const ID_MAX_LENGTH = 12;
+    /**
+     * Max length of ID for string columns
+     */
+    public const ID_MAX_LENGTH = 16;
 
     /**
      * For the factories, skip the mutators. Only apply to one instance
-     *
-     * @var bool
      */
     public $skip_mutator = false;
 }

app/Contracts/Repository.php

@@ -5,6 +5,9 @@ namespace App\Contracts;
 use Illuminate\Validation\Validator;
 use Prettus\Repository\Eloquent\BaseRepository;
 
+/**
+ * @mixin \Prettus\Repository\Eloquent\BaseRepository
+ */
 abstract class Repository extends BaseRepository
 {
     /**

app/Contracts/Resource.php

@@ -1,14 +1,11 @@
 <?php
 
-namespace App\Http\Resources;
-
-use App\Contracts\Unit;
-use Illuminate\Http\Resources\Json\Resource;
+namespace App\Contracts;
 
 /**
- * Class Response
+ * Base class for a resource/response
  */
-class Response extends Resource
+class Resource extends \Illuminate\Http\Resources\Json\Resource
 {
     /**
      * Iterate through the list of $fields and check if they're a "Unit"

app/Contracts/Unit.php

@@ -3,13 +3,10 @@
 namespace App\Contracts;
 
 use ArrayAccess;
+use PhpUnitsOfMeasure\Exception\UnknownUnitOfMeasure;
 
 /**
- * Class Unit
- *
- * @property mixed  $instance
- * @property string $unit
- * @property array  $units
+ * Abstract unit wrapper
  */
 class Unit implements ArrayAccess
 {
@@ -25,6 +22,8 @@ class Unit implements ArrayAccess
 
     /**
      * Holds an instance of the PhpUnit type
+     *
+     * @var \PhpUnitsOfMeasure\AbstractPhysicalQuantity
      */
     protected $instance;
 
@@ -60,7 +59,7 @@ class Unit implements ArrayAccess
     {
         $response = [];
         foreach ($this->responseUnits as $unit) {
-            $response[$unit] = $this[$unit];
+            $response[$unit] = $this[$unit] ?? 0;
         }
 
         return $response;
@@ -75,7 +74,7 @@ class Unit implements ArrayAccess
      */
     public function offsetExists($offset)
     {
-        return array_key_exists($offset, $this->units);
+        return $this->offsetGet($offset) !== null;
     }
 
     /**
@@ -87,7 +86,16 @@ class Unit implements ArrayAccess
      */
     public function offsetGet($offset)
     {
-        return round($this->instance->toUnit($offset), 2);
+        try {
+            $value = $this->instance->toUnit($offset);
+            if (!$value) {
+                return;
+            }
+        } catch (UnknownUnitOfMeasure $e) {
+            return;
+        }
+
+        return round($value, 2);
     }
 
     /**
@@ -116,6 +124,6 @@ class Unit implements ArrayAccess
      */
     public function __toString()
     {
-        return (string) $this->units[$this->unit];
+        return (string) $this->offsetGet($this->unit);
     }
 }

app/Cron/Hourly/RemoveExpiredLiveFlights.php

@@ -4,6 +4,7 @@ namespace App\Cron\Hourly;
 
 use App\Contracts\Listener;
 use App\Events\CronHourly;
+use App\Models\Enums\PirepState;
 use App\Models\Pirep;
 use Carbon\Carbon;
 
@@ -13,7 +14,7 @@ use Carbon\Carbon;
 class RemoveExpiredLiveFlights extends Listener
 {
     /**
-     * Remove expired live flights
+     * Remove expired live flights that haven't had an update in the live time
      *
      * @param CronHourly $event
      *
@@ -26,7 +27,7 @@ class RemoveExpiredLiveFlights extends Listener
         }
 
         $date = Carbon::now()->subHours(setting('acars.live_time'));
-        Pirep::whereDate('created_at', '<', $date)
+        Pirep::whereDate('updated_at', '<', $date)
             ->where('state', PirepState::IN_PROGRESS)
             ->delete();
     }

app/Cron/Nightly/ClearExpiredSimbrief.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Cron\Nightly;
+
+use App\Contracts\Listener;
+use App\Events\CronNightly;
+use App\Services\SimBriefService;
+
+/**
+ * Clear any expired SimBrief flight briefs that aren't attached to a PIREP
+ */
+class ClearExpiredSimbrief extends Listener
+{
+    private $simbriefSvc;
+
+    public function __construct(SimBriefService $simbriefSvc)
+    {
+        $this->simbriefSvc = $simbriefSvc;
+    }
+
+    /**
+     * @param \App\Events\CronNightly $event
+     */
+    public function handle(CronNightly $event): void
+    {
+        $this->simbriefSvc->removeExpiredEntries();
+    }
+}

app/Cron/Nightly/RecalculateStats.php

@@ -4,6 +4,7 @@ namespace App\Cron\Nightly;
 
 use App\Contracts\Listener;
 use App\Events\CronNightly;
+use App\Services\AircraftService;
 use App\Services\UserService;
 use Illuminate\Support\Facades\Log;
 
@@ -12,11 +13,13 @@ use Illuminate\Support\Facades\Log;
  */
 class RecalculateStats extends Listener
 {
+    private $aircraftSvc;
     private $userSvc;
 
-    public function __construct(UserService $userService)
+    public function __construct(AircraftService $aircraftSvc, UserService $userSvc)
     {
-        $this->userSvc = $userService;
+        $this->aircraftSvc = $aircraftSvc;
+        $this->userSvc = $userSvc;
     }
 
     /**
@@ -29,10 +32,10 @@ class RecalculateStats extends Listener
      */
     public function handle(CronNightly $event): void
     {
-        Log::info('Recalculating balances');
-
+        Log::info('Recalculating user stats');
         $this->userSvc->recalculateAllUserStats();
 
-        Log::info('Done recalculating stats');
+        Log::info('Recalcuating aircraft status');
+        $this->aircraftSvc->recalculateStats();
     }
 }

app/Database/factories/AirportFactory.php

@@ -8,7 +8,7 @@ use Faker\Generator as Faker;
 if (!function_exists('createFactoryICAO')) {
     function createFactoryICAO(): string
     {
-        $characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+        $characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
         $max = strlen($characters) - 1;
         $string = '';
         for ($i = 0; $i < 4; $i++) {
@@ -26,14 +26,15 @@ if (!function_exists('createFactoryICAO')) {
  * 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 () use ($used) {
-            do {
-                $string = createFactoryICAO();
-            } while (in_array($string, $used, true));
+    $usedIcaos = [];
 
-            return $string;
+    return [
+        'id' => function () use ($usedIcaos) {
+            do {
+                $airport = createFactoryICAO();
+            } while (in_array($airport, $usedIcaos, true));
+
+            return $airport;
         },
         'icao' => function (array $apt) {
             return $apt['id'];

app/Database/factories/FlightFactory.php

@@ -22,20 +22,22 @@ $factory->define(App\Models\Flight::class, function (Faker $faker) {
         'alt_airport_id' => function () {
             return factory(App\Models\Airport::class)->create()->id;
         },
-        'distance'    => $faker->numberBetween(1, 1000),
-        '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'  => static function (array $flight) {
+        'distance'             => $faker->numberBetween(1, 1000),
+        'route'                => null,
+        'level'                => 0,
+        'dpt_time'             => $faker->time(),
+        'arr_time'             => $faker->time(),
+        'flight_time'          => $faker->numberBetween(60, 360),
+        'load_factor'          => $faker->randomElement([15, 20, 50, 90, 100]),
+        'load_factor_variance' => $faker->randomElement([15, 20, 50, 90, 100]),
+        'has_bid'              => false,
+        'active'               => true,
+        'visible'              => true,
+        'days'                 => 0,
+        'start_date'           => null,
+        'end_date'             => null,
+        'created_at'           => $faker->dateTimeBetween('-1 week', 'now'),
+        'updated_at'           => static function (array $flight) {
             return $flight['created_at'];
         },
     ];

app/Database/factories/SimbriefFactory.php

@@ -0,0 +1,21 @@
+<?php
+
+/** @var \Illuminate\Database\Eloquent\Factory $factory */
+
+use Carbon\Carbon;
+use Faker\Generator as Faker;
+
+$factory->define(App\Models\SimBrief::class, function (Faker $faker) {
+    return [
+        'id'         => $faker->unique()->numberBetween(10, 10000000),
+        'user_id'    => null,
+        'flight_id'  => null,
+        'pirep_id'   => null,
+        'acars_xml'  => '',
+        'ofp_xml'    => '',
+        'created_at' => Carbon::now('UTC')->toDateTimeString(),
+        'updated_at' => function (array $sb) {
+            return $sb['created_at'];
+        },
+    ];
+});

app/Database/factories/UserFactory.php

@@ -8,7 +8,7 @@ $factory->define(App\Models\User::class, function (Faker $faker) {
 
     return [
         'id'         => null,
-        'pilot_id'   => 0,
+        'pilot_id'   => null,
         'name'       => $faker->name,
         'email'      => $faker->safeEmail,
         'password'   => $password ?: $password = Hash::make('secret'),

app/Database/migrations/2017_06_08_0000_create_users_table.php

@@ -1,6 +1,7 @@
 <?php
 
 use App\Contracts\Migration;
+use App\Models\Pirep;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
@@ -24,7 +25,7 @@ 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', \App\Models\Pirep::ID_MAX_LENGTH)->nullable();
+            $table->string('last_pirep_id', Pirep::ID_MAX_LENGTH)->nullable();
             $table->unsignedBigInteger('flights')->default(0);
             $table->unsignedBigInteger('flight_time')->nullable()->default(0);
             $table->unsignedBigInteger('transfer_time')->nullable()->default(0);

app/Database/migrations/2017_12_20_005147_create_acars_tables.php

@@ -1,6 +1,7 @@
 <?php
 
 use App\Contracts\Migration;
+use App\Contracts\Model;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
@@ -14,8 +15,8 @@ class CreateAcarsTables extends Migration
     public function up()
     {
         Schema::create('acars', function (Blueprint $table) {
-            $table->string('id', 12);
-            $table->string('pirep_id', \App\Contracts\Model::ID_MAX_LENGTH);
+            $table->string('id', Model::ID_MAX_LENGTH);
+            $table->string('pirep_id', Model::ID_MAX_LENGTH);
             $table->unsignedTinyInteger('type');
             $table->unsignedInteger('nav_type')->nullable();
             $table->unsignedInteger('order')->default(0);

app/Database/migrations/2018_01_03_014930_create_stats_table.php

@@ -2,6 +2,7 @@
 
 use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateStatsTable extends Migration
 {
@@ -22,28 +23,6 @@ class CreateStatsTable extends Migration
             $table->primary('id');
             $table->timestamps();
         });
-        /*$this->addCounterGroups([
-            'flights' => 1,
-        ]);
-
-        $stats = [
-            [
-                'id' => $this->formatSettingId('flights.total_flights'),
-                'order' => $this->getNextOrderNumber('flights'),
-                'value' => 0,
-                'type' => 'int',
-                'description' => 'Total number of flights in the VA',
-            ],
-            [
-                'id' => $this->formatSettingId('flights.total_time'),
-                'order' => $this->getNextOrderNumber('flights'),
-                'value' => 0,
-                'type' => 'int',
-                'description' => 'Total number of hours in the VA',
-            ],
-        ];
-
-        $this->addData('stats', $stats);*/
     }
 
     /**
@@ -53,6 +32,6 @@ class CreateStatsTable extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('settings');
+        Schema::dropIfExists('stats');
     }
 }

app/Database/migrations/2019_06_19_220910_add_readonly_to_roles.php

@@ -2,6 +2,7 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 
 class AddReadonlyToRoles extends Migration

app/Database/migrations/2019_07_16_141152_users_add_pilot_id.php

@@ -18,7 +18,7 @@ class UsersAddPilotId extends Migration
      */
     public function up()
     {
-        Schema::table('users', function (Blueprint $table) {
+        Schema::table('users', static function (Blueprint $table) {
             $table->unsignedBigInteger('pilot_id')
                 ->after('id')
                 ->unique()
@@ -26,30 +26,7 @@ class UsersAddPilotId extends Migration
                 ->index('users_pilot_id');
         });
 
-        // Migrate the current pilot IDs
-        DB::update('UPDATE `users` SET `pilot_id`=`id`');
-
-        // Drop the old ID column and add a new one
-        /*Schema::table('users', function (Blueprint $table) {
-            $table->dropPrimary('users_id_primary');
-            $table->dropColumn('id');
-            $table->string('id', Model::ID_MAX_LENGTH)->primary();
-        });
-
-        // Update the users to use the `pilot_id` (so we don't need to migrate data from other tables)
-        $users = DB::table('users')->get(['id']);
-        foreach ($users as $user) {
-            $user->id = $user->pilot_id;
-            $user->save();
-        }*/
-
-        // role_user
-        // permission_user
-        // sessions
-        // pireps
-        // bids
-        // news
-        // user_awards
+        DB::table('users')->update(['pilot_id' => DB::raw('`id`')]);
     }
 
     /**

app/Database/migrations/2019_09_16_141152_pireps_change_state_type.php

@@ -16,8 +16,9 @@ class PirepsChangeStateType extends Migration
     public function up()
     {
         // Migrate the old rejected state
-        DB::update('UPDATE `pireps` SET `state`='.PirepState::REJECTED
-                  .' WHERE state=-1');
+        DB::table('pireps')
+            ->where(['state' => -1])
+            ->update(['state' => PirepState::REJECTED]);
 
         // Change the column type to an unsigned small int (tinyint not supported on all)
         Schema::table('pireps', function (Blueprint $table) {

app/Database/migrations/2020_02_12_141152_expenses_add_flight_type.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ExpensesAddFlightType extends Migration
+{
+    /**
+     * Add a `flight_type` column to the expenses table
+     */
+    public function up()
+    {
+        Schema::table('expenses', function (Blueprint $table) {
+            $table->string('flight_type', 50)
+                ->nullable()
+                ->after('type');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('expenses', function (Blueprint $table) {
+            $table->dropColumn('flight_type');
+        });
+    }
+}

app/Database/migrations/2020_02_26_044305_modify_airports_coordinates.php

@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Schema;
+
+/**
+ * Turn the airport coordinates and other lat/lon coords into decimal type
+ */
+class ModifyAirportsCoordinates extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('acars', function ($table) {
+            $table->decimal('lat', 10, 5)->change()->default(0.0)->nullable();
+            $table->decimal('lon', 11, 5)->change()->default(0.0)->nullable();
+        });
+
+        Schema::table('airports', function ($table) {
+            $table->decimal('lat', 10, 5)->change()->default(0.0)->nullable();
+            $table->decimal('lon', 11, 5)->change()->default(0.0)->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+    }
+}

app/Database/migrations/2020_03_04_044305_flight_field_nullable.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Schema;
+
+/**
+ * Allow the flight field value to be nullable
+ */
+class FlightFieldNullable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('flight_field_values', function ($table) {
+            $table->text('value')->change()->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+    }
+}

app/Database/migrations/2020_03_05_141152_flights_add_load_factor.php

@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class FlightsAddLoadFactor extends Migration
+{
+    /**
+     * Add a `load_factor` and `load_factor_variance` columns to the expenses table
+     */
+    public function up()
+    {
+        Schema::table('flights', function (Blueprint $table) {
+            $table->decimal('load_factor', 5, 2)
+                ->nullable()
+                ->after('flight_type');
+
+            $table->decimal('load_factor_variance', 5, 2)
+                ->nullable()
+                ->after('load_factor');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('flights', function (Blueprint $table) {
+            $table->dropColumn('load_factor');
+            $table->dropColumn('load_factor_variance');
+        });
+    }
+}

app/Database/migrations/2020_03_06_141152_flights_add_pilot_pay.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class FlightsAddPilotPay extends Migration
+{
+    /**
+     * Add a `pilot_pay` column for a fixed amount to pay to a pilot for a flight
+     */
+    public function up()
+    {
+        Schema::table('flights', function (Blueprint $table) {
+            $table->decimal('pilot_pay')
+                ->nullable()
+                ->after('route');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('flights', function (Blueprint $table) {
+            $table->dropColumn('pilot_pay');
+        });
+    }
+}

app/Database/migrations/2020_03_06_141153_fares_add_type.php

@@ -0,0 +1,34 @@
+<?php
+
+use App\Models\Enums\FareType;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class FaresAddType extends Migration
+{
+    /**
+     * Add a `pilot_pay` column for a fixed amount to pay to a pilot for a flight
+     */
+    public function up()
+    {
+        Schema::table('fares', function (Blueprint $table) {
+            $table->unsignedTinyInteger('type')
+                ->default(FareType::PASSENGER)
+                ->nullable()
+                ->after('capacity');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('fares', function (Blueprint $table) {
+            $table->dropColumn('type');
+        });
+    }
+}

app/Database/migrations/2020_03_09_141152_increase_id_lengths.php

@@ -0,0 +1,45 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+/**
+ * Increase string ID lengths because of collisions
+ */
+class IncreaseIdLengths extends Migration
+{
+    public function up()
+    {
+        $tables = [
+            'acars'               => ['id', 'pirep_id'],
+            'bids'                => ['flight_id'],
+            'flights'             => ['id'],
+            'pireps'              => ['id', 'flight_id'],
+            'flight_fare'         => ['flight_id'],
+            'flight_field_values' => ['flight_id'],
+            'flight_subfleet'     => ['flight_id'],
+            'pirep_comments'      => ['pirep_id'],
+            'pirep_fares'         => ['pirep_id'],
+            'pirep_field_values'  => ['pirep_id'],
+            'users'               => ['last_pirep_id'],
+        ];
+
+        foreach ($tables as $table_name => $columns) {
+            Schema::table($table_name, function (Blueprint $table) use ($columns) {
+                foreach ($columns as $column) {
+                    $table->string($column, 36)->change();
+                }
+            });
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+    }
+}

app/Database/migrations/2020_03_09_141153_remove_subfleet_type_index.php

@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+/**
+ * Remove the unique index from subfleets.type
+ */
+class RemoveSubfleetTypeIndex extends Migration
+{
+    public function up()
+    {
+        Schema::table('subfleets', function (Blueprint $table) {
+            $table->dropUnique(['type']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+    }
+}

app/Database/migrations/2020_03_11_141153_add_simbrief_table.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+/**
+ * Add a table to store the Simbrief data
+ */
+class AddSimbriefTable extends Migration
+{
+    public function up()
+    {
+        Schema::create('simbrief', function (Blueprint $table) {
+            $table->string('id', 36); // The OFP ID
+            $table->unsignedInteger('user_id');
+            $table->string('flight_id', 36)->nullable();
+            $table->string('pirep_id', 36)->nullable();
+            $table->mediumText('acars_xml');
+            $table->mediumText('ofp_xml');
+            $table->timestamps();
+
+            $table->primary('id');
+            $table->index(['user_id', 'flight_id']);
+            $table->index('pirep_id');
+            $table->unique('pirep_id'); // Can only belong to a single PIREP
+        });
+    }
+
+    public function down()
+    {
+        Schema::drop('simbrief');
+    }
+}

app/Database/migrations/2020_03_27_174238_create_pages.php

@@ -0,0 +1,44 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+/**
+ * Create the pages
+ * https://github.com/nabeelio/phpvms/issues/641
+ */
+class CreatePages extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('pages', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->string('name');
+            $table->string('slug');
+            $table->string('icon');
+            $table->unsignedSmallInteger('type');
+            $table->boolean('public');
+            $table->boolean('enabled');
+            $table->mediumText('body');
+            $table->timestamps();
+
+            $table->index('slug');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('pages');
+    }
+}

app/Database/migrations/2020_03_28_174238_airline_remove_nullable.php

@@ -0,0 +1,19 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AirlineRemoveNullable extends Migration
+{
+    public function up()
+    {
+        Schema::table('airlines', function (Blueprint $table) {
+            $table->dropUnique('airlines_iata_unique');
+        });
+    }
+
+    public function down()
+    {
+    }
+}

app/Database/migrations/2020_03_28_174238_page_icon_nullable.php

@@ -0,0 +1,19 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class PageIconNullable extends Migration
+{
+    public function up()
+    {
+        Schema::table('pages', function (Blueprint $table) {
+            $table->string('icon')->change()->nullable();
+        });
+    }
+
+    public function down()
+    {
+    }
+}

app/Database/seeds/dev/.gitignore

@@ -0,0 +1 @@
+local.yml

app/Database/seeds/dev/sample.yml

@@ -20,7 +20,7 @@ awards:
     name: Pilot 50 flights
     description: When a pilot has 50 flights, give this award
     image_url:
-    ref_model: App\Awards\PilotFlightAwards
+    ref_model: Modules\Awards\Awards\PilotFlightAwards
     ref_model_params: 50
     created_at: now
     updated_at: now
@@ -124,7 +124,16 @@ airports:
     lat: 25.2528
     lon: 55.3644
     ground_handling_cost: 50
-
+  - id: OMAA
+    iata: AUH
+    icao: OMAA
+    name: Abu Dhabi International Airport
+    location: Abu Dhabi
+    country:
+    timezone: Asia/Dubai
+    lat: 24.433
+    lon: 54.6511
+    ground_handling_cost: 50
 #
 aircraft:
   - id: 1
@@ -132,24 +141,28 @@ aircraft:
     airport_id: KJFK
     name: Boeing 747-438
     registration: 001Z
+    flight_time: 360
     status: A
   - id: 2
     subfleet_id: 2
     airport_id: LGRP
     name: Boeing 777-200
     registration: C202
+    flight_time: 260
     status: A
   - id: 3
     subfleet_id: 1
     airport_id: KAUS
     name: Boeing 747-412
     registration: S2333
+    flight_time: 0
     status: A
   - id: 4
     subfleet_id: 1
     airport_id: KAUS
     name: Boeing 747-436 RETIRED
     registration:
+    flight_time: 45
     status: R
 
 expenses:
@@ -283,6 +296,7 @@ flights:
     arr_time: 11PM EST
     flight_time: 240
     flight_type: J
+    load_factor: 100
     created_at: NOW
     updated_at: NOW
   - id: flightid_3
@@ -294,6 +308,7 @@ flights:
     arr_airport_id: KJFK
     flight_time: 480
     flight_type: J
+    load_factor: 63
     dpt_time: 9AM CST
     arr_time: 1030AM CST
     route: PITZZ4 MNURE WLEEE4
@@ -307,10 +322,41 @@ flights:
     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
+    flight_type: 'J'
+    load_factor: 80
+    dpt_time: '0800'
+    arr_time: '0900'
+    route: 'MLY5 KEMBO UG442 SIA UG633 OTEKO UR640 NALRO GUBEL3'
+    created_at: NOW
+    updated_at: NOW
+  - id: flightid_5
+    airline_id: 1
+    flight_number: 112
+    route_code:
+    route_leg:
+    dpt_airport_id: OMAA
+    arr_airport_id: OMDB
+    flight_time: 30
+    flight_type: 'J'
+    load_factor:
+    dpt_time: '0800'
+    arr_time: '0900'
+    route: 'MLY5 KEMBO UG442 SIA UG633 OTEKO UR640 NALRO GUBEL3'
+    created_at: NOW
+    updated_at: NOW
+  - id: flightid_6
+    airline_id: 1
+    flight_number: 113
+    route_code:
+    route_leg:
+    dpt_airport_id: OMDB
+    arr_airport_id: OMAA
+    flight_time: 30
+    flight_type: 'J'
+    load_factor: 100
+    dpt_time: '0800'
+    arr_time: '0900'
+    route: 'MLY5 KEMBO UG442 SIA UG633 OTEKO UR640 NALRO GUBEL3'
     created_at: NOW
     updated_at: NOW
 
@@ -467,12 +513,8 @@ pirep_fares:
 
 pirep_fields:
   - id: 1
-    name: departure terminal
-    slug: departure-terminal
-    required: 1
-  - id: 2
-    name: arrival terminal
-    slug: arrival-terminal
+    name: Cost Index
+    slug: cost-index
     required: 0
 
 pirep_field_values:

app/Database/seeds/dev/users.yml

@@ -21,10 +21,10 @@ users:
     updated_at: now
   - id: 2
     pilot_id: 2
-    name: Carla Walters
-    email: carla.walters68@example.com
-    password: admin
-    api_key: testuserapikey1
+    name: Test User
+    email: user@phpvms.net
+    password: user
+    api_key: testuserapikey
     airline_id: 1
     rank_id: 1
     home_airport_id: KJFK
@@ -34,7 +34,7 @@ users:
     transfer_time: 360
     created_at: now
     updated_at: now
-    state: 0
+    state: 1
     opt_in: 1
     toc_accepted: 1
   - id: 3

app/Database/seeds/permissions.yml

@@ -1,7 +1,7 @@
 # All of the different permissions that can be assigned to roles
 ---
 - name: admin-access
-  display_name: Admin Access
+  display_name: Admin Panel
   description: Access the admin panel
 - name: airlines
   display_name: Airlines
@@ -24,9 +24,15 @@
 - name: fares
   display_name: Fares
   description: Create/edit fares
+- name: files
+  display_name: Files
+  description: Manage the files available
 - name: finances
   display_name: Finances
   description: Create/view finance related items
+- name: pages
+  display_name: Pages
+  description: Add/edit/delete pages
 - name: pireps
   display_name: PIREPs
   description: Accept/reject/edit PIREPs

app/Database/seeds/settings.yml

@@ -40,6 +40,19 @@
   options: ''
   type: boolean
   description: 'Send some data (php version, mysql version) to phpVMS. See AnalyticsSvc code for details'
+- key: general.google_analytics_id
+  name: 'Google Analytics Tracking ID'
+  group: general
+  value: ''
+  options: ''
+  type: text
+  description: 'Enter your Google Analytics Tracking ID'
+- key: units.currency
+  name: 'Currency'
+  group: units
+  value: USD
+  type: select
+  description: 'The currency to use'
 - key: units.distance
   name: 'Distance Units'
   group: units
@@ -131,6 +144,41 @@
   options: ''
   type: int
   description: 'Number of hours to expire bids after'
+- key: flights.default_load_factor
+  name: 'Load Factor'
+  group: flights
+  value: 82
+  options: ''
+  type: number
+  description: 'The default load factor for a flight, as a percent'
+- key: flights.load_factor_variance
+  name: 'Load Factor Variance'
+  group: flights
+  value: 5
+  options: ''
+  type: number
+  description: 'How much the load factor can vary per-flight'
+- key: simbrief.api_key
+  name: 'SimBrief API Key'
+  group: simbrief
+  value: ''
+  options: ''
+  type: string
+  description: 'Your SimBrief API key'
+- key: simbrief.only_bids
+  name: 'Only allow for bids'
+  group: simbrief
+  value: true
+  options: ''
+  type: boolean
+  description: 'Only allow briefs to be created for bidded flights'
+- key: simbrief.expire_days
+  name: 'SimBrief Expire Time'
+  group: simbrief
+  value: 5
+  options: ''
+  type: number
+  description: 'Days after how long to remove unused briefs'
 - key: pireps.duplicate_check_time
   name: 'PIREP duplicate time check'
   group: pireps
@@ -222,3 +270,17 @@
   options: ''
   type: boolean
   description: 'Count transfer hours in calculations, like ranks and the total hours'
+- key: notifications.discord_api_key
+  name: Discord API token
+  group: notifications
+  value: ''
+  options: ''
+  type: text
+  description: Discord API token for notifications
+- key: 'notifications.discord_public_channel_id'
+  name: 'Discord Public Channel ID'
+  group: 'notifications'
+  value: ''
+  options: ''
+  type: 'text'
+  description: 'Discord public channel ID for broadcasat notifications'

app/Events/BaseEvent.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Events;
+
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class BaseEvent
+{
+    use Dispatchable;
+    use InteractsWithSockets;
+    use SerializesModels;
+}

app/Events/CronHourly.php

@@ -2,20 +2,6 @@
 
 namespace App\Events;
 
-use Illuminate\Foundation\Events\Dispatchable;
-use Illuminate\Queue\SerializesModels;
-
-/**
- * This event is dispatched when the hourly cron is run
- */
-class CronHourly
+class CronHourly extends BaseEvent
 {
-    use Dispatchable, SerializesModels;
-
-    /**
-     * CronHourly constructor.
-     */
-    public function __construct()
-    {
-    }
 }

app/Events/CronMonthly.php

@@ -2,21 +2,10 @@
 
 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
+class CronMonthly extends BaseEvent
 {
-    use Dispatchable, SerializesModels;
-
-    /**
-     * CronMonthly constructor.
-     */
-    public function __construct()
-    {
-    }
 }

app/Events/CronNightly.php

@@ -2,21 +2,10 @@
 
 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
+class CronNightly extends BaseEvent
 {
-    use Dispatchable, SerializesModels;
-
-    /**
-     * CronNightly constructor.
-     */
-    public function __construct()
-    {
-    }
 }

app/Events/CronWeekly.php

@@ -2,20 +2,12 @@
 
 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
+class CronWeekly extends BaseEvent
 {
-    use Dispatchable, SerializesModels;
-
-    /**
-     * CronWeekly constructor.
-     */
     public function __construct()
     {
     }

app/Events/Expenses.php

@@ -3,8 +3,6 @@
 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
@@ -27,9 +25,8 @@ use Illuminate\Queue\SerializesModels;
  *
  * The event will have a copy of the PIREP model, if it's applicable
  */
-class Expenses
+class Expenses extends BaseEvent
 {
-    use Dispatchable, SerializesModels;
     public $pirep;
 
     /**

app/Events/NewsAdded.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Events;
+
+use App\Models\News;
+
+class NewsAdded extends BaseEvent
+{
+    public $news;
+
+    public function __construct(News $news)
+    {
+        $this->news = $news;
+    }
+}

app/Events/PirepAccepted.php

@@ -3,24 +3,11 @@
 namespace App\Events;
 
 use App\Models\Pirep;
-use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Foundation\Events\Dispatchable;
-use Illuminate\Queue\SerializesModels;
 
-/**
- * Class PirepAccepted
- */
-class PirepAccepted
+class PirepAccepted extends BaseEvent
 {
-    use Dispatchable, InteractsWithSockets, SerializesModels;
-
     public $pirep;
 
-    /**
-     * PirepAccepted constructor.
-     *
-     * @param Pirep $pirep
-     */
     public function __construct(Pirep $pirep)
     {
         $this->pirep = $pirep;

app/Events/PirepCancelled.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Events;
+
+use App\Models\Pirep;
+
+class PirepCancelled extends BaseEvent
+{
+    public $pirep;
+
+    public function __construct(Pirep $pirep)
+    {
+        $this->pirep = $pirep;
+    }
+}

app/Events/PirepFiled.php

@@ -3,13 +3,9 @@
 namespace App\Events;
 
 use App\Models\Pirep;
-use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Foundation\Events\Dispatchable;
-use Illuminate\Queue\SerializesModels;
 
-class PirepFiled
+class PirepFiled extends BaseEvent
 {
-    use Dispatchable, InteractsWithSockets, SerializesModels;
     public $pirep;
 
     public function __construct(Pirep $pirep)

app/Events/PirepPrefiled.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Events;
+
+use App\Models\Pirep;
+
+class PirepPrefiled extends BaseEvent
+{
+    public $pirep;
+
+    public function __construct(Pirep $pirep)
+    {
+        $this->pirep = $pirep;
+    }
+}

app/Events/PirepRejected.php

@@ -3,24 +3,11 @@
 namespace App\Events;
 
 use App\Models\Pirep;
-use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Foundation\Events\Dispatchable;
-use Illuminate\Queue\SerializesModels;
 
-/**
- * Class PirepRejected
- */
-class PirepRejected
+class PirepRejected extends BaseEvent
 {
-    use Dispatchable, InteractsWithSockets, SerializesModels;
-
     public $pirep;
 
-    /**
-     * PirepRejected constructor.
-     *
-     * @param Pirep $pirep
-     */
     public function __construct(Pirep $pirep)
     {
         $this->pirep = $pirep;

app/Events/PirepUpdated.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Events;
+
+use App\Models\Pirep;
+
+class PirepUpdated extends BaseEvent
+{
+    public $pirep;
+
+    public function __construct(Pirep $pirep)
+    {
+        $this->pirep = $pirep;
+    }
+}

app/Events/TestEvent.php

@@ -3,24 +3,11 @@
 namespace App\Events;
 
 use App\Models\User;
-use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Foundation\Events\Dispatchable;
-use Illuminate\Queue\SerializesModels;
 
-/**
- * Class TestEvent
- */
-class TestEvent
+class TestEvent extends BaseEvent
 {
-    use Dispatchable, InteractsWithSockets, SerializesModels;
-
     public $user;
 
-    /**
-     * Create a new event instance.
-     *
-     * @param User $user
-     */
     public function __construct(User $user)
     {
         $this->user = $user;

app/Events/UserAccepted.php

@@ -3,24 +3,11 @@
 namespace App\Events;
 
 use App\Models\User;
-use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Foundation\Events\Dispatchable;
-use Illuminate\Queue\SerializesModels;
 
-/**
- * Class UserAccepted
- */
-class UserAccepted
+class UserAccepted extends BaseEvent
 {
-    use Dispatchable, InteractsWithSockets, SerializesModels;
-
     public $user;
 
-    /**
-     * UserAccepted constructor.
-     *
-     * @param User $user
-     */
     public function __construct(User $user)
     {
         $this->user = $user;

app/Events/UserRegistered.php

@@ -3,24 +3,11 @@
 namespace App\Events;
 
 use App\Models\User;
-use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Foundation\Events\Dispatchable;
-use Illuminate\Queue\SerializesModels;
 
-/**
- * Class UserRegistered
- */
-class UserRegistered
+class UserRegistered extends BaseEvent
 {
-    use Dispatchable, InteractsWithSockets, SerializesModels;
-
     public $user;
 
-    /**
-     * UserRegistered constructor.
-     *
-     * @param User $user
-     */
     public function __construct(User $user)
     {
         $this->user = $user;

app/Events/UserStateChanged.php

@@ -3,26 +3,15 @@
 namespace App\Events;
 
 use App\Models\User;
-use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Foundation\Events\Dispatchable;
-use Illuminate\Queue\SerializesModels;
 
 /**
  * Event triggered when a user's state changes
  */
-class UserStateChanged
+class UserStateChanged extends BaseEvent
 {
-    use Dispatchable, InteractsWithSockets, SerializesModels;
-
     public $old_state;
     public $user;
 
-    /**
-     * UserStateChanged constructor.
-     *
-     * @param User $user
-     * @param      $old_state
-     */
     public function __construct(User $user, $old_state)
     {
         $this->old_state = $old_state;

app/Events/UserStatsChanged.php

@@ -3,26 +3,18 @@
 namespace App\Events;
 
 use App\Models\User;
-use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Foundation\Events\Dispatchable;
-use Illuminate\Queue\SerializesModels;
 
-/**
- * Class UserStatsChanged
- */
-class UserStatsChanged
+class UserStatsChanged extends BaseEvent
 {
-    use Dispatchable, InteractsWithSockets, SerializesModels;
-
     public $stat_name;
     public $old_value;
     public $user;
 
     /*
      * When a user's stats change. Stats changed match the field name:
-     *      airport
-     *      flights
-     *      rank
+     *   airport
+     *   flights
+     *   rank
      */
     public function __construct(User $user, $stat_name, $old_value)
     {

app/Exceptions/Handler.php

@@ -30,8 +30,8 @@ class Handler extends ExceptionHandler
      * A list of the exception types that should not be reported.
      */
     protected $dontReport = [
-        AuthenticationException::class,
-        AuthorizationException::class,
+        //AuthenticationException::class,
+        //AuthorizationException::class,
         AbstractHttpException::class,
         IlluminateValidationException::class,
         ModelNotFoundException::class,
@@ -50,36 +50,7 @@ class Handler extends ExceptionHandler
     public function render($request, Exception $exception)
     {
         if ($request->is('api/*')) {
-            Log::error('API Error', $exception->getTrace());
-
-            if ($exception instanceof AbstractHttpException) {
-                return $exception->getResponse();
-            }
-
-            /*
-             * Not of the HttpException abstract class. Map these into
-             */
-
-            if ($exception instanceof ModelNotFoundException ||
-                $exception instanceof NotFoundHttpException) {
-                $error = new AssetNotFound($exception);
-                return $error->getResponse();
-            }
-
-            // Custom exceptions should be extending HttpException
-            if ($exception instanceof SymfonyHttpException) {
-                $error = new SymfonyException($exception);
-                return $error->getResponse();
-            }
-
-            // Create the detailed errors from the validation errors
-            if ($exception instanceof IlluminateValidationException) {
-                $error = new ValidationException($exception);
-                return $error->getResponse();
-            }
-
-            $error = new GenericExceptionAbstract($exception);
-            return $error->getResponse();
+            return $this->handleApiError($request, $exception);
         }
 
         if ($exception instanceof AbstractHttpException
@@ -90,6 +61,51 @@ class Handler extends ExceptionHandler
         return parent::render($request, $exception);
     }
 
+    /**
+     * Handle errors in the API
+     *
+     * @param            $request
+     * @param \Exception $exception
+     *
+     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
+     */
+    private function handleApiError($request, Exception $exception)
+    {
+        Log::error('API Error', $exception->getTrace());
+
+        if ($exception instanceof AbstractHttpException) {
+            return $exception->getResponse();
+        }
+
+        /*
+         * Not of the HttpException abstract class. Map these into
+         */
+
+        if ($exception instanceof ModelNotFoundException || $exception instanceof NotFoundHttpException) {
+            $error = new AssetNotFound($exception);
+
+            return $error->getResponse();
+        }
+
+        // Custom exceptions should be extending HttpException
+        if ($exception instanceof SymfonyHttpException) {
+            $error = new SymfonyException($exception);
+
+            return $error->getResponse();
+        }
+
+        // Create the detailed errors from the validation errors
+        if ($exception instanceof IlluminateValidationException) {
+            $error = new ValidationException($exception);
+
+            return $error->getResponse();
+        }
+
+        $error = new GenericExceptionAbstract($exception);
+
+        return $error->getResponse();
+    }
+
     /**
      * Convert an authentication exception into an unauthenticated response.
      *

app/Exceptions/PageNotFound.php

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

app/Facades/Utils.php

@@ -1,225 +0,0 @@
-<?php
-
-namespace App\Facades;
-
-use GuzzleHttp\Client;
-use Illuminate\Support\Facades\Facade;
-
-/**
- * Class Utils
- */
-class Utils extends Facade
-{
-    /**
-     * @return string
-     */
-    protected static function getFacadeAccessor(): string
-    {
-        return 'utils';
-    }
-
-    /**
-     * Simple check on the first character if it's an object or not
-     *
-     * @param $obj
-     *
-     * @return bool
-     */
-    public static function isObject($obj): bool
-    {
-        if (!$obj) {
-            return false;
-        }
-
-        if ($obj[0] === '{' || $obj[0] === '[') {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Download a URI. If a file is given, it will save the downloaded
-     * content into that file
-     *
-     * @param string $uri
-     * @param null   $file
-     *
-     * @throws \RuntimeException
-     * @throws \GuzzleHttp\Exception\GuzzleException
-     *
-     * @return string
-     */
-    public static function downloadUrl($uri, $file = null): string
-    {
-        $opts = [];
-        if ($file !== null) {
-            $opts['sink'] = $file;
-        }
-
-        $client = new Client();
-        $response = $client->request('GET', $uri, $opts);
-
-        $body = $response->getBody()->getContents();
-        if ($response->getHeader('content-type') === 'application/json') {
-            $body = \GuzzleHttp\json_decode($body);
-        }
-
-        return $body;
-    }
-
-    /**
-     * Returns a 40 character API key that a user can use
-     *
-     * @return string
-     */
-    public static function generateApiKey(): string
-    {
-        $key = substr(sha1(time().mt_rand()), 0, 20);
-        return $key;
-    }
-
-    /**
-     * @param string $minutes
-     *
-     * @return array
-     */
-    public static function minutesToTimeParts($minutes): array
-    {
-        $hours = floor($minutes / 60);
-        $minutes %= 60;
-
-        return ['h' => $hours, 'm' => $minutes];
-    }
-
-    public static function minutesToTimeString($minutes): string
-    {
-        $hm = self::minutesToTimeParts($minutes);
-        return $hm['h'].'h '.$hm['m'].'m';
-    }
-
-    /**
-     * Convert seconds to an array of hours, minutes, seconds
-     *
-     * @param int $seconds
-     *
-     * @throws \Exception
-     *
-     * @return array['h', 'm', 's']
-     */
-    public static function secondsToTimeParts($seconds): array
-    {
-        $dtF = new \DateTimeImmutable('@0', new \DateTimeZone('UTC'));
-        $dtT = new \DateTimeImmutable("@$seconds", new \DateTimeZone('UTC'));
-
-        $t = $dtF->diff($dtT);
-
-        $retval = [];
-        $retval['h'] = (int) $t->format('%h');
-        $retval['m'] = (int) $t->format('%i');
-        $retval['s'] = (int) $t->format('%s');
-
-        return $retval;
-    }
-
-    /**
-     * Convert seconds to HH MM format
-     *
-     * @param int  $seconds
-     * @param bool $incl_sec
-     *
-     * @throws \Exception
-     *
-     * @return string
-     */
-    public static function secondsToTimeString($seconds, $incl_sec = false): string
-    {
-        $hms = self::secondsToTimeParts($seconds);
-        $format = $hms['h'].'h '.$hms['m'].'m';
-        if ($incl_sec) {
-            $format .= ' '.$hms['s'].'s';
-        }
-
-        return $format;
-    }
-
-    /**
-     * @param $minutes
-     *
-     * @return float|int
-     */
-    public static function minutesToSeconds($minutes)
-    {
-        return $minutes * 60;
-    }
-
-    /**
-     * Convert the seconds to minutes and then round it up
-     *
-     * @param $seconds
-     *
-     * @return float|int
-     */
-    public static function secondsToMinutes($seconds)
-    {
-        return ceil($seconds / 60);
-    }
-
-    /**
-     * Convert hours to minutes. Pretty complex
-     *
-     * @param $minutes
-     *
-     * @return float|int
-     */
-    public static function minutesToHours($minutes)
-    {
-        return $minutes / 60;
-    }
-
-    /**
-     * @param      $hours
-     * @param null $minutes
-     *
-     * @return float|int
-     */
-    public static function hoursToMinutes($hours, $minutes = null)
-    {
-        $total = (int) $hours * 60;
-        if ($minutes) {
-            $total += (int) $minutes;
-        }
-
-        return $total;
-    }
-
-    /**
-     * Bitwise operator for setting days of week to integer field
-     *
-     * @param int   $datefield initial datefield
-     * @param array $day_enums Array of values from config("enum.days")
-     *
-     * @return int
-     */
-    public static function setDays(int $datefield, array $day_enums): int
-    {
-        foreach ($day_enums as $day) {
-            $datefield |= $day;
-        }
-
-        return $datefield;
-    }
-
-    /**
-     * Bit check if a day exists within a integer bitfield
-     *
-     * @param int $datefield datefield from database
-     * @param int $day_enum  Value from config("enum.days")
-     *
-     * @return bool
-     */
-    public static function hasDay(int $datefield, int $day_enum): bool
-    {
-        return ($datefield & $day_enum) === $datefield;
-    }
-}

app/Http/Composers/PageLinksComposer.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Http\Composers;
+
+use App\Contracts\Composer;
+use App\Repositories\PageRepository;
+use Exception;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\View\View;
+
+class PageLinksComposer extends Composer
+{
+    protected $pageRepo;
+
+    /**
+     * PageLinksComposer constructor.
+     *
+     * @param \App\Repositories\PageRepository $pageRepo
+     */
+    public function __construct(PageRepository $pageRepo)
+    {
+        $this->pageRepo = $pageRepo;
+    }
+
+    /**
+     * @param \Illuminate\View\View $view
+     */
+    public function compose(View $view)
+    {
+        try {
+            // If not logged in, then only get the public pages
+            $w = ['enabled' => true];
+            if (!Auth::check()) {
+                $w = ['public' => true];
+            }
+
+            $pages = $this->pageRepo->findWhere($w, ['id', 'name', 'slug', 'icon']);
+        } catch (Exception $e) {
+            $pages = [];
+        }
+
+        $view->with('page_links', $pages);
+    }
+}

app/Http/Composers/VersionComposer.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Composers;
+
+use App\Contracts\Composer;
+use App\Services\VersionService;
+use Illuminate\View\View;
+
+class VersionComposer extends Composer
+{
+    protected $versionSvc;
+
+    public function __construct(VersionService $versionSvc)
+    {
+        $this->versionSvc = $versionSvc;
+    }
+
+    public function compose(View $view)
+    {
+        $view->with('version', $this->versionSvc->getCurrentVersion(false));
+        $view->with('version_full', $this->versionSvc->getCurrentVersion(true));
+    }
+}

app/Http/Controllers/Admin/AircraftController.php

@@ -3,27 +3,25 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Contracts\Controller;
+use App\Http\Controllers\Admin\Traits\Importable;
 use App\Http\Requests\CreateAircraftRequest;
-use App\Http\Requests\ImportRequest;
 use App\Http\Requests\UpdateAircraftRequest;
 use App\Models\Aircraft;
 use App\Models\Enums\AircraftStatus;
+use App\Models\Enums\ImportExportType;
 use App\Models\Expense;
 use App\Models\Subfleet;
 use App\Repositories\AircraftRepository;
 use App\Repositories\AirportRepository;
 use App\Services\ExportService;
 use App\Services\ImportService;
-use Flash;
 use Illuminate\Http\Request;
-use Log;
-use Storage;
+use Laracasts\Flash\Flash;
 
-/**
- * Class AircraftController
- */
 class AircraftController extends Controller
 {
+    use Importable;
+
     private $aircraftRepo;
     private $airportRepo;
     private $importSvc;
@@ -82,7 +80,7 @@ class AircraftController extends Controller
         return view('admin.aircraft.create', [
             'airports'    => $this->airportRepo->selectBoxList(),
             'subfleets'   => Subfleet::all()->pluck('name', 'id'),
-            'statuses'    => AircraftStatus::select(true),
+            'statuses'    => AircraftStatus::select(false),
             'subfleet_id' => $request->query('subfleet'),
         ]);
     }
@@ -90,7 +88,11 @@ class AircraftController extends Controller
     /**
      * Store a newly created Aircraft in storage.
      *
+     * @param \App\Http\Requests\CreateAircraftRequest $request
+     *
      * @throws \Prettus\Validator\Exceptions\ValidatorException
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
     public function store(CreateAircraftRequest $request)
     {
@@ -142,14 +144,15 @@ class AircraftController extends Controller
             'aircraft'  => $aircraft,
             'airports'  => $this->airportRepo->selectBoxList(),
             'subfleets' => Subfleet::all()->pluck('name', 'id'),
-            'statuses'  => AircraftStatus::select(true),
+            'statuses'  => AircraftStatus::select(false),
         ]);
     }
 
     /**
      * Update the specified Aircraft in storage.
      *
-     * @param mixed $id
+     * @param mixed                 $id
+     * @param UpdateAircraftRequest $request
      *
      * @throws \Prettus\Validator\Exceptions\ValidatorException
      *
@@ -218,8 +221,6 @@ class AircraftController extends Controller
     /**
      * @param Request $request
      *
-     * @throws \Illuminate\Validation\ValidationException
-     *
      * @return mixed
      */
     public function import(Request $request)
@@ -230,16 +231,7 @@ class AircraftController extends Controller
         ];
 
         if ($request->isMethod('post')) {
-            ImportRequest::validate($request);
-            $path = Storage::putFileAs(
-                'import',
-                $request->file('csv_file'),
-                'import_aircraft.csv'
-            );
-
-            $path = storage_path('app/'.$path);
-            Log::info('Uploaded aircraft import file to '.$path);
-            $logs = $this->importSvc->importAircraft($path);
+            $logs = $this->importFile($request, ImportExportType::AIRCRAFT);
         }
 
         return view('admin.aircraft.import', [

app/Http/Controllers/Admin/AirlinesController.php

@@ -63,7 +63,7 @@ class AirlinesController extends Controller
     public function store(CreateAirlineRequest $request)
     {
         $input = $request->all();
-        $airlines = $this->airlineRepo->create($input);
+        $this->airlineSvc->createAirline($input);
 
         Flash::success('Airlines saved successfully.');
         return redirect(route('admin.airlines.index'));

app/Http/Controllers/Admin/AirportController.php

@@ -3,27 +3,24 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Contracts\Controller;
+use App\Http\Controllers\Admin\Traits\Importable;
 use App\Http\Requests\CreateAirportRequest;
-use App\Http\Requests\ImportRequest;
 use App\Http\Requests\UpdateAirportRequest;
 use App\Models\Airport;
+use App\Models\Enums\ImportExportType;
 use App\Models\Expense;
 use App\Repositories\AirportRepository;
 use App\Repositories\Criteria\WhereCriteria;
 use App\Services\ExportService;
 use App\Services\ImportService;
 use App\Support\Timezonelist;
-use Flash;
 use Illuminate\Http\Request;
-use Log;
-use Response;
-use Storage;
+use Laracasts\Flash\Flash;
 
-/**
- * Class AirportController
- */
 class AirportController extends Controller
 {
+    use Importable;
+
     private $airportRepo;
     private $importSvc;
 
@@ -46,7 +43,7 @@ class AirportController extends Controller
      *
      * @throws \Prettus\Repository\Exceptions\RepositoryException
      *
-     * @return Response
+     * @return mixed
      */
     public function index(Request $request)
     {
@@ -68,7 +65,7 @@ class AirportController extends Controller
     /**
      * Show the form for creating a new Airport.
      *
-     * @return Response
+     * @return mixed
      */
     public function create()
     {
@@ -84,7 +81,7 @@ class AirportController extends Controller
      *
      * @throws \Prettus\Validator\Exceptions\ValidatorException
      *
-     * @return Response
+     * @return mixed
      */
     public function store(CreateAirportRequest $request)
     {
@@ -102,7 +99,7 @@ class AirportController extends Controller
      *
      * @param int $id
      *
-     * @return Response
+     * @return mixed
      */
     public function show($id)
     {
@@ -123,7 +120,7 @@ class AirportController extends Controller
      *
      * @param int $id
      *
-     * @return Response
+     * @return mixed
      */
     public function edit($id)
     {
@@ -148,7 +145,7 @@ class AirportController extends Controller
      *
      * @throws \Prettus\Validator\Exceptions\ValidatorException
      *
-     * @return Response
+     * @return mixed
      */
     public function update($id, UpdateAirportRequest $request)
     {
@@ -173,7 +170,7 @@ class AirportController extends Controller
      *
      * @param int $id
      *
-     * @return Response
+     * @return mixed
      */
     public function destroy($id)
     {
@@ -227,16 +224,7 @@ class AirportController extends Controller
         ];
 
         if ($request->isMethod('post')) {
-            ImportRequest::validate($request);
-            $path = Storage::putFileAs(
-                'import',
-                $request->file('csv_file'),
-                'import_airports.csv'
-            );
-
-            $path = storage_path('app/'.$path);
-            Log::info('Uploaded airport import file to '.$path);
-            $logs = $this->importSvc->importAirports($path);
+            $logs = $this->importFile($request, ImportExportType::AIRPORT);
         }
 
         return view('admin.airports.import', [

app/Http/Controllers/Admin/AwardController.php

@@ -7,10 +7,9 @@ use App\Http\Requests\CreateAwardRequest;
 use App\Http\Requests\UpdateAwardRequest;
 use App\Repositories\AwardRepository;
 use App\Services\AwardService;
-use Flash;
 use Illuminate\Http\Request;
+use Laracasts\Flash\Flash;
 use Prettus\Repository\Criteria\RequestCriteria;
-use Response;
 
 class AwardController extends Controller
 {
@@ -62,7 +61,7 @@ class AwardController extends Controller
      *
      * @throws \Prettus\Repository\Exceptions\RepositoryException
      *
-     * @return Response
+     * @return mixed
      */
     public function index(Request $request)
     {
@@ -76,8 +75,6 @@ class AwardController extends Controller
 
     /**
      * Show the form for creating a new Fare.
-     *
-     * @return Response
      */
     public function create()
     {
@@ -96,7 +93,7 @@ class AwardController extends Controller
      *
      * @throws \Prettus\Validator\Exceptions\ValidatorException
      *
-     * @return Response
+     * @return mixed
      */
     public function store(CreateAwardRequest $request)
     {
@@ -112,7 +109,7 @@ class AwardController extends Controller
      *
      * @param int $id
      *
-     * @return Response
+     * @return mixed
      */
     public function show($id)
     {
@@ -133,7 +130,7 @@ class AwardController extends Controller
      *
      * @param int $id
      *
-     * @return Response
+     * @return mixed
      */
     public function edit($id)
     {
@@ -161,7 +158,7 @@ class AwardController extends Controller
      *
      * @throws \Prettus\Validator\Exceptions\ValidatorException
      *
-     * @return Response
+     * @return mixed
      */
     public function update($id, UpdateAwardRequest $request)
     {
@@ -183,7 +180,7 @@ class AwardController extends Controller
      *
      * @param int $id
      *
-     * @return Response
+     * @return mixed
      */
     public function destroy($id)
     {

app/Http/Controllers/Admin/DashboardController.php

@@ -7,6 +7,8 @@ use App\Repositories\KvpRepository;
 use App\Repositories\NewsRepository;
 use App\Repositories\PirepRepository;
 use App\Repositories\UserRepository;
+use App\Services\CronService;
+use App\Services\NewsService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
@@ -14,27 +16,35 @@ use Laracasts\Flash\Flash;
 
 class DashboardController extends Controller
 {
+    private $cronSvc;
     private $kvpRepo;
     private $newsRepo;
+    private $newsSvc;
     private $pirepRepo;
     private $userRepo;
 
     /**
      * DashboardController constructor.
      *
+     * @param CronService     $cronSvc
      * @param KvpRepository   $kvpRepo
      * @param NewsRepository  $newsRepo
+     * @param NewsService     $newsSvc
      * @param PirepRepository $pirepRepo
      * @param UserRepository  $userRepo
      */
     public function __construct(
+        CronService $cronSvc,
         KvpRepository $kvpRepo,
         NewsRepository $newsRepo,
+        NewsService $newsSvc,
         PirepRepository $pirepRepo,
         UserRepository $userRepo
     ) {
+        $this->cronSvc = $cronSvc;
         $this->kvpRepo = $kvpRepo;
         $this->newsRepo = $newsRepo;
+        $this->newsSvc = $newsSvc;
         $this->pirepRepo = $pirepRepo;
         $this->userRepo = $userRepo;
     }
@@ -74,9 +84,10 @@ class DashboardController extends Controller
         $this->checkNewVersion();
 
         return view('admin.dashboard.index', [
-            'news'           => $this->newsRepo->getLatest(),
-            'pending_pireps' => $this->pirepRepo->getPendingCount(),
-            'pending_users'  => $this->userRepo->getPendingCount(),
+            'news'                => $this->newsRepo->getLatest(),
+            'pending_pireps'      => $this->pirepRepo->getPendingCount(),
+            'pending_users'       => $this->userRepo->getPendingCount(),
+            'cron_problem_exists' => $this->cronSvc->cronProblemExists(),
         ]);
     }
 
@@ -93,10 +104,10 @@ class DashboardController extends Controller
             $attrs = $request->post();
             $attrs['user_id'] = Auth::user()->id;
 
-            $this->newsRepo->create($attrs);
+            $this->newsSvc->addNews($attrs);
         } elseif ($request->isMethod('delete')) {
-            $news_id = $request->input('news_id');
-            $this->newsRepo->delete($news_id);
+            $id = $request->input('news_id');
+            $this->newsSvc->deleteNews($id);
         }
 
         return view('admin.dashboard.news', [

app/Http/Controllers/Admin/ExpenseController.php

@@ -3,25 +3,23 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Contracts\Controller;
-use App\Http\Requests\ImportRequest;
+use App\Http\Controllers\Admin\Traits\Importable;
 use App\Models\Enums\ExpenseType;
+use App\Models\Enums\FlightType;
+use App\Models\Enums\ImportExportType;
 use App\Models\Expense;
 use App\Repositories\AirlineRepository;
 use App\Repositories\ExpenseRepository;
 use App\Services\ExportService;
 use App\Services\ImportService;
-use Flash;
 use Illuminate\Http\Request;
-use Log;
+use Laracasts\Flash\Flash;
 use Prettus\Repository\Criteria\RequestCriteria;
-use Response;
-use Storage;
 
-/**
- * Class ExpenseController
- */
 class ExpenseController extends Controller
 {
+    use Importable;
+
     private $airlineRepo;
     private $expenseRepo;
     private $importSvc;
@@ -72,6 +70,7 @@ class ExpenseController extends Controller
         return view('admin.expenses.create', [
             'airlines_list' => $this->airlineRepo->selectBoxList(true),
             'expense_types' => ExpenseType::select(),
+            'flight_types'  => FlightType::select(),
         ]);
     }
 
@@ -122,7 +121,7 @@ class ExpenseController extends Controller
      *
      * @param int $id
      *
-     * @return Response
+     * @return mixed
      */
     public function edit($id)
     {
@@ -138,6 +137,7 @@ class ExpenseController extends Controller
             'expense'       => $expense,
             'airlines_list' => $this->airlineRepo->selectBoxList(true),
             'expense_types' => ExpenseType::select(),
+            'flight_types'  => FlightType::select(),
         ]);
     }
 
@@ -149,7 +149,7 @@ class ExpenseController extends Controller
      *
      * @throws \Prettus\Validator\Exceptions\ValidatorException
      *
-     * @return Response
+     * @return mixed
      */
     public function update($id, Request $request)
     {
@@ -157,14 +157,12 @@ class ExpenseController extends Controller
 
         if (empty($expenses)) {
             Flash::error('Expense not found');
-
             return redirect(route('admin.expenses.index'));
         }
 
         $this->expenseRepo->update($request->all(), $id);
 
         Flash::success('Expense updated successfully.');
-
         return redirect(route('admin.expenses.index'));
     }
 
@@ -173,7 +171,7 @@ class ExpenseController extends Controller
      *
      * @param int $id
      *
-     * @return Response
+     * @return mixed
      */
     public function destroy($id)
     {
@@ -227,16 +225,7 @@ class ExpenseController extends Controller
         ];
 
         if ($request->isMethod('post')) {
-            ImportRequest::validate($request);
-            $path = Storage::putFileAs(
-                'import',
-                $request->file('csv_file'),
-                'import_expenses.csv'
-            );
-
-            $path = storage_path('app/'.$path);
-            Log::info('Uploaded expenses import file to '.$path);
-            $logs = $this->importSvc->importExpenses($path);
+            $logs = $this->importFile($request, ImportExportType::EXPENSES);
         }
 
         return view('admin.expenses.import', [

app/Http/Controllers/Admin/FareController.php

@@ -3,24 +3,22 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Contracts\Controller;
+use App\Http\Controllers\Admin\Traits\Importable;
 use App\Http\Requests\CreateFareRequest;
-use App\Http\Requests\ImportRequest;
 use App\Http\Requests\UpdateFareRequest;
+use App\Models\Enums\FareType;
+use App\Models\Enums\ImportExportType;
 use App\Repositories\FareRepository;
 use App\Services\ExportService;
 use App\Services\ImportService;
-use Flash;
 use Illuminate\Http\Request;
-use Log;
+use Laracasts\Flash\Flash;
 use Prettus\Repository\Criteria\RequestCriteria;
-use Response;
-use Storage;
 
-/**
- * Class FareController
- */
 class FareController extends Controller
 {
+    use Importable;
+
     private $fareRepo;
     private $importSvc;
 
@@ -45,7 +43,7 @@ class FareController extends Controller
      *
      * @throws \Prettus\Repository\Exceptions\RepositoryException
      *
-     * @return Response
+     * @return mixed
      */
     public function index(Request $request)
     {
@@ -58,12 +56,12 @@ class FareController extends Controller
 
     /**
      * Show the form for creating a new Fare.
-     *
-     * @return Response
      */
     public function create()
     {
-        return view('admin.fares.create');
+        return view('admin.fares.create', [
+            'fare_types' => FareType::select(),
+        ]);
     }
 
     /**
@@ -73,7 +71,7 @@ class FareController extends Controller
      *
      * @throws \Prettus\Validator\Exceptions\ValidatorException
      *
-     * @return Response
+     * @return mixed
      */
     public function store(CreateFareRequest $request)
     {
@@ -89,7 +87,7 @@ class FareController extends Controller
      *
      * @param int $id
      *
-     * @return Response
+     * @return mixed
      */
     public function show($id)
     {
@@ -99,7 +97,9 @@ class FareController extends Controller
             return redirect(route('admin.fares.index'));
         }
 
-        return view('admin.fares.show')->with('fare', $fare);
+        return view('admin.fares.show', [
+            'fare' => $fare,
+        ]);
     }
 
     /**
@@ -107,7 +107,7 @@ class FareController extends Controller
      *
      * @param int $id
      *
-     * @return Response
+     * @return mixed
      */
     public function edit($id)
     {
@@ -117,7 +117,10 @@ class FareController extends Controller
             return redirect(route('admin.fares.index'));
         }
 
-        return view('admin.fares.edit')->with('fare', $fare);
+        return view('admin.fares.edit', [
+            'fare'       => $fare,
+            'fare_types' => FareType::select(),
+        ]);
     }
 
     /**
@@ -128,7 +131,7 @@ class FareController extends Controller
      *
      * @throws \Prettus\Validator\Exceptions\ValidatorException
      *
-     * @return Response
+     * @return mixed
      */
     public function update($id, UpdateFareRequest $request)
     {
@@ -149,7 +152,7 @@ class FareController extends Controller
      *
      * @param int $id
      *
-     * @return Response
+     * @return mixed
      */
     public function destroy($id)
     {
@@ -202,16 +205,7 @@ class FareController extends Controller
         ];
 
         if ($request->isMethod('post')) {
-            ImportRequest::validate($request);
-            $path = Storage::putFileAs(
-                'import',
-                $request->file('csv_file'),
-                'import_fares.csv'
-            );
-
-            $path = storage_path('app/'.$path);
-            Log::info('Uploaded fares import file to '.$path);
-            $logs = $this->importSvc->importFares($path);
+            $logs = $this->importFile($request, ImportExportType::FARES);
         }
 
         return view('admin.fares.import', [

app/Http/Controllers/Admin/FileController.php

@@ -8,12 +8,8 @@ use App\Services\FileService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Validator;
-use Illuminate\Validation\Rule;
 use Laracasts\Flash\Flash;
 
-/**
- * Class FileController
- */
 class FileController extends Controller
 {
     private $fileSvc;

app/Http/Controllers/Admin/FinanceController.php

@@ -10,9 +10,6 @@ use App\Services\FinanceService;
 use App\Support\Dates;
 use Illuminate\Http\Request;
 
-/**
- * Class FinanceController
- */
 class FinanceController extends Controller
 {
     private $airlineRepo;
@@ -43,25 +40,14 @@ class FinanceController extends Controller
     public function index(Request $request)
     {
         $month = $request->query('month', date('Y-m'));
-        $between = Dates::getMonthBoundary($month);
+        $transaction_groups = $this->financeSvc->getAllAirlineTransactionsBetween($month);
 
-        $first_journal = Journal::where(['type' => JournalType::AIRLINE])
+        $first_journal = Journal::select(['created_at'])
+            ->where(['type' => JournalType::AIRLINE])
             ->orderBy('created_at', 'asc')
             ->limit(1)
             ->first();
 
-        $transaction_groups = [];
-        $airlines = $this->airlineRepo->orderBy('icao')->all();
-
-        // group by the airline
-        foreach ($airlines as $airline) {
-            $transaction_groups[] = $this->financeSvc->getAirlineTransactionsBetween(
-                $airline,
-                $between[0],
-                $between[1]
-            );
-        }
-
         return view('admin.finances.index', [
             'current_month'      => $month,
             'months_list'        => Dates::getMonthsList($first_journal->created_at),

app/Http/Controllers/Admin/FlightController.php

@@ -3,9 +3,11 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Contracts\Controller;
+use App\Http\Controllers\Admin\Traits\Importable;
 use App\Http\Requests\CreateFlightRequest;
 use App\Http\Requests\UpdateFlightRequest;
 use App\Models\Enums\FlightType;
+use App\Models\Enums\ImportExportType;
 use App\Models\Flight;
 use App\Models\FlightField;
 use App\Models\FlightFieldValue;
@@ -25,11 +27,10 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
 use Laracasts\Flash\Flash;
 
-/**
- * Class FlightController
- */
 class FlightController extends Controller
 {
+    use Importable;
+
     private $airlineRepo;
     private $airportRepo;
     private $fareRepo;
@@ -324,15 +325,7 @@ class FlightController extends Controller
         ];
 
         if ($request->isMethod('post')) {
-            $path = Storage::putFileAs(
-                'import',
-                $request->file('csv_file'),
-                'import_flights.csv'
-            );
-
-            $path = storage_path('app/'.$path);
-            Log::info('Uploaded flights import file to '.$path);
-            $logs = $this->importSvc->importFlights($path);
+            $logs = $this->importFile($request, ImportExportType::FLIGHTS);
         }
 
         return view('admin.flights.import', [

app/Http/Controllers/Admin/FlightFieldController.php

@@ -4,14 +4,10 @@ namespace App\Http\Controllers\Admin;
 
 use App\Contracts\Controller;
 use App\Repositories\FlightFieldRepository;
-use Flash;
 use Illuminate\Http\Request;
+use Laracasts\Flash\Flash;
 use Prettus\Repository\Criteria\RequestCriteria;
-use Response;
 
-/**
- * Class FlightFieldController
- */
 class FlightFieldController extends Controller
 {
     private $flightFieldRepo;
@@ -34,7 +30,7 @@ class FlightFieldController extends Controller
      *
      * @throws \Prettus\Repository\Exceptions\RepositoryException
      *
-     * @return Response
+     * @return mixed
      */
     public function index(Request $request)
     {
@@ -48,8 +44,6 @@ class FlightFieldController extends Controller
 
     /**
      * Show the form for creating a new FlightField.
-     *
-     * @return Response
      */
     public function create()
     {
@@ -63,7 +57,7 @@ class FlightFieldController extends Controller
      *
      * @throws \Prettus\Validator\Exceptions\ValidatorException
      *
-     * @return Response
+     * @return mixed
      */
     public function store(Request $request)
     {
@@ -81,7 +75,7 @@ class FlightFieldController extends Controller
      *
      * @param int $id
      *
-     * @return Response
+     * @return mixed
      */
     public function show($id)
     {
@@ -102,7 +96,7 @@ class FlightFieldController extends Controller
      *
      * @param int $id
      *
-     * @return Response
+     * @return mixed
      */
     public function edit($id)
     {
@@ -126,7 +120,7 @@ class FlightFieldController extends Controller
      *
      * @throws \Prettus\Validator\Exceptions\ValidatorException
      *
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @return mixed
      */
     public function update($id, Request $request)
     {
@@ -150,7 +144,7 @@ class FlightFieldController extends Controller
      *
      * @param int $id
      *
-     * @return Response
+     * @return mixed
      */
     public function destroy($id)
     {

app/Http/Controllers/Admin/MaintenanceController.php

@@ -3,32 +3,41 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Contracts\Controller;
+use App\Repositories\KvpRepository;
 use App\Services\CronService;
+use App\Services\VersionService;
+use Codedge\Updater\UpdaterManager;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Log;
 use Laracasts\Flash\Flash;
 
 class MaintenanceController extends Controller
 {
     private $cronSvc;
+    private $kvpRepo;
+    private $updateManager;
+    private $versionSvc;
 
-    public function __construct(CronService $cronSvc)
-    {
+    public function __construct(
+        CronService $cronSvc,
+        KvpRepository $kvpRepo,
+        UpdaterManager $updateManager,
+        VersionService $versionSvc
+    ) {
         $this->cronSvc = $cronSvc;
+        $this->kvpRepo = $kvpRepo;
+        $this->updateManager = $updateManager;
+        $this->versionSvc = $versionSvc;
     }
 
     public function index()
     {
-        // Generate the cron path. Replace php-fpm with just php
-        $cron_path = [
-            '* * * * *',
-            $this->cronSvc->getCronPath(),
-            '>> /dev/null 2>&1',
-        ];
-
         return view('admin.maintenance.index', [
-            'cron_path'           => implode(' ', $cron_path),
+            'cron_path'           => $this->cronSvc->getCronExecString(),
             'cron_problem_exists' => $this->cronSvc->cronProblemExists(),
+            'new_version'         => true, //$this->kvpRepo->get('new_version_available', false),
+            'new_version_tag'     => $this->kvpRepo->get('latest_version_tag'),
         ]);
     }
 
@@ -37,7 +46,7 @@ class MaintenanceController extends Controller
      *
      * @param \Illuminate\Http\Request $request
      *
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @return mixed
      */
     public function cache(Request $request)
     {
@@ -49,6 +58,7 @@ class MaintenanceController extends Controller
             $calls[] = 'config:cache';
             $calls[] = 'cache:clear';
             $calls[] = 'route:cache';
+            $calls[] = 'clear-compiled';
         }
 
         // If we want to clear only the views but keep everything else
@@ -63,4 +73,43 @@ class MaintenanceController extends Controller
         Flash::success('Cache cleared!');
         return redirect(route('admin.maintenance.index'));
     }
+
+    /**
+     * Force an update check
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return mixed
+     */
+    public function forcecheck(Request $request)
+    {
+        $this->versionSvc->isNewVersionAvailable();
+
+        $new_version_avail = $this->kvpRepo->get('new_version_available', false);
+        $new_version_tag = $this->kvpRepo->get('latest_version_tag');
+
+        Log::info('Force check, available='.$new_version_avail.', tag='.$new_version_tag);
+
+        if (!$new_version_avail) {
+            Flash::success('No new version available');
+        } else {
+            Flash::success('New version available: '.$new_version_tag);
+        }
+
+        return redirect(route('admin.maintenance.index'));
+    }
+
+    /**
+     * Update the phpVMS install
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return mixed
+     */
+    public function update(Request $request)
+    {
+        $new_version_tag = $this->kvpRepo->get('latest_version_tag');
+        Log::info('Attempting to update to '.$new_version_tag);
+        return redirect('/update/downloader');
+    }
 }

app/Http/Controllers/Admin/PagesController.php

@@ -0,0 +1,152 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Contracts\Controller;
+use App\Http\Requests\CreatePageRequest;
+use App\Http\Requests\UpdatePageRequest;
+use App\Repositories\PageRepository;
+use Illuminate\Http\Request;
+use Laracasts\Flash\Flash;
+
+class PagesController extends Controller
+{
+    private $pageRepo;
+
+    /**
+     * @param PageRepository $pageRepo
+     */
+    public function __construct(PageRepository $pageRepo)
+    {
+        $this->pageRepo = $pageRepo;
+    }
+
+    /**
+     * @param Request $request
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function index(Request $request)
+    {
+        $pages = $this->pageRepo->all();
+
+        return view('admin.pages.index', [
+            'pages' => $pages,
+        ]);
+    }
+
+    /**
+     * Show the form for creating a new Airlines.
+     */
+    public function create()
+    {
+        return view('admin.pages.create');
+    }
+
+    /**
+     * Store a newly created Airlines in storage.
+     *
+     * @param \App\Http\Requests\CreatePageRequest $request
+     *
+     * @throws \Prettus\Validator\Exceptions\ValidatorException
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function store(CreatePageRequest $request)
+    {
+        $input = $request->all();
+        $this->pageRepo->create($input);
+
+        Flash::success('Page saved successfully.');
+        return redirect(route('admin.pages.index'));
+    }
+
+    /**
+     * Display the specified page
+     *
+     * @param int $id
+     *
+     * @return mixed
+     */
+    public function show($id)
+    {
+        $pages = $this->pageRepo->findWithoutFail($id);
+
+        if (empty($pages)) {
+            Flash::error('Page not found');
+            return redirect(route('admin.page.index'));
+        }
+
+        return view('admin.pages.show', [
+            'pages' => $pages,
+        ]);
+    }
+
+    /**
+     * Show the form for editing the specified pages
+     *
+     * @param int $id
+     *
+     * @return mixed
+     */
+    public function edit($id)
+    {
+        $page = $this->pageRepo->findWithoutFail($id);
+
+        if (empty($page)) {
+            Flash::error('Page not found');
+            return redirect(route('admin.pages.index'));
+        }
+
+        return view('admin.pages.edit', [
+            'page' => $page,
+        ]);
+    }
+
+    /**
+     * Update the specified Airlines in storage.
+     *
+     * @param int               $id
+     * @param UpdatePageRequest $request
+     *
+     * @throws \Prettus\Validator\Exceptions\ValidatorException
+     *
+     * @return mixed
+     */
+    public function update($id, UpdatePageRequest $request)
+    {
+        $page = $this->pageRepo->findWithoutFail($id);
+
+        if (empty($page)) {
+            Flash::error('page not found');
+            return redirect(route('admin.pages.index'));
+        }
+
+        $this->pageRepo->update($request->all(), $id);
+
+        Flash::success('pages updated successfully.');
+        return redirect(route('admin.pages.index'));
+    }
+
+    /**
+     * Remove the specified Airlines from storage.
+     *
+     * @param int $id
+     *
+     * @return mixed
+     */
+    public function destroy($id)
+    {
+        $pages = $this->pageRepo->findWithoutFail($id);
+
+        if (empty($pages)) {
+            Flash::error('Page not found');
+            return redirect(route('admin.pages.index'));
+        }
+
+        $this->pageRepo->delete($id);
+
+        Flash::success('page deleted successfully.');
+        return redirect(route('admin.pages.index'));
+    }
+}

app/Http/Controllers/Admin/PirepController.php

@@ -3,7 +3,6 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Contracts\Controller;
-use App\Facades\Utils;
 use App\Http\Requests\CreatePirepRequest;
 use App\Http\Requests\UpdatePirepRequest;
 use App\Models\Enums\PirepSource;
@@ -21,16 +20,12 @@ use App\Services\FareService;
 use App\Services\PirepService;
 use App\Services\UserService;
 use App\Support\Units\Time;
-use Flash;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
-use Log;
+use Illuminate\Support\Facades\Log;
+use Laracasts\Flash\Flash;
 use Prettus\Repository\Criteria\RequestCriteria;
-use Response;
 
-/**
- * Class PirepController
- */
 class PirepController extends Controller
 {
     private $airportRepo;
@@ -170,7 +165,7 @@ class PirepController extends Controller
      *
      * @param Request $request
      *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @return mixed
      */
     public function fares(Request $request)
     {
@@ -192,7 +187,7 @@ class PirepController extends Controller
      *
      * @throws \Prettus\Repository\Exceptions\RepositoryException
      *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @return mixed
      */
     public function index(Request $request)
     {
@@ -218,7 +213,7 @@ class PirepController extends Controller
      *
      * @throws \Prettus\Repository\Exceptions\RepositoryException
      *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @return mixed
      */
     public function pending(Request $request)
     {
@@ -238,7 +233,7 @@ class PirepController extends Controller
     /**
      * Show the form for creating a new Pirep.
      *
-     * @return Response
+     * @return mixed
      */
     public function create()
     {
@@ -264,7 +259,7 @@ class PirepController extends Controller
 
         $hours = (int) $attrs['hours'];
         $minutes = (int) $attrs['minutes'];
-        $pirep->flight_time = Utils::hoursToMinutes($hours) + $minutes;
+        $pirep->flight_time = Time::hoursToMinutes($hours) + $minutes;
 
         $this->saveCustomFields($pirep, $request);
         $this->saveFares($pirep, $request);
@@ -279,7 +274,7 @@ class PirepController extends Controller
      *
      * @param int $id
      *
-     * @return Response
+     * @return mixed
      */
     public function show($id)
     {
@@ -302,7 +297,7 @@ class PirepController extends Controller
      *
      * @throws \InvalidArgumentException
      *
-     * @return Response
+     * @return mixed
      */
     public function edit($id)
     {
@@ -388,7 +383,7 @@ class PirepController extends Controller
      *
      * @param int $id
      *
-     * @return Response
+     * @return mixed
      */
     public function destroy($id)
     {

app/Http/Controllers/Admin/PirepFieldController.php

@@ -6,14 +6,10 @@ use App\Contracts\Controller;
 use App\Http\Requests\CreatePirepFieldRequest;
 use App\Http\Requests\UpdatePirepFieldRequest;
 use App\Repositories\PirepFieldRepository;
-use Flash;
 use Illuminate\Http\Request;
+use Laracasts\Flash\Flash;
 use Prettus\Repository\Criteria\RequestCriteria;
-use Response;
 
-/**
- * Class PirepFieldController
- */
 class PirepFieldController extends Controller
 {
     private $pirepFieldRepo;
@@ -36,7 +32,7 @@ class PirepFieldController extends Controller
      *
      * @throws \Prettus\Repository\Exceptions\RepositoryException
      *
-     * @return Response
+     * @return mixed
      */
     public function index(Request $request)
     {
@@ -51,7 +47,7 @@ class PirepFieldController extends Controller
     /**
      * Show the form for creating a new PirepField.
      *
-     * @return Response
+     * @return mixed
      */
     public function create()
     {
@@ -65,7 +61,7 @@ class PirepFieldController extends Controller
      *
      * @throws \Prettus\Validator\Exceptions\ValidatorException
      *
-     * @return Response
+     * @return mixed
      */
     public function store(CreatePirepFieldRequest $request)
     {
@@ -85,7 +81,7 @@ class PirepFieldController extends Controller
      *
      * @param int $id
      *
-     * @return Response
+     * @return mixed
      */
     public function show($id)
     {
@@ -107,7 +103,7 @@ class PirepFieldController extends Controller
      *
      * @param int $id
      *
-     * @return Response
+     * @return mixed
      */
     public function edit($id)
     {
@@ -158,7 +154,7 @@ class PirepFieldController extends Controller
      *
      * @param int $id
      *
-     * @return Response
+     * @return mixed
      */
     public function destroy($id)
     {

app/Http/Controllers/Admin/RankController.php

@@ -9,14 +9,10 @@ use App\Repositories\RankRepository;
 use App\Repositories\SubfleetRepository;
 use App\Services\FleetService;
 use Cache;
-use Flash;
 use Illuminate\Http\Request;
+use Laracasts\Flash\Flash;
 use Prettus\Repository\Criteria\RequestCriteria;
-use Response;
 
-/**
- * Class RankController
- */
 class RankController extends Controller
 {
     private $fleetSvc;
@@ -67,7 +63,7 @@ class RankController extends Controller
      *
      * @throws \Prettus\Repository\Exceptions\RepositoryException
      *
-     * @return Response
+     * @return mixed
      */
     public function index(Request $request)
     {
@@ -82,7 +78,7 @@ class RankController extends Controller
     /**
      * Show the form for creating a new Ranking.
      *
-     * @return Response
+     * @return mixed
      */
     public function create()
     {
@@ -96,7 +92,7 @@ class RankController extends Controller
      *
      * @throws \Prettus\Validator\Exceptions\ValidatorException
      *
-     * @return Response
+     * @return mixed
      */
     public function store(CreateRankRequest $request)
     {
@@ -115,7 +111,7 @@ class RankController extends Controller
      *
      * @param int $id
      *
-     * @return Response
+     * @return mixed
      */
     public function show($id)
     {
@@ -137,7 +133,7 @@ class RankController extends Controller
      *
      * @param int $id
      *
-     * @return Response
+     * @return mixed
      */
     public function edit($id)
     {
@@ -165,7 +161,7 @@ class RankController extends Controller
      *
      * @throws \Prettus\Validator\Exceptions\ValidatorException
      *
-     * @return Response
+     * @return mixed
      */
     public function update($id, UpdateRankRequest $request)
     {
@@ -190,7 +186,7 @@ class RankController extends Controller
      *
      * @param int $id
      *
-     * @return Response
+     * @return mixed
      */
     public function destroy($id)
     {