kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-18 07:38:29 +00:00
Code Issues Projects Releases Wiki Activity

Fixed chart. [skip ci]

Browse Source
This commit is contained in:
James Cole
2016-05-16 09:05:06 +02:00
parent 5a43e6cb9f
commit fc4ab29244
3 changed files with 72 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Chart/ReportController.php
View File

@@ -270,8 +270,8 @@ class ReportController extends Controller
while ($start < $end) {
// total income and total expenses:
$date = $start->format('Y-m');
$incomeSum = isset($earned[$date]) ? $earned[$date] * -1 : 0;
$expenseSum = isset($spent[$date]) ? $spent[$date] * -1 : 0;
$incomeSum = isset($earned[$date]) ? $earned[$date] : 0;
$expenseSum = isset($spent[$date]) ? $spent[$date] : 0;
$entries->push([clone $start, $incomeSum, $expenseSum]);
$start->addMonth();
@@ -297,8 +297,8 @@ class ReportController extends Controller
$count = 0;
while ($start < $end) {
$date = $start->format('Y-m');
$currentIncome = $earned[$date] ?? '0';
$currentExpense = $spent[$date] ??'0';
$currentIncome = isset($earned[$date]) ? $earned[$date] : 0;
$currentExpense = isset($spent[$date]) ? $spent[$date] : 0;
$income = bcadd($income, $currentIncome);
$expense = bcadd($expense, $currentExpense);