From ddc2ed4d89a9e652e2536a59e93c4b0f9ace9ff3 Mon Sep 17 00:00:00 2001
From: Nabeel Shahzad <nshahzad@gmail.com>
Date: Sun, 2 Jul 2017 15:11:27 -0500
Subject: [PATCH] #32 Cleanup of subfleet edit and linked from the aircraft
 screen

---
 app/Http/Controllers/Admin/RankController.php |  4 ---
 .../Controllers/Admin/SubfleetController.php  |  2 ++
 .../views/admin/aircraft/table.blade.php      |  2 ++
 .../views/admin/subfleets/edit.blade.php      | 18 ++++++++++++
 .../views/admin/subfleets/fields.blade.php    |  8 ++++--
 .../views/admin/subfleets/script.blade.php    | 27 ++++++++++++++++++
 .../views/admin/subfleets/show.blade.php      | 28 +------------------
 7 files changed, 55 insertions(+), 34 deletions(-)
 create mode 100644 resources/views/admin/subfleets/script.blade.php

diff --git a/app/Http/Controllers/Admin/RankController.php b/app/Http/Controllers/Admin/RankController.php
index 9aa76ffc..3695e741 100644
--- a/app/Http/Controllers/Admin/RankController.php
+++ b/app/Http/Controllers/Admin/RankController.php
@@ -77,10 +77,6 @@ class RankController extends BaseController
         Flash::success('Ranking saved successfully.');
 
         return redirect(route('admin.ranks.edit', ['id' => $model->id]));
