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

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-CKEDITOR4-1922733
- https://snyk.io/vuln/SNYK-JS-CKEDITOR4-1922735

.github/scripts/build.sh

@@ -70,14 +70,22 @@ mkdir -p storage/framework/views
 
 cd /tmp
 
+echo "Current directory contents"
+ls -al $BASE_DIR
+
+echo "Parent directory contents"
 ls -al $BASE_DIR/../
 
-tar -czf $TAR_NAME -C $BASE_DIR .
+echo "Calling find"
+find $BASE_DIR/../ -type d -maxdepth 2
+
+tar -czf $TAR_NAME -C $BASE_DIR --xform 's:^\./::' . [--show-transformed-names|--show-stored-names]
 sha256sum $TAR_NAME >"$TAR_NAME.sha256"
 
 cd $BASE_DIR;
-zip -r $ZIP_NAME *
+zip -r $ZIP_NAME ./
 sha256sum $ZIP_NAME >"$ZIP_NAME.sha256"
+
 mv $ZIP_NAME /tmp
 mv "$ZIP_NAME.sha256" /tmp
 

.github/workflows/build.yml

@@ -116,7 +116,6 @@ jobs:
       - name: 'Install Release Dependencies'
         run: |
           rm -rf vendor
-          sudo npm i tar-to-zip -g
           composer install --no-dev --prefer-dist --no-interaction --verbose
           sudo chmod +x ./.github/scripts/*
 
@@ -179,7 +178,6 @@ jobs:
       - name: 'Install Release Dependencies'
         run: |
           rm -rf vendor
-          sudo npm i tar-to-zip -g
           composer install --no-dev --prefer-dist --no-interaction --verbose
           sudo chmod +x ./.github/scripts/*
 

Dockerfile

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

LICENSE

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

Makefile

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

app/Contracts/ImportExport.php

@@ -170,6 +170,11 @@ class ImportExport
         }
 
         foreach ($split_values as $value) {
+            $value = trim($value);
+            if ($value === '') {
+                continue;
+            }
+
             // This isn't in the query string format, so it's
             // just a straight key-value pair set
             if (strpos($value, '?') === false) {

app/Cron/Hourly/DeletePireps.php

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

app/Cron/Hourly/RemoveExpiredLiveFlights.php

@@ -32,6 +32,7 @@ class RemoveExpiredLiveFlights extends Listener
         $pireps = Pirep::where('updated_at', '<', $date)
             ->where('state', PirepState::IN_PROGRESS)
             ->get();
+
         foreach ($pireps as $pirep) {
             event(new PirepCancelled($pirep));
             Log::info('Cron: Deleting Expired Live PIREP id='.$pirep->id.', state='.PirepState::label($pirep->state));

app/Events/Fares.php

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

app/Http/Controllers/Admin/ModulesController.php

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

app/Http/Controllers/Admin/PirepController.php

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

app/Http/Controllers/Api/AcarsController.php

@@ -193,9 +193,9 @@ class AcarsController extends Controller
         }
 
         // Change the PIREP status if it's as SCHEDULED before
-        if ($pirep->status === PirepStatus::INITIATED) {
+        /*if ($pirep->status === PirepStatus::INITIATED) {
             $pirep->status = PirepStatus::AIRBORNE;
-        }
+        }*/
 
         $pirep->save();
 

app/Http/Controllers/Api/AirlineController.php

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

app/Http/Controllers/Api/UserController.php

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

app/Http/Controllers/Frontend/AirportController.php

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

app/Http/Controllers/Frontend/DashboardController.php

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

app/Http/Controllers/Frontend/DownloadController.php

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

app/Http/Controllers/Frontend/FlightController.php

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

app/Http/Controllers/Frontend/HomeController.php

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

app/Http/Controllers/Frontend/PirepController.php

@@ -182,7 +182,7 @@ class PirepController extends Controller
 
         $where = [['user_id', $user->id]];
         $where[] = ['state', '<>', PirepState::CANCELLED];
-        $with = ['airline', 'aircraft', 'dpt_airport', 'arr_airport', 'fares', 'comments'];
+        $with = ['aircraft', 'airline', 'arr_airport', 'comments', 'dpt_airport'];
 
         $this->pirepRepo->with($with)
             ->pushCriteria(new WhereCriteria($request, $where));
