Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Fix #11228
James Cole78de80077720
diff --git a/app/Api/V1/Requests/Generic/ObjectTypeApiRequest.php b/app/Api/V1/Requests/Generic/ObjectTypeApiRequest.phpindex 2e8a793747..0cb60c67fc 100644--- a/app/Api/V1/Requests/Generic/ObjectTypeApiRequest.php+++ b/app/Api/V1/Requests/Generic/ObjectTypeApiRequest.php@@ -23,15 +23,16 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Requests\Generic;-use Override;-use Illuminate\Contracts\Validation\Validator;use FireflyIII\Api\V1\Requests\ApiRequest;+use FireflyIII\Enums\AccountTypeEnum;use FireflyIII\Models\Account;use FireflyIII\Models\Transaction;use FireflyIII\Rules\Account\IsValidAccountTypeList;use FireflyIII\Rules\TransactionType\IsValidTransactionTypeList;use FireflyIII\Support\Http\Api\AccountFilter;use FireflyIII\Support\Http\Api\TransactionFilter;+use Illuminate\Contracts\Validation\Validator;+use Override;use RuntimeException;class ObjectTypeApiRequest extends ApiRequest@@ -55,7 +56,7 @@ class ObjectTypeApiRequest extends ApiRequestpublic function rules(): array{- $rule = null;+ $rule = null;if (Account::class === $this->objectType) {$rule = new IsValidAccountTypeList();}@@ -86,9 +87,13 @@ class ObjectTypeApiRequest extends ApiRequestdefault:$this->attributes->set('types', []);- // no break+ // no breakcase Account::class:- $this->attributes->set('types', $this->mapAccountTypes($type));+ $types = $this->mapAccountTypes($type);++ // remove system account types because autocomplete doesn't need them.+ $types = array_values(array_diff($types, [AccountTypeEnum::INITIAL_BALANCE->value, AccountTypeEnum::RECONCILIATION->value, AccountTypeEnum::LIABILITY_CREDIT->value]));+ $this->attributes->set('types', $types);break;diff --git a/app/Rules/Account/IsValidAccountTypeList.php b/app/Rules/Account/IsValidAccountTypeList.phpindex 9cb71bf44c..08c2c25894 100644--- a/app/Rules/Account/IsValidAccountTypeList.php+++ b/app/Rules/Account/IsValidAccountTypeList.php@@ -48,7 +48,7 @@ class IsValidAccountTypeList implements ValidationRule$keys = array_keys($this->types);foreach ($values as $entry) {if (!in_array($entry, $keys, true)) {- $fail('validation.invalid_account_list')->translate();+ $fail('validation.invalid_account_list')->translate(['value'=> $entry]);}}}diff --git a/app/Support/Http/Api/AccountFilter.php b/app/Support/Http/Api/AccountFilter.phpindex 00033ec5e1..25d9c08907 100644--- a/app/Support/Http/Api/AccountFilter.php+++ b/app/Support/Http/Api/AccountFilter.php@@ -76,6 +76,7 @@ trait AccountFilterAccountTypeEnum::MORTGAGE->value => [AccountTypeEnum::MORTGAGE->value],AccountTypeEnum::DEBT->value => [AccountTypeEnum::DEBT->value],AccountTypeEnum::CREDITCARD->value => [AccountTypeEnum::CREDITCARD->value],+ AccountTypeEnum::LIABILITY_CREDIT->value => [AccountTypeEnum::LIABILITY_CREDIT->value],'default account' => [AccountTypeEnum::DEFAULT->value],'cash account' => [AccountTypeEnum::CASH->value],'asset account' => [AccountTypeEnum::ASSET->value],@@ -104,6 +105,7 @@ trait AccountFilter$return = array_merge($return, $this->types[$part]);}}+if (0 === count($return)) {$return = $this->types['normal'];}diff --git a/resources/lang/en_US/validation.php b/resources/lang/en_US/validation.phpindex 833154b1e1..7236f38e29 100644--- a/resources/lang/en_US/validation.php+++ b/resources/lang/en_US/validation.php@@ -24,7 +24,7 @@declare(strict_types=1);return [- 'invalid_account_list' => 'Invalid account type list',+ 'invalid_account_list' => 'Invalid account type list entry ":value"','invalid_transaction_type_list' => 'Invalid transaction type list','limit_exists' => 'There is already a budget limit (amount) for this budget and currency in the given period.','invalid_sort_instruction' => 'The sort instruction is invalid for an object of type ":object".',