set country on the airline, in admin and installer #191

This commit is contained in:
Nabeel Shahzad
2018-02-12 10:51:04 -06:00
parent 61dc0a046d
commit 62506a26a1
21 changed files with 11199 additions and 2578 deletions

View File

@@ -2,6 +2,7 @@
namespace Modules\Installer\Http\Controllers;
use App\Support\Countries;
use Log;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Hash;
@@ -226,7 +227,9 @@ class InstallerController extends Controller
*/
public function step3(Request $request)
{
return view('installer::install/steps/step3-user', []);
return view('installer::install/steps/step3-user', [
'countries' => Countries::getSelectList(),
]);
}
/**
@@ -241,6 +244,7 @@ class InstallerController extends Controller
$validator = Validator::make($request->all(), [
'airline_name' => 'required',
'airline_icao' => 'required|unique:airlines,icao',
'airline_country' => 'required',
'name' => 'required',
'email' => 'required|email|unique:users,email',
'password' => 'required|confirmed'
@@ -259,6 +263,7 @@ class InstallerController extends Controller
$attrs = [
'icao' => $request->get('airline_icao'),
'name' => $request->get('airline_name'),
'country' => $request->get('airline_country'),
];
$airline = $this->airlineRepo->create($attrs);

View File

@@ -17,6 +17,7 @@
<link href="{!! public_asset('/assets/frontend/css/bootstrap.min.css') !!}" rel="stylesheet"/>
<link href="{!! public_asset('/assets/frontend/css/now-ui-kit.css') !!}" rel="stylesheet"/>
<link href="{!! public_asset('/assets/frontend/css/styles.css') !!}" rel="stylesheet"/>
<link href="{!! public_asset('/assets/system/css/installer.css') !!}" rel="stylesheet"/>
{{--<link href="/assets/frontend/css/installer.css" rel="stylesheet"/>--}}
<link rel="stylesheet"
@@ -77,6 +78,9 @@
hljs.configure({languages: ['sh']});
$(document).ready(function () {
$(".select2").select2();
$('pre code').each(function (i, block) {
hljs.fixMarkup(block);
hljs.highlightBlock(block);

View File

@@ -31,6 +31,16 @@
</td>
</tr>
<tr>
<td><p>Airline Country</p></td>
<td>
<div class="form-group">
{!! Form::select('airline_country', $countries, null, ['class' => 'form-control select2' ]); !!}
@include('installer::flash/check_error', ['field' => 'airline_country'])
</div>
</td>
</tr>
<tr>
<td colspan="2"><h4>First User</h4></td>
</tr>