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

New code. Debug.

Browse Source
This commit is contained in:
James Cole
2015-09-29 09:20:50 +02:00
parent dac6efd98b
commit 103de5e18a
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,6 +9,7 @@ use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Support\CacheProperties; use FireflyIII\Support\CacheProperties;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Response; use Response;
use Log;
/** /**
* Class ReportController * Class ReportController
@@ -110,8 +111,18 @@ class ReportController extends Controller
$month = clone $start; $month = clone $start;
$month->endOfMonth(); $month->endOfMonth();
// total income and total expenses: // total income and total expenses:
$income = bcadd($income, $query->incomeInPeriodCorrected($start, $month, $shared)->sum('amount')); $currentIncome = $query->incomeInPeriodCorrected($start, $month, $shared)->sum('amount');
$expense = bcadd($expense, $query->expenseInPeriodCorrected($start, $month, $shared)->sum('amount')); $currentExpense = $query->expenseInPeriodCorrected($start, $month, $shared)->sum('amount');
Log::debug('Date ['.$month->format('M Y').']: income = ['.$income.' + '.$currentIncome.'], out = ['.$expense.' + '.$currentExpense.']');
$income = bcadd($income, $currentIncome);
$expense = bcadd($expense, $currentExpense);
$count++; $count++;
$start->addMonth(); $start->addMonth();
} }