Merge pull request #317 from LUCILE-DECROZANT-TRIQUENAUX-EIRL/develop

Merge #316
LUCILE-DECROZANT-TRIQUENAUX-EIRL · Mar 30, 2023 · 521457a · 521457a
2 parents cfd0008 + dcc53a8
commit 521457a
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Controller/Ajax/PeopleAjaxController.php b/src/Controller/Ajax/PeopleAjaxController.php
@@ -166,13 +166,13 @@ public function getMembershipsListAction(People $people)
                 'type_label' => $membership->getType()->getLabel(),
                 'type_description' => $membership->getType()->getDescription(),
                 'price' => $membership->getType()->getDefaultAmount(),
-                'date_start' => $membership->getDateStart()->format('d/m/Y'),
-                'date_end' => $membership->getDateEnd()->format('d/m/Y'),
+                'date_start' => $membership->getDateStart()?->format('d/m/Y'),
+                'date_end' => $membership->getDateEnd()?->format('d/m/Y'),
                 'payment' => [
                     'amount' => $payment->getAmount(),
                     'mean' => $payment->getType()->getLabel(),
-                    'date_received' => $payment->getDateReceived()->format('d/m/Y'),
-                    'date_cashed' => $payment->getDateCashed()->format('d/m/Y'),
+                    'date_received' => $payment->getDateReceived()?->format('d/m/Y'),
+                    'date_cashed' => $payment->getDateCashed()?->format('d/m/Y'),
                     'payer' => [
                         'id' => $payment->getPayer()->getId(),
                         'denomination' => $payment->getPayer()->getDenomination()->getLabel(),