-        /*$ranks = $this->rankRepository->all();
-        return view('admin.ranks.table', [
-            'ranks' => $ranks,
-        ]);*/
     }
 
     /**
diff --git a/app/Http/Controllers/Admin/SubfleetController.php b/app/Http/Controllers/Admin/SubfleetController.php
index 8412c231..6fcc8b52 100644
--- a/app/Http/Controllers/Admin/SubfleetController.php
+++ b/app/Http/Controllers/Admin/SubfleetController.php
@@ -127,8 +127,10 @@ class SubfleetController extends BaseController
             return redirect(route('admin.subfleets.index'));
         }
 
+        $avail_fares = $this->getAvailFares($subfleet);
         return view('admin.subfleets.edit', [
             'airlines' => Airline::all()->pluck('name', 'id'),
+            'avail_fares' => $avail_fares,
             'subfleet' => $subfleet,
         ]);
     }
diff --git a/resources/views/admin/aircraft/table.blade.php b/resources/views/admin/aircraft/table.blade.php
index 0c610c36..03fcf1ed 100644
--- a/resources/views/admin/aircraft/table.blade.php
+++ b/resources/views/admin/aircraft/table.blade.php
@@ -11,7 +11,9 @@
         <tr>
             <td>
                 @if($ac->subfleet_id)
+                    <a href="{!! route('admin.subfleets.edit', [$ac->subfleet_id]) !!}">
                     {!! $ac->subfleet->name !!}
+                    </a>
                 @else
                     -
                 @endif
diff --git a/resources/views/admin/subfleets/edit.blade.php b/resources/views/admin/subfleets/edit.blade.php
index ca2954ec..cd51e7d5 100644
--- a/resources/views/admin/subfleets/edit.blade.php
+++ b/resources/views/admin/subfleets/edit.blade.php
@@ -17,5 +17,23 @@
                </div>
            </div>
        </div>
+       <div class="box box-primary">
+           <div class="box-body">
+               <div class="row">
+                   <div class="col-xs-12">
+                       <h3>fares</h3>
+                       <div class="box-body">
+                           <div class="callout callout-info">
+                               <i class="icon fa fa-info">&nbsp;&nbsp;</i>
+                               Fares assigned to the current subfleet. These can be overridden,
+                               otherwise, the value used is the default, which comes from the fare.
+                           </div>
+                           @include('admin.subfleets.fares')
+                       </div>
+                   </div>
+               </div>
+           </div>
+       </div>
    </div>
 @endsection
+@include('admin.subfleets.script')
diff --git a/resources/views/admin/subfleets/fields.blade.php b/resources/views/admin/subfleets/fields.blade.php
index 19f2ffb4..b793e1b3 100644
--- a/resources/views/admin/subfleets/fields.blade.php
+++ b/resources/views/admin/subfleets/fields.blade.php
@@ -1,23 +1,25 @@
 <!-- Airline Id Field -->
-<div class="form-group col-sm-6">
+<div class="form-group col-sm-4">
     {!! Form::label('airline_id', 'Airline Id:') !!}
     {!! Form::select('airline_id', $airlines, null , ['class' => 'form-control']) !!}
 </div>
 
 <!-- Name Field -->
-<div class="form-group col-sm-6">
+<div class="form-group col-sm-4">
     {!! Form::label('name', 'Name:') !!}
     {!! Form::text('name', null, ['class' => 'form-control']) !!}
 </div>
 
 <!-- Type Field -->
-<div class="form-group col-sm-6">
+<div class="form-group col-sm-4">
     {!! Form::label('type', 'Type:') !!}
     {!! Form::text('type', null, ['class' => 'form-control']) !!}
 </div>
 
 <!-- Submit Field -->
 <div class="form-group col-sm-12">
+    <div class="pull-right">
     {!! Form::submit('Save', ['class' => 'btn btn-primary']) !!}
     <a href="{!! route('admin.subfleets.index') !!}" class="btn btn-default">Cancel</a>
+    </div>
 </div>
diff --git a/resources/views/admin/subfleets/script.blade.php b/resources/views/admin/subfleets/script.blade.php
new file mode 100644
index 00000000..059bf8c5
--- /dev/null
+++ b/resources/views/admin/subfleets/script.blade.php
@@ -0,0 +1,27 @@
+@section('scripts')
+<script>
+$(document).ready(function() {
+    $(".ac-fare-dropdown").select2();
+    $('#aircraft_fares a').editable({
+        type: 'text',
+        mode: 'inline',
+        emptytext: 'default',
+        url: '/admin/subfleets/{!! $subfleet->id !!}/fares',
+        title: 'Enter override value',
+        ajaxOptions: { 'type': 'put'},
+        params: function(params) {
+            return {
+                fare_id: params.pk,
+                name: params.name,
+                value: params.value
+            }
+        }
+    });
+
+    $(document).on('submit', 'form.rm_fare', function(event) {
+        event.preventDefault();
+        $.pjax.submit(event, '#aircraft_fares_wrapper', {push: false});
+    });
+});
+</script>
+@endsection
diff --git a/resources/views/admin/subfleets/show.blade.php b/resources/views/admin/subfleets/show.blade.php
index a9891af7..efd6e828 100644
--- a/resources/views/admin/subfleets/show.blade.php
+++ b/resources/views/admin/subfleets/show.blade.php
@@ -31,30 +31,4 @@
         </div>
     </div>
 @endsection
-@section('scripts')
-<script>
-    $(document).ready(function() {
-        $(".ac-fare-dropdown").select2();
-        $('#aircraft_fares a').editable({
-            type: 'text',
-            mode: 'inline',
-            emptytext: 'default',
-            url: '/admin/subfleets/{!! $subfleet->id !!}/fares',
-            title: 'Enter override value',
-            ajaxOptions: { 'type': 'put'},
-            params: function(params) {
-                return {
-                    fare_id: params.pk,
-                    name: params.name,
-                    value: params.value
-                }
-            }
-        });
-
-        $(document).on('submit', 'form.rm_fare', function(event) {
-            event.preventDefault();
-            $.pjax.submit(event, '#aircraft_fares_wrapper', {push: false});
-        });
-    });
-</script>
-@endsection
+@include('admin.subfleets.script')