correction fautes orthographes

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.15.5
+    rev: v0.15.0
     hooks:
       - id: ruff-check  # just check the code, and print the errors
       - id: ruff-check  # actually fix the fixable errors, but print nothing
@@ -12,7 +12,7 @@ repos:
     rev: v0.6.1
     hooks:
       - id: biome-check
-        additional_dependencies: ["@biomejs/biome@2.4.6"]
+        additional_dependencies: ["@biomejs/biome@2.3.14"]
   - repo: https://github.com/rtts/djhtml
     rev: 3.0.10
     hooks:

club/api.py

@@ -6,15 +6,9 @@ from ninja_extra.pagination import PageNumberPaginationExtra
 from ninja_extra.schemas import PaginatedResponseSchema
 
 from api.auth import ApiKeyAuth
-from api.permissions import CanAccessLookup, CanView, HasPerm
+from api.permissions import CanAccessLookup, HasPerm
 from club.models import Club, Membership
-from club.schemas import (
+from club.schemas import ClubSchema, ClubSearchFilterSchema, SimpleClubSchema
-    ClubSchema,
-    ClubSearchFilterSchema,
-    SimpleClubSchema,
-    UserMembershipSchema,
-)
-from core.models import User
 
 
 @api_controller("/club")
@@ -44,22 +38,3 @@ class ClubController(ControllerBase):
         return self.get_object_or_exception(
             Club.objects.prefetch_related(prefetch), id=club_id
         )
-
-
-@api_controller("/user/{int:user_id}/club")
-class UserClubController(ControllerBase):
-    @route.get(
-        "",
-        response=list[UserMembershipSchema],
-        auth=[ApiKeyAuth(), SessionAuth()],
-        permissions=[CanView],
-        url_name="fetch_user_clubs",
-    )
-    def fetch_user_clubs(self, user_id: int):
-        """Get all the active memberships of the given user."""
-        user = self.get_object_or_exception(User, id=user_id)
-        return (
-            Membership.objects.ongoing()
-            .filter(user=user)
-            .select_related("club", "user")
-        )

club/schemas.py

@@ -40,8 +40,6 @@ class ClubProfileSchema(ModelSchema):
 
 
 class ClubMemberSchema(ModelSchema):
-    """A schema to represent all memberships in a club."""
-
     class Meta:
         model = Membership
         fields = ["start_date", "end_date", "role", "description"]
@@ -55,13 +53,3 @@ class ClubSchema(ModelSchema):
         fields = ["id", "name", "logo", "is_active", "short_description", "address"]
 
     members: list[ClubMemberSchema]
-
-
-class UserMembershipSchema(ModelSchema):
-    """A schema to represent the active club memberships of a user."""
-
-    class Meta:
-        model = Membership
-        fields = ["id", "start_date", "role", "description"]
-
-    club: SimpleClubSchema

club/tests/test_user_club_controller.py

