kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-17 01:42:19 +00:00
Code Issues Projects Releases Wiki Activity

Renamed the other method.

Browse Source
This commit is contained in:
James Cole
2017-01-05 09:10:04 +01:00
parent 2d8ca363db
commit a872cf7061
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Helpers/Report/BalanceReportHelper.php
View File

@@ -213,7 +213,7 @@ class BalanceReportHelper implements BalanceReportHelperInterface
$empty = new BalanceLine; $empty = new BalanceLine;
foreach ($accounts as $account) { foreach ($accounts as $account) {
$spent = $this->budgetRepository->spentInPeriodWithoutBudget(new Collection([$account]), $start, $end); $spent = $this->budgetRepository->spentInPeriodWoBudget(new Collection([$account]), $start, $end);
// budget // budget
$budgetEntry = new BalanceEntry; $budgetEntry = new BalanceEntry;
$budgetEntry->setAccount($account); $budgetEntry->setAccount($account);

2
app/Helpers/Report/BudgetReportHelper.php
View File

@@ -80,7 +80,7 @@ class BudgetReportHelper implements BudgetReportHelperInterface
} }
} }
$noBudget = $this->repository->spentInPeriodWithoutBudget($accounts, $start, $end); // stuff outside of budgets $noBudget = $this->repository->spentInPeriodWoBudget($accounts, $start, $end); // stuff outside of budgets
$budgetLine = new BudgetLine; $budgetLine = new BudgetLine;
$budgetLine->setOverspent($noBudget)->setSpent($noBudget); $budgetLine->setOverspent($noBudget)->setSpent($noBudget);
$object->addOverspent($noBudget)->addBudgetLine($budgetLine); $object->addOverspent($noBudget)->addBudgetLine($budgetLine);

2
app/Repositories/Budget/BudgetRepository.php
View File

@@ -467,7 +467,7 @@ class BudgetRepository implements BudgetRepositoryInterface
* *
* @return string * @return string
*/ */
public function spentInPeriodWithoutBudgetCollector(Collection $accounts, Carbon $start, Carbon $end): string public function spentInPeriodWoBudget(Collection $accounts, Carbon $start, Carbon $end): string
{ {
/** @var JournalCollectorInterface $collector */ /** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class, [$this->user]); $collector = app(JournalCollectorInterface::class, [$this->user]);

2
app/Repositories/Budget/BudgetRepositoryInterface.php
View File

@@ -166,7 +166,7 @@ interface BudgetRepositoryInterface
* *
* @return string * @return string
*/ */
public function spentInPeriodWithoutBudgetCollector(Collection $accounts, Carbon $start, Carbon $end): string; public function spentInPeriodWoBudget(Collection $accounts, Carbon $start, Carbon $end): string;
/** /**
* @param array $data * @param array $data