Add subfleet specific expenses, fixed bug for pirep fares #130 #136

This commit is contained in:
Nabeel Shahzad
2018-03-05 12:21:38 -06:00
parent bf94a20e57
commit 96e8fbfa78
12 changed files with 357 additions and 44 deletions

View File

@@ -21,5 +21,11 @@
@include('admin.subfleets.fares')
</div>
</div>
<div class="card border-blue-bottom">
<div class="content">
@include('admin.subfleets.expenses')
</div>
</div>
@endsection
@include('admin.subfleets.script')

View File

@@ -0,0 +1,60 @@
<div id="subfleet-expenses-wrapper" class="col-12">
<div class="header">
<h3>expenses</h3>
@component('admin.components.info')
These expenses are only applied to this subfleet
@endcomponent
</div>
<br/>
<table class="table table-responsive" id="subfleet-expenses">
@if(count($subfleet->expenses))
<thead>
<th>Name</th>
<th>Cost&nbsp;<span class="small">{!! currency(config('phpvms.currency')) !!}</span></th>
<th></th>
</thead>
@endif
<tbody>
@foreach($subfleet->expenses as $expense)
<tr>
<td>
<p>
<a href="#" data-pk="{!! $expense->id !!}"
data-name="name">{!! $expense->name !!}</a>
</p>
</td>
<td>
<p>
<a href="#" data-pk="{!! $expense->id !!}"
data-name="amount">{!! $expense->amount !!}</a>
</p>
</td>
<td align="right">
{!! Form::open(['url' => url('/admin/subfleets/'.$subfleet->id.'/expenses'),
'method' => 'delete', 'class' => 'modify_expense form-inline']) !!}
{!! Form::hidden('expense_id', $expense->id) !!}
{!! 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>
<hr/>
<div class="row">
<div class="col-sm-12">
<div class="text-right">
{!! Form::open(['url' => url('/admin/subfleets/'.$subfleet->id.'/expenses'),
'method' => 'post', 'class' => 'modify_expense form-inline']) !!}
{!! Form::input('text', 'name', null, ['class' => 'form-control input-sm']) !!}
{!! Form::number('cost', 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>

View File

@@ -32,6 +32,22 @@ function setEditable() {
}
}
});
$('#subfleet-expenses a').editable({
type: 'text',
mode: 'inline',
emptytext: '0',
url: '{!! url('/admin/subfleets/'.$subfleet->id.'/expenses') !!}',
title: 'Enter override value',
ajaxOptions: {'type': 'put'},
params: function (params) {
return {
expense_id: params.pk,
name: params.name,
value: params.value
}
}
});
}
$(document).ready(function() {
@@ -51,6 +67,12 @@ $(document).ready(function() {
$.pjax.submit(event, '#subfleet_ranks_wrapper', {push: false});
});
$(document).on('submit', 'form.modify_expense', function (event) {
event.preventDefault();
console.log(event);
$.pjax.submit(event, '#subfleet-expenses-wrapper', {push: false});
});
$(document).on('pjax:complete', function() {
$(".select2").select2();
setEditable();