kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-30 10:33:30 +00:00
Code Issues Projects Releases Wiki Activity

Add expenses. [skip ci]

Browse Source
This commit is contained in:
James Cole
2016-05-18 14:19:33 +02:00
parent b0cb9663a6
commit e23c6521b9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,7 +94,7 @@ class BudgetReportHelper implements BudgetReportHelperInterface
// stuff outside of budgets: // stuff outside of budgets:
$noBudget = $this->repository->spentInPeriodWithoutBudget($accounts, $start, $end); $noBudget = $this->repository->spentInPeriodWithoutBudget($accounts, $start, $end);
$budgetLine = new BudgetLine; $budgetLine = new BudgetLine;
$budgetLine->setOverspent($noBudget); $budgetLine->setOverspent($noBudget);
$budgetLine->setSpent($noBudget); $budgetLine->setSpent($noBudget);
@@ -175,6 +175,7 @@ class BudgetReportHelper implements BudgetReportHelperInterface
$array['left'] = bccomp(bcadd($repetition->amount, $expenses), '0') === 1 ? bcadd($repetition->amount, $expenses) : '0'; $array['left'] = bccomp(bcadd($repetition->amount, $expenses), '0') === 1 ? bcadd($repetition->amount, $expenses) : '0';
$array['spent'] = bccomp(bcadd($repetition->amount, $expenses), '0') === 1 ? $expenses : '0'; $array['spent'] = bccomp(bcadd($repetition->amount, $expenses), '0') === 1 ? $expenses : '0';
$array['overspent'] = bccomp(bcadd($repetition->amount, $expenses), '0') === 1 ? '0' : bcadd($expenses, $repetition->amount); $array['overspent'] = bccomp(bcadd($repetition->amount, $expenses), '0') === 1 ? '0' : bcadd($expenses, $repetition->amount);
$array['expenses'] = $expenses;
return $array; return $array;