diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php index 460f3effb3..28ebe99313 100644 --- a/app/Repositories/Bill/BillRepository.php +++ b/app/Repositories/Bill/BillRepository.php @@ -399,7 +399,8 @@ class BillRepository implements BillRepositoryInterface public function nextExpectedMatch(Bill $bill): Carbon { - $finalDate = Carbon::now()->subDays(2); + $finalDate = Carbon::now(); + $finalDate->year = 1900; if ($bill->active == 0) { return $finalDate; } diff --git a/resources/views/list/bills.twig b/resources/views/list/bills.twig index 7b95561765..50747535aa 100644 --- a/resources/views/list/bills.twig +++ b/resources/views/list/bills.twig @@ -45,14 +45,14 @@ {% endif %} - {% if entry.nextExpectedMatch.isFuture %} -
- {% else %} + {% if entry.nextExpectedMatch.year == 1900 %} + {% else %} + {% endif %}