Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions templates/admin/event/ticket/index.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
</td>
Expand All @@ -109,15 +109,17 @@
{% if a.lastSubscription == null %}
<span class="ui blue label">Non trouvée</span>
{% elseif a.lastSubscription < 'now'|date('U') %}
<span class="ui red label">À expiré le {{ a.lastSubscription|date('d/m/Y') }}</span>
<a class="compact ui tiny icon button" href="/pages/event-payment/?ref=ins-{{ a.ticket.id }}&forum={{ event.id }}">
URL Paiement
</a>
<span class="ui red label"
data-tooltip="Cette personne n'aura pas de cotisation à jour pendant l'évènement (nécessaire pour ce tarif)."
data-position="left center">
À expirée le {{ a.lastSubscription|date('d/m/Y') }}
</span>
{% elseif a.lastSubscription < event.dateEnd %}
<span class="ui red label">Expiré le {{ a.lastSubscription|date('d/m/Y') }}</span>
<a class="compact ui tiny icon button" href="/pages/event-payment/?ref=ins-{{ a.ticket.id }}&forum={{ event.id }}">
URL Paiement
</a>
<span class="ui red label"
data-tooltip="Cette personne n'a pas de cotisation à jour (nécessaire pour ce tarif)."
data-position="left center">
Expirée le {{ a.lastSubscription|date('d/m/Y') }}
</span>
{% else %}
<span class="ui green label">OK</span>
{% endif %}
Expand Down
4 changes: 2 additions & 2 deletions tests/behat/features/Admin/Events/Inscriptions.feature
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
Loading