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

Add the acars and manual payrates in the rank/subfleet forms

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-02-26 19:14:10 -06:00
parent f6ec647eb6
commit cdd5fc749c
11 changed files with 95 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Database/migrations/2017_06_23_011011_create_subfleet_tables.php
View File

@@ -57,8 +57,8 @@ class CreateSubfleetTables extends Migration
Schema::create('subfleet_rank', function(Blueprint $table) {
$table->unsignedInteger('rank_id');
$table->unsignedInteger('subfleet_id');
$table->unsignedDecimal('acars_pay')->nullable();
$table->unsignedDecimal('manual_pay')->nullable();
$table->string('acars_pay')->nullable();
$table->string('manual_pay')->nullable();
$table->primary(['rank_id', 'subfleet_id']);
$table->index(['subfleet_id', 'rank_id']);

7
app/Http/Controllers/Admin/RankController.php
View File

@@ -207,6 +207,13 @@ class RankController extends BaseController
$rank->subfleets()->syncWithoutDetaching([$request->subfleet_id]);
}
elseif($request->isMethod('put')) {
$override = [];
$subfleet = $this->subfleetRepo->find($request->input('subfleet_id'));
$override[$request->name] = $request->value;
$rank->subfleets()->updateExistingPivot($subfleet->id, $override);
}
// remove aircraft from flight
elseif ($request->isMethod('delete')) {
$rank->subfleets()->detach($request->subfleet_id);

13
app/Http/Controllers/Admin/SubfleetController.php
View File

@@ -274,6 +274,13 @@ class SubfleetController extends BaseController
$subfleet->ranks()->syncWithoutDetaching([$request->input('rank_id')]);
}
elseif ($request->isMethod('put')) {
$override = [];
$rank = $this->fareRepo->find($request->input('rank_id'));
$override[$request->name] = $request->value;
$subfleet->ranks()->updateExistingPivot($rank->id, $override);
}
// dissassociate fare from teh aircraft
elseif ($request->isMethod('delete')) {
$subfleet->ranks()->detach($request->input('rank_id'));
@@ -305,21 +312,21 @@ class SubfleetController extends BaseController
* update specific fare data
*/
if ($request->isMethod('post')) {
$fare = $this->fareRepo->findWithoutFail($request->fare_id);
$fare = $this->fareRepo->find($request->fare_id);
$this->fareSvc->setForSubfleet($subfleet, $fare);
}
// update the pivot table with overrides for the fares
elseif ($request->isMethod('put')) {
$override = [];
$fare = $this->fareRepo->findWithoutFail($request->fare_id);
$fare = $this->fareRepo->find($request->fare_id);
$override[$request->name] = $request->value;
$this->fareSvc->setForSubfleet($subfleet, $fare, $override);
}
// dissassociate fare from teh aircraft
elseif ($request->isMethod('delete')) {
$fare = $this->fareRepo->findWithoutFail($request->fare_id);
$fare = $this->fareRepo->find($request->fare_id);
$this->fareSvc->delFareFromSubfleet($subfleet, $fare);
}

2
app/Routes/admin.php
View File

@@ -47,7 +47,7 @@ Route::group([
# subfleet
Route::resource('subfleets', 'SubfleetController');
Route::match(['get', 'post', 'put', 'delete'], 'subfleets/{id}/fares', 'SubfleetController@fares');
Route::match(['get', 'post', 'delete'], 'subfleets/{id}/ranks', 'SubfleetController@ranks');
Route::match(['get', 'post', 'put', 'delete'], 'subfleets/{id}/ranks', 'SubfleetController@ranks');
Route::resource('users', 'UserController');
Route::get('users/{id}/regen_apikey',