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

Merge pull request #3018 from JC5/develop

Browse Source 
Fix #3016
This commit is contained in:
James Cole
2020-01-19 18:11:21 +01:00
committed by GitHub
parent f6e5a399cf 154ac8b73c
commit d49efca791
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,10 +115,15 @@ class BillController extends Controller
$collector = app(GroupCollectorInterface::class); $collector = app(GroupCollectorInterface::class);
$journals = $collector->setBill($bill)->getExtractedJournals(); $journals = $collector->setBill($bill)->getExtractedJournals();
// sort the other way around:
usort($journals, static function (array $left, array $right) {
return $left['date']->gte($right['date'])? 1 : 0;
});
$chartData = [ $chartData = [
['type' => 'bar', 'label' => (string)trans('firefly.min-amount'), 'currency_symbol' => $bill->transactionCurrency->symbol, 'entries' => []], ['type' => 'line', 'label' => (string)trans('firefly.max-amount'), 'currency_symbol' => $bill->transactionCurrency->symbol, 'entries' => []],
['type' => 'bar', 'label' => (string)trans('firefly.max-amount'), 'currency_symbol' => $bill->transactionCurrency->symbol, 'entries' => []], ['type' => 'line', 'label' => (string)trans('firefly.min-amount'), 'currency_symbol' => $bill->transactionCurrency->symbol, 'entries' => []],
['type' => 'line', 'label' => (string)trans('firefly.journal-amount'), 'currency_symbol' => $bill->transactionCurrency->symbol, 'entries' => []], ['type' => 'bar', 'label' => (string)trans('firefly.journal-amount'), 'currency_symbol' => $bill->transactionCurrency->symbol, 'entries' => []],
]; ];
foreach ($journals as $journal) { foreach ($journals as $journal) {