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

Remove subfleet_expenses and combine into main expenses table; select expense type on subfleet #130 #136

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-03-05 21:24:49 -06:00
parent 8c05ad134e
commit 88a8fd2bbd
20 changed files with 160 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Admin/ExpenseController.php
View File

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Admin;
use App\Http\Requests\CreateAirlineRequest;
use App\Http\Requests\UpdateAirlineRequest;
use App\Models\Enums\ExpenseType;
use App\Models\Expense;
use App\Repositories\AirlineRepository;
use App\Repositories\ExpenseRepository;
use Flash;
@@ -39,7 +40,9 @@ class ExpenseController extends BaseController
public function index(Request $request)
{
$this->expenseRepo->pushCriteria(new RequestCriteria($request));
$expenses = $this->expenseRepo->all();
$expenses = $this->expenseRepo->findWhere([
'ref_class' => Expense::class
]);
return view('admin.expenses.index', [
'expenses' => $expenses
@@ -66,6 +69,7 @@ class ExpenseController extends BaseController
public function store(Request $request)
{
$input = $request->all();
$input['ref_class'] = Expense::class;
$this->expenseRepo->create($input);
Flash::success('Expense saved successfully.');

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

@@ -6,8 +6,8 @@ use App\Http\Requests\CreateSubfleetRequest;
use App\Http\Requests\UpdateSubfleetRequest;
use App\Models\Airline;
use App\Models\Enums\FuelType;
use App\Models\Expense;
use App\Models\Subfleet;
use App\Models\SubfleetExpense;
use App\Repositories\AircraftRepository;
use App\Repositories\FareRepository;
use App\Repositories\RankRepository;
@@ -338,17 +338,18 @@ class SubfleetController extends BaseController
* update specific rank data
*/
if ($request->isMethod('post')) {
$expense = new SubfleetExpense($request->post());
$expense->subfleet_id = $subfleet->id;
$expense = new Expense($request->post());
$expense->ref_class = Subfleet::class;
$expense->ref_class_id = $subfleet->id;
$expense->save();
$subfleet->refresh();
} elseif ($request->isMethod('put')) {
$expense = SubfleetExpense::findOrFail($request->input('expense_id'));
$expense = Expense::findOrFail($request->input('expense_id'));
$expense->{$request->name} = $request->value;
$expense->save();
} // dissassociate fare from teh aircraft
elseif ($request->isMethod('delete')) {
$expense = SubfleetExpense::findOrFail($request->input('expense_id'));
$expense = Expense::findOrFail($request->input('expense_id'));
$expense->delete();
}