@@ -201,7 +201,20 @@ class PirepController extends Controller
      */
     public function show($id)
     {
-        $pirep = $this->pirepRepo->with(['simbrief'])->find($id);
+        $with = [
+            'acars_logs',
+            'aircraft.airline',
+            'airline.journal',
+            'arr_airport',
+            'comments',
+            'dpt_airport',
+            'fares.fare',
+            'transactions',
+            'simbrief',
+            'user.rank',
+        ];
+
+        $pirep = $this->pirepRepo->with($with)->find($id);
         if (empty($pirep)) {
             Flash::error('Pirep not found');
             return redirect(route('frontend.pirep.index'));

app/Http/Controllers/Frontend/ProfileController.php

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

app/Http/Controllers/Frontend/SimBriefController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Frontend;
 
 use App\Exceptions\AssetNotFound;
 use App\Models\Aircraft;
+use App\Models\Bid;
 use App\Models\Enums\AircraftState;
 use App\Models\Enums\AircraftStatus;
 use App\Models\Enums\FareType;
@@ -14,6 +15,7 @@ use App\Models\SimBrief;
 use App\Models\User;
 use App\Repositories\FlightRepository;
 use App\Services\FareService;
+use App\Services\ModuleService;
 use App\Services\SimBriefService;
 use App\Services\UserService;
 use Exception;
@@ -24,17 +26,20 @@ class SimBriefController
 {
     private $fareSvc;
     private $flightRepo;
+    private $moduleSvc;
     private $simBriefSvc;
     private $userSvc;
 
     public function __construct(
         FareService $fareSvc,
         FlightRepository $flightRepo,
+        ModuleService $moduleSvc,
         SimBriefService $simBriefSvc,
         UserService $userSvc
     ) {
         $this->fareSvc = $fareSvc;
         $this->flightRepo = $flightRepo;
+        $this->moduleSvc = $moduleSvc;
         $this->simBriefSvc = $simBriefSvc;
         $this->userSvc = $userSvc;
     }
@@ -57,7 +62,7 @@ class SimBriefController
         $aircraft_id = $request->input('aircraft_id');
 
         /** @var Flight $flight */
-        $flight = $this->flightRepo->with(['fares', 'subfleets'])->find($flight_id);
+        $flight = $this->flightRepo->with(['airline', 'arr_airport', 'dpt_airport', 'fares', 'subfleets'])->find($flight_id);
 
         if (!$flight) {
             flash()->error('Unknown flight');
@@ -106,6 +111,7 @@ class SimBriefController
             if (setting('simbrief.block_aircraft')) {
                 // Build a list of aircraft_id's being used for active sb packs
                 $sb_aircraft = SimBrief::whereNotNull('flight_id')->pluck('aircraft_id');
+
                 // Filter aircraft list to non used/blocked ones
                 $aircrafts = $aircrafts->whereNotIn('id', $sb_aircraft);
             }
@@ -130,7 +136,7 @@ class SimBriefController
         // SimBrief profile does not exists and everything else is ok
         // Select aircraft which will be used for calculations and details
         /** @var Aircraft $aircraft */
-        $aircraft = Aircraft::where('id', $aircraft_id)->first();
+        $aircraft = Aircraft::with(['airline'])->where('id', $aircraft_id)->first();
 
         // Figure out the proper fares to use for this flight/aircraft
         $all_fares = $this->fareSvc->getFareWithOverrides($aircraft->subfleet->fares, $flight->fares);
@@ -225,7 +231,7 @@ class SimBriefController
 
         // Show the main simbrief form
         return view('flights.simbrief_form', [
-            'user'             => Auth::user(),
+            'user'             => $user,
             'flight'           => $flight,
             'aircraft'         => $aircraft,
             'pax_weight'       => $pax_weight,
@@ -253,7 +259,11 @@ class SimBriefController
      */
     public function briefing($id)
     {
-        $simbrief = SimBrief::find($id);
+        /** @var User $user */
+        $user = Auth::user();
+
+        /** @var SimBrief $simbrief */
+        $simbrief = SimBrief::with(['flight.airline', 'pirep.airline'])->find($id);
         if (!$simbrief) {
             flash()->error('SimBrief briefing not found');
             return redirect(route('frontend.flights.index'));
@@ -266,11 +276,18 @@ class SimBriefController
         $equipment = substr($str, $wc + 1, $tr - 2);
         $transponder = substr($str, $tr + 1);
 
+        // See if a bid exists for this flight
+        $bid = Bid::where(['user_id' => $user->id, 'flight_id' => $simbrief->flight_id])->first();
+
         return view('flights.simbrief_briefing', [
-            'simbrief'    => $simbrief,
-            'wakecat'     => $wakecat,
-            'equipment'   => $equipment,
-            'transponder' => $transponder,
+            'user'         => $user,
+            'simbrief'     => $simbrief,
+            'wakecat'      => $wakecat,
+            'equipment'    => $equipment,
+            'transponder'  => $transponder,
+            'bid'          => $bid,
+            'flight'       => $simbrief->flight,
+            'acars_plugin' => $this->moduleSvc->isModuleActive('VMSAcars'),
         ]);
     }
 

app/Http/Controllers/Frontend/UserController.php

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

app/Listeners/ExpenseListener.php

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

app/Listeners/FareListener.php

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

app/Models/Aircraft.php

@@ -7,6 +7,7 @@ use App\Models\Enums\AircraftStatus;
 use App\Models\Traits\ExpensableTrait;
 use App\Models\Traits\FilesTrait;
 use Carbon\Carbon;
+use Znck\Eloquent\Traits\BelongsToThrough;
 
 /**
  * @property int      id
@@ -31,6 +32,7 @@ class Aircraft extends Model
 {
     use ExpensableTrait;
     use FilesTrait;
+    use BelongsToThrough;
 
     public $table = 'aircraft';
 
@@ -100,14 +102,41 @@ class Aircraft extends Model
         $this->attributes['icao'] = strtoupper($icao);
     }
 
+    /**
+     * Return the landing time in carbon format if provided
+     *
+     * @return Carbon|null
+     */
+    public function getLandingTimeAttribute()
+    {
+        if (array_key_exists('landing_time', $this->attributes) && filled($this->attributes['landing_time'])) {
+            return new Carbon($this->attributes['landing_time']);
+        }
+    }
+
     /**
      * foreign keys
      */
+    public function airline()
+    {
+        return $this->belongsToThrough(Airline::class, Subfleet::class);
+    }
+
     public function airport()
     {
         return $this->belongsTo(Airport::class, 'airport_id');
     }
 
+    public function pireps()
+    {
+        return $this->hasMany(Pirep::class, 'aircraft_id');
+    }
+
+    public function simbriefs()
+    {
+        return $this->hasMany(SimBrief::class, 'aircraft_id');
+    }
+
     public function subfleet()
     {
         return $this->belongsTo(Subfleet::class, 'subfleet_id');

app/Models/Airline.php

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

app/Models/Bid.php

@@ -6,7 +6,7 @@ use App\Contracts\Model;
 use Carbon\Carbon;
 
 /**
- * @property string user_id
+ * @property int    user_id
  * @property string flight_id
  * @property Carbon created_at
  * @property Carbon updated_at

app/Models/Enums/AircraftStatus.php

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

app/Models/Enums/PirepState.php

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

app/Models/Enums/PirepStatus.php

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

app/Models/Flight.php

@@ -136,19 +136,19 @@ class Flight extends Model
     }
 
     /**
-     * Get the flight ident, e.,g JBU1900
+     * Get the flight ident, e.,g JBU1900/C.nn/L.yy
      */
     public function getIdentAttribute(): string
     {
-        $flight_id = $this->airline->code;
+        $flight_id = optional($this->airline)->code;
         $flight_id .= $this->flight_number;
 
         if (filled($this->route_code)) {
-            $flight_id .= '-'.$this->route_code;
+            $flight_id .= '/C.'.$this->route_code;
         }
 
         if (filled($this->route_leg)) {
-            $flight_id .= '-'.$this->route_leg;
+            $flight_id .= '/L.'.$this->route_leg;
         }
 
         return $flight_id;

app/Models/Pirep.php

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

app/Models/SimBrief.php

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

app/Models/User.php

@@ -126,7 +126,7 @@ class User extends Authenticatable
     {
         $length = setting('pilots.id_length');
 
-        return $this->airline->icao.str_pad($this->pilot_id, $length, '0', STR_PAD_LEFT);
+        return optional($this->airline)->icao.str_pad($this->pilot_id, $length, '0', STR_PAD_LEFT);
     }
 
     /**

app/Models/UserFieldValue.php

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

app/Notifications/Messages/PirepPrefiled.php

@@ -48,9 +48,9 @@ class PirepPrefiled extends Notification implements ShouldQueue
             return null;
         }
 
-        $title = 'Flight '.$pirep->airline->code.$pirep->ident.' Prefiled';
+        $title = 'Flight '.$pirep->ident.' Prefiled';
         $fields = [
-            'Flight'                => $pirep->airline->code.$pirep->ident,
+            'Flight'                => $pirep->ident,
             'Departure Airport'     => $pirep->dpt_airport_id,
             'Arrival Airport'       => $pirep->arr_airport_id,
             'Equipment'             => $pirep->aircraft->ident,

app/Notifications/Messages/PirepStatusChanged.php

@@ -44,6 +44,7 @@ class PirepStatusChanged extends Notification implements ShouldQueue
         PirepStatus::LANDED        => 'has landed',
         PirepStatus::ARRIVED       => 'has arrived',
         PirepStatus::CANCELLED     => 'is cancelled',
+        PirepStatus::PAUSED        => 'is paused',
         PirepStatus::EMERG_DESCENT => 'in emergency descent',
     ];
 
@@ -76,10 +77,10 @@ class PirepStatusChanged extends Notification implements ShouldQueue
             return null;
         }
 
-        $title = 'Flight '.$pirep->airline->code.$pirep->ident.' '.self::$verbs[$pirep->status];
+        $title = 'Flight '.$pirep->ident.' '.self::$verbs[$pirep->status];
 
         $fields = [
-            'Flight'            => $pirep->airline->code.$pirep->ident,
+            'Flight'            => $pirep->ident,
             'Departure Airport' => $pirep->dpt_airport_id,
             'Arrival Airport'   => $pirep->arr_airport_id,
             'Equipment'         => $pirep->aircraft->ident,
@@ -101,12 +102,12 @@ class PirepStatusChanged extends Notification implements ShouldQueue
                         $planned_distance = new Distance($pirep->planned_distance, $unit);
                         $pd = $planned_distance[$planned_distance->unit];
                         $fields['Distance'] .= '/'.$pd;
-                    } catch (NonNumericValue | NonStringUnitName $e) {
+                    } catch (NonNumericValue|NonStringUnitName $e) {
                     }
                 }
 
                 $fields['Distance'] .= ' '.$planned_distance->unit;
-            } catch (NonNumericValue | NonStringUnitName $e) {
+            } catch (NonNumericValue|NonStringUnitName $e) {
             }
         }
 

app/Notifications/Messages/PirepSubmitted.php

@@ -55,9 +55,9 @@ class PirepSubmitted extends Notification implements ShouldQueue
             return null;
         }
 
-        $title = 'Flight '.$pirep->airline->code.$pirep->ident.' Filed';
+        $title = 'Flight '.$pirep->ident.' Filed';
         $fields = [
-            'Flight'                => $pirep->airline->code.$pirep->ident,
+            'Flight'                => $pirep->ident,
             'Departure Airport'     => $pirep->dpt_airport_id,
             'Arrival Airport'       => $pirep->arr_airport_id,
             'Equipment'             => $pirep->aircraft->ident,
@@ -73,7 +73,7 @@ class PirepSubmitted extends Notification implements ShouldQueue
 
                 $pd = $planned_distance[$planned_distance->unit].' '.$planned_distance->unit;
                 $fields['Distance (Planned)'] = $pd;
-            } catch (NonNumericValue | NonStringUnitName $e) {
+            } catch (NonNumericValue|NonStringUnitName $e) {
             }
         }
 

app/Notifications/NotificationEventsHandler.php

@@ -58,8 +58,8 @@ class NotificationEventsHandler extends Listener
             }
 
             try {
-                $this->notifyUser($user, $notification);
-                // Notification::send([$user], $notification);
+                // $this->notifyUser($user, $notification);
+                Notification::send([$user], $notification);
             } catch (Exception $e) {
                 Log::emergency('Error emailing admin ('.$user->email.'). Error='.$e->getMessage());
             }

app/Providers/EventServiceProvider.php

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

app/Providers/RouteServiceProvider.php

@@ -584,6 +584,10 @@ class RouteServiceProvider extends ServiceProvider
                 Route::get('user/fleet', 'UserController@fleet');
                 Route::get('user/pireps', 'UserController@pireps');
 
+                Route::get('bids', 'UserController@bids');
+                Route::get('bids/{id}', 'UserController@get_bid');
+                Route::get('user/bids/{id}', 'UserController@get_bid');
+
                 Route::get('user/bids', 'UserController@bids');
                 Route::put('user/bids', 'UserController@bids');
                 Route::post('user/bids', 'UserController@bids');

app/Repositories/AcarsRepository.php

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

app/Repositories/FlightRepository.php

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

app/Repositories/UserRepository.php

@@ -36,9 +36,14 @@ class UserRepository extends Repository
      *
      * @return \App\Models\UserField[]|\Illuminate\Database\Eloquent\Collection|\Illuminate\Support\Collection
      */
-    public function getUserFields(User $user, $only_public_fields = true): Collection
+    public function getUserFields(User $user, $only_public_fields = null): Collection
     {
-        $fields = UserField::where(['private' => !$only_public_fields])->get();
+        if (is_bool($only_public_fields)) {
+            $fields = UserField::where(['private' => !$only_public_fields])->get();
+        } else {
+            $fields = UserField::get();
+        }
+
         return $fields->map(function ($field, $_) use ($user) {
             foreach ($user->fields as $userFieldValue) {
                 if ($userFieldValue->field->slug === $field->slug) {

app/Services/BidService.php

@@ -8,6 +8,7 @@ use App\Exceptions\UserBidLimit;
 use App\Models\Bid;
 use App\Models\Flight;
 use App\Models\Pirep;
+use App\Models\SimBrief;
 use App\Models\User;
 use Illuminate\Support\Facades\Log;
 
@@ -30,12 +31,24 @@ class BidService extends Service
      *
      * @param $bid_id
      *
-     * @return \App\Models\Bid|\Illuminate\Database\Eloquent\Model|tests/ImporterTest.php:521object|null
+     * @return \App\Models\Bid|\Illuminate\Database\Eloquent\Model|object|null
      */
-    public function getBid($bid_id)
+    public function getBid(User $user, $bid_id): Bid
     {
-        return Bid::with(['flight', 'flight.simbrief'])
-            ->where(['id' => $bid_id])->first();
+        $with = [
+            'flight',
+            'flight.fares',
+            'flight.simbrief' => function ($query) use ($user) {
+                $query->where('user_id', $user->id);
+            },
+            'flight.simbrief.aircraft',
+            'flight.simbrief.aircraft.subfleet',
+            'flight.subfleets',
+            'flight.subfleets.aircraft',
+            'flight.subfleets.fares',
+        ];
+
+        return Bid::with($with)->where(['id' => $bid_id])->first();
     }
 
     /**
@@ -132,7 +145,7 @@ class BidService extends Service
         $flight->has_bid = true;
         $flight->save();
 
-        return $this->getBid($bid->id);
+        return $this->getBid($user, $bid->id);
     }
 
     /**
@@ -152,6 +165,14 @@ class BidService extends Service
             $bid->forceDelete();
         }
 
+        // Remove SimBrief OFP when removing the bid if it is not flown
+        if (setting('simbrief.only_bids')) {
+            $simbrief = SimBrief::where([
+                'user_id'   => $user->id,
+                'flight_id' => $flight->id,
+            ])->whereNull('pirep_id')->delete();
+        }
+
         // Only flip the flag if there are no bids left for this flight
         $bid_count = Bid::where(['flight_id' => $flight->id])->count();
         if ($bid_count === 0) {

app/Services/Finance/PirepFinanceService.php

@@ -4,6 +4,7 @@ namespace App\Services\Finance;
 
 use App\Contracts\Service;
 use App\Events\Expenses as ExpensesEvent;
+use App\Events\Fares as FaresEvent;
 use App\Models\Aircraft;
 use App\Models\Airport;
 use App\Models\Enums\ExpenseType;
@@ -13,6 +14,7 @@ use App\Models\Enums\PirepSource;
 use App\Models\Enums\PirepState;
 use App\Models\Enums\PirepStatus;
 use App\Models\Expense;
+use App\Models\Fare;
 use App\Models\Pirep;
 use App\Models\Subfleet;
 use App\Repositories\ExpenseRepository;
@@ -81,6 +83,7 @@ class PirepFinanceService extends Service
         // Now start and pay from scratch
         $this->payFuelCosts($pirep);
         $this->payFaresForPirep($pirep);
+        $this->payFaresEventsForPirep($pirep);
         $this->payExpensesForSubfleet($pirep);
         $this->payExpensesForPirep($pirep);
         $this->payAirportExpensesForPirep($pirep);
@@ -145,6 +148,53 @@ class PirepFinanceService extends Service
         }
     }
 
+    /**
+     * Collect all of the fares from listeners and apply those to the journal
+     *
+     * @param Pirep $pirep
+     *
+     * @throws \UnexpectedValueException
+     * @throws \InvalidArgumentException
+     * @throws \Prettus\Validator\Exceptions\ValidatorException
+     */
+    public function payFaresEventsForPirep(Pirep $pirep): void
+    {
+        // Throw an event and collect any fares returned from it
+        $gathered_fares = event(new FaresEvent($pirep));
+        if (!\is_array($gathered_fares)) {
+            return;
+        }
+
+        foreach ($gathered_fares as $event_fare) {
+            if (!\is_array($event_fare)) {
+                continue;
+            }
+
+            foreach ($event_fare as $fare) {
+                // Make sure it's of type Fare Model
+                if (!($fare instanceof Fare)) {
+                    Log::info('Finance: Event Fare is not an instance of Fare Model, aborting process!');
+                    continue;
+                }
+
+                $credit = Money::createFromAmount($fare->price);
+                $debit = Money::createFromAmount($fare->cost);
+                Log::info('Finance: Income From Listener N='.$fare->name.', C='.$credit.', D='.$debit);
+
+                $this->journalRepo->post(
+                    $pirep->airline->journal,
+                    $credit,
+                    $debit,
+                    $pirep,
+                    $fare->name,
+                    null,
+                    $fare->notes,
+                    'additional-sales'
+                );
+            }
+        }
+    }
+
     /**
      * Calculate the fuel used by the PIREP and add those costs in
      *

app/Services/GeoService.php

@@ -309,7 +309,7 @@ class GeoService extends Service
             foreach ($all_route_points as $point) {
                 $route->addPoint($point->lat, $point->lon, [
                     'name'  => $point->name,
-                    'popup' => $point->name.' ('.$point->name.')',
+                    'popup' => $point->name.' ('.$point->lat.', '.$point->lon.')',
                     'icon'  => '',
                 ]);
             }
@@ -351,7 +351,7 @@ class GeoService extends Service
         foreach ($planned_route as $point) {
             $planned->addPoint($point->lat, $point->lon, [
                 'name'  => $point->name,
-                'popup' => $point->name.' ('.$point->name.')',
+                'popup' => $point->name.' ('.$point->lat.', '.$point->lon.')',
             ]);
         }
 
@@ -369,7 +369,7 @@ class GeoService extends Service
             $actual->addPoint($point->lat, $point->lon, [
                 'pirep_id' => $pirep->id,
                 'name'     => $point->altitude,
-                'popup'    => 'GS: '.$point->gs.'<br />Alt: '.$point->altitude,
+                'popup'    => 'Spd: '.$point->gs.' kts<br />Alt: '.$point->altitude.' ft<br />Pos: '.$point->lat.', '.$point->lon,
             ]);
         }
 

app/Services/ImportExport/AircraftImporter.php

@@ -25,9 +25,11 @@ class AircraftImporter extends ImportExport
         'subfleet'     => 'required',
         'iata'         => 'nullable',
         'icao'         => 'nullable',
+        'airport_id'   => 'nullable',
         'name'         => 'required',
         'registration' => 'required',
         'hex_code'     => 'nullable',
+        'mtow'         => 'nullable|numeric',
         'zfw'          => 'nullable|numeric',
         'status'       => 'nullable',
     ];

app/Services/ImportExport/FlightImporter.php

@@ -29,6 +29,7 @@ class FlightImporter extends ImportExport
         'airline'              => 'required',
         'flight_number'        => 'required',
         'route_code'           => 'nullable',
+        'callsign'             => 'nullable',
         'route_leg'            => 'nullable',
         'dpt_airport'          => 'required',
         'arr_airport'          => 'required',
@@ -45,6 +46,8 @@ class FlightImporter extends ImportExport
         'pilot_pay'            => 'nullable',
         'route'                => 'nullable',
         'notes'                => 'nullable',
+        'start_date'           => 'nullable|date',
+        'end_date'             => 'nullable|date',
         'active'               => 'nullable|boolean',
         'subfleets'            => 'nullable',
         'fares'                => 'nullable',
@@ -212,9 +215,17 @@ class FlightImporter extends ImportExport
         $count = 0;
         $subfleets = $this->parseMultiColumnValues($col);
         foreach ($subfleets as $subfleet_type) {
+            $subfleet_type = trim($subfleet_type);
+            if (empty($subfleet_type)) {
+                continue;
+            }
+
             $subfleet = Subfleet::firstOrCreate(
                 ['type' => $subfleet_type],
-                ['name' => $subfleet_type]
+                [
+                    'name'       => $subfleet_type,
+                    'airline_id' => $flight->airline_id,
+                ]
             );
 
             $subfleet->save();

app/Services/ImportExport/SubfleetImporter.php

@@ -20,15 +20,14 @@ class SubfleetImporter extends ImportExport
      */
     public static $columns = [
         'airline'                    => 'required',
+        'hub_id'                     => 'nullable',
         'type'                       => 'required',
+        'simbrief_type'              => 'nullable',
         'name'                       => 'required',
         'fuel_type'                  => 'nullable',
         'cost_block_hour'            => 'nullable',
         'cost_delay_minute'          => 'nullable',
         'ground_handling_multiplier' => 'nullable',
-        'cargo_capacity'             => 'nullable',
-        'fuel_capacity'              => 'nullable',
-        'gross_weight'               => 'nullable',
         'fares'                      => 'nullable',
     ];
 

app/Services/Installer/ConfigService.php

@@ -33,7 +33,7 @@ class ConfigService extends Service
         'DB_EMULATE_PREPARES' => false,
         'CACHE_DRIVER'        => 'array',
         'CACHE_PREFIX'        => '',
-        'MAIL_DRIVER'         => 'mail',
+        'MAIL_DRIVER'         => 'log',
         'MAIL_HOST'           => '',
         'MAIL_PORT'           => 587,
         'MAIL_ENCRYPTION'     => '',

app/Services/ModuleService.php

@@ -88,13 +88,56 @@ class ModuleService extends Service
     }
 
     /**
-     * Get All modules from Database
+     * Get all of the modules from database but make sure they also exist on disk
      *
      * @return object
      */
-    public function getAllModules(): object
+    public function getAllModules(): array
     {
-        return Module::all();
+        $modules = [];
+        $moduleList = Module::all();
+
+        /** @var Module $module */
+        foreach ($moduleList as $module) {
+            /** @var \Nwidart\Modules\Module $moduleInstance */
+            $moduleInstance = \Nwidart\Modules\Facades\Module::find($module->name);
+            if (empty($moduleInstance)) {
+                continue;
+            }
+
+            if (file_exists($moduleInstance->getPath())) {
+                $modules[] = $module;
+            }
+        }
+
+        return $modules;
+    }
+
+    /**
+     * Determine if a module is active - also checks that the module exists properly
+     *
+     * @param string $name
+     *
+     * @return bool
+     */
+    public function isModuleActive(string $name): bool
+    {
+        $module = Module::where('name', $name)->first();
+        if (empty($module)) {
+            return false;
+        }
+
+        /** @var \Nwidart\Modules\Module $moduleInstance */
+        $moduleInstance = \Nwidart\Modules\Facades\Module::find($module->name);
+        if (empty($moduleInstance)) {
+            return false;
+        }
+
+        if (!file_exists($moduleInstance->getPath())) {
+            return false;
+        }
+
+        return $moduleInstance->isEnabled();
     }
 
     /**
@@ -102,9 +145,9 @@ class ModuleService extends Service
      *
      * @param $id
      *
-     * @return object
+     * @return Module
      */
-    public function getModule($id): object
+    public function getModule($id): Module
     {
         return Module::find($id);
     }
@@ -148,22 +191,20 @@ class ModuleService extends Service
      */
     public function installModule(UploadedFile $file): FlashNotifier
     {
-        $file_ext = $file->getClientOriginalExtension();
+        $file_ext = strtolower($file->getClientOriginalExtension());
         $allowed_extensions = ['zip', 'tar', 'gz'];
 
         if (!in_array($file_ext, $allowed_extensions, true)) {
             throw new ModuleInvalidFileType();
         }
 
-        $module = null;
-
         $new_dir = rand();
-
         File::makeDirectory(
             storage_path('app/tmp/modules/'.$new_dir),
             0777,
             true
         );
+
         $temp_ext_folder = storage_path('app/tmp/modules/'.$new_dir);
         $temp = storage_path('app/tmp/modules/'.$new_dir);
 
@@ -219,7 +260,6 @@ class ModuleService extends Service
         }
 
         File::moveDirectory($temp, $toCopy);
-
         File::deleteDirectory($temp_ext_folder);
 
         try {

app/Services/PirepService.php

@@ -206,7 +206,7 @@ class PirepService extends Service
     /**
      * Create a new PIREP with some given fields
      *
-     * @param Pirep                   $pirep
+     * @param Pirep $pirep
      * @param array PirepFieldValue[] $field_values
      *
      * @return Pirep
@@ -460,19 +460,6 @@ class PirepService extends Service
      */
     public function submit(Pirep $pirep)
     {
-        // Figure out what default state should be. Look at the default
-        // behavior from the rank that the pilot is assigned to
-        $default_state = PirepState::PENDING;
-        if ($pirep->source === PirepSource::ACARS) {
-            if ($pirep->user->rank->auto_approve_acars) {
-                $default_state = PirepState::ACCEPTED;
-            }
-        } else {
-            if ($pirep->user->rank->auto_approve_manual) {
-                $default_state = PirepState::ACCEPTED;
-            }
-        }
-
         // Check if there is a simbrief_id, change it to be set to the PIREP
         // at the end of the flight when it's been submitted finally.
         // Prefile, Save (as draft) and File already have this but the Submit button
@@ -489,6 +476,24 @@ class PirepService extends Service
         Log::info('New PIREP filed', [$pirep]);
         event(new PirepFiled($pirep));
 
+        $pirep->refresh();
+
+        // Figure out what pirep state should be, if nothing provided yet.
+        if ($pirep->state != PirepState::ACCEPTED && $pirep->state != PirepState::REJECTED) {
+            $default_state = PirepState::PENDING;
+        } else {
+            $default_state = $pirep->state;
+        }
+
+        // If pirep is still at PENDING state decide the default behavior by looking at rank settings
+        if ($pirep->state === PirepState::PENDING) {
+            if ($pirep->source === PirepSource::ACARS && $pirep->user->rank->auto_approve_acars) {
+                $default_state = PirepState::ACCEPTED;
+            } elseif ($pirep->source === PirepSource::MANUAL && $pirep->user->rank->auto_approve_manual) {
+                $default_state = PirepState::ACCEPTED;
+            }
+        }
+
         // only update the pilot last state if they are accepted
         if ($default_state === PirepState::ACCEPTED) {
             $pirep = $this->accept($pirep);
@@ -574,8 +579,8 @@ class PirepService extends Service
 
         foreach ($field_values as $fv) {
             PirepFieldValue::updateOrCreate(
-                ['pirep_id' => $pirep_id, 'name' => $fv->name],
-                ['value' => $fv->value, 'source' => $fv->source]
+                ['pirep_id' => $pirep_id, 'name' => $fv['name']],
+                ['value' => $fv['value'], 'source' => $fv['source']]
             );
         }
     }

app/Widgets/LatestNews.php

@@ -23,7 +23,7 @@ class LatestNews extends Widget
 
         return view('widgets.latest_news', [
             'config' => $this->config,
-            'news'   => $newsRepo->recent($this->config['count']),
+            'news'   => $newsRepo->with('user')->recent($this->config['count']),
         ]);
     }
 }

app/Widgets/LatestPilots.php

@@ -21,7 +21,7 @@ class LatestPilots extends Widget
     public function run()
     {
         $userRepo = app(UserRepository::class);
-        $userRepo = $userRepo->where('state', '!=', UserState::DELETED)->orderby('created_at', 'desc')->take($this->config['count'])->get();
+        $userRepo = $userRepo->with('home_airport')->where('state', '!=', UserState::DELETED)->orderby('created_at', 'desc')->take($this->config['count'])->get();
 
         return view('widgets.latest_pilots', [
             'config' => $this->config,

composer.json

@@ -41,6 +41,7 @@
         "laravel/helpers": "^1.4",
         "laravelcollective/html": "~6.2.0",
         "jeremykendall/php-domain-parser": "~5.7.2",
+        "league/commonmark": "~1.6",
         "league/csv": "9.2.*",
         "league/geotools": "0.8.*",
         "league/iso3166": "^3.0.0",
@@ -68,7 +69,8 @@
         "wildbit/swiftmailer-postmark": "^3.3",
         "queueworker/sansdaemon": "^1.2",
         "jpkleemans/attribute-events": "^1.1",
-        "akaunting/laravel-money": "^1.2"
+        "akaunting/laravel-money": "^1.2",
+        "staudenmeir/belongs-to-through": "^2.5"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.5",

config/laravel-widgets.php

@@ -8,7 +8,7 @@ return [
     /*
     * Set Ajax widget middleware
     */
-    'route_middleware' => [],
+    'route_middleware' => ['web'],
 
     'widget_stub'       => 'resources/stubs/widgets/widget.stub',
     'widget_plain_stub' => 'resources/stubs/widgets/widget_plain.stub',

config/mail.php

@@ -1,21 +1,7 @@
 <?php
 
 return [
-    /*
-    |--------------------------------------------------------------------------
-    | Mail Driver
-    |--------------------------------------------------------------------------
-    |
-    | Laravel supports both SMTP and PHP's "mail" function as drivers for the
-    | sending of e-mail. You may specify which one you're using throughout
-    | your application here. By default, Laravel is setup for SMTP mail.
-    |
-    | Supported: "smtp", "mail", "sendmail", "mailgun", "mandrill",
-    |            "ses", "sparkpost", "log"
-    |
-    */
-
-    'default' => env('MAIL_DRIVER', 'smtp'),
+    'default' => env('MAIL_MAILER', 'smtp'),
     'mailers' => [
         'smtp' => [
             'transport'  => 'smtp',
@@ -28,7 +14,7 @@ return [
         ],
 
         'ses' => [
-            'transport' => 'seapp/Contracts/Command.php:105s',
+            'transport' => 'ses',
         ],
 
         'mailgun' => [
@@ -46,7 +32,7 @@ return [
 
         'log' => [
             'transport' => 'log',
-            'channel'   => env('MAIL_LOG_CHANNEL'),
+            'channel'   => env('MAIL_LOG_CHANNEL', 'stack'),
         ],
 
         'array' => [

config/services.php

@@ -1,7 +1,5 @@
 <?php
 
-use App\Models\User;
-
 return [
     /*
     |--------------------------------------------------------------------------
@@ -9,31 +7,25 @@ return [
     |--------------------------------------------------------------------------
     |
     | This file is for storing the credentials for third party services such
-    | as Stripe, Mailgun, SparkPost and others. This file provides a sane
-    | default location for this type of information, allowing packages
-    | to have a conventional place to find your various credentials.
+    | as Mailgun, Postmark, AWS and more. This file provides the de facto
+    | location for this type of information, allowing packages to have
+    | a conventional file to locate the various service credentials.
     |
     */
 
     'mailgun' => [
-        'domain' => env('MAILGUN_DOMAIN'),
-        'secret' => env('MAILGUN_SECRET'),
+        'domain'   => env('MAILGUN_DOMAIN'),
+        'secret'   => env('MAILGUN_SECRET'),
+        'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'),
+    ],
+
+    'postmark' => [
+        'token' => env('POSTMARK_TOKEN'),
     ],
 
     'ses' => [
-        'key'    => env('SES_KEY'),
-        'secret' => env('SES_SECRET'),
-        'region' => 'us-east-1',
+        'key'    => env('AWS_ACCESS_KEY_ID'),
+        'secret' => env('AWS_SECRET_ACCESS_KEY'),
+        'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
     ],
-
-    'sparkpost' => [
-        'secret' => env('SPARKPOST_SECRET'),
-    ],
-
-    'stripe' => [
-        'model'  => User::class,
-        'key'    => env('STRIPE_KEY'),
-        'secret' => env('STRIPE_SECRET'),
-    ],
-
 ];

docker-compose.local.yml

@@ -24,9 +24,8 @@ services:
       - ./tests:/var/www/tests
       - ./composer.json:/var/www/composer.json
       - ./composer-lock.json:/var/www/composer-lock.json
-      - ./env.php:/var/www/env.php
+      #- ./env.php:/var/www/env.php
       - ./resources/docker/php/www.conf:/usr/local/etc/php-fpm.d/www.conf
-      - ./vendor/var/www/vendor
     depends_on:
       - mysql
       - redis

package.json

@@ -17,7 +17,7 @@
     "bootstrap": "~4.3",
     "bootstrap-sass": "^3.4.1",
     "bootstrap3": "npm:bootstrap@~3.4",
-    "ckeditor4": "4.14.0",
+    "ckeditor4": "4.17.0",
     "cookieconsent": "^3.1.0",
     "cross-env": "^5.1.6",
     "eonasdan-bootstrap-datetimepicker": "^4.17.47",
@@ -27,14 +27,14 @@
     "jquery": "^3.5.1",
     "jquery-pjax": "~2.0",
     "js-yaml": "^3.14.0",
-    "laravel-mix": "^5.0.7",
+    "laravel-mix": "^6.0.25",
     "leaflet": "^1.3.4",
     "leaflet-ajax": "2.1.0",
     "leaflet-providers": "1.0.*",
     "leaflet-rotatedmarker": "^0.2.0",
     "leaflet.geodesic": "^2.5.2",
     "lodash": ">=4.17.19",
-    "marked": "^1.2.2",
+    "marked": "^2.1.3",
     "minimist": "^1.2.2",
     "moment": "^2.29.1",
     "paper-dashboard": "^1.1.0",
@@ -44,14 +44,14 @@
     "popper.js": "^1.15.0",
     "rivets": "^0.9.6",
     "select2": "^4.0.13",
-    "ssri": "^5.3.0",
+    "ssri": "^8.0.1",
     "tar": ">=4.4.2",
-    "webpack": "^4.44.2",
+    "webpack": "^5.45.1",
     "webpack-cli": "^3.3.12",
     "x-editable": "1.5.1"
   },
   "devDependencies": {
-    "copy-webpack-plugin": "^4.6.0",
+    "copy-webpack-plugin": "^9.0.1",
     "eslint": "^6.2.2",
     "eslint-config-airbnb": "^18.0.1",
     "eslint-config-airbnb-base": "^14.0.0",
@@ -63,6 +63,6 @@
     "tailwindcss": "^0.5.3",
     "vue-template-compiler": "^2.6.12",
     "webpack-bundle-analyzer": "^3.9.0",
-    "webpack-dev-server": "^3.1.11"
+    "webpack-dev-server": "^1.16.5"
   }
 }

public/assets/vendor/ckeditor4/config.js

@@ -1,38 +1 @@
-/**
- * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see https://ckeditor.com/legal/ckeditor-oss-license
- */
-
-CKEDITOR.editorConfig = function( config ) {
-	// Define changes to default configuration here.
-	// For complete reference see:
-	// https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html
-
-	// The toolbar groups arrangement, optimized for two toolbar rows.
-	config.toolbarGroups = [
-		{ name: 'clipboard',   groups: [ 'clipboard', 'undo' ] },
-		{ name: 'editing',     groups: [ 'find', 'selection', 'spellchecker' ] },
-		{ name: 'links' },
-		{ name: 'insert' },
-		{ name: 'forms' },
-		{ name: 'tools' },
-		{ name: 'document',	   groups: [ 'mode', 'document', 'doctools' ] },
-		{ name: 'others' },
-		'/',
-		{ name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ] },
-		{ name: 'paragraph',   groups: [ 'list', 'indent', 'blocks', 'align', 'bidi' ] },
-		{ name: 'styles' },
-		{ name: 'colors' },
-		{ name: 'about' }
-	];
-
-	// Remove some buttons provided by the standard plugins, which are
-	// not needed in the Standard(s) toolbar.
-	config.removeButtons = 'Underline,Subscript,Superscript';
-
-	// Set the most common block elements.
-	config.format_tags = 'p;h1;h2;h3;pre';
-
-	// Simplify the dialog windows.
-	config.removeDialogTabs = 'image:advanced;link:advanced';
-};
+CKEDITOR.editorConfig=function(e){e.toolbarGroups=[{name:"clipboard",groups:["clipboard","undo"]},{name:"editing",groups:["find","selection","spellchecker"]},{name:"links"},{name:"insert"},{name:"forms"},{name:"tools"},{name:"document",groups:["mode","document","doctools"]},{name:"others"},"/",{name:"basicstyles",groups:["basicstyles","cleanup"]},{name:"paragraph",groups:["list","indent","blocks","align","bidi"]},{name:"styles"},{name:"colors"},{name:"about"}],e.removeButtons="Underline,Subscript,Superscript",e.format_tags="p;h1;h2;h3;pre",e.removeDialogTabs="image:advanced;link:advanced"};

public/assets/vendor/ckeditor4/contents.css

@@ -1,208 +1 @@
-/*
-Copyright (c) 2003-2020, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
-*/
-
-body
-{
-	/* Font */
-	/* Emoji fonts are added to visualise them nicely in Internet Explorer. */
-	font-family: sans-serif, Arial, Verdana, "Trebuchet MS", "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
-	font-size: 12px;
-
-	/* Text color */
-	color: #333;
-
-	/* Remove the background color to make it transparent. */
-	background-color: #fff;
-
-	margin: 20px;
-}
-
-.cke_editable
-{
-	font-size: 13px;
-	line-height: 1.6;
-
-	/* Fix for missing scrollbars with RTL texts. (#10488) */
-	word-wrap: break-word;
-}
-
-blockquote
-{
-	font-style: italic;
-	font-family: Georgia, Times, "Times New Roman", serif;
-	padding: 2px 0;
-	border-style: solid;
-	border-color: #ccc;
-	border-width: 0;
-}
-
-.cke_contents_ltr blockquote
-{
-	padding-left: 20px;
-	padding-right: 8px;
-	border-left-width: 5px;
-}
-
-.cke_contents_rtl blockquote
-{
-	padding-left: 8px;
-	padding-right: 20px;
-	border-right-width: 5px;
-}
-
-a
-{
-	color: #0782C1;
-}
-
-ol,ul,dl
-{
-	/* IE7: reset rtl list margin. (#7334) */
-	*margin-right: 0px;
-	/* Preserved spaces for list items with text direction different than the list. (#6249,#8049)*/
-	padding: 0 40px;
-}
-
-h1,h2,h3,h4,h5,h6
-{
-	font-weight: normal;
-	line-height: 1.2;
-}
-
-hr
-{
-	border: 0px;
-	border-top: 1px solid #ccc;
-}
-
-img.right
-{
-	border: 1px solid #ccc;
-	float: right;
-	margin-left: 15px;
-	padding: 5px;
-}
-
-img.left
-{
-	border: 1px solid #ccc;
-	float: left;
-	margin-right: 15px;
-	padding: 5px;
-}
-
-pre
-{
-	white-space: pre-wrap; /* CSS 2.1 */
-	word-wrap: break-word; /* IE7 */
-	-moz-tab-size: 4;
-	tab-size: 4;
-}
-
-.marker
-{
-	background-color: Yellow;
-}
-
-span[lang]
-{
-	font-style: italic;
-}
-
-figure
-{
-	text-align: center;
-	outline: solid 1px #ccc;
-	background: rgba(0,0,0,0.05);
-	padding: 10px;
-	margin: 10px 20px;
-	display: inline-block;
-}
-
-figure > figcaption
-{
-	text-align: center;
-	display: block; /* For IE8 */
-}
-
-a > img {
-	padding: 1px;
-	margin: 1px;
-	border: none;
-	outline: 1px solid #0782C1;
-}
-
-/* Widget Styles */
-.code-featured
-{
-	border: 5px solid red;
-}
-
-.math-featured
-{
-	padding: 20px;
-	box-shadow: 0 0 2px rgba(200, 0, 0, 1);
-	background-color: rgba(255, 0, 0, 0.05);
-	margin: 10px;
-}
-
-.image-clean
-{
-	border: 0;
-	background: none;
-	padding: 0;
-}
-
-.image-clean > figcaption
-{
-	font-size: .9em;
-	text-align: right;
-}
-
-.image-grayscale
-{
-	background-color: white;
-	color: #666;
-}
-
-.image-grayscale img, img.image-grayscale
-{
-	filter: grayscale(100%);
-}
-
-.embed-240p
-{
-	max-width: 426px;
-	max-height: 240px;
-	margin:0 auto;
-}
-
-.embed-360p
-{
-	max-width: 640px;
-	max-height: 360px;
-	margin:0 auto;
-}
-
-.embed-480p
-{
-	max-width: 854px;
-	max-height: 480px;
-	margin:0 auto;
-}
-
-.embed-720p
-{
-	max-width: 1280px;
-	max-height: 720px;
-	margin:0 auto;
-}
-
-.embed-1080p
-{
-	max-width: 1920px;
-	max-height: 1080px;
-	margin:0 auto;
-}
+body{font-family:sans-serif,Arial,Verdana,"Trebuchet MS","Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol";font-size:12px;color:#333;background-color:#fff;margin:20px}.cke_editable{font-size:13px;line-height:1.6;word-wrap:break-word}blockquote{font-style:italic;font-family:Georgia,Times,"Times New Roman",serif;padding:2px 0;border-style:solid;border-color:#ccc;border-width:0}.cke_contents_ltr blockquote{padding-left:20px;padding-right:8px;border-left-width:5px}.cke_contents_rtl blockquote{padding-left:8px;padding-right:20px;border-right-width:5px}a{color:#0782c1}dl,ol,ul{padding:0 40px}h1,h2,h3,h4,h5,h6{font-weight:400;line-height:1.2}hr{border:0;border-top:1px solid #ccc}img.right{border:1px solid #ccc;float:right;margin-left:15px;padding:5px}img.left{border:1px solid #ccc;float:left;margin-right:15px;padding:5px}pre{white-space:pre-wrap;word-wrap:break-word;-moz-tab-size:4;tab-size:4}.marker{background-color:#ff0}span[lang]{font-style:italic}figure{text-align:center;outline:solid 1px #ccc;background:rgba(0,0,0,.05);padding:10px;margin:10px 20px;display:inline-block}figure>figcaption{text-align:center;display:block}a>img{padding:1px;margin:1px;border:none;outline:1px solid #0782C1}.code-featured{border:5px solid red}.math-featured{padding:20px;box-shadow:0 0 2px #c80000;background-color:rgba(255,0,0,.05);margin:10px}.image-clean{border:0;background:0 0;padding:0}.image-clean>figcaption{font-size:.9em;text-align:right}.image-grayscale{background-color:#fff;color:#666}.image-grayscale img,img.image-grayscale{filter:grayscale(100%)}.embed-240p{max-width:426px;max-height:240px;margin:0 auto}.embed-360p{max-width:640px;max-height:360px;margin:0 auto}.embed-480p{max-width:854px;max-height:480px;margin:0 auto}.embed-720p{max-width:1280px;max-height:720px;margin:0 auto}.embed-1080p{max-width:1920px;max-height:1080px;margin:0 auto}

public/assets/vendor/ckeditor4/styles.js

@@ -1,137 +1 @@
-/**
- * Copyright (c) 2003-2020, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
- */
-
-// This file contains style definitions that can be used by CKEditor plugins.
-//
-// The most common use for it is the "stylescombo" plugin which shows the Styles drop-down
-// list containing all styles in the editor toolbar. Other plugins, like
-// the "div" plugin, use a subset of the styles for their features.
-//
-// If you do not have plugins that depend on this file in your editor build, you can simply
-// ignore it. Otherwise it is strongly recommended to customize this file to match your
-// website requirements and design properly.
-//
-// For more information refer to: https://ckeditor.com/docs/ckeditor4/latest/guide/dev_styles.html#style-rules
-
-CKEDITOR.stylesSet.add( 'default', [
-	/* Block styles */
-
-	// These styles are already available in the "Format" drop-down list ("format" plugin),
-	// so they are not needed here by default. You may enable them to avoid
-	// placing the "Format" combo in the toolbar, maintaining the same features.
-	/*
-	{ name: 'Paragraph',		element: 'p' },
-	{ name: 'Heading 1',		element: 'h1' },
-	{ name: 'Heading 2',		element: 'h2' },
-	{ name: 'Heading 3',		element: 'h3' },
-	{ name: 'Heading 4',		element: 'h4' },
-	{ name: 'Heading 5',		element: 'h5' },
-	{ name: 'Heading 6',		element: 'h6' },
-	{ name: 'Preformatted Text',element: 'pre' },
-	{ name: 'Address',			element: 'address' },
-	*/
-
-	{ name: 'Italic Title',		element: 'h2', styles: { 'font-style': 'italic' } },
-	{ name: 'Subtitle',			element: 'h3', styles: { 'color': '#aaa', 'font-style': 'italic' } },
-	{
-		name: 'Special Container',
-		element: 'div',
-		styles: {
-			padding: '5px 10px',
-			background: '#eee',
-			border: '1px solid #ccc'
-		}
-	},
-
-	/* Inline styles */
-
-	// These are core styles available as toolbar buttons. You may opt enabling
-	// some of them in the Styles drop-down list, removing them from the toolbar.
-	// (This requires the "stylescombo" plugin.)
-	/*
-	{ name: 'Strong',			element: 'strong', overrides: 'b' },
-	{ name: 'Emphasis',			element: 'em'	, overrides: 'i' },
-	{ name: 'Underline',		element: 'u' },
-	{ name: 'Strikethrough',	element: 'strike' },
-	{ name: 'Subscript',		element: 'sub' },
-	{ name: 'Superscript',		element: 'sup' },
-	*/
-
-	{ name: 'Marker',			element: 'span', attributes: { 'class': 'marker' } },
-
-	{ name: 'Big',				element: 'big' },
-	{ name: 'Small',			element: 'small' },
-	{ name: 'Typewriter',		element: 'tt' },
-
-	{ name: 'Computer Code',	element: 'code' },
-	{ name: 'Keyboard Phrase',	element: 'kbd' },
-	{ name: 'Sample Text',		element: 'samp' },
-	{ name: 'Variable',			element: 'var' },
-
-	{ name: 'Deleted Text',		element: 'del' },
-	{ name: 'Inserted Text',	element: 'ins' },
-
-	{ name: 'Cited Work',		element: 'cite' },
-	{ name: 'Inline Quotation',	element: 'q' },
-
-	{ name: 'Language: RTL',	element: 'span', attributes: { 'dir': 'rtl' } },
-	{ name: 'Language: LTR',	element: 'span', attributes: { 'dir': 'ltr' } },
-
-	/* Object styles */
-
-	{
-		name: 'Styled Image (left)',
-		element: 'img',
-		attributes: { 'class': 'left' }
-	},
-
-	{
-		name: 'Styled Image (right)',
-		element: 'img',
-		attributes: { 'class': 'right' }
-	},
-
-	{
-		name: 'Compact Table',
-		element: 'table',
-		attributes: {
-			cellpadding: '5',
-			cellspacing: '0',
-			border: '1',
-			bordercolor: '#ccc'
-		},
-		styles: {
-			'border-collapse': 'collapse'
-		}
-	},
-
-	{ name: 'Borderless Table',		element: 'table',	styles: { 'border-style': 'hidden', 'background-color': '#E6E6FA' } },
-	{ name: 'Square Bulleted List',	element: 'ul',		styles: { 'list-style-type': 'square' } },
-
-	/* Widget styles */
-
-	{ name: 'Clean Image', type: 'widget', widget: 'image', attributes: { 'class': 'image-clean' } },
-	{ name: 'Grayscale Image', type: 'widget', widget: 'image', attributes: { 'class': 'image-grayscale' } },
-
-	{ name: 'Featured Snippet', type: 'widget', widget: 'codeSnippet', attributes: { 'class': 'code-featured' } },
-
-	{ name: 'Featured Formula', type: 'widget', widget: 'mathjax', attributes: { 'class': 'math-featured' } },
-
-	{ name: '240p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-240p' }, group: 'size' },
-	{ name: '360p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-360p' }, group: 'size' },
-	{ name: '480p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-480p' }, group: 'size' },
-	{ name: '720p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-720p' }, group: 'size' },
-	{ name: '1080p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-1080p' }, group: 'size' },
-
-	// Adding space after the style name is an intended workaround. For now, there
-	// is no option to create two styles with the same name for different widget types. See https://dev.ckeditor.com/ticket/16664.
-	{ name: '240p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-240p' }, group: 'size' },
-	{ name: '360p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-360p' }, group: 'size' },
-	{ name: '480p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-480p' }, group: 'size' },
-	{ name: '720p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-720p' }, group: 'size' },
-	{ name: '1080p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-1080p' }, group: 'size' }
-
-] );
-
+CKEDITOR.stylesSet.add("default",[{name:"Italic Title",element:"h2",styles:{"font-style":"italic"}},{name:"Subtitle",element:"h3",styles:{color:"#aaa","font-style":"italic"}},{name:"Special Container",element:"div",styles:{padding:"5px 10px",background:"#eee",border:"1px solid #ccc"}},{name:"Marker",element:"span",attributes:{class:"marker"}},{name:"Big",element:"big"},{name:"Small",element:"small"},{name:"Typewriter",element:"tt"},{name:"Computer Code",element:"code"},{name:"Keyboard Phrase",element:"kbd"},{name:"Sample Text",element:"samp"},{name:"Variable",element:"var"},{name:"Deleted Text",element:"del"},{name:"Inserted Text",element:"ins"},{name:"Cited Work",element:"cite"},{name:"Inline Quotation",element:"q"},{name:"Language: RTL",element:"span",attributes:{dir:"rtl"}},{name:"Language: LTR",element:"span",attributes:{dir:"ltr"}},{name:"Styled Image (left)",element:"img",attributes:{class:"left"}},{name:"Styled Image (right)",element:"img",attributes:{class:"right"}},{name:"Compact Table",element:"table",attributes:{cellpadding:"5",cellspacing:"0",border:"1",bordercolor:"#ccc"},styles:{"border-collapse":"collapse"}},{name:"Borderless Table",element:"table",styles:{"border-style":"hidden","background-color":"#E6E6FA"}},{name:"Square Bulleted List",element:"ul",styles:{"list-style-type":"square"}},{name:"Clean Image",type:"widget",widget:"image",attributes:{class:"image-clean"}},{name:"Grayscale Image",type:"widget",widget:"image",attributes:{class:"image-grayscale"}},{name:"Featured Snippet",type:"widget",widget:"codeSnippet",attributes:{class:"code-featured"}},{name:"Featured Formula",type:"widget",widget:"mathjax",attributes:{class:"math-featured"}},{name:"240p",type:"widget",widget:"embedSemantic",attributes:{class:"embed-240p"},group:"size"},{name:"360p",type:"widget",widget:"embedSemantic",attributes:{class:"embed-360p"},group:"size"},{name:"480p",type:"widget",widget:"embedSemantic",attributes:{class:"embed-480p"},group:"size"},{name:"720p",type:"widget",widget:"embedSemantic",attributes:{class:"embed-720p"},group:"size"},{name:"1080p",type:"widget",widget:"embedSemantic",attributes:{class:"embed-1080p"},group:"size"},{name:"240p ",type:"widget",widget:"embed",attributes:{class:"embed-240p"},group:"size"},{name:"360p ",type:"widget",widget:"embed",attributes:{class:"embed-360p"},group:"size"},{name:"480p ",type:"widget",widget:"embed",attributes:{class:"embed-480p"},group:"size"},{name:"720p ",type:"widget",widget:"embed",attributes:{class:"embed-720p"},group:"size"},{name:"1080p ",type:"widget",widget:"embed",attributes:{class:"embed-1080p"},group:"size"}]);

public/mix-manifest.json

@@ -1,25 +1,35 @@
 {
-    "/assets/admin/js/app.js": "/assets/admin/js/app.js?id=c6f09efd67f43399c980",
-    "/assets/admin/js/app.js.map": "/assets/admin/js/app.js.map?id=d7cf2fb613c6991e3725",
-    "/assets/frontend/js/app.js": "/assets/frontend/js/app.js?id=cd0e1cc7897d01d2b2c8",
-    "/assets/frontend/css/now-ui-kit.css": "/assets/frontend/css/now-ui-kit.css?id=4e7a6eff0f7ee6e041a4",
-    "/assets/admin/css/vendor.min.css": "/assets/admin/css/vendor.min.css?id=71ff475a10f4f7af711c",
-    "/assets/frontend/js/app.js.map": "/assets/frontend/js/app.js.map?id=354cbdecd6ca9a777054",
-    "/assets/frontend/css/now-ui-kit.css.map": "/assets/frontend/css/now-ui-kit.css.map?id=e5c9b2a4e9d0a7678653",
-    "/assets/admin/css/vendor.min.css.map": "/assets/admin/css/vendor.min.css.map?id=ef71a09a5b9fa35df9a9",
-    "/assets/installer/js/app.js": "/assets/installer/js/app.js?id=4ebdf2b99afe39ca2dc3",
-    "/assets/installer/js/app.js.map": "/assets/installer/js/app.js.map?id=03bfe28bb64a23033bec",
+    "/assets/frontend/js/app.js": "/assets/frontend/js/app.js?id=b4f2e97d5ad74fbbb8c1",
+    "/assets/installer/js/app.js": "/assets/installer/js/app.js?id=83f3226250dcffc124b0",
+    "/assets/admin/js/app.js": "/assets/admin/js/app.js?id=b3b38b9ffe987af4c1e7",
+    "/assets/admin/css/vendor.min.css": "/assets/admin/css/vendor.min.css?id=bdbd85be3fb1f0381fc2",
+    "/assets/frontend/css/now-ui-kit.css": "/assets/frontend/css/now-ui-kit.css?id=c40e60a13efd077c7c02",
     "/assets/fonts/glyphicons-halflings-regular.woff2": "/assets/fonts/glyphicons-halflings-regular.woff2?id=349344e92fb16221dd56",
     "/assets/admin/fonts/glyphicons-halflings-regular.woff2": "/assets/admin/fonts/glyphicons-halflings-regular.woff2?id=349344e92fb16221dd56",
     "/assets/admin/img/clear.png": "/assets/admin/img/clear.png?id=63b3af84650a0145d61a",
     "/assets/admin/img/loading.gif": "/assets/admin/img/loading.gif?id=1e2db432947c2dca1b9f",
     "/assets/global/js/jquery.js": "/assets/global/js/jquery.js?id=2849239b95f5a9a2aea3",
+    "/assets/global/css/images/layers-2x.png": "/assets/global/css/images/layers-2x.png?id=f905cd0e87fcdde8969b",
+    "/assets/global/css/images/layers.png": "/assets/global/css/images/layers.png?id=3d61d49c98ea3572cae4",
+    "/assets/global/css/images/marker-icon-2x.png": "/assets/global/css/images/marker-icon-2x.png?id=da330e712dc6fc8c7d58",
+    "/assets/global/css/images/marker-icon.png": "/assets/global/css/images/marker-icon.png?id=1045a925825f69b0a874",
+    "/assets/global/css/images/marker-shadow.png": "/assets/global/css/images/marker-shadow.png?id=43ccefc930d47f2e3a17",
     "/assets/admin/css/blue.png": "/assets/admin/css/blue.png?id=39437a6200d8066a49d4",
     "/assets/admin/css/blue@2x.png": "/assets/admin/css/blue@2x.png?id=127d7cfbb176dc559854",
     "/assets/frontend/js/vendor.js": "/assets/frontend/js/vendor.js?id=3ab539b466b46ef2ed84",
-    "/assets/admin/css/vendor.css": "/assets/admin/css/vendor.css?id=4e79a5c8b0241493191b",
+    "/assets/admin/css/vendor.css": "/assets/admin/css/vendor.css?id=568fd06f4beaec54aa13",
     "/assets/admin/js/vendor.js": "/assets/admin/js/vendor.js?id=edb4f99fb0b0998555c1",
-    "/assets/installer/css/vendor.css": "/assets/installer/css/vendor.css?id=a60c0e373bba3e7cd76b",
+    "/assets/vendor/ckeditor4/CHANGES.md": "/assets/vendor/ckeditor4/CHANGES.md?id=f6aecaa34a4f047b698b",
+    "/assets/vendor/ckeditor4/LICENSE.md": "/assets/vendor/ckeditor4/LICENSE.md?id=bdd7b1a5211ef8687a2b",
+    "/assets/vendor/ckeditor4/README.md": "/assets/vendor/ckeditor4/README.md?id=54b2071da0fd5125556d",
+    "/assets/vendor/ckeditor4/bower.json": "/assets/vendor/ckeditor4/bower.json?id=a6d6f831706863d6df7a",
+    "/assets/vendor/ckeditor4/ckeditor.js": "/assets/vendor/ckeditor4/ckeditor.js?id=aa81f7b2b2ddb8c4e0dd",
+    "/assets/vendor/ckeditor4/composer.json": "/assets/vendor/ckeditor4/composer.json?id=7d18ab5f522c8ecf3892",
+    "/assets/vendor/ckeditor4/config.js": "/assets/vendor/ckeditor4/config.js?id=dbc65722e8c3bae5b43b",
+    "/assets/vendor/ckeditor4/contents.css": "/assets/vendor/ckeditor4/contents.css?id=471be63a33e8ce099801",
+    "/assets/vendor/ckeditor4/package.json": "/assets/vendor/ckeditor4/package.json?id=4c783954edc3a50b72fc",
+    "/assets/vendor/ckeditor4/styles.js": "/assets/vendor/ckeditor4/styles.js?id=f5d57c2be704fbecec57",
+    "/assets/installer/css/vendor.css": "/assets/installer/css/vendor.css?id=29cfe641b34ad0c7ed19",
     "/assets/installer/js/vendor.js": "/assets/installer/js/vendor.js?id=4398fa9f7340f95a1107",
     "/assets/global/js/vendor.js": "/assets/global/js/vendor.js?id=bb691042c0629f4af9f5",
     "/assets/global/css/vendor.css": "/assets/global/css/vendor.css?id=e01e86f8033ae9836957"

resources/lang/de/aircraft.php

@@ -2,10 +2,11 @@
 
 return [
     'status' => [
-        'active'   => 'Aktiv',
-        'stored'   => 'Gelagert',
-        'retired'  => 'Außer Dienst',
-        'scrapped' => 'Verschrottet',
-        'written'  => 'Abgeschrieben',
+        'active'      => 'Aktiv',
+        'maintenance' => 'Instandhaltung',
+        'stored'      => 'Gelagert',
+        'retired'     => 'Außer Dienst',
+        'scrapped'    => 'Verschrottet',
+        'written'     => 'Abgeschrieben',
     ],
 ];

resources/lang/de/flights.php

@@ -23,17 +23,17 @@ return [
     'departuretime'    => 'Abflugzeit',
     'arrivaltime'      => 'Ankunftszeit',
     'type'             => [
-        'pass_scheduled'    => 'Passagier - planmäßig',
-        'cargo_scheduled'   => 'Fracht - planmäßig',
-        'charter_pass_only' => 'Charter - Nur Passagier',
-        'addtl_cargo_mail'  => 'Zusätzliche Fracht/Post',
-        'special_vip'       => 'Spezieller VIP-Flug (FAA/Behörde)',
-        'pass_addtl'        => 'Passagier - Zusätzlich',
-        'charter_cargo'     => 'Charter - Fracht/Post',
+        'pass_scheduled'    => 'Passagier (Planmäßig)',
+        'cargo_scheduled'   => 'Fracht (Planmäßig)',
+        'charter_pass_only' => 'Passagier (Charter)',
+        'addtl_cargo_mail'  => 'Fracht (Zusätzliche)',
+        'special_vip'       => 'Spezieller VIP-Flug',
+        'pass_addtl'        => 'Passagier (Zusätzlich)',
+        'charter_cargo'     => 'Fracht (Charter)',
         'ambulance'         => 'Ambulanzflug',
         'training_flight'   => 'Trainingsflug',
         'mail_service'      => 'Postdienst',
-        'charter_special'   => 'Charter mit Sonderbehandlung',
+        'charter_special'   => 'Passagier (Charter mit Sonderbehandlung)',
         'positioning'       => 'Positionierung (Fähre/Lieferung/Demo)',
         'technical_test'    => 'Technischer Test',
         'military'          => 'Militär',

resources/lang/de/pireps.php

@@ -43,6 +43,7 @@ return [
         'cancelled'   => 'Abgebrochen',
         'deleted'     => 'Gelöscht',
         'draft'       => 'Entwurf',
+        'paused'      => 'Angehalten',
     ],
     'status' => [
         'initialized'  => 'Erstellt',
@@ -66,5 +67,6 @@ return [
         'arrived'      => 'Angekommen',
         'cancelled'    => 'Abgebrochen',
         'emerg_decent' => 'Notfall dezent',
+        'paused'       => 'Angehalten',
     ],
 ];

resources/lang/de/widgets.php

@@ -19,6 +19,7 @@ return [
         'nometar'    => 'METAR/TAF Daten konnten nicht abgerufen werden',
         'conditions' => 'Bedingungen',
         'visibility' => 'Sichtbarkeit',
+        'temp'       => 'Temperatur',
         'humidity'   => 'Feuchtigkeit',
         'dewpoint'   => 'Taupunkt',
         'barometer'  => 'Barometer',

resources/lang/en/aircraft.php

@@ -2,10 +2,11 @@
 
 return [
     'status' => [
-        'active'   => 'Active',
-        'stored'   => 'Stored',
-        'retired'  => 'Retired',
-        'scrapped' => 'Scrapped',
-        'written'  => 'Written Off',
+        'active'      => 'Active',
+        'maintenance' => 'Maintenance',
+        'stored'      => 'Stored',
+        'retired'     => 'Retired',
+        'scrapped'    => 'Scrapped',
+        'written'     => 'Written Off',
     ],
 ];

resources/lang/en/flights.php

@@ -23,20 +23,20 @@ return [
     'departuretime'    => 'Departure Time',
     'arrivaltime'      => 'Arrival Time',
     'type'             => [
-        'pass_scheduled'    => 'Passenger - Scheduled',
-        'cargo_scheduled'   => 'Cargo - Scheduled',
-        'charter_pass_only' => 'Charter - Passenger Only',
-        'addtl_cargo_mail'  => 'Additional Cargo/Mail',
-        'special_vip'       => 'Special VIP Flight (FAA/Government)',
-        'pass_addtl'        => 'Passenger - Additional',
-        'charter_cargo'     => 'Charter - Cargo/Mail',
-        'ambulance'         => 'Ambulance Flight',
-        'training_flight'   => 'Training Flight',
+        'pass_scheduled'    => 'Passenger (Scheduled)',
+        'pass_addtl'        => 'Passenger (Additional)',
+        'charter_pass_only' => 'Passenger (Charter)',
+        'charter_special'   => 'Passenger (Special Charter)',
+        'cargo_scheduled'   => 'Cargo (Scheduled)',
+        'addtl_cargo_mail'  => 'Cargo (Additional)',
+        'charter_cargo'     => 'Cargo (Charter)',
         'mail_service'      => 'Mail Service',
-        'charter_special'   => 'Charter w/ Special Handling',
-        'positioning'       => 'Positioning (Ferry/Delivery/Demo)',
-        'technical_test'    => 'Technical Test',
+        'special_vip'       => 'VIP Flight',
+        'ambulance'         => 'Ambulance',
+        'training_flight'   => 'Training',
         'military'          => 'Military',
+        'positioning'       => 'Positioning',
+        'technical_test'    => 'Technical Test',
         'technical_stop'    => 'Technical Stop',
     ],
 ];

resources/lang/en/pireps.php

@@ -43,6 +43,7 @@ return [
         'cancelled'   => 'Cancelled',
         'deleted'     => 'Deleted',
         'draft'       => 'Draft',
+        'paused'      => 'Paused',
     ],
     'status' => [
         'initialized'  => 'Initiated',
@@ -66,5 +67,6 @@ return [
         'arrived'      => 'Arrived',
         'cancelled'    => 'Cancelled',
         'emerg_decent' => 'Emergency decent',
+        'paused'       => 'Paused',
     ],
 ];

resources/lang/en/widgets.php

@@ -19,6 +19,7 @@ return [
         'nometar'    => 'METAR/TAF data could not be retrieved',
         'conditions' => 'Conditions',
         'visibility' => 'visibility',
+        'temp'       => 'Temperature',
         'humidity'   => 'humidity',
         'dewpoint'   => 'dew point',
         'barometer'  => 'Barometer',

resources/lang/es/aircraft.php

@@ -2,10 +2,11 @@
 
 return [
     'status' => [
-        'active'   => 'Activo',
-        'stored'   => 'Guardado',
-        'retired'  => 'Retirado',
-        'scrapped' => 'Desguazado',
-        'written'  => 'Dado de baja',
+        'active'      => 'Activo',
+        'maintenance' => 'Mantenimiento',
+        'stored'      => 'Guardado',
+        'retired'     => 'Retirado',
+        'scrapped'    => 'Desguazado',
+        'written'     => 'Dado de baja',
     ],
 ];

resources/lang/es/common.php

@@ -19,14 +19,14 @@ return [
     'download'       => 'Descarga|Descargas',
     'from'           => 'de',
     'to'             => 'a',
-    'state'          => 'Estado',
-    'status'         => 'Estatus',
+    'state'          => 'Situación',
+    'status'         => 'Estado',
     'departure'      => 'Salida',
     'arrival'        => 'Llegada',
     'aircraft'       => 'Aeronave',
     'airline'        => 'Aerolínea',
     'subfleet'       => 'Subfleet',
-    'distance'       => 'Distancía',
+    'distance'       => 'Distancia',
     'fuel'           => 'Combustible',
     'metar'          => 'METAR',
     'hour'           => 'Hora|Horas',

resources/lang/es/expenses.php

@@ -2,7 +2,7 @@
 
 return [
     'type' => [
-        'flight'  => 'Vuelo',
+        'flight'  => 'Por vuelo',
         'daily'   => 'Diario',
         'monthly' => 'Mensual',
     ],

resources/lang/es/flights.php

@@ -23,18 +23,18 @@ return [
     'departuretime'    => 'Hora de salida',
     'arrivaltime'      => 'Hora de llegada',
     'type'             => [
-        'pass_scheduled'    => 'Pasajero - Programado',
-        'cargo_scheduled'   => 'Carga - Programado',
-        'charter_pass_only' => 'Charter - Solo pasajeros',
-        'addtl_cargo_mail'  => 'Carga/correo adicional',
-        'special_vip'       => 'Vuelo VIP especial (Autoridad de Aviación Civil)',
-        'pass_addtl'        => 'Pasajero - Adicional',
-        'charter_cargo'     => 'Charter - Carga/Correo',
+        'pass_scheduled'    => 'Pasajero (Programado)',
+        'cargo_scheduled'   => 'Carga (Programado)',
+        'charter_pass_only' => 'Pasajero (Charter)',
+        'addtl_cargo_mail'  => 'Carga (Adicional)',
+        'special_vip'       => 'Vuelo VIP especial',
+        'pass_addtl'        => 'Pasajero (Adicional)',
+        'charter_cargo'     => 'Carga (Charter)',
         'ambulance'         => 'Vuelo ambulancia',
         'training_flight'   => 'Vuelo de entrenamiento',
         'mail_service'      => 'Servicio postal',
-        'charter_special'   => 'Charter con cargas especiales',
-        'positioning'       => 'Posicionamiento (Ferry/Entrega/Demo)',
+        'charter_special'   => 'Pasajero (Charter con cargas especiales)',
+        'positioning'       => 'Posicionamiento',
         'technical_test'    => 'Prueba técnica',
         'military'          => 'Militar',
         'technical_stop'    => 'Parada técnica',

resources/lang/es/pireps.php

@@ -43,6 +43,7 @@ return [
         'cancelled'   => 'Cancelado',
         'deleted'     => 'Eliminado',
         'draft'       => 'Borrador',
+        'paused'      => 'Pausado',
     ],
     'status' => [
         'initialized'  => 'Iniciado',
@@ -66,5 +67,6 @@ return [
         'arrived'      => 'Llegó',
         'cancelled'    => 'Cancelado',
         'emerg_decent' => 'Descenso de emergencía',
+        'paused'       => 'Pausado',
     ],
 ];