diff --git a/app/Services/Installer/SeederService.php b/app/Services/Installer/SeederService.php index 82d5ebb3..05b76433 100644 --- a/app/Services/Installer/SeederService.php +++ b/app/Services/Installer/SeederService.php @@ -18,11 +18,8 @@ class SeederService extends Service private $counters = []; private $offsets = []; - private static $seed_mapper = [ - 'local' => 'dev', - 'qa' => 'dev', - 'staging' => 'dev', - ]; + // Map an environment to a seeder directory, if we want to share + public static $seed_mapper = []; public function __construct(DatabaseService $databaseSvc) { diff --git a/app/Support/Http.php b/app/Support/Http.php index b5de03d0..571097d6 100644 --- a/app/Support/Http.php +++ b/app/Support/Http.php @@ -27,7 +27,7 @@ class Http ], $opts); $client = new Client(); - $response = $client->request('GET', $uri, $opts); + $responseSeederService = $client->request('GET', $uri, $opts); $body = $response->getBody()->getContents(); if ($response->getHeader('content-type') === 'application/json') { diff --git a/package.json b/package.json index 31daf40a..586858f7 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "icheck": "~1.0", "jquery": "~3.4", "jquery-pjax": "~2.0", - "js-yaml": "^3.13.1", + "js-yaml": "^3.4", "laravel-mix": "^2.1.14", "leaflet": "^1.3.4", "leaflet-ajax": "2.1.0", diff --git a/resources/views/admin/aircraft/expenses.blade.php b/resources/views/admin/aircraft/expenses.blade.php index 10c3688d..871e278e 100644 --- a/resources/views/admin/aircraft/expenses.blade.php +++ b/resources/views/admin/aircraft/expenses.blade.php @@ -64,7 +64,7 @@ {{ Form::open(['url' => url('/admin/aircraft/'.$aircraft->id.'/expenses'), 'method' => 'post', 'class' => 'modify_expense form-inline']) }} {{ Form::input('text', 'name', null, ['class' => 'form-control input-sm', 'placeholder' => 'Name']) }} - {{ Form::number('amount', null, ['class' => 'form-control input-sm', 'placeholder' => 'Amount']) }} + {{ Form::number('amount', null, ['class' => 'form-control input-sm', 'placeholder' => 'Amount', 'step' => '0.01']) }} {{ Form::select('type', \App\Models\Enums\ExpenseType::select(), null, ['class' => 'select2']) }} {{ Form::button(' Add', ['type' => 'submit', 'class' => 'btn btn-success btn-small']) }} diff --git a/resources/views/admin/airports/expenses.blade.php b/resources/views/admin/airports/expenses.blade.php index a097c3ce..0e8be5d2 100644 --- a/resources/views/admin/airports/expenses.blade.php +++ b/resources/views/admin/airports/expenses.blade.php @@ -61,7 +61,7 @@ {{ Form::open(['url' => url('/admin/airports/'.$airport->id.'/expenses'), 'method' => 'post', 'class' => 'modify_expense form-inline']) }} {{ Form::input('text', 'name', null, ['class' => 'form-control input-sm', 'placeholder' => 'Name']) }} - {{ Form::number('amount', null, ['class' => 'form-control input-sm', 'placeholder' => 'Amount']) }} + {{ Form::number('amount', null, ['class' => 'form-control input-sm', 'placeholder' => 'Amount', 'step' => '0.01']) }} {{ Form::select('type', \App\Models\Enums\ExpenseType::select(), null, ['class' => 'select2']) }} {{ Form::button(' Add', ['type' => 'submit', 'class' => 'btn btn-success btn-small']) }} diff --git a/resources/views/admin/airports/fields.blade.php b/resources/views/admin/airports/fields.blade.php index 64418f98..8134201b 100644 --- a/resources/views/admin/airports/fields.blade.php +++ b/resources/views/admin/airports/fields.blade.php @@ -62,7 +62,7 @@
{{ $errors->first('ground_handling_cost') }}
@component('admin.components.info') @@ -73,7 +73,7 @@{{ $errors->first('fuel_jeta_cost') }}
@component('admin.components.info') diff --git a/resources/views/admin/airports/table.blade.php b/resources/views/admin/airports/table.blade.php index 6e9c6fde..41e19fec 100644 --- a/resources/views/admin/airports/table.blade.php +++ b/resources/views/admin/airports/table.blade.php @@ -6,9 +6,7 @@{{ $errors->first('amount') }}
{{ $errors->first('cost') }}
@@ -50,7 +50,7 @@ @component('admin.components.info') The number of seats available in this class. @endcomponent - {{ Form::text('capacity', null, ['class' => 'form-control', 'placeholder' => 0]) }} + {{ Form::number('capacity', null, ['class' => 'form-control', 'min' => 0]) }}{{ $errors->first('capacity') }}
diff --git a/resources/views/admin/flights/fields.blade.php b/resources/views/admin/flights/fields.blade.php index 322e6420..aaf2f83b 100644 --- a/resources/views/admin/flights/fields.blade.php +++ b/resources/views/admin/flights/fields.blade.php @@ -46,12 +46,14 @@ 'class' => 'form-control', 'placeholder' => 'hours', 'style' => 'width: 50%', + 'min' => '0', ]) }} {{ Form::number('minutes', null, [ 'class' => 'form-control', 'placeholder' => 'minutes', 'style' => 'width: 50%', + 'min' => '0', ]) }} diff --git a/resources/views/admin/pireps/fares.blade.php b/resources/views/admin/pireps/fares.blade.php index 3bf523de..96ecd776 100644 --- a/resources/views/admin/pireps/fares.blade.php +++ b/resources/views/admin/pireps/fares.blade.php @@ -18,6 +18,7 @@ {{ Form::number('fare_'.$fare->id, null, [ 'class' => 'form-control', 'min' => 0, + 'step' => '0.01', 'readonly' => $pirep->read_only]) }} @endif diff --git a/resources/views/admin/ranks/fields.blade.php b/resources/views/admin/ranks/fields.blade.php index f18ef6d4..9f9c6fc2 100644 --- a/resources/views/admin/ranks/fields.blade.php +++ b/resources/views/admin/ranks/fields.blade.php @@ -22,7 +22,7 @@{{ $errors->first('acars_base_pay_rate') }}
@component('admin.components.info') Base rate, per-flight hour, for ACARS PIREPs. @@ -32,7 +32,7 @@{{ $errors->first('manual_base_pay_rate') }}
@component('admin.components.info') Base rate, per-flight hour, for manually-filed PIREPs. diff --git a/resources/views/admin/settings/table.blade.php b/resources/views/admin/settings/table.blade.php index 0a59cd02..d079d541 100644 --- a/resources/views/admin/settings/table.blade.php +++ b/resources/views/admin/settings/table.blade.php @@ -24,8 +24,10 @@ @elseif($setting->type === 'boolean' || $setting->type === 'bool') {{ Form::hidden($setting->id, 0) }} {{ Form::checkbox($setting->id, null, $setting->value) }} - @elseif($setting->type === 'int' || $setting->type === 'number') + @elseif($setting->type === 'int') {{ Form::number($setting->id, $setting->value, ['class'=>'form-control']) }} + @elseif($setting->type === 'number') + {{ Form::number($setting->id, $setting->value, ['class'=>'form-control', 'step' => '0.01']) }} @elseif($setting->type === 'select') {{ Form::select( $setting->id, diff --git a/resources/views/admin/subfleets/expenses.blade.php b/resources/views/admin/subfleets/expenses.blade.php index 19ff46ee..d8c22e43 100644 --- a/resources/views/admin/subfleets/expenses.blade.php +++ b/resources/views/admin/subfleets/expenses.blade.php @@ -59,7 +59,7 @@ {{ Form::open(['url' => url('/admin/subfleets/'.$subfleet->id.'/expenses'), 'method' => 'post', 'class' => 'modify_expense form-inline']) }} {{ Form::text('name', null, ['class' => 'form-control input-sm', 'placeholder' => 'Name']) }} - {{ Form::number('amount', null, ['class' => 'form-control input-sm', 'placeholder' => 'Amount']) }} + {{ Form::number('amount', null, ['class' => 'form-control input-sm', 'placeholder' => 'Amount', 'step' => '0.01']) }} {{ Form::select('type', \App\Models\Enums\ExpenseType::select(), null, ['class' => 'select2']) }} {{ Form::button(' Add', ['type' => 'submit', 'class' => 'btn btn-success btn-small']) }} diff --git a/resources/views/admin/subfleets/fields.blade.php b/resources/views/admin/subfleets/fields.blade.php index 24b46773..ce1ebd33 100644 --- a/resources/views/admin/subfleets/fields.blade.php +++ b/resources/views/admin/subfleets/fields.blade.php @@ -35,13 +35,13 @@{{ $errors->first('cost_block_hour') }}
{{ $errors->first('cost_delay_minute') }}