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

Try to convert balance to native, still internal debates.

Browse Source
This commit is contained in:
James Cole
2024-12-22 16:41:55 +01:00
parent d4525da6bc
commit df49dd23e2
8 changed files with 431 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Support/Http/Controllers/ChartGeneration.php
View File

@@ -50,8 +50,9 @@ trait ChartGeneration
$cache->addProperty($end);
$cache->addProperty('chart.account.account-balance-chart');
$cache->addProperty($accounts);
$convertToNative =app('preferences')->get('convert_to_native', false)->data;
if ($cache->has()) {
return $cache->get();
// return $cache->get();
}
app('log')->debug('Regenerate chart.account.account-balance-chart from scratch.');
$locale = app('steam')->getLocale();
@@ -72,6 +73,11 @@ trait ChartGeneration
if (null === $currency) {
$currency = $default;
}
// if the user prefers the native currency, overrule the currency of the account.
if($currency->id !== $default->id && $convertToNative) {
$currency = $default;
}
$currentSet = [
'label' => $account->name,
'currency_symbol' => $currency->symbol,
@@ -79,7 +85,7 @@ trait ChartGeneration
];
$currentStart = clone $start;
$range = app('steam')->balanceInRange($account, $start, clone $end);
$range = $convertToNative ? app('steam')->balanceInRangeNative($account, $start, clone $end) : app('steam')->balanceInRange($account, $start, clone $end);
$previous = array_values($range)[0];
while ($currentStart <= $end) {
$format = $currentStart->format('Y-m-d');