mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-12-18 12:28:46 +00:00
Layout updates and extensions. Found a problem I need closures for. Yay! [skip ci]
This commit is contained in:
@@ -14,7 +14,7 @@ class AccountController extends \BaseController
|
||||
|
||||
/**
|
||||
* @param ARI $repository
|
||||
* @param AI $accounts
|
||||
* @param AI $accounts
|
||||
*/
|
||||
public function __construct(ARI $repository, AI $accounts)
|
||||
{
|
||||
@@ -93,7 +93,7 @@ class AccountController extends \BaseController
|
||||
{
|
||||
$show = $this->_accounts->show($account, 40);
|
||||
|
||||
return View::make('accounts.show')->with('account', $account)->with('show',$show);
|
||||
return View::make('accounts.show')->with('account', $account)->with('show', $show);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -13,8 +13,10 @@ class BudgetController extends BaseController
|
||||
protected $_budgets;
|
||||
protected $_repository;
|
||||
|
||||
|
||||
/**
|
||||
* @param BRI $budgets
|
||||
* @param BI $budgets
|
||||
* @param BRI $repository
|
||||
*/
|
||||
public function __construct(BI $budgets, BRI $repository)
|
||||
{
|
||||
@@ -60,12 +62,52 @@ class BudgetController extends BaseController
|
||||
|
||||
}
|
||||
|
||||
public function edit(Budget $budget)
|
||||
{
|
||||
return View::make('budgets.edit')->with('budget', $budget);
|
||||
|
||||
}
|
||||
|
||||
public function update()
|
||||
{
|
||||
$budget = $this->_repository->update(Input::all());
|
||||
Session::flash('success', 'Budget "' . $budget->name . '" updated.');
|
||||
|
||||
if (Input::get('from') == 'date') {
|
||||
return Redirect::route('budgets.index');
|
||||
} else {
|
||||
return Redirect::route('budgets.index.budget');
|
||||
}
|
||||
|
||||
return Redirect::route('budgets.index');
|
||||
}
|
||||
|
||||
public function delete(Budget $budget)
|
||||
{
|
||||
return View::make('budgets.delete')->with('budget', $budget);
|
||||
}
|
||||
|
||||
public function destroy()
|
||||
{
|
||||
$result = $this->_repository->destroy(Input::get('id'));
|
||||
if ($result === true) {
|
||||
Session::flash('success', 'The budget was deleted.');
|
||||
if (Input::get('from') == 'date') {
|
||||
return Redirect::route('budgets.index');
|
||||
} else {
|
||||
return Redirect::route('budgets.index.budget');
|
||||
}
|
||||
} else {
|
||||
Session::flash('error', 'Could not delete the budget. Check the logs to be sure.');
|
||||
}
|
||||
return Redirect::route('budgets.index');
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* TODO actual view, actual content.
|
||||
* @param Budget $budget
|
||||
*
|
||||
* @param $budgetId
|
||||
*
|
||||
* @return string
|
||||
* @return int
|
||||
*/
|
||||
public function show(Budget $budget)
|
||||
{
|
||||
|
||||
@@ -21,11 +21,11 @@ class ChartController extends BaseController
|
||||
|
||||
|
||||
/**
|
||||
* @param ARI $accounts
|
||||
* @param ARI $accounts
|
||||
* @param TJRI $journals
|
||||
* @param PHI $preferences
|
||||
* @param tk $toolkit
|
||||
* @param BRI $budgets
|
||||
* @param PHI $preferences
|
||||
* @param tk $toolkit
|
||||
* @param BRI $budgets
|
||||
*/
|
||||
public function __construct(ARI $accounts, TJRI $journals, PHI $preferences, tk $toolkit, BRI $budgets)
|
||||
{
|
||||
|
||||
@@ -17,11 +17,11 @@ class HomeController extends BaseController
|
||||
protected $_tk;
|
||||
|
||||
/**
|
||||
* @param ARI $accounts
|
||||
* @param PHI $preferences
|
||||
* @param TJRI $journal
|
||||
* @param ARI $accounts
|
||||
* @param PHI $preferences
|
||||
* @param TJRI $journal
|
||||
* @param Toolkit $toolkit
|
||||
* @param BRI $budgets
|
||||
* @param BRI $budgets
|
||||
*/
|
||||
public function __construct(ARI $accounts, PHI $preferences, TJRI $journal, Toolkit $toolkit, BRI $budgets)
|
||||
{
|
||||
|
||||
@@ -33,7 +33,7 @@ class LimitController extends BaseController
|
||||
{
|
||||
$periods = \Config::get('firefly.periods_to_text');
|
||||
$prefilled = [
|
||||
'startdate' => Input::get('startdate') ? : date('Y-m-d'),
|
||||
'startdate' => Input::get('startdate') ? : date('Y-m-d'),
|
||||
'repeat_freq' => Input::get('repeat_freq') ? : 'monthly'
|
||||
];
|
||||
|
||||
@@ -54,11 +54,11 @@ class LimitController extends BaseController
|
||||
$budgets = $this->_budgets->getAsSelectList();
|
||||
|
||||
$periods = [
|
||||
'weekly' => 'A week',
|
||||
'monthly' => 'A month',
|
||||
'weekly' => 'A week',
|
||||
'monthly' => 'A month',
|
||||
'quarterly' => 'A quarter',
|
||||
'half-year' => 'Six months',
|
||||
'yearly' => 'A year',
|
||||
'yearly' => 'A year',
|
||||
];
|
||||
|
||||
|
||||
|
||||
@@ -18,9 +18,9 @@ class TransactionController extends BaseController
|
||||
protected $_journal;
|
||||
|
||||
/**
|
||||
* @param ARI $accounts
|
||||
* @param Bud $budgets
|
||||
* @param Cat $categories
|
||||
* @param ARI $accounts
|
||||
* @param Bud $budgets
|
||||
* @param Cat $categories
|
||||
* @param TJRI $journal
|
||||
*/
|
||||
public function __construct(ARI $accounts, Bud $budgets, Cat $categories, TJRI $journal)
|
||||
@@ -167,8 +167,8 @@ class TransactionController extends BaseController
|
||||
|
||||
// data to properly display form:
|
||||
$data = [
|
||||
'date' => $journal->date->format('Y-m-d'),
|
||||
'category' => '',
|
||||
'date' => $journal->date->format('Y-m-d'),
|
||||
'category' => '',
|
||||
'budget_id' => 0
|
||||
];
|
||||
$category = $journal->categories()->first();
|
||||
|
||||
@@ -42,7 +42,7 @@ class UserController extends BaseController
|
||||
{
|
||||
$rememberMe = Input::get('remember_me') == '1';
|
||||
$data = [
|
||||
'email' => Input::get('email'),
|
||||
'email' => Input::get('email'),
|
||||
'password' => Input::get('password')
|
||||
];
|
||||
if (Auth::attempt($data, $rememberMe)) {
|
||||
|
||||
Reference in New Issue
Block a user