kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-04 04:24:26 +00:00
Code Issues Projects Releases Wiki Activity

Fix #11172

Browse Source
This commit is contained in:
James Cole
2025-11-12 05:37:33 +01:00
parent 8ff2f817c6
commit 55c045c791
3 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Support/Http/Api/AccountFilter.php
View File

@@ -47,6 +47,14 @@ trait AccountFilter
AccountTypeEnum::DEBT->value,
AccountTypeEnum::MORTGAGE->value,
],
'normal' => [
AccountTypeEnum::ASSET->value,
AccountTypeEnum::EXPENSE->value,
AccountTypeEnum::REVENUE->value,
AccountTypeEnum::LOAN->value,
AccountTypeEnum::DEBT->value,
AccountTypeEnum::MORTGAGE->value,
],
'asset' => [AccountTypeEnum::DEFAULT->value, AccountTypeEnum::ASSET->value],
'cash' => [AccountTypeEnum::CASH->value],
'expense' => [AccountTypeEnum::EXPENSE->value, AccountTypeEnum::BENEFICIARY->value],
@@ -89,6 +97,16 @@ trait AccountFilter
*/
protected function mapAccountTypes(string $type): array
{
return $this->types[$type] ?? $this->types['all'];
$return = [];
$parts = explode(',', $type);
foreach ($parts as $part) {
if (array_key_exists($part, $this->types)) {
$return = array_merge($return, $this->types[$part]);
}
}
if(0 === count($return)) {
$return = $this->types['normal'];
}
return $return;
}
}

3
app/Support/Http/Api/TransactionFilter.php
View File

@@ -74,6 +74,9 @@ trait TransactionFilter
$return = array_merge($return, $this->transactionTypes[$part]);
}
}
if(0 === count($return)) {
$return = $this->transactionTypes['all'];
}
return array_unique($return);
}