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

Fix #1530

Browse Source
This commit is contained in:
James Cole
2018-07-22 08:58:58 +02:00
parent 662b832274
commit b705240faa
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/Chart/BillController.php
View File

@@ -85,7 +85,7 @@ class BillController extends Controller
/** /**
* Shows history for a single bill. * Shows overview for a single bill.
* *
* @param JournalCollectorInterface $collector * @param JournalCollectorInterface $collector
* @param Bill $bill * @param Bill $bill
@@ -101,8 +101,8 @@ class BillController extends Controller
return response()->json($cache->get()); // @codeCoverageIgnore return response()->json($cache->get()); // @codeCoverageIgnore
} }
$results = $collector->setAllAssetAccounts()->setBills(new Collection([$bill]))->getJournals(); $results = $collector->setAllAssetAccounts()->setBills(new Collection([$bill]))->getJournals();
$results = $results->sortBy( $results = $results->sortBy(
function (Transaction $transaction) { function (Transaction $transaction) {
return $transaction->date->format('U'); return $transaction->date->format('U');
} }
@@ -118,7 +118,13 @@ class BillController extends Controller
$date = $entry->date->formatLocalized((string)trans('config.month_and_day')); $date = $entry->date->formatLocalized((string)trans('config.month_and_day'));
$chartData[0]['entries'][$date] = $bill->amount_min; // minimum amount of bill $chartData[0]['entries'][$date] = $bill->amount_min; // minimum amount of bill
$chartData[1]['entries'][$date] = $bill->amount_max; // maximum amount of bill $chartData[1]['entries'][$date] = $bill->amount_max; // maximum amount of bill
$chartData[2]['entries'][$date] = bcmul($entry->transaction_amount, '-1'); // amount of journal
// append amount because there are more than one per moment:
if (!isset($chartData[2]['entries'][$date])) {
$chartData[2]['entries'][$date] = '0';
}
$amount = bcmul($entry->transaction_amount, '-1');
$chartData[2]['entries'][$date] = bcadd($chartData[2]['entries'][$date], $amount); // amount of journal
} }
$data = $this->generator->multiSet($chartData); $data = $this->generator->multiSet($chartData);