@@ -1,50 +0,0 @@
-from datetime import timedelta
-
-from django.test import TestCase
-from django.urls import reverse
-from django.utils.timezone import localdate
-from model_bakery import baker
-from model_bakery.recipe import Recipe
-
-from club.models import Club, Membership
-from club.schemas import UserMembershipSchema
-from core.baker_recipes import subscriber_user
-from core.models import Page
-
-
-class TestFetchClub(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        cls.user = subscriber_user.make()
-        pages = baker.make(Page, _quantity=3, _bulk_create=True)
-        clubs = baker.make(Club, page=iter(pages), _quantity=3, _bulk_create=True)
-        recipe = Recipe(
-            Membership, user=cls.user, start_date=localdate() - timedelta(days=2)
-        )
-        cls.members = Membership.objects.bulk_create(
-            [
-                recipe.prepare(club=clubs[0]),
-                recipe.prepare(club=clubs[1], end_date=localdate() - timedelta(days=1)),
-                recipe.prepare(club=clubs[1]),
-            ]
-        )
-
-    def test_fetch_memberships(self):
-        self.client.force_login(subscriber_user.make())
-        res = self.client.get(
-            reverse("api:fetch_user_clubs", kwargs={"user_id": self.user.id})
-        )
-        assert res.status_code == 200
-        assert [UserMembershipSchema.model_validate(m) for m in res.json()] == [
-            UserMembershipSchema.from_orm(m) for m in (self.members[0], self.members[2])
-        ]
-
-    def test_fetch_club_nb_queries(self):
-        self.client.force_login(subscriber_user.make())
-        with self.assertNumQueries(6):
-            # - 5 queries for authentication
-            # - 1 query for the actual data
-            res = self.client.get(
-                reverse("api:fetch_user_clubs", kwargs={"user_id": self.user.id})
-            )
-            assert res.status_code == 200

core/auth/mixins.py

@@ -307,7 +307,6 @@ class PermissionOrClubBoardRequiredMixin(PermissionRequiredMixin):
             return False
         if super().has_permission():
             return True
-        return (
+        return self.club is not None and any(
-            self.club is not None
+            g.id == self.club.board_group_id for g in self.request.user.cached_groups
-            and self.club.board_group_id in self.request.user.all_groups
         )

core/models.py

@@ -356,27 +356,23 @@ class User(AbstractUser):
         )
         if group_id is None:
             return False
-        return group_id in self.all_groups
+        if group_id == settings.SITH_GROUP_SUBSCRIBERS_ID:
+            return self.is_subscribed
+        if group_id == settings.SITH_GROUP_ROOT_ID:
+            return self.is_root
+        return any(g.id == group_id for g in self.cached_groups)
 
     @cached_property
-    def all_groups(self) -> dict[int, Group]:
+    def cached_groups(self) -> list[Group]:
         """Get the list of groups this user is in."""
-        additional_groups = []
+        return list(self.groups.all())
-        if self.is_subscribed:
-            additional_groups.append(settings.SITH_GROUP_SUBSCRIBERS_ID)
-        if self.is_superuser:
-            additional_groups.append(settings.SITH_GROUP_ROOT_ID)
-        qs = self.groups.all()
-        if additional_groups:
-            # This is somewhat counter-intuitive, but this query runs way faster with
-            # a UNION rather than a OR (in average, 0.25ms vs 14ms).
-            # For the why, cf. https://dba.stackexchange.com/questions/293836/why-is-an-or-statement-slower-than-union
-            qs = qs.union(Group.objects.filter(id__in=additional_groups))
-        return {g.id: g for g in qs}
 
     @cached_property
     def is_root(self) -> bool:
-        return self.is_superuser or settings.SITH_GROUP_ROOT_ID in self.all_groups
+        if self.is_superuser:
+            return True
+        root_id = settings.SITH_GROUP_ROOT_ID
+        return any(g.id == root_id for g in self.cached_groups)
 
     @cached_property
     def is_board_member(self) -> bool:
@@ -1103,7 +1099,10 @@ class PageQuerySet(models.QuerySet):
             return self.filter(view_groups=settings.SITH_GROUP_PUBLIC_ID)
         if user.has_perm("core.view_page"):
             return self.all()
-        return self.filter(view_groups__in=user.all_groups)
+        groups_ids = [g.id for g in user.cached_groups]
+        if user.is_subscribed:
+            groups_ids.append(settings.SITH_GROUP_SUBSCRIBERS_ID)
+        return self.filter(view_groups__in=groups_ids)
 
 
 # This function prevents generating migration upon settings change
@@ -1377,7 +1376,7 @@ class PageRev(models.Model):
         return self.page.can_be_edited_by(user)
 
     def is_owned_by(self, user: User) -> bool:
-        return self.page.owner_group_id in user.all_groups
+        return any(g.id == self.page.owner_group_id for g in user.cached_groups)
 
     def similarity_ratio(self, text: str) -> float:
         """Similarity ratio between this revision's content and the given text.

core/static/bundled/core/dynamic-formset-index.ts

@@ -1,77 +0,0 @@
-interface Config {
-  /**
-   * The prefix of the formset, in case it has been changed.
-   * See https://docs.djangoproject.com/fr/stable/topics/forms/formsets/#customizing-a-formset-s-prefix
-   */
-  prefix?: string;
-}
-
-// biome-ignore lint/style/useNamingConvention: It's the DOM API naming
-type HTMLFormInputElement = HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement;
-
-document.addEventListener("alpine:init", () => {
-  /**
-   * Alpine data element to allow the dynamic addition of forms to a formset.
-   *
-   * To use this, you need :
-   * - an HTML element containing the existing forms, noted by `x-ref="formContainer"`
-   * - a template containing the empty form
-   *   (that you can obtain jinja-side with `{{ formset.empty_form }}`),
-   *   noted by `x-ref="formTemplate"`
-   * - a button with `@click="addForm"`
-   * - you may also have one or more buttons with `@click="removeForm(element)"`,
-   *   where `element` is the HTML element containing the form.
-   *
-   * For an example of how this is used, you can have a look to
-   * `counter/templates/counter/product_form.jinja`
-   */
-  Alpine.data("dynamicFormSet", (config?: Config) => ({
-    init() {
-      this.formContainer = this.$refs.formContainer as HTMLElement;
-      this.nbForms = this.formContainer.children.length as number;
-      this.template = this.$refs.formTemplate as HTMLTemplateElement;
-      const prefix = config?.prefix ?? "form";
-      this.$root
-        .querySelector(`#id_${prefix}-TOTAL_FORMS`)
-        .setAttribute(":value", "nbForms");
-    },
-
-    addForm() {
-      this.formContainer.appendChild(document.importNode(this.template.content, true));
-      const newForm = this.formContainer.lastElementChild;
-      const inputs: NodeListOf<HTMLFormInputElement> = newForm.querySelectorAll(
-        "input, select, textarea",
-      );
-      for (const el of inputs) {
-        el.name = el.name.replace("__prefix__", this.nbForms.toString());
-        el.id = el.id.replace("__prefix__", this.nbForms.toString());
-      }
-      const labels: NodeListOf<HTMLLabelElement> = newForm.querySelectorAll("label");
-      for (const el of labels) {
-        el.htmlFor = el.htmlFor.replace("__prefix__", this.nbForms.toString());
-      }
-      inputs[0].focus();
-      this.nbForms += 1;
-    },
-
-    removeForm(container: HTMLDivElement) {
-      container.remove();
-      this.nbForms -= 1;
-      // adjust the id of remaining forms
-      for (let i = 0; i < this.nbForms; i++) {
-        const form: HTMLDivElement = this.formContainer.children[i];
-        const inputs: NodeListOf<HTMLFormInputElement> = form.querySelectorAll(
-          "input, select, textarea",
-        );
-        for (const el of inputs) {
-          el.name = el.name.replace(/\d+/, i.toString());
-          el.id = el.id.replace(/\d+/, i.toString());
-        }
-        const labels: NodeListOf<HTMLLabelElement> = form.querySelectorAll("label");
-        for (const el of labels) {
-          el.htmlFor = el.htmlFor.replace(/\d+/, i.toString());
-        }
-      }
-    },
-  }));
-});

core/static/core/base.css

@@ -115,6 +115,7 @@ blockquote:before,
 blockquote:after,
 q:before,
 q:after {
+  content: "";
   content: none;
 }
 table {

core/templates/core/base.jinja

@@ -35,8 +35,8 @@
       <noscript><link rel="stylesheet" href="{{ static('bundled/fontawesome-index.css') }}"></noscript>
 
       <script src="{{ url('javascript-catalog') }}"></script>
-      <script type="module" src="{{ static("bundled/core/navbar-index.ts") }}"></script>
+      <script type="module" src={{ static("bundled/core/navbar-index.ts") }}></script>
-      <script type="module" src="{{ static("bundled/core/components/include-index.ts") }}"></script>
+      <script type="module" src={{ static("bundled/core/components/include-index.ts") }}></script>
       <script type="module" src="{{ static('bundled/alpine-index.js') }}"></script>
       <script type="module" src="{{ static('bundled/htmx-index.js') }}"></script>
       <script type="module" src="{{ static('bundled/country-flags-index.ts') }}"></script>

core/templates/core/delete_confirm.jinja

@@ -21,8 +21,6 @@
   <h2>{% trans %}Delete confirmation{% endtrans %}</h2>
   <form action="" method="post">{% csrf_token %}
     <p>{% trans name=object_name %}Are you sure you want to delete "{{ name }}"?{% endtrans %}</p>
-    {% if help_text %}<p><em>{{ help_text }}</em></p>{% endif %}
-    <br/>
     <input type="submit" value="{% trans %}Confirm{% endtrans %}" />
   </form>
   <form method="GET" action="javascript:history.back();">

core/tests/test_core.py

@@ -418,16 +418,16 @@ class TestUserIsInGroup(TestCase):
         group_in = baker.make(Group)
         self.public_user.groups.add(group_in)
 
-        # clear the cached property `User.all_groups`
+        # clear the cached property `User.cached_groups`
-        self.public_user.__dict__.pop("all_groups", None)
+        self.public_user.__dict__.pop("cached_groups", None)
         # Test when the user is in the group
-        with self.assertNumQueries(2):
+        with self.assertNumQueries(1):
             self.public_user.is_in_group(pk=group_in.id)
         with self.assertNumQueries(0):
             self.public_user.is_in_group(pk=group_in.id)
 
         group_not_in = baker.make(Group)
-        self.public_user.__dict__.pop("all_groups", None)
+        self.public_user.__dict__.pop("cached_groups", None)
         # Test when the user is not in the group
         with self.assertNumQueries(1):
             self.public_user.is_in_group(pk=group_not_in.id)

counter/forms.py

@@ -5,8 +5,6 @@ from datetime import date, datetime, timezone
 
 from dateutil.relativedelta import relativedelta
 from django import forms
-from django.core.exceptions import ValidationError
-from django.core.validators import MaxValueValidator
 from django.db.models import Exists, OuterRef, Q
 from django.forms import BaseModelFormSet
 from django.utils.timezone import now
@@ -16,7 +14,7 @@ from phonenumber_field.widgets import RegionalPhoneNumberWidget
 
 from club.models import Club
 from club.widgets.ajax_select import AutoCompleteSelectClub
-from core.models import User, UserQuerySet
+from core.models import User
 from core.views.forms import (
     FutureDateTimeField,
     NFCTextInput,
@@ -25,7 +23,6 @@ from core.views.forms import (
 )
 from core.views.widgets.ajax_select import (
     AutoCompleteSelect,
-    AutoCompleteSelectMultiple,
     AutoCompleteSelectMultipleGroup,
     AutoCompleteSelectMultipleUser,
     AutoCompleteSelectUser,
@@ -33,12 +30,10 @@ from core.views.widgets.ajax_select import (
 from counter.models import (
     BillingInfo,
     Counter,
-    CounterSellers,
     Customer,
     Eticket,
     InvoiceCall,
     Product,
-    ProductFormula,
     Refilling,
     ReturnableProduct,
     ScheduledProductAction,
@@ -172,102 +167,12 @@ class RefillForm(forms.ModelForm):
 class CounterEditForm(forms.ModelForm):
     class Meta:
         model = Counter
-        fields = ["products"]
+        fields = ["sellers", "products"]
 
-    sellers_regular = forms.ModelMultipleChoiceField(
+        widgets = {
-        label=_("Regular barmen"),
+            "sellers": AutoCompleteSelectMultipleUser,
-        help_text=_(
+            "products": AutoCompleteSelectMultipleProduct,
-            "Barmen having regular permanences "
+        }
-            "or frequently giving a hand throughout the semester."
-        ),
-        queryset=User.objects.all(),
-        widget=AutoCompleteSelectMultipleUser,
-        required=False,
-    )
-    sellers_temporary = forms.ModelMultipleChoiceField(
-        label=_("Temporary barmen"),
-        help_text=_(
-            "Barmen who will be there only for a limited period (e.g. for one evening)"
-        ),
-        queryset=User.objects.all(),
-        widget=AutoCompleteSelectMultipleUser,
-        required=False,
-    )
-    field_order = ["sellers_regular", "sellers_temporary", "products"]
-
-    def __init__(self, *args, user: User, instance: Counter, **kwargs):
-        super().__init__(*args, instance=instance, **kwargs)
-        # if the user is an admin, he will have access to all products,
-        # else only to active products owned by the counter's club
-        # or already on the counter
-        if user.has_perm("counter.change_counter"):
-            self.fields["products"].widget = AutoCompleteSelectMultipleProduct()
-        else:
-            # updating the queryset of the field also updates the choices of
-            # the widget, so it's important to set the queryset after the widget
-            self.fields["products"].widget = AutoCompleteSelectMultiple()
-            self.fields["products"].queryset = Product.objects.filter(
-                Q(club_id=instance.club_id) | Q(counters=instance), archived=False
-            ).distinct()
-            self.fields["products"].help_text = _(
-                "If you want to add a product that is not owned by "
-                "your club to this counter, you should ask an admin."
-            )
-        self.fields["sellers_regular"].initial = self.instance.sellers.filter(
-            countersellers__is_regular=True
-        ).all()
-        self.fields["sellers_temporary"].initial = self.instance.sellers.filter(
-            countersellers__is_regular=False
-        ).all()
-
-    def clean(self):
-        regular: UserQuerySet = self.cleaned_data["sellers_regular"]
-        temporary: UserQuerySet = self.cleaned_data["sellers_temporary"]
-        duplicates = list(regular.intersection(temporary))
-        if duplicates:
-            raise ValidationError(
-                _(
-                    "A user cannot be a regular and a temporary barman "
-                    "at the same time, "
-                    "but the following users have been defined as both : %(users)s"
-                )
-                % {"users": ", ".join([u.get_display_name() for u in duplicates])}
-            )
-        return self.cleaned_data
-
-    def save_sellers(self):
-        sellers = []
-        for users, is_regular in (
-            (self.cleaned_data["sellers_regular"], True),
-            (self.cleaned_data["sellers_temporary"], False),
-        ):
-            sellers.extend(
-                [
-                    CounterSellers(counter=self.instance, user=u, is_regular=is_regular)
-                    for u in users
-                ]
-            )
-        # start by deleting removed CounterSellers objects
-        user_ids = [seller.user.id for seller in sellers]
-        CounterSellers.objects.filter(
-            ~Q(user_id__in=user_ids), counter=self.instance
-        ).delete()
-
-        # then create or update the new barmen
-        CounterSellers.objects.bulk_create(
-            sellers,
-            update_conflicts=True,
-            update_fields=["is_regular"],
-            unique_fields=["user", "counter"],
-        )
-
-    def save(self, commit=True):  # noqa: FBT002
-        self.instance = super().save(commit=commit)
-        if commit and any(
-            key in self.changed_data for key in ("sellers_regular", "sellers_temporary")
-        ):
-            self.save_sellers()
-        return self.instance
 
 
 class ScheduledProductActionForm(forms.ModelForm):
@@ -373,8 +278,7 @@ ScheduledProductActionFormSet = forms.modelformset_factory(
     absolute_max=None,
     can_delete=True,
     can_delete_extra=False,
-    extra=0,
+    extra=2,
-    min_num=1,
 )
 
 
@@ -412,6 +316,7 @@ class ProductForm(forms.ModelForm):
         }
 
     counters = forms.ModelMultipleChoiceField(
+        help_text=None,
         label=_("Counters"),
         required=False,
         widget=AutoCompleteSelectMultipleCounter,
@@ -422,31 +327,10 @@ class ProductForm(forms.ModelForm):
         super().__init__(*args, instance=instance, **kwargs)
         if self.instance.id:
             self.fields["counters"].initial = self.instance.counters.all()
-            if hasattr(self.instance, "formula"):
-                self.formula_init(self.instance.formula)
         self.action_formset = ScheduledProductActionFormSet(
             *args, product=self.instance, **kwargs
         )
 
-    def formula_init(self, formula: ProductFormula):
-        """Part of the form initialisation specific to formula products."""
-        self.fields["selling_price"].help_text = _(
-            "This product is a formula. "
-            "Its price cannot be greater than the price "
-            "of the products constituting it, which is %(price)s €"
-        ) % {"price": formula.max_selling_price}
-        self.fields["special_selling_price"].help_text = _(
-            "This product is a formula. "
-            "Its special price cannot be greater than the price "
-            "of the products constituting it, which is %(price)s €"
-        ) % {"price": formula.max_special_selling_price}
-        for key, price in (
-            ("selling_price", formula.max_selling_price),
-            ("special_selling_price", formula.max_special_selling_price),
-        ):
-            self.fields[key].widget.attrs["max"] = price
-            self.fields[key].validators.append(MaxValueValidator(price))
-
     def is_valid(self):
         return super().is_valid() and self.action_formset.is_valid()
 
@@ -465,47 +349,13 @@ class ProductForm(forms.ModelForm):
         return product
 
 
-class ProductFormulaForm(forms.ModelForm):
-    class Meta:
-        model = ProductFormula
-        fields = ["products", "result"]
-        widgets = {
-            "products": AutoCompleteSelectMultipleProduct,
-            "result": AutoCompleteSelectProduct,
-        }
-
-    def clean(self):
-        cleaned_data = super().clean()
-        if cleaned_data["result"] in cleaned_data["products"]:
-            self.add_error(
-                None,
-                _(
-                    "The same product cannot be at the same time "
-                    "the result and a part of the formula."
-                ),
-            )
-        prices = [p.selling_price for p in cleaned_data["products"]]
-        special_prices = [p.special_selling_price for p in cleaned_data["products"]]
-        selling_price = cleaned_data["result"].selling_price
-        special_selling_price = cleaned_data["result"].special_selling_price
-        if selling_price > sum(prices) or special_selling_price > sum(special_prices):
-            self.add_error(
-                "result",
-                _(
-                    "The result cannot be more expensive "
-                    "than the total of the other products."
-                ),
-            )
-        return cleaned_data
-
-
 class ReturnableProductForm(forms.ModelForm):
     class Meta:
         model = ReturnableProduct
         fields = ["product", "returned_product", "max_return"]
         widgets = {
-            "product": AutoCompleteSelectProduct,
+            "product": AutoCompleteSelectProduct(),
-            "returned_product": AutoCompleteSelectProduct,
+            "returned_product": AutoCompleteSelectProduct(),
         }
 
     def save(self, commit: bool = True) -> ReturnableProduct:  # noqa FBT

counter/migrations/0037_productformula.py

@@ -1,43 +0,0 @@
-# Generated by Django 5.2.8 on 2025-11-26 11:34
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [("counter", "0036_product_created_at_product_updated_at")]
-
-    operations = [
-        migrations.CreateModel(
-            name="ProductFormula",
-            fields=[
-                (
-                    "id",
-                    models.AutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                (
-                    "products",
-                    models.ManyToManyField(
-                        help_text="The products that constitute this formula.",
-                        related_name="formulas",
-                        to="counter.product",
-                        verbose_name="products",
-                    ),
-                ),
-                (
-                    "result",
-                    models.OneToOneField(
-                        help_text="The formula product.",
-                        on_delete=django.db.models.deletion.CASCADE,
-                        to="counter.product",
-                        verbose_name="result product",
-                    ),
-                ),
-            ],
-        ),
-    ]

counter/migrations/0038_countersellers.py

@@ -1,88 +0,0 @@
-# Generated by Django 5.2.11 on 2026-03-04 15:26
-
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("counter", "0037_productformula"),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        # cf. https://docs.djangoproject.com/fr/stable/howto/writing-migrations/#changing-a-manytomanyfield-to-use-a-through-model
-        migrations.SeparateDatabaseAndState(
-            database_operations=[
-                migrations.RunSQL(
-                    sql="ALTER TABLE counter_counter_sellers RENAME TO counter_countersellers",
-                    reverse_sql="ALTER TABLE counter_countersellers RENAME TO counter_counter_sellers",
-                ),
-            ],
-            state_operations=[
-                migrations.CreateModel(
-                    name="CounterSellers",
-                    fields=[
-                        (
-                            "id",
-                            models.AutoField(
-                                auto_created=True,
-                                primary_key=True,
-                                serialize=False,
-                                verbose_name="ID",
-                            ),
-                        ),
-                        (
-                            "counter",
-                            models.ForeignKey(
-                                on_delete=django.db.models.deletion.CASCADE,
-                                to="counter.counter",
-                            ),
-                        ),
-                        (
-                            "user",
-                            models.ForeignKey(
-                                on_delete=django.db.models.deletion.CASCADE,
-                                to=settings.AUTH_USER_MODEL,
-                            ),
-                        ),
-                    ],
-                    options={
-                        "constraints": [
-                            models.UniqueConstraint(
-                                fields=("counter", "user"),
-                                name="counter_counter_sellers_counter_id_subscriber_id_key",
-                            )
-                        ],
-                    },
-                ),
-                migrations.AlterField(
-                    model_name="counter",
-                    name="sellers",
-                    field=models.ManyToManyField(
-                        blank=True,
-                        related_name="counters",
-                        through="counter.CounterSellers",
-                        to=settings.AUTH_USER_MODEL,
-                        verbose_name="sellers",
-                    ),
-                ),
-            ],
-        ),
-        migrations.AddField(
-            model_name="countersellers",
-            name="created_at",
-            field=models.DateTimeField(
-                auto_now_add=True,
-                default=django.utils.timezone.now,
-                verbose_name="created at",
-            ),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name="countersellers",
-            name="is_regular",
-            field=models.BooleanField(default=False, verbose_name="regular barman"),
-        ),
-    ]

counter/models.py

@@ -456,37 +456,6 @@ class Product(models.Model):
         return self.selling_price - self.purchase_price
 
 
-class ProductFormula(models.Model):
-    products = models.ManyToManyField(
-        Product,
-        related_name="formulas",
-        verbose_name=_("products"),
-        help_text=_("The products that constitute this formula."),
-    )
-    result = models.OneToOneField(
-        Product,
-        related_name="formula",
-        on_delete=models.CASCADE,
-        verbose_name=_("result product"),
-        help_text=_("The product got with the formula."),
-    )
-
-    def __str__(self):
-        return self.result.name
-
-    @cached_property
-    def max_selling_price(self) -> float:
-        # iterating over all products is less efficient than doing
-        # a simple aggregation, but this method is likely to be used in
-        # coordination with `max_special_selling_price`,
-        # and Django caches the result of the `all` queryset.
-        return sum(p.selling_price for p in self.products.all())
-
-    @cached_property
-    def max_special_selling_price(self) -> float:
-        return sum(p.special_selling_price for p in self.products.all())
-
-
 class CounterQuerySet(models.QuerySet):
     def annotate_has_barman(self, user: User) -> Self:
         """Annotate the queryset with the `user_is_barman` field.
@@ -551,11 +520,7 @@ class Counter(models.Model):
         choices=[("BAR", _("Bar")), ("OFFICE", _("Office")), ("EBOUTIC", _("Eboutic"))],
     )
     sellers = models.ManyToManyField(
-        User,
+        User, verbose_name=_("sellers"), related_name="counters", blank=True
-        verbose_name=_("sellers"),
-        related_name="counters",
-        blank=True,
-        through="CounterSellers",
     )
     edit_groups = models.ManyToManyField(
         Group, related_name="editable_counters", blank=True
@@ -747,26 +712,6 @@ class Counter(models.Model):
         ]
 
 
