From aa57997ff52bc02575dbd943653c9f91ab6cce99 Mon Sep 17 00:00:00 2001
From: Nabeel Shahzad <nshahzad@gmail.com>
Date: Thu, 1 Aug 2019 13:13:11 -0400
Subject: [PATCH] PIREP fields not showing up and blocking PIREP submission

---
 app/Http/Controllers/Frontend/PirepController.php |  6 +++++-
 app/Http/Requests/CreatePirepRequest.php          |  2 --
 .../views/layouts/default/flash/message.blade.php |  2 +-
 .../views/layouts/default/pireps/fields.blade.php | 15 ++++++++-------
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/Frontend/PirepController.php b/app/Http/Controllers/Frontend/PirepController.php
index 445d2365..b389f316 100644
--- a/app/Http/Controllers/Frontend/PirepController.php
+++ b/app/Http/Controllers/Frontend/PirepController.php
@@ -24,7 +24,7 @@ use Carbon\Carbon;
 use Flash;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
-use Log;
+use Illuminate\Support\Facades\Log;
 use PirepStatus;
 
 /**
@@ -269,6 +269,7 @@ class PirepController extends Controller
             // Are they allowed at this airport?
             if (setting('pilots.only_flights_from_current')
                 && Auth::user()->curr_airport_id !== $pirep->dpt_airport_id) {
+                Log::info('Pilot '.Auth::user()->id.' not at departure airport, erroring out');
                 return $this->flashError(
                     'You are currently not at the departure airport!',
                     'frontend.pireps.create'
@@ -278,6 +279,7 @@ class PirepController extends Controller
             // Can they fly this aircraft?
             if (setting('pireps.restrict_aircraft_to_rank', false)
                 && !$this->userSvc->aircraftAllowed(Auth::user(), $pirep->aircraft_id)) {
+                Log::info('Pilot ' . Auth::user()->id . ' not allowed to fly aircraft');
                 return $this->flashError(
                     'You are not allowed to fly this aircraft!',
                     'frontend.pireps.create'
@@ -288,6 +290,7 @@ class PirepController extends Controller
             /* @noinspection NotOptimalIfConditionsInspection */
             if (setting('pireps.only_aircraft_at_dpt_airport')
                 && $pirep->aircraft_id !== $pirep->dpt_airport_id) {
+                Log::info('Aircraft ' . $pirep->aircraft_id . ' not at departure airport '.$pirep->dpt_airport_id.', erroring out');
                 return $this->flashError(
                     'This aircraft is not positioned at the departure airport!',
                     'frontend.pireps.create'
@@ -297,6 +300,7 @@ class PirepController extends Controller
             // Make sure this isn't a duplicate
             $dupe_pirep = $this->pirepSvc->findDuplicate($pirep);
             if ($dupe_pirep !== false) {
+                Log::info('Duplicate PIREP found');
                 return $this->flashError(
                     'This PIREP has already been filed.',
                     'frontend.pireps.create'
diff --git a/app/Http/Requests/CreatePirepRequest.php b/app/Http/Requests/CreatePirepRequest.php
index ff87570d..9f66d7df 100644
--- a/app/Http/Requests/CreatePirepRequest.php
+++ b/app/Http/Requests/CreatePirepRequest.php
@@ -51,8 +51,6 @@ class CreatePirepRequest extends FormRequest
             $field_rules[$field->slug] = $field->required ? 'required' : 'nullable';
         }
 
-        Log::debug('createPirepFormRequest::rules', $field_rules);
-
         return $field_rules;
     }
 }
diff --git a/resources/views/layouts/default/flash/message.blade.php b/resources/views/layouts/default/flash/message.blade.php
index 80030ffb..68f85f8f 100644
--- a/resources/views/layouts/default/flash/message.blade.php
+++ b/resources/views/layouts/default/flash/message.blade.php
@@ -10,7 +10,7 @@
                     alert-{{ session('flash_notification.level') }}
                     {{ session()->has('flash_notification.important') ? 'alert-important' : '' }}">
             @if(session()->has('flash_notification.important'))
-                <button type="button"class="close" data-dismiss="alert">&times;</button>
+                <button type="button" class="close" data-dismiss="alert">&times;</button>
             @endif
 
             {{ session('flash_notification.message') }}
diff --git a/resources/views/layouts/default/pireps/fields.blade.php b/resources/views/layouts/default/pireps/fields.blade.php
index a4b0e736..7573b0c7 100644
--- a/resources/views/layouts/default/pireps/fields.blade.php
+++ b/resources/views/layouts/default/pireps/fields.blade.php
@@ -303,20 +303,22 @@ flight reports that have been filed. You've been warned!
         </div>
     </div>
 
+    {{--
+        Write out the custom fields, and label if they're required
+    --}}
     <div class="col-4">
-        @if(isset($pirep) && $pirep->fields)
         <div class="form-container">
             <h6><i class="fab fa-wpforms"></i>
                 &nbsp;{{ trans_choice('common.field', 2) }}
             </h6>
             <div class="form-container-body">
-                {{--
-                Write out the custom fields, and label if they're required
-                --}}
-                @each('pireps.custom_fields', $pirep->fields, 'field')
+                @if(isset($pirep) && $pirep->fields)
+                    @each('pireps.custom_fields', $pirep->fields, 'field')
+                @else
+                    @each('pireps.custom_fields', $pirep_fields, 'field')
+                @endif
             </div>
         </div>
-        @endif
     </div>
 </div>
 <div class="row">
@@ -352,5 +354,4 @@ flight reports that have been filed. You've been warned!
             </div>
         </div>
     </div>
-
 </div>