diff --git a/eboutic/templates/eboutic/eboutic_main.jinja b/eboutic/templates/eboutic/eboutic_main.jinja index db5bf7ed..18ece465 100644 --- a/eboutic/templates/eboutic/eboutic_main.jinja +++ b/eboutic/templates/eboutic/eboutic_main.jinja @@ -120,56 +120,6 @@ {% endif %} -
-
-

{% trans %}Eurockéennes 2025 partnership{% endtrans %}

- {% if user.is_subscribed %} -
-

- {% trans trimmed %} - Our partner uses Weezevent to sell tickets. - Weezevent may collect user info according to - its own privacy policy. - By clicking the accept button you consent to - their terms of services. - {% endtrans %} -

- - {% trans %}Privacy policy{% endtrans %} - - -
- {% else %} -

- {%- trans trimmed %} - You must be subscribed to benefit from the partnership with the Eurockéennes. - {% endtrans -%} -

-

- {%- trans trimmed %} - This partnership offers a discount of up to 33% - on tickets for Friday, Saturday and Sunday, - as well as the 3-day package from Friday to Sunday. - {% endtrans -%} -

- {% endif %} -
-
{% for priority_groups in products|groupby('order') %} {% for category, items in priority_groups.list|groupby('category') %} {% if items|count > 0 %} diff --git a/eboutic/urls.py b/eboutic/urls.py index 54afd428..732dac2f 100644 --- a/eboutic/urls.py +++ b/eboutic/urls.py @@ -31,7 +31,6 @@ from eboutic.views import ( EbouticMainView, EbouticPayWithSith, EtransactionAutoAnswer, - EurokPartnerFragment, payment_result, ) @@ -46,7 +45,6 @@ urlpatterns = [ "pay/sith/", EbouticPayWithSith.as_view(), name="pay_with_sith" ), path("pay//", payment_result, name="payment_result"), - path("eurok/", EurokPartnerFragment.as_view(), name="eurok"), path( "et_autoanswer", EtransactionAutoAnswer.as_view(), diff --git a/eboutic/views.py b/eboutic/views.py index 869fe7e9..ec937e9b 100644 --- a/eboutic/views.py +++ b/eboutic/views.py @@ -41,11 +41,11 @@ from django.shortcuts import redirect, render from django.urls import reverse from django.utils.translation import gettext_lazy as _ from django.views.decorators.http import require_GET -from django.views.generic import DetailView, FormView, TemplateView, UpdateView, View +from django.views.generic import DetailView, FormView, UpdateView, View from django.views.generic.edit import SingleObjectMixin from django_countries.fields import Country -from core.auth.mixins import CanViewMixin, IsSubscriberMixin +from core.auth.mixins import CanViewMixin from core.views.mixins import FragmentMixin, UseFragmentsMixin from counter.forms import BaseBasketForm, BillingInfoForm, ProductForm from counter.models import BillingInfo, Customer, Product, Selling, get_eboutic @@ -142,10 +142,6 @@ def payment_result(request, result: str) -> HttpResponse: return render(request, "eboutic/eboutic_payment_result.jinja", context) -class EurokPartnerFragment(IsSubscriberMixin, TemplateView): - template_name = "eboutic/eurok_fragment.jinja" - - class BillingInfoFormFragment( LoginRequiredMixin, FragmentMixin, SuccessMessageMixin, UpdateView ): diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index d6549184..f1ad16da 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-06-25 16:29+0200\n" +"POT-Creation-Date: 2025-08-23 15:30+0200\n" "PO-Revision-Date: 2016-07-18\n" "Last-Translator: Maréchal \n" @@ -1708,27 +1708,27 @@ msgstr "500, Erreur Serveur" msgid "Welcome!" msgstr "Bienvenue !" -#: core/templates/core/base.jinja core/templates/core/base/navbar.jinja +#: core/templates/core/base/footer.jinja core/templates/core/base/navbar.jinja msgid "Contacts" msgstr "Contacts" -#: core/templates/core/base.jinja +#: core/templates/core/base/footer.jinja msgid "Legal notices" msgstr "Mentions légales" -#: core/templates/core/base.jinja +#: core/templates/core/base/footer.jinja msgid "Intellectual property" msgstr "Propriété intellectuelle" -#: core/templates/core/base.jinja +#: core/templates/core/base/footer.jinja msgid "Help & Documentation" msgstr "Aide & Documentation" -#: core/templates/core/base.jinja +#: core/templates/core/base/footer.jinja msgid "R&D" msgstr "R&D" -#: core/templates/core/base.jinja +#: core/templates/core/base/footer.jinja msgid "Site created by the IT Department of the AE" msgstr "Site réalisé par le Pôle Informatique de l'AE" @@ -3838,47 +3838,6 @@ msgstr "" msgid "this page" msgstr "cette page" -#: eboutic/templates/eboutic/eboutic_main.jinja -msgid "Eurockéennes 2025 partnership" -msgstr "Partenariat Eurockéennes 2025" - -#: eboutic/templates/eboutic/eboutic_main.jinja -msgid "" -"Our partner uses Weezevent to sell tickets. Weezevent may collect user info " -"according to its own privacy policy. By clicking the accept button you " -"consent to their terms of services." -msgstr "" -"Notre partenaire utilises Wezevent pour vendre ses billets. Weezevent peut " -"collecter des informations utilisateur conformément à sa propre politique de " -"confidentialité. En cliquant sur le bouton d'acceptation vous consentez à " -"leurs termes de service." - -#: eboutic/templates/eboutic/eboutic_main.jinja -msgid "Privacy policy" -msgstr "Politique de confidentialité" - -#: eboutic/templates/eboutic/eboutic_main.jinja -#: trombi/templates/trombi/comment_moderation.jinja -msgid "Accept" -msgstr "Accepter" - -#: eboutic/templates/eboutic/eboutic_main.jinja -msgid "" -"You must be subscribed to benefit from the partnership with the Eurockéennes." -msgstr "" -"Vous devez être cotisant pour bénéficier du partenariat avec les " -"Eurockéennes." - -#: eboutic/templates/eboutic/eboutic_main.jinja -#, python-format -msgid "" -"This partnership offers a discount of up to 33%% on tickets for Friday, " -"Saturday and Sunday, as well as the 3-day package from Friday to Sunday." -msgstr "" -"Ce partenariat permet de profiter d'une réduction jusqu'à 33%% sur les " -"billets du vendredi, du samedi et du dimanche, ainsi qu'au forfait 3 jours, " -"du vendredi au dimanche." - #: eboutic/templates/eboutic/eboutic_main.jinja msgid "There are no items available for sale" msgstr "Aucun article n'est disponible à la vente" @@ -5305,6 +5264,10 @@ msgstr "fin" msgid "Moderate Trombi comments" msgstr "Modérer les commentaires du Trombi" +#: trombi/templates/trombi/comment_moderation.jinja +msgid "Accept" +msgstr "Accepter" + #: trombi/templates/trombi/comment_moderation.jinja msgid "Reject" msgstr "Refuser" diff --git a/locale/fr/LC_MESSAGES/djangojs.po b/locale/fr/LC_MESSAGES/djangojs.po index bcb6d1de..0dc0a145 100644 --- a/locale/fr/LC_MESSAGES/djangojs.po +++ b/locale/fr/LC_MESSAGES/djangojs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-05-18 12:17+0200\n" +"POT-Creation-Date: 2025-08-23 15:30+0200\n" "PO-Revision-Date: 2024-09-17 11:54+0200\n" "Last-Translator: Sli \n" "Language-Team: AE info \n" @@ -193,7 +193,7 @@ msgstr "Montrer moins" msgid "Show more" msgstr "Montrer plus" -#: core/static/bundled/user/family-graph-index.js +#: core/static/bundled/user/family-graph-index.ts msgid "family_tree.%(extension)s" msgstr "arbre_genealogique.%(extension)s"