kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-08 02:38:09 +00:00
Code Issues Projects Releases Wiki Activity

Some cleanup and a small bug fix.

Browse Source
This commit is contained in:
James Cole
2014-12-12 07:42:38 +01:00
parent cb2863eaf3
commit 136adbe723
3 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/BudgetController.php
View File

@@ -145,11 +145,12 @@ class BudgetController extends BaseController
App::abort(500);
}
$journals = $this->_repository->getJournals($budget, $repetition);
$limits = $repetition ? $budget->limits()->orderBy('startdate', 'DESC')->get() : [$repetition->limit];
$subTitle = $repetition ? e($budget->name) . ' in ' . $repetition->startdate->format('F Y') : e($budget->name);
$hideBudget = true; // used in transaction list.
$journals = $this->_repository->getJournals($budget, $repetition);
$limits = $repetition ? $budget->limits()->orderBy('startdate', 'DESC')->get() : [$repetition->limit];
$subTitle = $repetition ? e($budget->name) . ' in ' . $repetition->startdate->format('F Y') : e($budget->name);
return View::make('budgets.show', compact('limits', 'budget', 'repetition', 'journals', 'subTitle'));
return View::make('budgets.show', compact('limits', 'budget', 'repetition', 'journals', 'subTitle', 'hideBudget'));
}
/**
@@ -181,7 +182,7 @@ class BudgetController extends BaseController
if ($data['post_submit_action'] == 'store') {
return Redirect::route('budgets.index');
}
// create another.
if ($data['post_submit_action'] == 'create_another') {
return Redirect::route('budgets.create')->withInput();
@@ -239,6 +240,7 @@ class BudgetController extends BaseController
public function updateIncome()
{
$budgetAmount = $this->_preferences->get('budgetIncomeTotal' . Session::get('start')->format('FY'), 1000);
return View::make('budgets.income')->with('amount', $budgetAmount);
}
}