IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Experimental fix for issue #109.

Browse Source
This commit is contained in:
James Cole 2015-09-13 07:32:39 +02:00
parent 3699a7ba9a
commit b3333cc2d3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Chart/CategoryController.php
View File

@ -65,7 +65,7 @@ class CategoryController extends Controller
while ($start <= $end) { while ($start <= $end) {
$currentEnd = Navigation::endOfPeriod($start, $range); $currentEnd = Navigation::endOfPeriod($start, $range);
$spent = $repository->balanceInPeriod($category, $start, $currentEnd); $spent = $repository->balanceInPeriod($category, $start, $currentEnd, true);
$entries->push([clone $start, $spent]); $entries->push([clone $start, $spent]);
$start = Navigation::addPeriod($start, $range, 0); $start = Navigation::addPeriod($start, $range, 0);

2
app/Repositories/Shared/ComponentRepository.php
View File

@ -40,7 +40,7 @@ class ComponentRepository
if ($shared === true) { // shared is true: always ignore transfers between accounts! if ($shared === true) { // shared is true: always ignore transfers between accounts!
$sum = $object->transactionjournals()->transactionTypes(['Withdrawal'])->before($end)->after($start) $sum = $object->transactionjournals()->transactionTypes(['Withdrawal'])->before($end)->after($start)
->get(['transaction_journals.*'])->sum('amount'); ->get(['transaction_journals.*'])->sum('actual_amount');
} else { } else {
// do something else, SEE budgets. // do something else, SEE budgets.
// get all journals in this month where the asset account is NOT shared. // get all journals in this month where the asset account is NOT shared.