Aircraft can have its own expenses #130

2018-03-06 17:32:56 -06:00
parent c7925db0e7
commit a325470b8f
8 changed files with 206 additions and 17 deletions
--- a/app/Http/Controllers/Admin/AircraftController.php
+++ b/app/Http/Controllers/Admin/AircraftController.php
@@ -4,7 +4,9 @@ namespace App\Http\Controllers\Admin;

 use App\Http\Requests\CreateAircraftRequest;
 use App\Http\Requests\UpdateAircraftRequest;
+use App\Models\Aircraft;
 use App\Models\Enums\AircraftStatus;
+use App\Models\Expense;
 use App\Models\Subfleet;
 use App\Repositories\AircraftRepository;
 use Flash;
@@ -14,7 +16,7 @@ use Prettus\Repository\Criteria\RequestCriteria;

 class AircraftController extends BaseController
 {
-    private $aircraftRepository;
+    private $aircraftRepo;

    /**
     * AircraftController constructor.
@@ -23,7 +25,7 @@ class AircraftController extends BaseController
    public function __construct(
        AircraftRepository $aircraftRepo
    ) {
-        $this->aircraftRepository = $aircraftRepo;
+        $this->aircraftRepo = $aircraftRepo;
    }

    /**
@@ -32,8 +34,8 @@ class AircraftController extends BaseController
     */
    public function index(Request $request)
    {
-        $this->aircraftRepository->pushCriteria(new RequestCriteria($request));
-        $aircraft = $this->aircraftRepository->orderBy('name', 'asc')->all();
+        $this->aircraftRepo->pushCriteria(new RequestCriteria($request));
+        $aircraft = $this->aircraftRepo->orderBy('name', 'asc')->all();

        return view('admin.aircraft.index', [
            'aircraft' => $aircraft
@@ -58,7 +60,7 @@ class AircraftController extends BaseController
    public function store(CreateAircraftRequest $request)
    {
        $attrs = $request->all();
-        $aircraft = $this->aircraftRepository->create($attrs);
+        $aircraft = $this->aircraftRepo->create($attrs);

        Flash::success('Aircraft saved successfully.');
        return redirect(route('admin.aircraft.edit', ['id' => $aircraft->id]));
@@ -69,7 +71,7 @@ class AircraftController extends BaseController
     */
    public function show($id)
    {
-        $aircraft = $this->aircraftRepository->findWithoutFail($id);
+        $aircraft = $this->aircraftRepo->findWithoutFail($id);

        if (empty($aircraft)) {
            Flash::error('Aircraft not found');
@@ -86,7 +88,7 @@ class AircraftController extends BaseController
     */
    public function edit($id)
    {
-        $aircraft = $this->aircraftRepository->findWithoutFail($id);
+        $aircraft = $this->aircraftRepo->findWithoutFail($id);

        if (empty($aircraft)) {
            Flash::error('Aircraft not found');
@@ -106,7 +108,7 @@ class AircraftController extends BaseController
     */
    public function update($id, UpdateAircraftRequest $request)
    {
-        $aircraft = $this->aircraftRepository->findWithoutFail($id);
+        $aircraft = $this->aircraftRepo->findWithoutFail($id);

        if (empty($aircraft)) {
            Flash::error('Aircraft not found');
@@ -114,7 +116,7 @@ class AircraftController extends BaseController
        }

        $attrs = $request->all();
-        $this->aircraftRepository->update($attrs, $id);
+        $this->aircraftRepo->update($attrs, $id);

        Flash::success('Aircraft updated successfully.');
        return redirect(route('admin.aircraft.index'));
@@ -125,16 +127,64 @@ class AircraftController extends BaseController
     */
    public function destroy($id)
    {
-        $aircraft = $this->aircraftRepository->findWithoutFail($id);
+        $aircraft = $this->aircraftRepo->findWithoutFail($id);

        if (empty($aircraft)) {
            Flash::error('Aircraft not found');
            return redirect(route('admin.aircraft.index'));
        }

-        $this->aircraftRepository->delete($id);
+        $this->aircraftRepo->delete($id);

        Flash::success('Aircraft deleted successfully.');
        return redirect(route('admin.aircraft.index'));
    }
+
+    /**
+     * @param Aircraft|null $aircraft
+     * @return mixed
+     */
+    protected function return_expenses_view(?Aircraft $aircraft)
+    {
+        $aircraft->refresh();
+        return view('admin.aircraft.expenses', [
+            'aircraft' => $aircraft,
+        ]);
+    }
+
+    /**
+     * Operations for associating ranks to the subfleet
+     * @param $id
+     * @param Request $request
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @throws \Exception
+     */
+    public function expenses($id, Request $request)
+    {
+        $aircraft = $this->aircraftRepo->findWithoutFail($id);
+        if (empty($aircraft)) {
+            return $this->return_expenses_view($aircraft);
+        }
+
+        if ($request->isMethod('get')) {
+            return $this->return_expenses_view($aircraft);
+        }
+
+        if ($request->isMethod('post')) {
+            $expense = new Expense($request->post());
+            $expense->ref_class = Aircraft::class;
+            $expense->ref_class_id = $aircraft->id;
+            $expense->save();
+        } elseif ($request->isMethod('put')) {
+            $expense = Expense::findOrFail($request->input('expense_id'));
+            $expense->{$request->name} = $request->value;
+            $expense->save();
+        } // dissassociate fare from teh aircraft
+        elseif ($request->isMethod('delete')) {
+            $expense = Expense::findOrFail($request->input('expense_id'));
+            $expense->delete();
+        }
+
+        return $this->return_expenses_view($aircraft);
+    }
 }
--- a/app/Http/Controllers/Admin/AirportController.php
+++ b/app/Http/Controllers/Admin/AirportController.php
@@ -194,9 +194,6 @@ class AirportController extends BaseController
            return $this->return_expenses_view($airport);
        }

-        /**
-         * update specific rank data
-         */
        if ($request->isMethod('post')) {
            $expense = new Expense($request->post());
            $expense->ref_class = Airport::class;
--- a/app/Models/Aircraft.php
+++ b/app/Models/Aircraft.php
@@ -3,6 +3,7 @@
 namespace App\Models;

 use App\Models\Enums\AircraftStatus;
+use App\Models\Traits\Expensable;
 use App\Support\ICAO;

 /**
@@ -18,6 +19,8 @@ use App\Support\ICAO;
 */
 class Aircraft extends BaseModel
 {
+    use Expensable;
+
    public $table = 'aircraft';

    public $fillable = [
--- a/app/Routes/admin.php
+++ b/app/Routes/admin.php
@@ -15,6 +15,7 @@ Route::group([

    # aircraft and fare associations
    Route::resource('aircraft', 'AircraftController');
+    Route::match(['get', 'post', 'put', 'delete'], 'aircraft/{id}/expenses', 'AircraftController@expenses');

    # expenses
    Route::resource('expenses', 'ExpenseController');
--- a/app/Services/Finance/PirepFinanceService.php
+++ b/app/Services/Finance/PirepFinanceService.php
@@ -127,6 +127,7 @@ class PirepFinanceService extends BaseService
    /**
     * Collect all of the expenses and apply those to the journal
     * @param Pirep $pirep
+     * @throws \Prettus\Validator\Exceptions\ValidatorException
     * @throws \UnexpectedValueException
     * @throws \InvalidArgumentException
     */
@@ -142,9 +143,9 @@ class PirepFinanceService extends BaseService
         */
        $expenses->map(function ($expense, $i) use ($pirep)
        {
-            if ($expense->multiplier) {
+            /*if ($expense->multiplier) {
                # TODO: Modify the amount
-            }
+            }*/

            Log::info('Finance: PIREP: '.$pirep->id.', expense:', $expense->toArray());

@@ -166,7 +167,8 @@ class PirepFinanceService extends BaseService
                $transaction_group = "Subfleet: {$expense->name} ({$pirep->aircraft->subfleet->name})";
            } elseif ($klass === 'Aircraft') {
                $memo = "Aircraft Expense: {$expense->name} ({$pirep->aircraft->name})";
-                $transaction_group = "Aircraft: {$expense->name} ({$pirep->aircraft->name})";
+                $transaction_group = "Aircraft: {$expense->name} "
+                    ."({$pirep->aircraft->name}-{$pirep->aircraft->registration})";
            } else {
                $memo = "Expense: {$expense->name}";
                $transaction_group = "Expense: {$expense->name}";
--- a/resources/views/admin/aircraft/edit.blade.php
+++ b/resources/views/admin/aircraft/edit.blade.php
@@ -8,4 +8,12 @@
       {!! Form::close() !!}
   </div>
 </div>
+
+<div class="card border-blue-bottom">
+   <div class="content">
+      @include('admin.aircraft.expenses')
+   </div>
+</div>
@endsection
+
+@include('admin.aircraft.script')
--- a/resources/views/admin/aircraft/expenses.blade.php
+++ b/resources/views/admin/aircraft/expenses.blade.php
@@ -0,0 +1,75 @@
+<div id="expenses-wrapper" class="col-12">
+    <div class="header">
+        <h3>expenses</h3>
+        @component('admin.components.info')
+        These expenses are only applied to this aircraft.
+        @endcomponent
+    </div>
+    <br/>
+    <table class="table table-responsive" id="expenses">
+
+        @if(count($aircraft->expenses))
+        <thead>
+        <th>Name</th>
+        <th>Cost&nbsp;<span class="small">{!! currency(config('phpvms.currency')) !!}</span></th>
+        <th>Type</th>
+        <th></th>
+        </thead>
+        @endif
+
+        <tbody>
+        @foreach($aircraft->expenses as $expense)
+            <tr>
+                <td>
+                    <p>
+                        <a class="text" href="#" data-pk="{!! $expense->id !!}"
+                           data-name="name">{!! $expense->name !!}</a>
+                    </p>
+                </td>
+                <td>
+                    <p>
+                        <a class="text" href="#" data-pk="{!! $expense->id !!}"
+                           data-name="amount">{!! $expense->amount !!}</a>
+                    </p>
+                </td>
+                <td>
+                    <p>
+                        <a href="#"
+                           class="dropdown"
+                           data-pk="{!! $expense->id !!}"
+                           data-name="type">{!! \App\Models\Enums\ExpenseType::label($expense->type) !!}</a>
+                    </p>
+                </td>
+                <td align="right">
+                    {!! Form::open(['url' => url('/admin/aircraft/'.$aircraft->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/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::select('type', \App\Models\Enums\ExpenseType::select(), null, ['class' => 'select2']) !!}
+                {!! Form::button('<i class="fa fa-plus"></i> Add', ['type' => 'submit',
+                                 'class' => 'btn btn-success btn-small']) !!}
+                {!! Form::close() !!}
+
+                <p class="text-danger">{{ $errors->first('name') }}</p>
+                <p class="text-danger">{{ $errors->first('amount') }}</p>
+            </div>
+        </div>
+    </div>
+</div>
--- a/resources/views/admin/aircraft/script.blade.php
+++ b/resources/views/admin/aircraft/script.blade.php
@@ -0,0 +1,53 @@
+@section('scripts')
+<script>
+function setEditable() {
+    @if(isset($aircraft))
+    $('#expenses a.text').editable({
+        emptytext: '0',
+        url: '{!! url('/admin/aircraft/'.$aircraft->id.'/expenses') !!}',
+        title: 'Enter override value',
+        ajaxOptions: {'type': 'put'},
+        params: function (params) {
+            return {
+                expense_id: params.pk,
+                name: params.name,
+                value: params.value
+            }
+        }
+    });
+
+    $('#expenses a.dropdown').editable({
+        type: 'select',
+        emptytext: '0',
+        source: {!! json_encode(list_to_editable(\App\Models\Enums\ExpenseType::select())) !!},
+        url: '{!! url('/admin/aircraft/'.$aircraft->id.'/expenses') !!}',
+        title: 'Enter override value',
+        ajaxOptions: {'type': 'put'},
+        params: function (params) {
+            return {
+                expense_id: params.pk,
+                name: params.name,
+                value: params.value
+            }
+        }
+    });
+    @endif
+}
+
+$(document).ready(function() {
+
+    setEditable();
+
+    $(document).on('submit', 'form.modify_expense', function (event) {
+        event.preventDefault();
+        console.log(event);
+        $.pjax.submit(event, '#expenses-wrapper', {push: false});
+    });
+
+    $(document).on('pjax:complete', function () {
+        $(".select2").select2();
+        setEditable();
+    });
+});
+</script>
+@endsection