From a9da7f1282b5b2fd07ea72cc1849edb2534506fe Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Thu, 25 Apr 2024 22:36:55 +0200 Subject: [PATCH] Fix missing end date --- galette/lib/Galette/Entity/Contribution.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/galette/lib/Galette/Entity/Contribution.php b/galette/lib/Galette/Entity/Contribution.php index aa9c1ce41..62a859e84 100644 --- a/galette/lib/Galette/Entity/Contribution.php +++ b/galette/lib/Galette/Entity/Contribution.php @@ -284,13 +284,10 @@ private function retrieveEndDate(): void } } - // Caution : the end_date to retrieve is the day before the next_begin_date. $end_date = clone $next_begin_date; - $end_date->sub(new DateInterval('P1D')); } else { $dext = new DateInterval('P' . $this->type->extension . 'M'); $end_date = $begin_date->add($dext); - $end_date->sub(new DateInterval('P1D')); //-1 day } } elseif ($preferences->pref_membership_ext != '') { //case membership extension @@ -301,13 +298,15 @@ private function retrieveEndDate(): void // Caution : the end_date to retrieve is the day before the next_begin_date. $next_begin_date = $begin_date->add($dext); $end_date = clone $next_begin_date; - $end_date->sub(new DateInterval('P1D')); - $this->end_date = $end_date->format('Y-m-d'); } else { throw new \RuntimeException( 'Unable to define end date; none of pref_beg_membership nor pref_membership_ext are defined!' ); } + + // Caution : the end_date to retrieve is the day before the next_begin_date. + $end_date->sub(new DateInterval('P1D')); + $this->end_date = $end_date->format('Y-m-d'); } /**