-class CounterSellers(models.Model):
-    """Custom through model for the counter-sellers M2M relationship."""
-
-    counter = models.ForeignKey(Counter, on_delete=models.CASCADE)
-    user = models.ForeignKey(User, on_delete=models.CASCADE)
-    is_regular = models.BooleanField(_("regular barman"), default=False)
-    created_at = models.DateTimeField(_("created at"), auto_now_add=True)
-
-    class Meta:
-        constraints = [
-            models.UniqueConstraint(
-                fields=["counter", "user"],
-                name="counter_counter_sellers_counter_id_subscriber_id_key",
-            )
-        ]
-
-    def __str__(self):
-        return f"counter {self.counter_id} - user {self.user_id}"
-
-
 class RefillingQuerySet(models.QuerySet):
     def annotate_total(self) -> Self:
         """Annotate the Queryset with the total amount.

counter/static/bundled/counter/components/ajax-select-index.ts

@@ -18,10 +18,7 @@ export class ProductAjaxSelect extends AjaxSelect {
   protected searchField = ["code", "name"];
 
   protected async search(query: string): Promise<TomOption[]> {
-    const resp = await productSearchProducts({
+    const resp = await productSearchProducts({ query: { search: query } });
-      // biome-ignore lint/style/useNamingConvention: API is snake_case
-      query: { search: query, is_archived: false },
-    });
     if (resp.data) {
       return resp.data.results;
     }

counter/static/bundled/counter/counter-click-index.ts

@@ -1,10 +1,6 @@
 import { AlertMessage } from "#core:utils/alert-message.ts";
 import { BasketItem } from "#counter:counter/basket.ts";
-import type {
+import type { CounterConfig, ErrorMessage } from "#counter:counter/types.ts";
-  CounterConfig,
-  ErrorMessage,
-  ProductFormula,
-} from "#counter:counter/types.ts";
 import type { CounterProductSelect } from "./components/counter-product-select-index.ts";
 
 document.addEventListener("alpine:init", () => {
@@ -51,43 +47,15 @@ document.addEventListener("alpine:init", () => {
 
       this.basket[id] = item;
 
-      this.checkFormulas();
-
       if (this.sumBasket() > this.customerBalance) {
         item.quantity = oldQty;
         if (item.quantity === 0) {
           delete this.basket[id];
         }
-        this.alertMessage.display(gettext("Not enough money"), { success: false });
+        return gettext("Not enough money");
       }
-    },
 
-    checkFormulas() {
+      return "";
-      const products = new Set(
-        Object.keys(this.basket).map((i: string) => Number.parseInt(i, 10)),
-      );
-      const formula: ProductFormula = config.formulas.find((f: ProductFormula) => {
-        return f.products.every((p: number) => products.has(p));
-      });
-      if (formula === undefined) {
-        return;
-      }
-      for (const product of formula.products) {
-        const key = product.toString();
-        this.basket[key].quantity -= 1;
-        if (this.basket[key].quantity <= 0) {
-          this.removeFromBasket(key);
-        }
-      }
-      this.alertMessage.display(
-        interpolate(
-          gettext("Formula %(formula)s applied"),
-          { formula: config.products[formula.result.toString()].name },
-          true,
-        ),
-        { success: true },
-      );
-      this.addToBasket(formula.result.toString(), 1);
     },
 
     getBasketSize() {
@@ -102,7 +70,14 @@ document.addEventListener("alpine:init", () => {
         (acc: number, cur: BasketItem) => acc + cur.sum(),
         0,
       ) as number;
-      return Math.round(total * 100) / 100;
+      return total;
+    },
+
+    addToBasketWithMessage(id: string, quantity: number) {
+      const message = this.addToBasket(id, quantity);
+      if (message.length > 0) {
+        this.alertMessage.display(message, { success: false });
+      }
     },
 
     onRefillingSuccess(event: CustomEvent) {
@@ -141,7 +116,7 @@ document.addEventListener("alpine:init", () => {
           this.finish();
         }
       } else {
-        this.addToBasket(code, quantity);
+        this.addToBasketWithMessage(code, quantity);
       }
       this.codeField.widget.clear();
       this.codeField.widget.focus();

counter/static/bundled/counter/types.d.ts

@@ -7,16 +7,10 @@ export interface InitialFormData {
   errors?: string[];
 }
 
-export interface ProductFormula {
-  result: number;
-  products: number[];
-}
-
 export interface CounterConfig {
   customerBalance: number;
   customerId: number;
   products: Record<string, Product>;
-  formulas: ProductFormula[];
   formInitial: InitialFormData[];
   cancelUrl: string;
 }

counter/static/counter/css/counter-click.scss

@@ -10,12 +10,12 @@
   float: right;
 }
 
-.basket-message-container {
+.basket-error-container {
   position: relative;
   display: block
 }
 
-.basket-message {
+.basket-error {
   z-index: 10; // to get on top of tomselect
   text-align: center;
   position: absolute;

counter/templates/counter/counter_click.jinja

@@ -32,11 +32,13 @@
   <div id="bar-ui" x-data="counter({
                            customerBalance: {{ customer.amount }},
                            products: products,
-                           formulas: formulas,
                            customerId: {{ customer.pk }},
                            formInitial: formInitial,
                            cancelUrl: '{{ cancel_url }}',
                            })">
+    <noscript>
+      <p class="important">Javascript is required for the counter UI.</p>
+    </noscript>
 
     <div id="user_info">
       <h5>{% trans %}Customer{% endtrans %}</h5>
@@ -86,12 +88,11 @@
 
           <form x-cloak method="post" action="" x-ref="basketForm">
 
-            <div class="basket-message-container">
+            <div class="basket-error-container">
               <div
                 x-cloak
-                class="alert basket-message"
+                class="alert alert-red basket-error"
-                :class="alertMessage.success ? 'alert-green' : 'alert-red'"
+                x-show="alertMessage.show"
-                x-show="alertMessage.open"
                 x-transition.duration.500ms
                 x-text="alertMessage.content"
               ></div>
@@ -110,9 +111,9 @@
                     </div>
                   </template>
 
-                  <button @click.prevent="addToBasket(item.product.id, -1)">-</button>
+                  <button @click.prevent="addToBasketWithMessage(item.product.id, -1)">-</button>
                   <span class="quantity" x-text="item.quantity"></span>
-                  <button @click.prevent="addToBasket(item.product.id, 1)">+</button>
+                  <button @click.prevent="addToBasketWithMessage(item.product.id, 1)">+</button>
 
                   <span x-text="item.product.name"></span> :
                   <span x-text="item.sum().toLocaleString(undefined, { minimumFractionDigits: 2 })">€</span>
@@ -212,7 +213,7 @@
                 <h5 class="margin-bottom">{{ category }}</h5>
                 <div class="row gap-2x">
                   {% for product in categories[category] -%}
-                    <button class="card shadow" @click="addToBasket('{{ product.id }}', 1)">
+                    <button class="card shadow" @click="addToBasketWithMessage('{{ product.id }}', 1)">
                       <img
                         class="card-image"
                         alt="image de {{ product.name }}"
@@ -251,18 +252,6 @@
         },
       {%- endfor -%}
     };
-    const formulas = [
-      {%- for formula in formulas -%}
-        {
-          result: {{ formula.result_id }},
-          products: [
-            {%- for product in formula.products.all() -%}
-              {{ product.id }},
-            {%- endfor -%}
-          ]
-        },
-      {%- endfor -%}
-    ];
     const formInitial = [
       {%- for f in form -%}
         {%- if f.cleaned_data -%}

counter/templates/counter/formula_list.jinja

@@ -1,78 +0,0 @@
-{% extends "core/base.jinja" %}
-
-{% block title %}
-  {% trans %}Product formulas{% endtrans %}
-{% endblock %}
-
-{% block additional_css %}
-  <link rel="stylesheet" href="{{ static("core/components/card.scss") }}">
-  <link rel="stylesheet" href="{{ static("counter/css/admin.scss") }}">
-{% endblock %}
-
-{% block content %}
-  <main>
-    <h3 class="margin-bottom">{% trans %}Product formulas{% endtrans %}</h3>
-    <p>
-      {%- trans trimmed -%}
-        Formulas allow you to associate a group of products
-        with a result product (the formula itself).
-      {%- endtrans -%}
-    </p>
-    <p>
-      {%- trans trimmed -%}
-        If the product of a formula is available on a counter,
-        it will be automatically applied if all the products that
-        make it up are added to the basket.
-      {%- endtrans -%}
-    </p>
-    <p>
-      {%- trans trimmed -%}
-        For example, if there is a formula that combines a "Sandwich Formula" product
-        with the "Sandwich" and "Soft Drink" products,
-        then, if a person orders a sandwich and a soft drink,
-        the formula will be applied and the basket will then contain a sandwich formula instead.
-      {%- endtrans -%}
-    </p>
-    <p class="margin-bottom">
-      <a href="{{ url('counter:product_formula_create') }}" class="btn btn-blue">
-        {% trans %}New formula{% endtrans %}
-        <i class="fa fa-plus"></i>
-      </a>
-    </p>
-    <div class="product-group">
-      {%- for formula in object_list -%}
-        <a
-          class="card card-row shadow clickable"
-          href="{{ url('counter:product_formula_edit', formula_id=formula.id) }}"
-        >
-          <div class="card-content">
-            <strong class="card-title">{{ formula.result.name }}</strong>
-            <p>
-              {% for p in formula.products.all() %}
-                <i>{{ p.code }} ({{ p.selling_price }} €)</i>
-                {% if not loop.last %}+{% endif %}
-              {% endfor %}
-            </p>
-            <p>
-              {{ formula.result.selling_price }} €
-              ({% trans %}instead of{% endtrans %} {{ formula.max_selling_price}} €)
-            </p>
-          </div>
-          {% if user.has_perm("counter.delete_productformula") %}
-            <button
-              x-data
-              class="btn btn-red btn-no-text card-top-left"
-              @click.prevent="document.location.href = '{{ url('counter:product_formula_delete', formula_id=formula.id) }}'"
-            >
-            {# The delete link is a button with a JS event listener
-               instead of a proper <a> element,
-               because the enclosing card is already a <a>,
-               and HTML forbids nested <a> #}
-              <i class="fa fa-trash"></i>
-            </button>
-          {% endif %}
-        </a>
-      {%- endfor -%}
-    </div>
-  </main>
-{% endblock %}

counter/templates/counter/product_form.jinja

@@ -1,44 +1,5 @@
 {% extends "core/base.jinja" %}
 
-{% block additional_js %}
-  <script type="module" src="{{ static("bundled/core/dynamic-formset-index.ts") }}"></script>
-{% endblock %}
-
-
-{% macro action_form(form) %}
-  <fieldset x-data="{action: '{{ form.task.initial }}'}">
-    {{ form.non_field_errors() }}
-    <div class="row gap-2x margin-bottom">
-      <div>
-        {{ form.task.errors }}
-        {{ form.task.label_tag() }}
-        {{ form.task|add_attr("x-model=action") }}
-      </div>
-      <div>{{ form.trigger_at.as_field_group() }}</div>
-    </div>
-    <div x-show="action==='counter.tasks.change_counters'" class="margin-bottom">
-      {{ form.counters.as_field_group() }}
-    </div>
-    {%- if form.DELETE -%}
-      <div class="row gap">
-        {{ form.DELETE.as_field_group() }}
-      </div>
-    {%- else -%}
-      <button
-        class="btn btn-grey"
-        @click.prevent="removeForm($event.target.closest('fieldset'))"
-      >
-        <i class="fa fa-minus"></i>{% trans %}Remove this action{% endtrans %}
-      </button>
-    {%- endif -%}
-    {%- for field in form.hidden_fields() -%}
-      {{ field }}
-    {%- endfor -%}
-    <hr />
-  </fieldset>
-{% endmacro %}
-
-
 {% block content %}
   {% if object %}
     <h2>{% trans name=object %}Edit product {{ name }}{% endtrans %}</h2>
@@ -64,20 +25,34 @@
       </em>
     </p>
 
-    <div x-data="dynamicFormSet" class="margin-bottom">
+    {{ form.action_formset.management_form }}
-      {{ form.action_formset.management_form }}
+    {%- for action_form in form.action_formset.forms -%}
-      <div x-ref="formContainer">
+      <fieldset x-data="{action: '{{ action_form.task.initial }}'}">
-        {%- for f in form.action_formset.forms -%}
+        {{ action_form.non_field_errors() }}
-          {{ action_form(f) }}
+        <div class="row gap-2x margin-bottom">
+          <div>
+            {{ action_form.task.errors }}
+            {{ action_form.task.label_tag() }}
+            {{ action_form.task|add_attr("x-model=action") }}
+          </div>
+          <div>{{ action_form.trigger_at.as_field_group() }}</div>
+        </div>
+        <div x-show="action==='counter.tasks.change_counters'" class="margin-bottom">
+          {{ action_form.counters.as_field_group() }}
+        </div>
+        {%- if action_form.DELETE -%}
+          <div class="row gap">
+            {{ action_form.DELETE.as_field_group() }}
+          </div>
+        {%- endif -%}
+        {%- for field in action_form.hidden_fields() -%}
+          {{ field }}
         {%- endfor -%}
-      </div>
+      </fieldset>
-      <template x-ref="formTemplate">
+      {%- if not loop.last -%}
-        {{ action_form(form.action_formset.empty_form) }}
+        <hr class="margin-bottom">
-      </template>
+      {%- endif -%}
-      <button @click.prevent="addForm()" class="btn btn-grey">
+    {%- endfor -%}
-        <i class="fa fa-plus"></i>{% trans %}Add action{% endtrans %}
+    <p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
-      </button>
-    </div>
-    <p><input class="btn btn-blue" type="submit" value="{% trans %}Save{% endtrans %}" /></p>
   </form>
 {% endblock %}

counter/tests/test_counter_admin.py

@@ -1,181 +0,0 @@
-from django.conf import settings
-from django.contrib.auth.models import Permission
-from django.test import TestCase
-from django.urls import reverse
-from model_bakery import baker
-
-from club.models import Membership
-from core.baker_recipes import subscriber_user
-from core.models import Group, User
-from counter.baker_recipes import product_recipe
-from counter.forms import CounterEditForm
-from counter.models import Counter, CounterSellers
-
-
-class TestEditCounterSellers(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        cls.counter = baker.make(Counter, type="BAR")
-        cls.products = product_recipe.make(_quantity=2, _bulk_create=True)
-        cls.counter.products.add(*cls.products)
-        users = subscriber_user.make(_quantity=6, _bulk_create=True)
-        cls.regular_barmen = users[:2]
-        cls.tmp_barmen = users[2:4]
-        cls.not_barmen = users[4:]
-        CounterSellers.objects.bulk_create(
-            [
-                *baker.prepare(
-                    CounterSellers,
-                    counter=cls.counter,
-                    user=iter(cls.regular_barmen),
-                    is_regular=True,
-                    _quantity=len(cls.regular_barmen),
-                ),
-                *baker.prepare(
-                    CounterSellers,
-                    counter=cls.counter,
-                    user=iter(cls.tmp_barmen),
-                    is_regular=False,
-                    _quantity=len(cls.tmp_barmen),
-                ),
-            ]
-        )
-        cls.operator = baker.make(
-            User, groups=[Group.objects.get(id=settings.SITH_GROUP_COUNTER_ADMIN_ID)]
-        )
-
-    def test_view_ok(self):
-        url = reverse("counter:admin", kwargs={"counter_id": self.counter.id})
-        self.client.force_login(self.operator)
-        res = self.client.get(url)
-        assert res.status_code == 200
-        res = self.client.post(
-            url,
-            data={
-                "sellers_regular": [u.id for u in self.regular_barmen],
-                "sellers_temporary": [u.id for u in self.tmp_barmen],
-                "products": [p.id for p in self.products],
-            },
-        )
-        self.assertRedirects(res, url)
-
-    def test_add_barmen(self):
-        form = CounterEditForm(
-            data={
-                "sellers_regular": [*self.regular_barmen, self.not_barmen[0]],
-                "sellers_temporary": [*self.tmp_barmen, self.not_barmen[1]],
-                "products": self.products,
-            },
-            instance=self.counter,
-            user=self.operator,
-        )
-        assert form.is_valid()
-        form.save()
-        assert set(self.counter.sellers.filter(countersellers__is_regular=True)) == {
-            *self.regular_barmen,
-            self.not_barmen[0],
-        }
-        assert set(self.counter.sellers.filter(countersellers__is_regular=False)) == {
-            *self.tmp_barmen,
-            self.not_barmen[1],
-        }
-
-    def test_barman_change_status(self):
-        """Test when a barman goes from temporary to regular"""
-        form = CounterEditForm(
-            data={
-                "sellers_regular": [*self.regular_barmen, self.tmp_barmen[0]],
-                "sellers_temporary": [*self.tmp_barmen[1:]],
-                "products": self.products,
-            },
-            instance=self.counter,
-            user=self.operator,
-        )
-        assert form.is_valid()
-        form.save()
-        assert set(self.counter.sellers.filter(countersellers__is_regular=True)) == {
-            *self.regular_barmen,
-            self.tmp_barmen[0],
-        }
-        assert set(
-            self.counter.sellers.filter(countersellers__is_regular=False)
-        ) == set(self.tmp_barmen[1:])
-
-    def test_barman_duplicate(self):
-        """Test that a barman cannot be regular and temporary at the same time."""
-        form = CounterEditForm(
-            data={
-                "sellers_regular": [*self.regular_barmen, self.not_barmen[0]],
-                "sellers_temporary": [*self.tmp_barmen, self.not_barmen[0]],
-                "products": self.products,
-            },
-            instance=self.counter,
-            user=self.operator,
-        )
-        assert not form.is_valid()
-        assert form.errors == {
-            "__all__": [
-                "Un utilisateur ne peut pas être un barman "
-                "régulier et temporaire en même temps, "
-                "mais les utilisateurs suivants ont été définis "
-                f"comme les deux : {self.not_barmen[0].get_display_name()}"
-            ],
-        }
-        assert set(self.counter.sellers.filter(countersellers__is_regular=True)) == set(
-            self.regular_barmen
-        )
-        assert set(
-            self.counter.sellers.filter(countersellers__is_regular=False)
-        ) == set(self.tmp_barmen)
-
-
-class TestEditCounterProducts(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        cls.counter = baker.make(Counter)
-        cls.products = product_recipe.make(_quantity=5, _bulk_create=True)
-        cls.counter.products.add(*cls.products)
-
-    def test_admin(self):
-        """Test that an admin can add and remove products"""
-        user = baker.make(
-            User, user_permissions=[Permission.objects.get(codename="change_counter")]
-        )
-        new_product = product_recipe.make()
-        form = CounterEditForm(
-            data={"sellers": [], "products": [*self.products[1:], new_product]},
-            user=user,
-            instance=self.counter,
-        )
-        assert form.is_valid()
-        form.save()
-        assert set(self.counter.products.all()) == {*self.products[1:], new_product}
-
-    def test_club_board_id(self):
-        """Test that people from counter club board can only add their own products."""
-        club = self.counter.club
-        user = subscriber_user.make()
-        baker.make(Membership, user=user, club=club, end_date=None)
-        new_product = product_recipe.make(club=club)
-        form = CounterEditForm(
-            data={"sellers": [], "products": [*self.products[1:], new_product]},
-            user=user,
-            instance=self.counter,
-        )
-        assert form.is_valid()
-        form.save()
-        assert set(self.counter.products.all()) == {*self.products[1:], new_product}
-
-        new_product = product_recipe.make()  # product not owned by the club
-        form = CounterEditForm(
-            data={"sellers": [], "products": [*self.products[1:], new_product]},
-            user=user,
-            instance=self.counter,
-        )
-        assert not form.is_valid()
-        assert form.errors == {
-            "products": [
-                "Sélectionnez un choix valide. "
-                f"{new_product.id} n\u2019en fait pas partie."
-            ],
-        }

counter/tests/test_formula.py

@@ -1,59 +0,0 @@
-from django.test import TestCase
-
-from counter.baker_recipes import product_recipe
-from counter.forms import ProductFormulaForm
-
-
-class TestFormulaForm(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        cls.products = product_recipe.make(
-            selling_price=iter([1.5, 1, 1]),
-            special_selling_price=iter([1.4, 0.9, 0.9]),
-            _quantity=3,
-            _bulk_create=True,
-        )
-
-    def test_ok(self):
-        form = ProductFormulaForm(
-            data={
-                "result": self.products[0].id,
-                "products": [self.products[1].id, self.products[2].id],
-            }
-        )
-        assert form.is_valid()
-        formula = form.save()
-        assert formula.result == self.products[0]
-        assert set(formula.products.all()) == set(self.products[1:])
-
-    def test_price_invalid(self):
-        self.products[0].selling_price = 2.1
-        self.products[0].save()
-        form = ProductFormulaForm(
-            data={
-                "result": self.products[0].id,
-                "products": [self.products[1].id, self.products[2].id],
-            }
-        )
-        assert not form.is_valid()
-        assert form.errors == {
-            "result": [
-                "Le résultat ne peut pas être plus cher "
-                "que le total des autres produits."
-            ]
-        }
-
-    def test_product_both_in_result_and_products(self):
-        form = ProductFormulaForm(
-            data={
-                "result": self.products[0].id,
-                "products": [self.products[0].id, self.products[1].id],
-            }
-        )
-        assert not form.is_valid()
-        assert form.errors == {
-            "__all__": [
-                "Un même produit ne peut pas être à la fois "
-                "le résultat et un élément de la formule."
-            ]
-        }

counter/tests/test_product.py

@@ -15,9 +15,8 @@ from pytest_django.asserts import assertNumQueries, assertRedirects
 from club.models import Club
 from core.baker_recipes import board_user, subscriber_user
 from core.models import Group, User
-from counter.baker_recipes import product_recipe
 from counter.forms import ProductForm
-from counter.models import Product, ProductFormula, ProductType
+from counter.models import Product, ProductType
 
 
 @pytest.mark.django_db
@@ -94,9 +93,6 @@ class TestCreateProduct(TestCase):
     def setUpTestData(cls):
         cls.product_type = baker.make(ProductType)
         cls.club = baker.make(Club)
-        cls.counter_admin = baker.make(
-            User, groups=[Group.objects.get(id=settings.SITH_GROUP_COUNTER_ADMIN_ID)]
-        )
         cls.data = {
             "name": "foo",
             "description": "bar",
@@ -120,36 +116,13 @@ class TestCreateProduct(TestCase):
         assert instance.name == "foo"
         assert instance.selling_price == 1.0
 
-    def test_form_with_product_from_formula(self):
-        """Test when the edited product is a result of a formula."""
-        self.client.force_login(self.counter_admin)
-        products = product_recipe.make(
-            selling_price=iter([1.5, 1, 1]),
-            special_selling_price=iter([1.4, 0.9, 0.9]),
-            _quantity=3,
-            _bulk_create=True,
-        )
-        baker.make(ProductFormula, result=products[0], products=products[1:])
-
-        data = self.data | {"selling_price": 1.7, "special_selling_price": 1.5}
-        form = ProductForm(data=data, instance=products[0])
-        assert form.is_valid()
-
-        # it shouldn't be possible to give a price higher than the formula's products
-        data = self.data | {"selling_price": 2.1, "special_selling_price": 1.9}
-        form = ProductForm(data=data, instance=products[0])
-        assert not form.is_valid()
-        assert form.errors == {
-            "selling_price": [
-                "Assurez-vous que cette valeur est inférieure ou égale à 2.00."
-            ],
-            "special_selling_price": [
-                "Assurez-vous que cette valeur est inférieure ou égale à 1.80."
-            ],
-        }
-
     def test_view(self):
-        self.client.force_login(self.counter_admin)
+        self.client.force_login(
+            baker.make(
+                User,
+                groups=[Group.objects.get(id=settings.SITH_GROUP_COUNTER_ADMIN_ID)],
+            )
+        )
         url = reverse("counter:new_product")
         response = self.client.get(url)
         assert response.status_code == 200

counter/urls.py

@@ -25,10 +25,6 @@ from counter.views.admin import (
     CounterStatView,
     ProductCreateView,
     ProductEditView,
-    ProductFormulaCreateView,
-    ProductFormulaDeleteView,
-    ProductFormulaEditView,
-    ProductFormulaListView,
     ProductListView,
     ProductTypeCreateView,
     ProductTypeEditView,
@@ -120,24 +116,6 @@ urlpatterns = [
         ProductEditView.as_view(),
         name="product_edit",
     ),
-    path(
-        "admin/formula/", ProductFormulaListView.as_view(), name="product_formula_list"
-    ),
-    path(
-        "admin/formula/new/",
-        ProductFormulaCreateView.as_view(),
-        name="product_formula_create",
-    ),
-    path(
-        "admin/formula/<int:formula_id>/edit",
-        ProductFormulaEditView.as_view(),
-        name="product_formula_edit",
-    ),
-    path(
-        "admin/formula/<int:formula_id>/delete",
-        ProductFormulaDeleteView.as_view(),
-        name="product_formula_delete",
-    ),
     path(
         "admin/product-type/list/",
         ProductTypeListView.as_view(),

counter/views/admin.py

@@ -16,7 +16,6 @@ from datetime import datetime, timedelta
 
 from django.conf import settings
 from django.contrib.auth.mixins import PermissionRequiredMixin, UserPassesTestMixin
-from django.contrib.messages.views import SuccessMessageMixin
 from django.core.exceptions import PermissionDenied
 from django.db import transaction
 from django.forms import CheckboxSelectMultiple
@@ -35,13 +34,11 @@ from counter.forms import (
     CloseCustomerAccountForm,
     CounterEditForm,
     ProductForm,
-    ProductFormulaForm,
     ReturnableProductForm,
 )
 from counter.models import (
     Counter,
     Product,
-    ProductFormula,
     ProductType,
     Refilling,
     ReturnableProduct,
@@ -59,9 +56,7 @@ class CounterListView(CounterAdminTabsMixin, CanViewMixin, ListView):
     current_tab = "counters"
 
 
-class CounterEditView(
+class CounterEditView(CounterAdminTabsMixin, CounterAdminMixin, UpdateView):
-    CounterAdminTabsMixin, UserPassesTestMixin, SuccessMessageMixin, UpdateView
-):
     """Edit a counter's main informations (for the counter's manager)."""
 
     model = Counter
@@ -69,16 +64,11 @@ class CounterEditView(
     pk_url_kwarg = "counter_id"
     template_name = "core/edit.jinja"
     current_tab = "counters"
-    success_message = _("Counter update done")
 
-    def test_func(self):
+    def dispatch(self, request, *args, **kwargs):
-        if self.request.user.has_perm("counter.change_counter"):
+        obj = self.get_object()
-            return True
+        self.edit_club.append(obj.club)
-        obj = self.get_object(queryset=self.get_queryset().select_related("club"))
+        return super().dispatch(request, *args, **kwargs)
-        return obj.club.has_rights_in_club(self.request.user)
-
-    def get_form_kwargs(self):
-        return super().get_form_kwargs() | {"user": self.request.user}
 
     def get_success_url(self):
         return reverse_lazy("counter:admin", kwargs={"counter_id": self.object.id})
@@ -172,62 +162,6 @@ class ProductEditView(CounterAdminTabsMixin, CounterAdminMixin, UpdateView):
     current_tab = "products"
 
 
-class ProductFormulaListView(CounterAdminTabsMixin, PermissionRequiredMixin, ListView):
-    model = ProductFormula
-    queryset = ProductFormula.objects.select_related("result").prefetch_related(
-        "products"
-    )
-    template_name = "counter/formula_list.jinja"
-    current_tab = "formulas"
-    permission_required = "counter.view_productformula"
-
-
-class ProductFormulaCreateView(
-    CounterAdminTabsMixin, PermissionRequiredMixin, CreateView
-):
-    model = ProductFormula
-    form_class = ProductFormulaForm
-    pk_url_kwarg = "formula_id"
-    template_name = "core/create.jinja"
-    current_tab = "formulas"
-    success_url = reverse_lazy("counter:product_formula_list")
-    permission_required = "counter.add_productformula"
-
-
-class ProductFormulaEditView(
-    CounterAdminTabsMixin, PermissionRequiredMixin, UpdateView
-):
-    model = ProductFormula
-    form_class = ProductFormulaForm
-    pk_url_kwarg = "formula_id"
-    template_name = "core/edit.jinja"
-    current_tab = "formulas"
-    success_url = reverse_lazy("counter:product_formula_list")
-    permission_required = "counter.change_productformula"
-
-
-class ProductFormulaDeleteView(
-    CounterAdminTabsMixin, PermissionRequiredMixin, DeleteView
-):
-    model = ProductFormula
-    pk_url_kwarg = "formula_id"
-    template_name = "core/delete_confirm.jinja"
-    current_tab = "formulas"
-    success_url = reverse_lazy("counter:product_formula_list")
-    permission_required = "counter.delete_productformula"
-
-    def get_context_data(self, **kwargs):
-        obj_name = self.object.result.name
-        return super().get_context_data(**kwargs) | {
-            "object_name": _("%(formula)s (formula)") % {"formula": obj_name},
-            "help_text": _(
-                "This action will only delete the formula, "
-                "but not the %(product)s product itself."
-            )
-            % {"product": obj_name},
-        }
-
-
 class ReturnableProductListView(
     CounterAdminTabsMixin, PermissionRequiredMixin, ListView
 ):

counter/views/click.py

@@ -12,7 +12,6 @@
 # OR WITHIN THE LOCAL FILE "LICENSE"
 #
 #
-from collections import defaultdict
 
 from django.core.exceptions import PermissionDenied
 from django.db import transaction
@@ -32,7 +31,6 @@ from counter.forms import BasketForm, RefillForm
 from counter.models import (
     Counter,
     Customer,
-    ProductFormula,
     ReturnableProduct,
     Selling,
 )
@@ -208,13 +206,12 @@ class CounterClick(
         """Add customer to the context."""
         kwargs = super().get_context_data(**kwargs)
         kwargs["products"] = self.products
-        kwargs["formulas"] = ProductFormula.objects.filter(
+        kwargs["categories"] = {}
-            result__in=self.products
-        ).prefetch_related("products")
-        kwargs["categories"] = defaultdict(list)
         for product in kwargs["products"]:
             if product.product_type:
-                kwargs["categories"][product.product_type].append(product)
+                kwargs["categories"].setdefault(product.product_type, []).append(
+                    product
+                )
         kwargs["customer"] = self.customer
         kwargs["cancel_url"] = self.get_success_url()
 

counter/views/mixins.py

@@ -100,11 +100,6 @@ class CounterAdminTabsMixin(TabedViewMixin):
             "slug": "products",
             "name": _("Products"),
         },
-        {
-            "url": reverse_lazy("counter:product_formula_list"),
-            "slug": "formulas",
-            "name": _("Formulas"),
-        },
         {
             "url": reverse_lazy("counter:product_type_list"),
             "slug": "product_types",

eboutic/templates/eboutic/eboutic_checkout.jinja

@@ -68,6 +68,12 @@
         <template x-for="[key, value] in Object.entries(data)" :key="key">
           <input type="hidden" :name="key" :value="value">
         </template>
+        <input type="checkbox" value="cgv" required>
+        <label>
+          {% trans  trimmed %}I have read and accept {% endtrans %}
+          <a href="">{% trans %}the general terms and conditions{% endtrans%}</a> 
+          {%trans%}of the student assosiation of UTBM{% endtrans %}</label>
+        <br>
         <input
           x-cloak
           type="submit"
@@ -93,6 +99,12 @@
     {% else %}
       <form method="post" action="{{ url('eboutic:pay_with_sith', basket_id=basket.id) }}" name="sith-pay-form">
         {% csrf_token %}
+        <input type="checkbox" value="cgv" required>
+        <label>
+          {% trans  trimmed %}I have read and accept {% endtrans %}
+          <a href="">{% trans %}the general terms and conditions{% endtrans%}</a> 
+          {%trans%}of the student assosiation of UTBM{% endtrans %}</label>
+        <br>
         <input class="btn btn-blue" type="submit" value="{% trans %}Pay with Sith account{% endtrans %}"/>
       </form>
     {% endif %}

election/tests.py

@@ -6,8 +6,6 @@ from django.test import Client, TestCase
 from django.urls import reverse
 from django.utils.timezone import now
 from model_bakery import baker
-from model_bakery.recipe import Recipe
-from pytest_django.asserts import assertRedirects
 
 from core.baker_recipes import subscriber_user
 from core.models import Group, User
@@ -54,102 +52,6 @@ class TestElectionUpdateView(TestElection):
         assert response.status_code == 403
 
 
-class TestElectionForm(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        cls.election = baker.make(Election, end_date=now() + timedelta(days=1))
-        cls.group = baker.make(Group)
-        cls.election.vote_groups.add(cls.group)
-        cls.election.edit_groups.add(cls.group)
-        lists = baker.make(
-            ElectionList, election=cls.election, _quantity=2, _bulk_create=True
-        )
-        cls.roles = baker.make(
-            Role, election=cls.election, _quantity=2, _bulk_create=True
-        )
-        users = baker.make(User, _quantity=4, _bulk_create=True)
-        recipe = Recipe(Candidature)
-        cls.cand = [
-            recipe.prepare(role=cls.roles[0], user=users[0], election_list=lists[0]),
-            recipe.prepare(role=cls.roles[0], user=users[1], election_list=lists[1]),
-            recipe.prepare(role=cls.roles[1], user=users[2], election_list=lists[0]),
-            recipe.prepare(role=cls.roles[1], user=users[3], election_list=lists[1]),
-        ]
-        Candidature.objects.bulk_create(cls.cand)
-        cls.vote_url = reverse("election:vote", kwargs={"election_id": cls.election.id})
-        cls.detail_url = reverse(
-            "election:detail", kwargs={"election_id": cls.election.id}
-        )
-
-    def test_election_good_form(self):
-        postes = (self.roles[0].title, self.roles[1].title)
-        votes = [
-            {postes[0]: "", postes[1]: str(self.cand[2].id)},
-            {postes[0]: "", postes[1]: ""},
-            {postes[0]: str(self.cand[0].id), postes[1]: str(self.cand[2].id)},
-            {postes[0]: str(self.cand[0].id), postes[1]: str(self.cand[3].id)},
-        ]
-        voters = subscriber_user.make(_quantity=len(votes), _bulk_create=True)
-        self.group.users.set(voters)
-
-        for voter, vote in zip(voters, votes, strict=True):
-            assert self.election.can_vote(voter)
-            self.client.force_login(voter)
-            response = self.client.post(self.vote_url, data=vote)
-            assertRedirects(response, self.detail_url)
-
-        assert set(self.election.voters.all()) == set(voters)
-        assert self.election.results == {
-            postes[0]: {
-                self.cand[0].user.username: {"percent": 50.0, "vote": 2},
-                self.cand[1].user.username: {"percent": 0.0, "vote": 0},
-                "blank vote": {"percent": 50.0, "vote": 2},
-                "total vote": 4,
-            },
-            postes[1]: {
-                self.cand[2].user.username: {"percent": 50.0, "vote": 2},
-                self.cand[3].user.username: {"percent": 25.0, "vote": 1},
-                "blank vote": {"percent": 25.0, "vote": 1},
-                "total vote": 4,
-            },
-        }
-
-    def test_election_bad_form(self):
-        postes = (self.roles[0].title, self.roles[1].title)
-
-        votes = [
-            {postes[0]: "", postes[1]: str(self.cand[0].id)},  # wrong candidate
-            {postes[0]: ""},
-            {
-                postes[0]: "0123456789",  # unknow users
-                postes[1]: str(subscriber_user.make().id),  # not a candidate
-            },
-            {},
-        ]
-        voters = subscriber_user.make(_quantity=len(votes), _bulk_create=True)
-        self.group.users.set(voters)
-
-        for voter, vote in zip(voters, votes, strict=True):
-            self.client.force_login(voter)
-            response = self.client.post(self.vote_url, data=vote)
-            assertRedirects(response, self.detail_url)
-
-        assert self.election.results == {
-            postes[0]: {
-                self.cand[0].user.username: {"percent": 0.0, "vote": 0},
-                self.cand[1].user.username: {"percent": 0.0, "vote": 0},
-                "blank vote": {"percent": 100.0, "vote": 2},
-                "total vote": 2,
-            },
-            postes[1]: {
-                self.cand[2].user.username: {"percent": 0.0, "vote": 0},
-                self.cand[3].user.username: {"percent": 0.0, "vote": 0},
-                "blank vote": {"percent": 100.0, "vote": 2},
-                "total vote": 2,
-            },
-        }
-
-
 @pytest.mark.django_db
 def test_election_create_list_permission(client: Client):
     election = baker.make(Election, end_candidature=now() + timedelta(hours=1))

election/views.py

@@ -1,6 +1,7 @@
 from typing import TYPE_CHECKING
 
 from cryptography.utils import cached_property
+from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.mixins import (
     LoginRequiredMixin,
@@ -114,9 +115,16 @@ class VoteFormView(LoginRequiredMixin, UserPassesTestMixin, FormView):
     def test_func(self):
         if not self.election.can_vote(self.request.user):
             return False
-        return self.election.vote_groups.filter(
+
-            id__in=self.request.user.all_groups
+        groups = set(self.election.vote_groups.values_list("id", flat=True))
-        ).exists()
+        if (
+            settings.SITH_GROUP_SUBSCRIBERS_ID in groups
+            and self.request.user.is_subscribed
+        ):
+            # the subscriber group isn't truly attached to users,
+            # so it must be dealt with separately
+            return True
+        return self.request.user.groups.filter(id__in=groups).exists()
 
     def vote(self, election_data):
         with transaction.atomic():
@@ -230,9 +238,15 @@ class RoleCreateView(LoginRequiredMixin, UserPassesTestMixin, CreateView):
             return False
         if self.request.user.has_perm("election.add_role"):
             return True
-        return self.election.edit_groups.filter(
+        groups = set(self.election.edit_groups.values_list("id", flat=True))
-            id__in=self.request.user.all_groups
+        if (
-        ).exists()
+            settings.SITH_GROUP_SUBSCRIBERS_ID in groups
+            and self.request.user.is_subscribed
+        ):
+            # the subscriber group isn't truly attached to users,
+            # so it must be dealt with separately
+            return True
+        return self.request.user.groups.filter(id__in=groups).exists()
 
     def get_initial(self):
         return {"election": self.election}
@@ -265,7 +279,14 @@ class ElectionListCreateView(LoginRequiredMixin, UserPassesTestMixin, CreateView
             .union(self.election.edit_groups.values("id"))
             .values_list("id", flat=True)
         )
-        return not groups.isdisjoint(self.request.user.all_groups.keys())
+        if (
+            settings.SITH_GROUP_SUBSCRIBERS_ID in groups
+            and self.request.user.is_subscribed
+        ):
+            # the subscriber group isn't truly attached to users,
+            # so it must be dealt with separately
+            return True
+        return self.request.user.groups.filter(id__in=groups).exists()
 
     def get_initial(self):
         return {"election": self.election}

locale/fr/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-03-10 10:28+0100\n"
+"POT-Creation-Date: 2026-02-14 15:21+0100\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"
@@ -2937,47 +2937,6 @@ msgstr "Cet UID est invalide"
 msgid "User not found"
 msgstr "Utilisateur non trouvé"
 
-#: counter/forms.py
-msgid "Regular barmen"
-msgstr "Barmen réguliers"
-
-#: counter/forms.py
-msgid ""
-"Barmen having regular permanences or frequently giving a hand throughout the "
-"semester."
-msgstr ""
-"Les barmen assurant des permanences régulières ou donnant régulièrement un "
-"coup de main au cours du semestre."
-
-#: counter/forms.py
-msgid "Temporary barmen"
-msgstr "Barmen temporaires"
-
-#: counter/forms.py
-msgid ""
-"Barmen who will be there only for a limited period (e.g. for one evening)"
-msgstr ""
-"Les barmen qui seront là uniquement pour une durée limitée (par exemple, le "
-"temps d'une soirée)"
-
-#: counter/forms.py
-msgid ""
-"If you want to add a product that is not owned by your club to this counter, "
-"you should ask an admin."
-msgstr ""
-"Si vous souhaitez ajouter sur ce comptoir un produit qui n'appartient pas à "
-"votre club, vous devriez demander à un admin."
-
-#: counter/forms.py
-#, python-format
-msgid ""
-"A user cannot be a regular and a temporary barman at the same time, but the "
-"following users have been defined as both : %(users)s"
-msgstr ""
-"Un utilisateur ne peut pas être un barman régulier et temporaire en même "
-"temps, mais les utilisateurs suivants ont été définis comme les deux : "
-"%(users)s"
-
 #: counter/forms.py
 msgid "Date and time of action"
 msgstr "Date et heure de l'action"
@@ -2998,38 +2957,6 @@ msgstr ""
 "Décrivez le produit. Si c'est un click pour un évènement, donnez quelques "
 "détails dessus, comme la date (en incluant l'année)."
 
-#: counter/forms.py
-#, python-format
-msgid ""
-"This product is a formula. Its price cannot be greater than the price of the "
-"products constituting it, which is %(price)s €"
-msgstr ""
-"Ce produit est une formule. Son prix ne peut pas être supérieur au prix des "
-"produits qui la constituent, soit %(price)s €."
-
-#: counter/forms.py
-#, python-format
-msgid ""
-"This product is a formula. Its special price cannot be greater than the "
-"price of the products constituting it, which is %(price)s €"
-msgstr ""
-"Ce produit est une formule. Son prix spécial ne peut pas être supérieur au "
-"prix des produits qui la constituent, soit %(price)s €."
-
-#: counter/forms.py
-msgid ""
-"The same product cannot be at the same time the result and a part of the "
-"formula."
-msgstr ""
-"Un même produit ne peut pas être à la fois le résultat et un élément de la "
-"formule."
-
-#: counter/forms.py
-msgid ""
-"The result cannot be more expensive than the total of the other products."
-msgstr ""
-"Le résultat ne peut pas être plus cher que le total des autres produits."
-
 #: counter/forms.py
 msgid "Refound this account"
 msgstr "Rembourser ce compte"
@@ -3194,18 +3121,6 @@ msgstr "produit"
 msgid "products"
 msgstr "produits"
 
-#: counter/models.py
-msgid "The products that constitute this formula."
-msgstr "Les produits qui constituent cette formule."
-
-#: counter/models.py
-msgid "result product"
-msgstr "produit résultat"
-
-#: counter/models.py
-msgid "The product got with the formula."
-msgstr "Le produit obtenu par la formule."
-
 #: counter/models.py
 msgid "counter type"
 msgstr "type de comptoir"
@@ -3226,10 +3141,6 @@ msgstr "vendeurs"
 msgid "token"
 msgstr "jeton"
 
-#: counter/models.py
-msgid "regular barman"
-msgstr "barman régulier"
-
 #: counter/models.py sith/settings.py
 msgid "Credit card"
 msgstr "Carte bancaire"
@@ -3630,48 +3541,6 @@ msgstr "Nouveau eticket"
 msgid "There is no eticket in this website."
 msgstr "Il n'y a pas de eticket sur ce site web."
 
-#: counter/templates/counter/formula_list.jinja
-msgid "Product formulas"
-msgstr "Formules de produits"
-
-#: counter/templates/counter/formula_list.jinja
-msgid ""
-"Formulas allow you to associate a group of products with a result product "
-"(the formula itself)."
-msgstr ""
-"Les formules permettent d'associer un groupe de produits à un produit "
-"résultat (la formule en elle-même)."
-
-#: counter/templates/counter/formula_list.jinja
-msgid ""
-"If the product of a formula is available on a counter, it will be "
-"automatically applied if all the products that make it up are added to the "
-"basket."
-msgstr ""
-"Si le produit d'une formule est disponible sur un comptoir, celle-ci sera "
-"automatiquement appliquée si tous les produits qui la constituent sont "
-"ajoutés au panier."
-
-#: counter/templates/counter/formula_list.jinja
-msgid ""
-"For example, if there is a formula that combines a \"Sandwich Formula\" "
-"product with the \"Sandwich\" and \"Soft Drink\" products, then, if a person "
-"orders a sandwich and a soft drink, the formula will be applied and the "
-"basket will then contain a sandwich formula instead."
-msgstr ""
-"Par exemple s'il existe une formule associant un produit « Formule "
-"sandwich » aux produits « Sandwich » et « Soft », alors, si une personne "
-"commande un sandwich et un soft, la formule sera appliquée et le panier "
-"contiendra alors une formule sandwich à la place."
-
-#: counter/templates/counter/formula_list.jinja
-msgid "New formula"
-msgstr "Nouvelle formule"
-
-#: counter/templates/counter/formula_list.jinja
-msgid "instead of"
-msgstr "au lieu de"
-
 #: counter/templates/counter/fragments/create_student_card.jinja
 msgid "No student card registered."
 msgstr "Aucune carte étudiante enregistrée."
@@ -3794,10 +3663,6 @@ msgstr ""
 "votre cotisation. Si vous ne renouvelez pas votre cotisation, il n'y aura "
 "aucune conséquence autre que le retrait de l'argent de votre compte."
 
-#: counter/templates/counter/product_form.jinja
-msgid "Remove this action"
-msgstr "Retirer cette action"
-
 #: counter/templates/counter/product_form.jinja
 #, python-format
 msgid "Edit product %(name)s"
@@ -3825,10 +3690,6 @@ msgstr ""
 "Les actions automatiques vous permettent de planifier des modifications du "
 "produit à l'avance."
 
-#: counter/templates/counter/product_form.jinja
-msgid "Add action"
-msgstr "Ajouter une action"
-
 #: counter/templates/counter/product_list.jinja
 msgid "Product list"
 msgstr "Liste des produits"
@@ -3942,24 +3803,6 @@ msgstr "Temps"
 msgid "Top 100 barman %(counter_name)s (all semesters)"
 msgstr "Top 100 barman %(counter_name)s (tous les semestres)"
 
-#: counter/views/admin.py
-msgid "Counter update done"
-msgstr "Mise à jour du comptoir effectuée"
-
-#: counter/views/admin.py
-#, python-format
-msgid "%(formula)s (formula)"
-msgstr "%(formula)s (formule)"
-
-#: counter/views/admin.py
-#, python-format
-msgid ""
-"This action will only delete the formula, but not the %(product)s product "
-"itself."
-msgstr ""
-"Cette action supprimera seulement la formule, mais pas le produit "
-"%(product)s en lui-même."
-
 #: counter/views/admin.py
 #, python-format
 msgid "returnable product : %(returnable)s -> %(returned)s"
@@ -4045,10 +3888,6 @@ msgstr "Dernières opérations"
 msgid "Counter administration"
 msgstr "Administration des comptoirs"
 
-#: counter/views/mixins.py
-msgid "Formulas"
-msgstr "Formules"
-
 #: counter/views/mixins.py
 msgid "Product types"
 msgstr "Types de produit"
@@ -4214,6 +4053,18 @@ msgstr ""
 msgid "You can't buy a refilling with sith money"
 msgstr "Vous ne pouvez pas acheter un rechargement avec de l'argent du sith"
 
+#: eboutic/views.py
+msgid "I have read and accept"
+msgstr "J'ai lu et j'accepte"
+
+#: eboutic/views.py
+msgid "the general terms and conditions"
+msgstr "les conditions générales de vente"
+
+#: eboutic/views.py
+msgid "of the student assosiation of UTBM"
+msgstr "de l'Association des étudiants de l'UTBM"
+
 #: election/forms.py
 msgid "You have selected too many candidates."
 msgstr "Vous avez sélectionné trop de candidats."
@@ -5294,6 +5145,8 @@ msgid "One day"
 msgstr "Un jour"
 
 #: sith/settings.py
+#, fuzzy
+#| msgid "GA staff member"
 msgid "GA staff member"
 msgstr "Membre staff GA"
 

locale/fr/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-11-26 15:45+0100\n"
+"POT-Creation-Date: 2025-08-23 15:30+0200\n"
 "PO-Revision-Date: 2024-09-17 11:54+0200\n"
 "Last-Translator: Sli <antoine@bartuccio.fr>\n"
 "Language-Team: AE info <ae.info@utbm.fr>\n"
@@ -206,10 +206,6 @@ msgstr "capture.%s"
 msgid "Not enough money"
 msgstr "Pas assez d'argent"
 
-#: counter/static/bundled/counter/counter-click-index.ts
-msgid "Formula %(formula)s applied"
-msgstr "Formule %(formula)s appliquée"
-
 #: counter/static/bundled/counter/counter-click-index.ts
 msgid "You can't send an empty basket."
 msgstr "Vous ne pouvez pas envoyer un panier vide."
@@ -266,9 +262,3 @@ msgstr "Il n'a pas été possible de modérer l'image"
 #: sas/static/bundled/sas/viewer-index.ts
 msgid "Couldn't delete picture"
 msgstr "Il n'a pas été possible de supprimer l'image"
-
-#: timetable/static/bundled/timetable/generator-index.ts
-msgid ""
-"Wrong timetable format. Make sure you copied if from your student folder."
-msgstr ""
-"Mauvais format d'emploi du temps. Assurez-vous que vous l'avez copié depuis votre dossier étudiants."

package.json

@@ -28,8 +28,8 @@
   "devDependencies": {
     "@babel/core": "^7.29.0",
     "@babel/preset-env": "^7.29.0",
-    "@biomejs/biome": "^2.4.6",
+    "@biomejs/biome": "^2.3.14",
-    "@hey-api/openapi-ts": "^0.94.0",
+    "@hey-api/openapi-ts": "^0.92.4",
     "@rollup/plugin-inject": "^5.0.5",
     "@types/alpinejs": "^3.13.11",
     "@types/cytoscape-cxtmenu": "^3.4.5",
@@ -43,14 +43,14 @@
   "dependencies": {
     "@alpinejs/sort": "^3.15.8",
     "@arendjr/text-clipper": "npm:@jsr/arendjr__text-clipper@^3.0.0",
-    "@floating-ui/dom": "^1.7.6",
+    "@floating-ui/dom": "^1.7.5",
     "@fortawesome/fontawesome-free": "^7.2.0",
     "@fullcalendar/core": "^6.1.20",
     "@fullcalendar/daygrid": "^6.1.20",
     "@fullcalendar/icalendar": "^6.1.20",
     "@fullcalendar/list": "^6.1.20",
-    "@sentry/browser": "^10.43.0",
+    "@sentry/browser": "^10.38.0",
-    "@zip.js/zip.js": "^2.8.23",
+    "@zip.js/zip.js": "^2.8.20",
     "3d-force-graph": "^1.79.1",
     "alpinejs": "^3.15.8",
     "chart.js": "^4.5.1",
@@ -60,14 +60,14 @@
     "cytoscape-klay": "^3.1.4",
     "d3-force-3d": "^3.0.6",
     "easymde": "^2.20.0",
-    "glob": "^13.0.6",
+    "glob": "^13.0.2",
     "html2canvas": "^1.4.1",
     "htmx.org": "^2.0.8",
     "js-cookie": "^3.0.5",
     "lit-html": "^3.3.2",
     "native-file-system-adapter": "^3.0.1",
-    "three": "^0.183.2",
+    "three": "^0.182.0",
     "three-spritetext": "^1.10.0",
-    "tom-select": "^2.5.2"
+    "tom-select": "^2.5.1"
   }
 }

pyproject.toml

@@ -19,7 +19,7 @@ authors = [
 license = { text = "GPL-3.0-only" }
 requires-python = "<4.0,>=3.12"
 dependencies = [
-    "django>=5.2.12,<6.0.0",
+    "django>=5.2.11,<6.0.0",
     "django-ninja>=1.5.3,<6.0.0",
     "django-ninja-extra>=0.31.0",
     "Pillow>=12.1.1,<13.0.0",
@@ -27,15 +27,15 @@ dependencies = [
     "django-jinja<3.0.0,>=2.11.0",
     "cryptography>=46.0.5,<47.0.0",
     "django-phonenumber-field>=8.4.0,<9.0.0",
-    "phonenumbers>=9.0.25,<10.0.0",
+    "phonenumbers>=9.0.23,<10.0.0",
-    "reportlab>=4.4.10,<5.0.0",
+    "reportlab>=4.4.9,<5.0.0",
     "django-haystack<4.0.0,>=3.3.0",
     "xapian-haystack<4.0.0,>=3.1.0",
     "libsass<1.0.0,>=0.23.0",
     "django-ordered-model<4.0.0,>=3.7.4",
     "django-simple-captcha<1.0.0,>=0.6.3",
     "python-dateutil<3.0.0.0,>=2.9.0.post0",
-    "sentry-sdk>=2.54.0,<3.0.0",
+    "sentry-sdk>=2.52.0,<3.0.0",
     "jinja2<4.0.0,>=3.1.6",
     "django-countries>=8.2.0,<9.0.0",
     "dict2xml>=1.7.8,<2.0.0",
@@ -51,7 +51,7 @@ dependencies = [
     "psutil>=7.2.2,<8.0.0",
     "celery[redis]>=5.6.2,<7",
     "django-celery-results>=2.5.1",
-    "django-celery-beat>=2.9.0",
+    "django-celery-beat>=2.7.0",
 ]
 
 [project.urls]
@@ -60,31 +60,31 @@ documentation = "https://sith-ae.readthedocs.io/"
 
 [dependency-groups]
 prod = [
-    "psycopg[c]>=3.3.3,<4.0.0",
+    "psycopg[c]>=3.3.2,<4.0.0",
 ]
 dev = [
     "django-debug-toolbar>=6.2.0,<7",
-    "ipython>=9.11.0,<10.0.0",
+    "ipython>=9.10.0,<10.0.0",
     "pre-commit>=4.5.1,<5.0.0",
-    "ruff>=0.15.5,<1.0.0",
+    "ruff>=0.15.0,<1.0.0",
     "djhtml>=3.0.10,<4.0.0",
-    "faker>=40.8.0,<41.0.0",
+    "faker>=40.4.0,<41.0.0",
     "rjsmin>=1.2.5,<2.0.0",
 ]
 tests = [
     "freezegun>=1.5.5,<2.0.0",
     "pytest>=9.0.2,<10.0.0",
     "pytest-cov>=7.0.0,<8.0.0",
-    "pytest-django<5.0.0,>=4.12.0",
+    "pytest-django<5.0.0,>=4.10.0",
-    "model-bakery<2.0.0,>=1.23.3",
+    "model-bakery<2.0.0,>=1.23.2",
     "beautifulsoup4>=4.14.3,<5",
     "lxml>=6.0.2,<7",
 ]
 docs = [
     "mkdocs<2.0.0,>=1.6.1",
-    "mkdocs-material>=9.7.5,<10.0.0",
+    "mkdocs-material>=9.7.1,<10.0.0",
     "mkdocstrings>=1.0.3,<2.0.0",
-    "mkdocstrings-python>=2.0.3,<3.0.0",
+    "mkdocstrings-python>=2.0.2,<3.0.0",
     "mkdocs-include-markdown-plugin>=7.2.1,<8.0.0",
 ]
 

sas/static/bundled/sas/viewer-index.ts

@@ -1,6 +1,7 @@
 import type TomSelect from "tom-select";
 import type { UserAjaxSelect } from "#core:core/components/ajax-select-index.ts";
 import { paginated } from "#core:utils/api.ts";
+import { exportToHtml } from "#core:utils/globals.ts";
 import { History } from "#core:utils/history.ts";
 import {
   type IdentifiedUserSchema,
@@ -108,225 +109,232 @@ interface ViewerConfig {
   /** id of the first picture to load on the page */
   firstPictureId: number;
   /** if the user is sas admin */
-  userCanModerate: boolean;
+  userIsSasAdmin: boolean;
 }
 
 /**
  * Load user picture page with a nice download bar
  **/
-document.addEventListener("alpine:init", () => {
+exportToHtml("loadViewer", (config: ViewerConfig) => {
-  Alpine.data("picture_viewer", (config: ViewerConfig) => ({
+  document.addEventListener("alpine:init", () => {
-    /**
+    Alpine.data("picture_viewer", () => ({
-     * All the pictures that can be displayed on this picture viewer
+      /**
-     **/
+       * All the pictures that can be displayed on this picture viewer
-    pictures: [] as PictureWithIdentifications[],
+       **/
-    /**
+      pictures: [] as PictureWithIdentifications[],
-     * The currently displayed picture
+      /**
-     * Default dummy data are pre-loaded to avoid javascript error
+       * The currently displayed picture
-     * when loading the page at the beginning
+       * Default dummy data are pre-loaded to avoid javascript error
-     * @type PictureWithIdentifications
+       * when loading the page at the beginning
-     **/
+       * @type PictureWithIdentifications
-    currentPicture: {
+       **/
-      // biome-ignore lint/style/useNamingConvention: api is in snake_case
+      currentPicture: {
-      is_moderated: true,
+        // biome-ignore lint/style/useNamingConvention: api is in snake_case
-      id: null as number,
+        is_moderated: true,
-      name: "",
+        id: null as number,
-      // biome-ignore lint/style/useNamingConvention: api is in snake_case
+        name: "",
-      display_name: "",
+        // biome-ignore lint/style/useNamingConvention: api is in snake_case
-      // biome-ignore lint/style/useNamingConvention: api is in snake_case
+        display_name: "",
-      compressed_url: "",
+        // biome-ignore lint/style/useNamingConvention: api is in snake_case
-      // biome-ignore lint/style/useNamingConvention: api is in snake_case
+        compressed_url: "",
-      profile_url: "",
+        // biome-ignore lint/style/useNamingConvention: api is in snake_case
-      // biome-ignore lint/style/useNamingConvention: api is in snake_case
+        profile_url: "",
-      full_size_url: "",
+        // biome-ignore lint/style/useNamingConvention: api is in snake_case
-      owner: "",
+        full_size_url: "",
-      date: new Date(),
+        owner: "",
-      identifications: [] as IdentifiedUserSchema[],
+        date: new Date(),
-    },
+        identifications: [] as IdentifiedUserSchema[],
-    /**
+      },
-     * The picture which will be displayed next if the user press the "next" button
+      /**
-     **/
+       * The picture which will be displayed next if the user press the "next" button
-    nextPicture: null as PictureWithIdentifications,
+       **/
-    /**
+      nextPicture: null as PictureWithIdentifications,
-     * The picture which will be displayed next if the user press the "previous" button
+      /**
-     **/
+       * The picture which will be displayed next if the user press the "previous" button
-    previousPicture: null as PictureWithIdentifications,
+       **/
-    /**
+      previousPicture: null as PictureWithIdentifications,
-     * The select2 component used to identify users
+      /**
-     **/
+       * The select2 component used to identify users
-    selector: undefined as UserAjaxSelect,
+       **/
-    /**
+      selector: undefined as UserAjaxSelect,
-     * Error message when a moderation operation fails
+      /**
-     **/
+       * Error message when a moderation operation fails
-    moderationError: "",
+       **/
-    /**
+      moderationError: "",
-     * Method of pushing new url to the browser history
+      /**
-     * Used by popstate event and always reset to it's default value when used
+       * Method of pushing new url to the browser history
-     **/
+       * Used by popstate event and always reset to it's default value when used
-    pushstate: History.Push,
+       **/
+      pushstate: History.Push,
 
-    async init() {
+      async init() {
-      this.pictures = (
+        this.pictures = (
-        await paginated(picturesFetchPictures, {
+          await paginated(picturesFetchPictures, {
-          // biome-ignore lint/style/useNamingConvention: api is in snake_case
+            // biome-ignore lint/style/useNamingConvention: api is in snake_case
-          query: { album_id: config.albumId },
+            query: { album_id: config.albumId },
-        } as PicturesFetchPicturesData)
+          } as PicturesFetchPicturesData)
-      ).map(PictureWithIdentifications.fromPicture);
+        ).map(PictureWithIdentifications.fromPicture);
-      this.selector = this.$refs.search;
+        this.selector = this.$refs.search;
-      this.selector.setFilter((users: UserProfileSchema[]) => {
+        this.selector.setFilter((users: UserProfileSchema[]) => {
-        const resp: UserProfileSchema[] = [];
+          const resp: UserProfileSchema[] = [];
-        const ids = [
+          const ids = [
-          ...(this.currentPicture.identifications || []).map(
+            ...(this.currentPicture.identifications || []).map(
-            (i: IdentifiedUserSchema) => i.user.id,
+              (i: IdentifiedUserSchema) => i.user.id,
-          ),
+            ),
-        ];
+          ];
-        for (const user of users) {
+          for (const user of users) {
-          if (!ids.includes(user.id)) {
+            if (!ids.includes(user.id)) {
-            resp.push(user);
+              resp.push(user);
+            }
           }
-        }
+          return resp;
-        return resp;
+        });
-      });
+        this.currentPicture = this.pictures.find(
-      this.currentPicture = this.pictures.find(
+          (i: PictureSchema) => i.id === config.firstPictureId,
-        (i: PictureSchema) => i.id === config.firstPictureId,
+        );
-      );
+        this.$watch(
-      this.$watch(
+          "currentPicture",
-        "currentPicture",
+          (current: PictureSchema, previous: PictureSchema) => {
-        (current: PictureSchema, previous: PictureSchema) => {
+            if (current === previous) {
-          if (current === previous) {
+              /* Avoid recursive updates */
-            /* Avoid recursive updates */
+              return;
+            }
+            this.updatePicture();
+          },
+        );
+        window.addEventListener("popstate", async (event) => {
+          if (!event.state || event.state.sasPictureId === undefined) {
             return;
           }
-          this.updatePicture();
+          this.pushstate = History.Replace;
-        },
+          this.currentPicture = this.pictures.find(
-      );
+            (i: PictureSchema) =>
-      window.addEventListener("popstate", async (event) => {
+              i.id === Number.parseInt(event.state.sasPictureId, 10),
-        if (!event.state || event.state.sasPictureId === undefined) {
+          );
+        });
+        this.pushstate = History.Replace; /* Avoid first url push */
+        await this.updatePicture();
+      },
+
+      /**
+       * Update the page.
+       * Called when the `currentPicture` property changes.
+       *
+       * The url is modified without reloading the page,
+       * and the previous picture, the next picture and
+       * the list of identified users are updated.
+       */
+      async updatePicture(): Promise<void> {
+        const updateArgs = {
+          data: { sasPictureId: this.currentPicture.id },
+          unused: "",
+          url: this.currentPicture.sas_url,
+        };
+        if (this.pushstate === History.Replace) {
+          window.history.replaceState(
+            updateArgs.data,
+            updateArgs.unused,
+            updateArgs.url,
+          );
+          this.pushstate = History.Push;
+        } else {
+          window.history.pushState(updateArgs.data, updateArgs.unused, updateArgs.url);
+        }
+
+        this.moderationError = "";
+        const index: number = this.pictures.indexOf(this.currentPicture);
+        this.previousPicture = this.pictures[index - 1] || null;
+        this.nextPicture = this.pictures[index + 1] || null;
+        this.$refs.mainPicture?.addEventListener("load", () => {
+          // once the current picture is loaded,
+          // start preloading the next and previous pictures
+          this.nextPicture?.preload();
+          this.previousPicture?.preload();
+        });
+        if (this.currentPicture.asked_for_removal && config.userIsSasAdmin) {
+          await Promise.all([
+            this.currentPicture.loadIdentifications(),
+            this.currentPicture.loadModeration(),
+          ]);
+        } else {
+          await this.currentPicture.loadIdentifications();
+        }
+      },
+
+      async moderatePicture() {
+        const res = await picturesModeratePicture({
+          // biome-ignore lint/style/useNamingConvention: api is in snake_case
+          path: { picture_id: this.currentPicture.id },
+        });
+        if (res.error) {
+          this.moderationError = `${gettext("Couldn't moderate picture")} : ${(res.error as { detail: string }).detail}`;
           return;
         }
-        this.pushstate = History.Replace;
+        this.currentPicture.is_moderated = true;
-        this.currentPicture = this.pictures.find(
+        this.currentPicture.asked_for_removal = false;
-          (i: PictureSchema) => i.id === Number.parseInt(event.state.sasPictureId, 10),
+      },
-        );
-      });
-      this.pushstate = History.Replace; /* Avoid first url push */
-      await this.updatePicture();
-    },
 
-    /**
+      async deletePicture() {
-     * Update the page.
+        const res = await picturesDeletePicture({
-     * Called when the `currentPicture` property changes.
-     *
-     * The url is modified without reloading the page,
-     * and the previous picture, the next picture and
-     * the list of identified users are updated.
-     */
-    async updatePicture(): Promise<void> {
-      const updateArgs = {
-        data: { sasPictureId: this.currentPicture.id },
-        unused: "",
-        url: this.currentPicture.sas_url,
-      };
-      if (this.pushstate === History.Replace) {
-        window.history.replaceState(updateArgs.data, updateArgs.unused, updateArgs.url);
-        this.pushstate = History.Push;
-      } else {
-        window.history.pushState(updateArgs.data, updateArgs.unused, updateArgs.url);
-      }
-
-      this.moderationError = "";
-      const index: number = this.pictures.indexOf(this.currentPicture);
-      this.previousPicture = this.pictures[index - 1] || null;
-      this.nextPicture = this.pictures[index + 1] || null;
-      this.$refs.mainPicture?.addEventListener("load", () => {
-        // once the current picture is loaded,
-        // start preloading the next and previous pictures
-        this.nextPicture?.preload();
-        this.previousPicture?.preload();
-      });
-      if (this.currentPicture.asked_for_removal && config.userCanModerate) {
-        await Promise.all([
-          this.currentPicture.loadIdentifications(),
-          this.currentPicture.loadModeration(),
-        ]);
-      } else {
-        await this.currentPicture.loadIdentifications();
-      }
-    },
-
-    async moderatePicture() {
-      const res = await picturesModeratePicture({
-        // biome-ignore lint/style/useNamingConvention: api is in snake_case
-        path: { picture_id: this.currentPicture.id },
-      });
-      if (res.error) {
-        this.moderationError = `${gettext("Couldn't moderate picture")} : ${(res.error as { detail: string }).detail}`;
-        return;
-      }
-      this.currentPicture.is_moderated = true;
-      this.currentPicture.asked_for_removal = false;
-    },
-
-    async deletePicture() {
-      const res = await picturesDeletePicture({
-        // biome-ignore lint/style/useNamingConvention: api is in snake_case
-        path: { picture_id: this.currentPicture.id },
-      });
-      if (res.error) {
-        this.moderationError = `${gettext("Couldn't delete picture")} : ${(res.error as { detail: string }).detail}`;
-        return;
-      }
-      this.pictures.splice(this.pictures.indexOf(this.currentPicture), 1);
-      if (this.pictures.length === 0) {
-        // The deleted picture was the only one in the list.
-        // As the album is now empty, go back to the parent page
-        document.location.href = config.albumUrl;
-      }
-      this.currentPicture = this.nextPicture || this.previousPicture;
-    },
-
-    /**
-     * Send the identification request and update the list of identified users.
-     */
-    async submitIdentification(): Promise<void> {
-      const widget: TomSelect = this.selector.widget;
-      await picturesIdentifyUsers({
-        path: {
           // biome-ignore lint/style/useNamingConvention: api is in snake_case
-          picture_id: this.currentPicture.id,
+          path: { picture_id: this.currentPicture.id },
-        },
+        });
-        body: widget.items.map((i: string) => Number.parseInt(i, 10)),
+        if (res.error) {
-      });
+          this.moderationError = `${gettext("Couldn't delete picture")} : ${(res.error as { detail: string }).detail}`;
-      // refresh the identified users list
+          return;
-      await this.currentPicture.loadIdentifications({ forceReload: true });
+        }
+        this.pictures.splice(this.pictures.indexOf(this.currentPicture), 1);
+        if (this.pictures.length === 0) {
+          // The deleted picture was the only one in the list.
+          // As the album is now empty, go back to the parent page
+          document.location.href = config.albumUrl;
+        }
+        this.currentPicture = this.nextPicture || this.previousPicture;
+      },
 
-      // Clear selection and cache of retrieved user so they can be filtered again
+      /**
-      widget.clear(false);
+       * Send the identification request and update the list of identified users.
-      widget.clearOptions();
+       */
-      widget.setTextboxValue("");
+      async submitIdentification(): Promise<void> {
-    },
+        const widget: TomSelect = this.selector.widget;
+        await picturesIdentifyUsers({
+          path: {
+            // biome-ignore lint/style/useNamingConvention: api is in snake_case
+            picture_id: this.currentPicture.id,
+          },
+          body: widget.items.map((i: string) => Number.parseInt(i, 10)),
+        });
+        // refresh the identified users list
+        await this.currentPicture.loadIdentifications({ forceReload: true });
 
-    /**
+        // Clear selection and cache of retrieved user so they can be filtered again
-     * Check if an identification can be removed by the currently logged user
+        widget.clear(false);
-     */
+        widget.clearOptions();
-    canBeRemoved(identification: IdentifiedUserSchema): boolean {
+        widget.setTextboxValue("");
-      return config.userCanModerate || identification.user.id === config.userId;
+      },
-    },
 
-    /**
+      /**
-     * Untag a user from the current picture
+       * Check if an identification can be removed by the currently logged user
-     */
+       */
-    async removeIdentification(identification: IdentifiedUserSchema): Promise<void> {
+      canBeRemoved(identification: IdentifiedUserSchema): boolean {
-      const res = await usersidentifiedDeleteRelation({
+        return config.userIsSasAdmin || identification.user.id === config.userId;
-        // biome-ignore lint/style/useNamingConvention: api is in snake_case
+      },
-        path: { relation_id: identification.id },
+
-      });
+      /**
-      if (!res.error && Array.isArray(this.currentPicture.identifications)) {
+       * Untag a user from the current picture
-        this.currentPicture.identifications =
+       */
-          this.currentPicture.identifications.filter(
+      async removeIdentification(identification: IdentifiedUserSchema): Promise<void> {
-            (i: IdentifiedUserSchema) => i.id !== identification.id,
+        const res = await usersidentifiedDeleteRelation({
-          );
+          // biome-ignore lint/style/useNamingConvention: api is in snake_case
-      }
+          path: { relation_id: identification.id },
-    },
+        });
-  }));
+        if (!res.error && Array.isArray(this.currentPicture.identifications)) {
+          this.currentPicture.identifications =
+            this.currentPicture.identifications.filter(
+              (i: IdentifiedUserSchema) => i.id !== identification.id,
+            );
+        }
+      },
+    }));
+  });
 });

sas/templates/sas/picture.jinja

@@ -17,8 +17,10 @@
 
 {% from "sas/macros.jinja" import print_path %}
 
+{% set user_is_sas_admin = user.is_root or user.is_in_group(pk = settings.SITH_GROUP_SAS_ADMIN_ID) %}
+
 {% block content %}
-  <main x-data="picture_viewer(config)">
+  <main x-data="picture_viewer">
     <code>
       <a href="{{ url('sas:main') }}">SAS</a> / {{ print_path(album) }} <span x-text="currentPicture.name"></span>
     </code>
@@ -48,13 +50,15 @@
               It will be hidden to other users until it has been moderated.
             {% endtrans %}
           </p>
-          {% if user.has_perm("sas.moderate_sasfile") %}
+          {% if user_is_sas_admin %}
             <template x-if="currentPicture.asked_for_removal">
               <div>
                 <h5>{% trans %}The following issues have been raised:{% endtrans %}</h5>
                 <template x-for="req in (currentPicture.moderationRequests ?? [])" :key="req.id">
                   <div>
-                    <h6 x-text="`${req.author.first_name} ${req.author.last_name}`"></h6>
+                    <h6
+                      x-text="`${req.author.first_name} ${req.author.last_name}`"
+                    ></h6>
                     <i x-text="Intl.DateTimeFormat(
                                '{{ LANGUAGE_CODE }}',
                                {dateStyle: 'long', timeStyle: 'short'}
@@ -66,7 +70,7 @@
             </template>
           {% endif %}
         </div>
-        {% if user.has_perm("sas.moderate_sasfile") %}
+        {% if user_is_sas_admin %}
           <div class="alert-aside">
             <button class="btn btn-blue" @click="moderatePicture()">
               {% trans %}Moderate{% endtrans %}
@@ -200,13 +204,16 @@
 {% endblock %}
 
 {% block script %}
+  {{ super() }}
   <script>
-    const config = {
+    window.addEventListener("DOMContentLoaded", () => {
-      albumId: {{ album.id }},
+      loadViewer({
-      albumUrl: "{{ album.get_absolute_url() }}",
+        albumId: {{ album.id }} ,
-      firstPictureId: {{ picture.id }},  {# id of the first picture to show after page load #}
+        albumUrl: "{{ album.get_absolute_url() }}",
-      userId: {{ user.id }},
+        firstPictureId: {{ picture.id }},  {# id of the first picture to show after page load #}
-      userCanModerate: {{ user.has_perm("sas.moderate_sasfile")|tojson }}
+        userId: {{ user.id }},
-    }
+        userIsSasAdmin: {{ user_is_sas_admin|tojson }}
+      });
+    })
   </script>
 {% endblock %}

sas/tests/test_views.py

@@ -161,22 +161,16 @@ class TestSasModeration(TestCase):
         assert len(res.context_data["pictures"]) == 1
         assert res.context_data["pictures"][0] == self.to_moderate
 
+        res = self.client.post(
+            reverse("sas:moderation"),
+            data={"album_id": self.to_moderate.id, "picture_id": self.to_moderate.id},
+        )
+
     def test_moderation_page_forbidden(self):
         self.client.force_login(self.simple_user)
         res = self.client.get(reverse("sas:moderation"))
         assert res.status_code == 403
 
-    def test_moderate_album(self):
-        self.client.force_login(self.moderator)
-        url = reverse("sas:moderation")
-        album = baker.make(
-            Album, is_moderated=False, parent_id=settings.SITH_SAS_ROOT_DIR_ID
-        )
-        res = self.client.post(url, data={"album_id": album.id, "moderate": ""})
-        assertRedirects(res, url)
-        album.refresh_from_db()
-        assert album.is_moderated
-
     def test_moderate_picture(self):
         self.client.force_login(self.moderator)
         res = self.client.get(

sas/views.py

@@ -15,10 +15,10 @@
 from typing import Any
 
 from django.conf import settings
-from django.contrib.auth.mixins import PermissionRequiredMixin
+from django.core.exceptions import PermissionDenied
 from django.db.models import Count, OuterRef, Subquery
 from django.http import Http404, HttpResponseRedirect
-from django.shortcuts import get_object_or_404, redirect
+from django.shortcuts import get_object_or_404
 from django.urls import reverse
 from django.utils.safestring import SafeString
 from django.views.generic import CreateView, DetailView, TemplateView
@@ -191,21 +191,26 @@ class UserPicturesView(UserTabsMixin, CanViewMixin, DetailView):
 # Admin views
 
 
-class ModerationView(PermissionRequiredMixin, TemplateView):
+class ModerationView(TemplateView):
     template_name = "sas/moderation.jinja"
-    permission_required = "sas.moderate_sasfile"
+
+    def get(self, request, *args, **kwargs):
+        if request.user.is_in_group(pk=settings.SITH_GROUP_SAS_ADMIN_ID):
+            return super().get(request, *args, **kwargs)
+        raise PermissionDenied
 
     def post(self, request, *args, **kwargs):
         if "album_id" not in request.POST:
             raise Http404
-        album = get_object_or_404(Album, pk=request.POST["album_id"])
+        if request.user.is_in_group(pk=settings.SITH_GROUP_SAS_ADMIN_ID):
-        if "moderate" in request.POST:
+            album = get_object_or_404(Album, pk=request.POST["album_id"])
-            album.moderator = request.user
+            if "moderate" in request.POST:
-            album.is_moderated = True
+                album.moderator = request.user
-            album.save()
+                album.is_moderated = True
-        elif "delete" in request.POST:
+                album.save()
-            album.delete()
+            elif "delete" in request.POST:
-        return redirect(self.request.path)
+                album.delete()
+        return super().get(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
         kwargs = super().get_context_data(**kwargs)

sith/settings.py

@@ -551,27 +551,27 @@ SITH_SUBSCRIPTIONS = {
     # Discount subscriptions
     "un-semestre-reduction": {
         "name": _("One semester (-20%)"),
-        "price": 16,
+        "price": 12,
         "duration": 1,
     },
     "deux-semestres-reduction": {
         "name": _("Two semesters (-20%)"),
-        "price": 28,
+        "price": 22,
         "duration": 2,
     },
     "cursus-tronc-commun-reduction": {
         "name": _("Common core cursus (-20%)"),
-        "price": 48,
+        "price": 36,
         "duration": 4,
     },
     "cursus-branche-reduction": {
         "name": _("Branch cursus (-20%)"),
-        "price": 48,
+        "price": 36,
         "duration": 6,
     },
     "cursus-alternant-reduction": {
         "name": _("Alternating cursus (-20%)"),
-        "price": 28,
+        "price": 24,
         "duration": 6,
     },
     # CA special offer