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

Some more bug fixes.

Browse Source
This commit is contained in:
James Cole
2014-09-28 09:20:25 +02:00
parent 8e86196352
commit 6798cea268
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/controllers/TransactionController.php
View File

@@ -14,9 +14,8 @@ use Firefly\Storage\TransactionJournal\TransactionJournalRepositoryInterface as
class TransactionController extends BaseController class TransactionController extends BaseController
{ {
protected $_repository;
protected $_helper; protected $_helper;
protected $_repository;
/** /**
* Construct a new transaction controller with two of the most often used helpers. * Construct a new transaction controller with two of the most often used helpers.
@@ -236,14 +235,6 @@ class TransactionController extends BaseController
)->with('what', 'revenue'); )->with('what', 'revenue');
} }
public function transfers()
{
return View::make('transactions.list')->with('subTitle', 'Transfers')->with(
'subTitleIcon', 'fa-arrows-h'
)->with('what', 'transfers');
}
/** /**
* @param TransactionJournal $journal * @param TransactionJournal $journal
* *
@@ -307,6 +298,14 @@ class TransactionController extends BaseController
} }
} }
public function transfers()
{
return View::make('transactions.list')->with('subTitle', 'Transfers')->with(
'subTitleIcon', 'fa-arrows-h'
)->with('what', 'transfers');
}
/** /**
* @param TransactionJournal $journal * @param TransactionJournal $journal
* *

2
app/lib/Firefly/Helper/Controllers/Budget.php
View File

@@ -34,7 +34,7 @@ class Budget implements BudgetInterface
/** @var \LimitRepetition $repetition */ /** @var \LimitRepetition $repetition */
foreach ($limit->limitrepetitions as $repetition) { foreach ($limit->limitrepetitions as $repetition) {
$repetition->left = $repetition->left(); $repetition->left = $repetition->leftInRepetition();
$periodOrder = $repetition->periodOrder(); $periodOrder = $repetition->periodOrder();
$period = $repetition->periodShow(); $period = $repetition->periodShow();
if (!isset($return[$periodOrder])) { if (!isset($return[$periodOrder])) {