Some more bug fixes.

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

View File

@@ -25,7 +25,7 @@ class BudgetController extends BaseController
{
$this->_budgets = $budgets;
$this->_repository = $repository;
View::share('title','Budgets');
View::share('title', 'Budgets');
View::share('mainTitleIcon', 'fa-tasks');
}
@@ -158,7 +158,7 @@ class BudgetController extends BaseController
->with('view', $view)
->with('highlight', Input::get('highlight'))
->with('useSessionDates', $useSessionDates)
->with('subTitle', 'Overview for '.$title);
->with('subTitle', 'Overview for ' . $title);
}
/**

View File

@@ -14,9 +14,8 @@ use Firefly\Storage\TransactionJournal\TransactionJournalRepositoryInterface as
class TransactionController extends BaseController
{
protected $_repository;
protected $_helper;
protected $_repository;
/**
* Construct a new transaction controller with two of the most often used helpers.
@@ -236,14 +235,6 @@ class TransactionController extends BaseController
)->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
*
@@ -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
*
@@ -317,7 +316,7 @@ class TransactionController extends BaseController
switch (Input::get('post_submit_action')) {
case 'store':
case 'return_to_edit':
$what = strtolower($journal->transactionType->type);
$what = strtolower($journal->transactionType->type);
$messageBag = $this->_helper->update($journal, Input::all());
if ($messageBag->count() == 0) {
// has been saved, return to index:

View File

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