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

Migrate to new rule engine.

Browse Source
This commit is contained in:
James Cole
2020-08-24 07:31:50 +02:00
parent 3141ec0406
commit 9123454545
11 changed files with 181 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
resources/lang/en_US/firefly.php
View File

@@ -397,8 +397,7 @@ return [
'delete_rule' => 'Delete rule ":title"',
'update_rule' => 'Update rule',
'test_rule_triggers' => 'See matching transactions',
'warning_transaction_subset' => 'For performance reasons this list is limited to :max_num_transactions and may only show a subset of matching transactions',
'warning_no_matching_transactions' => 'No matching transactions found. Please note that for performance reasons, only the last :num_transactions transactions have been checked.',
'warning_no_matching_transactions' => 'No matching transactions found.',
'warning_no_valid_triggers' => 'No valid triggers provided.',
'apply_rule_selection' => 'Apply rule ":title" to a selection of your transactions',
'apply_rule_selection_intro' => 'Rules like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run it on a selection of your existing transactions. This can be useful when you have updated a rule and you need the changes to be applied to all of your other transactions.',

82
resources/lang/en_US/form.php
View File

@@ -24,37 +24,37 @@ declare(strict_types=1);
return [
// new user:
'bank_name' => 'Bank name',
'bank_balance' => 'Balance',
'savings_balance' => 'Savings balance',
'credit_card_limit' => 'Credit card limit',
'automatch' => 'Match automatically',
'skip' => 'Skip',
'enabled' => 'Enabled',
'name' => 'Name',
'active' => 'Active',
'amount_min' => 'Minimum amount',
'amount_max' => 'Maximum amount',
'match' => 'Matches on',
'strict' => 'Strict mode',
'repeat_freq' => 'Repeats',
'object_group' => 'Group',
'location' => 'Location',
'update_channel' => 'Update channel',
'currency_id' => 'Currency',
'transaction_currency_id' => 'Currency',
'auto_budget_currency_id' => 'Currency',
'external_ip' => 'Your server\'s external IP',
'attachments' => 'Attachments',
'BIC' => 'BIC',
'verify_password' => 'Verify password security',
'source_account' => 'Source account',
'destination_account' => 'Destination account',
'asset_destination_account' => 'Destination account',
'include_net_worth' => 'Include in net worth',
'asset_source_account' => 'Source account',
'journal_description' => 'Description',
'note' => 'Notes',
'bank_name' => 'Bank name',
'bank_balance' => 'Balance',
'savings_balance' => 'Savings balance',
'credit_card_limit' => 'Credit card limit',
'automatch' => 'Match automatically',
'skip' => 'Skip',
'enabled' => 'Enabled',
'name' => 'Name',
'active' => 'Active',
'amount_min' => 'Minimum amount',
'amount_max' => 'Maximum amount',
'match' => 'Matches on',
'strict' => 'Strict mode',
'repeat_freq' => 'Repeats',
'object_group' => 'Group',
'location' => 'Location',
'update_channel' => 'Update channel',
'currency_id' => 'Currency',
'transaction_currency_id' => 'Currency',
'auto_budget_currency_id' => 'Currency',
'external_ip' => 'Your server\'s external IP',
'attachments' => 'Attachments',
'BIC' => 'BIC',
'verify_password' => 'Verify password security',
'source_account' => 'Source account',
'destination_account' => 'Destination account',
'asset_destination_account' => 'Destination account',
'include_net_worth' => 'Include in net worth',
'asset_source_account' => 'Source account',
'journal_description' => 'Description',
'note' => 'Notes',
'currency' => 'Currency',
'account_id' => 'Asset account',
'budget_id' => 'Budget',
@@ -83,10 +83,10 @@ return [
'interest' => 'Interest',
'interest_period' => 'Interest period',
'type' => 'Type',
'convert_Withdrawal' => 'Convert withdrawal',
'convert_Deposit' => 'Convert deposit',
'convert_Transfer' => 'Convert transfer',
'type' => 'Type',
'convert_Withdrawal' => 'Convert withdrawal',
'convert_Deposit' => 'Convert deposit',
'convert_Transfer' => 'Convert transfer',
'amount' => 'Amount',
'foreign_amount' => 'Foreign amount',
@@ -120,6 +120,8 @@ return [
'stop_processing' => 'Stop processing',
'start_date' => 'Start of range',
'end_date' => 'End of range',
'start' => 'Start of range',
'end' => 'End of range',
'delete_account' => 'Delete account ":name"',
'delete_bill' => 'Delete bill ":name"',
'delete_budget' => 'Delete budget ":name"',
@@ -235,14 +237,14 @@ return [
'expected_on' => 'Expected on',
'paid' => 'Paid',
'auto_budget_type' => 'Auto-budget',
'auto_budget_amount' => 'Auto-budget amount',
'auto_budget_period' => 'Auto-budget period',
'auto_budget_type' => 'Auto-budget',
'auto_budget_amount' => 'Auto-budget amount',
'auto_budget_period' => 'Auto-budget period',
'collected' => 'Collected',
'submitted' => 'Submitted',
'key' => 'Key',
'value' => 'Content of record'
'key' => 'Key',
'value' => 'Content of record',
];

14
resources/views/v1/list/journals-array-tiny.twig
View File

@@ -1,10 +1,12 @@
<div class="list-group">
{% for journal in journals %}
<a class="list-group-item" href="{{ route('transactions.show', [journal.transaction_group_id]) }}">
{{ journal.description }}
<span class="pull-right small">
{{ journalArrayAmount(journal) }}
{% for group in groups %}
{% for transaction in group.transactions %}
<a class="list-group-item" href="{{ route('transactions.show', [transaction.transaction_group_id]) }}">
{{ transaction.description }}
<span class="pull-right small">
X
</span>
</a>
</a>
{% endfor %}
{% endfor %}
</div>

4
resources/views/v1/rules/rule-group/select-transactions.twig
View File

@@ -26,8 +26,8 @@
</p>
<div class="row">
<div class="col-lg-6 col-md-8 col-sm-12 col-xs-12">
{{ ExpandedForm.date('start_date', first) }}
{{ ExpandedForm.date('end_date', today) }}
{{ ExpandedForm.date('start', first) }}
{{ ExpandedForm.date('end', today) }}
{{ AccountForm.assetAccountCheckList('accounts', {'select_all': true,'class': 'account-checkbox', 'label': trans('firefly.include_transactions_from_accounts') }) }}
</div>
</div>

4
resources/views/v1/rules/rule/select-transactions.twig
View File

@@ -26,8 +26,8 @@
</p>
<div class="row">
<div class="col-lg-6 col-md-8 col-sm-12 col-xs-12">
{{ ExpandedForm.date('start_date', first) }}
{{ ExpandedForm.date('end_date', today) }}
{{ ExpandedForm.date('start', first) }}
{{ ExpandedForm.date('end', today) }}
{{ AccountForm.assetAccountCheckList('accounts', {'select_all': true, 'class': 'account-checkbox', 'label': trans('firefly.include_transactions_from_accounts') }) }}
</div>
</div>