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

Improve code for recurring transactions.

Browse Source
This commit is contained in:
James Cole
2018-06-21 18:57:51 +02:00
parent 7bdd4ddeab
commit 1d162edb59
15 changed files with 431 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1247,4 +1247,9 @@ return [
'store_new_recurrence' => 'Store recurring transaction',
'stored_new_recurrence' => 'Recurring transaction ":title" stored successfully.',
'edit_recurrence' => 'Edit recurring transaction ":title"',
'recurring_repeats_until' => 'Repeats until :date',
'recurring_repeats_forever' => 'Repeats forever',
'recurring_repeats_x_times' => 'Repeats :count time(s)',
'update_recurrence' => 'Update recurring transaction',
'updated_recurrence' => 'Updated recurring transaction ":title"',
];

14
resources/views/recurring/edit.twig
View File

@@ -4,7 +4,7 @@
{% endblock %}
{% block content %}
<form action="{{ route('recurring.update') }}" method="post" id="store" class="form-horizontal">
{{ Form.model(recurrence, {'class' : 'form-horizontal','enctype': 'multipart/form-data','id' : 'update','url' : route('recurring.update', recurrence.id)}) }}
<input type="hidden" name="_token" value="{{ csrf_token() }}"/>
{# row with recurrence information #}
<div class="row">
@@ -16,7 +16,8 @@
<h3 class="box-title">{{ 'mandatory_for_recurring'|_ }}</h3>
</div>
<div class="box-body">
{{ ExpandedForm.text('title',array.title) }}
<input type="hidden" name="id" value="{{ array.id }}" />
{{ ExpandedForm.text('title') }}
{{ ExpandedForm.date('first_date',array.first_date, {helpText: trans('firefly.help_first_date_no_past')}) }}
{{ ExpandedForm.select('repetition_type', [], null, {helpText: trans('firefly.change_date_other_options')}) }}
{{ ExpandedForm.number('skip', array.recurrence_repetitions[0].repetition_skip) }}
@@ -48,9 +49,8 @@
{{ ExpandedForm.textarea('recurring_description',array.description) }}
{# only correct way to do active checkbox #}
{{ ExpandedForm.checkbox('active', 1) }}
{{ ExpandedForm.checkbox('apply_rules',1) }}
{{ ExpandedForm.checkbox('active', 1, preFilled.active) }}
{{ ExpandedForm.checkbox('apply_rules', 1, preFilled.apply_rules) }}
</div>
</div>
</div>
@@ -162,11 +162,11 @@
<h3 class="box-title">{{ 'options'|_ }}</h3>
</div>
<div class="box-body">
{{ ExpandedForm.optionsList('create','recurrence') }}
{{ ExpandedForm.optionsList('update','recurrence') }}
</div>
<div class="box-footer">
<button type="submit" class="btn pull-right btn-success">
{{ ('store_new_recurrence')|_ }}
{{ ('update_recurrence')|_ }}
</button>
</div>
</div>

11
resources/views/recurring/index.twig
View File

@@ -94,6 +94,17 @@
</li>
{% endfor %}
</ul>
<p>
{% if null == rt.repeat_until and rt.repetitions == 0 %}
{{ 'recurring_repeats_forever'|_ }}
{% endif %}
{% if null != rt.repeat_until and rt.repetitions == 0 %}
{{ trans('firefly.recurring_repeats_until', {date: rt.repeat_until.formatLocalized(monthAndDayFormat)}) }}
{% endif %}
{% if null == rt.repeat_until and rt.repetitions != 0 %}
{{ trans('firefly.recurring_repeats_x_times', {count: rt.repetitions}) }}
{% endif %}
</p>
</td>
</tr>
{% endfor %}