diff --git a/app/Support/Search/Search.php b/app/Support/Search/Search.php index 3bd636d82d..7d62c2cff7 100644 --- a/app/Support/Search/Search.php +++ b/app/Support/Search/Search.php @@ -195,6 +195,7 @@ class Search implements SearchInterface switch ($modifier['type']) { default: die(sprintf('unsupported modifier: "%s"', $modifier['type'])); + case 'from': case 'source': // source can only be asset, liability or revenue account: $searchTypes = [AccountType::ASSET, AccountType::MORTGAGE, AccountType::LOAN, AccountType::DEBT, AccountType::REVENUE]; @@ -203,6 +204,7 @@ class Search implements SearchInterface $totalAccounts = $accounts->merge($totalAccounts); } break; + case 'to': case 'destination': // source can only be asset, liability or expense account: $searchTypes = [AccountType::ASSET, AccountType::MORTGAGE, AccountType::LOAN, AccountType::DEBT, AccountType::EXPENSE]; diff --git a/config/firefly.php b/config/firefly.php index 1cfa32e383..a3c7c42441 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -513,7 +513,7 @@ return [ 'default_currency' => 'EUR', 'default_language' => 'en_US', 'search_modifiers' => ['amount_is', 'amount', 'amount_max', 'amount_min', 'amount_less', 'amount_more', 'source', 'destination', 'category', - 'budget', 'bill', 'type', 'date', 'date_before', 'date_after', 'on', 'before', 'after'], + 'budget', 'bill', 'type', 'date', 'date_before', 'date_after', 'on', 'before', 'after','from','to'], // tag notes has_attachments 'cer_providers' => [ 'fixer' => FixerIOv2::class, diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 1216f10339..5556b8af0b 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -221,21 +221,23 @@ return [ 'search_query' => 'Query', 'search_found_transactions' => 'Firefly III found :count transaction(s) in :time seconds.', 'search_for_query' => 'Firefly III is searching for transactions with all of these words in them: :query', - 'search_modifier_amount_is' => 'Amount is exactly :value', - 'search_modifier_amount' => 'Amount is exactly :value', - 'search_modifier_amount_max' => 'Amount is at most :value', - 'search_modifier_amount_min' => 'Amount is at least :value', - 'search_modifier_amount_less' => 'Amount is less than :value', - 'search_modifier_amount_more' => 'Amount is more than :value', - 'search_modifier_source' => 'Source account is :value', - 'search_modifier_destination' => 'Destination account is :value', - 'search_modifier_category' => 'Category is :value', - 'search_modifier_budget' => 'Budget is :value', - 'search_modifier_bill' => 'Bill is :value', - 'search_modifier_type' => 'Transaction type is :value', - 'search_modifier_date' => 'Transaction date is :value', - 'search_modifier_date_before' => 'Transaction date is before :value', - 'search_modifier_date_after' => 'Transaction date is after :value', + 'search_modifier_amount_is' => 'Amount is exactly :value', + 'search_modifier_amount' => 'Amount is exactly :value', + 'search_modifier_amount_max' => 'Amount is at most :value', + 'search_modifier_amount_min' => 'Amount is at least :value', + 'search_modifier_amount_less' => 'Amount is less than :value', + 'search_modifier_amount_more' => 'Amount is more than :value', + 'search_modifier_source' => 'Source account is :value', + 'search_modifier_from' => 'Source account is :value', + 'search_modifier_destination' => 'Destination account is :value', + 'search_modifier_to' => 'Destination account is :value', + 'search_modifier_category' => 'Category is :value', + 'search_modifier_budget' => 'Budget is :value', + 'search_modifier_bill' => 'Bill is :value', + 'search_modifier_type' => 'Transaction type is :value', + 'search_modifier_date' => 'Transaction date is :value', + 'search_modifier_date_before' => 'Transaction date is before :value', + 'search_modifier_date_after' => 'Transaction date is after :value', 'search_modifier_on' => 'Transaction date is :value', 'search_modifier_before' => 'Transaction date is before :value', 'search_modifier_after' => 'Transaction date is after :value',