FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix missing $countries

Browse Source
This commit is contained in:
Nabeel Shahzad
2020-10-06 18:52:34 -04:00
parent 93da2ca061
commit 7a75e0f5ad
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/Http/Controllers/Admin/UserController.php
View File

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