mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-12-12 01:42:32 +00:00
Allow rule to be applied to transactions (not just group).
This commit is contained in:
James Cole
@@ -6,16 +6,9 @@
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-12 col-md-12 col-sm-12">
|
||||
<div class="box box-primary">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title">{{ 'rules'|_ }}</h3>
|
||||
</div>
|
||||
<div class="box-body">
|
||||
<p>
|
||||
{{ 'rules_explanation'|_ }}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<p>
|
||||
<a href="{{ route('rule-groups.create') }}" class="btn btn-success">{{ 'new_rule_group'|_ }}</a>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -38,12 +31,11 @@
|
||||
<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i
|
||||
class="fa fa-ellipsis-v"></i></button>
|
||||
<ul class="dropdown-menu" role="menu">
|
||||
<li><a href="{{ route('rule-groups.edit',ruleGroup.id) }}"><i
|
||||
class="fa fa-fw fa-pencil"></i> {{ 'edit'|_ }}</a></li>
|
||||
<li><a href="{{ route('rule-groups.delete',ruleGroup.id) }}"><i
|
||||
class="fa fa-fw fa-trash"></i> {{ 'delete'|_ }}</a></li>
|
||||
<li><a href="{{ route('rule-groups.edit',ruleGroup.id) }}"><i class="fa fa-fw fa-pencil"></i> {{ 'edit'|_ }}</a></li>
|
||||
<li><a href="{{ route('rule-groups.delete',ruleGroup.id) }}"><i class="fa fa-fw fa-trash"></i> {{ 'delete'|_ }}</a></li>
|
||||
<li><a href="{{ route('rule-groups.select-transactions',ruleGroup.id) }}"><i
|
||||
class="fa fa-fw fa-anchor"></i> {{ 'execute_on_existing_transactions_short'|_ }}</a></li>
|
||||
class="fa fa-fw fa-power-off"></i> {{ trans('firefly.apply_rule_group_selection', {title: ruleGroup.title}) }}
|
||||
</a></li>
|
||||
{% if ruleGroup.order > 1 %}
|
||||
<li><a href="{{ route('rule-groups.up',ruleGroup.id) }}"><i
|
||||
class="fa fa-fw fa-arrow-up"></i> {{ 'move_rule_group_up'|_ }}</a></li>
|
||||
@@ -67,7 +59,10 @@
|
||||
<table class="table table-hover table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th colspan="2">{{ 'rule_name'|_ }}</th>
|
||||
<th> </th>
|
||||
<th> </th>
|
||||
<th> </th>
|
||||
<th>{{ 'rule_name'|_ }}</th>
|
||||
<th class="hidden-xs">{{ 'rule_triggers'|_ }}</th>
|
||||
<th class="hidden-xs">{{ 'rule_actions'|_ }}</th>
|
||||
</tr>
|
||||
@@ -96,6 +91,10 @@
|
||||
<a href="#" class="btn btn-default"><span
|
||||
class="fa fa-fw"></span></a>
|
||||
{% endif %}
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<div class="btn-group btn-group-xs">
|
||||
<a title="{{ 'edit'|_ }}" href="{{ route('rules.edit', rule.id) }}"
|
||||
class="btn btn-default"><span
|
||||
class="fa fa-fw fa-pencil"></span></a>
|
||||
@@ -104,13 +103,18 @@
|
||||
class="btn btn-danger"><span
|
||||
class="fa fa-fw fa-trash"></span></a>
|
||||
</div>
|
||||
<br/>
|
||||
</td>
|
||||
<td>
|
||||
<div class="btn-group btn-group-xs">
|
||||
<a href="{{ route('rule-groups.select-transactions',ruleGroup.id) }}" class="btn btn-default"
|
||||
title=" {{ 'execute_on_existing_transactions_short'|_ }}">
|
||||
<i class="fa fa-fw fa-check-circle"></i></a>
|
||||
</div>
|
||||
{# show which transactions would match #}
|
||||
<a href="#" class="btn btn-default test_rule_triggers" data-id="{{ rule.id }}"
|
||||
title="{{ 'test_rule_triggers'|_ }}"><i data-id="{{ rule.id }}" class="fa fa-fw fa-flask"></i></a>
|
||||
|
||||
{# actually execute rule #}
|
||||
<a href="{{ route('rules.select-transactions',ruleGroup.id) }}" class="btn btn-default"
|
||||
title=" {{ trans('firefly.apply_rule_selection', {title: rule.title}) }}">
|
||||
<i class="fa fa-fw fa-power-off "></i></a>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
{% if rule.active %}
|
||||
@@ -188,6 +192,8 @@
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
||||
{% include '/rules/partials/test-trigger-modal' %}
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-12 col-md-12 col-sm-12">
|
||||
<a href="{{ route('rule-groups.create') }}" class="btn btn-success">{{ 'new_rule_group'|_ }}</a>
|
||||
|
||||
@@ -14,12 +14,12 @@
|
||||
|
||||
<div class="box box-primary">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title">{{ 'execute_on_existing_transactions'|_ }}</h3>
|
||||
<h3 class="box-title">{{ subTitle }}</h3>
|
||||
</div>
|
||||
<div class="box-body">
|
||||
<div id="form-body">
|
||||
<p>
|
||||
{{ 'execute_on_existing_transactions_intro'|_ }}
|
||||
{{ trans('firefly.apply_rule_group_selection_intro', {title: ruleGroup.title}) }}
|
||||
</p>
|
||||
<div class="row">
|
||||
<div class="col-lg-6 col-md-8 col-sm-12 col-xs-12">
|
||||
|
||||
@@ -62,7 +62,7 @@
|
||||
<p>
|
||||
<br/>
|
||||
<a href="#" class="btn btn-default add_rule_trigger">{{ 'add_rule_trigger'|_ }}</a>
|
||||
<a href="#" class="btn btn-default test_rule_triggers">{{ 'test_rule_triggers'|_ }}</a>
|
||||
<a href="#" class="btn btn-default test_rule_triggers"><i class="fa fa-flask"></i> {{ 'test_rule_triggers'|_ }}</a>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
52
resources/views/rules/rule/select-transactions.twig
Normal file
52
resources/views/rules/rule/select-transactions.twig
Normal file
@@ -0,0 +1,52 @@
|
||||
{% extends "./layout/default" %}
|
||||
|
||||
{% block breadcrumbs %}
|
||||
{{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, rule) }}
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<form method="POST" action="{{ route('rules.execute', rule.id) }}" accept-charset="UTF-8" class="form-horizontal" id="execute-rule">
|
||||
<input name="_token" type="hidden" value="{{ csrf_token() }}">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-12 col-sm-12 col-xs-12">
|
||||
|
||||
<div class="box box-primary">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title">{{ subTitle }}</h3>
|
||||
</div>
|
||||
<div class="box-body">
|
||||
<div id="form-body">
|
||||
<p>
|
||||
{{ trans('firefly.apply_rule_selection_intro', {title: rule.title}) }}
|
||||
</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) }}
|
||||
|
||||
<!-- ACCOUNTS -->
|
||||
{{ ExpandedForm.multiCheckbox('accounts',accountList, checkedAccounts, {' class': 'account-checkbox', 'label': trans('firefly.include_transactions_from_accounts') }) }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="box-footer">
|
||||
<input type="submit" name="submit" value="{{ 'execute'|_ }}" id="do-execute-button" class="btn btn-success pull-right"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
{% endblock %}
|
||||
{% block scripts %}
|
||||
<script type="text/javascript" src="js/lib/modernizr-custom.js"></script>
|
||||
<script type="text/javascript" src="js/lib/jquery-ui.min.js"></script>
|
||||
<script type="text/javascript" src="js/ff/rules/select-transactions.js"></script>
|
||||
{% endblock %}
|
||||
|
||||
{% block styles %}
|
||||
<link href="css/jquery-ui/jquery-ui.structure.min.css" type="text/css" rel="stylesheet" media="all">
|
||||
<link href="css/jquery-ui/jquery-ui.theme.min.css" type="text/css" rel="stylesheet" media="all">
|
||||
{% endblock %}
|
||||
Reference in New Issue
Block a user