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

Cleanup subfleet expense name; reload page on recalculate #130

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-03-05 13:15:47 -06:00
parent a7a70ce423
commit 33c2ee702b
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Services/FinanceService.php
View File

@@ -177,8 +177,9 @@ class FinanceService extends BaseService
*/ */
public function paySubfleetExpenses(Pirep $pirep) public function paySubfleetExpenses(Pirep $pirep)
{ {
$subfleet = $pirep->aircraft->subfleet;
$subfleet_expenses = SubfleetExpense::where([ $subfleet_expenses = SubfleetExpense::where([
'subfleet_id' => $pirep->aircraft->subfleet_id, 'subfleet_id' => $subfleet->id,
])->get(); ])->get();
if(!$subfleet_expenses) { if(!$subfleet_expenses) {
@@ -195,7 +196,7 @@ class FinanceService extends BaseService
null, null,
Money::createFromAmount($expense->amount), Money::createFromAmount($expense->amount),
$pirep, $pirep,
'Subfleet Expense: '.$expense->name, 'Subfleet ('.$subfleet->type.'): '.$expense->name,
null, null,
'subfleet_expense' 'subfleet_expense'
); );

2
resources/views/admin/pireps/scripts.blade.php
View File

@@ -65,7 +65,7 @@ $(document).ready(() => {
}, },
success: (data) => { success: (data) => {
console.log(data); console.log(data);
//location.reload(); location.reload();
} }
}); });
}); });