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

Fix some things in recurring transactions.

Browse Source
This commit is contained in:
James Cole
2020-05-04 10:26:01 +02:00
parent 6f6087995d
commit be8286b15c
5 changed files with 56 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
resources/views/v1/recurring/index.twig
View File

@@ -100,13 +100,13 @@
({{ trans('firefly.recurring_skips_more', {count: rep.repetition_skip})|lower }}).
{% endif %}
{% if rep.weekend == 3 %}
{{ 'will_jump_friday'|_ }}
<br>{{ 'will_jump_friday'|_ }}
{% endif %}
{% if rep.weekend == 4 %}
{{ 'will_jump_monday'|_ }}
<br>{{ 'will_jump_monday'|_ }}
{% endif %}
{% if rep.weekend == 2 %}
{{ 'except_weekends'|_ }}
<br>{{ 'except_weekends'|_ }}
{% endif %}
</li>
{% endfor %}
@@ -123,11 +123,15 @@
{% endif %}
</p>
</td>
{% if rt.occurrences|length == 0 %}
<td>&nbsp;</td>
{% else %}
<td>{{ rt.occurrences[0].formatLocalized(monthAndDayFormat) }}</td>
{% endif %}
<td>
<ul>
{% for rep in rt.repetitions %}
{% for occ in rep.occurrences %}
<li>{{ occ.formatLocalized(monthAndDayFormat) }}</li>
{% endfor %}
{% endfor %}
</ul>
</td>
</tr>
{% endfor %}
</tbody>

6
resources/views/v1/recurring/show.twig
View File

@@ -52,7 +52,11 @@
</h3>
</div>
<div class="box-body">
{% if null != array.repeat_until and today > array.repeat_until %}
<span class="text-danger">
{{ trans('firefly.repeat_until_in_past', {date: array.repeat_until.formatLocalized(monthAndDayFormat) }) }}
</span>
{% endif %}
<ul>
{% for rep in array.repetitions %}
<li>