Add fare type for pax/cargo/mixed flights #621 (#623)

app/Http/Controllers/Admin/FareController.php

@@ -6,6 +6,7 @@ use App\Contracts\Controller;
 use App\Http\Controllers\Admin\Traits\Importable;
 use App\Http\Requests\CreateFareRequest;
 use App\Http\Requests\UpdateFareRequest;
+use App\Models\Enums\FareType;
 use App\Models\Enums\ImportExportType;
 use App\Repositories\FareRepository;
 use App\Services\ExportService;
@@ -58,7 +59,9 @@ class FareController extends Controller
      */
     public function create()
     {
-        return view('admin.fares.create');
+        return view('admin.fares.create', [
+            'fare_types' => FareType::select(),
+        ]);
     }
 
     /**
@@ -94,7 +97,9 @@ class FareController extends Controller
             return redirect(route('admin.fares.index'));
         }
 
-        return view('admin.fares.show')->with('fare', $fare);
+        return view('admin.fares.show', [
+            'fare' => $fare,
+        ]);
     }
 
     /**
@@ -112,7 +117,10 @@ class FareController extends Controller
             return redirect(route('admin.fares.index'));
         }
 
-        return view('admin.fares.edit')->with('fare', $fare);
+        return view('admin.fares.edit', [
+            'fare'       => $fare,
+            'fare_types' => FareType::select(),
+        ]);
     }
 
     /**

app/Http/Controllers/Admin/SubfleetController.php

@@ -7,6 +7,7 @@ use App\Http\Controllers\Admin\Traits\Importable;
 use App\Http\Requests\CreateSubfleetRequest;
 use App\Http\Requests\UpdateSubfleetRequest;
 use App\Models\Airline;
+use App\Models\Enums\FareType;
 use App\Models\Enums\FuelType;
 use App\Models\Enums\ImportExportType;
 use App\Models\Expense;
@@ -98,6 +99,7 @@ class SubfleetController extends Controller
         foreach ($avail_fares as $fare) {
             $retval[$fare->id] = $fare->name.
                 ' (price: '.$fare->price.
+                ', type: '.FareType::label($fare->type).
                 ', cost: '.$fare->cost.
                 ', capacity: '.$fare->capacity.')';
         }
@@ -162,7 +164,9 @@ class SubfleetController extends Controller
      */
     public function show($id)
     {
-        $subfleet = $this->subfleetRepo->findWithoutFail($id);
+        $subfleet = $this->subfleetRepo
+            ->with(['fares'])
+            ->findWithoutFail($id);
 
         if (empty($subfleet)) {
             Flash::error('Subfleet not found');
@@ -185,7 +189,9 @@ class SubfleetController extends Controller
      */
     public function edit($id)
     {
-        $subfleet = $this->subfleetRepo->findWithoutFail($id);
+        $subfleet = $this->subfleetRepo
+            ->with(['fares', 'ranks'])
+            ->findWithoutFail($id);
 
         if (empty($subfleet)) {
             Flash::error('Subfleet not found');