kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-12 09:52:20 +00:00
Code Issues Projects Releases Wiki Activity

Because nextExpectedMatch() must return a date (and cannot return null) the list of bills will show "unknown" when the bill is next expected in 1900.

Browse Source
This commit is contained in:
James Cole
2016-02-10 06:55:08 +01:00
parent 1f2b37b70e
commit 807dede90a
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Repositories/Bill/BillRepository.php
View File

@@ -399,7 +399,8 @@ class BillRepository implements BillRepositoryInterface
public function nextExpectedMatch(Bill $bill): Carbon public function nextExpectedMatch(Bill $bill): Carbon
{ {
$finalDate = Carbon::now()->subDays(2); $finalDate = Carbon::now();
$finalDate->year = 1900;
if ($bill->active == 0) { if ($bill->active == 0) {
return $finalDate; return $finalDate;
} }

10
resources/views/list/bills.twig
View File

@@ -45,14 +45,14 @@
</td> </td>
{% endif %} {% endif %}
{% if entry.nextExpectedMatch.isFuture %} {% if entry.nextExpectedMatch.year == 1900 %}
<td class="hidden-sm hidden-xs" data-value="{{ entry.nextExpectedMatch.format('U') }}">
{{ entry.nextExpectedMatch.formatLocalized(monthAndDayFormat) }}
</td>
{% else %}
<td class="hidden-sm hidden-xs" data-value="0"> <td class="hidden-sm hidden-xs" data-value="0">
<em>{{ 'unknown'|_ }}</em> <em>{{ 'unknown'|_ }}</em>
</td> </td>
{% else %}
<td class="hidden-sm hidden-xs" data-value="{{ entry.nextExpectedMatch.format('U') }}">
{{ entry.nextExpectedMatch.formatLocalized(monthAndDayFormat) }}
</td>
{% endif %} {% endif %}
<td class="hidden-sm hidden-xs" data-value="{{ entry.active }}"> <td class="hidden-sm hidden-xs" data-value="{{ entry.active }}">