FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add fare type for pax/cargo/mixed flights #621 (#623)

Browse Source
This commit is contained in:
Nabeel S
2020-03-06 15:10:03 -05:00
committed by GitHub
parent 9f3ddd5dbd
commit 632c5782de
12 changed files with 150 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
resources/views/admin/fares/fields.blade.php
View File

@@ -9,7 +9,7 @@
</div>
</div>
<div class="row">
<div class="form-group col-sm-6">
<div class="form-group col-sm-4">
{{ Form::label('code', 'Code:') }}&nbsp;<span class="required">*</span>
@component('admin.components.info')
How this fare class will show up on a ticket
@@ -18,7 +18,7 @@
<p class="text-danger">{{ $errors->first('code') }}</p>
</div>
<div class="form-group col-sm-6">
<div class="form-group col-sm-4">
{{ Form::label('name', 'Name:') }}&nbsp;<span class="required">*</span>
@component('admin.components.info')
The fare class name, E.g, "Economy" or "First"
@@ -27,10 +27,25 @@
<p class="text-danger">{{ $errors->first('name') }}</p>
</div>
<div class="form-group col-sm-4">
{{ Form::label('type', 'Fare Type:') }}&nbsp;<span class="required">*</span>
@component('admin.components.info')
If this is a passenger or cargo fare
@endcomponent
{{ Form::select('type', $fare_types, null , [
'id' => 'type',
'class' => 'form-control select2'
]) }}
<p class="text-danger">{{ $errors->first('type') }}</p>
</div>
</div>
<div class="row">
<div class="form-group col-sm-6">
{{ Form::label('price', 'Price:') }}
@component('admin.components.info')
This is the price of a ticket for a passenger
This is the price of a ticket or price per {{ setting('units.weight') }}
@endcomponent
{{ Form::text('price', null, ['class' => 'form-control', 'placeholder' => 0]) }}
<p class="text-danger">{{ $errors->first('price') }}</p>
@@ -39,16 +54,17 @@
<div class="form-group col-sm-6">
{{ Form::label('cost', 'Cost:') }}
@component('admin.components.info')
The operating cost
The operating cost per unit (passenger or {{ setting('units.weight') }})
@endcomponent
{{ Form::number('cost', null, ['class' => 'form-control', 'placeholder' => 0, 'step' => '0.01']) }}
<p class="text-danger">{{ $errors->first('cost') }}</p>
</div>
</div>
<div class="row">
<div class="form-group col-sm-6">
{{ Form::label('capacity', 'Capacity:') }}
@component('admin.components.info')
The number of seats available in this class.
Max seats or capacity available. This can be adjusted in the subfleet
@endcomponent
{{ Form::number('capacity', null, ['class' => 'form-control', 'min' => 0]) }}
<p class="text-danger">{{ $errors->first('capacity') }}</p>
@@ -56,10 +72,15 @@
<div class="form-group col-sm-6">
{{ Form::label('notes', 'Notes:') }}
@component('admin.components.info')
Notes for this fare
@endcomponent
{{ Form::text('notes', null, ['class' => 'form-control']) }}
<p class="text-danger">{{ $errors->first('notes') }}</p>
</div>
</div>
<div class="row">
<!-- Active Field -->
<div class="form-group col-sm-12">
{{ Form::label('active', 'Active:') }}
@@ -68,7 +89,8 @@
{{ Form::checkbox('active', 1, null) }}
</label>
</div>
</div>
<div class="row">
<!-- Submit Field -->
<div class="form-group col-sm-12">
<div class="pull-right">

12
resources/views/admin/subfleets/fares.blade.php
View File

