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

Fix flight duplicate detection in add/edit/import; fix active checkbox

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-04-25 11:53:32 -05:00
parent fb6d5a6a0a
commit 531e86f5e7
7 changed files with 117 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -166,21 +166,9 @@ class FlightController extends Controller
{
$input = $request->all();
# See if flight number exists with the route code/leg
$where = [
'flight_number' => $input['flight_number'],
];
if (filled($input['route_code'])) {
$where['route_code'] = $input['route_code'];
}
if (filled($input['route_leg'])) {
$where['route_leg'] = $input['route_leg'];
}
$flights = $this->flightRepo->findWhere($where);
if ($flights->count() > 0) {
// Create a temporary flight so we can validate
$flight = new Flight($input);
if ($this->flightSvc->isFlightDuplicate($flight)) {
Flash::error('Duplicate flight with same number/code/leg found, please change to proceed');
return redirect()->back()->withInput($request->all());
}
@@ -270,22 +258,11 @@ class FlightController extends Controller
$input = $request->all();
# See if flight number exists with the route code/leg
$where = [
['id', '<>', $id],
'flight_number' => $input['flight_number'],
];
# apply the updates here temporarily, don't save
# the repo->update() call will actually do it
$flight->fill($input);
if (filled($input['route_code'])) {
$where['route_code'] = $input['route_code'];
}
if (filled($input['route_leg'])) {
$where['route_leg'] = $input['route_leg'];
}
$flights = $this->flightRepo->findWhere($where);
if ($flights->count() > 0) {
if($this->flightSvc->isFlightDuplicate($flight)) {
Flash::error('Duplicate flight with same number/code/leg found, please change to proceed');
return redirect()->back()->withInput($request->all());
}