kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'v6.2' of github.com:firefly-iii/firefly-iii into v6.2

Browse Source
This commit is contained in:
James Cole
2024-12-23 14:35:34 +01:00
parent 3a274dcaa7 ddfededf02
commit ff5c9a3aa0
5 changed files with 2982 additions and 2943 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/Chart/AccountController.php
View File

@@ -92,7 +92,7 @@ class AccountController extends Controller
$cache->addProperty($end);
$cache->addProperty('chart.account.expense-accounts');
if ($cache->has()) {
return response()->json($cache->get());
return response()->json($cache->get());
}
$start->subDay();
@@ -135,10 +135,10 @@ class AccountController extends Controller
}
// recreate currencies, but on ID instead of code.
$newCurrencies = [];
foreach($currencies as $currency) {
foreach ($currencies as $currency) {
$newCurrencies[$currency->id] = $currency;
}
$currencies = $newCurrencies;
$currencies = $newCurrencies;
@@ -502,7 +502,7 @@ class AccountController extends Controller
$cache->addProperty($end);
$cache->addProperty('chart.account.revenue-accounts');
if ($cache->has()) {
return response()->json($cache->get());
return response()->json($cache->get());
}
$start->subDay();
@@ -549,10 +549,10 @@ class AccountController extends Controller
// recreate currencies, but on ID instead of code.
$newCurrencies = [];
foreach($currencies as $currency) {
foreach ($currencies as $currency) {
$newCurrencies[$currency->id] = $currency;
}
$currencies = $newCurrencies;
$currencies = $newCurrencies;
// sort temp array by amount.
$amounts = array_column($tempData, 'diff_float');