Add table/models and admin for expenses #136

This commit is contained in:
Nabeel Shahzad
2018-02-26 15:16:12 -06:00
parent 286ed78436
commit 4a73a5a6b3
27 changed files with 556 additions and 41 deletions

View File

@@ -15,8 +15,10 @@
@endsection
@section('content')
<div class="card">
@include('admin.aircraft.table')
<div class="card border-blue-bottom">
<div class="content">
@include('admin.aircraft.table')
</div>
</div>
@endsection

View File

@@ -10,8 +10,10 @@
@endsection
@section('content')
<div class="card">
<div class="card border-blue-bottom">
<div class="content">
@include('admin.airlines.table')
</div>
</div>
@endsection

View File

@@ -62,14 +62,13 @@
<div class="row">
<div class="form-group col-sm-6">
{!! Form::label('ground_handling_cost', 'Ground Handling Cost:') !!}
{!! Form::number('ground_handling_cost', null, ['class' => 'form-control']) !!}
<p class="text-danger">{{ $errors->first('ground_handling_cost') }}</p>
@component('admin.components.info')
This is the base rate per-flight. A multiplier for this rate can be
set in the subfleet, so you can modulate those costs from there.
@endcomponent
{!! Form::number('ground_handling_cost', null, ['class' => 'form-control']) !!}
<p class="text-danger">{{ $errors->first('ground_handling_cost') }}</p>
</div>
<div class="form-group col-md-6">

View File

@@ -14,8 +14,10 @@
@include('admin.airports.search')
</div>
<div class="card">
<div class="card border-blue-bottom">
<div class="content">
@include('admin.airports.table')
</div>
</div>
<div class="row">

View File

@@ -0,0 +1,11 @@
@extends('admin.app')
@section('title', 'Add Expense')
@section('content')
<div class="card border-blue-bottom">
<div class="content">
{!! Form::open(['route' => 'admin.expenses.store']) !!}
@include('admin.expenses.fields')
{!! Form::close() !!}
</div>
</div>
@endsection

View File

@@ -0,0 +1,11 @@
@extends('admin.app')
@section('title', "Edit \"$expense->name\"")
@section('content')
<div class="card border-blue-bottom">
<div class="content">
{!! Form::model($expense, ['route' => ['admin.expenses.update', $expense->id], 'method' => 'patch']) !!}
@include('admin.expenses.fields')
{!! Form::close() !!}
</div>
</div>
@endsection

View File

