Ref #332: Fixed the way we generate the payment list in the paymentAj…

…axController
LUCILE-DECROZANT-TRIQUENAUX-EIRL · Apr 15, 2024 · abc7019 · abc7019
1 parent 2268636
commit abc7019
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/Controller/Ajax/PeopleAjaxController.php b/src/Controller/Ajax/PeopleAjaxController.php
@@ -262,24 +262,28 @@ public function getPaymentsListAction(People $people)
  $paymentsData = [];
  foreach ($people->getPayments() as $payment) {
  $usedForLabel = '';
- if (empty($payment->getDonation())) {
+ if (!empty($payment->getMembership()) && empty($payment->getDonation())) {
  $usedForLabel = sprintf(
  'Adhésion (%s, %s €)',
  $payment->getMembership()->getType()->getLabel(),
  $payment->getMembership()->getType()->getDefaultAmount()
  );
- } else {
- if (!empty($payment->getMembership())) {
+ } else if (!empty($payment->getMembership()) && !empty($payment->getDonation())) {
  $usedForLabel = sprintf(
  'Adhésion (%s, %s €) et don (%s €)',
  $payment->getMembership()->getType()->getLabel(),
  $payment->getMembership()->getType()->getDefaultAmount(),
  $payment->getDonation()->getAmount()
  );
- } else {
- $usedForLabel = 'Don';
- }
+ } else if (empty($payment->getMembership()) && !empty($payment->getDonation())) {
+ $usedForLabel = sprintf(
+ 'Don (%s €)',
+ $payment->getDonation()->getAmount()
+ );
+ } else {
+ continue;
  }
+
  $formattedDonation = [
  'id' => $payment->getId(),
  'usage' => $usedForLabel,