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

Update category overview to be multi-currency aware.

Browse Source
This commit is contained in:
James Cole
2025-08-15 07:44:14 +02:00
parent fc9ef290f1
commit 844b8d48c4
5 changed files with 71 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Support/Http/Api/AccountBalanceGrouped.php
View File

@@ -80,6 +80,7 @@ class AccountBalanceGrouped
'start_date' => $this->start->toAtomString(),
'end_date' => $this->end->toAtomString(),
'yAxisID' => 0,
'type' => 'line',
'period' => $this->preferredRange,
'entries' => [],
'pc_entries' => [],
@@ -97,6 +98,7 @@ class AccountBalanceGrouped
'date' => $this->start->toAtomString(),
'start_date' => $this->start->toAtomString(),
'end_date' => $this->end->toAtomString(),
'type' => 'line',
'yAxisID' => 0,
'period' => $this->preferredRange,
'entries' => [],

5
app/Support/Http/Api/CleansChartData.php
View File

@@ -61,7 +61,10 @@ trait CleansChartData
if (array_key_exists('primary_currency_id', $array)) {
$array['primary_currency_id'] = (string)$array['primary_currency_id'];
}
$required = ['start_date', 'end_date', 'period', 'yAxisID'];
$required = [
'start_date', 'end_date', 'period', 'yAxisID','type','entries','pc_entries',
'currency_id', 'primary_currency_id'
];
foreach ($required as $field) {
if (!array_key_exists($field, $array)) {
throw new FireflyException(sprintf('Data-set "%s" is missing the "%s"-variable.', $index, $field));