@@ -0,0 +1,64 @@
<div class="row">
<!-- Code Field -->
<div class="form-group col-sm-6">
{!! Form::label('airline_id', 'Airline:') !!}
{!! Form::select('airline_id', $airlines_list, null , ['class' => 'form-control select2']) !!}
<p class="text-danger">{{ $errors->first('airline_id') }}</p>
@component('admin.components.info')
If an airline is selected, then the expense will only be applied
to the selected airline, or flights in that airline.
@endcomponent
</div>
<!-- Name Field -->
<div class="form-group col-sm-6">
{!! Form::label('type', 'Expense Type:') !!}&nbsp;<span class="required">*</span>
{!! Form::select('type', $expense_types, null , ['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('name', 'Expense Name:') !!}
{!! Form::text('name', null, ['class' => 'form-control']) !!}
<p class="text-danger">{{ $errors->first('name') }}</p>
</div>
<div class="form-group col-sm-6">
{!! Form::label('amount', 'Amount:') !!}
{!! Form::number('amount', null, ['class' => 'form-control', 'min' => 0]) !!}
<p class="text-danger">{{ $errors->first('amount') }}</p>
</div>
</div>
<div class="row">
<div class="col-sm-5">
{!! Form::label('multiplier', 'Multiplier:') !!}
<label class="checkbox-inline">
{!! Form::hidden('multiplier', 0, false) !!}
{!! Form::checkbox('multiplier', 1, null) !!}
</label>
@component('admin.components.info')
If checked, with a PIREP, this expense can be modified by a multiplier
on the subfleet. This is ignored for daily and monthly expenses
@endcomponent
</div>
<div class="col-sm-3">
{!! Form::label('active', 'Active:') !!}
<label class="checkbox-inline">
{!! Form::hidden('active', 0, false) !!}
{!! Form::checkbox('active', 1, null) !!}
</label>
</div>
<div class="form-group col-sm-4">
<div class="pull-right">
{!! Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) !!}
<a href="{!! route('admin.expenses.index') !!}" class="btn btn-default">Cancel</a>
</div>
</div>
</div>

View File

@@ -0,0 +1,25 @@
@extends('admin.app')
@section('title', 'Expenses')
@section('actions')
<li>
<a href="{!! route('admin.expenses.create') !!}">
<i class="ti-plus"></i>
Add New</a>
</li>
@endsection
@section('content')
<div class="card border-blue-bottom">
<div class="content">
@if(!filled($expenses))
<p class="text-center">
You must add a subfleet before you can add an aircraft!
</p>
@else
@include('admin.expenses.table')
@endif
</div>
</div>
@endsection

View File

@@ -0,0 +1,40 @@
<table class="table table-hover table-responsive" id="expenses-table">
<thead>
<th>Name</th>
<th>Type</th>
<th style="text-align: center;">Amount</th>
<th>Airline</th>
<th class="text-center">Active</th>
<th></th>
</thead>
<tbody>
@foreach($expenses as $expense)
<tr>
<td><a href="{!! route('admin.expenses.edit', [$expense->id]) !!}">
{!! $expense->name !!}</a>
</td>
<td>{!! \App\Models\Enums\ExpenseType::label($expense->type) !!}</td>
<td style="text-align: center;">{!! $expense->amount !!}</td>
<td>
@if(filled($expense->airline))
{!! $expense->airline->name !!}
@else
<span class="description">-</span>
@endif
</td>
<td class="text-center">
<span class="label label-{!! $expense->active?'success':'default' !!}">
{!! \App\Models\Enums\ActiveState::label($expense->active) !!}
</span>
</td>
<td class="text-right">
{!! Form::open(['route' => ['admin.expenses.destroy', $expense->id], 'method' => 'delete']) !!}
<a href="{!! route('admin.expenses.edit', [$expense->id]) !!}"
class='btn btn-sm btn-success btn-icon'><i class="fas fa-pencil-alt"></i></a>
{!! Form::button('<i class="fa fa-times"></i>', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) !!}
{!! Form::close() !!}
</td>
</tr>
@endforeach
</tbody>
</table>

View File

@@ -11,8 +11,10 @@
@endsection
@section('content')
<div class="card">
@include('admin.fares.table')
<div class="card border-blue-bottom">
<div class="content">
@include('admin.fares.table')
</div>
</div>
@endsection

View File

@@ -117,6 +117,7 @@
<!-- Active Field -->
<div class="col-sm-4">
{!! Form::label('active', 'Active:') !!}
{!! Form::hidden('active', 0, false) !!}
@if($flight!==null)
{!! Form::checkbox('active', $flight->active, ['class' => 'form-control icheck']) !!}
@else

View File

@@ -14,8 +14,10 @@
@include('admin.flights.search')
</div>
<div class="card">
@include('admin.flights.table')
<div class="card border-blue-bottom">
<div class="content">
@include('admin.flights.table')
</div>
</div>
<div class="row">

View File

@@ -33,9 +33,10 @@
class="pe-7s-paper-plane"></i>airlines</a></li>
<li><a href="{!! url('/admin/airports') !!}"><i
class="pe-7s-map-marker"></i>airports</a></li>
<li><a href="{!! url('/admin/expenses') !!}"><i class="pe-7s-cash"></i>expenses</a></li>
<li><a href="{!! url('/admin/users') !!}"><i class="pe-7s-users"></i>users</a></li>
<li><a href="{!! url('/admin/ranks') !!}"><i class="pe-7s-id"></i>ranks</a></li>
<li><a href="{!! url('/admin/settings') !!}"><i class="pe-7s-id"></i>settings</a></li>
<li><a href="{!! url('/admin/ranks') !!}"><i class="pe-7s-graph1"></i>ranks</a></li>
<li><a href="{!! url('/admin/settings') !!}"><i class="pe-7s-config"></i>settings</a></li>
</ul>
</div>
</li>

View File

@@ -9,8 +9,10 @@
@endsection
@section('content')
<div class="card">
@include('admin.ranks.table')
<div class="card border-blue-bottom">
<div class="content">
@include('admin.ranks.table')
</div>
</div>
@endsection
@include('admin.ranks.scripts')

View File

@@ -13,7 +13,11 @@
<tr>
<td width="70%">
<p>{!! $setting->name !!}</p>
<p class="description">{{$setting->description}}</p></td>
<p class="description">
@component('admin.components.info')
{{$setting->description}}
@endcomponent
</p></td>
<td align="center">
@if($setting->type === 'date')
{!! Form::input('text', $setting->id, $setting->value, ['class' => 'form-control', 'id' => 'datepicker']) !!}

View File

@@ -28,14 +28,13 @@
<div class="form-group col-sm-4">
{!! Form::label('ground_handling_multiplier', 'Ground Handling Multiplier:') !!}
{!! Form::text('ground_handling_multiplier', null, ['class' => 'form-control']) !!}
<p class="text-danger">{{ $errors->first('ground_handling_multiplier') }}</p>
@component('admin.components.info')
This is the multiplier of the airport ground-handling cost to charge for
aircraft in this subfleet, as a percentage. Defaults to 100.
@endcomponent
{!! Form::text('ground_handling_multiplier', null, ['class' => 'form-control']) !!}
<p class="text-danger">{{ $errors->first('ground_handling_multiplier') }}</p>
</div>
</div>
<div class="row">

View File

@@ -12,8 +12,10 @@
@include('admin.users.search')
</div>
<div class="card">
@include('admin.users.table')
<div class="card border-blue-bottom">
<div class="content">
@include('admin.users.table')
</div>
</div>
<div class="row">