diff --git a/templates/admin/event/ticket/index.html.twig b/templates/admin/event/ticket/index.html.twig index 370a26ee9..5f5755c68 100644 --- a/templates/admin/event/ticket/index.html.twig +++ b/templates/admin/event/ticket/index.html.twig @@ -100,7 +100,7 @@ CB {% elseif a.invoice.paymentType == constant('AppBundle\\Event\\Model\\Ticket::PAYMENT_CHEQUE') %} CHQ - {% elseif a.invoice.paymentType == constant('AppBundle\\Event\\Model\\Ticket::PAYMENT_BANKWIRE')%} + {% elseif a.invoice.paymentType == constant('AppBundle\\Event\\Model\\Ticket::PAYMENT_BANKWIRE') %} VIR {% endif %} @@ -109,15 +109,17 @@ {% if a.lastSubscription == null %} Non trouvée {% elseif a.lastSubscription < 'now'|date('U') %} - À expiré le {{ a.lastSubscription|date('d/m/Y') }} - - URL Paiement - + + À expirée le {{ a.lastSubscription|date('d/m/Y') }} + {% elseif a.lastSubscription < event.dateEnd %} - Expiré le {{ a.lastSubscription|date('d/m/Y') }} - - URL Paiement - + + Expirée le {{ a.lastSubscription|date('d/m/Y') }} + {% else %} OK {% endif %} diff --git a/tests/behat/features/Admin/Events/Inscriptions.feature b/tests/behat/features/Admin/Events/Inscriptions.feature index 43079eef9..7ab2ebf1f 100644 --- a/tests/behat/features/Admin/Events/Inscriptions.feature +++ b/tests/behat/features/Admin/Events/Inscriptions.feature @@ -19,7 +19,7 @@ Feature: Administration - Évènements - Inscriptions Then the ".content h2" element should contain "Inscriptions" And I should see "Michu Bernadette Helios Aerospace 2 Jours Réglé CB n/a" And I should see "Personne Paul 2 Jours AFUP Réglé CB OK" - And I should see "Maurice Jean 2 Jours AFUP Réglé CB Expiré le 08/07/2019 URL Paiement" + And I should see "Maurice Jean 2 Jours AFUP Réglé CB Expirée le 08/07/2019" And I should see "Annulé Lepaiement 2 Jours Annulé CB n/a" And I should see "Super Bénévole AFUP Organisation Invité n/a" And I should see "Kirk James Tiberius 2 Jours Réglé VIR n/a" @@ -34,7 +34,7 @@ Feature: Administration - Évènements - Inscriptions And I press "Filtrer" And I should not see "Michu Bernadette Helios Aerospace 2 Jours Réglé CB n/a" And I should see "Personne Paul 2 Jours AFUP Réglé CB OK" - And I should not see "Maurice Jean 2 Jours AFUP Réglé CB Expiré le 08/07/2019 URL Paiement" + And I should not see "Maurice Jean 2 Jours AFUP Réglé CB Expirée le 08/07/2019" And I should not see "Annulé Lepaiement 2 Jours Annulé CB n/a" And I should not see "Kirk James Tiberius 2 Jours Réglé VIR n/a" And I should not see "Sans Cotisation 2 Jours AFUP Réglé CB Non trouvée"