mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-11-02 20:25:28 +00:00
Some fixes for budgets
This commit is contained in:
Sander Dorigo
@@ -4,248 +4,325 @@ use Carbon\Carbon;
|
||||
use Firefly\Exception\FireflyException;
|
||||
use Firefly\Helper\Controllers\BudgetInterface as BI;
|
||||
use Firefly\Storage\Budget\BudgetRepositoryInterface as BRI;
|
||||
use FireflyIII\Exception\NotImplementedException;
|
||||
|
||||
|
||||
/**
|
||||
* Class BudgetController
|
||||
*
|
||||
* @SuppressWarnings(PHPMD.CamelCasePropertyName)
|
||||
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
|
||||
*
|
||||
*/
|
||||
class BudgetController extends BaseController
|
||||
{
|
||||
|
||||
protected $_budgets;
|
||||
protected $_repository;
|
||||
|
||||
/**
|
||||
* @param BI $budgets
|
||||
* @param BRI $repository
|
||||
*/
|
||||
public function __construct(BI $budgets, BRI $repository)
|
||||
public function __construct()
|
||||
{
|
||||
$this->_budgets = $budgets;
|
||||
$this->_repository = $repository;
|
||||
View::share('title', 'Budgets');
|
||||
View::share('mainTitleIcon', 'fa-tasks');
|
||||
}
|
||||
|
||||
public function nobudget($view = 'session') {
|
||||
switch($view) {
|
||||
default:
|
||||
throw new FireflyException('Cannot show transactions without a budget for view "'.$view.'".');
|
||||
break;
|
||||
case 'session':
|
||||
$start = Session::get('start');
|
||||
$end = Session::get('end');
|
||||
break;
|
||||
}
|
||||
|
||||
// Add expenses that have no budget:
|
||||
$set = \Auth::user()->transactionjournals()->whereNotIn(
|
||||
'transaction_journals.id', function ($query) use ($start, $end) {
|
||||
$query->select('transaction_journals.id')->from('transaction_journals')
|
||||
->leftJoin(
|
||||
'component_transaction_journal', 'component_transaction_journal.transaction_journal_id', '=',
|
||||
'transaction_journals.id'
|
||||
)
|
||||
->leftJoin('components', 'components.id', '=', 'component_transaction_journal.component_id')
|
||||
->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
|
||||
->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
|
||||
->where('components.class', 'Budget');
|
||||
}
|
||||
)->before($end)->after($start)->get();
|
||||
|
||||
return View::make('budgets.nobudget')
|
||||
->with('view', $view)
|
||||
->with('transactions',$set)
|
||||
->with('subTitle', 'Transactions without a budget');
|
||||
}
|
||||
|
||||
/**
|
||||
* @return $this|\Illuminate\View\View
|
||||
*/
|
||||
public function create()
|
||||
public function postUpdateIncome()
|
||||
{
|
||||
$periods = \Config::get('firefly.periods_to_text');
|
||||
/** @var \Firefly\Helper\Preferences\PreferencesHelperInterface $preferences */
|
||||
$preferences = App::make('Firefly\Helper\Preferences\PreferencesHelperInterface');
|
||||
$date = Session::get('start');
|
||||
|
||||
return View::make('budgets.create')->with('periods', $periods)->with('subTitle', 'Create a new budget');
|
||||
$value = intval(Input::get('amount'));
|
||||
$preferences->set('budgetIncomeTotal' . $date->format('FY'), $value);
|
||||
return Redirect::route('budgets.index');
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the amount for a budget's limitrepetition and/or create it.
|
||||
*
|
||||
* @param Budget $budget
|
||||
*
|
||||
* @return $this
|
||||
*/
|
||||
public function delete(Budget $budget)
|
||||
public function amount(Budget $budget)
|
||||
{
|
||||
return View::make('budgets.delete')->with('budget', $budget)
|
||||
->with('subTitle', 'Delete budget "' . $budget->name . '"');
|
||||
}
|
||||
$amount = intval(Input::get('amount'));
|
||||
$date = Session::get('start');
|
||||
/** @var \Limit $limit */
|
||||
$limit = $budget->limits()->where('startdate', $date->format('Y-m-d'))->first();
|
||||
if (!$limit) {
|
||||
// create one!
|
||||
$limit = new Limit;
|
||||
$limit->budget()->associate($budget);
|
||||
$limit->startdate = $date;
|
||||
$limit->amount = $amount;
|
||||
$limit->repeat_freq = 'monthly';
|
||||
$limit->repeats = 0;
|
||||
$limit->save();
|
||||
Event::fire('limits.store', [$limit]);
|
||||
|
||||
/**
|
||||
* @param Budget $budget
|
||||
*
|
||||
* @return \Illuminate\Http\RedirectResponse
|
||||
*/
|
||||
public function destroy(Budget $budget)
|
||||
{
|
||||
// remove budget
|
||||
Event::fire('budgets.destroy', [$budget]); // just before deletion.
|
||||
$this->_repository->destroy($budget);
|
||||
Session::flash('success', 'The budget was deleted.');
|
||||
|
||||
// redirect:
|
||||
if (Input::get('from') == 'date') {
|
||||
return Redirect::route('budgets.index');
|
||||
}
|
||||
return Redirect::route('budgets.index.budget');
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Budget $budget
|
||||
*
|
||||
* @return $this
|
||||
*/
|
||||
public function edit(Budget $budget)
|
||||
{
|
||||
return View::make('budgets.edit')->with('budget', $budget)
|
||||
->with('subTitle', 'Edit budget "' . $budget->name . '"');
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* @return $this|\Illuminate\View\View
|
||||
*/
|
||||
public function indexByBudget()
|
||||
{
|
||||
View::share('subTitleIcon', 'fa-folder-open');
|
||||
|
||||
$budgets = $this->_repository->get();
|
||||
|
||||
return View::make('budgets.indexByBudget')->with('budgets', $budgets)->with('today', new Carbon)
|
||||
->with('subTitle', 'Grouped by budget');
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* @return $this
|
||||
*/
|
||||
public function indexByDate()
|
||||
{
|
||||
View::share('subTitleIcon', 'fa-calendar');
|
||||
|
||||
// get a list of dates by getting all repetitions:
|
||||
$set = $this->_repository->get();
|
||||
$budgets = $this->_budgets->organizeByDate($set);
|
||||
|
||||
return View::make('budgets.indexByDate')->with('budgets', $budgets)
|
||||
->with('subTitle', 'Grouped by date');
|
||||
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Three use cases for this view:
|
||||
*
|
||||
* - Show everything.
|
||||
* - Show a specific repetition.
|
||||
* - Show everything shows NO repetition.
|
||||
*
|
||||
* @param Budget $budget
|
||||
* @param LimitRepetition $repetition
|
||||
*
|
||||
* @return int
|
||||
*/
|
||||
public function show(Budget $budget, \LimitRepetition $repetition = null)
|
||||
{
|
||||
$useSessionDates = Input::get('useSession') == 'true' ? true : false;
|
||||
$view = null;
|
||||
$title = null;
|
||||
\Log::debug('Is envelope true? ' . (Input::get('noenvelope') == 'true'));
|
||||
switch (true) {
|
||||
case (!is_null($repetition)):
|
||||
$data = $this->_budgets->organizeRepetition($repetition);
|
||||
$view = 1;
|
||||
$title = $budget->name . ', ' . $repetition->periodShow() . ', ' . mf(
|
||||
$repetition->limit->amount,
|
||||
false
|
||||
);
|
||||
break;
|
||||
case (Input::get('noenvelope') == 'true'):
|
||||
$data = $this->_budgets->outsideRepetitions($budget);
|
||||
$view = 2;
|
||||
$title = $budget->name . ', transactions outside an envelope';
|
||||
break;
|
||||
default:
|
||||
$data = $this->_budgets->organizeRepetitions($budget, $useSessionDates);
|
||||
$view = $useSessionDates ? 3 : 4;
|
||||
$title = $useSessionDates ? $budget->name . ' in session period' : $budget->name;
|
||||
break;
|
||||
}
|
||||
|
||||
return View::make('budgets.show')
|
||||
->with('budget', $budget)
|
||||
->with('repetitions', $data)
|
||||
->with('view', $view)
|
||||
->with('highlight', Input::get('highlight'))
|
||||
->with('useSessionDates', $useSessionDates)
|
||||
->with('subTitle', 'Overview for ' . $title);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return \Illuminate\Http\RedirectResponse
|
||||
*/
|
||||
public function store()
|
||||
{
|
||||
|
||||
$budget = $this->_repository->store(Input::all());
|
||||
if ($budget->validate()) {
|
||||
Event::fire('budgets.store', [$budget]);
|
||||
Session::flash('success', 'Budget created!');
|
||||
|
||||
if (Input::get('create') == '1') {
|
||||
return Redirect::route('budgets.create', ['from' => Input::get('from')]);
|
||||
}
|
||||
|
||||
if (Input::get('from') == 'date') {
|
||||
return Redirect::route('budgets.index');
|
||||
} else {
|
||||
return Redirect::route('budgets.index.budget');
|
||||
}
|
||||
} else {
|
||||
Session::flash('error', 'Could not save the new budget');
|
||||
|
||||
return Redirect::route('budgets.create')->withInput()->withErrors($budget->errors());
|
||||
$limit->amount = $amount;
|
||||
$limit->save();
|
||||
Event::fire('limits.update', [$limit]);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Budget $budget
|
||||
*
|
||||
* @return $this|\Illuminate\Http\RedirectResponse
|
||||
*/
|
||||
public function update(Budget $budget)
|
||||
{
|
||||
$budget = $this->_repository->update($budget, Input::all());
|
||||
if ($budget->validate()) {
|
||||
Event::fire('budgets.update', [$budget]);
|
||||
Session::flash('success', 'Budget "' . $budget->name . '" updated.');
|
||||
|
||||
if (Input::get('from') == 'date') {
|
||||
return Redirect::route('budgets.index');
|
||||
} else {
|
||||
return Redirect::route('budgets.index.budget');
|
||||
}
|
||||
// try to find the limit repetition for this limit:
|
||||
$repetition = $limit->limitrepetitions()->first();
|
||||
if($repetition) {
|
||||
return Response::json(['name' => $budget->name,'repetition' => $repetition->id]);
|
||||
} else {
|
||||
Session::flash('error', 'Could not update budget: ' . $budget->errors()->first());
|
||||
|
||||
return Redirect::route('budgets.edit', $budget->id)->withInput()->withErrors($budget->errors());
|
||||
return Response::json(['name' => $budget->name,'repetition' => null]);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public function index()
|
||||
{
|
||||
|
||||
/** @var \Firefly\Helper\Preferences\PreferencesHelperInterface $preferences */
|
||||
$preferences = App::make('Firefly\Helper\Preferences\PreferencesHelperInterface');
|
||||
$date = Session::get('start');
|
||||
|
||||
/** @var \FireflyIII\Database\Budget $repos */
|
||||
$repos = App::make('FireflyIII\Database\Budget');
|
||||
$budgets = $repos->get();
|
||||
|
||||
// get the limits for the current month.
|
||||
$date = \Session::get('start');
|
||||
/** @var \Budget $budget */
|
||||
foreach ($budgets as $budget) {
|
||||
|
||||
$budget->spent = $repos->spentInMonth($budget, $date);
|
||||
$budget->pct = 0;
|
||||
$budget->limit = 0;
|
||||
|
||||
/** @var \Limit $limit */
|
||||
foreach ($budget->limits as $limit) {
|
||||
/** @var \LimitRepetition $repetition */
|
||||
foreach ($limit->limitrepetitions as $repetition) {
|
||||
if ($repetition->startdate == $date) {
|
||||
$budget->currentRep = $repetition;
|
||||
$budget->limit = floatval($repetition->amount);
|
||||
if($budget->limit > $budget->spent) {
|
||||
// not overspent:
|
||||
$budget->pct = 30;
|
||||
} else {
|
||||
$budget->pct = 50;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$budgetAmount = $preferences->get('budgetIncomeTotal' . $date->format('FY'), 1000);
|
||||
|
||||
return View::make('budgets.index', compact('budgets'))->with('budgetAmount', $budgetAmount);
|
||||
}
|
||||
|
||||
public function updateIncome()
|
||||
{
|
||||
$date = Session::get('start');
|
||||
/** @var \Firefly\Helper\Preferences\PreferencesHelperInterface $preferences */
|
||||
$preferences = App::make('Firefly\Helper\Preferences\PreferencesHelperInterface');
|
||||
$budgetAmount = $preferences->get('budgetIncomeTotal' . $date->format('FY'), 1000);
|
||||
return View::make('budgets.income')->with('amount', $budgetAmount)->with('date', $date);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
//
|
||||
// public function create()
|
||||
// {
|
||||
// throw new NotImplementedException;
|
||||
//// $periods = \Config::get('firefly.periods_to_text');
|
||||
////
|
||||
//// return View::make('budgets.create')->with('periods', $periods)->with('subTitle', 'Create a new budget');
|
||||
// }
|
||||
//
|
||||
// public function delete(Budget $budget)
|
||||
// {
|
||||
// throw new NotImplementedException;
|
||||
//// return View::make('budgets.delete')->with('budget', $budget)
|
||||
//// ->with('subTitle', 'Delete budget "' . $budget->name . '"');
|
||||
// }
|
||||
//
|
||||
// public function destroy(Budget $budget)
|
||||
// {
|
||||
// throw new NotImplementedException;
|
||||
//// // remove budget
|
||||
//// Event::fire('budgets.destroy', [$budget]); // just before deletion.
|
||||
//// $this->_repository->destroy($budget);
|
||||
//// Session::flash('success', 'The budget was deleted.');
|
||||
////
|
||||
//// // redirect:
|
||||
//// if (Input::get('from') == 'date') {
|
||||
//// return Redirect::route('budgets.index');
|
||||
//// }
|
||||
//// return Redirect::route('budgets.index.budget');
|
||||
//
|
||||
// }
|
||||
// public function edit(Budget $budget)
|
||||
// {
|
||||
// throw new NotImplementedException;
|
||||
//// return View::make('budgets.edit')->with('budget', $budget)
|
||||
//// ->with('subTitle', 'Edit budget "' . $budget->name . '"');
|
||||
//
|
||||
// }
|
||||
|
||||
// /**
|
||||
// * @return $this|\Illuminate\View\View
|
||||
// */
|
||||
// public function indexByBudget()
|
||||
// {
|
||||
// View::share('subTitleIcon', 'fa-folder-open');
|
||||
//
|
||||
// $budgets = $this->_repository->get();
|
||||
//
|
||||
// return View::make('budgets.indexByBudget')->with('budgets', $budgets)->with('today', new Carbon)
|
||||
// ->with('subTitle', 'Grouped by budget');
|
||||
//
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * @return $this
|
||||
// */
|
||||
// public function indexByDate()
|
||||
// {
|
||||
// View::share('subTitleIcon', 'fa-calendar');
|
||||
//
|
||||
// // get a list of dates by getting all repetitions:
|
||||
// $set = $this->_repository->get();
|
||||
// $budgets = $this->_budgets->organizeByDate($set);
|
||||
//
|
||||
// return View::make('budgets.indexByDate')->with('budgets', $budgets)
|
||||
// ->with('subTitle', 'Grouped by date');
|
||||
//
|
||||
//
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * Three use cases for this view:
|
||||
// *
|
||||
// * - Show everything.
|
||||
// * - Show a specific repetition.
|
||||
// * - Show everything shows NO repetition.
|
||||
// *
|
||||
// * @param Budget $budget
|
||||
// * @param LimitRepetition $repetition
|
||||
// *
|
||||
// * @return int
|
||||
// */
|
||||
// public function show(Budget $budget, \LimitRepetition $repetition = null)
|
||||
// {
|
||||
// $useSessionDates = Input::get('useSession') == 'true' ? true : false;
|
||||
// $view = null;
|
||||
// $title = null;
|
||||
// \Log::debug('Is envelope true? ' . (Input::get('noenvelope') == 'true'));
|
||||
// switch (true) {
|
||||
// case (!is_null($repetition)):
|
||||
// $data = $this->_budgets->organizeRepetition($repetition);
|
||||
// $view = 1;
|
||||
// $title = $budget->name . ', ' . $repetition->periodShow() . ', ' . mf(
|
||||
// $repetition->limit->amount,
|
||||
// false
|
||||
// );
|
||||
// break;
|
||||
// case (Input::get('noenvelope') == 'true'):
|
||||
// $data = $this->_budgets->outsideRepetitions($budget);
|
||||
// $view = 2;
|
||||
// $title = $budget->name . ', transactions outside an envelope';
|
||||
// break;
|
||||
// default:
|
||||
// $data = $this->_budgets->organizeRepetitions($budget, $useSessionDates);
|
||||
// $view = $useSessionDates ? 3 : 4;
|
||||
// $title = $useSessionDates ? $budget->name . ' in session period' : $budget->name;
|
||||
// break;
|
||||
// }
|
||||
//
|
||||
// return View::make('budgets.show')
|
||||
// ->with('budget', $budget)
|
||||
// ->with('repetitions', $data)
|
||||
// ->with('view', $view)
|
||||
// ->with('highlight', Input::get('highlight'))
|
||||
// ->with('useSessionDates', $useSessionDates)
|
||||
// ->with('subTitle', 'Overview for ' . $title);
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * @return \Illuminate\Http\RedirectResponse
|
||||
// */
|
||||
// public function store()
|
||||
// {
|
||||
//
|
||||
// $budget = $this->_repository->store(Input::all());
|
||||
// if ($budget->validate()) {
|
||||
// Event::fire('budgets.store', [$budget]);
|
||||
// Session::flash('success', 'Budget created!');
|
||||
//
|
||||
// if (Input::get('create') == '1') {
|
||||
// return Redirect::route('budgets.create', ['from' => Input::get('from')]);
|
||||
// }
|
||||
//
|
||||
// if (Input::get('from') == 'date') {
|
||||
// return Redirect::route('budgets.index');
|
||||
// } else {
|
||||
// return Redirect::route('budgets.index.budget');
|
||||
// }
|
||||
// } else {
|
||||
// Session::flash('error', 'Could not save the new budget');
|
||||
//
|
||||
// return Redirect::route('budgets.create')->withInput()->withErrors($budget->errors());
|
||||
// }
|
||||
//
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * @param Budget $budget
|
||||
// *
|
||||
// * @return $this|\Illuminate\Http\RedirectResponse
|
||||
// */
|
||||
// public function update(Budget $budget)
|
||||
// {
|
||||
// $budget = $this->_repository->update($budget, Input::all());
|
||||
// if ($budget->validate()) {
|
||||
// Event::fire('budgets.update', [$budget]);
|
||||
// Session::flash('success', 'Budget "' . $budget->name . '" updated.');
|
||||
//
|
||||
// if (Input::get('from') == 'date') {
|
||||
// return Redirect::route('budgets.index');
|
||||
// } else {
|
||||
// return Redirect::route('budgets.index.budget');
|
||||
// }
|
||||
// } else {
|
||||
// Session::flash('error', 'Could not update budget: ' . $budget->errors()->first());
|
||||
//
|
||||
// return Redirect::route('budgets.edit', $budget->id)->withInput()->withErrors($budget->errors());
|
||||
// }
|
||||
//
|
||||
// }
|
||||
|
||||
// public function nobudget($view = 'session') {
|
||||
// switch($view) {
|
||||
// default:
|
||||
// throw new FireflyException('Cannot show transactions without a budget for view "'.$view.'".');
|
||||
// break;
|
||||
// case 'session':
|
||||
// $start = Session::get('start');
|
||||
// $end = Session::get('end');
|
||||
// break;
|
||||
// }
|
||||
//
|
||||
// // Add expenses that have no budget:
|
||||
// $set = \Auth::user()->transactionjournals()->whereNotIn(
|
||||
// 'transaction_journals.id', function ($query) use ($start, $end) {
|
||||
// $query->select('transaction_journals.id')->from('transaction_journals')
|
||||
// ->leftJoin(
|
||||
// 'component_transaction_journal', 'component_transaction_journal.transaction_journal_id', '=',
|
||||
// 'transaction_journals.id'
|
||||
// )
|
||||
// ->leftJoin('components', 'components.id', '=', 'component_transaction_journal.component_id')
|
||||
// ->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
|
||||
// ->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
|
||||
// ->where('components.class', 'Budget');
|
||||
// }
|
||||
// )->before($end)->after($start)->get();
|
||||
//
|
||||
// return View::make('budgets.nobudget')
|
||||
// ->with('view', $view)
|
||||
// ->with('transactions',$set)
|
||||
// ->with('subTitle', 'Transactions without a budget');
|
||||
// }
|
||||
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user