kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-06 22:21:42 +00:00
Code Issues Projects Releases Wiki Activity

Various extensions to recurring transactions.

Browse Source
This commit is contained in:
James Cole
2018-06-26 18:49:33 +02:00
parent 7591f3fa29
commit 5d01955133
12 changed files with 88 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1261,5 +1261,11 @@ return [
'updated_recurrence' => 'Updated recurring transaction ":title"',
'recurrence_is_inactive' => 'This recurring transaction is not active and will not generate new transactions.',
'delete_recurring' => 'Delete recurring transaction ":title"',
'new_recurring_transaction' => 'New recurring transaction',
'help_weekend' => 'What should Firefly III do when the recurring transaction falls on a Saturday or Sunday?',
'do_nothing' => 'Just create the transaction',
'skip_transaction' => 'Skip the occurence',
'jump_to_friday' => 'Create the transaction on the previous Friday instead',
'jump_to_monday' => 'Create the transaction on the next Monday instead',
'recurrence_deleted' => 'Recurring transaction ":title" deleted',
];

1
resources/lang/en_US/form.php
View File

@@ -236,5 +236,6 @@ return [
'repetition_end' => 'Repetition ends',
'repetitions' => 'Repetitions',
'calendar' => 'Calendar',
'weekend' => 'Weekend',
];

9
resources/views/partials/control-bar.twig
View File

@@ -105,6 +105,15 @@
</div>
</a>
</li>
<li>
<a href="{{ route('recurring.create') }}">
<i class="menu-icon fa fa-paint-brush bg-teal"></i>
<div class="menu-info">
<h4 class="control-sidebar-subheading">{{ 'new_recurring_transaction'|_ }}</h4>
</div>
</a>
</li>
</ul>

1
resources/views/recurring/create.twig
View File

@@ -21,6 +21,7 @@
{{ ExpandedForm.select('repetition_type', [], null, {helpText: trans('firefly.change_date_other_options')}) }}
{{ ExpandedForm.number('skip', 0) }}
{{ ExpandedForm.select('repetition_end', repetitionEnds) }}
{{ ExpandedForm.select('weekend', weekendResponses, null, {helpText: trans('firefly.help_weekend')}) }}
{{ ExpandedForm.date('repeat_until',null) }}
{{ ExpandedForm.number('repetitions',null) }}