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

Code and tests for #1450

Browse Source
This commit is contained in:
James Cole
2018-09-15 13:43:57 +02:00
parent fa347f5f75
commit 57b4a5be08
16 changed files with 1089 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -425,6 +425,12 @@ return [
'rule_action_link_to_bill_choice' => 'Link to a bill..',
'rule_action_link_to_bill' => 'Link to bill ":action_value"',
'rule_action_set_notes' => 'Set notes to ":action_value"',
'rule_action_convert_deposit_choice' => 'Convert the transaction to a deposit',
'rule_action_convert_deposit' => 'Convert the transaction to a deposit from ":action_value"',
'rule_action_convert_withdrawal_choice' => 'Convert the transaction to a withdrawal',
'rule_action_convert_withdrawal' => 'Convert the transaction to a withdrawal to ":action_value"',
'rule_action_convert_transfer_choice' => 'Convert the transaction to a transfer',
'rule_action_convert_transfer' => 'Convert the transaction to a transfer with ":action_value"',
'rules_have_read_warning' => 'Have you read the warning?',
'apply_rule_warning' => 'Warning: running a rule(group) on a large selection of transactions could take ages, and it could time-out. If it does, the rule(group) will only be applied to an unknown subset of your transactions. This might leave your financial administration in tatters. Please be careful.',

14
resources/views/rules/partials/action.twig
View File

@@ -3,13 +3,7 @@
<a href="#" class="btn btn-danger btn-sm remove-action"><i class="fa fa-trash"></i></a>
</td>
<td style="width:30%;">
{#
{% if errors.has('rule-action.'~count) %}
<span class="form-control-feedback"><i class="fa fa-fw fa-remove"></i></span>
<p class="text-danger">{{ errors.first('rule-action.'~count) }}</p>
{% endif %}
#}
{# todo error when invalid name. #}
<select name="rule_actions[{{ count }}][name]" class="form-control">
{% for key,name in allRuleActions() %}
<option value="{{ key }}" label="{{ name }}" {% if key == oldAction %} selected{% endif %}>{{ name }}</option>
@@ -20,13 +14,11 @@
<input autocomplete="off" type="text" value="{{ oldValue }}" name="rule_actions[{{ count }}][value]"
class="form-control">
{#
{% if errors.has(('rule-action-value.'~count)) %}
{% if errors.has('rule_actions.'~count~'.value') %}
<p class="text-danger">
{{ errors.first('rule-action-value.'~count) }}
{{ errors.first('rule_actions.'~count~'.value') }}
</p>
{% endif %}
#}
</td>
<td style="width:20%;">
<div class="checkbox">

6
resources/views/rules/partials/trigger.twig
View File

@@ -23,13 +23,11 @@
<td style="position: relative;">
<input autocomplete="off" type="text" value="{{ oldValue }}" name="rule_triggers[{{ count }}][value]" class="form-control">
{#
{% if errors.has(('rule-trigger-value.'~count)) %}
{% if errors.has('rule_triggers.'~count~'.value') %}
<p class="text-danger">
{{ errors.first('rule-trigger-value.'~count) }}
{{ errors.first('rule_triggers.'~count~'.value') }}
</p>
{% endif %}
#}
</td>
<td style="width:20%;">
<div class="checkbox">