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

Fix flight edit and active/inactive flags #150

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-01-23 13:23:32 -06:00
parent edb72e462f
commit 341424ad7e
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/Http/Controllers/Admin/FlightController.php
View File

@@ -105,11 +105,13 @@ class FlightController extends BaseController
'flight_number' => $input['flight_number'], 'flight_number' => $input['flight_number'],
]; ];
if(filled($input['route_code'])) if(filled($input['route_code'])) {
$where['route_code'] = $input['route_code']; $where['route_code'] = $input['route_code'];
}
if(filled($input['route_leg'])) if(filled($input['route_leg'])) {
$where['route_leg'] = $input['route_leg']; $where['route_leg'] = $input['route_leg'];
}
$flights = $this->flightRepo->findWhere($where); $flights = $this->flightRepo->findWhere($where);
if($flights->count() > 0) { if($flights->count() > 0) {
@@ -117,7 +119,7 @@ class FlightController extends BaseController
return redirect()->back()->withInput($request->all()); return redirect()->back()->withInput($request->all());
} }
$input['active'] = true; $input['active'] = get_truth_state($input['active']);;
$flight = $this->flightRepo->create($input); $flight = $this->flightRepo->create($input);
Flash::success('Flight saved successfully.'); Flash::success('Flight saved successfully.');
@@ -182,19 +184,21 @@ class FlightController extends BaseController
return redirect(route('admin.flights.index')); return redirect(route('admin.flights.index'));
} }
$attrs = $request->all(); $input = $request->all();
# See if flight number exists with the route code/leg # See if flight number exists with the route code/leg
$where = [ $where = [
'id != '.$id, ['id', '<>', $id],
'flight_number' => $attrs['flight_number'], 'flight_number' => $input['flight_number'],
]; ];
if (filled($attrs['route_code'])) if (filled($input['route_code'])) {
$where['route_code'] = $attrs['route_code']; $where['route_code'] = $input['route_code'];
}
if (filled($attrs['route_leg'])) if (filled($input['route_leg'])) {
$where['route_leg'] = $attrs['route_leg']; $where['route_leg'] = $input['route_leg'];
}
$flights = $this->flightRepo->findWhere($where); $flights = $this->flightRepo->findWhere($where);
if ($flights->count() > 0) { if ($flights->count() > 0) {
@@ -202,8 +206,8 @@ class FlightController extends BaseController
return redirect()->back()->withInput($request->all()); return redirect()->back()->withInput($request->all());
} }
$attrs['active'] = true; $input['active'] = get_truth_state($input['active']);
$flight = $this->flightRepo->update($attrs, $id); $this->flightRepo->update($input, $id);
Flash::success('Flight updated successfully.'); Flash::success('Flight updated successfully.');
return redirect(route('admin.flights.index')); return redirect(route('admin.flights.index'));