Skip to content

Refonte visuelle de la page facture #2379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vgreb wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refonte visuelle de la page facture #2379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
58 changes: 43 additions & 15 deletions templates/site/payment/invoice.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,52 @@
{% extends 'admin/association/membership/_base.html.twig' %}
{% block page_content %}
<article>
<h1>Paiement en ligne de la facture #{{ invoice_number }}</h1>
{% extends 'layouts/site.html.twig' %}

{% block title %}Facture n° {{ invoice_number }} - AFUP{% endblock %}

{% block metas %}
<meta name="robots" content="noindex, nofollow">
{% endblock %}

{% block content %}

<div class="container mx-auto flex flex-col px-4 py-6 gap-6 sm:px-28 sm:py-10 sm:gap-10">

<h1 class="font-titre text-afup-800 text-2xl sm:text-4xl">Facture #{{ invoice_number }}</h1>

{# Retour de paiement : `InvoiceRedirectAction` pose un flash puis redirige ici. C'est le seul
endroit où le résultat est visible, et layouts/site.html.twig n'affiche pas les flashs. #}
{% for message in app.flashes('success') %}
<twig:Alert type="success">{{ message|nl2br }}</twig:Alert>
{% endfor %}
{% for message in app.flashes('error') %}
<twig:Alert type="error">{{ message|nl2br }}</twig:Alert>
{% endfor %}

{# `paybox` n'est fourni que si la facture est encore en attente de règlement. #}
{% if paybox %}
<h2>Paiement</h2>
{{ paybox|raw }}
<twig:Card class="flex flex-col sm:flex-row sm:items-center gap-4 sm:gap-8 bg-afup-100 border-afup-300">
<div class="grow">
<p class="font-titre text-xl text-afup-800">Régler cette facture</p>
<p class="text-sm text-neutre-700">Paiement immédiat et sécurisé par carte bancaire via Paybox.</p>
</div>
{# Le <button> du formulaire généré par AppBundle\Payment\Paybox porte les classes de
buttons.css, que la nouvelle charte ne charge plus : on le restyle depuis le parent
plutôt que de toucher au PHP, partagé avec le tunnel billetterie encore en legacy. #}
<div class="shrink-0 [&_button]:inline-flex [&_button]:items-center [&_button]:justify-center [&_button]:whitespace-nowrap [&_button]:rounded-lg [&_button]:bg-ruby-500 [&_button]:px-8 [&_button]:py-3 [&_button]:font-semibold [&_button]:text-white [&_button]:hover:bg-ruby-700">
{{ paybox|raw }}
</div>
</twig:Card>
{% endif %}

<p class="note">
<twig:Button as="a" variant="secondary" class="flex self-start px-8 py-3 text-base"
href="{{ url('payment_invoice_download', {ref: ref}) }}">
Télécharger la facture en PDF
</twig:Button>

<p class="text-sm text-neutre-400">
Si vous avez la moindre question, n'hésitez pas à contacter
<a href="mailto:tresorier@afup.org">la trésorerie</a>.
<a href="mailto:tresorier@afup.org" class="text-afup-500 underline hover:no-underline">la trésorerie</a>.
</p>

<h2>Facture en PDF</h2>
<p>
<a href="{{ url('payment_invoice_download', {ref: ref}) }}">
Télécharger la facture en PDF
</a>
</p>
</div>

</article>
{% endblock %}
2 changes: 1 addition & 1 deletion tests/behat/features/Admin/Tresorerie/DevisFactures.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ Feature: Administration - Trésorerie - Devis/Facture
Then the ".content .message" element should contain "La facture a été envoyée"
# Lien de paiement
Then I follow the button of tooltip "Récupérer le lien de paiement en ligne"
Then I should see "Paiement en ligne de la facture"
Then I should see "Facture #"
Then I should see "Télécharger la facture en PDF"

# On n'utilise pas @reloadDbWithTestData pour conserver les données
Expand Down
Loading