mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-18 18:40:12 +00:00
This breaks everything budget-related.
This commit is contained in:
@@ -68,8 +68,8 @@ class BalanceReportHelper implements BalanceReportHelperInterface
|
|||||||
|
|
||||||
// build a balance header:
|
// build a balance header:
|
||||||
$header = new BalanceHeader;
|
$header = new BalanceHeader;
|
||||||
$budgets = $this->budgetRepository->getBudgetsAndLimitsInRange($start, $end);
|
$budgets = new Collection;// $this->budgetRepository->getBudgetsAndLimitsInRange($start, $end); // TODO BUDGET getBudgets
|
||||||
$spentData = $this->budgetRepository->spentPerBudgetPerAccount($budgets, $accounts, $start, $end);
|
$spentData = new Collection; // $this->budgetRepository->spentPerBudgetPerAccount($budgets, $accounts, $start, $end); TODO BUDGET journalsInPeriod
|
||||||
foreach ($accounts as $account) {
|
foreach ($accounts as $account) {
|
||||||
$header->addAccount($account);
|
$header->addAccount($account);
|
||||||
}
|
}
|
||||||
|
@@ -41,7 +41,7 @@ class BudgetReportHelper implements BudgetReportHelperInterface
|
|||||||
$repository = app(BudgetRepositoryInterface::class);
|
$repository = app(BudgetRepositoryInterface::class);
|
||||||
$set = $repository->getBudgets();
|
$set = $repository->getBudgets();
|
||||||
$allRepetitions = $repository->getAllBudgetLimitRepetitions($start, $end);
|
$allRepetitions = $repository->getAllBudgetLimitRepetitions($start, $end);
|
||||||
$allTotalSpent = $repository->spentAllPerDayForAccounts($accounts, $start, $end);
|
$allTotalSpent = '0'; //$repository->spentAllPerDayForAccounts($accounts, $start, $end);// TODO BUDGET MASSIVELY STUPID SPECIFIC METHOD
|
||||||
|
|
||||||
foreach ($set as $budget) {
|
foreach ($set as $budget) {
|
||||||
|
|
||||||
@@ -98,7 +98,7 @@ class BudgetReportHelper implements BudgetReportHelperInterface
|
|||||||
}
|
}
|
||||||
|
|
||||||
// stuff outside of budgets:
|
// stuff outside of budgets:
|
||||||
$noBudget = $repository->getWithoutBudgetSum($accounts, $start, $end);
|
$noBudget = '0'; //$repository->getWithoutBudgetSum($accounts, $start, $end); // TODO BUDGET journalsInPeriodWithoutBudget
|
||||||
$budgetLine = new BudgetLine;
|
$budgetLine = new BudgetLine;
|
||||||
$budgetLine->setOverspent($noBudget);
|
$budgetLine->setOverspent($noBudget);
|
||||||
$budgetLine->setSpent($noBudget);
|
$budgetLine->setSpent($noBudget);
|
||||||
@@ -124,7 +124,7 @@ class BudgetReportHelper implements BudgetReportHelperInterface
|
|||||||
$set = new Collection;
|
$set = new Collection;
|
||||||
/** @var Budget $budget */
|
/** @var Budget $budget */
|
||||||
foreach ($budgets as $budget) {
|
foreach ($budgets as $budget) {
|
||||||
$expenses = $repository->spentPerDay($budget, $start, $end, $accounts);
|
$expenses = [0]; // $repository->spentPerDay($budget, $start, $end, $accounts); // TODO BUDGET spentInPeriod
|
||||||
$total = strval(array_sum($expenses));
|
$total = strval(array_sum($expenses));
|
||||||
if (bccomp($total, '0') === -1) {
|
if (bccomp($total, '0') === -1) {
|
||||||
$set->push($budget);
|
$set->push($budget);
|
||||||
|
@@ -10,6 +10,7 @@ use FireflyIII\Models\Budget;
|
|||||||
use FireflyIII\Models\LimitRepetition;
|
use FireflyIII\Models\LimitRepetition;
|
||||||
use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
|
use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
|
||||||
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
|
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
|
||||||
|
use Illuminate\Pagination\LengthAwarePaginator;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Input;
|
use Input;
|
||||||
use Navigation;
|
use Navigation;
|
||||||
@@ -177,14 +178,16 @@ class BudgetController extends Controller
|
|||||||
/**
|
/**
|
||||||
* Do some cleanup:
|
* Do some cleanup:
|
||||||
*/
|
*/
|
||||||
$repository->cleanupBudgets();
|
// $repository->cleanupBudgets();
|
||||||
|
|
||||||
// loop the budgets:
|
// loop the budgets:
|
||||||
/** @var Budget $budget */
|
/** @var Budget $budget */
|
||||||
foreach ($budgets as $budget) {
|
foreach ($budgets as $budget) {
|
||||||
$budget->spent = $repository->balanceInPeriod($budget, $start, $end, $accounts);
|
$budget->spent = '0';//$repository->balanceInPeriod($budget, $start, $end, $accounts); // TODO BUDGET spentInPeriod
|
||||||
$budget->currentRep = $repository->getCurrentRepetition($budget, $repeatFreq, $start, $end);
|
$budget->currentRep = new LimitRepetition(
|
||||||
$budget->otherRepetitions = $repository->getValidRepetitions($budget, $start, $end, $budget->currentRep);
|
); // $repository->getCurrentRepetition($budget, $repeatFreq, $start, $end); // TODO BUDGET getBudgetLimitRepetitions
|
||||||
|
$budget->otherRepetitions = new Collection(
|
||||||
|
);//$repository->getValidRepetitions($budget, $start, $end, $budget->currentRep); // TODO BUDGET getBudgetLimitRepetitions
|
||||||
if (!is_null($budget->currentRep->id)) {
|
if (!is_null($budget->currentRep->id)) {
|
||||||
$budgeted = bcadd($budgeted, $budget->currentRep->amount);
|
$budgeted = bcadd($budgeted, $budget->currentRep->amount);
|
||||||
}
|
}
|
||||||
@@ -220,7 +223,7 @@ class BudgetController extends Controller
|
|||||||
|
|
||||||
$page = intval(Input::get('page')) == 0 ? 1 : intval(Input::get('page'));
|
$page = intval(Input::get('page')) == 0 ? 1 : intval(Input::get('page'));
|
||||||
$pageSize = Preferences::get('transactionPageSize', 50)->data;
|
$pageSize = Preferences::get('transactionPageSize', 50)->data;
|
||||||
$list = $repository->getWithoutBudget($start, $end, $page, $pageSize);
|
$list = new LengthAwarePaginator([], 0, $pageSize); // $repository->getWithoutBudget($start, $end, $page, $pageSize); // TODO BUDGET journalsInPeriodWithoutBudget
|
||||||
$subTitle = trans(
|
$subTitle = trans(
|
||||||
'firefly.without_budget_between',
|
'firefly.without_budget_between',
|
||||||
['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
|
['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
|
||||||
@@ -258,13 +261,15 @@ class BudgetController extends Controller
|
|||||||
public function show(BudgetRepositoryInterface $repository, Budget $budget)
|
public function show(BudgetRepositoryInterface $repository, Budget $budget)
|
||||||
{
|
{
|
||||||
$pageSize = Preferences::get('transactionPageSize', 50)->data;
|
$pageSize = Preferences::get('transactionPageSize', 50)->data;
|
||||||
$journals = $repository->getJournals($budget, new LimitRepetition, $pageSize);
|
$journals = new LengthAwarePaginator(
|
||||||
$start = $repository->firstActivity($budget);
|
[], 0, $pageSize
|
||||||
|
); //$repository->getJournals($budget, new LimitRepetition, $pageSize); // TODO BUDGET journalsInPeriod
|
||||||
|
$start = new Carbon; //$repository->firstActivity($budget); // TODO BUDGET getOldestJournal
|
||||||
$end = new Carbon;
|
$end = new Carbon;
|
||||||
$set = $budget->limitrepetitions()->orderBy('startdate', 'DESC')->get();
|
$set = $budget->limitrepetitions()->orderBy('startdate', 'DESC')->get();
|
||||||
$subTitle = e($budget->name);
|
$subTitle = e($budget->name);
|
||||||
$journals->setPath('/budgets/show/' . $budget->id);
|
$journals->setPath('/budgets/show/' . $budget->id);
|
||||||
$spentArray = $repository->spentPerDay($budget, $start, $end, new Collection);
|
$spentArray = []; //$repository->spentPerDay($budget, $start, $end, new Collection); // TODO BUDGET spentInPeriod
|
||||||
$limits = new Collection();
|
$limits = new Collection();
|
||||||
|
|
||||||
/** @var LimitRepetition $entry */
|
/** @var LimitRepetition $entry */
|
||||||
@@ -292,13 +297,13 @@ class BudgetController extends Controller
|
|||||||
}
|
}
|
||||||
|
|
||||||
$pageSize = Preferences::get('transactionPageSize', 50)->data;
|
$pageSize = Preferences::get('transactionPageSize', 50)->data;
|
||||||
$journals = $repository->getJournals($budget, $repetition, $pageSize);
|
$journals = new LengthAwarePaginator([], 0, $pageSize); // $repository->getJournals($budget, $repetition, $pageSize); // TODO BUDGET journalsInPeriod
|
||||||
$start = $repetition->startdate;
|
$start = $repetition->startdate;
|
||||||
$end = $repetition->enddate;
|
$end = $repetition->enddate;
|
||||||
$set = new Collection([$repetition]);
|
$set = new Collection([$repetition]);
|
||||||
$subTitle = trans('firefly.budget_in_month', ['name' => $budget->name, 'month' => $repetition->startdate->formatLocalized($this->monthFormat)]);
|
$subTitle = trans('firefly.budget_in_month', ['name' => $budget->name, 'month' => $repetition->startdate->formatLocalized($this->monthFormat)]);
|
||||||
$journals->setPath('/budgets/show/' . $budget->id . '/' . $repetition->id);
|
$journals->setPath('/budgets/show/' . $budget->id . '/' . $repetition->id);
|
||||||
$spentArray = $repository->spentPerDay($budget, $start, $end, new Collection);
|
$spentArray = []; //$repository->spentPerDay($budget, $start, $end, new Collection); // TODO BUDGET spentInPeriod
|
||||||
$limits = new Collection();
|
$limits = new Collection();
|
||||||
|
|
||||||
/** @var LimitRepetition $entry */
|
/** @var LimitRepetition $entry */
|
||||||
|
@@ -8,14 +8,9 @@ use FireflyIII\Generator\Chart\Budget\BudgetChartGeneratorInterface;
|
|||||||
use FireflyIII\Http\Controllers\Controller;
|
use FireflyIII\Http\Controllers\Controller;
|
||||||
use FireflyIII\Models\Budget;
|
use FireflyIII\Models\Budget;
|
||||||
use FireflyIII\Models\LimitRepetition;
|
use FireflyIII\Models\LimitRepetition;
|
||||||
use FireflyIII\Models\TransactionJournal;
|
|
||||||
use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
|
use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
|
||||||
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
|
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
|
||||||
use FireflyIII\Support\CacheProperties;
|
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Navigation;
|
|
||||||
use Preferences;
|
|
||||||
use Response;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class BudgetController
|
* Class BudgetController
|
||||||
@@ -48,45 +43,46 @@ class BudgetController extends Controller
|
|||||||
*/
|
*/
|
||||||
public function budget(BudgetRepositoryInterface $repository, Budget $budget)
|
public function budget(BudgetRepositoryInterface $repository, Budget $budget)
|
||||||
{
|
{
|
||||||
|
/**
|
||||||
// dates and times
|
* // dates and times
|
||||||
$first = $repository->getFirstBudgetLimitDate($budget);
|
* $first = $repository->getFirstBudgetLimitDate($budget);
|
||||||
$range = Preferences::get('viewRange', '1M')->data;
|
* $range = Preferences::get('viewRange', '1M')->data;
|
||||||
$last = session('end', new Carbon);
|
* $last = session('end', new Carbon);
|
||||||
|
*
|
||||||
// chart properties for cache:
|
* // chart properties for cache:
|
||||||
$cache = new CacheProperties();
|
* $cache = new CacheProperties();
|
||||||
$cache->addProperty($first);
|
* $cache->addProperty($first);
|
||||||
$cache->addProperty($last);
|
* $cache->addProperty($last);
|
||||||
$cache->addProperty('budget');
|
* $cache->addProperty('budget');
|
||||||
if ($cache->has()) {
|
* if ($cache->has()) {
|
||||||
|
*
|
||||||
//return Response::json($cache->get());
|
* //return Response::json($cache->get());
|
||||||
}
|
* }
|
||||||
|
*
|
||||||
$final = clone $last;
|
* $final = clone $last;
|
||||||
$final->addYears(2);
|
* $final->addYears(2);
|
||||||
$last = Navigation::endOfX($last, $range, $final);
|
* $last = Navigation::endOfX($last, $range, $final);
|
||||||
$entries = new Collection;
|
* $entries = new Collection;
|
||||||
// get all expenses:
|
* // get all expenses:
|
||||||
$spentArray = $repository->spentPerDay($budget, $first, $last, new Collection);
|
* $spentArray = $repository->spentPerDay($budget, $first, $last, new Collection);
|
||||||
|
*
|
||||||
while ($first < $last) {
|
* while ($first < $last) {
|
||||||
|
*
|
||||||
// periodspecific dates:
|
* // periodspecific dates:
|
||||||
$currentStart = Navigation::startOfPeriod($first, $range);
|
* $currentStart = Navigation::startOfPeriod($first, $range);
|
||||||
$currentEnd = Navigation::endOfPeriod($first, $range);
|
* $currentEnd = Navigation::endOfPeriod($first, $range);
|
||||||
$spent = $this->getSumOfRange($currentStart, $currentEnd, $spentArray);
|
* $spent = $this->getSumOfRange($currentStart, $currentEnd, $spentArray);
|
||||||
$entry = [$first, ($spent * -1)];
|
* $entry = [$first, ($spent * -1)];
|
||||||
|
*
|
||||||
$entries->push($entry);
|
* $entries->push($entry);
|
||||||
$first = Navigation::addPeriod($first, $range, 0);
|
* $first = Navigation::addPeriod($first, $range, 0);
|
||||||
}
|
* }
|
||||||
|
*
|
||||||
$data = $this->generator->budgetLimit($entries, 'month');
|
* $data = $this->generator->budgetLimit($entries, 'month');
|
||||||
$cache->store($data);
|
* $cache->store($data);
|
||||||
|
*
|
||||||
return Response::json($data);
|
* return Response::json($data);
|
||||||
|
* **/
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -100,42 +96,42 @@ class BudgetController extends Controller
|
|||||||
*/
|
*/
|
||||||
public function budgetLimit(BudgetRepositoryInterface $repository, Budget $budget, LimitRepetition $repetition)
|
public function budgetLimit(BudgetRepositoryInterface $repository, Budget $budget, LimitRepetition $repetition)
|
||||||
{
|
{
|
||||||
$start = clone $repetition->startdate;
|
/**
|
||||||
$end = $repetition->enddate;
|
* $start = clone $repetition->startdate;
|
||||||
|
* $end = $repetition->enddate;
|
||||||
// chart properties for cache:
|
*
|
||||||
$cache = new CacheProperties();
|
* // chart properties for cache:
|
||||||
$cache->addProperty($start);
|
* $cache = new CacheProperties();
|
||||||
$cache->addProperty($end);
|
* $cache->addProperty($start);
|
||||||
$cache->addProperty('budget');
|
* $cache->addProperty($end);
|
||||||
$cache->addProperty('limit');
|
* $cache->addProperty('budget');
|
||||||
$cache->addProperty($budget->id);
|
* $cache->addProperty('limit');
|
||||||
$cache->addProperty($repetition->id);
|
* $cache->addProperty($budget->id);
|
||||||
if ($cache->has()) {
|
* $cache->addProperty($repetition->id);
|
||||||
return Response::json($cache->get());
|
* if ($cache->has()) {
|
||||||
}
|
* return Response::json($cache->get());
|
||||||
|
* }
|
||||||
$set = $repository->spentPerDay($budget, $start, $end, new Collection);
|
*
|
||||||
$entries = new Collection;
|
* $set = $repository->spentPerDay($budget, $start, $end, new Collection);
|
||||||
$amount = $repetition->amount;
|
* $entries = new Collection;
|
||||||
|
* $amount = $repetition->amount;
|
||||||
// get sum (har har)!
|
*
|
||||||
while ($start <= $end) {
|
* // get sum (har har)!
|
||||||
$formatted = $start->format('Y-m-d');
|
* while ($start <= $end) {
|
||||||
$sum = $set[$formatted] ?? '0';
|
* $formatted = $start->format('Y-m-d');
|
||||||
|
* $sum = $set[$formatted] ?? '0';
|
||||||
/*
|
*
|
||||||
* Sum of expenses on this day:
|
* // Sum of expenses on this day:
|
||||||
*/
|
* $amount = round(bcadd(strval($amount), $sum), 2);
|
||||||
$amount = round(bcadd(strval($amount), $sum), 2);
|
* $entries->push([clone $start, $amount]);
|
||||||
$entries->push([clone $start, $amount]);
|
* $start->addDay();
|
||||||
$start->addDay();
|
* }
|
||||||
}
|
*
|
||||||
|
* $data = $this->generator->budgetLimit($entries, 'monthAndDay');
|
||||||
$data = $this->generator->budgetLimit($entries, 'monthAndDay');
|
* $cache->store($data);
|
||||||
$cache->store($data);
|
*
|
||||||
|
* return Response::json($data);
|
||||||
return Response::json($data);
|
**/
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -150,75 +146,77 @@ class BudgetController extends Controller
|
|||||||
*/
|
*/
|
||||||
public function frontpage(BudgetRepositoryInterface $repository, ARI $accountRepository)
|
public function frontpage(BudgetRepositoryInterface $repository, ARI $accountRepository)
|
||||||
{
|
{
|
||||||
$start = session('start', Carbon::now()->startOfMonth());
|
/**
|
||||||
$end = session('end', Carbon::now()->endOfMonth());
|
* $start = session('start', Carbon::now()->startOfMonth());
|
||||||
|
* $end = session('end', Carbon::now()->endOfMonth());
|
||||||
// chart properties for cache:
|
*
|
||||||
$cache = new CacheProperties();
|
* // chart properties for cache:
|
||||||
$cache->addProperty($start);
|
* $cache = new CacheProperties();
|
||||||
$cache->addProperty($end);
|
* $cache->addProperty($start);
|
||||||
$cache->addProperty('budget');
|
* $cache->addProperty($end);
|
||||||
$cache->addProperty('all');
|
* $cache->addProperty('budget');
|
||||||
if ($cache->has()) {
|
* $cache->addProperty('all');
|
||||||
return Response::json($cache->get());
|
* if ($cache->has()) {
|
||||||
}
|
* return Response::json($cache->get());
|
||||||
|
* }
|
||||||
$budgets = $repository->getBudgetsAndLimitsInRange($start, $end);
|
*
|
||||||
$allEntries = new Collection;
|
* $budgets = $repository->getBudgetsAndLimitsInRange($start, $end);
|
||||||
$accounts = $accountRepository->getAccounts(['Default account', 'Asset account', 'Cash account']);
|
* $allEntries = new Collection;
|
||||||
$format = strval(trans('config.month_and_day'));
|
* $accounts = $accountRepository->getAccounts(['Default account', 'Asset account', 'Cash account']);
|
||||||
|
* $format = strval(trans('config.month_and_day'));
|
||||||
|
*
|
||||||
/** @var Budget $budget */
|
*
|
||||||
foreach ($budgets as $budget) {
|
* // @var Budget $budget
|
||||||
// we already have amount, startdate and enddate.
|
* foreach ($budgets as $budget) {
|
||||||
// if this "is" a limit repetition (as opposed to a budget without one entirely)
|
* // we already have amount, startdate and enddate.
|
||||||
// depends on whether startdate and enddate are null.
|
* // if this "is" a limit repetition (as opposed to a budget without one entirely)
|
||||||
$name = $budget->name;
|
* // depends on whether startdate and enddate are null.
|
||||||
if (is_null($budget->startdate) && is_null($budget->enddate)) {
|
* $name = $budget->name;
|
||||||
$currentStart = clone $start;
|
* if (is_null($budget->startdate) && is_null($budget->enddate)) {
|
||||||
$currentEnd = clone $end;
|
* $currentStart = clone $start;
|
||||||
$expenses = $repository->balanceInPeriod($budget, $currentStart, $currentEnd, $accounts);
|
* $currentEnd = clone $end;
|
||||||
$amount = '0';
|
* $expenses = $repository->balanceInPeriod($budget, $currentStart, $currentEnd, $accounts);
|
||||||
$left = '0';
|
* $amount = '0';
|
||||||
$spent = $expenses;
|
* $left = '0';
|
||||||
$overspent = '0';
|
* $spent = $expenses;
|
||||||
} else {
|
* $overspent = '0';
|
||||||
|
* } else {
|
||||||
// update the display name if the range
|
*
|
||||||
// of the limit repetition does not match
|
* // update the display name if the range
|
||||||
// the session's range (for clarity).
|
* // of the limit repetition does not match
|
||||||
if (
|
* // the session's range (for clarity).
|
||||||
($start->format('Y-m-d') != $budget->startdate->format('Y-m-d'))
|
* if (
|
||||||
|| ($end->format('Y-m-d') != $budget->enddate->format('Y-m-d'))
|
* ($start->format('Y-m-d') != $budget->startdate->format('Y-m-d'))
|
||||||
) {
|
* || ($end->format('Y-m-d') != $budget->enddate->format('Y-m-d'))
|
||||||
$name .= ' ' . trans(
|
* ) {
|
||||||
'firefly.between_dates',
|
* $name .= ' ' . trans(
|
||||||
[
|
* 'firefly.between_dates',
|
||||||
'start' => $budget->startdate->formatLocalized($format),
|
* [
|
||||||
'end' => $budget->startdate->formatLocalized($format),
|
* 'start' => $budget->startdate->formatLocalized($format),
|
||||||
]
|
* 'end' => $budget->startdate->formatLocalized($format),
|
||||||
);
|
* ]
|
||||||
}
|
* );
|
||||||
$currentStart = clone $budget->startdate;
|
* }
|
||||||
$currentEnd = clone $budget->enddate;
|
* $currentStart = clone $budget->startdate;
|
||||||
$expenses = $repository->balanceInPeriod($budget, $currentStart, $currentEnd, $accounts);
|
* $currentEnd = clone $budget->enddate;
|
||||||
$amount = $budget->amount;
|
* $expenses = $repository->balanceInPeriod($budget, $currentStart, $currentEnd, $accounts);
|
||||||
// smaller than 1 means spent MORE than budget allows.
|
* $amount = $budget->amount;
|
||||||
$left = bccomp(bcadd($budget->amount, $expenses), '0') < 1 ? '0' : bcadd($budget->amount, $expenses);
|
* // smaller than 1 means spent MORE than budget allows.
|
||||||
$spent = bccomp(bcadd($budget->amount, $expenses), '0') < 1 ? bcmul($amount, '-1') : $expenses;
|
* $left = bccomp(bcadd($budget->amount, $expenses), '0') < 1 ? '0' : bcadd($budget->amount, $expenses);
|
||||||
$overspent = bccomp(bcadd($budget->amount, $expenses), '0') < 1 ? bcadd($budget->amount, $expenses) : '0';
|
* $spent = bccomp(bcadd($budget->amount, $expenses), '0') < 1 ? bcmul($amount, '-1') : $expenses;
|
||||||
}
|
* $overspent = bccomp(bcadd($budget->amount, $expenses), '0') < 1 ? bcadd($budget->amount, $expenses) : '0';
|
||||||
|
* }
|
||||||
$allEntries->push([$name, $left, $spent, $overspent, $amount, $expenses]);
|
*
|
||||||
}
|
* $allEntries->push([$name, $left, $spent, $overspent, $amount, $expenses]);
|
||||||
|
* }
|
||||||
$noBudgetExpenses = $repository->getWithoutBudgetSum($accounts, $start, $end);
|
*
|
||||||
$allEntries->push([trans('firefly.no_budget'), '0', '0', $noBudgetExpenses, '0', '0']);
|
* $noBudgetExpenses = $repository->getWithoutBudgetSum($accounts, $start, $end);
|
||||||
$data = $this->generator->frontpage($allEntries);
|
* $allEntries->push([trans('firefly.no_budget'), '0', '0', $noBudgetExpenses, '0', '0']);
|
||||||
$cache->store($data);
|
* $data = $this->generator->frontpage($allEntries);
|
||||||
|
* $cache->store($data);
|
||||||
return Response::json($data);
|
*
|
||||||
|
* return Response::json($data);
|
||||||
|
**/
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -235,73 +233,72 @@ class BudgetController extends Controller
|
|||||||
*/
|
*/
|
||||||
public function multiYear(BudgetRepositoryInterface $repository, string $reportType, Carbon $start, Carbon $end, Collection $accounts, Collection $budgets)
|
public function multiYear(BudgetRepositoryInterface $repository, string $reportType, Carbon $start, Carbon $end, Collection $accounts, Collection $budgets)
|
||||||
{
|
{
|
||||||
// chart properties for cache:
|
/**
|
||||||
$cache = new CacheProperties();
|
* // chart properties for cache:
|
||||||
$cache->addProperty($reportType);
|
* $cache = new CacheProperties();
|
||||||
$cache->addProperty($start);
|
* $cache->addProperty($reportType);
|
||||||
$cache->addProperty($end);
|
* $cache->addProperty($start);
|
||||||
$cache->addProperty($accounts);
|
* $cache->addProperty($end);
|
||||||
$cache->addProperty($budgets);
|
* $cache->addProperty($accounts);
|
||||||
$cache->addProperty('multiYearBudget');
|
* $cache->addProperty($budgets);
|
||||||
|
* $cache->addProperty('multiYearBudget');
|
||||||
if ($cache->has()) {
|
*
|
||||||
return Response::json($cache->get());
|
* if ($cache->has()) {
|
||||||
}
|
* return Response::json($cache->get());
|
||||||
|
* }
|
||||||
/*
|
*
|
||||||
* Get the budgeted amounts for each budgets in each year.
|
* // Get the budgeted amounts for each budgets in each year.
|
||||||
*/
|
* $budgetedSet = $repository->getBudgetedPerYear($budgets, $start, $end);
|
||||||
$budgetedSet = $repository->getBudgetedPerYear($budgets, $start, $end);
|
* $budgetedArray = [];
|
||||||
$budgetedArray = [];
|
* // @var Budget $entry
|
||||||
/** @var Budget $entry */
|
* foreach ($budgetedSet as $entry) {
|
||||||
foreach ($budgetedSet as $entry) {
|
* $budgetedArray[$entry->id][$entry->dateFormatted] = $entry->budgeted;
|
||||||
$budgetedArray[$entry->id][$entry->dateFormatted] = $entry->budgeted;
|
* }
|
||||||
}
|
*
|
||||||
|
* $set = $repository->getBudgetsAndExpensesPerYear($budgets, $accounts, $start, $end);
|
||||||
$set = $repository->getBudgetsAndExpensesPerYear($budgets, $accounts, $start, $end);
|
* $entries = new Collection;
|
||||||
$entries = new Collection;
|
* // go by budget, not by year.
|
||||||
// go by budget, not by year.
|
* // @var Budget $budget
|
||||||
/** @var Budget $budget */
|
* foreach ($budgets as $budget) {
|
||||||
foreach ($budgets as $budget) {
|
* $entry = ['name' => '', 'spent' => [], 'budgeted' => []];
|
||||||
$entry = ['name' => '', 'spent' => [], 'budgeted' => []];
|
* $id = $budget->id;
|
||||||
$id = $budget->id;
|
* $currentStart = clone $start;
|
||||||
$currentStart = clone $start;
|
* while ($currentStart < $end) {
|
||||||
while ($currentStart < $end) {
|
* // fix the date:
|
||||||
// fix the date:
|
* $currentEnd = clone $currentStart;
|
||||||
$currentEnd = clone $currentStart;
|
* $currentEnd->endOfYear();
|
||||||
$currentEnd->endOfYear();
|
*
|
||||||
|
* // basic information:
|
||||||
// basic information:
|
* $year = $currentStart->year;
|
||||||
$year = $currentStart->year;
|
* $entry['name'] = $budget->name ?? (string)trans('firefly.no_budget');
|
||||||
$entry['name'] = $budget->name ?? (string)trans('firefly.no_budget');
|
* $spent = 0;
|
||||||
$spent = 0;
|
* // this might be a good moment to collect no budget stuff.
|
||||||
// this might be a good moment to collect no budget stuff.
|
* if (is_null($budget->id)) {
|
||||||
if (is_null($budget->id)) {
|
* // get without budget sum in range:
|
||||||
// get without budget sum in range:
|
* $spent = $repository->getWithoutBudgetSum($accounts, $currentStart, $currentEnd) * -1;
|
||||||
$spent = $repository->getWithoutBudgetSum($accounts, $currentStart, $currentEnd) * -1;
|
* } else {
|
||||||
} else {
|
* if (isset($set[$id]['entries'][$year])) {
|
||||||
if (isset($set[$id]['entries'][$year])) {
|
* $spent = $set[$id]['entries'][$year] * -1;
|
||||||
$spent = $set[$id]['entries'][$year] * -1;
|
* }
|
||||||
}
|
* }
|
||||||
}
|
*
|
||||||
|
* $budgeted = $budgetedArray[$id][$year] ?? '0';
|
||||||
$budgeted = $budgetedArray[$id][$year] ?? '0';
|
* $entry['spent'][$year] = $spent;
|
||||||
$entry['spent'][$year] = $spent;
|
* $entry['budgeted'][$year] = round($budgeted, 2);
|
||||||
$entry['budgeted'][$year] = round($budgeted, 2);
|
*
|
||||||
|
*
|
||||||
|
* // jump to next year.
|
||||||
// jump to next year.
|
* $currentStart = clone $currentEnd;
|
||||||
$currentStart = clone $currentEnd;
|
* $currentStart->addDay();
|
||||||
$currentStart->addDay();
|
* }
|
||||||
}
|
* $entries->push($entry);
|
||||||
$entries->push($entry);
|
* }
|
||||||
}
|
* // generate chart with data:
|
||||||
// generate chart with data:
|
* $data = $this->generator->multiYear($entries);
|
||||||
$data = $this->generator->multiYear($entries);
|
* $cache->store($data);
|
||||||
$cache->store($data);
|
*
|
||||||
|
* return Response::json($data);
|
||||||
return Response::json($data);
|
**/
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -315,58 +312,60 @@ class BudgetController extends Controller
|
|||||||
*/
|
*/
|
||||||
public function period(Budget $budget, string $reportType, Carbon $start, Carbon $end, Collection $accounts)
|
public function period(Budget $budget, string $reportType, Carbon $start, Carbon $end, Collection $accounts)
|
||||||
{
|
{
|
||||||
// chart properties for cache:
|
/**
|
||||||
$cache = new CacheProperties();
|
* // chart properties for cache:
|
||||||
$cache->addProperty($start);
|
* $cache = new CacheProperties();
|
||||||
$cache->addProperty($end);
|
* $cache->addProperty($start);
|
||||||
$cache->addProperty($reportType);
|
* $cache->addProperty($end);
|
||||||
$cache->addProperty($accounts);
|
* $cache->addProperty($reportType);
|
||||||
$cache->addProperty($budget->id);
|
* $cache->addProperty($accounts);
|
||||||
$cache->addProperty('budget');
|
* $cache->addProperty($budget->id);
|
||||||
$cache->addProperty('period');
|
* $cache->addProperty('budget');
|
||||||
if ($cache->has()) {
|
* $cache->addProperty('period');
|
||||||
return Response::json($cache->get());
|
* if ($cache->has()) {
|
||||||
}
|
* return Response::json($cache->get());
|
||||||
|
* }
|
||||||
/** @var BudgetRepositoryInterface $repository */
|
*
|
||||||
$repository = app(BudgetRepositoryInterface::class);
|
* // @var BudgetRepositoryInterface $repository
|
||||||
// loop over period, add by users range:
|
* $repository = app(BudgetRepositoryInterface::class);
|
||||||
$current = clone $start;
|
* // loop over period, add by users range:
|
||||||
$viewRange = Preferences::get('viewRange', '1M')->data;
|
* $current = clone $start;
|
||||||
$set = new Collection;
|
* $viewRange = Preferences::get('viewRange', '1M')->data;
|
||||||
while ($current < $end) {
|
* $set = new Collection;
|
||||||
$currentStart = clone $current;
|
* while ($current < $end) {
|
||||||
$currentEnd = Navigation::endOfPeriod($currentStart, $viewRange);
|
* $currentStart = clone $current;
|
||||||
|
* $currentEnd = Navigation::endOfPeriod($currentStart, $viewRange);
|
||||||
// get all budget limits and their repetitions.
|
*
|
||||||
$reps = $repository->getAllBudgetLimitRepetitions($currentStart, $currentEnd, $budget);
|
* // get all budget limits and their repetitions.
|
||||||
$budgeted = $reps->sum('amount');
|
* $reps = $repository->getAllBudgetLimitRepetitions($currentStart, $currentEnd, $budget);
|
||||||
$perBudget = $repository->spentPerBudgetPerAccount(new Collection([$budget]), $accounts, $currentStart, $currentEnd);
|
* $budgeted = $reps->sum('amount');
|
||||||
// includes null, so filter!
|
* $perBudget = $repository->spentPerBudgetPerAccount(new Collection([$budget]), $accounts, $currentStart, $currentEnd);
|
||||||
$perBudget = $perBudget->filter(
|
* // includes null, so filter!
|
||||||
function (TransactionJournal $journal) use ($budget) {
|
* $perBudget = $perBudget->filter(
|
||||||
if (intval($journal->budget_id) === $budget->id) {
|
* function (TransactionJournal $journal) use ($budget) {
|
||||||
return $journal;
|
* if (intval($journal->budget_id) === $budget->id) {
|
||||||
}
|
* return $journal;
|
||||||
}
|
* }
|
||||||
);
|
* }
|
||||||
|
* );
|
||||||
|
*
|
||||||
$spent = $perBudget->sum('spent');
|
*
|
||||||
|
* $spent = $perBudget->sum('spent');
|
||||||
$entry = [
|
*
|
||||||
'date' => clone $currentStart,
|
* $entry = [
|
||||||
'budgeted' => $budgeted,
|
* 'date' => clone $currentStart,
|
||||||
'spent' => $spent,
|
* 'budgeted' => $budgeted,
|
||||||
];
|
* 'spent' => $spent,
|
||||||
$set->push($entry);
|
* ];
|
||||||
$currentEnd->addDay();
|
* $set->push($entry);
|
||||||
$current = clone $currentEnd;
|
* $currentEnd->addDay();
|
||||||
}
|
* $current = clone $currentEnd;
|
||||||
$data = $this->generator->period($set, $viewRange);
|
* }
|
||||||
$cache->store($data);
|
* $data = $this->generator->period($set, $viewRange);
|
||||||
|
* $cache->store($data);
|
||||||
return Response::json($data);
|
*
|
||||||
|
* return Response::json($data);
|
||||||
|
*/
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -382,52 +381,54 @@ class BudgetController extends Controller
|
|||||||
*/
|
*/
|
||||||
public function year(BudgetRepositoryInterface $repository, string $reportType, Carbon $start, Carbon $end, Collection $accounts)
|
public function year(BudgetRepositoryInterface $repository, string $reportType, Carbon $start, Carbon $end, Collection $accounts)
|
||||||
{
|
{
|
||||||
// chart properties for cache:
|
/**
|
||||||
$cache = new CacheProperties();
|
* // chart properties for cache:
|
||||||
$cache->addProperty($start);
|
* $cache = new CacheProperties();
|
||||||
$cache->addProperty($end);
|
* $cache->addProperty($start);
|
||||||
$cache->addProperty($reportType);
|
* $cache->addProperty($end);
|
||||||
$cache->addProperty($accounts);
|
* $cache->addProperty($reportType);
|
||||||
$cache->addProperty('budget');
|
* $cache->addProperty($accounts);
|
||||||
$cache->addProperty('year');
|
* $cache->addProperty('budget');
|
||||||
if ($cache->has()) {
|
* $cache->addProperty('year');
|
||||||
return Response::json($cache->get());
|
* if ($cache->has()) {
|
||||||
}
|
* return Response::json($cache->get());
|
||||||
|
* }
|
||||||
$budgetInformation = $repository->getBudgetsAndExpensesPerMonth($accounts, $start, $end);
|
*
|
||||||
$budgets = new Collection;
|
* $budgetInformation = $repository->getBudgetsAndExpensesPerMonth($accounts, $start, $end);
|
||||||
$entries = new Collection;
|
* $budgets = new Collection;
|
||||||
|
* $entries = new Collection;
|
||||||
/** @var array $row */
|
*
|
||||||
foreach ($budgetInformation as $row) {
|
* // @var array $row
|
||||||
$budgets->push($row['budget']);
|
* foreach ($budgetInformation as $row) {
|
||||||
}
|
* $budgets->push($row['budget']);
|
||||||
while ($start < $end) {
|
* }
|
||||||
// month is the current end of the period:
|
* while ($start < $end) {
|
||||||
$month = clone $start;
|
* // month is the current end of the period:
|
||||||
$month->endOfMonth();
|
* $month = clone $start;
|
||||||
$row = [clone $start];
|
* $month->endOfMonth();
|
||||||
$dateFormatted = $start->format('Y-m');
|
* $row = [clone $start];
|
||||||
|
* $dateFormatted = $start->format('Y-m');
|
||||||
// each budget, check if there is an entry for this month:
|
*
|
||||||
/** @var array $row */
|
* // each budget, check if there is an entry for this month:
|
||||||
foreach ($budgetInformation as $budgetRow) {
|
* // @var array $row
|
||||||
$spent = 0; // nothing spent.
|
* foreach ($budgetInformation as $budgetRow) {
|
||||||
if (isset($budgetRow['entries'][$dateFormatted])) {
|
* $spent = 0; // nothing spent.
|
||||||
$spent = $budgetRow['entries'][$dateFormatted] * -1; // to fit array
|
* if (isset($budgetRow['entries'][$dateFormatted])) {
|
||||||
}
|
* $spent = $budgetRow['entries'][$dateFormatted] * -1; // to fit array
|
||||||
$row[] = $spent;
|
* }
|
||||||
}
|
* $row[] = $spent;
|
||||||
|
* }
|
||||||
// add "no budget" thing.
|
*
|
||||||
$row[] = round(bcmul($repository->getWithoutBudgetSum($accounts, $start, $month), '-1'), 4);
|
* // add "no budget" thing.
|
||||||
|
* $row[] = round(bcmul($repository->getWithoutBudgetSum($accounts, $start, $month), '-1'), 4);
|
||||||
$entries->push($row);
|
*
|
||||||
$start->endOfMonth()->addDay();
|
* $entries->push($row);
|
||||||
}
|
* $start->endOfMonth()->addDay();
|
||||||
$data = $this->generator->year($budgets, $entries);
|
* }
|
||||||
$cache->store($data);
|
* $data = $this->generator->year($budgets, $entries);
|
||||||
|
* $cache->store($data);
|
||||||
return Response::json($data);
|
*
|
||||||
|
* return Response::json($data);
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -22,6 +22,7 @@ use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
|
|||||||
use FireflyIII\Repositories\Category\SingleCategoryRepositoryInterface;
|
use FireflyIII\Repositories\Category\SingleCategoryRepositoryInterface;
|
||||||
use FireflyIII\Support\Binder\AccountList;
|
use FireflyIII\Support\Binder\AccountList;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
use InvalidArgumentException;
|
use InvalidArgumentException;
|
||||||
use Response;
|
use Response;
|
||||||
use View;
|
use View;
|
||||||
@@ -93,15 +94,15 @@ class ReportController extends Controller
|
|||||||
|
|
||||||
switch (true) {
|
switch (true) {
|
||||||
case ($role === BalanceLine::ROLE_DEFAULTROLE && !is_null($budget->id)):
|
case ($role === BalanceLine::ROLE_DEFAULTROLE && !is_null($budget->id)):
|
||||||
$journals = $budgetRepository->expensesSplit($budget, $account, $attributes['startDate'], $attributes['endDate']);
|
$journals = new Collection;// $budgetRepository->expensesSplit($budget, $account, $attributes['startDate'], $attributes['endDate']);// TODO BUDGET journalsInPeriod
|
||||||
break;
|
break;
|
||||||
case ($role === BalanceLine::ROLE_DEFAULTROLE && is_null($budget->id)):
|
case ($role === BalanceLine::ROLE_DEFAULTROLE && is_null($budget->id)):
|
||||||
$budget->name = strval(trans('firefly.no_budget'));
|
$budget->name = strval(trans('firefly.no_budget'));
|
||||||
$journals = $budgetRepository->getAllWithoutBudget($account, $attributes['accounts'], $attributes['startDate'], $attributes['endDate']);
|
$journals = new Collection;// $budgetRepository->getAllWithoutBudget($account, $attributes['accounts'], $attributes['startDate'], $attributes['endDate']); // TODO BUDGET journalsInPeriodWithoutBudget
|
||||||
break;
|
break;
|
||||||
case ($role === BalanceLine::ROLE_DIFFROLE):
|
case ($role === BalanceLine::ROLE_DIFFROLE):
|
||||||
// journals no budget, not corrected by a tag.
|
// journals no budget, not corrected by a tag.
|
||||||
$journals = $budgetRepository->getAllWithoutBudget($account, $attributes['accounts'], $attributes['startDate'], $attributes['endDate']);
|
$journals = new Collection; //$budgetRepository->getAllWithoutBudget($account, $attributes['accounts'], $attributes['startDate'], $attributes['endDate']); // TODO BUDGET journalsInPeriodWithoutBudget
|
||||||
$budget->name = strval(trans('firefly.leftUnbalanced'));
|
$budget->name = strval(trans('firefly.leftUnbalanced'));
|
||||||
$journals = $journals->filter(
|
$journals = $journals->filter(
|
||||||
function (TransactionJournal $journal) {
|
function (TransactionJournal $journal) {
|
||||||
@@ -137,10 +138,10 @@ class ReportController extends Controller
|
|||||||
$repository = app(BudgetRepositoryInterface::class);
|
$repository = app(BudgetRepositoryInterface::class);
|
||||||
$budget = $repository->find(intval($attributes['budgetId']));
|
$budget = $repository->find(intval($attributes['budgetId']));
|
||||||
if (is_null($budget->id)) {
|
if (is_null($budget->id)) {
|
||||||
$journals = $repository->getWithoutBudgetForAccounts($attributes['accounts'], $attributes['startDate'], $attributes['endDate']);
|
$journals = new Collection;// $repository->getWithoutBudgetForAccounts($attributes['accounts'], $attributes['startDate'], $attributes['endDate']); // TODO BUDGET journalsInPeriodWithoutBudget
|
||||||
} else {
|
} else {
|
||||||
// get all expenses in budget in period:
|
// get all expenses in budget in period:
|
||||||
$journals = $repository->getExpenses($budget, $attributes['accounts'], $attributes['startDate'], $attributes['endDate']);
|
$journals = new Collection; //$repository->getExpenses($budget, $attributes['accounts'], $attributes['startDate'], $attributes['endDate']); // TODO BUDGET journalsInPeriod
|
||||||
}
|
}
|
||||||
|
|
||||||
$view = view('popup.report.budget-spent-amount', compact('journals', 'budget'))->render();
|
$view = view('popup.report.budget-spent-amount', compact('journals', 'budget'))->render();
|
||||||
|
File diff suppressed because it is too large
Load Diff
@@ -4,11 +4,8 @@ declare(strict_types = 1);
|
|||||||
namespace FireflyIII\Repositories\Budget;
|
namespace FireflyIII\Repositories\Budget;
|
||||||
|
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use FireflyIII\Models\Account;
|
|
||||||
use FireflyIII\Models\Budget;
|
use FireflyIII\Models\Budget;
|
||||||
use FireflyIII\Models\BudgetLimit;
|
use FireflyIII\Models\BudgetLimit;
|
||||||
use FireflyIII\Models\LimitRepetition;
|
|
||||||
use Illuminate\Pagination\LengthAwarePaginator;
|
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -19,23 +16,23 @@ use Illuminate\Support\Collection;
|
|||||||
interface BudgetRepositoryInterface
|
interface BudgetRepositoryInterface
|
||||||
{
|
{
|
||||||
|
|
||||||
/**
|
// /**
|
||||||
*
|
// *
|
||||||
* Same as ::spentInPeriod but corrects journals for a set of accounts
|
// * Same as ::spentInPeriod but corrects journals for a set of accounts
|
||||||
*
|
// *
|
||||||
* @param Budget $budget
|
// * @param Budget $budget
|
||||||
* @param Carbon $start
|
// * @param Carbon $start
|
||||||
* @param Carbon $end
|
// * @param Carbon $end
|
||||||
* @param Collection $accounts
|
// * @param Collection $accounts
|
||||||
*
|
// *
|
||||||
* @return string
|
// * @return string
|
||||||
*/
|
// */
|
||||||
public function balanceInPeriod(Budget $budget, Carbon $start, Carbon $end, Collection $accounts);
|
// public function balanceInPeriod(Budget $budget, Carbon $start, Carbon $end, Collection $accounts);
|
||||||
|
|
||||||
/**
|
// /**
|
||||||
* @return bool
|
// * @return bool
|
||||||
*/
|
// */
|
||||||
public function cleanupBudgets(): bool;
|
// public function cleanupBudgets(): bool;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param Budget $budget
|
* @param Budget $budget
|
||||||
@@ -44,15 +41,15 @@ interface BudgetRepositoryInterface
|
|||||||
*/
|
*/
|
||||||
public function destroy(Budget $budget): bool;
|
public function destroy(Budget $budget): bool;
|
||||||
|
|
||||||
/**
|
// /**
|
||||||
* @param Budget $budget
|
// * @param Budget $budget
|
||||||
* @param Account $account
|
// * @param Account $account
|
||||||
* @param Carbon $start
|
// * @param Carbon $start
|
||||||
* @param Carbon $end
|
// * @param Carbon $end
|
||||||
*
|
// *
|
||||||
* @return Collection
|
// * @return Collection
|
||||||
*/
|
// */
|
||||||
public function expensesSplit(Budget $budget, Account $account, Carbon $start, Carbon $end): Collection;
|
// public function expensesSplit(Budget $budget, Account $account, Carbon $start, Carbon $end): Collection;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Find a budget.
|
* Find a budget.
|
||||||
@@ -63,12 +60,12 @@ interface BudgetRepositoryInterface
|
|||||||
*/
|
*/
|
||||||
public function find(int $budgetId): Budget;
|
public function find(int $budgetId): Budget;
|
||||||
|
|
||||||
/**
|
// /**
|
||||||
* @param Budget $budget
|
// * @param Budget $budget
|
||||||
*
|
// *
|
||||||
* @return Carbon
|
// * @return Carbon
|
||||||
*/
|
// */
|
||||||
public function firstActivity(Budget $budget): Carbon;
|
// public function firstActivity(Budget $budget): Carbon;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return Collection
|
* @return Collection
|
||||||
@@ -78,209 +75,208 @@ interface BudgetRepositoryInterface
|
|||||||
/**
|
/**
|
||||||
* @param Carbon $start
|
* @param Carbon $start
|
||||||
* @param Carbon $end
|
* @param Carbon $end
|
||||||
* @param Budget $budget
|
|
||||||
*
|
*
|
||||||
* @return Collection
|
* @return Collection
|
||||||
*/
|
*/
|
||||||
public function getAllBudgetLimitRepetitions(Carbon $start, Carbon $end, Budget $budget = null): Collection;
|
public function getAllBudgetLimitRepetitions(Carbon $start, Carbon $end): Collection;
|
||||||
|
|
||||||
/**
|
// /**
|
||||||
* @param Account $account
|
// * @param Account $account
|
||||||
* @param Collection $accounts
|
// * @param Collection $accounts
|
||||||
* @param Carbon $start
|
// * @param Carbon $start
|
||||||
* @param Carbon $end
|
// * @param Carbon $end
|
||||||
*
|
// *
|
||||||
* @return Collection
|
// * @return Collection
|
||||||
*/
|
// */
|
||||||
public function getAllWithoutBudget(Account $account, Collection $accounts, Carbon $start, Carbon $end): Collection;
|
// public function getAllWithoutBudget(Account $account, Collection $accounts, Carbon $start, Carbon $end): Collection;
|
||||||
|
|
||||||
/**
|
// /**
|
||||||
* Get the budgeted amounts for each budgets in each year.
|
// * Get the budgeted amounts for each budgets in each year.
|
||||||
*
|
// *
|
||||||
* @param Collection $budgets
|
// * @param Collection $budgets
|
||||||
* @param Carbon $start
|
// * @param Carbon $start
|
||||||
* @param Carbon $end
|
// * @param Carbon $end
|
||||||
*
|
// *
|
||||||
* @return Collection
|
// * @return Collection
|
||||||
*/
|
// */
|
||||||
public function getBudgetedPerYear(Collection $budgets, Carbon $start, Carbon $end): Collection;
|
// public function getBudgetedPerYear(Collection $budgets, Carbon $start, Carbon $end): Collection;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return Collection
|
* @return Collection
|
||||||
*/
|
*/
|
||||||
public function getBudgets(): Collection;
|
public function getBudgets(): Collection;
|
||||||
|
|
||||||
/**
|
// /**
|
||||||
* Returns an array with every budget in it and the expenses for each budget
|
// * Returns an array with every budget in it and the expenses for each budget
|
||||||
* per month.
|
// * per month.
|
||||||
*
|
// *
|
||||||
* @param Collection $accounts
|
// * @param Collection $accounts
|
||||||
* @param Carbon $start
|
// * @param Carbon $start
|
||||||
* @param Carbon $end
|
// * @param Carbon $end
|
||||||
*
|
// *
|
||||||
* @return array
|
// * @return array
|
||||||
*/
|
// */
|
||||||
public function getBudgetsAndExpensesPerMonth(Collection $accounts, Carbon $start, Carbon $end): array;
|
// public function getBudgetsAndExpensesPerMonth(Collection $accounts, Carbon $start, Carbon $end): array;
|
||||||
|
|
||||||
/**
|
// /**
|
||||||
* Returns an array with every budget in it and the expenses for each budget
|
// * Returns an array with every budget in it and the expenses for each budget
|
||||||
* per year for.
|
// * per year for.
|
||||||
*
|
// *
|
||||||
* @param Collection $budgets
|
// * @param Collection $budgets
|
||||||
* @param Collection $accounts
|
// * @param Collection $accounts
|
||||||
* @param Carbon $start
|
// * @param Carbon $start
|
||||||
* @param Carbon $end
|
// * @param Carbon $end
|
||||||
*
|
// *
|
||||||
* @deprecated
|
// * @deprecated
|
||||||
*
|
// *
|
||||||
* @return array
|
// * @return array
|
||||||
*/
|
// */
|
||||||
public function getBudgetsAndExpensesPerYear(Collection $budgets, Collection $accounts, Carbon $start, Carbon $end): array;
|
// public function getBudgetsAndExpensesPerYear(Collection $budgets, Collection $accounts, Carbon $start, Carbon $end): array;
|
||||||
|
|
||||||
/**
|
// /**
|
||||||
* Returns a list of budgets, budget limits and limit repetitions
|
// * Returns a list of budgets, budget limits and limit repetitions
|
||||||
* (doubling any of them in a left join)
|
// * (doubling any of them in a left join)
|
||||||
*
|
// *
|
||||||
* @param Carbon $start
|
// * @param Carbon $start
|
||||||
* @param Carbon $end
|
// * @param Carbon $end
|
||||||
*
|
// *
|
||||||
* @return Collection
|
// * @return Collection
|
||||||
*/
|
// */
|
||||||
public function getBudgetsAndLimitsInRange(Carbon $start, Carbon $end): Collection;
|
// public function getBudgetsAndLimitsInRange(Carbon $start, Carbon $end): Collection;
|
||||||
|
|
||||||
/**
|
// /**
|
||||||
* Returns a list of budget limits that are valid in the current given range.
|
// * Returns a list of budget limits that are valid in the current given range.
|
||||||
*
|
// *
|
||||||
* @param Budget $budget
|
// * @param Budget $budget
|
||||||
* @param Carbon $start
|
// * @param Carbon $start
|
||||||
* @param Carbon $end
|
// * @param Carbon $end
|
||||||
* @param LimitRepetition $ignore
|
// * @param LimitRepetition $ignore
|
||||||
*
|
// *
|
||||||
* @return Collection
|
// * @return Collection
|
||||||
*/
|
// */
|
||||||
public function getValidRepetitions(Budget $budget, Carbon $start, Carbon $end, LimitRepetition $ignore) : Collection;
|
// public function getValidRepetitions(Budget $budget, Carbon $start, Carbon $end, LimitRepetition $ignore) : Collection;
|
||||||
|
|
||||||
/**
|
// /**
|
||||||
* @param Budget $budget
|
// * @param Budget $budget
|
||||||
* @param string $repeatFreq
|
// * @param string $repeatFreq
|
||||||
* @param Carbon $start
|
// * @param Carbon $start
|
||||||
* @param Carbon $end
|
// * @param Carbon $end
|
||||||
*
|
// *
|
||||||
* @return LimitRepetition
|
// * @return LimitRepetition
|
||||||
*/
|
// */
|
||||||
public function getCurrentRepetition(Budget $budget, string $repeatFreq, Carbon $start, Carbon $end): LimitRepetition;
|
// public function getCurrentRepetition(Budget $budget, string $repeatFreq, Carbon $start, Carbon $end): LimitRepetition;
|
||||||
|
|
||||||
/**
|
// /**
|
||||||
* Returns all expenses for the given budget and the given accounts, in the given period.
|
// * Returns all expenses for the given budget and the given accounts, in the given period.
|
||||||
*
|
// *
|
||||||
* @param Budget $budget
|
// * @param Budget $budget
|
||||||
* @param Collection $accounts
|
// * @param Collection $accounts
|
||||||
* @param Carbon $start
|
// * @param Carbon $start
|
||||||
* @param Carbon $end
|
// * @param Carbon $end
|
||||||
*
|
// *
|
||||||
* @return Collection
|
// * @return Collection
|
||||||
*/
|
// */
|
||||||
public function getExpenses(Budget $budget, Collection $accounts, Carbon $start, Carbon $end):Collection;
|
// public function getExpenses(Budget $budget, Collection $accounts, Carbon $start, Carbon $end):Collection;
|
||||||
|
|
||||||
/**
|
// /**
|
||||||
* @param Budget $budget
|
// * @param Budget $budget
|
||||||
*
|
// *
|
||||||
* @return Carbon
|
// * @return Carbon
|
||||||
*/
|
// */
|
||||||
public function getFirstBudgetLimitDate(Budget $budget):Carbon;
|
// public function getFirstBudgetLimitDate(Budget $budget):Carbon;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return Collection
|
* @return Collection
|
||||||
*/
|
*/
|
||||||
public function getInactiveBudgets(): Collection;
|
public function getInactiveBudgets(): Collection;
|
||||||
|
|
||||||
/**
|
// /**
|
||||||
* Returns all the transaction journals for a limit, possibly limited by a limit repetition.
|
// * Returns all the transaction journals for a limit, possibly limited by a limit repetition.
|
||||||
*
|
// *
|
||||||
* @param Budget $budget
|
// * @param Budget $budget
|
||||||
* @param LimitRepetition $repetition
|
// * @param LimitRepetition $repetition
|
||||||
* @param int $take
|
// * @param int $take
|
||||||
*
|
// *
|
||||||
* @return LengthAwarePaginator
|
// * @return LengthAwarePaginator
|
||||||
*/
|
// */
|
||||||
public function getJournals(Budget $budget, LimitRepetition $repetition = null, int $take = 50): LengthAwarePaginator;
|
// public function getJournals(Budget $budget, LimitRepetition $repetition = null, int $take = 50): LengthAwarePaginator;
|
||||||
|
|
||||||
/**
|
// /**
|
||||||
* @param Carbon $start
|
// * @param Carbon $start
|
||||||
* @param Carbon $end
|
// * @param Carbon $end
|
||||||
* @param int $page
|
// * @param int $page
|
||||||
* @param int $pageSize
|
// * @param int $pageSize
|
||||||
*
|
// *
|
||||||
* @return LengthAwarePaginator
|
// * @return LengthAwarePaginator
|
||||||
*/
|
// */
|
||||||
public function getWithoutBudget(Carbon $start, Carbon $end, int $page, int $pageSize = 50): LengthAwarePaginator;
|
// public function getWithoutBudget(Carbon $start, Carbon $end, int $page, int $pageSize = 50): LengthAwarePaginator;
|
||||||
|
|
||||||
/**
|
// /**
|
||||||
* @param Collection $accounts
|
// * @param Collection $accounts
|
||||||
* @param Carbon $start
|
// * @param Carbon $start
|
||||||
* @param Carbon $end
|
// * @param Carbon $end
|
||||||
*
|
// *
|
||||||
* @return Collection
|
// * @return Collection
|
||||||
*/
|
// */
|
||||||
public function getWithoutBudgetForAccounts(Collection $accounts, Carbon $start, Carbon $end): Collection;
|
// public function getWithoutBudgetForAccounts(Collection $accounts, Carbon $start, Carbon $end): Collection;
|
||||||
|
|
||||||
/**
|
// /**
|
||||||
* @param Collection $accounts
|
// * @param Collection $accounts
|
||||||
* @param Carbon $start
|
// * @param Carbon $start
|
||||||
* @param Carbon $end
|
// * @param Carbon $end
|
||||||
*
|
// *
|
||||||
* @return string
|
// * @return string
|
||||||
*/
|
// */
|
||||||
public function getWithoutBudgetSum(Collection $accounts, Carbon $start, Carbon $end): string;
|
// public function getWithoutBudgetSum(Collection $accounts, Carbon $start, Carbon $end): string;
|
||||||
|
|
||||||
/**
|
// /**
|
||||||
* Returns an array with the following key:value pairs:
|
// * Returns an array with the following key:value pairs:
|
||||||
*
|
// *
|
||||||
* yyyy-mm-dd:<array>
|
// * yyyy-mm-dd:<array>
|
||||||
*
|
// *
|
||||||
* That array contains:
|
// * That array contains:
|
||||||
*
|
// *
|
||||||
* budgetid:<amount>
|
// * budgetid:<amount>
|
||||||
*
|
// *
|
||||||
* Where yyyy-mm-dd is the date and <amount> is the money spent using WITHDRAWALS in the $budget
|
// * Where yyyy-mm-dd is the date and <amount> is the money spent using WITHDRAWALS in the $budget
|
||||||
* from the given users accounts..
|
// * from the given users accounts..
|
||||||
*
|
// *
|
||||||
* @param Collection $accounts
|
// * @param Collection $accounts
|
||||||
* @param Carbon $start
|
// * @param Carbon $start
|
||||||
* @param Carbon $end
|
// * @param Carbon $end
|
||||||
*
|
// *
|
||||||
* @return array
|
// * @return array
|
||||||
*/
|
// */
|
||||||
public function spentAllPerDayForAccounts(Collection $accounts, Carbon $start, Carbon $end): array;
|
// public function spentAllPerDayForAccounts(Collection $accounts, Carbon $start, Carbon $end): array;
|
||||||
|
|
||||||
/**
|
// /**
|
||||||
* Returns a list of expenses (in the field "spent", grouped per budget per account.
|
// * Returns a list of expenses (in the field "spent", grouped per budget per account.
|
||||||
*
|
// *
|
||||||
* @param Collection $budgets
|
// * @param Collection $budgets
|
||||||
* @param Collection $accounts
|
// * @param Collection $accounts
|
||||||
* @param Carbon $start
|
// * @param Carbon $start
|
||||||
* @param Carbon $end
|
// * @param Carbon $end
|
||||||
*
|
// *
|
||||||
* @return Collection
|
// * @return Collection
|
||||||
*/
|
// */
|
||||||
public function spentPerBudgetPerAccount(Collection $budgets, Collection $accounts, Carbon $start, Carbon $end): Collection;
|
// public function spentPerBudgetPerAccount(Collection $budgets, Collection $accounts, Carbon $start, Carbon $end): Collection;
|
||||||
|
|
||||||
/**
|
// /**
|
||||||
* Returns an array with the following key:value pairs:
|
// * Returns an array with the following key:value pairs:
|
||||||
*
|
// *
|
||||||
* yyyy-mm-dd:<amount>
|
// * yyyy-mm-dd:<amount>
|
||||||
*
|
// *
|
||||||
* Where yyyy-mm-dd is the date and <amount> is the money spent using WITHDRAWALS in the $budget
|
// * Where yyyy-mm-dd is the date and <amount> is the money spent using WITHDRAWALS in the $budget
|
||||||
* from all the users accounts.
|
// * from all the users accounts.
|
||||||
*
|
// *
|
||||||
* @param Budget $budget
|
// * @param Budget $budget
|
||||||
* @param Carbon $start
|
// * @param Carbon $start
|
||||||
* @param Carbon $end
|
// * @param Carbon $end
|
||||||
* @param Collection $accounts
|
// * @param Collection $accounts
|
||||||
*
|
// *
|
||||||
* @return array
|
// * @return array
|
||||||
*/
|
// */
|
||||||
public function spentPerDay(Budget $budget, Carbon $start, Carbon $end, Collection $accounts): array;
|
// public function spentPerDay(Budget $budget, Carbon $start, Carbon $end, Collection $accounts): array;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param array $data
|
* @param array $data
|
||||||
|
Reference in New Issue
Block a user