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

Fix #3350

Browse Source
This commit is contained in:
James Cole 2020-05-10 20:08:16 +02:00
parent 1ac95b6fa7
commit 91e384aae8
1 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/Http/Controllers/Chart/TransactionController.php
View File

@ -82,21 +82,11 @@ class TransactionController extends Controller
foreach ($result as $journal) { foreach ($result as $journal) {
$budget = $journal['budget_name'] ?? (string) trans('firefly.no_budget'); $budget = $journal['budget_name'] ?? (string) trans('firefly.no_budget');
$title = sprintf('%s (%s)', $budget, $journal['currency_symbol']); $title = sprintf('%s (%s)', $budget, $journal['currency_symbol']);
// key => [value => x, 'currency_symbol' => 'x']
$data[$title] = $data[$title] ?? [ $data[$title] = $data[$title] ?? [
'amount' => '0', 'amount' => '0',
'currency_symbol' => $journal['currency_symbol'], 'currency_symbol' => $journal['currency_symbol'],
]; ];
$data[$title]['amount'] = bcadd($data[$title]['amount'], $journal['amount']); $data[$title]['amount'] = bcadd($data[$title]['amount'], $journal['amount']);
if (null !== $journal['foreign_amount']) {
$title = sprintf('%s (%s)', $budget, $journal['foreign_currency_symbol']);
$data[$title] = $data[$title] ?? [
'amount' => $journal['foreign_amount'],
'currency_symbol' => $journal['currency_symbol'],
];
$data[$title]['amount'] = bcadd($data[$title]['amount'], $journal['foreign_amount']);
}
} }
$chart = $this->generator->multiCurrencyPieChart($data); $chart = $this->generator->multiCurrencyPieChart($data);
$cache->store($chart); $cache->store($chart);
@ -150,21 +140,12 @@ class TransactionController extends Controller
foreach ($result as $journal) { foreach ($result as $journal) {
$category = $journal['category_name'] ?? (string) trans('firefly.no_category'); $category = $journal['category_name'] ?? (string) trans('firefly.no_category');
$title = sprintf('%s (%s)', $category, $journal['currency_symbol']); $title = sprintf('%s (%s)', $category, $journal['currency_symbol']);
// key => [value => x, 'currency_symbol' => 'x']
$data[$title] = $data[$title] ?? [ $data[$title] = $data[$title] ?? [
'amount' => '0', 'amount' => '0',
'currency_symbol' => $journal['currency_symbol'], 'currency_symbol' => $journal['currency_symbol'],
]; ];
$data[$title]['amount'] = bcadd($data[$title]['amount'], $journal['amount']); $data[$title]['amount'] = bcadd($data[$title]['amount'], $journal['amount']);
if (null !== $journal['foreign_amount']) {
$title = sprintf('%s (%s)', $category, $journal['foreign_currency_symbol']);
$data[$title] = $data[$title] ?? [
'amount' => $journal['foreign_amount'],
'currency_symbol' => $journal['currency_symbol'],
];
$data[$title]['amount'] = bcadd($data[$title]['amount'], $journal['foreign_amount']);
}
} }
$chart = $this->generator->multiCurrencyPieChart($data); $chart = $this->generator->multiCurrencyPieChart($data);
$cache->store($chart); $cache->store($chart);
@ -223,15 +204,6 @@ class TransactionController extends Controller
'currency_symbol' => $journal['currency_symbol'], 'currency_symbol' => $journal['currency_symbol'],
]; ];
$data[$title]['amount'] = bcadd($data[$title]['amount'], $journal['amount']); $data[$title]['amount'] = bcadd($data[$title]['amount'], $journal['amount']);
if (null !== $journal['foreign_amount']) {
$title = sprintf('%s (%s)', $name, $journal['foreign_currency_symbol']);
$data[$title] = $data[$title] ?? [
'amount' => $journal['foreign_amount'],
'currency_symbol' => $journal['currency_symbol'],
];
$data[$title]['amount'] = bcadd($data[$title]['amount'], $journal['foreign_amount']);
}
} }
$chart = $this->generator->multiCurrencyPieChart($data); $chart = $this->generator->multiCurrencyPieChart($data);
$cache->store($chart); $cache->store($chart);
@ -291,14 +263,6 @@ class TransactionController extends Controller
]; ];
$data[$title]['amount'] = bcadd($data[$title]['amount'], $journal['amount']); $data[$title]['amount'] = bcadd($data[$title]['amount'], $journal['amount']);
if (null !== $journal['foreign_amount']) {
$title = sprintf('%s (%s)', $name, $journal['foreign_currency_symbol']);
$data[$title] = $data[$title] ?? [
'amount' => $journal['foreign_amount'],
'currency_symbol' => $journal['currency_symbol'],
];
$data[$title]['amount'] = bcadd($data[$title]['amount'], $journal['foreign_amount']);
}
} }
$chart = $this->generator->multiCurrencyPieChart($data); $chart = $this->generator->multiCurrencyPieChart($data);
$cache->store($chart); $cache->store($chart);