Compare commits

...

9 Commits

Author SHA1 Message Date
TitouanDor 494367b743 ajout translation 2026-05-30 20:15:09 +02:00
TitouanDor edda337d6d modification traduction 2026-05-30 18:02:19 +02:00
TitouanDor 631cfd7fdc ajout lien vers la page des CGV 2026-05-30 18:02:19 +02:00
imperosol 2ee53d201e one CGV button for and etransaction and sith account 2026-05-30 18:02:19 +02:00
TitouanDor b5332e95c7 ajout balise de traduction 2026-05-30 18:02:19 +02:00
TitouanDor c5d04f6f1d supression alert() 2026-05-30 18:02:19 +02:00
TitouanDor 530c9effb2 Juste one CGU checkbox 2026-05-30 18:02:19 +02:00
TitouanDor 4c04f84a25 correction fautes orthographes 2026-05-30 18:02:02 +02:00
TitouanDor 9ad269035d add button for general term and condition 2026-05-30 18:01:47 +02:00
3 changed files with 50 additions and 28 deletions
-1
View File
@@ -141,7 +141,6 @@ form {
display: block;
margin: calc(var(--nf-input-size) * 1.5) auto 10px;
line-height: 1;
white-space: nowrap;
.fields-centered {
padding: 10px 10px 0;
@@ -24,8 +24,8 @@
<thead>
<tr>
<td>Article</td>
<td>Quantity</td>
<td>Unit price</td>
<td>{% trans %}Quantity{% endtrans %}</td>
<td>{% trans %}Unit price{% endtrans %}</td>
</tr>
</thead>
<tbody>
@@ -59,11 +59,21 @@
<div @htmx:after-request="fill">
{{ billing_infos_form }}
</div>
{% endif %}
{% include "core/base/notifications.jinja" %}
<form
method="post"
action="{{ settings.SITH_EBOUTIC_ET_URL }}"
>
<form method="post" id="payment-form">
{# In order to have one CGV button for both payment means,
there is only one form, which action will be given
the `formaction` attribute of the selected submit input #}
<div class="form-group margin-bottom">
<input type="checkbox" id="cgv" name="cgv" required>
<label for="cgv">
{% trans trimmed %}I have read and I accept{% endtrans %}
<a href="{{ url('core:page', 'cgv') }}">{% trans %}the general terms and conditions{% endtrans%}</a>
{%trans%}of the student association of the UTBM{% endtrans %}
</label>
</div>
{% if settings.SITH_EBOUTIC_CB_ENABLED %}
<template x-for="[key, value] in Object.entries(data)" :key="key">
<input type="hidden" :name="key" :value="value">
</template>
@@ -77,9 +87,9 @@
:disabled="!isCbAvailable"
{% endif %}
class="btn btn-blue"
formaction="{{ settings.SITH_EBOUTIC_ET_URL }}"
value="{% trans %}Pay with credit card{% endtrans %}"
/>
</form>
{% else %}
<div class="alert alert-yellow">
{% trans trimmed %}
@@ -94,7 +104,6 @@
{% elif basket.total > user.account_balance %}
<p>{% trans %}AE account payment disabled because you do not have enough money remaining.{% endtrans %}</p>
{% else %}
<form method="post" action="{{ url('eboutic:pay_with_sith', basket_id=basket.id) }}" name="sith-pay-form">
{% csrf_token %}
<input
{% if basket.is_expired %}
@@ -104,9 +113,10 @@
{% endif %}
class="btn btn-blue"
type="submit"
formaction="{{ url('eboutic:pay_with_sith', basket_id=basket.id) }}"
value="{% trans %}Pay with Sith account{% endtrans %}"
/>
</form>
{% endif %}
</form>
</div>
{% endblock %}
+15 -2
View File
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2026-05-15 11:46+0200\n"
"POT-Creation-Date: 2026-05-30 20:12+0200\n"
"PO-Revision-Date: 2016-07-18\n"
"Last-Translator: Maréchal <thomas.girod@utbm.fr\n"
"Language-Team: AE info <ae.info@utbm.fr>\n"
@@ -683,6 +683,7 @@ msgstr "Étiquette"
#: core/templates/core/user_account_detail.jinja
#: core/templates/core/user_stats.jinja
#: counter/templates/counter/last_ops.jinja
#: eboutic/templates/eboutic/eboutic_checkout.jinja
msgid "Quantity"
msgstr "Quantité"
@@ -966,7 +967,7 @@ msgstr "rôle de club membre"
msgid "Benefit"
msgstr "Bénéfice"
#: club/views.py
#: club/views.py eboutic/templates/eboutic/eboutic_checkout.jinja
msgid "Unit price"
msgstr "Prix unitaire"
@@ -4367,6 +4368,18 @@ msgstr "Solde actuel : "
msgid "Remaining account amount: "
msgstr "Solde restant : "
#: eboutic/templates/eboutic/eboutic_checkout.jinja
msgid "I have read and I accept"
msgstr "J'ai lu et j'accepte"
#: eboutic/templates/eboutic/eboutic_checkout.jinja
msgid "the general terms and conditions"
msgstr "les conditions générales de vente"
#: eboutic/templates/eboutic/eboutic_checkout.jinja
msgid "of the student association of the UTBM"
msgstr "de l'Association des étudiants de l'UTBM"
#: eboutic/templates/eboutic/eboutic_checkout.jinja
msgid "Pay with credit card"
msgstr "Payer avec une carte bancaire"