@@ -14,6 +14,7 @@
<tr>
<th>Name</th>
<th style="text-align: center;">Code</th>
<th style="text-align: center;">Type</th>
<th style="text-align: center;">Capacity (default)</th>
<th style="text-align: center;">Price (default)</th>
<th style="text-align: center;">Cost (default)</th>
@@ -24,16 +25,17 @@
<tbody>
@foreach($subfleet->fares as $atf)
<tr>
<td class="sorting_1">{{ $atf->name }}</td>
<td style="text-align: center;">{{ $atf->code }}</td>
<td style="text-align: center;">
<td class="sorting_1 text-center">{{ $atf->name }}</td>
<td class="text-center">{{ $atf->code }}</td>
<td class="sorting_1 text-center">{{ \App\Models\Enums\FareType::label($atf->type) }}</td>
<td class="text-center">
<a href="#" data-pk="{{ $atf->id }}" data-name="capacity">{{ $atf->pivot->capacity }}</a>
<span class="small background-color-grey-light">({{ $atf->capacity }})</span>
</td>
<td style="text-align: center;">
<td class="text-center">
<a href="#" data-pk="{{ $atf->id }}" data-name="price">{{ $atf->pivot->price }}</a>
<span class="small background-color-grey-light">({{ $atf->price }})</span></td>
<td style="text-align: center;">
<td class="text-center">
<a href="#" data-pk="{{ $atf->id }}" data-name="cost">{{ $atf->pivot->cost }}</a>
<span class="small background-color-grey-light">({{ $atf->cost}})</span></td>
<td style="text-align: right; width:3%;">

56
resources/views/admin/subfleets/fields.blade.php
View File

@@ -1,32 +1,36 @@
<div class="row">
<div class="col-sm-12">
@component('admin.components.info')
Subfleets are aircraft groups. The "type" is a short name. Airlines always
group aircraft together by feature, so 737s with winglets might have a type of
"B.738-WL". You can create as many as you want, you need at least one, though.
<div class="col-12">
<div class="row">
<div class="col-sm-12">
@component('admin.components.info')
Subfleets are aircraft groups. The "type" is a short name. Airlines always
group aircraft together by feature, so 737s with winglets might have a type of
"B.738-WL". You can create as many as you want, you need at least one, though.
Read more about subfleets <a href="{{ docs_link('finances') }}" target="_new">here</a>.
@endcomponent
Read more about subfleets <a href="{{ docs_link('finances') }}" target="_new">here</a>.
@endcomponent
</div>
</div>
<div class="row">
<div class="form-group col-sm-4">
{{ Form::label('airline_id', 'Airline:') }}
{{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }}
<p class="text-danger">{{ $errors->first('airline_id') }}</p>
</div>
<div class="form-group col-sm-4">
{{ Form::label('type', 'Type:') }}
{{ Form::text('type', null, ['class' => 'form-control']) }}
<p class="text-danger">{{ $errors->first('type') }}</p>
</div>
<div class="form-group col-sm-4">
{{ Form::label('name', 'Name:') }}
{{ Form::text('name', null, ['class' => 'form-control']) }}
<p class="text-danger">{{ $errors->first('name') }}</p>
</div>
</div>
</div>
<div class="form-group col-sm-4">
{{ Form::label('airline_id', 'Airline:') }}
{{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }}
<p class="text-danger">{{ $errors->first('airline_id') }}</p>
</div>
<div class="form-group col-sm-4">
{{ Form::label('type', 'Type:') }}
{{ Form::text('type', null, ['class' => 'form-control']) }}
<p class="text-danger">{{ $errors->first('type') }}</p>
</div>
<div class="form-group col-sm-4">
{{ Form::label('name', 'Name:') }}
{{ Form::text('name', null, ['class' => 'form-control']) }}
<p class="text-danger">{{ $errors->first('name') }}</p>
</div>
</div>
<div class="row">

2
resources/views/layouts/default/pireps/fares.blade.php
View File

@@ -7,7 +7,7 @@
@foreach($aircraft->subfleet->fares as $fare)
<div class="row">
<div class="col">
{{Form::label('fare_'.$fare->id, $fare->name.' ('.$fare->code.')')}}
{{Form::label('fare_'.$fare->id, $fare->name.' ('. \App\Models\Enums\FareType::label($fare->type).', code '.$fare->code.')')}}
<div class="input-group form-group">
{{ Form::number('fare_'.$fare->id, null, ['class' => 'form-control', 'min' => 0]) }}
</div>