mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-09-19 19:01:58 +00:00
Some more bug fixes.
This commit is contained in:
@@ -25,7 +25,7 @@ class BudgetController extends BaseController
|
|||||||
{
|
{
|
||||||
$this->_budgets = $budgets;
|
$this->_budgets = $budgets;
|
||||||
$this->_repository = $repository;
|
$this->_repository = $repository;
|
||||||
View::share('title','Budgets');
|
View::share('title', 'Budgets');
|
||||||
View::share('mainTitleIcon', 'fa-tasks');
|
View::share('mainTitleIcon', 'fa-tasks');
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -158,7 +158,7 @@ class BudgetController extends BaseController
|
|||||||
->with('view', $view)
|
->with('view', $view)
|
||||||
->with('highlight', Input::get('highlight'))
|
->with('highlight', Input::get('highlight'))
|
||||||
->with('useSessionDates', $useSessionDates)
|
->with('useSessionDates', $useSessionDates)
|
||||||
->with('subTitle', 'Overview for '.$title);
|
->with('subTitle', 'Overview for ' . $title);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -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
|
||||||
*
|
*
|
||||||
|
@@ -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])) {
|
||||||
|
Reference in New Issue
Block a user