Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 snyk-bot
|
4a7eda875f |
@@ -15,10 +15,7 @@ declare -a remove_files=(
|
||||
.idea
|
||||
.travis
|
||||
docker
|
||||
node_modules
|
||||
vendor/willdurand/geocoder/tests
|
||||
_ide_helper.php
|
||||
.env
|
||||
.dockerignore
|
||||
.dpl
|
||||
.editorconfig
|
||||
@@ -26,7 +23,6 @@ declare -a remove_files=(
|
||||
.eslintrc
|
||||
.php_cs
|
||||
.php_cs.cache
|
||||
.php-cs-fixer.php
|
||||
.phpstorm.meta.php
|
||||
.styleci.yml
|
||||
.phpunit.result.cache
|
||||
@@ -41,8 +37,9 @@ declare -a remove_files=(
|
||||
phpvms.iml
|
||||
Procfile
|
||||
phpstan.neon
|
||||
symfony.lock
|
||||
node_modules
|
||||
composer.phar
|
||||
vendor/willdurand/geocoder/tests
|
||||
)
|
||||
|
||||
for file in "${remove_files[@]}"; do
|
||||
|
||||
@@ -2,12 +2,12 @@ name: 'Build'
|
||||
on: ['push', 'pull_request', 'workflow_dispatch', 'release']
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-20.04
|
||||
runs-on: ubuntu-18.04
|
||||
if: github.repository == 'nabeelio/phpvms'
|
||||
strategy:
|
||||
fail-fast: true
|
||||
matrix:
|
||||
php-versions: ['7.3', '7.4', '8.0', '8.1']
|
||||
php-versions: ['7.3', '7.4', '8.0']
|
||||
name: PHP ${{ matrix.php-versions }}
|
||||
env:
|
||||
extensions: intl, pcov, mbstring
|
||||
@@ -78,8 +78,7 @@ jobs:
|
||||
|
||||
- name: Run Tests
|
||||
run: |
|
||||
export PHP_CS_FIXER_IGNORE_ENV=1
|
||||
vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php -v --dry-run --diff --using-cache=no
|
||||
vendor/bin/php-cs-fixer fix --config=.php_cs -v --dry-run --diff --using-cache=no
|
||||
vendor/bin/phpunit --debug --verbose
|
||||
|
||||
# This runs after all of the tests, run have run. Creates a cleaned up version of the
|
||||
|
||||
@@ -76,4 +76,3 @@ error_log
|
||||
/config.php
|
||||
/config.bak.php
|
||||
/VERSION
|
||||
sync.sh
|
||||
|
||||
@@ -1,69 +0,0 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
/*
|
||||
* This file is part of PHP CS Fixer.
|
||||
*
|
||||
* (c) Fabien Potencier <fabien@symfony.com>
|
||||
* Dariusz Rumiński <dariusz.ruminski@gmail.com>
|
||||
*
|
||||
* This source file is subject to the MIT license that is bundled
|
||||
* with this source code in the file LICENSE.
|
||||
*/
|
||||
|
||||
$header = <<<'EOF'
|
||||
This file is part of PHP CS Fixer.
|
||||
(c) Fabien Potencier <fabien@symfony.com>
|
||||
Dariusz Rumiński <dariusz.ruminski@gmail.com>
|
||||
This source file is subject to the MIT license that is bundled
|
||||
with this source code in the file LICENSE.
|
||||
EOF;
|
||||
|
||||
$finder = PhpCsFixer\Finder::create()
|
||||
->ignoreVCSIgnored(true)
|
||||
->exclude('tests/data')
|
||||
->exclude('storage')
|
||||
->exclude('resources')
|
||||
->in(__DIR__)
|
||||
->append([
|
||||
__DIR__.'/dev-tools/doc.php',
|
||||
// __DIR__.'/php-cs-fixer', disabled, as we want to be able to run bootstrap file even on lower PHP version, to show nice message
|
||||
__FILE__,
|
||||
])
|
||||
;
|
||||
|
||||
$config = new PhpCsFixer\Config();
|
||||
$config
|
||||
->setRiskyAllowed(true)
|
||||
->setRules([
|
||||
'@PSR2' => true,
|
||||
'strict_param' => true,
|
||||
'no_php4_constructor' => true,
|
||||
'no_extra_blank_lines' => true,
|
||||
'no_superfluous_elseif' => true,
|
||||
'single_line_comment_style' => false,
|
||||
'simple_to_complex_string_variable' => true,
|
||||
'array_syntax' => [
|
||||
'syntax' => 'short',
|
||||
],
|
||||
'binary_operator_spaces' => [
|
||||
'operators' => [
|
||||
'=>' => 'align_single_space_minimal'
|
||||
]
|
||||
],
|
||||
/*
|
||||
'blank_line_before_statement' => [
|
||||
'statements' => [
|
||||
'declare',
|
||||
'for',
|
||||
'return',
|
||||
'throw',
|
||||
'try',
|
||||
],
|
||||
],
|
||||
*/
|
||||
])
|
||||
->setFinder($finder);
|
||||
|
||||
return $config;
|
||||
@@ -0,0 +1,37 @@
|
||||
<?php
|
||||
|
||||
$finder = PhpCsFixer\Finder::create()
|
||||
->in('app')
|
||||
->in('config');
|
||||
|
||||
return PhpCsFixer\Config::create()
|
||||
->setHideProgress(true)
|
||||
->setUsingCache(false)
|
||||
->setRiskyAllowed(true)
|
||||
->setRules([
|
||||
'@PSR2' => true,
|
||||
'strict_param' => true,
|
||||
'no_php4_constructor' => true,
|
||||
'no_extra_blank_lines' => true,
|
||||
'no_superfluous_elseif' => true,
|
||||
'single_line_comment_style' => false,
|
||||
'simple_to_complex_string_variable' => true,
|
||||
'array_syntax' => [
|
||||
'syntax' => 'short',
|
||||
],
|
||||
'binary_operator_spaces' => [
|
||||
'align_double_arrow' => true,
|
||||
],
|
||||
/*
|
||||
'blank_line_before_statement' => [
|
||||
'statements' => [
|
||||
'declare',
|
||||
'for',
|
||||
'return',
|
||||
'throw',
|
||||
'try',
|
||||
],
|
||||
],
|
||||
*/
|
||||
])
|
||||
->setFinder($finder);
|
||||
+6
-11
@@ -1,11 +1,8 @@
|
||||
FROM php:8.0.9-fpm-alpine3.14
|
||||
FROM php:7.4-fpm-alpine
|
||||
|
||||
WORKDIR /var/www/
|
||||
|
||||
# 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 apk add gmp-dev icu-dev zlib-dev libpng-dev
|
||||
RUN curl --silent --show-error https://getcomposer.org/installer | php
|
||||
|
||||
# Copy any config files in
|
||||
@@ -19,19 +16,17 @@ RUN docker-php-ext-install \
|
||||
pdo_mysql \
|
||||
gd \
|
||||
gmp \
|
||||
bcmath \
|
||||
opcache \
|
||||
zip && \
|
||||
docker-php-ext-enable pdo_mysql opcache bcmath zip
|
||||
opcache && \
|
||||
docker-php-ext-enable pdo_mysql opcache
|
||||
|
||||
COPY . /var/www/
|
||||
RUN composer install \
|
||||
RUN php composer.phar 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
|
||||
|
||||
@@ -102,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:
|
||||
|
||||
@@ -166,27 +166,6 @@ class ImportExport
|
||||
return [];
|
||||
}
|
||||
|
||||
if (strpos($split_values[0], '?') !== false) {
|
||||
// This contains the query string, which turns it into a multi-level array
|
||||
$query_str = explode('?', $split_values[0]);
|
||||
$parent = trim($query_str[0]);
|
||||
|
||||
$children = [];
|
||||
$kvp = explode('&', trim($query_str[1]));
|
||||
foreach ($kvp as $items) {
|
||||
if (!$items) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$this->kvpToArray($items, $children);
|
||||
}
|
||||
|
||||
$ret[$parent] = $children;
|
||||
|
||||
return $ret;
|
||||
}
|
||||
|
||||
// This is not a query string, return it back untouched
|
||||
return [$split_values[0]];
|
||||
}
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
namespace App\Contracts;
|
||||
|
||||
use App\Notifications\Channels\Discord\DiscordMessage;
|
||||
use Illuminate\Bus\Queueable;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
|
||||
@@ -25,4 +26,24 @@ class Notification extends \Illuminate\Notifications\Notification implements Sho
|
||||
|
||||
$this->channels = $notif_config[$klass];*/
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the notification's delivery channels.
|
||||
*
|
||||
* @param mixed $notifiable
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
/*public function via($notifiable)
|
||||
{
|
||||
return $this->channels;
|
||||
}*/
|
||||
|
||||
/**
|
||||
* @return DiscordMessage|null
|
||||
*/
|
||||
public function toDiscordChannel($notifiable): ?DiscordMessage
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,53 +0,0 @@
|
||||
<?php
|
||||
|
||||
use App\Contracts\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
class AddTypeRatingTables extends Migration
|
||||
{
|
||||
public function up()
|
||||
{
|
||||
if (!Schema::hasTable('typeratings')) {
|
||||
Schema::create('typeratings', function (Blueprint $table) {
|
||||
$table->increments('id');
|
||||
$table->string('name');
|
||||
$table->string('type');
|
||||
$table->string('description')->nullable();
|
||||
$table->string('image_url')->nullable();
|
||||
$table->boolean('active')->default(true);
|
||||
$table->timestamps();
|
||||
|
||||
$table->unique('id');
|
||||
$table->unique('name');
|
||||
});
|
||||
}
|
||||
|
||||
if (!Schema::hasTable('typerating_user')) {
|
||||
Schema::create('typerating_user', function (Blueprint $table) {
|
||||
$table->unsignedInteger('typerating_id');
|
||||
$table->unsignedInteger('user_id');
|
||||
|
||||
$table->primary(['typerating_id', 'user_id']);
|
||||
$table->index(['typerating_id', 'user_id']);
|
||||
});
|
||||
}
|
||||
|
||||
if (!Schema::hasTable('typerating_subfleet')) {
|
||||
Schema::create('typerating_subfleet', function (Blueprint $table) {
|
||||
$table->unsignedInteger('typerating_id');
|
||||
$table->unsignedInteger('subfleet_id');
|
||||
|
||||
$table->primary(['typerating_id', 'subfleet_id']);
|
||||
$table->index(['typerating_id', 'subfleet_id']);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
public function down()
|
||||
{
|
||||
Schema::dropIfExists('typeratings');
|
||||
Schema::dropIfExists('typerating_user');
|
||||
Schema::dropIfExists('typerating_subfleet');
|
||||
}
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
<?php
|
||||
|
||||
use App\Contracts\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
class AddHubToAircraft extends Migration
|
||||
{
|
||||
public function up()
|
||||
{
|
||||
Schema::table('aircraft', function (Blueprint $table) {
|
||||
$table->string('hub_id', 5)->nullable()->after('airport_id');
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
<?php
|
||||
|
||||
use App\Contracts\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
class UpdateAwardsAddActive extends Migration
|
||||
{
|
||||
public function up()
|
||||
{
|
||||
Schema::table('awards', function (Blueprint $table) {
|
||||
$table->boolean('active')->default(true)->nullable()->after('ref_model_params');
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -36,8 +36,7 @@ acars:
|
||||
sim_time: now
|
||||
created_at: 'now'
|
||||
updated_at: 'now'
|
||||
- id: 9aAN4mxlK9zb1
|
||||
pirep_id: b68R5gwVzpVe
|
||||
- pirep_id: b68R5gwVzpVe
|
||||
type: '0'
|
||||
nav_type: null
|
||||
order: '0'
|
||||
@@ -55,8 +54,7 @@ acars:
|
||||
sim_time: now
|
||||
created_at: 'now'
|
||||
updated_at: 'now'
|
||||
- id: 9aAN4mxlK9zb2
|
||||
pirep_id: b68R5gwVzpVe
|
||||
- pirep_id: b68R5gwVzpVe
|
||||
type: '0'
|
||||
nav_type: null
|
||||
order: '0'
|
||||
@@ -74,8 +72,7 @@ acars:
|
||||
sim_time: now
|
||||
created_at: 'now'
|
||||
updated_at: 'now'
|
||||
- id: 9aAN4mxlK9zb3
|
||||
pirep_id: b68R5gwVzpVe
|
||||
- pirep_id: b68R5gwVzpVe
|
||||
type: '0'
|
||||
nav_type: null
|
||||
order: '0'
|
||||
@@ -93,8 +90,7 @@ acars:
|
||||
sim_time: now
|
||||
created_at: 'now'
|
||||
updated_at: 'now'
|
||||
- id: 9aAN4mxlK9zb34
|
||||
pirep_id: b68R5gwVzpVe
|
||||
- pirep_id: b68R5gwVzpVe
|
||||
type: '0'
|
||||
nav_type: null
|
||||
order: '0'
|
||||
@@ -112,8 +108,7 @@ acars:
|
||||
sim_time: now
|
||||
created_at: 'now'
|
||||
updated_at: 'now'
|
||||
- id: 9aAN4mxlK9zb35
|
||||
pirep_id: b68R5gwVzpVe
|
||||
- pirep_id: b68R5gwVzpVe
|
||||
type: '0'
|
||||
nav_type: null
|
||||
order: '0'
|
||||
@@ -131,8 +126,7 @@ acars:
|
||||
sim_time: now
|
||||
created_at: 'now'
|
||||
updated_at: 'now'
|
||||
- id: 9aAN4mxlK9zb36
|
||||
pirep_id: b68R5gwVzpVe
|
||||
- pirep_id: b68R5gwVzpVe
|
||||
type: '0'
|
||||
nav_type: null
|
||||
order: '0'
|
||||
@@ -150,8 +144,7 @@ acars:
|
||||
sim_time: now
|
||||
created_at: 'now'
|
||||
updated_at: 'now'
|
||||
- id: 9aAN4mxlK9zb37
|
||||
pirep_id: b68R5gwVzpVe
|
||||
- pirep_id: b68R5gwVzpVe
|
||||
type: '0'
|
||||
nav_type: null
|
||||
order: '0'
|
||||
@@ -169,8 +162,7 @@ acars:
|
||||
sim_time: now
|
||||
created_at: 'now'
|
||||
updated_at: 'now'
|
||||
- id: 9aAN4mxlK9zb38
|
||||
pirep_id: b68R5gwVzpVe
|
||||
- pirep_id: b68R5gwVzpVe
|
||||
type: '0'
|
||||
nav_type: null
|
||||
order: '0'
|
||||
@@ -188,8 +180,7 @@ acars:
|
||||
sim_time: now
|
||||
created_at: 'now'
|
||||
updated_at: 'now'
|
||||
- id: 9aAN4mxlK9zb39
|
||||
pirep_id: b68R5gwVzpVe
|
||||
- pirep_id: b68R5gwVzpVe
|
||||
type: '0'
|
||||
nav_type: null
|
||||
order: '0'
|
||||
|
||||
@@ -34,28 +34,6 @@ airports:
|
||||
lon: -97.6698889
|
||||
hub: 1
|
||||
ground_handling_cost: 100
|
||||
- id: KHPN
|
||||
iata: HPN
|
||||
icao: KHPN
|
||||
name: Westchester County Airport
|
||||
location: White Plains
|
||||
country: United States
|
||||
timezone: America/New_York
|
||||
lat: 41.067
|
||||
lon: -73.7076
|
||||
hub: 1
|
||||
ground_handling_cost: 100
|
||||
- id: KLGA
|
||||
iata: LGA
|
||||
icao: KLGA
|
||||
name: La Guardia Airport
|
||||
location: New York, New York, USA
|
||||
country: United States
|
||||
timezone: America/New_York
|
||||
lat: 40.7772
|
||||
lon: -73.8726
|
||||
hub: 1
|
||||
ground_handling_cost: 250
|
||||
- id: KJFK
|
||||
iata: JFK
|
||||
icao: KJFK
|
||||
@@ -470,21 +448,6 @@ flights:
|
||||
- id: flightid_1
|
||||
airline_id: 1
|
||||
flight_number: 100
|
||||
dpt_airport_id: KHPN
|
||||
arr_airport_id: KJFK
|
||||
route: DCT CMK V374 DENNA V44 BELTT/N0346F140 V44 DPK DCT
|
||||
distance: 113
|
||||
level: 110
|
||||
dpt_time: 6PM CST
|
||||
arr_time: 11PM EST
|
||||
flight_time: 240
|
||||
flight_type: J
|
||||
load_factor: 100
|
||||
created_at: NOW
|
||||
updated_at: NOW
|
||||
- id: flightid_2
|
||||
airline_id: 1
|
||||
flight_number: 101
|
||||
dpt_airport_id: KAUS
|
||||
arr_airport_id: KJFK
|
||||
route: KAUS SID TNV J87 IAH J2 LCH J22 MEI J239 ATL J52 AJFEB J14 BYJAC Q60 JAXSN J14 COLIN J61 HUBBS J55 SIE STAR KJFK
|
||||
@@ -586,21 +549,6 @@ flights:
|
||||
visible: 1
|
||||
created_at: now
|
||||
updated_at: now
|
||||
- id: flightid_4
|
||||
airline_id: 1
|
||||
flight_number: 100
|
||||
dpt_airport_id: KHPN
|
||||
arr_airport_id: KLGA
|
||||
route: DCT CMK V374 DENNA V44 BELTT/N0346F140 V44 DPK DCT
|
||||
distance: 75
|
||||
level: 110
|
||||
dpt_time: 6PM CST
|
||||
arr_time: 11PM EST
|
||||
flight_time: 240
|
||||
flight_type: J
|
||||
load_factor: 100
|
||||
created_at: NOW
|
||||
updated_at: NOW
|
||||
|
||||
flight_fields:
|
||||
- name: Departure Terminal
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -42,9 +42,6 @@
|
||||
- name: ranks
|
||||
display_name: Ranks
|
||||
description: Create/edit ranks
|
||||
- name: typeratings
|
||||
display_name: Type Ratings
|
||||
description: Create/edit type ratings
|
||||
- name: users
|
||||
display_name: Users
|
||||
description: Create/edit users
|
||||
|
||||
@@ -137,13 +137,6 @@
|
||||
options: ''
|
||||
type: int
|
||||
description: 'Initial zoom level on the map'
|
||||
- key: acars.update_interval
|
||||
name: 'Refresh Interval'
|
||||
group: acars
|
||||
value: 60
|
||||
options: ''
|
||||
type: int
|
||||
description: 'How often the live map updates its data'
|
||||
- key: airports.default_ground_handling_cost
|
||||
name: 'Default Ground Handling Cost'
|
||||
group: airports
|
||||
@@ -290,14 +283,7 @@
|
||||
value: true
|
||||
options: ''
|
||||
type: boolean
|
||||
description: 'Aircraft restricted to user''s rank'
|
||||
- key: pireps.restrict_aircraft_to_typerating
|
||||
name: 'Restrict Aircraft by Type Ratings'
|
||||
group: pireps
|
||||
value: false
|
||||
options: ''
|
||||
type: boolean
|
||||
description: 'Aircraft restricted to user type ratings'
|
||||
description: 'Aircraft that can be flown are restricted to a user''s rank'
|
||||
- key: pireps.only_aircraft_at_dpt_airport
|
||||
name: 'Restrict Aircraft At Departure'
|
||||
group: pireps
|
||||
@@ -333,13 +319,6 @@
|
||||
options: ''
|
||||
type: int
|
||||
description: 'The length of a pilot''s ID'
|
||||
- key: pilots.id_code
|
||||
name: 'Pilot ID Code'
|
||||
group: pilots
|
||||
value: ''
|
||||
options: ''
|
||||
type: text
|
||||
description: 'Fixed ICAO code for pilot IDs'
|
||||
- key: pilots.auto_accept
|
||||
name: 'Auto Accept New Pilot'
|
||||
group: pilots
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
<?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;
|
||||
}
|
||||
}
|
||||
@@ -1,43 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Exceptions;
|
||||
|
||||
class BidNotFound extends AbstractHttpException
|
||||
{
|
||||
private $bid_id;
|
||||
|
||||
public function __construct($bid_id)
|
||||
{
|
||||
$this->bid_id = $bid_id;
|
||||
parent::__construct(
|
||||
404,
|
||||
'The bid '.$bid_id.' was not found'
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the RFC 7807 error type (without the URL root)
|
||||
*/
|
||||
public function getErrorType(): string
|
||||
{
|
||||
return 'bid-not-found';
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the detailed error string
|
||||
*/
|
||||
public function getErrorDetails(): string
|
||||
{
|
||||
return $this->getMessage();
|
||||
}
|
||||
|
||||
/**
|
||||
* Return an array with the error details, merged with the RFC7807 response
|
||||
*/
|
||||
public function getErrorMetadata(): array
|
||||
{
|
||||
return [
|
||||
'bid_id' => $this->bid_id,
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -79,7 +79,6 @@ class AircraftController extends Controller
|
||||
{
|
||||
return view('admin.aircraft.create', [
|
||||
'airports' => $this->airportRepo->selectBoxList(),
|
||||
'hubs' => $this->airportRepo->selectBoxList(true, true),
|
||||
'subfleets' => Subfleet::all()->pluck('name', 'id'),
|
||||
'statuses' => AircraftStatus::select(false),
|
||||
'subfleet_id' => $request->query('subfleet'),
|
||||
@@ -144,7 +143,6 @@ class AircraftController extends Controller
|
||||
return view('admin.aircraft.edit', [
|
||||
'aircraft' => $aircraft,
|
||||
'airports' => $this->airportRepo->selectBoxList(),
|
||||
'hubs' => $this->airportRepo->selectBoxList(true, true),
|
||||
'subfleets' => Subfleet::all()->pluck('name', 'id'),
|
||||
'statuses' => AircraftStatus::select(false),
|
||||
]);
|
||||
|
||||
@@ -300,18 +300,14 @@ class FlightController extends Controller
|
||||
public function export(Request $request)
|
||||
{
|
||||
$exporter = app(ExportService::class);
|
||||
|
||||
$where = [];
|
||||
$file_name = 'flights.csv';
|
||||
if ($request->input('airline_id')) {
|
||||
$airline_id = $request->input('airline_id');
|
||||
$where['airline_id'] = $airline_id;
|
||||
$file_name = 'flights-'.$airline_id.'.csv';
|
||||
}
|
||||
$flights = $this->flightRepo->where($where)->get();
|
||||
$flights = $this->flightRepo->all();
|
||||
|
||||
$path = $exporter->exportFlights($flights);
|
||||
return response()->download($path, $file_name, ['content-type' => 'text/csv'])->deleteFileAfterSend(true);
|
||||
return response()
|
||||
->download($path, 'flights.csv', [
|
||||
'content-type' => 'text/csv',
|
||||
])
|
||||
->deleteFileAfterSend(true);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -17,7 +17,6 @@ use App\Repositories\AircraftRepository;
|
||||
use App\Repositories\FareRepository;
|
||||
use App\Repositories\RankRepository;
|
||||
use App\Repositories\SubfleetRepository;
|
||||
use App\Repositories\TypeRatingRepository;
|
||||
use App\Services\ExportService;
|
||||
use App\Services\FareService;
|
||||
use App\Services\FleetService;
|
||||
@@ -37,29 +36,26 @@ class SubfleetController extends Controller
|
||||
private $importSvc;
|
||||
private $rankRepo;
|
||||
private $subfleetRepo;
|
||||
private $typeratingRepo;
|
||||
|
||||
/**
|
||||
* SubfleetController constructor.
|
||||
*
|
||||
* @param AircraftRepository $aircraftRepo
|
||||
* @param FareRepository $fareRepo
|
||||
* @param FareService $fareSvc
|
||||
* @param FleetService $fleetSvc
|
||||
* @param ImportService $importSvc
|
||||
* @param RankRepository $rankRepo
|
||||
* @param SubfleetRepository $subfleetRepo
|
||||
* @param TypeRatingRepository $typeratingRepo
|
||||
* @param AircraftRepository $aircraftRepo
|
||||
* @param FleetService $fleetSvc
|
||||
* @param FareRepository $fareRepo
|
||||
* @param FareService $fareSvc
|
||||
* @param ImportService $importSvc
|
||||
* @param RankRepository $rankRepo
|
||||
* @param SubfleetRepository $subfleetRepo
|
||||
*/
|
||||
public function __construct(
|
||||
AircraftRepository $aircraftRepo,
|
||||
FleetService $fleetSvc,
|
||||
FareRepository $fareRepo,
|
||||
FareService $fareSvc,
|
||||
FleetService $fleetSvc,
|
||||
ImportService $importSvc,
|
||||
RankRepository $rankRepo,
|
||||
SubfleetRepository $subfleetRepo,
|
||||
TypeRatingRepository $typeratingRepo
|
||||
SubfleetRepository $subfleetRepo
|
||||
) {
|
||||
$this->aircraftRepo = $aircraftRepo;
|
||||
$this->fareRepo = $fareRepo;
|
||||
@@ -68,7 +64,48 @@ class SubfleetController extends Controller
|
||||
$this->importSvc = $importSvc;
|
||||
$this->rankRepo = $rankRepo;
|
||||
$this->subfleetRepo = $subfleetRepo;
|
||||
$this->typeratingRepo = $typeratingRepo;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the ranks that are available to the subfleet
|
||||
*
|
||||
* @param $subfleet
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
protected function getAvailRanks($subfleet)
|
||||
{
|
||||
$retval = [];
|
||||
$all_ranks = $this->rankRepo->all();
|
||||
$avail_ranks = $all_ranks->except($subfleet->ranks->modelKeys());
|
||||
foreach ($avail_ranks as $rank) {
|
||||
$retval[$rank->id] = $rank->name;
|
||||
}
|
||||
|
||||
return $retval;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get all the fares that haven't been assigned to a given subfleet
|
||||
*
|
||||
* @param mixed $subfleet
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
protected function getAvailFares($subfleet)
|
||||
{
|
||||
$retval = [];
|
||||
$all_fares = $this->fareRepo->all();
|
||||
$avail_fares = $all_fares->except($subfleet->fares->modelKeys());
|
||||
foreach ($avail_fares as $fare) {
|
||||
$retval[$fare->id] = $fare->name.
|
||||
' (price: '.$fare->price.
|
||||
', type: '.FareType::label($fare->type).
|
||||
', cost: '.$fare->cost.
|
||||
', capacity: '.$fare->capacity.')';
|
||||
}
|
||||
|
||||
return $retval;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -115,8 +152,8 @@ class SubfleetController extends Controller
|
||||
{
|
||||
$input = $request->all();
|
||||
$subfleet = $this->subfleetRepo->create($input);
|
||||
Flash::success('Subfleet saved successfully.');
|
||||
|
||||
Flash::success('Subfleet saved successfully.');
|
||||
return redirect(route('admin.subfleets.edit', [$subfleet->id]));
|
||||
}
|
||||
|
||||
@@ -135,12 +172,10 @@ class SubfleetController extends Controller
|
||||
|
||||
if (empty($subfleet)) {
|
||||
Flash::error('Subfleet not found');
|
||||
|
||||
return redirect(route('admin.subfleets.index'));
|
||||
}
|
||||
|
||||
$avail_fares = $this->getAvailFares($subfleet);
|
||||
|
||||
return view('admin.subfleets.show', [
|
||||
'subfleet' => $subfleet,
|
||||
'avail_fares' => $avail_fares,
|
||||
@@ -157,27 +192,24 @@ class SubfleetController extends Controller
|
||||
public function edit($id)
|
||||
{
|
||||
$subfleet = $this->subfleetRepo
|
||||
->with(['fares', 'ranks', 'typeratings'])
|
||||
->with(['fares', 'ranks'])
|
||||
->findWithoutFail($id);
|
||||
|
||||
if (empty($subfleet)) {
|
||||
Flash::error('Subfleet not found');
|
||||
|
||||
return redirect(route('admin.subfleets.index'));
|
||||
}
|
||||
|
||||
$avail_fares = $this->getAvailFares($subfleet);
|
||||
$avail_ranks = $this->getAvailRanks($subfleet);
|
||||
$avail_ratings = $this->getAvailTypeRatings($subfleet);
|
||||
|
||||
return view('admin.subfleets.edit', [
|
||||
'airlines' => Airline::all()->pluck('name', 'id'),
|
||||
'hubs' => Airport::where('hub', 1)->pluck('name', 'id'),
|
||||
'fuel_types' => FuelType::labels(),
|
||||
'avail_fares' => $avail_fares,
|
||||
'avail_ranks' => $avail_ranks,
|
||||
'avail_ratings' => $avail_ratings,
|
||||
'subfleet' => $subfleet,
|
||||
'airlines' => Airline::all()->pluck('name', 'id'),
|
||||
'hubs' => Airport::where('hub', 1)->pluck('name', 'id'),
|
||||
'fuel_types' => FuelType::labels(),
|
||||
'avail_fares' => $avail_fares,
|
||||
'avail_ranks' => $avail_ranks,
|
||||
'subfleet' => $subfleet,
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -197,13 +229,12 @@ class SubfleetController extends Controller
|
||||
|
||||
if (empty($subfleet)) {
|
||||
Flash::error('Subfleet not found');
|
||||
|
||||
return redirect(route('admin.subfleets.index'));
|
||||
}
|
||||
|
||||
$this->subfleetRepo->update($request->all(), $id);
|
||||
Flash::success('Subfleet updated successfully.');
|
||||
|
||||
Flash::success('Subfleet updated successfully.');
|
||||
return redirect(route('admin.subfleets.index'));
|
||||
}
|
||||
|
||||
@@ -220,7 +251,6 @@ class SubfleetController extends Controller
|
||||
|
||||
if (empty($subfleet)) {
|
||||
Flash::error('Subfleet not found');
|
||||
|
||||
return redirect(route('admin.subfleets.index'));
|
||||
}
|
||||
|
||||
@@ -229,13 +259,12 @@ class SubfleetController extends Controller
|
||||
$aircraft = $this->aircraftRepo->findWhere(['subfleet_id' => $id], ['id']);
|
||||
if ($aircraft->count() > 0) {
|
||||
Flash::error('There are aircraft still assigned to this subfleet, you can\'t delete it!')->important();
|
||||
|
||||
return redirect(route('admin.subfleets.index'));
|
||||
}
|
||||
|
||||
$this->subfleetRepo->delete($id);
|
||||
Flash::success('Subfleet deleted successfully.');
|
||||
|
||||
Flash::success('Subfleet deleted successfully.');
|
||||
return redirect(route('admin.subfleets.index'));
|
||||
}
|
||||
|
||||
@@ -252,8 +281,11 @@ class SubfleetController extends Controller
|
||||
$subfleets = $this->subfleetRepo->all();
|
||||
|
||||
$path = $exporter->exportSubfleets($subfleets);
|
||||
|
||||
return response()->download($path, 'subfleets.csv', ['content-type' => 'text/csv'])->deleteFileAfterSend(true);
|
||||
return response()
|
||||
->download($path, 'subfleets.csv', [
|
||||
'content-type' => 'text/csv',
|
||||
])
|
||||
->deleteFileAfterSend(true);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -280,64 +312,77 @@ class SubfleetController extends Controller
|
||||
}
|
||||
|
||||
/**
|
||||
* Get all the fares that haven't been assigned to a given subfleet
|
||||
* @param Subfleet $subfleet
|
||||
*
|
||||
* @param mixed $subfleet
|
||||
*
|
||||
* @return array
|
||||
* @return mixed
|
||||
*/
|
||||
protected function getAvailFares($subfleet)
|
||||
protected function return_ranks_view(?Subfleet $subfleet)
|
||||
{
|
||||
$retval = [];
|
||||
$all_fares = $this->fareRepo->all();
|
||||
$avail_fares = $all_fares->except($subfleet->fares->modelKeys());
|
||||
foreach ($avail_fares as $fare) {
|
||||
$retval[$fare->id] = $fare->name.
|
||||
' (price: '.$fare->price.
|
||||
', type: '.FareType::label($fare->type).
|
||||
', cost: '.$fare->cost.
|
||||
', capacity: '.$fare->capacity.')';
|
||||
}
|
||||
$subfleet->refresh();
|
||||
|
||||
return $retval;
|
||||
$avail_ranks = $this->getAvailRanks($subfleet);
|
||||
return view('admin.subfleets.ranks', [
|
||||
'subfleet' => $subfleet,
|
||||
'avail_ranks' => $avail_ranks,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the ranks that are available to the subfleet
|
||||
* @param Subfleet $subfleet
|
||||
*
|
||||
* @param $subfleet
|
||||
*
|
||||
* @return array
|
||||
* @return mixed
|
||||
*/
|
||||
protected function getAvailRanks($subfleet)
|
||||
protected function return_fares_view(?Subfleet $subfleet)
|
||||
{
|
||||
$retval = [];
|
||||
$all_ranks = $this->rankRepo->all();
|
||||
$avail_ranks = $all_ranks->except($subfleet->ranks->modelKeys());
|
||||
foreach ($avail_ranks as $rank) {
|
||||
$retval[$rank->id] = $rank->name;
|
||||
}
|
||||
$subfleet->refresh();
|
||||
|
||||
return $retval;
|
||||
$avail_fares = $this->getAvailFares($subfleet);
|
||||
return view('admin.subfleets.fares', [
|
||||
'subfleet' => $subfleet,
|
||||
'avail_fares' => $avail_fares,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the type ratings that are available to the subfleet
|
||||
* Operations for associating ranks to the subfleet
|
||||
*
|
||||
* @param $subfleet
|
||||
* @param $id
|
||||
* @param Request $request
|
||||
*
|
||||
* @return array
|
||||
* @return mixed
|
||||
*/
|
||||
protected function getAvailTypeRatings($subfleet)
|
||||
public function ranks($id, Request $request)
|
||||
{
|
||||
$retval = [];
|
||||
$all_ratings = $this->typeratingRepo->all();
|
||||
$avail_ratings = $all_ratings->except($subfleet->typeratings->modelKeys());
|
||||
foreach ($avail_ratings as $tr) {
|
||||
$retval[$tr->id] = $tr->name.' ('.$tr->type.')';
|
||||
$subfleet = $this->subfleetRepo->findWithoutFail($id);
|
||||
if (empty($subfleet)) {
|
||||
return $this->return_ranks_view($subfleet);
|
||||
}
|
||||
|
||||
return $retval;
|
||||
if ($request->isMethod('get')) {
|
||||
return $this->return_ranks_view($subfleet);
|
||||
}
|
||||
|
||||
/*
|
||||
* update specific rank data
|
||||
*/
|
||||
if ($request->isMethod('post')) {
|
||||
$rank = $this->rankRepo->find($request->input('rank_id'));
|
||||
$this->fleetSvc->addSubfleetToRank($subfleet, $rank);
|
||||
} elseif ($request->isMethod('put')) {
|
||||
$override = [];
|
||||
$rank = $this->rankRepo->find($request->input('rank_id'));
|
||||
$override[$request->name] = $request->value;
|
||||
|
||||
$this->fleetSvc->addSubfleetToRank($subfleet, $rank, $override);
|
||||
} // dissassociate fare from teh aircraft
|
||||
elseif ($request->isMethod('delete')) {
|
||||
$rank = $this->rankRepo->find($request->input('rank_id'));
|
||||
$this->fleetSvc->removeSubfleetFromRank($subfleet, $rank);
|
||||
}
|
||||
|
||||
$subfleet->save();
|
||||
|
||||
return $this->return_ranks_view($subfleet);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -353,54 +398,6 @@ class SubfleetController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Subfleet $subfleet
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
protected function return_fares_view(?Subfleet $subfleet)
|
||||
{
|
||||
$subfleet->refresh();
|
||||
$avail_fares = $this->getAvailFares($subfleet);
|
||||
|
||||
return view('admin.subfleets.fares', [
|
||||
'subfleet' => $subfleet,
|
||||
'avail_fares' => $avail_fares,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Subfleet $subfleet
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
protected function return_ranks_view(?Subfleet $subfleet)
|
||||
{
|
||||
$subfleet->refresh();
|
||||
$avail_ranks = $this->getAvailRanks($subfleet);
|
||||
|
||||
return view('admin.subfleets.ranks', [
|
||||
'subfleet' => $subfleet,
|
||||
'avail_ranks' => $avail_ranks,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Subfleet $subfleet
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
protected function return_typeratings_view(?Subfleet $subfleet)
|
||||
{
|
||||
$subfleet->refresh();
|
||||
$avail_ratings = $this->getAvailTypeRatings($subfleet);
|
||||
|
||||
return view('admin.subfleets.type_ratings', [
|
||||
'subfleet' => $subfleet,
|
||||
'avail_ratings' => $avail_ratings,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Operations for associating ranks to the subfleet
|
||||
*
|
||||
@@ -482,79 +479,4 @@ class SubfleetController extends Controller
|
||||
|
||||
return $this->return_fares_view($subfleet);
|
||||
}
|
||||
|
||||
/**
|
||||
* Operations for associating ranks to the subfleet
|
||||
*
|
||||
* @param $id
|
||||
* @param Request $request
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
public function ranks($id, Request $request)
|
||||
{
|
||||
$subfleet = $this->subfleetRepo->findWithoutFail($id);
|
||||
if (empty($subfleet)) {
|
||||
return $this->return_ranks_view($subfleet);
|
||||
}
|
||||
|
||||
if ($request->isMethod('get')) {
|
||||
return $this->return_ranks_view($subfleet);
|
||||
}
|
||||
|
||||
// associate rank with the subfleet
|
||||
if ($request->isMethod('post')) {
|
||||
$rank = $this->rankRepo->find($request->input('rank_id'));
|
||||
$this->fleetSvc->addSubfleetToRank($subfleet, $rank);
|
||||
} // override definitions
|
||||
elseif ($request->isMethod('put')) {
|
||||
$override = [];
|
||||
$rank = $this->rankRepo->find($request->input('rank_id'));
|
||||
$override[$request->name] = $request->value;
|
||||
|
||||
$this->fleetSvc->addSubfleetToRank($subfleet, $rank, $override);
|
||||
} // dissassociate rank from the subfleet
|
||||
elseif ($request->isMethod('delete')) {
|
||||
$rank = $this->rankRepo->find($request->input('rank_id'));
|
||||
$this->fleetSvc->removeSubfleetFromRank($subfleet, $rank);
|
||||
}
|
||||
|
||||
$subfleet->save();
|
||||
|
||||
return $this->return_ranks_view($subfleet);
|
||||
}
|
||||
|
||||
/**
|
||||
* Operations for associating type ratings to the subfleet
|
||||
*
|
||||
* @param $id
|
||||
* @param Request $request
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
public function typeratings($id, Request $request)
|
||||
{
|
||||
$subfleet = $this->subfleetRepo->findWithoutFail($id);
|
||||
if (empty($subfleet)) {
|
||||
return $this->return_typeratings_view($subfleet);
|
||||
}
|
||||
|
||||
if ($request->isMethod('get')) {
|
||||
return $this->return_typeratings_view($subfleet);
|
||||
}
|
||||
|
||||
// associate subfleet with type rating
|
||||
if ($request->isMethod('post')) {
|
||||
$typerating = $this->typeratingRepo->find($request->input('typerating_id'));
|
||||
$this->fleetSvc->addSubfleetToTypeRating($subfleet, $typerating);
|
||||
} // dissassociate subfleet from the type rating
|
||||
elseif ($request->isMethod('delete')) {
|
||||
$typerating = $this->typeratingRepo->find($request->input('typerating_id'));
|
||||
$this->fleetSvc->removeSubfleetFromTypeRating($subfleet, $typerating);
|
||||
}
|
||||
|
||||
$subfleet->save();
|
||||
|
||||
return $this->return_typeratings_view($subfleet);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,168 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Admin;
|
||||
|
||||
use App\Contracts\Controller;
|
||||
use App\Http\Requests\CreateTypeRatingRequest;
|
||||
use App\Http\Requests\UpdateTypeRatingRequest;
|
||||
use App\Repositories\SubfleetRepository;
|
||||
use App\Repositories\TypeRatingRepository;
|
||||
use App\Services\FleetService;
|
||||
use Cache;
|
||||
use Illuminate\Http\Request;
|
||||
use Laracasts\Flash\Flash;
|
||||
use Prettus\Repository\Criteria\RequestCriteria;
|
||||
|
||||
class TypeRatingController extends Controller
|
||||
{
|
||||
private $fleetSvc;
|
||||
private $subfleetRepo;
|
||||
private $typeratingRepo;
|
||||
|
||||
public function __construct(
|
||||
FleetService $fleetSvc,
|
||||
SubfleetRepository $subfleetRepo,
|
||||
TypeRatingRepository $typeratingRepo
|
||||
) {
|
||||
$this->fleetSvc = $fleetSvc;
|
||||
$this->subfleetRepo = $subfleetRepo;
|
||||
$this->typeratingRepo = $typeratingRepo;
|
||||
}
|
||||
|
||||
public function index(Request $request)
|
||||
{
|
||||
$this->typeratingRepo->pushCriteria(new RequestCriteria($request));
|
||||
$typeratings = $this->typeratingRepo->all();
|
||||
|
||||
return view('admin.typeratings.index', [
|
||||
'typeratings' => $typeratings,
|
||||
]);
|
||||
}
|
||||
|
||||
public function create()
|
||||
{
|
||||
return view('admin.typeratings.create');
|
||||
}
|
||||
|
||||
public function store(CreateTypeRatingRequest $request)
|
||||
{
|
||||
$input = $request->all();
|
||||
|
||||
$model = $this->typeratingRepo->create($input);
|
||||
Flash::success('Type Rating saved successfully.');
|
||||
// Cache::forget(config('cache.keys.RANKS_PILOT_LIST.key'));
|
||||
|
||||
return redirect(route('admin.typeratings.edit', [$model->id]));
|
||||
}
|
||||
|
||||
public function show($id)
|
||||
{
|
||||
$typerating = $this->typeratingRepo->findWithoutFail($id);
|
||||
|
||||
if (empty($typerating)) {
|
||||
Flash::error('Type Rating not found');
|
||||
|
||||
return redirect(route('admin.typeratings.index'));
|
||||
}
|
||||
|
||||
return view('admin.typeratings.show', [
|
||||
'typerating' => $typerating,
|
||||
]);
|
||||
}
|
||||
|
||||
public function edit($id)
|
||||
{
|
||||
$typerating = $this->typeratingRepo->findWithoutFail($id);
|
||||
|
||||
if (empty($typerating)) {
|
||||
Flash::error('Type Rating not found');
|
||||
|
||||
return redirect(route('admin.typeratings.index'));
|
||||
}
|
||||
|
||||
$avail_subfleets = $this->getAvailSubfleets($typerating);
|
||||
|
||||
return view('admin.typeratings.edit', [
|
||||
'typerating' => $typerating,
|
||||
'avail_subfleets' => $avail_subfleets,
|
||||
]);
|
||||
}
|
||||
|
||||
public function update($id, UpdateTypeRatingRequest $request)
|
||||
{
|
||||
$typerating = $this->typeratingRepo->findWithoutFail($id);
|
||||
|
||||
if (empty($typerating)) {
|
||||
Flash::error('Type Rating not found');
|
||||
|
||||
return redirect(route('admin.typeratings.index'));
|
||||
}
|
||||
|
||||
$typerating = $this->typeratingRepo->update($request->all(), $id);
|
||||
// Cache::forget(config('cache.keys.RANKS_PILOT_LIST.key'));
|
||||
Flash::success('Type Rating updated successfully.');
|
||||
|
||||
return redirect(route('admin.typeratings.index'));
|
||||
}
|
||||
|
||||
public function destroy($id)
|
||||
{
|
||||
$typerating = $this->typeratingRepo->findWithoutFail($id);
|
||||
|
||||
if (empty($typerating)) {
|
||||
Flash::error('Type Rating not found');
|
||||
|
||||
return redirect(route('admin.typeratings.index'));
|
||||
}
|
||||
|
||||
$this->typeratingRepo->delete($id);
|
||||
|
||||
Flash::success('Type Rating deleted successfully.');
|
||||
|
||||
return redirect(route('admin.typeratings.index'));
|
||||
}
|
||||
|
||||
protected function getAvailSubfleets($typerating)
|
||||
{
|
||||
$retval = [];
|
||||
$all_subfleets = $this->subfleetRepo->all();
|
||||
$avail_subfleets = $all_subfleets->except($typerating->subfleets->modelKeys());
|
||||
foreach ($avail_subfleets as $subfleet) {
|
||||
$retval[$subfleet->id] = $subfleet->name.' (Airline: '.$subfleet->airline->code.')';
|
||||
}
|
||||
|
||||
return $retval;
|
||||
}
|
||||
|
||||
protected function return_subfleet_view($typerating)
|
||||
{
|
||||
$avail_subfleets = $this->getAvailSubfleets($typerating);
|
||||
|
||||
return view('admin.typeratings.subfleets', [
|
||||
'typerating' => $typerating,
|
||||
'avail_subfleets' => $avail_subfleets,
|
||||
]);
|
||||
}
|
||||
|
||||
public function subfleets($id, Request $request)
|
||||
{
|
||||
$typerating = $this->typeratingRepo->findWithoutFail($id);
|
||||
if (empty($typerating)) {
|
||||
Flash::error('Type Rating not found!');
|
||||
return redirect(route('admin.typeratings.index'));
|
||||
}
|
||||
|
||||
// add subfleet to type rating
|
||||
if ($request->isMethod('post')) {
|
||||
$subfleet = $this->subfleetRepo->find($request->input('subfleet_id'));
|
||||
$this->fleetSvc->addSubfleetToTypeRating($subfleet, $typerating);
|
||||
}
|
||||
// remove subfleet from type rating
|
||||
elseif ($request->isMethod('delete')) {
|
||||
$subfleet = $this->subfleetRepo->find($request->input('subfleet_id'));
|
||||
$this->fleetSvc->removeSubfleetFromTypeRating($subfleet, $typerating);
|
||||
}
|
||||
|
||||
return $this->return_subfleet_view($typerating);
|
||||
}
|
||||
}
|
||||
@@ -12,7 +12,6 @@ use App\Repositories\AirlineRepository;
|
||||
use App\Repositories\AirportRepository;
|
||||
use App\Repositories\PirepRepository;
|
||||
use App\Repositories\RoleRepository;
|
||||
use App\Repositories\TypeRatingRepository;
|
||||
use App\Repositories\UserRepository;
|
||||
use App\Services\UserService;
|
||||
use App\Support\Timezonelist;
|
||||
@@ -31,27 +30,24 @@ class UserController extends Controller
|
||||
private $airportRepo;
|
||||
private $pirepRepo;
|
||||
private $roleRepo;
|
||||
private $typeratingRepo;
|
||||
private $userRepo;
|
||||
private $userSvc;
|
||||
|
||||
/**
|
||||
* UserController constructor.
|
||||
*
|
||||
* @param AirlineRepository $airlineRepo
|
||||
* @param AirportRepository $airportRepo
|
||||
* @param PirepRepository $pirepRepo
|
||||
* @param RoleRepository $roleRepo
|
||||
* @param TypeRatingRepository $typeratingRepo
|
||||
* @param UserRepository $userRepo
|
||||
* @param UserService $userSvc
|
||||
* @param AirlineRepository $airlineRepo
|
||||
* @param AirportRepository $airportRepo
|
||||
* @param PirepRepository $pirepRepo
|
||||
* @param RoleRepository $roleRepo
|
||||
* @param UserRepository $userRepo
|
||||
* @param UserService $userSvc
|
||||
*/
|
||||
public function __construct(
|
||||
AirlineRepository $airlineRepo,
|
||||
AirportRepository $airportRepo,
|
||||
PirepRepository $pirepRepo,
|
||||
RoleRepository $roleRepo,
|
||||
TypeRatingRepository $typeratingRepo,
|
||||
UserRepository $userRepo,
|
||||
UserService $userSvc
|
||||
) {
|
||||
@@ -59,7 +55,6 @@ class UserController extends Controller
|
||||
$this->airportRepo = $airportRepo;
|
||||
$this->pirepRepo = $pirepRepo;
|
||||
$this->roleRepo = $roleRepo;
|
||||
$this->typeratingRepo = $typeratingRepo;
|
||||
$this->userSvc = $userSvc;
|
||||
$this->userRepo = $userRepo;
|
||||
}
|
||||
@@ -154,7 +149,7 @@ class UserController extends Controller
|
||||
public function edit($id)
|
||||
{
|
||||
$user = $this->userRepo
|
||||
->with(['awards', 'fields', 'rank', 'typeratings'])
|
||||
->with(['awards', 'fields', 'rank'])
|
||||
->findWithoutFail($id);
|
||||
|
||||
if (empty($user)) {
|
||||
@@ -174,19 +169,17 @@ class UserController extends Controller
|
||||
$airlines = $this->airlineRepo->selectBoxList();
|
||||
$airports = $this->airportRepo->selectBoxList(false);
|
||||
$roles = $this->roleRepo->selectBoxList(false, true);
|
||||
$avail_ratings = $this->getAvailTypeRatings($user);
|
||||
|
||||
return view('admin.users.edit', [
|
||||
'user' => $user,
|
||||
'pireps' => $pireps,
|
||||
'country' => new ISO3166(),
|
||||
'countries' => $countries,
|
||||
'timezones' => Timezonelist::toArray(),
|
||||
'airports' => $airports,
|
||||
'airlines' => $airlines,
|
||||
'ranks' => Rank::all()->pluck('name', 'id'),
|
||||
'roles' => $roles,
|
||||
'avail_ratings' => $avail_ratings,
|
||||
'user' => $user,
|
||||
'pireps' => $pireps,
|
||||
'country' => new ISO3166(),
|
||||
'countries' => $countries,
|
||||
'timezones' => Timezonelist::toArray(),
|
||||
'airports' => $airports,
|
||||
'airlines' => $airlines,
|
||||
'ranks' => Rank::all()->pluck('name', 'id'),
|
||||
'roles' => $roles,
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -267,7 +260,6 @@ class UserController extends Controller
|
||||
$user = $this->userRepo->findWithoutFail($id);
|
||||
if (empty($user)) {
|
||||
Flash::error('User not found');
|
||||
|
||||
return redirect(route('admin.users.index'));
|
||||
}
|
||||
|
||||
@@ -291,7 +283,6 @@ class UserController extends Controller
|
||||
$userAward = UserAward::where(['user_id' => $id, 'award_id' => $award_id]);
|
||||
if (empty($userAward)) {
|
||||
Flash::error('The user award could not be found');
|
||||
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
@@ -320,73 +311,4 @@ class UserController extends Controller
|
||||
|
||||
return redirect(route('admin.users.edit', [$id]));
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the type ratings that are available to the user
|
||||
*
|
||||
* @param $user
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
protected function getAvailTypeRatings($user)
|
||||
{
|
||||
$retval = [];
|
||||
$all_ratings = $this->typeratingRepo->all();
|
||||
$avail_ratings = $all_ratings->except($user->typeratings->modelKeys());
|
||||
foreach ($avail_ratings as $tr) {
|
||||
$retval[$tr->id] = $tr->name.' ('.$tr->type.')';
|
||||
}
|
||||
|
||||
return $retval;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param User $user
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
protected function return_typeratings_view(?User $user)
|
||||
{
|
||||
$user->refresh();
|
||||
|
||||
$avail_ratings = $this->getAvailTypeRatings($user);
|
||||
return view('admin.users.type_ratings', [
|
||||
'user' => $user,
|
||||
'avail_ratings' => $avail_ratings,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Operations for associating type ratings to the user
|
||||
*
|
||||
* @param $id
|
||||
* @param Request $request
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
public function typeratings($id, Request $request)
|
||||
{
|
||||
$user = $this->userRepo->findWithoutFail($id);
|
||||
if (empty($user)) {
|
||||
return $this->return_typeratings_view($user);
|
||||
}
|
||||
|
||||
if ($request->isMethod('get')) {
|
||||
return $this->return_typeratings_view($user);
|
||||
}
|
||||
|
||||
// associate user with type rating
|
||||
if ($request->isMethod('post')) {
|
||||
$typerating = $this->typeratingRepo->find($request->input('typerating_id'));
|
||||
$this->userSvc->addUserToTypeRating($user, $typerating);
|
||||
} // dissassociate user from the type rating
|
||||
elseif ($request->isMethod('delete')) {
|
||||
$typerating = $this->typeratingRepo->find($request->input('typerating_id'));
|
||||
$this->userSvc->removeUserFromTypeRating($user, $typerating);
|
||||
}
|
||||
|
||||
$user->save();
|
||||
|
||||
return $this->return_typeratings_view($user);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -148,10 +148,10 @@ class AcarsController extends Controller
|
||||
$pirep = Pirep::find($id);
|
||||
$this->checkCancelled($pirep);
|
||||
|
||||
/*Log::debug(
|
||||
Log::debug(
|
||||
'Posting ACARS update (user: '.Auth::user()->ident.', pirep id :'.$id.'): ',
|
||||
$request->post()
|
||||
);*/
|
||||
);
|
||||
|
||||
$count = 0;
|
||||
$positions = $request->post('positions');
|
||||
@@ -223,7 +223,7 @@ class AcarsController extends Controller
|
||||
$pirep = Pirep::find($id);
|
||||
$this->checkCancelled($pirep);
|
||||
|
||||
// Log::debug('Posting ACARS log, PIREP: '.$id, $request->post());
|
||||
Log::debug('Posting ACARS log, PIREP: '.$id, $request->post());
|
||||
|
||||
$count = 0;
|
||||
$logs = $request->post('logs');
|
||||
|
||||
@@ -25,7 +25,6 @@ use App\Models\Pirep;
|
||||
use App\Models\PirepComment;
|
||||
use App\Models\PirepFare;
|
||||
use App\Models\PirepFieldValue;
|
||||
use App\Models\User;
|
||||
use App\Repositories\JournalRepository;
|
||||
use App\Repositories\PirepRepository;
|
||||
use App\Services\Finance\PirepFinanceService;
|
||||
@@ -236,12 +235,8 @@ class PirepController extends Controller
|
||||
Log::info('PIREP Update, user '.Auth::id());
|
||||
Log::info($request->getContent());
|
||||
|
||||
/** @var User $user */
|
||||
$user = Auth::user();
|
||||
|
||||
/** @var Pirep $pirep */
|
||||
$pirep = Pirep::find($pirep_id);
|
||||
|
||||
$this->checkCancelled($pirep);
|
||||
|
||||
$attrs = $this->parsePirep($request);
|
||||
@@ -283,7 +278,6 @@ class PirepController extends Controller
|
||||
{
|
||||
Log::info('PIREP file, user '.Auth::id(), $request->post());
|
||||
|
||||
/** @var User $user */
|
||||
$user = Auth::user();
|
||||
|
||||
// Check if the status is cancelled...
|
||||
@@ -338,7 +332,7 @@ class PirepController extends Controller
|
||||
*/
|
||||
public function cancel($pirep_id, Request $request)
|
||||
{
|
||||
Log::info('PIREP '.$pirep_id.' Cancel, user '.Auth::id(), $request->post());
|
||||
Log::info('PIREP Cancel, user '.Auth::id(), $request->post());
|
||||
|
||||
$pirep = Pirep::find($pirep_id);
|
||||
$this->pirepSvc->cancel($pirep);
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
namespace App\Http\Controllers\Api;
|
||||
|
||||
use App\Contracts\Controller;
|
||||
use App\Exceptions\BidNotFound;
|
||||
use App\Exceptions\Unauthorized;
|
||||
use App\Exceptions\UserNotFound;
|
||||
use App\Http\Resources\Bid as BidResource;
|
||||
@@ -161,10 +160,6 @@ class UserController extends Controller
|
||||
|
||||
// Return the current bid
|
||||
$bid = $this->bidSvc->getBid($user, $bid_id);
|
||||
if ($bid === null) {
|
||||
throw new BidNotFound($bid_id);
|
||||
}
|
||||
|
||||
if ($bid->user_id !== $user->id) {
|
||||
throw new Unauthorized(new \Exception('Bid not not belong to authenticated user'));
|
||||
}
|
||||
|
||||
@@ -62,7 +62,7 @@ class RegisterController extends Controller
|
||||
{
|
||||
$airports = $this->airportRepo->selectBoxList(false, setting('pilots.home_hubs_only'));
|
||||
$airlines = $this->airlineRepo->selectBoxList();
|
||||
$userFields = UserField::where(['show_on_registration' => true, 'active' => true])->get();
|
||||
$userFields = UserField::where(['show_on_registration' => true])->get();
|
||||
|
||||
return view('auth.register', [
|
||||
'airports' => $airports,
|
||||
@@ -138,7 +138,7 @@ class RegisterController extends Controller
|
||||
|
||||
Log::info('User registered: ', $user->toArray());
|
||||
|
||||
$userFields = UserField::where(['show_on_registration' => true, 'active' => true])->get();
|
||||
$userFields = UserField::all();
|
||||
foreach ($userFields as $field) {
|
||||
$field_name = 'field_'.$field->slug;
|
||||
UserFieldValue::updateOrCreate([
|
||||
|
||||
@@ -35,23 +35,22 @@ class AirportController extends Controller
|
||||
public function show($id, Request $request)
|
||||
{
|
||||
$id = strtoupper($id);
|
||||
$with_flights = ['airline', 'arr_airport', 'dpt_airport'];
|
||||
|
||||
$airport = $this->airportRepo->with('files')->where('id', $id)->first();
|
||||
$airport = $this->airportRepo->where('id', $id)->first();
|
||||
if (!$airport) {
|
||||
Flash::error('Airport not found!');
|
||||
return redirect(route('frontend.dashboard.index'));
|
||||
}
|
||||
|
||||
$inbound_flights = $this->flightRepo
|
||||
->with($with_flights)
|
||||
->with(['dpt_airport', 'arr_airport', 'airline'])
|
||||
->findWhere([
|
||||
'arr_airport_id' => $id,
|
||||
'active' => 1,
|
||||
])->all();
|
||||
|
||||
$outbound_flights = $this->flightRepo
|
||||
->with($with_flights)
|
||||
->with(['dpt_airport', 'arr_airport', 'airline'])
|
||||
->findWhere([
|
||||
'dpt_airport_id' => $id,
|
||||
'active' => 1,
|
||||
|
||||
@@ -28,15 +28,14 @@ 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->with($with_pirep)->find($user->last_pirep_id);
|
||||
$last_pirep = $this->pirepRepo->find($user->last_pirep_id);
|
||||
} catch (\Exception $e) {
|
||||
}
|
||||
|
||||
|
||||
@@ -88,7 +88,6 @@ 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;
|
||||
@@ -128,11 +127,9 @@ class FlightController extends Controller
|
||||
|
||||
$flights = $this->flightRepo->searchCriteria($request)
|
||||
->with([
|
||||
'airline',
|
||||
'alt_airport',
|
||||
'arr_airport',
|
||||
'dpt_airport',
|
||||
'subfleets.airline',
|
||||
'arr_airport',
|
||||
'airline',
|
||||
'simbrief' => function ($query) use ($user) {
|
||||
$query->where('user_id', $user->id);
|
||||
}, ])
|
||||
@@ -218,19 +215,7 @@ class FlightController extends Controller
|
||||
*/
|
||||
public function show($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);
|
||||
$flight = $this->flightRepo->find($id);
|
||||
if (empty($flight)) {
|
||||
Flash::error('Flight not found!');
|
||||
return redirect(route('frontend.dashboard.index'));
|
||||
@@ -239,7 +224,7 @@ 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();
|
||||
$bid = Bid::where(['user_id' => Auth::id(), 'flight_id' => $flight->id])->first();
|
||||
|
||||
return view('flights.show', [
|
||||
'flight' => $flight,
|
||||
|
||||
@@ -16,7 +16,7 @@ class HomeController extends Controller
|
||||
public function index()
|
||||
{
|
||||
try {
|
||||
$users = User::with('home_airport')->where('state', '!=', UserState::DELETED)->orderBy('created_at', 'desc')->take(4)->get();
|
||||
$users = User::where('state', '!=', UserState::DELETED)->orderBy('created_at', 'desc')->take(4)->get();
|
||||
} catch (\PDOException $e) {
|
||||
Log::emergency($e);
|
||||
return view('system/errors/database_error', [
|
||||
|
||||
@@ -91,12 +91,8 @@ class PirepController extends Controller
|
||||
*/
|
||||
public function aircraftList($add_blank = false)
|
||||
{
|
||||
$user = Auth::user();
|
||||
$user_loc = filled($user->curr_airport_id) ? $user->curr_airport_id : $user->home_airport_id;
|
||||
$location_check = setting('pireps.only_aircraft_at_dpt_airport', false);
|
||||
|
||||
$aircraft = [];
|
||||
$subfleets = $this->userSvc->getAllowableSubfleets($user);
|
||||
$subfleets = $this->userSvc->getAllowableSubfleets(Auth::user());
|
||||
|
||||
if ($add_blank) {
|
||||
$aircraft[''] = '';
|
||||
@@ -104,9 +100,7 @@ class PirepController extends Controller
|
||||
|
||||
foreach ($subfleets as $subfleet) {
|
||||
$tmp = [];
|
||||
foreach ($subfleet->aircraft->when($location_check, function ($query) use ($user_loc) {
|
||||
return $query->where('airport_id', $user_loc);
|
||||
}) as $ac) {
|
||||
foreach ($subfleet->aircraft as $ac) {
|
||||
$tmp[$ac->id] = $ac['name'].' - '.$ac['registration'];
|
||||
}
|
||||
|
||||
@@ -188,7 +182,7 @@ class PirepController extends Controller
|
||||
|
||||
$where = [['user_id', $user->id]];
|
||||
$where[] = ['state', '<>', PirepState::CANCELLED];
|
||||
$with = ['aircraft', 'airline', 'arr_airport', 'comments', 'dpt_airport'];
|
||||
$with = ['airline', 'aircraft', 'dpt_airport', 'arr_airport', 'fares', 'comments'];
|
||||
|
||||
$this->pirepRepo->with($with)
|
||||
->pushCriteria(new WhereCriteria($request, $where));
|
||||
@@ -207,20 +201,7 @@ class PirepController extends Controller
|
||||
*/
|
||||
public function show($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);
|
||||
$pirep = $this->pirepRepo->with(['simbrief'])->find($id);
|
||||
if (empty($pirep)) {
|
||||
Flash::error('Pirep not found');
|
||||
return redirect(route('frontend.pirep.index'));
|
||||
|
||||
@@ -80,19 +80,22 @@ class ProfileController extends Controller
|
||||
public function show($id)
|
||||
{
|
||||
/** @var \App\Models\User $user */
|
||||
$with = ['airline', 'awards', 'current_airport', 'fields.field', 'home_airport', 'last_pirep', 'rank', 'typeratings'];
|
||||
$user = User::with($with)->where('id', $id)->first();
|
||||
$user = User::with(['awards', 'fields', 'fields.field'])
|
||||
->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(),
|
||||
]);
|
||||
}
|
||||
@@ -109,7 +112,9 @@ class ProfileController extends Controller
|
||||
public function edit(Request $request)
|
||||
{
|
||||
/** @var \App\Models\User $user */
|
||||
$user = User::with('fields.field')->where('id', Auth::id())->first();
|
||||
$user = User::with(['fields', 'fields.field'])
|
||||
->where('id', Auth::user()->id)
|
||||
->first();
|
||||
|
||||
if (empty($user)) {
|
||||
Flash::error('User not found!');
|
||||
|
||||
@@ -62,7 +62,7 @@ class SimBriefController
|
||||
$aircraft_id = $request->input('aircraft_id');
|
||||
|
||||
/** @var Flight $flight */
|
||||
$flight = $this->flightRepo->with(['airline', 'arr_airport', 'dpt_airport', 'fares', 'subfleets'])->find($flight_id);
|
||||
$flight = $this->flightRepo->with(['fares', 'subfleets'])->find($flight_id);
|
||||
|
||||
if (!$flight) {
|
||||
flash()->error('Unknown flight');
|
||||
@@ -80,39 +80,46 @@ class SimBriefController
|
||||
|
||||
// No aircraft selected, show selection form
|
||||
if (!$aircraft_id) {
|
||||
|
||||
// Get user's allowed subfleets and intersect it with flight subfleets
|
||||
// so we will have a proper list which the user is allowed to fly
|
||||
$user_subfleets = $this->userSvc->getAllowableSubfleets($user)->pluck('id')->toArray();
|
||||
$flight_subfleets = $flight->subfleets->pluck('id')->toArray();
|
||||
|
||||
$subfleet_ids = filled($flight_subfleets) ? array_intersect($user_subfleets, $flight_subfleets) : $user_subfleets;
|
||||
|
||||
// Prepare variables for single aircraft query
|
||||
$where = [];
|
||||
$where['state'] = AircraftState::PARKED;
|
||||
$where['status'] = AircraftStatus::ACTIVE;
|
||||
|
||||
if (setting('pireps.only_aircraft_at_dpt_airport')) {
|
||||
$where['airport_id'] = $flight->dpt_airport_id;
|
||||
// If no subfleets defined for flight get them from user
|
||||
if ($flight->subfleets->count() > 0) {
|
||||
$subfleets = $flight->subfleets;
|
||||
} else {
|
||||
$subfleets = $this->userSvc->getAllowableSubfleets($user);
|
||||
}
|
||||
|
||||
$withCount = ['simbriefs' => function ($query) {
|
||||
$query->whereNull('pirep_id');
|
||||
}];
|
||||
// Build an array of subfleet id's from the subfleets collection
|
||||
$sf_ids = $subfleets->map(function ($subfleets) {
|
||||
return collect($subfleets->toArray())
|
||||
->only(['id'])
|
||||
->all();
|
||||
});
|
||||
|
||||
// Build proper aircraft collection considering all possible settings
|
||||
// Flight subfleets, user subfleet restrictions, pirep restrictions, simbrief blocking etc
|
||||
$aircraft = Aircraft::withCount($withCount)->where($where)
|
||||
->when(setting('simbrief.block_aircraft'), function ($query) {
|
||||
return $query->having('simbriefs_count', 0);
|
||||
})->whereIn('subfleet_id', $subfleet_ids)
|
||||
->orderby('icao')->orderby('registration')
|
||||
->get();
|
||||
// Now we can build a proper aircrafts collection
|
||||
// Contents will be either members of flight->subfleets
|
||||
// or members of user's allowable subfleets
|
||||
$aircrafts = Aircraft::whereIn('subfleet_id', $sf_ids)
|
||||
->where('state', AircraftState::PARKED)
|
||||
->where('status', AircraftStatus::ACTIVE)
|
||||
->orderby('icao')
|
||||
->orderby('registration')
|
||||
->get();
|
||||
|
||||
if (setting('pireps.only_aircraft_at_dpt_airport')) {
|
||||
$aircrafts = $aircrafts->where('airport_id', $flight->dpt_airport_id);
|
||||
}
|
||||
|
||||
if (setting('simbrief.block_aircraft')) {
|
||||
// Build a list of aircraft_id's being used for active sb packs
|
||||
$sb_aircraft = SimBrief::whereNotNull('flight_id')->pluck('aircraft_id');
|
||||
|
||||
// Filter aircraft list to non used/blocked ones
|
||||
$aircrafts = $aircrafts->whereNotIn('id', $sb_aircraft);
|
||||
}
|
||||
|
||||
return view('flights.simbrief_aircraft', [
|
||||
'flight' => $flight,
|
||||
'aircrafts' => $aircraft,
|
||||
'aircrafts' => $aircrafts,
|
||||
'subfleets' => $subfleets,
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -129,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::with(['airline'])->where('id', $aircraft_id)->first();
|
||||
$aircraft = Aircraft::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);
|
||||
@@ -256,7 +263,7 @@ class SimBriefController
|
||||
$user = Auth::user();
|
||||
|
||||
/** @var SimBrief $simbrief */
|
||||
$simbrief = SimBrief::with(['flight.airline', 'pirep.airline'])->find($id);
|
||||
$simbrief = SimBrief::with(['flight'])->find($id);
|
||||
if (!$simbrief) {
|
||||
flash()->error('SimBrief briefing not found');
|
||||
return redirect(route('frontend.flights.index'));
|
||||
|
||||
@@ -30,9 +30,6 @@ 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')) {
|
||||
@@ -46,8 +43,7 @@ class UserController extends Controller
|
||||
}
|
||||
|
||||
$users = $this->userRepo
|
||||
->withCount($with_count)
|
||||
->with($with)
|
||||
->with(['airline', 'current_airport'])
|
||||
->orderBy('pilot_id', 'asc')
|
||||
->paginate();
|
||||
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Requests;
|
||||
|
||||
use App\Contracts\FormRequest;
|
||||
use App\Models\Typerating;
|
||||
|
||||
class CreateTypeRatingRequest extends FormRequest
|
||||
{
|
||||
/**
|
||||
* Get the validation rules that apply to the request.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function rules(): array
|
||||
{
|
||||
return Typerating::$rules;
|
||||
}
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Requests;
|
||||
|
||||
use App\Contracts\FormRequest;
|
||||
use App\Models\Typerating;
|
||||
|
||||
class UpdateTypeRatingRequest extends FormRequest
|
||||
{
|
||||
/**
|
||||
* Get the validation rules that apply to the request.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function rules(): array
|
||||
{
|
||||
return Typerating::$rules;
|
||||
}
|
||||
}
|
||||
@@ -60,7 +60,7 @@ class AwardHandler extends Listener
|
||||
*/
|
||||
public function checkForAwards($user)
|
||||
{
|
||||
$awards = Award::where('active', 1)->get();
|
||||
$awards = Award::all();
|
||||
foreach ($awards as $award) {
|
||||
$klass = $award->getReference($award, $user);
|
||||
if ($klass) {
|
||||
|
||||
@@ -4,8 +4,6 @@ namespace App\Listeners;
|
||||
|
||||
use App\Contracts\Listener;
|
||||
use App\Events\Expenses;
|
||||
use App\Models\Enums\ExpenseType;
|
||||
use App\Models\Expense;
|
||||
|
||||
class ExpenseListener extends Listener
|
||||
{
|
||||
@@ -25,7 +23,7 @@ class ExpenseListener extends Listener
|
||||
// The transaction group is how it will show as a line item
|
||||
/*$expenses[] = new Expense([
|
||||
'type' => ExpenseType::FLIGHT,
|
||||
'amount' => 150, # $150
|
||||
'amount' => 15000, # $150
|
||||
'transaction_group' => '',
|
||||
'charge_to_user' => true|false
|
||||
]);*/
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
<?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;
|
||||
}
|
||||
}
|
||||
@@ -7,13 +7,11 @@ use App\Models\Enums\AircraftStatus;
|
||||
use App\Models\Traits\ExpensableTrait;
|
||||
use App\Models\Traits\FilesTrait;
|
||||
use Carbon\Carbon;
|
||||
use Znck\Eloquent\Traits\BelongsToThrough;
|
||||
|
||||
/**
|
||||
* @property int id
|
||||
* @property mixed subfleet_id
|
||||
* @property string airport_id The apt where the aircraft is
|
||||
* @property string hub_id The apt where the aircraft is based
|
||||
* @property string ident
|
||||
* @property string name
|
||||
* @property string icao
|
||||
@@ -23,7 +21,6 @@ use Znck\Eloquent\Traits\BelongsToThrough;
|
||||
* @property float zfw
|
||||
* @property string hex_code
|
||||
* @property Airport airport
|
||||
* @property Airport hub
|
||||
* @property Subfleet subfleet
|
||||
* @property int status
|
||||
* @property int state
|
||||
@@ -34,14 +31,12 @@ class Aircraft extends Model
|
||||
{
|
||||
use ExpensableTrait;
|
||||
use FilesTrait;
|
||||
use BelongsToThrough;
|
||||
|
||||
public $table = 'aircraft';
|
||||
|
||||
protected $fillable = [
|
||||
'subfleet_id',
|
||||
'airport_id',
|
||||
'hub_id',
|
||||
'iata',
|
||||
'icao',
|
||||
'name',
|
||||
@@ -105,46 +100,14 @@ class Aircraft extends Model
|
||||
$this->attributes['icao'] = strtoupper($icao);
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the landing time in carbon format if provided
|
||||
*
|
||||
* @return Carbon|null
|
||||
*/
|
||||
public function getLandingTimeAttribute()
|
||||
{
|
||||
if (array_key_exists('landing_time', $this->attributes) && filled($this->attributes['landing_time'])) {
|
||||
return new Carbon($this->attributes['landing_time']);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* foreign keys
|
||||
*/
|
||||
public function airline()
|
||||
{
|
||||
return $this->belongsToThrough(Airline::class, Subfleet::class);
|
||||
}
|
||||
|
||||
public function airport()
|
||||
{
|
||||
return $this->belongsTo(Airport::class, 'airport_id');
|
||||
}
|
||||
|
||||
public function hub()
|
||||
{
|
||||
return $this->hasOne(Airport::class, 'id', 'hub_id');
|
||||
}
|
||||
|
||||
public function pireps()
|
||||
{
|
||||
return $this->hasMany(Pirep::class, 'aircraft_id');
|
||||
}
|
||||
|
||||
public function simbriefs()
|
||||
{
|
||||
return $this->hasMany(SimBrief::class, 'aircraft_id');
|
||||
}
|
||||
|
||||
public function subfleet()
|
||||
{
|
||||
return $this->belongsTo(Subfleet::class, 'subfleet_id');
|
||||
|
||||
@@ -103,11 +103,6 @@ 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');
|
||||
|
||||
@@ -21,7 +21,6 @@ class Award extends Model
|
||||
'image_url',
|
||||
'ref_model',
|
||||
'ref_model_params',
|
||||
'active',
|
||||
];
|
||||
|
||||
public static $rules = [
|
||||
@@ -30,7 +29,6 @@ class Award extends Model
|
||||
'image_url' => 'nullable',
|
||||
'ref_model' => 'required',
|
||||
'ref_model_params' => 'nullable',
|
||||
'active' => 'nullable',
|
||||
];
|
||||
|
||||
/**
|
||||
|
||||
@@ -10,8 +10,6 @@ use Carbon\Carbon;
|
||||
* @property string flight_id
|
||||
* @property Carbon created_at
|
||||
* @property Carbon updated_at
|
||||
* @property Flight flight
|
||||
* @property User user
|
||||
*/
|
||||
class Bid extends Model
|
||||
{
|
||||
|
||||
@@ -7,7 +7,6 @@ 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';
|
||||
@@ -15,7 +14,6 @@ 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',
|
||||
|
||||
@@ -24,7 +24,6 @@ use Illuminate\Support\Collection;
|
||||
* @property Collection subfleets
|
||||
* @property int days
|
||||
* @property int distance
|
||||
* @property int planned_distance
|
||||
* @property int flight_time
|
||||
* @property string route
|
||||
* @property string dpt_time
|
||||
@@ -137,19 +136,19 @@ class Flight extends Model
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the flight ident, e.,g JBU1900/C.nn/L.yy
|
||||
* Get the flight ident, e.,g JBU1900
|
||||
*/
|
||||
public function getIdentAttribute(): string
|
||||
{
|
||||
$flight_id = optional($this->airline)->code;
|
||||
$flight_id = $this->airline->code;
|
||||
$flight_id .= $this->flight_number;
|
||||
|
||||
if (filled($this->route_code)) {
|
||||
$flight_id .= '/C.'.$this->route_code;
|
||||
$flight_id .= '-'.$this->route_code;
|
||||
}
|
||||
|
||||
if (filled($this->route_leg)) {
|
||||
$flight_id .= '/L.'.$this->route_leg;
|
||||
$flight_id .= '-'.$this->route_leg;
|
||||
}
|
||||
|
||||
return $flight_id;
|
||||
|
||||
@@ -215,19 +215,21 @@ class Pirep extends Model
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the flight ident, e.,g JBU1900/C.nn/L.yy
|
||||
* Get the flight ident, e.,g JBU1900
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public function getIdentAttribute(): string
|
||||
{
|
||||
$flight_id = optional($this->airline)->code;
|
||||
$flight_id .= $this->flight_number;
|
||||
//$flight_id = $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;
|
||||
|
||||
@@ -107,9 +107,4 @@ class Subfleet extends Model
|
||||
return $this->belongsToMany(Rank::class, 'subfleet_rank')
|
||||
->withPivot('acars_pay', 'manual_pay');
|
||||
}
|
||||
|
||||
public function typeratings()
|
||||
{
|
||||
return $this->belongsToMany(Typerating::class, 'typerating_subfleet', 'subfleet_id', 'typerating_id');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use App\Contracts\Model;
|
||||
|
||||
class Typerating extends Model
|
||||
{
|
||||
public $table = 'typeratings';
|
||||
|
||||
protected $fillable = [
|
||||
'name',
|
||||
'type',
|
||||
'description',
|
||||
'image_url',
|
||||
'active',
|
||||
];
|
||||
|
||||
// Validation
|
||||
public static $rules = [
|
||||
'name' => 'required',
|
||||
'type' => 'required',
|
||||
'description' => 'nullable',
|
||||
'image_url' => 'nullable',
|
||||
];
|
||||
|
||||
// Relationships
|
||||
public function subfleets()
|
||||
{
|
||||
return $this->belongsToMany(Subfleet::class, 'typerating_subfleet', 'typerating_id', 'subfleet_id');
|
||||
}
|
||||
|
||||
public function users()
|
||||
{
|
||||
return $this->belongsToMany(User::class, 'typerating_user', 'typerating_id', 'user_id');
|
||||
}
|
||||
}
|
||||
+4
-20
@@ -7,7 +7,6 @@ use App\Models\Traits\JournalTrait;
|
||||
use Illuminate\Foundation\Auth\User as Authenticatable;
|
||||
use Illuminate\Notifications\Notifiable;
|
||||
use Laratrust\Traits\LaratrustUserTrait;
|
||||
use Staudenmeir\EloquentHasManyDeep\HasRelationships;
|
||||
|
||||
/**
|
||||
* @property int id
|
||||
@@ -43,7 +42,6 @@ use Staudenmeir\EloquentHasManyDeep\HasRelationships;
|
||||
* @property UserFieldValue[] fields
|
||||
* @property Role[] roles
|
||||
* @property Subfleet[] subfleets
|
||||
* @property TypeRating[] typeratings
|
||||
*
|
||||
* @mixin \Illuminate\Database\Eloquent\Builder
|
||||
* @mixin \Illuminate\Notifications\Notifiable
|
||||
@@ -54,7 +52,6 @@ class User extends Authenticatable
|
||||
use JournalTrait;
|
||||
use LaratrustUserTrait;
|
||||
use Notifiable;
|
||||
use HasRelationships;
|
||||
|
||||
public $table = 'users';
|
||||
|
||||
@@ -97,10 +94,7 @@ class User extends Authenticatable
|
||||
*/
|
||||
protected $hidden = [
|
||||
'api_key',
|
||||
'email',
|
||||
'name',
|
||||
'discord_id',
|
||||
'discord_private_channel_id',
|
||||
'password',
|
||||
'last_ip',
|
||||
'remember_token',
|
||||
@@ -131,9 +125,8 @@ class User extends Authenticatable
|
||||
public function getIdentAttribute(): string
|
||||
{
|
||||
$length = setting('pilots.id_length');
|
||||
$ident_code = filled(setting('pilots.id_code')) ? setting('pilots.id_code') : optional($this->airline)->icao;
|
||||
|
||||
return $ident_code.str_pad($this->pilot_id, $length, '0', STR_PAD_LEFT);
|
||||
return $this->airline->icao.str_pad($this->pilot_id, $length, '0', STR_PAD_LEFT);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -152,7 +145,7 @@ class User extends Authenticatable
|
||||
$first_name = $name_parts[0];
|
||||
$last_name = $name_parts[$count - 1];
|
||||
|
||||
return $first_name.' '.mb_substr($last_name, 0, 1);
|
||||
return $first_name.' '.$last_name[0];
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -198,7 +191,8 @@ class User extends Authenticatable
|
||||
{
|
||||
$default = config('gravatar.default');
|
||||
|
||||
$uri = config('gravatar.url').md5(strtolower(trim($this->email))).'?d='.urlencode($default);
|
||||
$uri = config('gravatar.url')
|
||||
.md5(strtolower(trim($this->email))).'?d='.urlencode($default);
|
||||
|
||||
if ($size !== null) {
|
||||
$uri .= '&s='.$size;
|
||||
@@ -271,14 +265,4 @@ class User extends Authenticatable
|
||||
{
|
||||
return $this->belongsTo(Rank::class, 'rank_id');
|
||||
}
|
||||
|
||||
public function typeratings()
|
||||
{
|
||||
return $this->belongsToMany(Typerating::class, 'typerating_user', 'user_id', 'typerating_id');
|
||||
}
|
||||
|
||||
public function rated_subfleets()
|
||||
{
|
||||
return $this->hasManyDeep(Subfleet::class, ['typerating_user', Typerating::class, 'typerating_subfleet']);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,14 +22,6 @@ 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
|
||||
*/
|
||||
|
||||
@@ -20,23 +20,14 @@ class DiscordWebhook
|
||||
public function send($notifiable, Notification $notification)
|
||||
{
|
||||
$message = $notification->toDiscordChannel($notifiable);
|
||||
if ($message === null) {
|
||||
//Log::debug('Discord notifications not configured, skipping');
|
||||
if ($message === null || empty($message->webhook_url)) {
|
||||
Log::debug('Discord notifications not configured, skipping');
|
||||
return;
|
||||
}
|
||||
|
||||
$webhook_url = $message->webhook_url;
|
||||
if (empty($webhook_url)) {
|
||||
$webhook_url = setting('notifications.discord_private_webhook_url');
|
||||
if (empty($webhook_url)) {
|
||||
//Log::debug('Discord notifications not configured, skipping');
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
$data = $message->toArray();
|
||||
$this->httpClient->post($webhook_url, $data);
|
||||
$this->httpClient->post($message->webhook_url, $data);
|
||||
} catch (RequestException $e) {
|
||||
$request = Psr7\Message::toString($e->getRequest());
|
||||
$response = Psr7\Message::toString($e->getResponse());
|
||||
|
||||
@@ -4,6 +4,8 @@ namespace App\Notifications\Messages;
|
||||
|
||||
use App\Contracts\Notification;
|
||||
use App\Models\User;
|
||||
use App\Notifications\Channels\Discord\DiscordMessage;
|
||||
use App\Notifications\Channels\Discord\DiscordWebhook;
|
||||
use App\Notifications\Channels\MailChannel;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
|
||||
@@ -30,21 +32,32 @@ class AdminUserRegistered extends Notification implements ShouldQueue
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param $notifiable
|
||||
*
|
||||
* @return string[]
|
||||
*/
|
||||
public function via($notifiable)
|
||||
{
|
||||
return ['mail'];
|
||||
return ['mail', DiscordWebhook::class];
|
||||
}
|
||||
|
||||
/**
|
||||
* @param $notifiable
|
||||
* Send a Discord notification
|
||||
*
|
||||
* @return array
|
||||
* @param User $pirep
|
||||
* @param mixed $user
|
||||
*
|
||||
* @return DiscordMessage|null
|
||||
*/
|
||||
public function toDiscordChannel($user): ?DiscordMessage
|
||||
{
|
||||
if (empty(setting('notifications.discord_private_webhook_url'))) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$dm = new DiscordMessage();
|
||||
return $dm->webhook(setting('notifications.discord_private_webhook_url'))
|
||||
->success()
|
||||
->title('New User Registered: '.$user->ident)
|
||||
->fields([]);
|
||||
}
|
||||
|
||||
public function toArray($notifiable)
|
||||
{
|
||||
return [
|
||||
|
||||
@@ -1,58 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Notifications\Messages\Broadcast;
|
||||
|
||||
use App\Contracts\Notification;
|
||||
use App\Models\News;
|
||||
use App\Notifications\Channels\Discord\DiscordMessage;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
|
||||
class NewsAdded extends Notification implements ShouldQueue
|
||||
{
|
||||
private $news;
|
||||
|
||||
public function __construct(News $news)
|
||||
{
|
||||
parent::__construct();
|
||||
|
||||
$this->news = $news;
|
||||
}
|
||||
|
||||
public function via($notifiable)
|
||||
{
|
||||
return ['discord_webhook'];
|
||||
}
|
||||
|
||||
/**
|
||||
* @param News $news
|
||||
*
|
||||
* @return DiscordMessage|null
|
||||
*/
|
||||
public function toDiscordChannel($news): ?DiscordMessage
|
||||
{
|
||||
$dm = new DiscordMessage();
|
||||
return $dm->url(setting('notifications.discord_public_webhook_url'))
|
||||
->success()
|
||||
->title('News: '.$news->subject)
|
||||
->author([
|
||||
'name' => $news->user->ident.' - '.$news->user->name_private,
|
||||
'url' => '',
|
||||
'icon_url' => $news->user->resolveAvatarUrl(),
|
||||
])
|
||||
->description($news->body);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the array representation of the notification.
|
||||
*
|
||||
* @param mixed $notifiable
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function toArray($notifiable)
|
||||
{
|
||||
return [
|
||||
'news_id' => $this->news->id,
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -1,74 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Notifications\Messages\Broadcast;
|
||||
|
||||
use App\Contracts\Notification;
|
||||
use App\Models\User;
|
||||
use App\Notifications\Channels\Discord\DiscordMessage;
|
||||
use App\Notifications\Channels\MailChannel;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
|
||||
/**
|
||||
* Send a message to a Discord channel that a user was registered
|
||||
*/
|
||||
class UserRegistered extends Notification implements ShouldQueue
|
||||
{
|
||||
use MailChannel;
|
||||
|
||||
private $user;
|
||||
|
||||
/**
|
||||
* Create a new notification instance.
|
||||
*
|
||||
* @param \App\Models\User $user
|
||||
*/
|
||||
public function __construct(User $user)
|
||||
{
|
||||
parent::__construct();
|
||||
|
||||
$this->user = $user;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param $notifiable
|
||||
*
|
||||
* @return string[]
|
||||
*/
|
||||
public function via($notifiable)
|
||||
{
|
||||
return ['discord_webhook'];
|
||||
}
|
||||
|
||||
/**
|
||||
* Send a Discord notification
|
||||
*
|
||||
* @param $notifiable
|
||||
*
|
||||
* @return DiscordMessage|null
|
||||
*/
|
||||
public function toDiscordChannel($notifiable): ?DiscordMessage
|
||||
{
|
||||
$dm = new DiscordMessage();
|
||||
return $dm->url(setting('notifications.discord_private_webhook_url'))
|
||||
->success()
|
||||
->title('New User Registered: '.$this->user->ident)
|
||||
->author([
|
||||
'name' => $this->user->ident.' - '.$this->user->name_private,
|
||||
'url' => '',
|
||||
'icon_url' => $this->user->resolveAvatarUrl(),
|
||||
])
|
||||
->fields([]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param $notifiable
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function toArray($notifiable)
|
||||
{
|
||||
return [
|
||||
'user_id' => $this->user->id,
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -1,53 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Notifications\Messages;
|
||||
|
||||
use App\Contracts\Notification;
|
||||
use App\Models\Pirep;
|
||||
use App\Notifications\Channels\MailChannel;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
|
||||
class PirepFiled extends Notification implements ShouldQueue
|
||||
{
|
||||
use MailChannel;
|
||||
|
||||
private $pirep;
|
||||
|
||||
/**
|
||||
* Create a new notification instance.
|
||||
*
|
||||
* @param \App\Models\Pirep $pirep
|
||||
*/
|
||||
public function __construct(Pirep $pirep)
|
||||
{
|
||||
parent::__construct();
|
||||
|
||||
$this->pirep = $pirep;
|
||||
|
||||
$this->setMailable(
|
||||
'New PIREP Submitted',
|
||||
'notifications.mail.admin.pirep.submitted',
|
||||
['pirep' => $this->pirep]
|
||||
);
|
||||
}
|
||||
|
||||
public function via($notifiable)
|
||||
{
|
||||
return ['mail'];
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the array representation of the notification.
|
||||
*
|
||||
* @param mixed $notifiable
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function toArray($notifiable)
|
||||
{
|
||||
return [
|
||||
'pirep_id' => $this->pirep->id,
|
||||
'user_id' => $this->pirep->user_id,
|
||||
];
|
||||
}
|
||||
}
|
||||
+3
-3
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace App\Notifications\Messages\Broadcast;
|
||||
namespace App\Notifications\Messages;
|
||||
|
||||
use App\Contracts\Notification;
|
||||
use App\Models\Pirep;
|
||||
@@ -48,9 +48,9 @@ class PirepPrefiled extends Notification implements ShouldQueue
|
||||
return null;
|
||||
}
|
||||
|
||||
$title = 'Flight '.$pirep->ident.' Prefiled';
|
||||
$title = 'Flight '.$pirep->airline->code.$pirep->ident.' Prefiled';
|
||||
$fields = [
|
||||
'Flight' => $pirep->ident,
|
||||
'Flight' => $pirep->airline->code.$pirep->ident,
|
||||
'Departure Airport' => $pirep->dpt_airport_id,
|
||||
'Arrival Airport' => $pirep->arr_airport_id,
|
||||
'Equipment' => $pirep->aircraft->ident,
|
||||
+8
-6
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace App\Notifications\Messages\Broadcast;
|
||||
namespace App\Notifications\Messages;
|
||||
|
||||
use App\Contracts\Notification;
|
||||
use App\Models\Enums\PirepStatus;
|
||||
@@ -9,11 +9,9 @@ use App\Notifications\Channels\Discord\DiscordMessage;
|
||||
use App\Notifications\Channels\Discord\DiscordWebhook;
|
||||
use App\Support\Units\Distance;
|
||||
use App\Support\Units\Time;
|
||||
use function config;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
use PhpUnitsOfMeasure\Exception\NonNumericValue;
|
||||
use PhpUnitsOfMeasure\Exception\NonStringUnitName;
|
||||
use function route;
|
||||
|
||||
/**
|
||||
* Send the PIREP accepted message to a particular user, can also be sent to Discord
|
||||
@@ -75,10 +73,14 @@ class PirepStatusChanged extends Notification implements ShouldQueue
|
||||
*/
|
||||
public function toDiscordChannel($pirep): ?DiscordMessage
|
||||
{
|
||||
$title = 'Flight '.$pirep->ident.' '.self::$verbs[$pirep->status];
|
||||
if (empty(setting('notifications.discord_public_webhook_url'))) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$title = 'Flight '.$pirep->airline->code.$pirep->ident.' '.self::$verbs[$pirep->status];
|
||||
|
||||
$fields = [
|
||||
'Flight' => $pirep->ident,
|
||||
'Flight' => $pirep->airline->code.$pirep->ident,
|
||||
'Departure Airport' => $pirep->dpt_airport_id,
|
||||
'Arrival Airport' => $pirep->arr_airport_id,
|
||||
'Equipment' => $pirep->aircraft->ident,
|
||||
@@ -110,7 +112,7 @@ class PirepStatusChanged extends Notification implements ShouldQueue
|
||||
}
|
||||
|
||||
$dm = new DiscordMessage();
|
||||
return $dm->url(setting('notifications.discord_public_webhook_url'))
|
||||
return $dm->webhook(setting('notifications.discord_public_webhook_url'))
|
||||
->success()
|
||||
->title($title)
|
||||
->description($pirep->user->discord_id ? 'Flight by <@'.$pirep->user->discord_id.'>' : '')
|
||||
+29
-15
@@ -1,18 +1,22 @@
|
||||
<?php
|
||||
|
||||
namespace App\Notifications\Messages\Broadcast;
|
||||
namespace App\Notifications\Messages;
|
||||
|
||||
use App\Contracts\Notification;
|
||||
use App\Models\Pirep;
|
||||
use App\Notifications\Channels\Discord\DiscordMessage;
|
||||
use App\Notifications\Channels\Discord\DiscordWebhook;
|
||||
use App\Notifications\Channels\MailChannel;
|
||||
use App\Support\Units\Distance;
|
||||
use App\Support\Units\Time;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
use PhpUnitsOfMeasure\Exception\NonNumericValue;
|
||||
use PhpUnitsOfMeasure\Exception\NonStringUnitName;
|
||||
|
||||
class PirepFiled extends Notification implements ShouldQueue
|
||||
class PirepSubmitted extends Notification implements ShouldQueue
|
||||
{
|
||||
use MailChannel;
|
||||
|
||||
private $pirep;
|
||||
|
||||
/**
|
||||
@@ -25,11 +29,17 @@ class PirepFiled extends Notification implements ShouldQueue
|
||||
parent::__construct();
|
||||
|
||||
$this->pirep = $pirep;
|
||||
|
||||
$this->setMailable(
|
||||
'New PIREP Submitted',
|
||||
'notifications.mail.admin.pirep.submitted',
|
||||
['pirep' => $this->pirep]
|
||||
);
|
||||
}
|
||||
|
||||
public function via($notifiable)
|
||||
{
|
||||
return ['discord_webhook'];
|
||||
return ['mail', DiscordWebhook::class];
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -41,30 +51,34 @@ class PirepFiled extends Notification implements ShouldQueue
|
||||
*/
|
||||
public function toDiscordChannel($pirep): ?DiscordMessage
|
||||
{
|
||||
$title = 'Flight '.$pirep->ident.' Filed';
|
||||
if (empty(setting('notifications.discord_public_webhook_url'))) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$title = 'Flight '.$pirep->airline->code.$pirep->ident.' Filed';
|
||||
$fields = [
|
||||
'Flight' => $pirep->ident,
|
||||
'Departure Airport' => $pirep->dpt_airport_id,
|
||||
'Arrival Airport' => $pirep->arr_airport_id,
|
||||
'Equipment' => $pirep->aircraft->ident,
|
||||
'Flight Time' => Time::minutesToTimeString($pirep->flight_time),
|
||||
'Flight' => $pirep->airline->code.$pirep->ident,
|
||||
'Departure Airport' => $pirep->dpt_airport_id,
|
||||
'Arrival Airport' => $pirep->arr_airport_id,
|
||||
'Equipment' => $pirep->aircraft->ident,
|
||||
'Flight Time (Planned)' => Time::minutesToTimeString($pirep->planned_flight_time),
|
||||
];
|
||||
|
||||
if ($pirep->distance) {
|
||||
if ($pirep->planned_distance) {
|
||||
try {
|
||||
$distance = new Distance(
|
||||
$pirep->distance,
|
||||
$planned_distance = new Distance(
|
||||
$pirep->planned_distance,
|
||||
config('phpvms.internal_units.distance')
|
||||
);
|
||||
|
||||
$pd = $distance[$distance->unit].' '.$distance->unit;
|
||||
$fields['Distance'] = $pd;
|
||||
$pd = $planned_distance[$planned_distance->unit].' '.$planned_distance->unit;
|
||||
$fields['Distance (Planned)'] = $pd;
|
||||
} catch (NonNumericValue|NonStringUnitName $e) {
|
||||
}
|
||||
}
|
||||
|
||||
$dm = new DiscordMessage();
|
||||
return $dm->url(setting('notifications.discord_public_webhook_url'))
|
||||
return $dm->webhook(setting('notifications.discord_public_webhook_url'))
|
||||
->success()
|
||||
->title($title)
|
||||
->description($pirep->user->discord_id ? 'Flight by <@'.$pirep->user->discord_id.'>' : '')
|
||||
@@ -134,10 +134,10 @@ class NotificationEventsHandler extends Listener
|
||||
*/
|
||||
$this->notifyAdmins(new Messages\AdminUserRegistered($event->user));
|
||||
|
||||
/*
|
||||
* Broadcast notifications
|
||||
/**
|
||||
* Discord and other notifications
|
||||
*/
|
||||
Notification::send([$event->user], new Messages\Broadcast\UserRegistered($event->user));
|
||||
Notification::send([$event->user], new Messages\AdminUserRegistered($event->user));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -166,20 +166,16 @@ class NotificationEventsHandler extends Listener
|
||||
public function onPirepPrefile(PirepPrefiled $event): void
|
||||
{
|
||||
Log::info('NotificationEvents::onPirepPrefile: '.$event->pirep->id.' prefiled');
|
||||
|
||||
/*
|
||||
* Broadcast notifications
|
||||
*/
|
||||
Notification::send([$event->pirep], new Messages\Broadcast\PirepPrefiled($event->pirep));
|
||||
Notification::send([$event->pirep], new Messages\PirepPrefiled($event->pirep));
|
||||
}
|
||||
|
||||
/**
|
||||
* Status Change notification. Disabled for now, too noisy
|
||||
* Status Change notification
|
||||
*/
|
||||
public function onPirepStatusChange(PirepStatusChange $event): void
|
||||
{
|
||||
// Log::info('NotificationEvents::onPirepStatusChange: '.$event->pirep->id.' prefiled');
|
||||
// Notification::send([$event->pirep], new Messages\Discord\PirepStatusChanged($event->pirep));
|
||||
Log::info('NotificationEvents::onPirepStatusChange: '.$event->pirep->id.' prefiled');
|
||||
Notification::send([$event->pirep], new Messages\PirepStatusChanged($event->pirep));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -190,12 +186,8 @@ class NotificationEventsHandler extends Listener
|
||||
public function onPirepFile(PirepFiled $event): void
|
||||
{
|
||||
Log::info('NotificationEvents::onPirepFile: '.$event->pirep->id.' filed');
|
||||
$this->notifyAdmins(new Messages\PirepFiled($event->pirep));
|
||||
|
||||
/*
|
||||
* Broadcast notifications
|
||||
*/
|
||||
Notification::send([$event->pirep], new Messages\Broadcast\PirepFiled($event->pirep));
|
||||
$this->notifyAdmins(new Messages\PirepSubmitted($event->pirep));
|
||||
Notification::send([$event->pirep], new Messages\PirepSubmitted($event->pirep));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -229,10 +221,6 @@ class NotificationEventsHandler extends Listener
|
||||
{
|
||||
Log::info('NotificationEvents::onNewsAdded');
|
||||
$this->notifyAllUsers(new Messages\NewsAdded($event->news));
|
||||
|
||||
/*
|
||||
* Broadcast notifications
|
||||
*/
|
||||
Notification::send([$event->news], new Messages\Broadcast\NewsAdded($event->news));
|
||||
Notification::send([$event->news], new Messages\NewsAdded($event->news));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,12 +2,10 @@
|
||||
|
||||
namespace App\Providers;
|
||||
|
||||
use App\Notifications\Channels\Discord\DiscordWebhook;
|
||||
use App\Services\ModuleService;
|
||||
use App\Support\ThemeViewFinder;
|
||||
use App\Support\Utils;
|
||||
use Illuminate\Pagination\Paginator;
|
||||
use Illuminate\Support\Facades\Notification;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
use Illuminate\Support\Facades\View;
|
||||
use Illuminate\Support\ServiceProvider;
|
||||
@@ -17,13 +15,8 @@ class AppServiceProvider extends ServiceProvider
|
||||
public function boot(): void
|
||||
{
|
||||
Schema::defaultStringLength(191);
|
||||
|
||||
Paginator::useBootstrap();
|
||||
View::share('moduleSvc', app(ModuleService::class));
|
||||
|
||||
Notification::extend('discord_webhook', function ($app) {
|
||||
return app(DiscordWebhook::class);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -3,13 +3,11 @@
|
||||
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;
|
||||
@@ -27,10 +25,6 @@ class EventServiceProvider extends ServiceProvider
|
||||
ExpenseListener::class,
|
||||
],
|
||||
|
||||
Fares::class => [
|
||||
FareListener::class,
|
||||
],
|
||||
|
||||
PirepFiled::class => [
|
||||
UserStateListener::class,
|
||||
],
|
||||
|
||||
@@ -376,21 +376,6 @@ class RouteServiceProvider extends ServiceProvider
|
||||
], 'settings', 'SettingsController@update')
|
||||
->name('settings.update')->middleware('ability:admin,settings');
|
||||
|
||||
// Type Ratings
|
||||
Route::resource('typeratings', 'TypeRatingController')->middleware('ability:admin,typeratings');
|
||||
Route::match([
|
||||
'get',
|
||||
'post',
|
||||
'put',
|
||||
'delete',
|
||||
], 'typeratings/{id}/subfleets', 'TypeRatingController@subfleets')->middleware('ability:admin,typeratings');
|
||||
Route::match([
|
||||
'get',
|
||||
'post',
|
||||
'put',
|
||||
'delete',
|
||||
], 'typeratings/{id}/users', 'TypeRatingController@users')->middleware('ability:admin,typeratings');
|
||||
|
||||
// maintenance
|
||||
Route::match(['get'], 'maintenance', 'MaintenanceController@index')
|
||||
->name('maintenance.index')->middleware('ability:admin,maintenance');
|
||||
@@ -441,13 +426,6 @@ class RouteServiceProvider extends ServiceProvider
|
||||
'delete',
|
||||
], 'subfleets/{id}/ranks', 'SubfleetController@ranks')->middleware('ability:admin,fleet');
|
||||
|
||||
Route::match([
|
||||
'get',
|
||||
'post',
|
||||
'put',
|
||||
'delete',
|
||||
], 'subfleets/{id}/typeratings', 'SubfleetController@typeratings')->middleware('ability:admin,fleet');
|
||||
|
||||
Route::resource('subfleets', 'SubfleetController')->middleware('ability:admin,fleet');
|
||||
|
||||
/**
|
||||
@@ -461,13 +439,6 @@ class RouteServiceProvider extends ServiceProvider
|
||||
|
||||
Route::resource('users', 'UserController')->middleware('ability:admin,users');
|
||||
|
||||
Route::match([
|
||||
'get',
|
||||
'post',
|
||||
'put',
|
||||
'delete',
|
||||
], 'users/{id}/typeratings', 'UserController@typeratings')->middleware('ability:admin,users');
|
||||
|
||||
// defaults
|
||||
Route::get('', ['uses' => 'DashboardController@index'])
|
||||
->middleware('update_pending', 'ability:admin,admin-access');
|
||||
|
||||
@@ -18,10 +18,8 @@ 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',
|
||||
@@ -96,10 +94,6 @@ 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');
|
||||
}
|
||||
@@ -134,16 +128,6 @@ 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'] = [
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Repositories;
|
||||
|
||||
use App\Contracts\Repository;
|
||||
use App\Models\Typerating;
|
||||
use Prettus\Repository\Contracts\CacheableInterface;
|
||||
use Prettus\Repository\Traits\CacheableRepository;
|
||||
|
||||
class TypeRatingRepository extends Repository implements CacheableInterface
|
||||
{
|
||||
use CacheableRepository;
|
||||
|
||||
protected $fieldSearchable = [
|
||||
'name' => 'like',
|
||||
'type' => 'like',
|
||||
];
|
||||
|
||||
public function model()
|
||||
{
|
||||
return Typerating::class;
|
||||
}
|
||||
|
||||
public function selectBoxList($add_blank = false, $only_active = true): array
|
||||
{
|
||||
$retval = [];
|
||||
$where = [
|
||||
'active' => $only_active,
|
||||
];
|
||||
|
||||
$items = $this->findWhere($where);
|
||||
|
||||
if ($add_blank) {
|
||||
$retval[''] = '';
|
||||
}
|
||||
|
||||
foreach ($items as $i) {
|
||||
$retval[$i->id] = $i->name;
|
||||
}
|
||||
|
||||
return $retval;
|
||||
}
|
||||
}
|
||||
@@ -90,11 +90,11 @@ class UserRepository extends Repository
|
||||
}
|
||||
|
||||
if ($request->filled('name')) {
|
||||
$where[] = ['name', 'LIKE', '%'.$request->name.'%'];
|
||||
$where['name'] = $request->name;
|
||||
}
|
||||
|
||||
if ($request->filled('email')) {
|
||||
$where[] = ['email', 'LIKE', '%'.$request->email.'%'];
|
||||
$where['email'] = $request->email;
|
||||
}
|
||||
|
||||
if ($request->filled('state')) {
|
||||
|
||||
@@ -33,7 +33,7 @@ class BidService extends Service
|
||||
*
|
||||
* @return \App\Models\Bid|\Illuminate\Database\Eloquent\Model|object|null
|
||||
*/
|
||||
public function getBid(User $user, $bid_id): ?Bid
|
||||
public function getBid(User $user, $bid_id): Bid
|
||||
{
|
||||
$with = [
|
||||
'flight',
|
||||
@@ -48,18 +48,7 @@ class BidService extends Service
|
||||
'flight.subfleets.fares',
|
||||
];
|
||||
|
||||
/** @var Bid $bid */
|
||||
$bid = Bid::with($with)->where(['id' => $bid_id])->first();
|
||||
if ($bid === null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
// Reconcile the aircraft for this bid
|
||||
// TODO: Only do this if there isn't a Simbrief attached?
|
||||
$bid->flight = $this->flightSvc->filterSubfleets($user, $bid->flight);
|
||||
$bid->flight = $this->fareSvc->getReconciledFaresForFlight($bid->flight);
|
||||
|
||||
return $bid;
|
||||
return Bid::with($with)->where(['id' => $bid_id])->first();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -4,7 +4,6 @@ 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;
|
||||
@@ -14,7 +13,6 @@ 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;
|
||||
@@ -83,7 +81,6 @@ 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);
|
||||
@@ -148,53 +145,6 @@ 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
|
||||
*
|
||||
|
||||
@@ -6,7 +6,6 @@ use App\Contracts\Service;
|
||||
use App\Models\Flight;
|
||||
use App\Models\Rank;
|
||||
use App\Models\Subfleet;
|
||||
use App\Models\Typerating;
|
||||
|
||||
class FleetService extends Service
|
||||
{
|
||||
@@ -34,36 +33,7 @@ class FleetService extends Service
|
||||
public function removeSubfleetFromRank(Subfleet $subfleet, Rank $rank)
|
||||
{
|
||||
$subfleet->ranks()->detach($rank->id);
|
||||
$subfleet->save();
|
||||
$subfleet->refresh();
|
||||
|
||||
return $subfleet;
|
||||
}
|
||||
|
||||
/**
|
||||
* Add the subfleet to a type rating
|
||||
*
|
||||
* @param Subfleet $subfleet
|
||||
* @param Typerating $typerating
|
||||
*/
|
||||
public function addSubfleetToTypeRating(Subfleet $subfleet, Typerating $typerating)
|
||||
{
|
||||
$subfleet->typeratings()->syncWithoutDetaching([$typerating->id]);
|
||||
$subfleet->save();
|
||||
$subfleet->refresh();
|
||||
|
||||
return $subfleet;
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the subfleet from a type rating
|
||||
*
|
||||
* @param Subfleet $subfleet
|
||||
* @param Typerating $typerating
|
||||
*/
|
||||
public function removeSubfleetFromTypeRating(Subfleet $subfleet, Typerating $typerating)
|
||||
{
|
||||
$subfleet->typeratings()->detach($typerating->id);
|
||||
$subfleet->save();
|
||||
$subfleet->refresh();
|
||||
|
||||
|
||||
@@ -25,7 +25,6 @@ class AircraftImporter extends ImportExport
|
||||
'subfleet' => 'required',
|
||||
'iata' => 'nullable',
|
||||
'icao' => 'nullable',
|
||||
'hub_id' => 'nullable',
|
||||
'airport_id' => 'nullable',
|
||||
'name' => 'required',
|
||||
'registration' => 'required',
|
||||
@@ -54,7 +53,7 @@ class AircraftImporter extends ImportExport
|
||||
}
|
||||
|
||||
/**
|
||||
* Import an aircraft, parse out the different rows
|
||||
* Import a flight, parse out the different rows
|
||||
*
|
||||
* @param array $row
|
||||
* @param int $index
|
||||
|
||||
@@ -222,10 +222,7 @@ class FlightImporter extends ImportExport
|
||||
|
||||
$subfleet = Subfleet::firstOrCreate(
|
||||
['type' => $subfleet_type],
|
||||
[
|
||||
'name' => $subfleet_type,
|
||||
'airline_id' => $flight->airline_id,
|
||||
]
|
||||
['name' => $subfleet_type]
|
||||
);
|
||||
|
||||
$subfleet->save();
|
||||
@@ -253,9 +250,8 @@ class FlightImporter extends ImportExport
|
||||
$fare_attributes = [];
|
||||
}
|
||||
|
||||
$fare = Fare::firstOrCreate(['code' => $fare_code], ['name' => $fare_code]);
|
||||
$fare = Fare::updateOrCreate(['code' => $fare_code], ['name' => $fare_code]);
|
||||
$this->fareSvc->setForFlight($flight, $fare, $fare_attributes);
|
||||
$fare->save();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ class SubfleetImporter extends ImportExport
|
||||
*/
|
||||
public static $columns = [
|
||||
'airline' => 'required',
|
||||
'hub_id' => 'nullable',
|
||||
'hub_id' => 'required',
|
||||
'type' => 'required',
|
||||
'simbrief_type' => 'nullable',
|
||||
'name' => 'required',
|
||||
@@ -84,9 +84,8 @@ class SubfleetImporter extends ImportExport
|
||||
$fare_attributes = [];
|
||||
}
|
||||
|
||||
$fare = Fare::firstOrCreate(['code' => $fare_code], ['name' => $fare_code]);
|
||||
$fare = Fare::updateOrCreate(['code' => $fare_code], ['name' => $fare_code]);
|
||||
$this->fareSvc->setForSubfleet($subfleet, $fare, $fare_attributes);
|
||||
$fare->save();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -243,7 +243,7 @@ class PirepService extends Service
|
||||
|
||||
// Copy some fields over from Flight if we have it
|
||||
if ($pirep->flight) {
|
||||
$pirep->planned_distance = $pirep->flight->planned_distance;
|
||||
$pirep->planned_distance = $pirep->flight->distance;
|
||||
$pirep->planned_flight_time = $pirep->flight->flight_time;
|
||||
}
|
||||
|
||||
@@ -336,7 +336,7 @@ class PirepService extends Service
|
||||
|
||||
// Copy some fields over from Flight if we have it
|
||||
if ($pirep->flight) {
|
||||
$pirep->distance = $pirep->flight->distance;
|
||||
$pirep->planned_distance = $pirep->flight->distance;
|
||||
$pirep->planned_flight_time = $pirep->flight->flight_time;
|
||||
}
|
||||
|
||||
@@ -460,6 +460,19 @@ 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
|
||||
@@ -476,24 +489,6 @@ 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);
|
||||
|
||||
@@ -15,7 +15,6 @@ use App\Models\Enums\UserState;
|
||||
use App\Models\Pirep;
|
||||
use App\Models\Rank;
|
||||
use App\Models\Role;
|
||||
use App\Models\Typerating;
|
||||
use App\Models\User;
|
||||
use App\Models\UserFieldValue;
|
||||
use App\Repositories\AircraftRepository;
|
||||
@@ -344,7 +343,7 @@ class UserService extends Service
|
||||
|
||||
/**
|
||||
* Return the subfleets this user is allowed access to,
|
||||
* based on their current Rank and/or by Type Rating
|
||||
* based on their current rank
|
||||
*
|
||||
* @param $user
|
||||
*
|
||||
@@ -352,31 +351,14 @@ class UserService extends Service
|
||||
*/
|
||||
public function getAllowableSubfleets($user)
|
||||
{
|
||||
$restrict_rank = setting('pireps.restrict_aircraft_to_rank', true);
|
||||
$restrict_type = setting('pireps.restrict_aircraft_to_typerating', false);
|
||||
$restricted_to = [];
|
||||
|
||||
if ($user) {
|
||||
$rank_sf_array = $restrict_rank ? $user->rank->subfleets()->pluck('id')->toArray() : [];
|
||||
$type_sf_array = $restrict_type ? $user->rated_subfleets->pluck('id')->toArray() : [];
|
||||
|
||||
if ($restrict_rank && !$restrict_type) {
|
||||
$restricted_to = $rank_sf_array;
|
||||
} elseif (!$restrict_rank && $restrict_type) {
|
||||
$restricted_to = $type_sf_array;
|
||||
} elseif ($restrict_rank && $restrict_type) {
|
||||
$restricted_to = array_intersect($rank_sf_array, $type_sf_array);
|
||||
}
|
||||
if ($user === null || setting('pireps.restrict_aircraft_to_rank') === false) {
|
||||
/** @var Collection $subfleets */
|
||||
$subfleets = $this->subfleetRepo->with('aircraft')->all();
|
||||
} else {
|
||||
$restrict_rank = false;
|
||||
$restrict_type = false;
|
||||
/** @var Collection $subfleets */
|
||||
$subfleets = $user->rank->subfleets()->with('aircraft')->get();
|
||||
}
|
||||
|
||||
// @var Collection $subfleets
|
||||
$subfleets = $this->subfleetRepo->when(($restrict_rank || $restrict_type), function ($query) use ($restricted_to) {
|
||||
return $query->whereIn('id', $restricted_to);
|
||||
})->with('aircraft')->get();
|
||||
|
||||
// Map the subfleets with the proper fare information
|
||||
return $subfleets->transform(function ($sf, $key) {
|
||||
$sf->fares = $this->fareSvc->getForSubfleet($sf);
|
||||
@@ -416,7 +398,9 @@ class UserService extends Service
|
||||
return $user;
|
||||
}
|
||||
|
||||
Log::info('User '.$user->ident.' state changing from '.UserState::label($old_state).' to '.UserState::label($user->state));
|
||||
Log::info('User '.$user->ident.' state changing from '
|
||||
.UserState::label($old_state).' to '
|
||||
.UserState::label($user->state));
|
||||
|
||||
event(new UserStateChanged($user, $old_state));
|
||||
|
||||
@@ -577,39 +561,11 @@ class UserService extends Service
|
||||
// Recalc the rank
|
||||
$this->calculatePilotRank($user);
|
||||
|
||||
Log::info('User '.$user->ident.' updated; pirep count='.$pirep_count.', rank='.$user->rank->name.', flight_time='.$user->flight_time.' minutes');
|
||||
Log::info('User '.$user->ident.' updated; pirep count='.$pirep_count
|
||||
.', rank='.$user->rank->name
|
||||
.', flight_time='.$user->flight_time.' minutes');
|
||||
|
||||
$user->save();
|
||||
return $user;
|
||||
}
|
||||
|
||||
/**
|
||||
* Attach a type rating to the user
|
||||
*
|
||||
* @param User $user
|
||||
* @param Typerating $typerating
|
||||
*/
|
||||
public function addUserToTypeRating(User $user, Typerating $typerating)
|
||||
{
|
||||
$user->typeratings()->syncWithoutDetaching([$typerating->id]);
|
||||
$user->save();
|
||||
$user->refresh();
|
||||
|
||||
return $user;
|
||||
}
|
||||
|
||||
/**
|
||||
* Detach a type rating from the user
|
||||
*
|
||||
* @param User $user
|
||||
* @param Typerating $typerating
|
||||
*/
|
||||
public function removeUserFromTypeRating(User $user, Typerating $typerating)
|
||||
{
|
||||
$user->typeratings()->detach($typerating->id);
|
||||
$user->save();
|
||||
$user->refresh();
|
||||
|
||||
return $user;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -134,11 +134,6 @@ class Database
|
||||
->where($id_col, $row[$id_col])
|
||||
->update($row);
|
||||
} else {
|
||||
// Remove ID column if it exists and its empty, let the DB set it
|
||||
/*if (array_key_exists($id_col, $row) && empty($row[$id_col])) {
|
||||
unset($row[$id_col]);
|
||||
}*/
|
||||
|
||||
DB::table($table)->insert($row);
|
||||
}
|
||||
} catch (QueryException $e) {
|
||||
|
||||
@@ -23,7 +23,7 @@ class LatestNews extends Widget
|
||||
|
||||
return view('widgets.latest_news', [
|
||||
'config' => $this->config,
|
||||
'news' => $newsRepo->with('user')->recent($this->config['count']),
|
||||
'news' => $newsRepo->recent($this->config['count']),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@ class LatestPilots extends Widget
|
||||
public function run()
|
||||
{
|
||||
$userRepo = app(UserRepository::class);
|
||||
$userRepo = $userRepo->with('home_airport')->where('state', '!=', UserState::DELETED)->orderby('created_at', 'desc')->take($this->config['count'])->get();
|
||||
$userRepo = $userRepo->where('state', '!=', UserState::DELETED)->orderby('created_at', 'desc')->take($this->config['count'])->get();
|
||||
|
||||
return view('widgets.latest_pilots', [
|
||||
'config' => $this->config,
|
||||
|
||||
@@ -39,7 +39,7 @@ class application extends Illuminate\Foundation\Application
|
||||
$bootstrappers = array_replace(
|
||||
$bootstrappers,
|
||||
array_fill_keys(
|
||||
array_keys($bootstrappers, $find, true),
|
||||
array_keys($bootstrappers, $find),
|
||||
$replace
|
||||
)
|
||||
);
|
||||
|
||||
+11
-27
@@ -15,23 +15,12 @@
|
||||
"ext-bcmath": "*",
|
||||
"ext-pdo": "*",
|
||||
"ext-intl": "*",
|
||||
"cache/adapter-common": "1.2.0",
|
||||
"cache/array-adapter": "1.1.0",
|
||||
"cache/hierarchical-cache": "1.1.0",
|
||||
"symfony/flex": "^1.0",
|
||||
"symfony/polyfill-intl-icu": "*",
|
||||
"symfony/polyfill-intl-idn": "*",
|
||||
"symfony/polyfill-mbstring": "*",
|
||||
"symfony/polyfill-php74": "*",
|
||||
"symfony/polyfill-php80": "*",
|
||||
"symfony/polyfill-php81": "*",
|
||||
"symfony/deprecation-contracts": "^v2.5.0",
|
||||
"symfony/event-dispatcher-contracts": "^2",
|
||||
"symfony/property-info": "^5.4",
|
||||
"symfony/string": "^5.4",
|
||||
"symfony/translation": "^5.4",
|
||||
"psr/container": "1.1.1",
|
||||
"composer/composer": "~2.0",
|
||||
"composer/composer": "~1.0",
|
||||
"composer/installers": "~1.0",
|
||||
"laravel/framework": "~8.0",
|
||||
"anhskohbo/no-captcha": "^3.0",
|
||||
@@ -52,21 +41,21 @@
|
||||
"laravel/helpers": "^1.4",
|
||||
"laravelcollective/html": "~6.2.0",
|
||||
"jeremykendall/php-domain-parser": "~5.7.2",
|
||||
"league/commonmark": "~1.6.0",
|
||||
"league/csv": "9.7.*",
|
||||
"league/commonmark": "~1.6",
|
||||
"league/csv": "9.2.*",
|
||||
"league/geotools": "0.8.*",
|
||||
"league/iso3166": "^3.0.0",
|
||||
"markrogoyski/math-php": "^1.11.0",
|
||||
"markrogoyski/math-php": "^1.10",
|
||||
"myclabs/deep-copy": "~1.10.0",
|
||||
"nabeel/vacentral": "~2.0",
|
||||
"nwidart/laravel-modules": "^8.2.0",
|
||||
"nwidart/laravel-modules": "^8.2",
|
||||
"php-units-of-measure/php-units-of-measure": "~2.1.0",
|
||||
"phpvms/sample-module": "^1.0",
|
||||
"pragmarx/version": ">=v1.2.3",
|
||||
"prettus/l5-repository": "~2.7.0",
|
||||
"santigarcor/laratrust": "~6.3.0",
|
||||
"santigarcor/laratrust": "~6.3",
|
||||
"semver/semver": "~1.1.0",
|
||||
"spatie/valuestore": "~1.2.0",
|
||||
"spatie/valuestore": "~1.2",
|
||||
"symfony/polyfill-iconv": "~1.22.0",
|
||||
"tivie/php-os-detector": "~1.1.0",
|
||||
"vlucas/phpdotenv": "^5.3.0",
|
||||
@@ -80,16 +69,14 @@
|
||||
"wildbit/swiftmailer-postmark": "^3.3",
|
||||
"queueworker/sansdaemon": "^1.2",
|
||||
"jpkleemans/attribute-events": "^1.1",
|
||||
"akaunting/laravel-money": "^1.2",
|
||||
"staudenmeir/belongs-to-through": "^2.5",
|
||||
"staudenmeir/eloquent-has-many-deep": "1.14.3"
|
||||
"akaunting/laravel-money": "^1.2"
|
||||
},
|
||||
"require-dev": {
|
||||
"barryvdh/laravel-debugbar": "^3.5",
|
||||
"barryvdh/laravel-ide-helper": "^2.10",
|
||||
"barryvdh/laravel-ide-helper": "^2.9",
|
||||
"bpocallaghan/generators": "~7.0",
|
||||
"filp/whoops": "~2.0",
|
||||
"friendsofphp/php-cs-fixer": "^3.3",
|
||||
"friendsofphp/php-cs-fixer": "^2.16",
|
||||
"mockery/mockery": "^1.4.0",
|
||||
"nunomaduro/collision": "^5.3.0",
|
||||
"phpunit/phpunit": "~9.0",
|
||||
@@ -117,10 +104,7 @@
|
||||
"installer-paths": {
|
||||
"modules/{$name}/": ["type:phpvms-module"]
|
||||
},
|
||||
"module-dir": "modules",
|
||||
"symfony": {
|
||||
"require": "^5.4"
|
||||
}
|
||||
"module-dir": "modules"
|
||||
},
|
||||
"scripts": {
|
||||
"pre-package-uninstall": [
|
||||
|
||||
Generated
+1125
-1371
File diff suppressed because it is too large
Load Diff
@@ -3,8 +3,8 @@
|
||||
use App\Notifications\Messages\AdminUserRegistered;
|
||||
use App\Notifications\Messages\NewsAdded;
|
||||
use App\Notifications\Messages\PirepAccepted;
|
||||
use App\Notifications\Messages\PirepFiled;
|
||||
use App\Notifications\Messages\PirepRejected;
|
||||
use App\Notifications\Messages\PirepSubmitted;
|
||||
use App\Notifications\Messages\UserPending;
|
||||
use App\Notifications\Messages\UserRegistered;
|
||||
use App\Notifications\Messages\UserRejected;
|
||||
@@ -18,7 +18,7 @@ return [
|
||||
NewsAdded::class => ['mail'],
|
||||
PirepAccepted::class => ['mail'],
|
||||
PirepRejected::class => ['mail'],
|
||||
PirepFiled::class => ['mail'],
|
||||
PirepSubmitted::class => ['mail'],
|
||||
UserPending::class => ['mail'],
|
||||
UserRegistered::class => ['mail'],
|
||||
UserRejected::class => ['mail'],
|
||||
|
||||
@@ -24,8 +24,9 @@ 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
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
version: '3'
|
||||
services:
|
||||
app:
|
||||
image: nabeelio/phpvms
|
||||
image: phpvms:latest
|
||||
environment:
|
||||
DB_HOST: mysql
|
||||
REDIS_HOST: redis
|
||||
|
||||
Generated
+5939
-1830
File diff suppressed because it is too large
Load Diff
+2
-2
@@ -27,7 +27,7 @@
|
||||
"jquery": "^3.5.1",
|
||||
"jquery-pjax": "~2.0",
|
||||
"js-yaml": "^3.14.0",
|
||||
"laravel-mix": "^6.0.30",
|
||||
"laravel-mix": "^6.0.25",
|
||||
"leaflet": "^1.3.4",
|
||||
"leaflet-ajax": "2.1.0",
|
||||
"leaflet-providers": "1.0.*",
|
||||
@@ -47,7 +47,7 @@
|
||||
"ssri": "^8.0.1",
|
||||
"tar": ">=4.4.2",
|
||||
"webpack": "^5.45.1",
|
||||
"webpack-cli": "^3.3.12",
|
||||
"webpack-cli": "^4.0.0",
|
||||
"x-editable": "1.5.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
||||
@@ -2,11 +2,10 @@
|
||||
|
||||
return [
|
||||
'status' => [
|
||||
'active' => 'Aktiv',
|
||||
'maintenance' => 'Instandhaltung',
|
||||
'stored' => 'Gelagert',
|
||||
'retired' => 'Außer Dienst',
|
||||
'scrapped' => 'Verschrottet',
|
||||
'written' => 'Abgeschrieben',
|
||||
'active' => 'Aktiv',
|
||||
'stored' => 'Gelagert',
|
||||
'retired' => 'Außer Dienst',
|
||||
'scrapped' => 'Verschrottet',
|
||||
'written' => 'Abgeschrieben',
|
||||
],
|
||||
];
|
||||
|
||||
@@ -19,7 +19,6 @@ return [
|
||||
'nometar' => 'METAR/TAF Daten konnten nicht abgerufen werden',
|
||||
'conditions' => 'Bedingungen',
|
||||
'visibility' => 'Sichtbarkeit',
|
||||
'temp' => 'Temperatur',
|
||||
'humidity' => 'Feuchtigkeit',
|
||||
'dewpoint' => 'Taupunkt',
|
||||
'barometer' => 'Barometer',
|
||||
|
||||
@@ -2,11 +2,10 @@
|
||||
|
||||
return [
|
||||
'status' => [
|
||||
'active' => 'Active',
|
||||
'maintenance' => 'Maintenance',
|
||||
'stored' => 'Stored',
|
||||
'retired' => 'Retired',
|
||||
'scrapped' => 'Scrapped',
|
||||
'written' => 'Written Off',
|
||||
'active' => 'Active',
|
||||
'stored' => 'Stored',
|
||||
'retired' => 'Retired',
|
||||
'scrapped' => 'Scrapped',
|
||||
'written' => 'Written Off',
|
||||
],
|
||||
];
|
||||
|
||||
@@ -19,7 +19,6 @@ return [
|
||||
'nometar' => 'METAR/TAF data could not be retrieved',
|
||||
'conditions' => 'Conditions',
|
||||
'visibility' => 'visibility',
|
||||
'temp' => 'Temperature',
|
||||
'humidity' => 'humidity',
|
||||
'dewpoint' => 'dew point',
|
||||
'barometer' => 'Barometer',
|
||||
|
||||
@@ -2,11 +2,10 @@
|
||||
|
||||
return [
|
||||
'status' => [
|
||||
'active' => 'Activo',
|
||||
'maintenance' => 'Mantenimiento',
|
||||
'stored' => 'Guardado',
|
||||
'retired' => 'Retirado',
|
||||
'scrapped' => 'Desguazado',
|
||||
'written' => 'Dado de baja',
|
||||
'active' => 'Activo',
|
||||
'stored' => 'Guardado',
|
||||
'retired' => 'Retirado',
|
||||
'scrapped' => 'Desguazado',
|
||||
'written' => 'Dado de baja',
|
||||
],
|
||||
];
|
||||
|
||||
@@ -19,14 +19,14 @@ return [
|
||||
'download' => 'Descarga|Descargas',
|
||||
'from' => 'de',
|
||||
'to' => 'a',
|
||||
'state' => 'Situación',
|
||||
'status' => 'Estado',
|
||||
'state' => 'Estado',
|
||||
'status' => 'Estatus',
|
||||
'departure' => 'Salida',
|
||||
'arrival' => 'Llegada',
|
||||
'aircraft' => 'Aeronave',
|
||||
'airline' => 'Aerolínea',
|
||||
'subfleet' => 'Subfleet',
|
||||
'distance' => 'Distancia',
|
||||
'distance' => 'Distancía',
|
||||
'fuel' => 'Combustible',
|
||||
'metar' => 'METAR',
|
||||
'hour' => 'Hora|Horas',
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
return [
|
||||
'type' => [
|
||||
'flight' => 'Por vuelo',
|
||||
'flight' => 'Vuelo',
|
||||
'daily' => 'Diario',
|
||||
'monthly' => 'Mensual',
|
||||
],
|
||||
|
||||
@@ -6,7 +6,7 @@ return [
|
||||
'pending' => 'Pendiente',
|
||||
'active' => 'Activo',
|
||||
'rejected' => 'Rechazado',
|
||||
'on_leave' => 'En excedencia',
|
||||
'on_leave' => 'De vacaciones',
|
||||
'suspended' => 'Suspendido',
|
||||
'deleted' => 'Borrar',
|
||||
],
|
||||
|
||||
@@ -11,17 +11,16 @@ return [
|
||||
'altitude' => 'Altitud',
|
||||
'heading' => 'Rumbo',
|
||||
'distance' => 'Distancía',
|
||||
'noflights' => 'No hay vuelos',
|
||||
'noflights' => 'No hay vuelos.',
|
||||
'gs' => 'GS',
|
||||
],
|
||||
|
||||
'weather' => [
|
||||
'nometar' => 'No se han encontrado datos METAR/TAF',
|
||||
'conditions' => 'Condiciones',
|
||||
'visibility' => 'Visibilidad',
|
||||
'temp' => 'Temperatura',
|
||||
'humidity' => 'Humedad',
|
||||
'dewpoint' => 'Punto de rocío',
|
||||
'visibility' => 'visibilidad',
|
||||
'humidity' => 'humedad',
|
||||
'dewpoint' => 'punto de rocío',
|
||||
'barometer' => 'Barometro',
|
||||
'clouds' => 'Nubes',
|
||||
'wind' => 'Viento',
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
<?php
|
||||
|
||||
return [
|
||||
'status' => [
|
||||
'active' => 'Actif',
|
||||
'maintenance' => 'Maintenance',
|
||||
'stored' => 'Stocké',
|
||||
'retired' => 'Retiré',
|
||||
'scrapped' => 'Démantelé',
|
||||
'written' => 'Désaffecté',
|
||||
],
|
||||
];
|
||||
@@ -1,9 +0,0 @@
|
||||
<?php
|
||||
|
||||
return [
|
||||
'ident' => 'Identification',
|
||||
'home' => 'Aéroport d\'Attache',
|
||||
'current' => 'Aéroport Actuel',
|
||||
'departure' => 'Aéroport de Départ',
|
||||
'arrival' => 'Aéroport d\'Arrivée',
|
||||
];
|
||||
@@ -1,24 +0,0 @@
|
||||
<?php
|
||||
|
||||
return [
|
||||
'failed' => 'Ces informations d\'identification ne correspondent pas.',
|
||||
'throttle' => 'Trop de tentatives de connexion. Veuillez réessayer dans :seconds secondes.',
|
||||
'password' => 'Mot de Passe',
|
||||
'createaccount' => 'Créer un Compte',
|
||||
'forgotpassword' => 'Mot de Passe Oublié',
|
||||
'fullname' => 'Nom Complet',
|
||||
'emailaddress' => 'Adresse Email',
|
||||
'fillcaptcha' => 'Remplissez le captcha',
|
||||
'tocaccept' => 'En vous inscrivant, vous accezptez les Conditions Générales d\'Utilisations.',
|
||||
'register' => 'S\'inscrire',
|
||||
'registrationpending' => 'Inscription en attente',
|
||||
'pendingmessage' => 'Votre inscription est en attente d\'approbation. Veuillez vérifier vos emails!',
|
||||
'registrationsubmitted' => 'Inscription Soumise',
|
||||
'registrationconfirmation' => 'Confirmation d\'inscription',
|
||||
'confirmationmessage' => 'Votre demande a été soumise. Elle nécessite l\'approbation d\'un administrateur. Une fois qu\'un administrateur aura examiné votre demande, vous recevrez un email de confirmation.',
|
||||
'registrationdenied' => 'Inscription Refusée',
|
||||
'deniedmessage' => 'Votre inscription a été refusée. Veuillez contacter un administrateur.',
|
||||
'accountsuspended' => 'Compte suspendu',
|
||||
'suspendedmessage' => 'Votre compte a été suspendu. Veuillez contacter un administrateur.',
|
||||
'transferhours' => 'Heures transférées',
|
||||
];
|
||||
@@ -1,62 +0,0 @@
|
||||
<?php
|
||||
|
||||
return [
|
||||
'dashboard' => 'Tableau de bord',
|
||||
'administration' => 'Administration',
|
||||
'flight' => 'Vol|Vols',
|
||||
'livemap' => 'Carte des vols',
|
||||
'pilot' => 'Pilote|Pilotes',
|
||||
'pirep' => 'PIREP|PIREPs',
|
||||
'newestpilots' => 'Nouveaux Pilotes',
|
||||
'profile' => 'Profil',
|
||||
'email' => 'Email',
|
||||
'pilot_id' => 'Pilote ID',
|
||||
'register' => 'S\'inscrire',
|
||||
'login' => 'Se connecter',
|
||||
'logout' => 'Se déconnecter',
|
||||
'timezone' => 'Fuseau horraire',
|
||||
'country' => 'Pays',
|
||||
'download' => 'Téléchargement|Téléchargements',
|
||||
'from' => 'Depuis',
|
||||
'to' => 'Vers',
|
||||
'state' => 'Etat',
|
||||
'status' => 'Statut',
|
||||
'departure' => 'Départ',
|
||||
'arrival' => 'Arrivée',
|
||||
'aircraft' => 'Avion',
|
||||
'airline' => 'Compagnie',
|
||||
'subfleet' => 'Sous-Flotte',
|
||||
'distance' => 'Distance',
|
||||
'fuel' => 'Carburant',
|
||||
'metar' => 'METAR',
|
||||
'hour' => 'Heure|Heures',
|
||||
'minute' => 'Minute|Minutes',
|
||||
'note' => 'Note|Notes',
|
||||
'field' => 'Champ|Champs',
|
||||
'name' => 'Nom',
|
||||
'value' => 'Valeur|Valeurs',
|
||||
'remark' => 'Remarque|Remarques',
|
||||
'find' => 'Rechercher',
|
||||
'reset' => 'Réinitialiser',
|
||||
'submit' => 'Envoyer',
|
||||
'edit' => 'Editer',
|
||||
'close' => 'Fermer',
|
||||
'whoops' => 'Whoops',
|
||||
'hello' => 'Bonjour',
|
||||
'regards' => 'Cordialement',
|
||||
'rightsreserved' => 'Tous droits réservés',
|
||||
'active' => 'Actif',
|
||||
'inactive' => 'Inactif',
|
||||
'yes' => 'Oui',
|
||||
'no' => 'Non',
|
||||
'or' => 'ou',
|
||||
'days' => [
|
||||
'mon' => 'Lundi',
|
||||
'tues' => 'Mardi',
|
||||
'wed' => 'Mercredi',
|
||||
'thurs' => 'Jeudi',
|
||||
'fri' => 'Vendredi',
|
||||
'sat' => 'Samedi',
|
||||
'sun' => 'Dimanche',
|
||||
],
|
||||
];
|
||||
@@ -1,11 +0,0 @@
|
||||
<?php
|
||||
|
||||
return [
|
||||
'totalhours' => 'Heures Totales',
|
||||
'yourbalance' => 'Votre Solde',
|
||||
'yourlastreport' => 'Votre dernier Rapport',
|
||||
'noreportsyet' => 'Aucun Rapport',
|
||||
'fileonenow' => 'Créez en un maintenant',
|
||||
'weatherat' => 'Météo à :ICAO',
|
||||
'recentreports' => 'Rapports Récents',
|
||||
];
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user