From 7a75e0f5ad1bd5fef2eb82247192d5e8093af4ac Mon Sep 17 00:00:00 2001
From: Nabeel Shahzad <nshahzad@live.com>
Date: Tue, 6 Oct 2020 18:52:34 -0400
Subject: [PATCH] Fix missing $countries

---
 app/Http/Controllers/Admin/UserController.php | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
index 9d836370..691266d7 100644
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -20,6 +20,7 @@ use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Log;
 use Laracasts\Flash\Flash;
+use League\ISO3166\ISO3166;
 use Prettus\Repository\Exceptions\RepositoryException;
 
 class UserController extends Controller
@@ -69,7 +70,7 @@ class UserController extends Controller
 
         return view('admin.users.index', [
             'users'   => $users,
-            'country' => new \League\ISO3166\ISO3166(),
+            'country' => new ISO3166(),
         ]);
     }
 
@@ -82,13 +83,18 @@ class UserController extends Controller
     {
         $airlines = $this->airlineRepo->selectBoxList();
         $airports = $this->airportRepo->selectBoxList(false);
+        $countries = collect((new ISO3166())->all())
+            ->mapWithKeys(function ($item, $key) {
+                return [strtolower($item['alpha2']) => $item['name']];
+            });
 
         return view('admin.users.create', [
             'user'      => null,
             'pireps'    => null,
             'airlines'  => $airlines,
             'timezones' => Timezonelist::toArray(),
-            'country'   => new \League\ISO3166\ISO3166(),
+            'country'   => new ISO3166(),
+            'countries' => $countries,
             'airports'  => $airports,
             'ranks'     => Rank::all()->pluck('name', 'id'),
             'roles'     => Role::all()->pluck('name', 'id'),
@@ -136,13 +142,18 @@ class UserController extends Controller
 
         $airlines = $this->airlineRepo->selectBoxList();
         $airports = $this->airportRepo->selectBoxList(false);
+        $countries = collect((new ISO3166())->all())
+            ->mapWithKeys(function ($item, $key) {
+                return [strtolower($item['alpha2']) => $item['name']];
+            });
 
         return view('admin.users.show', [
             'user'      => $user,
             'pireps'    => $pireps,
             'airlines'  => $airlines,
             'timezones' => Timezonelist::toArray(),
-            'country'   => new \League\ISO3166\ISO3166(),
+            'country'   => new ISO3166(),
+            'countries' => $countries,
             'airports'  => $airports,
             'ranks'     => Rank::all()->pluck('name', 'id'),
             'roles'     => Role::all()->pluck('name', 'id'),
@@ -171,7 +182,7 @@ class UserController extends Controller
             ->whereOrder(['user_id' => $id], 'created_at', 'desc')
             ->paginate();
 
-        $countries = collect((new \League\ISO3166\ISO3166())->all())
+        $countries = collect((new ISO3166())->all())
             ->mapWithKeys(function ($item, $key) {
                 return [strtolower($item['alpha2']) => $item['name']];
             });