mirror of
https://github.com/ae-utbm/sith.git
synced 2026-06-05 07:39:21 +00:00
Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 494367b743 | |||
| edda337d6d | |||
| 631cfd7fdc | |||
| 2ee53d201e | |||
| b5332e95c7 | |||
| c5d04f6f1d | |||
| 530c9effb2 | |||
| 4c04f84a25 | |||
| 9ad269035d |
@@ -141,7 +141,6 @@ form {
|
|||||||
display: block;
|
display: block;
|
||||||
margin: calc(var(--nf-input-size) * 1.5) auto 10px;
|
margin: calc(var(--nf-input-size) * 1.5) auto 10px;
|
||||||
line-height: 1;
|
line-height: 1;
|
||||||
white-space: nowrap;
|
|
||||||
|
|
||||||
.fields-centered {
|
.fields-centered {
|
||||||
padding: 10px 10px 0;
|
padding: 10px 10px 0;
|
||||||
|
|||||||
@@ -24,8 +24,8 @@
|
|||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Article</td>
|
<td>Article</td>
|
||||||
<td>Quantity</td>
|
<td>{% trans %}Quantity{% endtrans %}</td>
|
||||||
<td>Unit price</td>
|
<td>{% trans %}Unit price{% endtrans %}</td>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
@@ -59,11 +59,21 @@
|
|||||||
<div @htmx:after-request="fill">
|
<div @htmx:after-request="fill">
|
||||||
{{ billing_infos_form }}
|
{{ billing_infos_form }}
|
||||||
</div>
|
</div>
|
||||||
{% include "core/base/notifications.jinja" %}
|
{% endif %}
|
||||||
<form
|
{% include "core/base/notifications.jinja" %}
|
||||||
method="post"
|
<form method="post" id="payment-form">
|
||||||
action="{{ settings.SITH_EBOUTIC_ET_URL }}"
|
{# 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">
|
<template x-for="[key, value] in Object.entries(data)" :key="key">
|
||||||
<input type="hidden" :name="key" :value="value">
|
<input type="hidden" :name="key" :value="value">
|
||||||
</template>
|
</template>
|
||||||
@@ -77,24 +87,23 @@
|
|||||||
:disabled="!isCbAvailable"
|
:disabled="!isCbAvailable"
|
||||||
{% endif %}
|
{% endif %}
|
||||||
class="btn btn-blue"
|
class="btn btn-blue"
|
||||||
|
formaction="{{ settings.SITH_EBOUTIC_ET_URL }}"
|
||||||
value="{% trans %}Pay with credit card{% endtrans %}"
|
value="{% trans %}Pay with credit card{% endtrans %}"
|
||||||
/>
|
/>
|
||||||
</form>
|
{% else %}
|
||||||
{% else %}
|
<div class="alert alert-yellow">
|
||||||
<div class="alert alert-yellow">
|
{% trans trimmed %}
|
||||||
{% trans trimmed %}
|
Credit card payments are currently disabled on the eboutic.
|
||||||
Credit card payments are currently disabled on the eboutic.
|
You may still refill your account in one of the AE counters.
|
||||||
You may still refill your account in one of the AE counters.
|
Please excuse us for the inconvenience.
|
||||||
Please excuse us for the inconvenience.
|
{% endtrans %}
|
||||||
{% endtrans %}
|
</div>
|
||||||
</div>
|
{% endif %}
|
||||||
{% endif %}
|
{% if basket.contains_refilling_item %}
|
||||||
{% if basket.contains_refilling_item %}
|
<p>{% trans %}AE account payment disabled because your basket contains refilling items.{% endtrans %}</p>
|
||||||
<p>{% trans %}AE account payment disabled because your basket contains refilling items.{% endtrans %}</p>
|
{% elif basket.total > user.account_balance %}
|
||||||
{% elif basket.total > user.account_balance %}
|
<p>{% trans %}AE account payment disabled because you do not have enough money remaining.{% endtrans %}</p>
|
||||||
<p>{% trans %}AE account payment disabled because you do not have enough money remaining.{% endtrans %}</p>
|
{% else %}
|
||||||
{% else %}
|
|
||||||
<form method="post" action="{{ url('eboutic:pay_with_sith', basket_id=basket.id) }}" name="sith-pay-form">
|
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
<input
|
<input
|
||||||
{% if basket.is_expired %}
|
{% if basket.is_expired %}
|
||||||
@@ -104,9 +113,10 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
class="btn btn-blue"
|
class="btn btn-blue"
|
||||||
type="submit"
|
type="submit"
|
||||||
|
formaction="{{ url('eboutic:pay_with_sith', basket_id=basket.id) }}"
|
||||||
value="{% trans %}Pay with Sith account{% endtrans %}"
|
value="{% trans %}Pay with Sith account{% endtrans %}"
|
||||||
/>
|
/>
|
||||||
</form>
|
{% endif %}
|
||||||
{% endif %}
|
</form>
|
||||||
</div>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
@@ -6,7 +6,7 @@
|
|||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"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"
|
"PO-Revision-Date: 2016-07-18\n"
|
||||||
"Last-Translator: Maréchal <thomas.girod@utbm.fr\n"
|
"Last-Translator: Maréchal <thomas.girod@utbm.fr\n"
|
||||||
"Language-Team: AE info <ae.info@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_account_detail.jinja
|
||||||
#: core/templates/core/user_stats.jinja
|
#: core/templates/core/user_stats.jinja
|
||||||
#: counter/templates/counter/last_ops.jinja
|
#: counter/templates/counter/last_ops.jinja
|
||||||
|
#: eboutic/templates/eboutic/eboutic_checkout.jinja
|
||||||
msgid "Quantity"
|
msgid "Quantity"
|
||||||
msgstr "Quantité"
|
msgstr "Quantité"
|
||||||
|
|
||||||
@@ -966,7 +967,7 @@ msgstr "rôle de club – membre"
|
|||||||
msgid "Benefit"
|
msgid "Benefit"
|
||||||
msgstr "Bénéfice"
|
msgstr "Bénéfice"
|
||||||
|
|
||||||
#: club/views.py
|
#: club/views.py eboutic/templates/eboutic/eboutic_checkout.jinja
|
||||||
msgid "Unit price"
|
msgid "Unit price"
|
||||||
msgstr "Prix unitaire"
|
msgstr "Prix unitaire"
|
||||||
|
|
||||||
@@ -4367,6 +4368,18 @@ msgstr "Solde actuel : "
|
|||||||
msgid "Remaining account amount: "
|
msgid "Remaining account amount: "
|
||||||
msgstr "Solde restant : "
|
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
|
#: eboutic/templates/eboutic/eboutic_checkout.jinja
|
||||||
msgid "Pay with credit card"
|
msgid "Pay with credit card"
|
||||||
msgstr "Payer avec une carte bancaire"
|
msgstr "Payer avec une carte bancaire"
|
||||||
|
|||||||
Reference in New Issue
Block a user