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

Got up to categories with the new tables.

Browse Source
This commit is contained in:
James Cole
2014-11-14 10:17:12 +01:00
parent 0530c0402c
commit ac2ab65471
11 changed files with 114 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/controllers/BudgetController.php
View File

@@ -191,17 +191,28 @@ class BudgetController extends BaseController
if (!is_null($repetition) && $repetition->limit->budget->id != $budget->id) {
App::abort(500);
}
/** @var \FireflyIII\Database\Budget $repos */
$repos = App::make('FireflyIII\Database\Budget');
if (is_null($repetition)) {
// get all other repetitions:
$limits = $budget->limits()->orderBy('startdate', 'DESC')->get();
// get all transaction journals for this budget.
$journals = $repos->getTransactionJournals($budget, 50);
$subTitle = $budget->name;
} else {
// get nothing? i dunno
$limits = [$repetition->limit];
// get all transaction journals for this budget and limit repetition.
$journals = [];
$subTitle = $budget->name.' in ' . $repetition->startdate->format('F Y');
$journals = $repos->getTransactionJournalsInRepetition($budget, $repetition, 50);
}
$hideBudget = true;
return View::make('budgets.show', compact('limits', 'budget', 'repetition'));
return View::make('budgets.show', compact('limits', 'budget', 'repetition', 'journals','subTitle','hideBudget'));
}
/**