kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-21 11:48:53 +00:00
Code Issues Projects Releases Wiki Activity

Add info on expired recurring transactions.

Browse Source
This commit is contained in:
James Cole
2020-05-04 10:12:38 +02:00
parent 2ff8a35171
commit 6f6087995d
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/Recurring/IndexController.php
View File

@@ -85,6 +85,8 @@ class IndexController extends Controller
$page = 0 === (int) $request->get('page') ? 1 : (int) $request->get('page'); $page = 0 === (int) $request->get('page') ? 1 : (int) $request->get('page');
$pageSize = (int) app('preferences')->get('listPageSize', 50)->data; $pageSize = (int) app('preferences')->get('listPageSize', 50)->data;
$collection = $this->recurring->get(); $collection = $this->recurring->get();
$today = new Carbon;
$year = new Carbon;
// split collection // split collection
$total = $collection->count(); $total = $collection->count();
@@ -98,8 +100,7 @@ class IndexController extends Controller
$recurring = []; $recurring = [];
/** @var Recurrence $recurrence */ /** @var Recurrence $recurrence */
foreach ($recurrences as $recurrence) { foreach ($recurrences as $recurrence) {
$today = new Carbon;
$year = new Carbon;
$year->addYear(); $year->addYear();
if ($recurrence->first_date > $today) { if ($recurrence->first_date > $today) {
$today = clone $recurrence->first_date; $today = clone $recurrence->first_date;
@@ -123,7 +124,7 @@ class IndexController extends Controller
$this->verifyRecurringCronJob(); $this->verifyRecurringCronJob();
return view('recurring.index', compact('paginator', 'page', 'pageSize', 'total')); return view('recurring.index', compact('paginator', 'today', 'page', 'pageSize', 'total'));
} }
} }

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

@@ -1519,6 +1519,7 @@ return [
// recurring transactions // recurring transactions
'recurrences' => 'Recurring transactions', 'recurrences' => 'Recurring transactions',
'repeat_until_in_past' => 'This recurring transaction stopped repeating on :date.',
'recurring_calendar_view' => 'Calendar', 'recurring_calendar_view' => 'Calendar',
'no_recurring_title_default' => 'Let\'s create a recurring transaction!', 'no_recurring_title_default' => 'Let\'s create a recurring transaction!',
'no_recurring_intro_default' => 'You have no recurring transactions yet. You can use these to make Firefly III automatically create transactions for you.', 'no_recurring_intro_default' => 'You have no recurring transactions yet. You can use these to make Firefly III automatically create transactions for you.',

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

@@ -85,6 +85,11 @@
</ol> </ol>
</td> </td>
<td> <td>
{% if null != rt.repeat_until and today > rt.repeat_until %}
<span class="text-danger">
{{ trans('firefly.repeat_until_in_past', {date: rt.repeat_until.formatLocalized(monthAndDayFormat) }) }}
</span>
{% endif %}
<ul> <ul>
{% for rep in rt.repetitions %} {% for rep in rt.repetitions %}
<li>{{ rep.description }} <li>{{ rep.description }}