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

Updated methods to make budget charts multi-currency

Browse Source
This commit is contained in:
James Cole
2020-01-01 14:28:03 +01:00
parent ca260387a2
commit 48a1ad3381
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Support/Http/Controllers/AugumentData.php
View File

@@ -120,7 +120,9 @@ trait AugumentData
$accounts = $repository->getAccountsByType([AccountType::ASSET, AccountType::DEFAULT, AccountType::EXPENSE, AccountType::CASH]); $accounts = $repository->getAccountsByType([AccountType::ASSET, AccountType::DEFAULT, AccountType::EXPENSE, AccountType::CASH]);
$grouped = $accounts->groupBy('id')->toArray(); $grouped = $accounts->groupBy('id')->toArray();
$return = []; $return = [];
foreach ($accountIds as $accountId) { foreach ($accountIds as $combinedId) {
$parts = explode('-', $combinedId);
$accountId = (int)$parts[0];
if (isset($grouped[$accountId])) { if (isset($grouped[$accountId])) {
$return[$accountId] = $grouped[$accountId][0]['name']; $return[$accountId] = $grouped[$accountId][0]['name'];
} }
@@ -168,7 +170,9 @@ trait AugumentData
$categories = $repository->getCategories(); $categories = $repository->getCategories();
$grouped = $categories->groupBy('id')->toArray(); $grouped = $categories->groupBy('id')->toArray();
$return = []; $return = [];
foreach ($categoryIds as $categoryId) { foreach ($categoryIds as $combinedId) {
$parts = explode('-', $combinedId);
$categoryId = (int)$parts[0];
if (isset($grouped[$categoryId])) { if (isset($grouped[$categoryId])) {
$return[$categoryId] = $grouped[$categoryId][0]['name']; $return[$categoryId] = $grouped[$categoryId][0]['name'];
} }