kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-30 02:26:58 +00:00
Code Issues Projects Releases Wiki Activity

Clean up rule form.

Browse Source
This commit is contained in:
James Cole
2022-10-03 05:49:25 +02:00
parent 38bdd6c36c
commit db2485f97a
4 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/v1/js/ff/rules/select-transactions.js vendored
View File

@@ -29,7 +29,4 @@ $(document).ready(function () {
} }
); );
} }
// $('form.form-horizontal').on('submit', function () {
// return confirm(askReadWarning);
// });
}); });

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

@@ -1213,17 +1213,14 @@ return [
'rule_action_append_notes_to_descr' => 'Append notes to description', 'rule_action_append_notes_to_descr' => 'Append notes to description',
'rule_action_move_descr_to_notes' => 'Replace notes with description', 'rule_action_move_descr_to_notes' => 'Replace notes with description',
'rule_action_move_notes_to_descr' => 'Replace description with notes', 'rule_action_move_notes_to_descr' => 'Replace description with notes',
'rulegroup_for_bills_title' => 'Rule group for bills',
'rules_have_read_warning' => 'Have you read the warning ? ', 'rulegroup_for_bills_description' => 'A special rule group for all the rules that involve bills.',
'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 . ', 'rule_for_bill_title' => 'Auto-generated rule for bill ":name"',
'rulegroup_for_bills_title' => 'Rule group for bills', 'rule_for_bill_description' => 'This rule is auto-generated to try to match bill ":name".',
'rulegroup_for_bills_description' => 'A special rule group for all the rules that involve bills . ', 'create_rule_for_bill' => 'Create a new rule for bill ":name"',
'rule_for_bill_title' => 'Auto - generated rule for bill ":name"', 'create_rule_for_bill_txt' => 'You have just created a new bill called ":name", congratulations!Firefly III can automagically match new withdrawals to this bill. For example, whenever you pay your rent, the bill "rent" will be linked to the expense. This way, Firefly III can accurately show you which bills are due and which ones aren\'t. In order to do so, a new rule must be created. Firefly III has filled in some sensible defaults for you. Please make sure these are correct. If these values are correct, Firefly III will automatically link the correct withdrawal to the correct bill. Please check out the triggers to see if they are correct, and add some if they\'re wrong.',
'rule_for_bill_description' => 'This rule is auto - generated to try to match bill ":name" . ', 'new_rule_for_bill_title' => 'Rule for bill ":name"',
'create_rule_for_bill' => 'Create a new rule for bill ":name"', 'new_rule_for_bill_description' => 'This rule marks transactions for bill ":name".',
'create_rule_for_bill_txt' => 'You have just created a new bill called ":name", congratulations!Firefly III can automagically match new withdrawals to this bill . for example, whenever you pay your rent, the bill "rent" will be linked to the expense . This way, Firefly III can accurately show you which bills are due and which ones aren\'t. In order to do so, a new rule must be created. Firefly III has filled in some sensible defaults for you. Please make sure these are correct. If these values are correct, Firefly III will automatically link the correct withdrawal to the correct bill. Please check out the triggers to see if they are correct, and add some if they\'re wrong.',
'new_rule_for_bill_title' => 'Rule for bill ":name"',
'new_rule_for_bill_description' => 'This rule marks transactions for bill ":name".',
'new_rule_for_journal_title' => 'Rule based on transaction ":description"', 'new_rule_for_journal_title' => 'Rule based on transaction ":description"',
'new_rule_for_journal_description' => 'This rule is based on transaction ":description". It will match transactions that are exactly the same.', 'new_rule_for_journal_description' => 'This rule is based on transaction ":description". It will match transactions that are exactly the same.',

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

@@ -21,9 +21,6 @@
<p> <p>
{{ trans('firefly.apply_rule_group_selection_intro', {title: ruleGroup.title}) }} {{ trans('firefly.apply_rule_group_selection_intro', {title: ruleGroup.title}) }}
</p> </p>
<p class="text-danger">
{{ 'apply_rule_warning'|_ }}
</p>
<div class="row"> <div class="row">
<div class="col-lg-6 col-md-8 col-sm-12 col-xs-12"> <div class="col-lg-6 col-md-8 col-sm-12 col-xs-12">
{{ ExpandedForm.date('start', first) }} {{ ExpandedForm.date('start', first) }}
@@ -42,9 +39,6 @@
</form> </form>
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
<script type="text/javascript" nonce="{{ JS_NONCE }}">
var askReadWarning = "{{ trans('firefly.rules_have_read_warning')|escape('js') }}";
</script>
<script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script> <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
<script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script> <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
<script type="text/javascript" src="v1/js/ff/rules/select-transactions.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script> <script type="text/javascript" src="v1/js/ff/rules/select-transactions.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>

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

@@ -21,9 +21,6 @@
<p> <p>
{{ trans('firefly.apply_rule_selection_intro', {title: rule.title}) }} {{ trans('firefly.apply_rule_selection_intro', {title: rule.title}) }}
</p> </p>
<p class="text-danger">
{{ 'apply_rule_warning'|_ }}
</p>
<div class="row"> <div class="row">
<div class="col-lg-6 col-md-8 col-sm-12 col-xs-12"> <div class="col-lg-6 col-md-8 col-sm-12 col-xs-12">
{{ ExpandedForm.date('start', first) }} {{ ExpandedForm.date('start', first) }}
@@ -42,9 +39,6 @@
</form> </form>
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
<script type="text/javascript" nonce="{{ JS_NONCE }}">
var askReadWarning = "{{ trans('firefly.rules_have_read_warning')|escape('js') }}";
</script>
<script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script> <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
<script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script> <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
<script type="text/javascript" src="v1/js/ff/rules/select-transactions.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script> <script type="text/javascript" src="v1/js/ff/rules/select-transactions.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>