From a5b71ae09e659896b9fd7052e11a32b16c9f5c83 Mon Sep 17 00:00:00 2001
From: Tim <timossenblok@gmail.com>
Date: Fri, 7 Jul 2017 23:49:03 +0200
Subject: [PATCH 1/3] correct redirect route airline forms

Previously you were not able to edit an airline & it would return an error when adding one cause the redirect route wasnt set properly. this is fixed now
---
 app/Http/Controllers/Admin/AirlinesController.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/Admin/AirlinesController.php b/app/Http/Controllers/Admin/AirlinesController.php
index f9f66287..b3a5db7e 100644
--- a/app/Http/Controllers/Admin/AirlinesController.php
+++ b/app/Http/Controllers/Admin/AirlinesController.php
@@ -50,7 +50,7 @@ class AirlinesController extends BaseController
 
         Flash::success('Airlines saved successfully.');
 
-        return redirect(route('airlines.index'));
+        return redirect(route('admin.airlines.index'));
     }
 
     /**
@@ -66,7 +66,7 @@ class AirlinesController extends BaseController
 
         if (empty($airlines)) {
             Flash::error('Airlines not found');
-            return redirect(route('airlines.index'));
+            return redirect(route('admin.airlines.index'));
         }
 
         return view('admin.airlines.show')->with('airlines', $airlines);
@@ -85,7 +85,7 @@ class AirlinesController extends BaseController
 
         if (empty($airlines)) {
             Flash::error('Airlines not found');
-            return redirect(route('airlines.index'));
+            return redirect(route('admin.airlines.index'));
         }
 
         return view('admin.airlines.edit')->with('airlines', $airlines);
@@ -105,14 +105,14 @@ class AirlinesController extends BaseController
 
         if (empty($airlines)) {
             Flash::error('Airlines not found');
-            return redirect(route('airlines.index'));
+            return redirect(route('admin.airlines.index'));
         }
 
         $airlines = $this->airlineRepo->update($request->all(), $id);
 
         Flash::success('Airlines updated successfully.');
 
-        return redirect(route('airlines.index'));
+        return redirect(route('admin.airlines.index'));
     }
 
     /**
@@ -128,13 +128,13 @@ class AirlinesController extends BaseController
 
         if (empty($airlines)) {
             Flash::error('Airlines not found');
-            return redirect(route('airlines.index'));
+            return redirect(route('admin.airlines.index'));
         }
 
         $this->airlineRepo->delete($id);
 
         Flash::success('Airlines deleted successfully.');
 
-        return redirect(route('airlines.index'));
+        return redirect(route('admin.airlines.index'));
     }
 }

From aece7809faf71e63dcd355c0b0625b231ce82b7d Mon Sep 17 00:00:00 2001
From: Tim <timossenblok@gmail.com>
Date: Sat, 8 Jul 2017 11:25:09 +0200
Subject: [PATCH 2/3] Active checkbox changed to integer

---
 app/Models/Airline.php                          | 6 +++---
 resources/views/admin/airlines/fields.blade.php | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Models/Airline.php b/app/Models/Airline.php
index c8e1f653..051d764a 100644
--- a/app/Models/Airline.php
+++ b/app/Models/Airline.php
@@ -20,7 +20,7 @@ class Airline extends Model
         'fuel_100ll_cost',
         'fuel_jeta_cost',
         'fuel_mogas_cost',
-        'active',
+        'active'
     ];
 
     /**
@@ -34,7 +34,7 @@ class Airline extends Model
         'fuel_100ll_cost' => 'double',
         'fuel_jeta_cost' => 'double',
         'fuel_mogas_cost' => 'double',
-        'active' => 'boolean',
+        'active' => 'integer'
     ];
 
     /**
@@ -44,7 +44,7 @@ class Airline extends Model
      */
     public static $rules = [
         'code' => 'required|max:3|unique:airlines',
-        'name' => 'required',
+        'name' => 'required'
     ];
 
 }
diff --git a/resources/views/admin/airlines/fields.blade.php b/resources/views/admin/airlines/fields.blade.php
index fdef2d03..4d0ef5cf 100644
--- a/resources/views/admin/airlines/fields.blade.php
+++ b/resources/views/admin/airlines/fields.blade.php
@@ -14,8 +14,8 @@
 <div class="form-group col-sm-6">
     {!! Form::label('active', 'Active:') !!}
     <label class="checkbox-inline">
-        {!! Form::hidden('active', false) !!}
-        {!! Form::checkbox('active', 'True', null) !!} 1
+        {!! Form::hidden('active', 0, false) !!}
+        {!! Form::checkbox('active', 1, null) !!}
     </label>
 </div>
 

From 650341e7c8a59dadf4cfc4651dbc334ee168ebe6 Mon Sep 17 00:00:00 2001
From: Tim <timossenblok@gmail.com>
Date: Sat, 8 Jul 2017 15:09:58 +0200
Subject: [PATCH 3/3] Update Airline.php

---
 app/Models/Airline.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Models/Airline.php b/app/Models/Airline.php
index 051d764a..b276efde 100644
--- a/app/Models/Airline.php
+++ b/app/Models/Airline.php
@@ -20,7 +20,7 @@ class Airline extends Model
         'fuel_100ll_cost',
         'fuel_jeta_cost',
         'fuel_mogas_cost',
-        'active'
+        'active',
     ];
 
     /**
@@ -34,7 +34,7 @@ class Airline extends Model
         'fuel_100ll_cost' => 'double',
         'fuel_jeta_cost' => 'double',
         'fuel_mogas_cost' => 'double',
-        'active' => 'integer'
+        'active' => 'integer',
     ];
 
     /**
@@ -44,7 +44,7 @@ class Airline extends Model
      */
     public static $rules = [
         'code' => 'required|max:3|unique:airlines',
-        'name' => 'required'
+        'name' => 'required',
     ];
 
 }