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

7.0.0-beta3 Release (#541)

Browse Source 
* 391 Notification refactorings (#441)

* Refactor notifications to allow easier plugins

* Notification refactoring

* Formatting

* Move news to NewsService; cleanup of events

* More refactoring; added send email out for news item and the template

* Formatting

* Formatting

* Fix missing newsRepo (#445)

* Refactor and add importer to Installer module #443 (#444)

* Refactor and add importer to Installer module #443

* Refactor for finances to use in import

* Import groups into roles

* Formatting

* Formatting

* Add interface in installer for import

* Notes about importing

* Check for installer folder

* Formatting

* Fix pirep->user mapping

* Unused import

* Formatting

* Replace importer with AJAX powered; better error handling #443 (#447)

* Replace importer with AJAX powered; better error handling #443

* Formatting

* Fix command line importer

* Remove bootstrap cache (#448)

* Cleanup the bootstrap/cache directory when packaging

* Fix removal of bootstrap cache

* Formatting

* Stricter checks on ACARS API data (#451)

* Stricter checks on ACARS API data

* More checks

* Fix for flight_number check forcing to exist

* Allow nullable on flight_id

* Avoid proc_open use #455 (#456)

* Use PhpExecutableFinder() closes #457 #458 (#460)

* Use DateTimeZone instead of int for creating datetime

closes #461

* Fix CSV imports giving Storage class not found #454 (#462)

* Fix CSV imports giving Storage class not found #454

* Update yarn files for security alert

* Add PHP 7.4 support (#464)

* Add PHP 7.4 to build matrix

* DB fix

* YAML parser fix in test data

* Show versions

* Package updates

* Track used ICAOs

* 7.4 METAR parsing fix

* METAR parser fix

* Formatting

* Add meters to response units

* Call instance for unit conversion

* Return value

* Catch exception for unknown quantity

* Comment fix

* Formatting

* METAR parsing fixes on PHP 7.4

* Package updates

* More random airport ID

* More random airport ID

* Properly disable toolbar

* Semver written out to version file

* Use dev as default identifier

* Fix BindingResolutionError when debug toolbar isn't present (#465)

* Fix BindingResolutionError when debug toolbar isn't present

* Formatting

* Split the importer module out from the installer module (#468)

* Split the importer module out from the installer module

* Cleanup of unused imports

* Move updater into separate module #453

* Remove unused imports/formatting

* Disable the install and importer modules at the end of the setup

* Unused imports; update IJ style

* test explicit stage for php+mysql

* add more to matrix

* Add different MariaDB versions

* undo

* Cleanup Model doc

* Pilots cannot use the dashboard or flights without admin rights (#481)

* Use auth middleware instead of specific groups for logged in state

* Auth check for admin access

* Check user admin access for updates

* Formatting

* Allow nullable field and calculate distance if nulled for flight import #478 (#482)

* Check for no roles being attached #480 (#483)

* Return the flight fares if there are no subfleet fares #488 (#489)

* Return the flight fares if there are no subfleet fares #488

* Formatting

* Formatting

* Account for units when entering fuel amounts #493

* Search for ICAO not working properly (#496)

* /flights and /flights/search direct to the same endpoint

* Properly set the distance/planned_distance on save (#497)

* 491 Installation Error (#495)

* Disable CSRF token

* Add error handling around looking up the theme and set a default

* Note about logs in issue template

* Formatting

* Fix GeoService errors when viewing PIREP #498 (#499)

* Add new command to export a specific PIREP for debugging (#501)

* Set a default model value for airports on PIREP (#500)

* Set a default model value for airports on PIREP

* Fix airport icao reference

* Default airport models

* Catch broader exception writing out config files #491

* style

* Add reference to docs on doc site (#502)

* Properly create/update rows importing #486 (#503)

* Add base Dockerfile for Dockerhub builds (#504)

* New subfleet not being attached to an airline on import #479 (#505)

* Fix subfleet not being attached to an airline on creation in import #479

* Call airline name with optional() around subfleet

* Minor cleanup

* Search flights by subfleet #484 (#506)

* API level search of flights #484

* Add Subfleet to flights page for search

* Make the fuel used optional (#512)

* Add make to Docker container

* Add getRootDomain() to Utils (#514)

* Show admin dropdown for admin-access ability (#515)

* Show admin dropdown for admin-access ability closes #509

* Formatting

* Check user permissions on the routes #508 (#516)

* Check user permissions on the routes #508

* Formatting

* Return default value on exception for setting()

* Correct text for no subfleets #507 (#518)

* Add a public_url() helper #513 (#519)

* Reduce number of queries for update check (#520)

* Try to clear caches before updating (#522)

* Try to clear caches before updating

* Add clear-compiled to maintenance cache list

* Formatting

* Set PIREPs page to public (#526)

Set PIREPs page to public

* Fix live and route map errors #527 (#528)

* Add menu bar for mobile (#529)

* Format all blade templates to 2 spaces #530 (#531)

* Fix PIREP edit endpoint closes #533 (#534)

* Fix import during flight cron #532 (#535)

* PIREPS resource except for show (#536)

* Use optional() around the airport fields (#537)

* Use optional() around the airport fields

* Add null-coalesce around full_name

* Add link to download ACARS config from profile (#539)

* Add link to download ACARS config from profile

* Formatting

* Update xml config file template (#540)
This commit is contained in:
Nabeel S
2020-02-08 13:29:34 -05:00
committed by GitHub
parent a335ed8e9b
commit 073e48c396
515 changed files with 13930 additions and 10708 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/admin/pireps/actions.blade.php
+40 -39
View File
@@ -1,41 +1,42 @@
<table class="">
<tr>
<td>
@if($pirep->state === PirepState::PENDING || $pirep->state === PirepState::REJECTED)
{{ Form::open(['url' => route('admin.pirep.status', [$pirep->id]),
'method' => 'post',
'name' => 'accept_'.$pirep->id,
'id' => $pirep->id.'_accept',
'pirep_id' => $pirep->id,
'new_status' => PirepState::ACCEPTED,
'class' => $on_edit_page ? 'pirep_change_status': 'pirep_submit_status']) }}
{{ Form::button('Accept', ['type' => 'submit', 'class' => 'btn btn-success']) }}
{{ Form::close() }}
@endif
</td>
<td>&nbsp;</td>
<td>
@if($pirep->state === PirepState::PENDING || $pirep->state === PirepState::ACCEPTED)
{{ Form::open(['url' => route('admin.pirep.status', [$pirep->id]),
'method' => 'post',
'name' => 'reject_'.$pirep->id,
'id' => $pirep->id.'_reject',
'pirep_id' => $pirep->id,
'new_status' => PirepState::REJECTED,
'class' => $on_edit_page ? 'pirep_change_status': 'pirep_submit_status']) }}
{{ Form::button('Reject', ['type' => 'submit', 'class' => 'btn btn-danger']) }}
{{ Form::close() }}
@endif
</td>
<td>&nbsp;</td>
@if ($on_edit_page === false)
<td>
<form action="{{ route('admin.pireps.edit', [$pirep->id]) }}">
<button type="submit"
class='btn btn-info'>
<i class="fas fa-pencil-alt"></i>&nbsp;&nbsp;Edit</button>
</form>
</td>
@endif
</tr>
<tr>
<td>
@if($pirep->state === PirepState::PENDING || $pirep->state === PirepState::REJECTED)
{{ Form::open(['url' => route('admin.pirep.status', [$pirep->id]),
'method' => 'post',
'name' => 'accept_'.$pirep->id,
'id' => $pirep->id.'_accept',
'pirep_id' => $pirep->id,
'new_status' => PirepState::ACCEPTED,
'class' => $on_edit_page ? 'pirep_change_status': 'pirep_submit_status']) }}
{{ Form::button('Accept', ['type' => 'submit', 'class' => 'btn btn-success']) }}
{{ Form::close() }}
@endif
</td>
<td>&nbsp;</td>
<td>
@if($pirep->state === PirepState::PENDING || $pirep->state === PirepState::ACCEPTED)
{{ Form::open(['url' => route('admin.pirep.status', [$pirep->id]),
'method' => 'post',
'name' => 'reject_'.$pirep->id,
'id' => $pirep->id.'_reject',
'pirep_id' => $pirep->id,
'new_status' => PirepState::REJECTED,
'class' => $on_edit_page ? 'pirep_change_status': 'pirep_submit_status']) }}
{{ Form::button('Reject', ['type' => 'submit', 'class' => 'btn btn-danger']) }}
{{ Form::close() }}
@endif
</td>
<td>&nbsp;</td>
@if ($on_edit_page === false)
<td>
<form action="{{ route('admin.pireps.edit', [$pirep->id]) }}">
<button type="submit"
class='btn btn-info'>
<i class="fas fa-pencil-alt"></i>&nbsp;&nbsp;Edit
</button>
</form>
</td>
@endif
</tr>
</table>
resources/views/admin/pireps/comments.blade.php
+44 -44
View File
@@ -1,47 +1,47 @@
<div id="pirep_comments_wrapper" class="col-12">
<table class="table table-responsive" id="pireps-comments-table">
<thead>
<th></th>
<th></th>
<th></th>
</thead>
<tbody>
@foreach($pirep->comments as $comment)
<tr>
<td width="1%" nowrap="" style="vertical-align: text-top">
<a href="{{ route('admin.users.show', [$comment->user_id]) }}">
{{ $comment->user->name }}
</a>
</td>
<td>
<p>{{ $comment->comment }}</p>
<p class="small">{{ show_datetime($comment->created_at) }}</p>
</td>
<td align="right">
{{ Form::open(['url' => url('/admin/pireps/'.$pirep->id.'/comments'),
'method' => 'delete', 'class' => 'pjax_form form-inline']) }}
{{ Form::hidden('comment_id', $comment->id) }}
{{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit',
'class' => 'btn btn-danger btn-small',
'onclick' => "return confirm('Are you sure?')",
]) }}
{{ Form::close() }}
</td>
</tr>
@endforeach
</tbody>
</table>
<hr/>
<div class="row">
<div class="col-sm-12">
<div class="text-right">
{{ Form::open(['url' => url('/admin/pireps/'.$pirep->id.'/comments'),
'method' => 'post', 'class' => 'pjax_form form-inline']) }}
{{ Form::input('text', 'comment', null, ['class' => 'form-control input-sm']) }}
{{ Form::button('<i class="fa fa-plus"></i> Add', ['type' => 'submit',
'class' => 'btn btn-success btn-small']) }}
{{ Form::close() }}
</div>
</div>
<table class="table table-responsive" id="pireps-comments-table">
<thead>
<th></th>
<th></th>
<th></th>
</thead>
<tbody>
@foreach($pirep->comments as $comment)
<tr>
<td width="1%" nowrap="" style="vertical-align: text-top">
<a href="{{ route('admin.users.show', [$comment->user_id]) }}">
{{ $comment->user->name }}
</a>
</td>
<td>
<p>{{ $comment->comment }}</p>
<p class="small">{{ show_datetime($comment->created_at) }}</p>
</td>
<td align="right">
{{ Form::open(['url' => url('/admin/pireps/'.$pirep->id.'/comments'),
'method' => 'delete', 'class' => 'pjax_form form-inline']) }}
{{ Form::hidden('comment_id', $comment->id) }}
{{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit',
'class' => 'btn btn-danger btn-small',
'onclick' => "return confirm('Are you sure?')",
]) }}
{{ Form::close() }}
</td>
</tr>
@endforeach
</tbody>
</table>
<hr/>
<div class="row">
<div class="col-sm-12">
<div class="text-right">
{{ Form::open(['url' => url('/admin/pireps/'.$pirep->id.'/comments'),
'method' => 'post', 'class' => 'pjax_form form-inline']) }}
{{ Form::input('text', 'comment', null, ['class' => 'form-control input-sm']) }}
{{ Form::button('<i class="fa fa-plus"></i> Add', ['type' => 'submit',
'class' => 'btn btn-success btn-small']) }}
{{ Form::close() }}
</div>
</div>
</div>
</div>
resources/views/admin/pireps/create.blade.php
+6 -6
View File
@@ -2,13 +2,13 @@
@section('title', 'Create PIREP')
<div class="content">
<div class="card border-blue-bottom">
<div class="content">
{{ Form::open(['route' => 'admin.pireps.store']) }}
@include('admin.pireps.fields')
{{ Form::close() }}
</div>
<div class="card border-blue-bottom">
<div class="content">
{{ Form::open(['route' => 'admin.pireps.store']) }}
@include('admin.pireps.fields')
{{ Form::close() }}
</div>
</div>
</div>
@endsection
@include('admin.pireps.scripts')
resources/views/admin/pireps/edit.blade.php
+47 -46
View File
@@ -2,59 +2,60 @@
@section('title', 'Edit ' . $pirep->ident )
@section('content')
<div class="content">
<div class="card border-blue-bottom">
<div class="content">
{{-- pulled out to here otherwise the form::close() within a form undo it --}}
<div class="row">
<div class="col-md-8">
<h5 style="margin-top: 0px;">
Filed By: <a href="{{ route('admin.users.edit', [$pirep->user_id]) }}" target="_blank">
{{ $pirep->user->ident }} {{ $pirep->user->name }}
</a>
</h5>
</div>
<div class="col-md-4">
<div class="pull-right">
@include('admin.pireps.actions', ['pirep' => $pirep, 'on_edit_page' => true])
</div>
</div>
</div>
{{ Form::model($pirep, ['route' => ['admin.pireps.update', $pirep->id], 'method' => 'patch']) }}
@include('admin.pireps.fields')
{{ Form::close() }}
</div>
</div>
<div class="content">
<div class="card border-blue-bottom">
<div class="content">
<h4>comments</h4>
@include('admin.pireps.comments')
</div>
</div>
<div class="content">
<div class="card border-blue-bottom">
<div class="content">
<h4>flight log</h4>
@include('admin.pireps.flight_log')
</div>
</div>
<div class="card border-blue-bottom">
<div class="content">
{{-- pulled out to here otherwise the form::close() within a form undo it --}}
<div class="row">
<div class="col-md-8">
<h5 style="margin-top: 0px;">
Filed By: <a href="{{ route('admin.users.edit', [$pirep->user_id]) }}" target="_blank">
{{ $pirep->user->ident }} {{ $pirep->user->name }}
</a>
</h5>
</div>
<div class="col-md-4">
<div class="pull-right">
<button id="recalculate-finances"
class="btn btn-success"
data-pirep-id="{{ $pirep->id }}">Recalcuate Finances</button>
@include('admin.pireps.actions', ['pirep' => $pirep, 'on_edit_page' => true])
</div>
<h4>transactions</h4>
@include('admin.pireps.transactions')
</div>
</div>
{{ Form::model($pirep, ['route' => ['admin.pireps.update', $pirep->id], 'method' => 'patch']) }}
@include('admin.pireps.fields')
{{ Form::close() }}
</div>
</div>
</div>
<div class="card border-blue-bottom">
<div class="content">
<h4>comments</h4>
@include('admin.pireps.comments')
</div>
</div>
<div class="card border-blue-bottom">
<div class="content">
<h4>flight log</h4>
@include('admin.pireps.flight_log')
</div>
</div>
<div class="card border-blue-bottom">
<div class="content">
<div class="pull-right">
<button id="recalculate-finances"
class="btn btn-success"
data-pirep-id="{{ $pirep->id }}">Recalcuate Finances
</button>
</div>
<h4>transactions</h4>
@include('admin.pireps.transactions')
</div>
</div>
</div>
@endsection
@include('admin.pireps.scripts')
resources/views/admin/pireps/fares.blade.php
+18 -18
View File
@@ -1,30 +1,30 @@
@if($aircraft)
<table class="table table-hover table-responsive">
<table class="table table-hover table-responsive">
<thead>
<th>Fare</th>
<th>Count</th>
<th>Fare</th>
<th>Count</th>
</thead>
</thead>
<tbody>
@foreach($aircraft->subfleet->fares as $fare)
<tr>
<tr>
<td>{{ $fare->name }} ({{ $fare->code }})</td>
<td>
<div class="form-group">
@if(isset($pirep) && $pirep->read_only)
<p>{{ $pirep->{'fare_'.$fare->id} }}</p>
{{ Form::hidden('fare_'.$fare->id) }}
@else
{{ Form::number('fare_'.$fare->id, null, [
'class' => 'form-control',
'min' => 0,
'step' => '0.01',
]) }}
@endif
</div>
<div class="form-group">
@if(isset($pirep) && $pirep->read_only)
<p>{{ $pirep->{'fare_'.$fare->id} }}</p>
{{ Form::hidden('fare_'.$fare->id) }}
@else
{{ Form::number('fare_'.$fare->id, null, [
'class' => 'form-control',
'min' => 0,
'step' => '0.01',
]) }}
@endif
</div>
</td>
</tr>
</tr>
@endforeach
</tbody>
</table>
</table>
@endif
resources/views/admin/pireps/field_values.blade.php
+29 -29
View File
@@ -1,36 +1,36 @@
<table class="table table-responsive table-hover" id="flight-fields-table">
@if(count($pirep->fields))
@if(count($pirep->fields))
<thead>
<th></th>
<th>Value</th>
<th>Source</th>
</thead>
@endif
<tbody>
@foreach($pirep->fields as $field)
<tr>
<td>
{{ $field->name }}
@if($field->required === true)
<span class="text-danger">*</span>
@endif
</td>
<td>
<div class="form-group">
@if(!$field->read_only)
{{ Form::text($field->slug, $field->value, [
'class' => 'form-control'
]) }}
@else
<p>{{ $field->value }}</p>
@endif
</div>
<p class="text-danger">{{ $errors->first($field->slug) }}</p>
</td>
<td>
{{ PirepSource::label($field->source) }}
</td>
</tr>
@endforeach
</tbody>
@endif
<tbody>
@foreach($pirep->fields as $field)
<tr>
<td>
{{ $field->name }}
@if($field->required === true)
<span class="text-danger">*</span>
@endif
</td>
<td>
<div class="form-group">
@if(!$field->read_only)
{{ Form::text($field->slug, $field->value, [
'class' => 'form-control'
]) }}
@else
<p>{{ $field->value }}</p>
@endif
</div>
<p class="text-danger">{{ $errors->first($field->slug) }}</p>
</td>
<td>
{{ PirepSource::label($field->source) }}
</td>
</tr>
@endforeach
</tbody>
</table>
resources/views/admin/pireps/fields.blade.php
+239 -239
View File
@@ -1,248 +1,248 @@
@if(!empty($pirep) && $pirep->read_only)
<div class="row">
<div class="col-sm-12">
@component('admin.components.info')
Once a PIREP has been accepted/rejected, certain fields go into read-only mode.
@endcomponent
</div>
</div>
<div class="row">
<div class="col-sm-12">
@component('admin.components.info')
Once a PIREP has been accepted/rejected, certain fields go into read-only mode.
@endcomponent
</div>
</div>
@endif
<div class="row">
<div class="col-xl-12">
<div class="form-container">
<h6><i class="fas fa-info-circle"></i>
&nbsp;Flight Information
</h6>
<div class="form-container-body">
<div class="col-xl-12">
<div class="form-container">
<h6><i class="fas fa-info-circle"></i>
&nbsp;Flight Information
</h6>
<div class="form-container-body">
<div class="row">
<div class="form-group col-sm-6">
{{ Form::label('flight_number', 'Flight Number/Route Code/Leg') }}
@if($pirep->read_only)
<p>{{ $pirep->ident }}
{{ Form::hidden('flight_number') }}
{{ Form::hidden('flight_code') }}
{{ Form::hidden('flight_leg') }}
</p>
@else
<div class="row">
<div class="col-sm-4">
{{ Form::text('flight_number', null, [
'placeholder' => 'Flight Number',
'class' => 'form-control']) }}
<p class="text-danger">{{ $errors->first('flight_number') }}</p>
</div>
<div class="col-sm-4">
{{ Form::text('route_code', null, [
'placeholder' => 'Code (optional)',
'class' => 'form-control']) }}
<p class="text-danger">{{ $errors->first('route_code') }}</p>
</div>
<div class="col-sm-4">
{{ Form::text('route_leg', null, [
'placeholder' => 'Leg (optional)',
'class' => 'form-control']) }}
<p class="text-danger">{{ $errors->first('route_leg') }}</p>
</div>
</div>
@endif
</div>
<div class="form-group col-sm-3">
{{ Form::label('flight_type', 'Flight Type') }}
{{ Form::select('flight_type',
\App\Models\Enums\FlightType::select(),
null, [
'class' => 'form-control select2',
'readonly' => $pirep->read_only
])
}}
<p class="text-danger">{{ $errors->first('flight_type') }}</p>
</div>
<div class="form-group col-sm-3">
<p class="description">Filed Via:</p>
{{ PirepSource::label($pirep->source) }}
@if(filled($pirep->source_name))
({{ $pirep->source_name }})
@endif
</div>
<div class="row">
<div class="form-group col-sm-6">
{{ Form::label('flight_number', 'Flight Number/Route Code/Leg') }}
@if($pirep->read_only)
<p>{{ $pirep->ident }}
{{ Form::hidden('flight_number') }}
{{ Form::hidden('flight_code') }}
{{ Form::hidden('flight_leg') }}
</p>
@else
<div class="row">
<div class="col-sm-4">
{{ Form::text('flight_number', null, [
'placeholder' => 'Flight Number',
'class' => 'form-control']) }}
<p class="text-danger">{{ $errors->first('flight_number') }}</p>
</div>
</div>
<div class="col-sm-4">
{{ Form::text('route_code', null, [
'placeholder' => 'Code (optional)',
'class' => 'form-control']) }}
<p class="text-danger">{{ $errors->first('route_code') }}</p>
</div>
<div class="col-sm-4">
{{ Form::text('route_leg', null, [
'placeholder' => 'Leg (optional)',
'class' => 'form-control']) }}
<p class="text-danger">{{ $errors->first('route_leg') }}</p>
</div>
</div>
@endif
</div>
<div class="form-group col-sm-3">
{{ Form::label('flight_type', 'Flight Type') }}
{{ Form::select('flight_type',
\App\Models\Enums\FlightType::select(),
null, [
'class' => 'form-control select2',
'readonly' => $pirep->read_only
])
}}
<p class="text-danger">{{ $errors->first('flight_type') }}</p>
</div>
<div class="form-group col-sm-3">
<p class="description">Filed Via:</p>
{{ PirepSource::label($pirep->source) }}
@if(filled($pirep->source_name))
({{ $pirep->source_name }})
@endif
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-xl-12">
<div class="form-container">
<h6><i class="fas fa-info-circle"></i>
&nbsp;Flight Information
</h6>
<div class="form-container-body">
<div class="col-xl-12">
<div class="form-container">
<h6><i class="fas fa-info-circle"></i>
&nbsp;Flight Information
</h6>
<div class="form-container-body">
<div class="row">
<div class="form-group col-sm-3">
{{ Form::label('airline_id', 'Airline') }}
@if($pirep->read_only)
<p>{{ $pirep->airline->name }}</p>
{{ Form::hidden('airline_id') }}
@else
{{ Form::select('airline_id', $airlines_list, null, [
'class' => 'form-control select2',
'readonly' => $pirep->read_only]) }}
<p class="text-danger">{{ $errors->first('airline_id') }}</p>
@endif
</div>
<div class="form-group col-sm-3">
{{ Form::label('aircraft_id', 'Aircraft:') }}
@if($pirep->read_only)
<p>{{ $pirep->aircraft->name }}</p>
{{ Form::hidden('aircraft_id') }}
@else
{{ Form::select('aircraft_id', $aircraft_list, null, [
'id' => 'aircraft_select',
'class' => 'form-control select2',
'readonly' => $pirep->read_only
]) }}
<p class="text-danger">{{ $errors->first('aircraft_id') }}</p>
@endif
</div>
<div class="form-group col-sm-3">
{{ Form::label('dpt_airport_id', 'Departure Airport:') }}
@if($pirep->read_only)
<p>{{ $pirep->dpt_airport_id }}@if($pirep->dpt_airport->name) - {{ $pirep->dpt_airport->name }}@endif
</p>
{{ Form::hidden('dpt_airport_id') }}
@else
{{ Form::select('dpt_airport_id', $airports_list, null, [
'class' => 'form-control select2',
'readonly' => $pirep->read_only]) }}
<p class="text-danger">{{ $errors->first('dpt_airport_id') }}</p>
@endif
</div>
<div class="row">
<div class="form-group col-sm-3">
{{ Form::label('airline_id', 'Airline') }}
@if($pirep->read_only)
<p>{{ $pirep->airline->name }}</p>
{{ Form::hidden('airline_id') }}
@else
{{ Form::select('airline_id', $airlines_list, null, [
'class' => 'form-control select2',
'readonly' => $pirep->read_only]) }}
<p class="text-danger">{{ $errors->first('airline_id') }}</p>
@endif
</div>
<div class="form-group col-sm-3">
{{ Form::label('aircraft_id', 'Aircraft:') }}
@if($pirep->read_only)
<p>{{ $pirep->aircraft->name }}</p>
{{ Form::hidden('aircraft_id') }}
@else
{{ Form::select('aircraft_id', $aircraft_list, null, [
'id' => 'aircraft_select',
'class' => 'form-control select2',
'readonly' => $pirep->read_only
]) }}
<p class="text-danger">{{ $errors->first('aircraft_id') }}</p>
@endif
</div>
<div class="form-group col-sm-3">
{{ Form::label('dpt_airport_id', 'Departure Airport:') }}
@if($pirep->read_only)
<p>{{ $pirep->dpt_airport_id }}@if($pirep->dpt_airport->name) - {{ $pirep->dpt_airport->name }}@endif
</p>
{{ Form::hidden('dpt_airport_id') }}
@else
{{ Form::select('dpt_airport_id', $airports_list, null, [
'class' => 'form-control select2',
'readonly' => $pirep->read_only]) }}
<p class="text-danger">{{ $errors->first('dpt_airport_id') }}</p>
@endif
</div>
<div class="form-group col-sm-3">
{{ Form::label('arr_airport_id', 'Arrival Airport:') }}
@if($pirep->read_only)
<p>{{ $pirep->arr_airport->id }}@if($pirep->arr_airport->name) - {{ $pirep->arr_airport->name }}@endif
</p>
{{ Form::hidden('arr_airport_id') }}
@else
{{ Form::select('arr_airport_id', $airports_list, null, ['class' => 'form-control select2']) }}
<p class="text-danger">{{ $errors->first('arr_airport_id') }}</p>
@endif
</div>
</div>
<div class="row">
<!-- Flight Time Field -->
<div class="form-group col-sm-3">
{{ Form::label('flight_time', 'Flight Time (hours & minutes):') }}
@if($pirep->read_only)
<p>
{{ $pirep->hours }} hours, {{ $pirep->minutes }} minutes
{{ Form::hidden('hours') }}
{{ Form::hidden('minutes') }}
</p>
@else
<div class="row">
<div class="col-sm-6">
{{ Form::number('hours', null, [
'class' => 'form-control',
'placeholder' => 'hours',
'readonly' => $pirep->read_only]) }}
</div>
<div class="col-sm-6">
{{ Form::number('minutes', null, [
'class' => 'form-control',
'placeholder' => 'minutes',
'readonly' => $pirep->read_only]) }}
</div>
<p class="text-danger">{{ $errors->first('hours') }}</p>
<p class="text-danger">{{ $errors->first('minutes') }}</p>
</div>
@endif
</div>
<!-- Block Fuel Field -->
<div class="form-group col-sm-2">
{{ Form::label('block_fuel', 'Block Fuel:') }}
<div class="row">
<div class="col-sm-12">
{{ Form::number('block_fuel', null, [
'class' => 'form-control',
'min' => 0,
'step' => '0.01',
]) }}
<p class="text-danger">{{ $errors->first('block_fuel') }}</p>
</div>
</div>
</div>
<!-- Fuel Used Field -->
<div class="form-group col-sm-2">
{{ Form::label('fuel_used', 'Fuel Used:') }}
<div class="row">
<div class="col-sm-12">
{{ Form::number('fuel_used', null, [
'class' => 'form-control',
'min' => 0,
'step' => '0.01'
]) }}
<p class="text-danger">{{ $errors->first('fuel_used') }}</p>
</div>
</div>
</div>
<!-- Level Field -->
<div class="form-group col-sm-5">
{{ Form::label('level', 'Flight Level:') }}
<div class="row">
<div class="col-sm-12">
{{ Form::number('level', null, ['class' => 'form-control', 'min' => 0]) }}
<p class="text-danger">{{ $errors->first('level') }}</p>
</div>
</div>
</div>
</div>
<div class="row">
<!-- Route Field -->
<div class="form-group col-sm-6">
{{ Form::label('route', 'Route:') }}
{{ Form::textarea('route', null, ['class' => 'form-control']) }}
<p class="text-danger">{{ $errors->first('route') }}</p>
</div>
<!-- Notes Field -->
<div class="form-group col-sm-6">
{{ Form::label('notes', 'Notes:') }}
{{ Form::textarea('notes', null, ['class' => 'form-control']) }}
<p class="text-danger">{{ $errors->first('notes') }}</p>
</div>
</div>
</div>
<div class="form-group col-sm-3">
{{ Form::label('arr_airport_id', 'Arrival Airport:') }}
@if($pirep->read_only)
<p>{{ $pirep->arr_airport->id }}@if($pirep->arr_airport->name) - {{ $pirep->arr_airport->name }}@endif
</p>
{{ Form::hidden('arr_airport_id') }}
@else
{{ Form::select('arr_airport_id', $airports_list, null, ['class' => 'form-control select2']) }}
<p class="text-danger">{{ $errors->first('arr_airport_id') }}</p>
@endif
</div>
</div>
<div class="row">
<!-- Flight Time Field -->
<div class="form-group col-sm-3">
{{ Form::label('flight_time', 'Flight Time (hours & minutes):') }}
@if($pirep->read_only)
<p>
{{ $pirep->hours }} hours, {{ $pirep->minutes }} minutes
{{ Form::hidden('hours') }}
{{ Form::hidden('minutes') }}
</p>
@else
<div class="row">
<div class="col-sm-6">
{{ Form::number('hours', null, [
'class' => 'form-control',
'placeholder' => 'hours',
'readonly' => $pirep->read_only]) }}
</div>
<div class="col-sm-6">
{{ Form::number('minutes', null, [
'class' => 'form-control',
'placeholder' => 'minutes',
'readonly' => $pirep->read_only]) }}
</div>
<p class="text-danger">{{ $errors->first('hours') }}</p>
<p class="text-danger">{{ $errors->first('minutes') }}</p>
</div>
@endif
</div>
<!-- Block Fuel Field -->
<div class="form-group col-sm-2">
{{ Form::label('block_fuel', 'Block Fuel:') }}
<div class="row">
<div class="col-sm-12">
{{ Form::number('block_fuel', null, [
'class' => 'form-control',
'min' => 0,
'step' => '0.01',
]) }}
<p class="text-danger">{{ $errors->first('block_fuel') }}</p>
</div>
</div>
</div>
<!-- Fuel Used Field -->
<div class="form-group col-sm-2">
{{ Form::label('fuel_used', 'Fuel Used:') }}
<div class="row">
<div class="col-sm-12">
{{ Form::number('fuel_used', null, [
'class' => 'form-control',
'min' => 0,
'step' => '0.01'
]) }}
<p class="text-danger">{{ $errors->first('fuel_used') }}</p>
</div>
</div>
</div>
<!-- Level Field -->
<div class="form-group col-sm-5">
{{ Form::label('level', 'Flight Level:') }}
<div class="row">
<div class="col-sm-12">
{{ Form::number('level', null, ['class' => 'form-control', 'min' => 0]) }}
<p class="text-danger">{{ $errors->first('level') }}</p>
</div>
</div>
</div>
</div>
<div class="row">
<!-- Route Field -->
<div class="form-group col-sm-6">
{{ Form::label('route', 'Route:') }}
{{ Form::textarea('route', null, ['class' => 'form-control']) }}
<p class="text-danger">{{ $errors->first('route') }}</p>
</div>
<!-- Notes Field -->
<div class="form-group col-sm-6">
{{ Form::label('notes', 'Notes:') }}
{{ Form::textarea('notes', null, ['class' => 'form-control']) }}
<p class="text-danger">{{ $errors->first('notes') }}</p>
</div>
</div>
</div>
</div>
</div>
</div>
{{--
FARES
--}}
<div class="row">
<div class="col-sm-12">
<div class="form-container">
<h6><i class="fas fa-info-circle"></i>
&nbsp;fares
</h6>
<div class="form-container-body">
<div id="fares_container">
@include('admin.pireps.fares')
</div>
</div>
<div class="col-sm-12">
<div class="form-container">
<h6><i class="fas fa-info-circle"></i>
&nbsp;fares
</h6>
<div class="form-container-body">
<div id="fares_container">
@include('admin.pireps.fares')
</div>
</div>
</div>
</div>
</div>
{{--
@@ -250,24 +250,24 @@
--}}
<div class="row">
<div class="col-sm-12">
<div class="form-container">
<h6><i class="fas fa-info-circle"></i>
&nbsp;fields
</h6>
<div class="form-container-body">
{{-- You don't want to change this ID unless you don't want the fares form to work :) --}}
@include('admin.pireps.field_values')
</div>
</div>
<div class="col-sm-12">
<div class="form-container">
<h6><i class="fas fa-info-circle"></i>
&nbsp;fields
</h6>
<div class="form-container-body">
{{-- You don't want to change this ID unless you don't want the fares form to work :) --}}
@include('admin.pireps.field_values')
</div>
</div>
</div>
</div>
<div class="row">
<div class="form-group col-sm-12">
<div class="pull-right">
{{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
<a href="{{ route('admin.pireps.index') }}" class="btn btn-warn">Cancel</a>
</div>
<div class="form-group col-sm-12">
<div class="pull-right">
{{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
<a href="{{ route('admin.pireps.index') }}" class="btn btn-warn">Cancel</a>
</div>
</div>
</div>
resources/views/admin/pireps/flight_log.blade.php
+10 -10
View File
@@ -1,14 +1,14 @@
@if(count($pirep->acars_logs) > 0)
<div class="col-12">
<div class="col-12">
<table class="table table-hover" id="users-table">
<tbody>
@foreach($pirep->acars_logs as $log)
<tr>
<td nowrap="true">{{ show_datetime($log->created_at) }}</td>
<td>{{ $log->log }}</td>
</tr>
@endforeach
</tbody>
<tbody>
@foreach($pirep->acars_logs as $log)
<tr>
<td nowrap="true">{{ show_datetime($log->created_at) }}</td>
<td>{{ $log->log }}</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
@endif
resources/views/admin/pireps/index.blade.php
+8 -8
View File
@@ -2,16 +2,16 @@
@section('title', 'Pilot Reports')
@section('actions')
<li><a href="{{ route('admin.pirepfields.index') }}"><i class="ti-menu-alt"></i>PIREP Fields</a></li>
<li><a href="{{ route('admin.pireps.index') }}?search=status:0"><i class="ti-plus"></i>Pending</a></li>
<li><a href="{{ route('admin.pireps.index') }}"><i class="ti-plus"></i>View All</a></li>
<li><a href="{{ route('admin.pirepfields.index') }}"><i class="ti-menu-alt"></i>PIREP Fields</a></li>
<li><a href="{{ route('admin.pireps.index') }}?search=status:0"><i class="ti-plus"></i>Pending</a></li>
<li><a href="{{ route('admin.pireps.index') }}"><i class="ti-plus"></i>View All</a></li>
@endsection
@section('content')
@include('admin.pireps.table')
<div class="row">
<div class="col-12 text-center">
{{ $pireps->links('admin.pagination.default') }}
</div>
@include('admin.pireps.table')
<div class="row">
<div class="col-12 text-center">
{{ $pireps->links('admin.pagination.default') }}
</div>
</div>
@endsection
@include('admin.pireps.scripts')
resources/views/admin/pireps/pirep_card.blade.php
+43 -43
View File
@@ -1,30 +1,30 @@
<div id="pirep_{{ $pirep->id }}_container">
<div class="card border-blue-bottom pirep_card_container">
<div class="card border-blue-bottom pirep_card_container">
<div class="card-block" style="min-height: 0px">
<div class="row">
<div class="col-sm-2 text-center">
<h5>
<a class="text-c"
href="{{ route('admin.pireps.edit', [$pirep->id]) }}">
{{ $pirep->airline->code }}{{ $pirep->ident }}
</a>
</h5>
<div>
@if($pirep->state === PirepState::PENDING)
<div class="badge badge-warning">
@elseif($pirep->state === PirepState::ACCEPTED)
<div class="badge badge-success">
<div class="row">
<div class="col-sm-2 text-center">
<h5>
<a class="text-c"
href="{{ route('admin.pireps.edit', [$pirep->id]) }}">
{{ $pirep->airline->code }}{{ $pirep->ident }}
</a>
</h5>
<div>
@if($pirep->state === PirepState::PENDING)
<div class="badge badge-warning">
@elseif($pirep->state === PirepState::ACCEPTED)
<div class="badge badge-success">
@elseif($pirep->state === PirepState::REJECTED)
<div class="badge badge-danger">
@else
<div class="badge badge-info">
@endif
{{ PirepState::label($pirep->state) }}</div>
</div>
</div>
<div class="col-sm-10">
<div class="row">
<div class="col-sm-6">
<div class="badge badge-danger">
@else
<div class="badge badge-info">
@endif
{{ PirepState::label($pirep->state) }}</div>
</div>
</div>
<div class="col-sm-10">
<div class="row">
<div class="col-sm-6">
<div>
<span class="description">
<b>DEP</b>&nbsp;
@@ -39,25 +39,25 @@
</span>
</div>
@if($pirep->aircraft)
<div><span class="description"><b>Aircraft</b>&nbsp;
<div><span class="description"><b>Aircraft</b>&nbsp;
{{ $pirep->aircraft->registration }}
({{ $pirep->aircraft->name }})
</span>
</div>
</div>
@endif
@if(filled($pirep->level))
<div>
<div>
<span class="description"><b>Flight Level</b>&nbsp;
{{ $pirep->level }}
</span>
</div>
</div>
@endif
<div>
<span class="description"><b>Filed Using</b>&nbsp;
{{ PirepSource::label($pirep->source) }}
@if(filled($pirep->source_name))
({{ $pirep->source_name }})
@endif
@if(filled($pirep->source_name))
({{ $pirep->source_name }})
@endif
</span>
</div>
<div>
@@ -65,20 +65,20 @@
{{ show_datetime($pirep->created_at) }}
</span>
</div>
</div>
<div class="col-sm-6">
</div>
<div class="col-sm-6">
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12">
<div id="pirep_{{ $pirep->id }}_actionbar" class="pull-right">
</div>
</div>
<div class="row">
<div class="col-lg-12">
<div id="pirep_{{ $pirep->id }}_actionbar" class="pull-right">
@include('admin.pireps.actions', ['pirep' => $pirep, 'on_edit_page' => false])
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
resources/views/admin/pireps/scripts.blade.php
+37 -37
View File
@@ -1,88 +1,88 @@
@section('scripts')
<script>
const changeStatus = async (values, fn) => {
console.log('Changing PIREP ' + values.pirep_id + ' to state ' + values.new_status);
<script>
const changeStatus = async (values, fn) => {
console.log('Changing PIREP ' + values.pirep_id + ' to state ' + values.new_status);
const opts = {
const opts = {
method: 'POST',
url: '{{url('/admin/pireps')}}/' + values.pirep_id + '/status',
data: values,
};
const response = await phpvms.request(opts);
fn(response.data);
};
const response = await phpvms.request(opts);
fn(response.data);
};
$(document).ready(() => {
const select_id = "select#aircraft_select";
const destContainer = $('#fares_container');
$(document).ready(() => {
const select_id = "select#aircraft_select";
const destContainer = $('#fares_container');
$(select_id).change(async (e) => {
$(select_id).change(async (e) => {
const aircraft_id = $(select_id + " option:selected").val();
console.log('aircraft select change: ', aircraft_id);
const response = await phpvms.request("{{ url('/admin/pireps/fares') }}?aircraft_id=" + aircraft_id);
console.log('returned new fares', response.data);
destContainer.html(response.data);
});
});
$(document).on('submit', 'form.pjax_form', (event) => {
$(document).on('submit', 'form.pjax_form', (event) => {
event.preventDefault();
$.pjax.submit(event, '#pirep_comments_wrapper', {push: false});
});
});
$(document).on('pjax:complete', function () {
$(document).on('pjax:complete', function () {
initPlugins();
});
});
/**
* Recalculate finances button is clicked
*/
$('button#recalculate-finances').on('click', async (event) => {
/**
* Recalculate finances button is clicked
*/
$('button#recalculate-finances').on('click', async (event) => {
event.preventDefault();
console.log('Sending recalculate finances request');
const pirep_id = $(event.currentTarget).attr('data-pirep-id');
const opts = {
method: 'POST',
url: '{{url('/api/pireps')}}/' + pirep_id + '/finances/recalculate',
method: 'POST',
url: '{{url('/api/pireps')}}/' + pirep_id + '/finances/recalculate',
};
const response = await phpvms.request(opts);
console.log(response.data);
location.reload();
});
});
$(document).on('submit', 'form.pirep_submit_status', (event) => {
$(document).on('submit', 'form.pirep_submit_status', (event) => {
event.preventDefault();
const values = {
pirep_id: $(event.currentTarget).attr('pirep_id'),
new_status: $(event.currentTarget).attr('new_status')
pirep_id: $(event.currentTarget).attr('pirep_id'),
new_status: $(event.currentTarget).attr('new_status')
};
console.log('change status', values);
changeStatus(values, (data) => {
const destContainer = '#pirep_' + values.pirep_id + '_actionbar';
$(destContainer).html(data);
const destContainer = '#pirep_' + values.pirep_id + '_actionbar';
$(destContainer).html(data);
});
});
});
$(document).on('submit', 'form.pirep_change_status', (event) => {
$(document).on('submit', 'form.pirep_change_status', (event) => {
event.preventDefault();
const values = {
pirep_id: $(event.currentTarget).attr('pirep_id'),
new_status: $(event.currentTarget).attr('new_status')
pirep_id: $(event.currentTarget).attr('pirep_id'),
new_status: $(event.currentTarget).attr('new_status')
};
console.log('change status', values);
changeStatus(values, (data) => {
location.reload();
location.reload();
});
});
});
});
</script>
});
</script>
@endsection
resources/views/admin/pireps/show.blade.php
+18 -18
View File
@@ -2,30 +2,30 @@
@section('title', 'pilot report')
@section('content')
<div class="card border-blue-bottom">
<div class="content">
@include('admin.pireps.show_fields')
</div>
<div class="card border-blue-bottom">
<div class="content">
@include('admin.pireps.show_fields')
</div>
</div>
<div class="card border-blue-bottom">
<div class="content">
<h4>custom fields</h4>
@include('admin.pireps.field_values')
</div>
<div class="card border-blue-bottom">
<div class="content">
<h4>custom fields</h4>
@include('admin.pireps.field_values')
</div>
</div>
<div class="card border-blue-bottom">
<div class="content">
<h4>comments</h4>
@include('admin.pireps.comments')
</div>
<div class="card border-blue-bottom">
<div class="content">
<h4>comments</h4>
@include('admin.pireps.comments')
</div>
</div>
<div class="card border-blue-bottom">
<div class="content">
@include('admin.pireps.map')
</div>
<div class="card border-blue-bottom">
<div class="content">
@include('admin.pireps.map')
</div>
</div>
@endsection
@include('admin.pireps.scripts')
resources/views/admin/pireps/show_fields.blade.php
+74 -74
View File
@@ -1,84 +1,84 @@
<div class="row">
<div class="form-group col-sm-4">
<div class="box box-solid">
<div class="box-header with-border">
{{--<i class="fa fa-text-width"></i>--}}
<h3 class="box-title">{{ Form::label('dpt_airport_id', 'Dep ICAO') }}</h3>
</div>
<div class="box-body"><p class="lead">
{{ $pirep->dpt_airport->icao }} - {{ $pirep->dpt_airport->name }}
</p></div>
</div>
<div class="form-group col-sm-4">
<div class="box box-solid">
<div class="box-header with-border">
{{--<i class="fa fa-text-width"></i>--}}
<h3 class="box-title">{{ Form::label('dpt_airport_id', 'Dep ICAO') }}</h3>
</div>
<div class="box-body"><p class="lead">
{{ $pirep->dpt_airport->icao }} - {{ $pirep->dpt_airport->name }}
</p></div>
</div>
</div>
<div class="form-group col-sm-5">
<div class="box box-solid">
<div class="box-header with-border">
{{--<i class="fa fa-text-width"></i>--}}
<h3 class="box-title">{{ Form::label('arr_airport_id', 'Arrival ICAO') }}</h3>
</div>
<div class="box-body"><p class="lead">
{{ $pirep->arr_airport->icao }} - {{ $pirep->arr_airport->name }}
</p>
</div>
</div>
<div class="form-group col-sm-5">
<div class="box box-solid">
<div class="box-header with-border">
{{--<i class="fa fa-text-width"></i>--}}
<h3 class="box-title">{{ Form::label('arr_airport_id', 'Arrival ICAO') }}</h3>
</div>
<div class="box-body"><p class="lead">
{{ $pirep->arr_airport->icao }} - {{ $pirep->arr_airport->name }}
</p>
</div>
</div>
</div>
<div class="form-group col-sm-3">
<div id="pirep_{{ $pirep->id }}_actionbar" class="pull-right">
@include('admin.pireps.actions')
</div>
<div class="form-group col-sm-3">
<div id="pirep_{{ $pirep->id }}_actionbar" class="pull-right">
@include('admin.pireps.actions')
</div>
</div>
</div>
<div class="row">
<div class="col-md-12">
<table class="table table-hover">
<tr>
<td>Pilot</td>
<td><a href="{{ route('admin.users.show', [$pirep->pilot->id]) }}"
target="_blank">{{ $pirep->user->name }}</a>
</td>
</tr>
<tr>
<td>Flight</td>
<td>
<a href="{{ route('admin.flights.show', [$pirep->flight_id]) }}"
target="_blank">
{{ $pirep->ident }}
</a>
</td>
</tr>
<tr>
<td>Aircraft</td>
<td>{{ $pirep->aircraft->subfleet->name }}, {{ $pirep->aircraft->name }}
({{ $pirep->aircraft->registration }})
</td>
</tr>
<tr>
<td>Flight Time</td>
<td>{{ Utils::minutesToTimeString($pirep->flight_time) }}</td>
</tr>
<tr>
<td>Flight Level</td>
<td>{{ $pirep->level }}</td>
</tr>
<tr>
<td>Route</td>
<td>{{ $pirep->route }}</td>
</tr>
<tr>
<td>Notes</td>
<td>{{ $pirep->notes }}</td>
</tr>
<tr>
<td>Filed On</td>
<td>{{ show_datetime($pirep->created_at) }}</td>
</tr>
<div class="col-md-12">
<table class="table table-hover">
<tr>
<td>Pilot</td>
<td><a href="{{ route('admin.users.show', [$pirep->pilot->id]) }}"
target="_blank">{{ $pirep->user->name }}</a>
</td>
</tr>
<tr>
<td>Flight</td>
<td>
<a href="{{ route('admin.flights.show', [$pirep->flight_id]) }}"
target="_blank">
{{ $pirep->ident }}
</a>
</td>
</tr>
<tr>
<td>Aircraft</td>
<td>{{ $pirep->aircraft->subfleet->name }}, {{ $pirep->aircraft->name }}
({{ $pirep->aircraft->registration }})
</td>
</tr>
<tr>
<td>Flight Time</td>
<td>{{ Utils::minutesToTimeString($pirep->flight_time) }}</td>
</tr>
<tr>
<td>Flight Level</td>
<td>{{ $pirep->level }}</td>
</tr>
<tr>
<td>Route</td>
<td>{{ $pirep->route }}</td>
</tr>
<tr>
<td>Notes</td>
<td>{{ $pirep->notes }}</td>
</tr>
<tr>
<td>Filed On</td>
<td>{{ show_datetime($pirep->created_at) }}</td>
</tr>
<tr>
<td>Updated On</td>
<td>{{ show_datetime($pirep->updated_at) }}</td>
</tr>
</table>
</div>
<tr>
<td>Updated On</td>
<td>{{ show_datetime($pirep->updated_at) }}</td>
</tr>
</table>
</div>
</div>
resources/views/admin/pireps/transactions.blade.php
+37 -37
View File
@@ -1,45 +1,45 @@
<div class="col-12">
@if(count($journal['transactions']) > 0)
@if(count($journal['transactions']) > 0)
<table class="table table-hover" id="users-table">
<tbody>
@foreach($journal['transactions'] as $entry)
<tr>
<td>{{ $entry->memo }}</td>
<td>
@if($entry->credit)
{{ money($entry->credit, config('phpvms.currency')) }}
@endif
</td>
<td>
@if($entry->debit)
{{ money($entry->debit, config('phpvms.currency')) }}
@endif
</td>
</tr>
@endforeach
{{-- show sums --}}
<tbody>
@foreach($journal['transactions'] as $entry)
<tr>
<td></td>
<td>
{{ $journal['credits'] }}
</td>
<td>
<i>{{ $journal['debits'] }}</i>
</td>
<td>{{ $entry->memo }}</td>
<td>
@if($entry->credit)
{{ money($entry->credit, config('phpvms.currency')) }}
@endif
</td>
<td>
@if($entry->debit)
{{ money($entry->debit, config('phpvms.currency')) }}
@endif
</td>
</tr>
@endforeach
{{-- final total --}}
<tr style="border-top: 3px; border-top-style: double;">
<td></td>
<td align="right">
<b>Total</b>
</td>
<td>
{{ $journal['credits']->subtract($journal['debits']) }}
</td>
</tr>
</tbody>
{{-- show sums --}}
<tr>
<td></td>
<td>
{{ $journal['credits'] }}
</td>
<td>
<i>{{ $journal['debits'] }}</i>
</td>
</tr>
{{-- final total --}}
<tr style="border-top: 3px; border-top-style: double;">
<td></td>
<td align="right">
<b>Total</b>
</td>
<td>
{{ $journal['credits']->subtract($journal['debits']) }}
</td>
</tr>
</tbody>
</table>
</div>
@endif