remove unused settings

Counter sellers

core/api.py

@@ -123,7 +123,7 @@ class GroupController(ControllerBase):
     )
     @paginate(PageNumberPaginationExtra, page_size=50)
     def search_group(self, search: Annotated[str, MinLen(1)]):
-        return Group.objects.filter(name__icontains=search).order_by("name").values()
+        return Group.objects.filter(name__icontains=search).values()
 
 
 DepthValue = Annotated[int, Ge(0), Le(10)]

core/management/commands/populate.py

@@ -41,14 +41,7 @@ from com.ics_calendar import IcsCalendar
 from com.models import News, NewsDate, Sith, Weekmail
 from core.models import BanGroup, Group, Page, PageRev, SithFile, User
 from core.utils import resize_image
-from counter.models import (
+from counter.models import Counter, Product, ProductType, ReturnableProduct, StudentCard
-    Counter,
-    Price,
-    Product,
-    ProductType,
-    ReturnableProduct,
-    StudentCard,
-)
 from election.models import Candidature, Election, ElectionList, Role
 from forum.models import Forum
 from pedagogy.models import UE
@@ -375,15 +368,125 @@ class Command(BaseCommand):
             end_date=localdate() - timedelta(days=100),
         )
 
-        self._create_products(groups, main_club, refound)
+        p = ProductType.objects.create(name="Bières bouteilles")
+        c = ProductType.objects.create(name="Cotisations")
+        r = ProductType.objects.create(name="Rechargements")
+        verre = ProductType.objects.create(name="Verre")
+        cotis = Product.objects.create(
+            name="Cotis 1 semestre",
+            code="1SCOTIZ",
+            product_type=c,
+            purchase_price="15",
+            selling_price="15",
+            special_selling_price="15",
+            club=main_club,
+        )
+        cotis2 = Product.objects.create(
+            name="Cotis 2 semestres",
+            code="2SCOTIZ",
+            product_type=c,
+            purchase_price="28",
+            selling_price="28",
+            special_selling_price="28",
+            club=main_club,
+        )
+        refill = Product.objects.create(
+            name="Rechargement 15 €",
+            code="15REFILL",
+            product_type=r,
+            purchase_price="15",
+            selling_price="15",
+            special_selling_price="15",
+            club=main_club,
+        )
+        barb = Product.objects.create(
+            name="Barbar",
+            code="BARB",
+            product_type=p,
+            purchase_price="1.50",
+            selling_price="1.7",
+            special_selling_price="1.6",
+            club=main_club,
+            limit_age=18,
+        )
+        cble = Product.objects.create(
+            name="Chimay Bleue",
+            code="CBLE",
+            product_type=p,
+            purchase_price="1.50",
+            selling_price="1.7",
+            special_selling_price="1.6",
+            club=main_club,
+            limit_age=18,
+        )
+        cons = Product.objects.create(
+            name="Consigne Eco-cup",
+            code="CONS",
+            product_type=verre,
+            purchase_price="1",
+            selling_price="1",
+            special_selling_price="1",
+            club=main_club,
+        )
+        dcons = Product.objects.create(
+            name="Déconsigne Eco-cup",
+            code="DECO",
+            product_type=verre,
+            purchase_price="-1",
+            selling_price="-1",
+            special_selling_price="-1",
+            club=main_club,
+        )
+        cors = Product.objects.create(
+            name="Corsendonk",
+            code="CORS",
+            product_type=p,
+            purchase_price="1.50",
+            selling_price="1.7",
+            special_selling_price="1.6",
+            club=main_club,
+            limit_age=18,
+        )
+        carolus = Product.objects.create(
+            name="Carolus",
+            code="CARO",
+            product_type=p,
+            purchase_price="1.50",
+            selling_price="1.7",
+            special_selling_price="1.6",
+            club=main_club,
+            limit_age=18,
+        )
+        Product.objects.create(
+            name="remboursement",
+            code="REMBOURS",
+            purchase_price="0",
+            selling_price="0",
+            special_selling_price="0",
+            club=refound,
+        )
+        groups.subscribers.products.add(
+            cotis, cotis2, refill, barb, cble, cors, carolus
+        )
+        groups.old_subscribers.products.add(cotis, cotis2)
+
+        mde = Counter.objects.get(name="MDE")
+        mde.products.add(barb, cble, cons, dcons)
+
+        eboutic = Counter.objects.get(name="Eboutic")
+        eboutic.products.add(barb, cotis, cotis2, refill)
 
         Counter.objects.create(name="Carte AE", club=refound, type="OFFICE")
 
+        ReturnableProduct.objects.create(
+            product=cons, returned_product=dcons, max_return=3
+        )
+
         # Add barman to counter
         Counter.sellers.through.objects.bulk_create(
             [
-                Counter.sellers.through(counter_id=1, user=skia),  # MDE
+                Counter.sellers.through(counter_id=2, user=krophil),
-                Counter.sellers.through(counter_id=2, user=krophil),  # Foyer
+                Counter.sellers.through(counter=mde, user=skia),
             ]
         )
 
@@ -639,131 +742,6 @@ class Command(BaseCommand):
             ]
         )
 
-    def _create_products(
-        self, groups: PopulatedGroups, main_club: Club, refound_club: Club
-    ):
-        beers_type, cotis_type, refill_type, verre_type = (
-            ProductType.objects.bulk_create(
-                [
-                    ProductType(name="Bières bouteilles"),
-                    ProductType(name="Cotisations"),
-                    ProductType(name="Rechargements"),
-                    ProductType(name="Verre"),
-                ]
-            )
-        )
-        cotis = Product.objects.create(
-            name="Cotis 1 semestre",
-            code="1SCOTIZ",
-            product_type=cotis_type,
-            purchase_price=15,
-            club=main_club,
-        )
-        cotis2 = Product.objects.create(
-            name="Cotis 2 semestres",
-            code="2SCOTIZ",
-            product_type=cotis_type,
-            purchase_price="28",
-            club=main_club,
-        )
-        refill = Product.objects.create(
-            name="Rechargement 15 €",
-            code="15REFILL",
-            product_type=refill_type,
-            purchase_price=15,
-            club=main_club,
-        )
-        barb = Product.objects.create(
-            name="Barbar",
-            code="BARB",
-            product_type=beers_type,
-            purchase_price="1.50",
-            club=main_club,
-            limit_age=18,
-        )
-        cble = Product.objects.create(
-            name="Chimay Bleue",
-            code="CBLE",
-            product_type=beers_type,
-            purchase_price="1.50",
-            club=main_club,
-            limit_age=18,
-        )
-        cons = Product.objects.create(
-            name="Consigne Eco-cup",
-            code="CONS",
-            product_type=verre_type,
-            purchase_price="1",
-            club=main_club,
-        )
-        dcons = Product.objects.create(
-            name="Déconsigne Eco-cup",
-            code="DECO",
-            product_type=verre_type,
-            purchase_price="-1",
-            club=main_club,
-        )
-        cors = Product.objects.create(
-            name="Corsendonk",
-            code="CORS",
-            product_type=beers_type,
-            purchase_price="1.50",
-            club=main_club,
-            limit_age=18,
-        )
-        carolus = Product.objects.create(
-            name="Carolus",
-            code="CARO",
-            product_type=beers_type,
-            purchase_price="1.50",
-            club=main_club,
-            limit_age=18,
-        )
-        Product.objects.create(
-            name="remboursement",
-            code="REMBOURS",
-            purchase_price=0,
-            club=refound_club,
-        )
-        ReturnableProduct.objects.create(
-            product=cons, returned_product=dcons, max_return=3
-        )
-        mde = Counter.objects.get(name="MDE")
-        mde.products.add(barb, cble, cons, dcons)
-        eboutic = Counter.objects.get(name="Eboutic")
-        eboutic.products.add(barb, cotis, cotis2, refill)
-
-        cotis, cotis2, refill, barb, cble, cors, carolus, cons, dcons = (
-            Price.objects.bulk_create(
-                [
-                    Price(product=cotis, amount=15),
-                    Price(product=cotis2, amount=28),
-                    Price(product=refill, amount=15),
-                    Price(product=barb, amount=1.7),
-                    Price(product=cble, amount=1.7),
-                    Price(product=cors, amount=1.7),
-                    Price(product=carolus, amount=1.7),
-                    Price(product=cons, amount=1),
-                    Price(product=dcons, amount=-1),
-                ]
-            )
-        )
-        Price.groups.through.objects.bulk_create(
-            [
-                Price.groups.through(price=cotis, group=groups.subscribers),
-                Price.groups.through(price=cotis2, group=groups.subscribers),
-                Price.groups.through(price=refill, group=groups.subscribers),
-                Price.groups.through(price=barb, group=groups.subscribers),
-                Price.groups.through(price=cble, group=groups.subscribers),
-                Price.groups.through(price=cors, group=groups.subscribers),
-                Price.groups.through(price=carolus, group=groups.subscribers),
-                Price.groups.through(price=cotis, group=groups.old_subscribers),
-                Price.groups.through(price=cotis2, group=groups.old_subscribers),
-                Price.groups.through(price=cons, group=groups.old_subscribers),
-                Price.groups.through(price=dcons, group=groups.old_subscribers),
-            ]
-        )
-
     def _create_profile_pict(self, user: User):
         path = self.SAS_FIXTURE_PATH / "Family" / f"{user.username}.jpg"
         file = resize_image(Image.open(path), 400, "WEBP")

core/management/commands/populate_more.py

@@ -17,7 +17,6 @@ from counter.models import (
     Counter,
     Customer,
     Permanency,
-    Price,
     Product,
     ProductType,
     Refilling,
@@ -279,7 +278,6 @@ class Command(BaseCommand):
         # 2/3 of the products are owned by AE
         clubs = [ae, ae, ae, ae, ae, ae, *other_clubs]
         products = []
-        prices = []
         buying_groups = []
         selling_places = []
         for _ in range(200):
@@ -290,28 +288,25 @@ class Command(BaseCommand):
                 product_type=random.choice(categories),
                 code="".join(self.faker.random_letters(length=random.randint(4, 8))),
                 purchase_price=price,
+                selling_price=price,
+                special_selling_price=price - min(0.5, price),
                 club=random.choice(clubs),
                 limit_age=0 if random.random() > 0.2 else 18,
-                archived=self.faker.boolean(60),
+                archived=bool(random.random() > 0.7),
             )
             products.append(product)
-            for i in range(random.randint(0, 3)):
+            # there will be products without buying groups
-                product_price = Price(
+            # but there are also such products in the real database
-                    amount=price, product=product, is_always_shown=self.faker.boolean()
+            buying_groups.extend(
-                )
+                Product.buying_groups.through(product=product, group=group)
-                # prices for non-subscribers will be higher than for subscribers
+                for group in random.sample(groups, k=random.randint(0, 3))
-                price *= 1.2
+            )
-                prices.append(product_price)
-                buying_groups.append(
-                    Price.groups.through(price=product_price, group=groups[i])
-                )
             selling_places.extend(
                 Counter.products.through(counter=counter, product=product)
                 for counter in random.sample(counters, random.randint(0, 4))
             )
         Product.objects.bulk_create(products)
-        Price.objects.bulk_create(prices)
+        Product.buying_groups.through.objects.bulk_create(buying_groups)
-        Price.groups.through.objects.bulk_create(buying_groups)
         Counter.products.through.objects.bulk_create(selling_places)
 
     def create_sales(self, sellers: list[User]):
@@ -325,7 +320,7 @@ class Command(BaseCommand):
                 )
             )
         )
-        prices = list(Price.objects.select_related("product").all())
+        products = list(Product.objects.all())
         counters = list(
             Counter.objects.filter(name__in=["Foyer", "MDE", "La Gommette"])
         )
@@ -335,14 +330,14 @@ class Command(BaseCommand):
             # the longer the customer has existed, the higher the mean of nb_products
             mu = 5 + (now().year - customer.since.year) * 2
             nb_sales = max(0, int(random.normalvariate(mu=mu, sigma=mu * 5)))
-            favoured_prices = random.sample(prices, k=(random.randint(1, 5)))
+            favoured_products = random.sample(products, k=(random.randint(1, 5)))
             favoured_counter = random.choice(counters)
             this_customer_sales = []
             for _ in range(nb_sales):
-                price = (
+                product = (
-                    random.choice(favoured_prices)
+                    random.choice(favoured_products)
                     if random.random() > 0.7
-                    else random.choice(prices)
+                    else random.choice(products)
                 )
                 counter = (
                     favoured_counter
@@ -351,11 +346,11 @@ class Command(BaseCommand):
                 )
                 this_customer_sales.append(
                     Selling(
-                        product=price.product,
+                        product=product,
                         counter=counter,
-                        club_id=price.product.club_id,
+                        club_id=product.club_id,
                         quantity=random.randint(1, 5),
-                        unit_price=price.amount,
+                        unit_price=product.selling_price,
                         seller=random.choice(sellers),
                         customer=customer,
                         date=make_aware(

core/tests/test_user.py

@@ -213,9 +213,9 @@ def test_user_invoice_with_multiple_items():
     """Test that annotate_total() works when invoices contain multiple items."""
     user: User = subscriber_user.make()
     item_recipe = Recipe(InvoiceItem, invoice=foreign_key(Recipe(Invoice, user=user)))
-    item_recipe.make(_quantity=3, quantity=1, unit_price=5)
+    item_recipe.make(_quantity=3, quantity=1, product_unit_price=5)
-    item_recipe.make(_quantity=1, quantity=1, unit_price=5)
+    item_recipe.make(_quantity=1, quantity=1, product_unit_price=5)
-    item_recipe.make(_quantity=2, quantity=1, unit_price=iter([5, 8]))
+    item_recipe.make(_quantity=2, quantity=1, product_unit_price=iter([5, 8]))
     res = list(
         Invoice.objects.filter(user=user)
         .annotate_total()

counter/admin.py

@@ -24,7 +24,6 @@ from counter.models import (
     Eticket,
     InvoiceCall,
     Permanency,
-    Price,
     Product,
     ProductType,
     Refilling,
@@ -33,24 +32,19 @@ from counter.models import (
 )
 
 
-class PriceInline(admin.TabularInline):
-    model = Price
-    autocomplete_fields = ("groups",)
-
-
 @admin.register(Product)
 class ProductAdmin(SearchModelAdmin):
     list_display = (
         "name",
         "code",
         "product_type",
+        "selling_price",
         "archived",
         "created_at",
         "updated_at",
     )
     list_select_related = ("product_type",)
     search_fields = ("name", "code")
-    inlines = [PriceInline]
 
 
 @admin.register(ReturnableProduct)

counter/api.py

@@ -101,9 +101,13 @@ class ProductController(ControllerBase):
         """Get the detailed information about the products."""
         return filters.filter(
             Product.objects.select_related("club")
-            .prefetch_related("prices", "prices__groups")
+            .prefetch_related("buying_groups")
             .select_related("product_type")
-            .order_by(F("product_type__order").asc(nulls_last=True), "name")
+            .order_by(
+                F("product_type__order").asc(nulls_last=True),
+                "product_type",
+                "name",
+            )
         )
 
 

counter/baker_recipes.py

@@ -2,11 +2,10 @@ from model_bakery.recipe import Recipe, foreign_key
 
 from club.models import Club
 from core.models import User
-from counter.models import Counter, Price, Product, Refilling, Selling
+from counter.models import Counter, Product, Refilling, Selling
 
 counter_recipe = Recipe(Counter)
 product_recipe = Recipe(Product, club=foreign_key(Recipe(Club)))
-price_recipe = Recipe(Price, product=foreign_key(product_recipe))
 sale_recipe = Recipe(
     Selling,
     product=foreign_key(product_recipe),

counter/forms.py

@@ -1,11 +1,12 @@
 import json
 import math
 import uuid
-from collections import defaultdict
 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
@@ -15,7 +16,7 @@ from phonenumber_field.widgets import RegionalPhoneNumberWidget
 
 from club.models import Club
 from club.widgets.ajax_select import AutoCompleteSelectClub
-from core.models import User
+from core.models import User, UserQuerySet
 from core.views.forms import (
     FutureDateTimeField,
     NFCTextInput,
@@ -32,10 +33,10 @@ from core.views.widgets.ajax_select import (
 from counter.models import (
     BillingInfo,
     Counter,
+    CounterSellers,
     Customer,
     Eticket,
     InvoiceCall,
-    Price,
     Product,
     ProductFormula,
     Refilling,
@@ -171,14 +172,39 @@ class RefillForm(forms.ModelForm):
 class CounterEditForm(forms.ModelForm):
     class Meta:
         model = Counter
-        fields = ["sellers", "products"]
+        fields = ["products"]
-        widgets = {"sellers": AutoCompleteSelectMultipleUser}
+
+    sellers_regular = forms.ModelMultipleChoiceField(
+        label=_("Regular barmen"),
+        help_text=_(
+            "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
@@ -187,6 +213,61 @@ class CounterEditForm(forms.ModelForm):
                 "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):
@@ -293,21 +374,7 @@ ScheduledProductActionFormSet = forms.modelformset_factory(
     can_delete=True,
     can_delete_extra=False,
     extra=0,
-)
-
-
-ProductPriceFormSet = forms.inlineformset_factory(
-    parent_model=Product,
-    model=Price,
-    fields=["amount", "label", "groups", "is_always_shown"],
-    widgets={
-        "groups": AutoCompleteSelectMultipleGroup,
-        "is_always_shown": forms.CheckboxInput(attrs={"class": "switch"}),
-    },
-    absolute_max=None,
-    can_delete_extra=False,
     min_num=1,
-    extra=0,
 )
 
 
@@ -322,7 +389,10 @@ class ProductForm(forms.ModelForm):
             "description",
             "product_type",
             "code",
+            "buying_groups",
             "purchase_price",
+            "selling_price",
+            "special_selling_price",
             "icon",
             "club",
             "limit_age",
@@ -337,8 +407,8 @@ class ProductForm(forms.ModelForm):
         }
         widgets = {
             "product_type": AutoCompleteSelect,
+            "buying_groups": AutoCompleteSelectMultipleGroup,
             "club": AutoCompleteSelectClub,
-            "tray": forms.CheckboxInput(attrs={"class": "switch"}),
         }
 
     counters = forms.ModelMultipleChoiceField(
@@ -348,40 +418,50 @@ class ProductForm(forms.ModelForm):
         queryset=Counter.objects.all(),
     )
 
-    def __init__(self, *args, prefix: str | None = None, instance=None, **kwargs):
+    def __init__(self, *args, instance=None, **kwargs):
-        super().__init__(*args, prefix=prefix, instance=instance, **kwargs)
+        super().__init__(*args, instance=instance, **kwargs)
-        self.fields["name"].widget.attrs["autofocus"] = "autofocus"
         if self.instance.id:
             self.fields["counters"].initial = self.instance.counters.all()
             if hasattr(self.instance, "formula"):
                 self.formula_init(self.instance.formula)
-        self.price_formset = ProductPriceFormSet(
-            *args, instance=self.instance, prefix="price", **kwargs
-        )
         self.action_formset = ScheduledProductActionFormSet(
-            *args, product=self.instance, prefix="action", **kwargs
+            *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 (
+        return super().is_valid() and self.action_formset.is_valid()
-            super().is_valid()
-            and self.price_formset.is_valid()
-            and self.action_formset.is_valid()
-        )
 
     def save(self, *args, **kwargs) -> Product:
         product = super().save(*args, **kwargs)
         product.counters.set(self.cleaned_data["counters"])
-        # if it's a creation, the product given in the formset
-        # wasn't a persisted instance.
-        # So if we tried to persist the related objects in the current state,
-        # they would be linked to no product, thus be completely useless
-        # To make it work, we have to replace
-        # the initial product with a persisted one
         for form in self.action_formset:
+            # if it's a creation, the product given in the formset
+            # wasn't a persisted instance.
+            # So if we tried to persist the scheduled actions in the current state,
+            # they would be linked to no product, thus be completely useless
+            # To make it work, we have to replace
+            # the initial product with a persisted one
             form.set_product(product)
         self.action_formset.save()
-        self.price_formset.save()
         return product
 
 
@@ -404,6 +484,18 @@ class ProductFormulaForm(forms.ModelForm):
                     "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
 
 
@@ -454,47 +546,48 @@ class CloseCustomerAccountForm(forms.Form):
     )
 
 
-class BasketItemForm(forms.Form):
+class BasketProductForm(forms.Form):
     quantity = forms.IntegerField(min_value=1, required=True)
-    price_id = forms.IntegerField(min_value=0, required=True)
+    id = forms.IntegerField(min_value=0, required=True)
 
     def __init__(
         self,
         customer: Customer,
         counter: Counter,
-        allowed_prices: dict[int, Price],
+        allowed_products: dict[int, Product],
         *args,
         **kwargs,
     ):
         self.customer = customer  # Used by formset
         self.counter = counter  # Used by formset
-        self.allowed_prices = allowed_prices
+        self.allowed_products = allowed_products
         super().__init__(*args, **kwargs)
 
-    def clean_price_id(self):
+    def clean_id(self):
-        data = self.cleaned_data["price_id"]
+        data = self.cleaned_data["id"]
 
-        # We store self.price so we can use it later on the formset validation
+        # We store self.product so we can use it later on the formset validation
         # And also in the global clean
-        self.price = self.allowed_prices.get(data, None)
+        self.product = self.allowed_products.get(data, None)
-        if self.price is None:
+        if self.product is None:
             raise forms.ValidationError(
                 _("The selected product isn't available for this user")
             )
+
         return data
 
     def clean(self):
         cleaned_data = super().clean()
         if len(self.errors) > 0:
-            return cleaned_data
+            return
 
         # Compute prices
         cleaned_data["bonus_quantity"] = 0
-        if self.price.product.tray:
+        if self.product.tray:
             cleaned_data["bonus_quantity"] = math.floor(
                 cleaned_data["quantity"] / Product.QUANTITY_FOR_TRAY_PRICE
             )
-        cleaned_data["total_price"] = self.price.amount * (
+        cleaned_data["total_price"] = self.product.price * (
             cleaned_data["quantity"] - cleaned_data["bonus_quantity"]
         )
 
@@ -518,8 +611,8 @@ class BaseBasketForm(forms.BaseFormSet):
             raise forms.ValidationError(_("Submitted basket is invalid"))
 
     def _check_product_are_unique(self):
-        price_ids = {form.cleaned_data["price_id"] for form in self.forms}
+        product_ids = {form.cleaned_data["id"] for form in self.forms}
-        if len(price_ids) != len(self.forms):
+        if len(product_ids) != len(self.forms):
             raise forms.ValidationError(_("Duplicated product entries."))
 
     def _check_enough_money(self, counter: Counter, customer: Customer):
@@ -529,9 +622,10 @@ class BaseBasketForm(forms.BaseFormSet):
 
     def _check_recorded_products(self, customer: Customer):
         """Check for, among other things, ecocups and pitchers"""
-        items = defaultdict(int)
+        items = {
-        for form in self.forms:
+            form.cleaned_data["id"]: form.cleaned_data["quantity"]
-            items[form.price.product_id] += form.cleaned_data["quantity"]
+            for form in self.forms
+        }
         ids = list(items.keys())
         returnables = list(
             ReturnableProduct.objects.filter(
@@ -557,7 +651,7 @@ class BaseBasketForm(forms.BaseFormSet):
 
 
 BasketForm = forms.formset_factory(
-    BasketItemForm, formset=BaseBasketForm, absolute_max=None, min_num=1
+    BasketProductForm, formset=BaseBasketForm, absolute_max=None, min_num=1
 )
 
 

counter/migrations/0038_countersellers.py

@@ -0,0 +1,88 @@
+# 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/migrations/0038_price.py

@@ -1,149 +0,0 @@
-# Generated by Django 5.2.11 on 2026-02-18 13:30
-
-import django.db.models.deletion
-from django.db import migrations, models
-from django.db.migrations.state import StateApps
-
-import counter.fields
-
-
-def migrate_prices(apps: StateApps, schema_editor):
-    Product = apps.get_model("counter", "Product")
-    Price = apps.get_model("counter", "Price")
-    prices = [
-        Price(
-            amount=p.selling_price,
-            product=p,
-            created_at=p.created_at,
-            updated_at=p.updated_at,
-        )
-        for p in Product.objects.all()
-    ]
-    Price.objects.bulk_create(prices)
-    groups = [
-        Price.groups.through(price=price, group=group)
-        for price in Price.objects.select_related("product").prefetch_related(
-            "product__buying_groups"
-        )
-        for group in price.product.buying_groups.all()
-    ]
-    Price.groups.through.objects.bulk_create(groups)
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("core", "0048_alter_user_options"),
-        ("counter", "0037_productformula"),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="Price",
-            fields=[
-                (
-                    "id",
-                    models.AutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                (
-                    "amount",
-                    counter.fields.CurrencyField(
-                        decimal_places=2, max_digits=12, verbose_name="amount"
-                    ),
-                ),
-                (
-                    "is_always_shown",
-                    models.BooleanField(
-                        default=False,
-                        help_text=(
-                            "If this option is enabled, "
-                            "people will see this price and be able to pay it, "
-                            "even if another cheaper price exists. "
-                            "Else it will visible only if it is the cheapest available price."
-                        ),
-                        verbose_name="always show",
-                    ),
-                ),
-                (
-                    "label",
-                    models.CharField(
-                        default="",
-                        help_text=(
-                            "A short label for easier differentiation "
-                            "if a user can see multiple prices."
-                        ),
-                        max_length=32,
-                        verbose_name="label",
-                        blank=True,
-                    ),
-                ),
-                (
-                    "created_at",
-                    models.DateTimeField(auto_now_add=True, verbose_name="created at"),
-                ),
-                (
-                    "updated_at",
-                    models.DateTimeField(auto_now=True, verbose_name="updated at"),
-                ),
-                (
-                    "groups",
-                    models.ManyToManyField(
-                        related_name="prices", to="core.group", verbose_name="groups"
-                    ),
-                ),
-                (
-                    "product",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="prices",
-                        to="counter.product",
-                        verbose_name="product",
-                    ),
-                ),
-            ],
-            options={"verbose_name": "price"},
-        ),
-        migrations.AlterField(
-            model_name="product",
-            name="tray",
-            field=models.BooleanField(
-                default=False,
-                help_text="Buy five, get the sixth free",
-                verbose_name="tray price",
-            ),
-        ),
-        migrations.RunPython(migrate_prices, reverse_code=migrations.RunPython.noop),
-        migrations.RemoveField(model_name="product", name="selling_price"),
-        migrations.RemoveField(model_name="product", name="special_selling_price"),
-        migrations.AlterField(
-            model_name="product",
-            name="description",
-            field=models.TextField(blank=True, default="", verbose_name="description"),
-        ),
-        migrations.AlterField(
-            model_name="product",
-            name="product_type",
-            field=models.ForeignKey(
-                null=True,
-                on_delete=django.db.models.deletion.SET_NULL,
-                related_name="products",
-                to="counter.producttype",
-                verbose_name="product type",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="productformula",
-            name="result",
-            field=models.OneToOneField(
-                help_text="The product got with the formula.",
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="formula",
-                to="counter.product",
-                verbose_name="result product",
-            ),
-        ),
-    ]

counter/models.py

@@ -22,7 +22,7 @@ import string
 from datetime import date, datetime, timedelta
 from datetime import timezone as tz
 from decimal import Decimal
-from typing import TYPE_CHECKING, Literal, Self
+from typing import Literal, Self
 
 from dict2xml import dict2xml
 from django.conf import settings
@@ -47,9 +47,6 @@ from core.utils import get_start_of_semester
 from counter.fields import CurrencyField
 from subscription.models import Subscription
 
-if TYPE_CHECKING:
-    from collections.abc import Sequence
-
 
 def get_eboutic() -> Counter:
     return Counter.objects.filter(type="EBOUTIC").order_by("id").first()
@@ -160,7 +157,14 @@ class Customer(models.Model):
 
     @property
     def can_buy(self) -> bool:
-        """Check if whether this customer has the right to purchase any item."""
+        """Check if whether this customer has the right to purchase any item.
+
+        This must be not confused with the Product.can_be_sold_to(user)
+        method as the present method returns an information
+        about a customer whereas the other tells something
+        about the relation between a User (not a Customer,
+        don't mix them) and a Product.
+        """
         subscription = self.user.subscriptions.order_by("subscription_end").last()
         if subscription is None:
             return False
@@ -359,13 +363,13 @@ class Product(models.Model):
     QUANTITY_FOR_TRAY_PRICE = 6
 
     name = models.CharField(_("name"), max_length=64)
-    description = models.TextField(_("description"), blank=True, default="")
+    description = models.TextField(_("description"), default="")
     product_type = models.ForeignKey(
         ProductType,
         related_name="products",
         verbose_name=_("product type"),
         null=True,
-        blank=False,
+        blank=True,
         on_delete=models.SET_NULL,
     )
     code = models.CharField(_("code"), max_length=16, blank=True)
@@ -373,6 +377,11 @@ class Product(models.Model):
         _("purchase price"),
         help_text=_("Initial cost of purchasing the product"),
     )
+    selling_price = CurrencyField(_("selling price"))
+    special_selling_price = CurrencyField(
+        _("special selling price"),
+        help_text=_("Price for barmen during their permanence"),
+    )
     icon = ResizedImageField(
         height=70,
         force_format="WEBP",
@@ -385,9 +394,7 @@ class Product(models.Model):
         Club, related_name="products", verbose_name=_("club"), on_delete=models.CASCADE
     )
     limit_age = models.IntegerField(_("limit age"), default=0)
-    tray = models.BooleanField(
+    tray = models.BooleanField(_("tray price"), default=False)
-        _("tray price"), help_text=_("Buy five, get the sixth free"), default=False
-    )
     buying_groups = models.ManyToManyField(
         Group, related_name="products", verbose_name=_("buying groups"), blank=True
     )
@@ -412,77 +419,41 @@ class Product(models.Model):
             pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID
         ) or user.is_in_group(pk=settings.SITH_GROUP_COUNTER_ADMIN_ID)
 
+    def can_be_sold_to(self, user: User) -> bool:
+        """Check if whether the user given in parameter has the right to buy
+        this product or not.
 
-class PriceQuerySet(models.QuerySet):
+        This must be not confused with the Customer.can_buy()
-    def for_user(self, user: User) -> Self:
+        method as the present method returns an information
-        age = user.age
+        about the relation between a User and a Product,
-        if user.is_banned_alcohol:
+        whereas the other tells something about a Customer
-            age = min(age, 17)
+        (and not a user, they are not the same model).
-        return self.filter(
-            Q(is_always_shown=True, groups__in=user.all_groups)
-            | Q(
-                id=Subquery(
-                    Price.objects.filter(
-                        product_id=OuterRef("product_id"), groups__in=user.all_groups
-                    )
-                    .order_by("amount")
-                    .values("id")[:1]
-                )
-            ),
-            product__archived=False,
-            product__limit_age__lte=age,
-        )
 
+        Returns:
+            True if the user can buy this product else False
 
-class Price(models.Model):
+        Warning:
-    amount = CurrencyField(_("amount"))
+            This performs a db query, thus you can quickly have
-    product = models.ForeignKey(
+            a N+1 queries problem if you call it in a loop.
-        Product,
+            Hopefully, you can avoid that if you prefetch the buying_groups :
-        verbose_name=_("product"),
-        related_name="prices",
-        on_delete=models.CASCADE,
-    )
-    groups = models.ManyToManyField(
-        Group, verbose_name=_("groups"), related_name="prices"
-    )
-    is_always_shown = models.BooleanField(
-        _("always show"),
-        help_text=_(
-            "If this option is enabled, "
-            "people will see this price and be able to pay it, "
-            "even if another cheaper price exists. "
-            "Else it will visible only if it is the cheapest available price."
-        ),
-        default=False,
-    )
-    label = models.CharField(
-        _("label"),
-        help_text=_(
-            "A short label for easier differentiation "
-            "if a user can see multiple prices."
-        ),
-        max_length=32,
-        default="",
-        blank=True,
-    )
-    created_at = models.DateTimeField(_("created at"), auto_now_add=True)
-    updated_at = models.DateTimeField(_("updated at"), auto_now=True)
 
-    objects = PriceQuerySet.as_manager()
+            ```python
-
+            user = User.objects.get(username="foobar")
-    class Meta:
+            products = [
-        verbose_name = _("price")
+                p
-
+                for p in Product.objects.prefetch_related("buying_groups")
-    def __str__(self):
+                if p.can_be_sold_to(user)
-        if not self.label:
+            ]
-            return f"{self.product.name} ({self.amount}€)"
+            ```
-        return f"{self.product.name} {self.label} ({self.amount}€)"
+        """
+        buying_groups = list(self.buying_groups.all())
+        if not buying_groups:
+            return True
+        return any(user.is_in_group(pk=group.id) for group in buying_groups)
 
     @property
-    def full_label(self):
+    def profit(self):
-        if not self.label:
+        return self.selling_price - self.purchase_price
-            return self.product.name
-        return f"{self.product.name} \u2013 {self.label}"
 
 
 class ProductFormula(models.Model):
@@ -503,6 +474,18 @@ class ProductFormula(models.Model):
     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:
@@ -568,7 +551,11 @@ class Counter(models.Model):
         choices=[("BAR", _("Bar")), ("OFFICE", _("Office")), ("EBOUTIC", _("Eboutic"))],
     )
     sellers = models.ManyToManyField(
-        User, verbose_name=_("sellers"), related_name="counters", blank=True
+        User,
+        verbose_name=_("sellers"),
+        related_name="counters",
+        blank=True,
+        through="CounterSellers",
     )
     edit_groups = models.ManyToManyField(
         Group, related_name="editable_counters", blank=True
@@ -729,20 +716,55 @@ class Counter(models.Model):
         # but they share the same primary key
         return self.type == "BAR" and any(b.pk == customer.pk for b in self.barmen_list)
 
-    def get_prices_for(
+    def get_products_for(self, customer: Customer) -> list[Product]:
-        self, customer: Customer, *, order_by: Sequence[str] | None = None
+        """
-    ) -> list[Price]:
+        Get all allowed products for the provided customer on this counter
-        qs = (
+        Prices will be annotated
-            Price.objects.filter(
+        """
-                product__counters=self, product__product_type__isnull=False
+
-            )
+        products = (
-            .for_user(customer.user)
+            self.products.filter(archived=False)
-            .select_related("product", "product__product_type")
+            .select_related("product_type")
-            .prefetch_related("groups")
+            .prefetch_related("buying_groups")
         )
-        if order_by:
+
-            qs = qs.order_by(*order_by)
+        # Only include age appropriate products
-        return list(qs)
+        age = customer.user.age
+        if customer.user.is_banned_alcohol:
+            age = min(age, 17)
+        products = products.filter(limit_age__lte=age)
+
+        # Compute special price for customer if he is a barmen on that bar
+        if self.customer_is_barman(customer):
+            products = products.annotate(price=F("special_selling_price"))
+        else:
+            products = products.annotate(price=F("selling_price"))
+
+        return [
+            product
+            for product in products.all()
+            if product.can_be_sold_to(customer.user)
+        ]
+
+
+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):
@@ -1003,9 +1025,7 @@ class Selling(models.Model):
         event = self.product.eticket.event_title or _("Unknown event")
         subject = _("Eticket bought for the event %(event)s") % {"event": event}
         message_html = _(
-            "You bought an eticket for the event %(event)s.\n"
+            "You bought an eticket for the event %(event)s.\nYou can download it directly from this link %(eticket)s.\nYou can also retrieve all your e-tickets on your account page %(url)s."
-            "You can download it directly from this link %(eticket)s.\n"
-            "You can also retrieve all your e-tickets on your account page %(url)s."
         ) % {
             "event": event,
             "url": (

counter/schemas.py

@@ -6,8 +6,8 @@ from ninja import FilterLookup, FilterSchema, ModelSchema, Schema
 from pydantic import model_validator
 
 from club.schemas import SimpleClubSchema
-from core.schemas import NonEmptyStr, SimpleUserSchema
+from core.schemas import GroupSchema, NonEmptyStr, SimpleUserSchema
-from counter.models import Counter, Price, Product, ProductType
+from counter.models import Counter, Product, ProductType
 
 
 class CounterSchema(ModelSchema):
@@ -66,12 +66,6 @@ class SimpleProductSchema(ModelSchema):
         fields = ["id", "name", "code"]
 
 
-class ProductPriceSchema(ModelSchema):
-    class Meta:
-        model = Price
-        fields = ["amount", "groups"]
-
-
 class ProductSchema(ModelSchema):
     class Meta:
         model = Product
@@ -81,12 +75,13 @@ class ProductSchema(ModelSchema):
             "code",
             "description",
             "purchase_price",
+            "selling_price",
             "icon",
             "limit_age",
             "archived",
         ]
 
-    prices: list[ProductPriceSchema]
+    buying_groups: list[GroupSchema]
     club: SimpleClubSchema
     product_type: SimpleProductTypeSchema | None
     url: str

counter/static/bundled/counter/basket.ts

@@ -1,11 +1,12 @@
-import type { CounterItem } from "#counter:counter/types";
+import type { Product } from "#counter:counter/types.ts";
 
 export class BasketItem {
   quantity: number;
-  product: CounterItem;
+  product: Product;
+  quantityForTrayPrice: number;
   errors: string[];
 
-  constructor(product: CounterItem, quantity: number) {
+  constructor(product: Product, quantity: number) {
     this.quantity = quantity;
     this.product = product;
     this.errors = [];
@@ -19,6 +20,6 @@ export class BasketItem {
   }
 
   sum(): number {
-    return (this.quantity - this.getBonusQuantity()) * this.product.price.amount;
+    return (this.quantity - this.getBonusQuantity()) * this.product.price;
   }
 }

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

@@ -1,12 +1,11 @@
-import { AlertMessage } from "#core:utils/alert-message";
+import { AlertMessage } from "#core:utils/alert-message.ts";
-import { BasketItem } from "#counter:counter/basket";
+import { BasketItem } from "#counter:counter/basket.ts";
 import type {
   CounterConfig,
-  CounterItem,
   ErrorMessage,
   ProductFormula,
-} from "#counter:counter/types";
+} from "#counter:counter/types.ts";
-import type { CounterProductSelect } from "./components/counter-product-select-index";
+import type { CounterProductSelect } from "./components/counter-product-select-index.ts";
 
 document.addEventListener("alpine:init", () => {
   Alpine.data("counter", (config: CounterConfig) => ({
@@ -64,10 +63,8 @@ document.addEventListener("alpine:init", () => {
     },
 
     checkFormulas() {
-      // Try to find a formula.
-      // A formula is found if all its elements are already in the basket
       const products = new Set(
-        Object.values(this.basket).map((item: BasketItem) => item.product.productId),
+        Object.keys(this.basket).map((i: string) => Number.parseInt(i)),
       );
       const formula: ProductFormula = config.formulas.find((f: ProductFormula) => {
         return f.products.every((p: number) => products.has(p));
@@ -75,29 +72,22 @@ document.addEventListener("alpine:init", () => {
       if (formula === undefined) {
         return;
       }
-      // Now that the formula is found, remove the items composing it from the basket
       for (const product of formula.products) {
-        const key = Object.entries(this.basket).find(
+        const key = product.toString();
-          ([_, i]: [string, BasketItem]) => i.product.productId === product,
-        )[0];
         this.basket[key].quantity -= 1;
         if (this.basket[key].quantity <= 0) {
           this.removeFromBasket(key);
         }
       }
-      // Then add the result product of the formula to the basket
-      const result = Object.values(config.products)
-        .filter((item: CounterItem) => item.productId === formula.result)
-        .reduce((acc, curr) => (acc.price.amount < curr.price.amount ? acc : curr));
-      this.addToBasket(result.price.id, 1);
       this.alertMessage.display(
         interpolate(
           gettext("Formula %(formula)s applied"),
-          { formula: result.name },
+          { formula: config.products[formula.result.toString()].name },
           true,
         ),
         { success: true },
       );
+      this.addToBasket(formula.result.toString(), 1);
     },
 
     getBasketSize() {

counter/static/bundled/counter/product-list-index.ts

@@ -1,9 +1,13 @@
 import { showSaveFilePicker } from "native-file-system-adapter";
 import type TomSelect from "tom-select";
-import { paginated } from "#core:utils/api";
+import { paginated } from "#core:utils/api.ts";
-import { csv } from "#core:utils/csv";
+import { csv } from "#core:utils/csv.ts";
-import { getCurrentUrlParams, History, updateQueryString } from "#core:utils/history";
+import {
-import type { NestedKeyOf } from "#core:utils/types";
+  getCurrentUrlParams,
+  History,
+  updateQueryString,
+} from "#core:utils/history.ts";
+import type { NestedKeyOf } from "#core:utils/types.ts";
 import {
   type ProductSchema,
   type ProductSearchProductsDetailedData,
@@ -16,9 +20,6 @@ type GroupedProducts = Record<ProductType, ProductSchema[]>;
 const defaultPageSize = 100;
 const defaultPage = 1;
 
-// biome-ignore lint/style/useNamingConvention: api is snake case
-type ProductWithPriceSchema = ProductSchema & { selling_price: string };
-
 /**
  * Keys of the properties to include in the CSV.
  */
@@ -33,7 +34,7 @@ const csvColumns = [
   "purchase_price",
   "selling_price",
   "archived",
-] as NestedKeyOf<ProductWithPriceSchema>[];
+] as NestedKeyOf<ProductSchema>[];
 
 /**
  * Title of the csv columns.
@@ -174,16 +175,7 @@ document.addEventListener("alpine:init", () => {
         this.nbPages > 1
           ? await paginated(productSearchProductsDetailed, this.getQueryParams())
           : Object.values<ProductSchema[]>(this.products).flat();
-      // CSV cannot represent nested data
+      const content = csv.stringify(products, {
-      // so we create a row for each price of each product.
-      const productsWithPrice: ProductWithPriceSchema[] = products.flatMap(
-        (product: ProductSchema) =>
-          product.prices.map((price) =>
-            // biome-ignore lint/style/useNamingConvention: API is snake_case
-            Object.assign(product, { selling_price: price.amount }),
-          ),
-      );
-      const content = csv.stringify(productsWithPrice, {
         columns: csvColumns,
         titleRow: csvColumnTitles,
       });

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

@@ -2,7 +2,7 @@ export type ErrorMessage = string;
 
 export interface InitialFormData {
   /* Used to refill the form when the backend raises an error */
-  id?: keyof Record<string, CounterItem>;
+  id?: keyof Record<string, Product>;
   quantity?: number;
   errors?: string[];
 }
@@ -15,22 +15,17 @@ export interface ProductFormula {
 export interface CounterConfig {
   customerBalance: number;
   customerId: number;
-  products: Record<string, CounterItem>;
+  products: Record<string, Product>;
   formulas: ProductFormula[];
   formInitial: InitialFormData[];
   cancelUrl: string;
 }
 
-interface Price {
+export interface Product {
-  id: number;
+  id: string;
-  amount: number;
-}
-
-export interface CounterItem {
-  productId: number;
-  price: Price;
   code: string;
   name: string;
+  price: number;
   hasTrayPrice: boolean;
   quantityForTrayPrice: number;
 }

counter/templates/counter/counter_click.jinja

@@ -6,10 +6,10 @@
 {% endblock %}
 
 {% block additional_css %}
-  <link rel="stylesheet" href="{{ static('counter/css/counter-click.scss') }}">
+  <link rel="stylesheet" type="text/css" href="{{ static('counter/css/counter-click.scss') }}" defer></link>
-  <link rel="stylesheet" href="{{ static('bundled/core/components/ajax-select-index.css') }}">
+  <link rel="stylesheet" type="text/css" href="{{ static('bundled/core/components/ajax-select-index.css') }}" defer></link>
-  <link rel="stylesheet" href="{{ static('core/components/ajax-select.scss') }}">
+  <link rel="stylesheet" type="text/css" href="{{ static('core/components/ajax-select.scss') }}" defer></link>
-  <link rel="stylesheet" href="{{ static('core/components/tabs.scss') }}">
+  <link rel="stylesheet" type="text/css" href="{{ static('core/components/tabs.scss') }}" defer></link>
   <link rel="stylesheet" href="{{ static("core/components/card.scss") }}">
 {% endblock %}
 
@@ -65,10 +65,10 @@
                 <option value="FIN">{% trans %}Confirm (FIN){% endtrans %}</option>
                 <option value="ANN">{% trans %}Cancel (ANN){% endtrans %}</option>
               </optgroup>
-              {%- for category, prices in categories.items() -%}
+              {%- for category in categories.keys() -%}
                 <optgroup label="{{ category }}">
-                  {%- for price in prices -%}
+                  {%- for product in categories[category] -%}
-                    <option value="{{ price.id }}">{{ price.full_label }}</option>
+                    <option value="{{ product.id }}">{{ product }}</option>
                   {%- endfor -%}
                 </optgroup>
               {%- endfor -%}
@@ -103,25 +103,24 @@
             </div>
             <ul>
               <li x-show="getBasketSize() === 0">{% trans %}This basket is empty{% endtrans %}</li>
-              <template x-for="(item, index) in Object.values(basket)" :key="item.product.price.id">
+              <template x-for="(item, index) in Object.values(basket)" :key="item.product.id">
                 <li>
                   <template x-for="error in item.errors">
                     <div class="alert alert-red" x-text="error">
                     </div>
                   </template>
 
-                  <button @click.prevent="addToBasket(item.product.price.id, -1)">-</button>
+                  <button @click.prevent="addToBasket(item.product.id, -1)">-</button>
                   <span class="quantity" x-text="item.quantity"></span>
-                  <button @click.prevent="addToBasket(item.product.price.id, 1)">+</button>
+                  <button @click.prevent="addToBasket(item.product.id, 1)">+</button>
 
                   <span x-text="item.product.name"></span> :
                   <span x-text="item.sum().toLocaleString(undefined, { minimumFractionDigits: 2 })">€</span>
-                  <span x-show="item.getBonusQuantity() > 0"
+                  <span x-show="item.getBonusQuantity() > 0" x-text="`${item.getBonusQuantity()} x P`"></span>
-                        x-text="`${item.getBonusQuantity()} x P`"></span>
 
                   <button
                     class="remove-item"
-                    @click.prevent="removeFromBasket(item.product.price.id)"
+                    @click.prevent="removeFromBasket(item.product.id)"
                   ><i class="fa fa-trash-can delete-action"></i></button>
 
                   <input
@@ -134,9 +133,9 @@
                   >
                   <input
                     type="hidden"
-                    :value="item.product.price.id"
+                    :value="item.product.id"
-                    :id="`id_form-${index}-price_id`"
+                    :id="`id_form-${index}-id`"
-                    :name="`form-${index}-price_id`"
+                    :name="`form-${index}-id`"
                     required
                     readonly
                   >
@@ -202,30 +201,30 @@
       </div>
 
       <div id="products">
-        {% if not prices %}
+        {% if not products %}
           <div class="alert alert-red">
             {% trans %}No products available on this counter for this user{% endtrans %}
           </div>
         {% else %}
           <ui-tab-group>
-            {% for category, prices in categories.items() -%}
+            {% for category in categories.keys() -%}
               <ui-tab title="{{ category }}" {% if loop.index == 1 -%}active{%- endif -%}>
                 <h5 class="margin-bottom">{{ category }}</h5>
                 <div class="row gap-2x">
-                  {% for price in prices -%}
+                  {% for product in categories[category] -%}
-                    <button class="card shadow" @click="addToBasket('{{ price.id }}', 1)">
+                    <button class="card shadow" @click="addToBasket('{{ product.id }}', 1)">
                       <img
                         class="card-image"
-                        alt="image de {{ price.full_label }}"
+                        alt="image de {{ product.name }}"
-                        {% if price.product.icon %}
+                        {% if product.icon %}
-                          src="{{ price.product.icon.url }}"
+                          src="{{ product.icon.url }}"
                         {% else %}
                           src="{{ static('core/img/na.gif') }}"
                         {% endif %}
                       />
                       <span class="card-content">
-                        <strong class="card-title">{{ price.full_label }}</strong>
+                        <strong class="card-title">{{ product.name }}</strong>
-                        <p>{{ price.amount }} €<br>{{ price.product.code }}</p>
+                        <p>{{ product.price }} €<br>{{ product.code }}</p>
                       </span>
                     </button>
                   {%- endfor %}
@@ -242,14 +241,13 @@
   {{ super() }}
   <script>
     const products = {
-      {%- for price in prices -%}
+      {%- for product in products -%}
-        {{ price.id }}: {
+        {{ product.id }}: {
-          productId: {{ price.product_id }},
+          id: "{{ product.id }}",
-          price: { id: "{{ price.id }}", amount: {{ price.amount }} },
+          name: "{{ product.name }}",
-          code: "{{ price.product.code }}",
+          price: {{ product.price }},
-          name: "{{ price.full_label }}",
+          hasTrayPrice: {{ product.tray | tojson }},
-          hasTrayPrice: {{ price.product.tray | tojson }},
+          quantityForTrayPrice: {{ product.QUANTITY_FOR_TRAY_PRICE }},
-          quantityForTrayPrice: {{ price.product.QUANTITY_FOR_TRAY_PRICE }},
         },
       {%- endfor -%}
     };

counter/templates/counter/formula_list.jinja

@@ -49,10 +49,14 @@
             <strong class="card-title">{{ formula.result.name }}</strong>
             <p>
               {% for p in formula.products.all() %}
-                <i>{{ p.name }} ({{ p.code }})</i>
+                <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

counter/templates/counter/product_form.jinja

@@ -39,49 +39,6 @@
 {% endmacro %}
 
 
-{% macro price_form(form) %}
-  <fieldset>
-    {{ form.non_field_errors() }}
-    <div class="form-group row gap-2x">
-      <div>{{ form.amount.as_field_group() }}</div>
-      <div>
-        {{ form.label.errors }}
-        <label for="{{ form.label.id_for_label }}">{{ form.label.label }}</label>
-        {{ form.label }}
-        <span class="helptext">{{ form.label.help_text }}</span>
-      </div>
-      <div class="grow">{{ form.groups.as_field_group() }}</div>
-    </div>
-    <div class="form-group">
-      <div>
-        {{ form.is_always_shown.errors }}
-        <div class="row gap">
-          {{ form.is_always_shown }}
-          <label for="{{ form.is_always_shown.id_for_label }}">{{ form.is_always_shown.label }}</label>
-        </div>
-        <span class="helptext">{{ form.is_always_shown.help_text }}</span>
-      </div>
-    </div>
-    {%- if form.DELETE -%}
-      <div class="form-group row gap">
-        {{ form.DELETE.as_field_group() }}
-      </div>
-    {%- else -%}
-      <br>
-      <button
-        class="btn btn-grey"
-        @click.prevent="removeForm($event.target.closest('fieldset').parentElement)"
-      >
-        <i class="fa fa-minus"></i> {% trans %}Remove price{% endtrans %}
-      </button>
-    {%- endif -%}
-    {%- for field in form.hidden_fields() -%}
-      {{ field }}
-    {%- endfor -%}
-  </fieldset>
-  <hr class="margin-bottom">
-{% endmacro %}
-
 {% block content %}
   {% if object %}
     <h2>{% trans name=object %}Edit product {{ name }}{% endtrans %}</h2>
@@ -92,54 +49,7 @@
   {% endif %}
   <form method="post" enctype="multipart/form-data">
     {% csrf_token %}
-    {{ form.non_field_errors() }}
+    {{ form.as_p() }}
-    <fieldset class="row gap">
-      <div>{{ form.name.as_field_group() }}</div>
-      <div>{{ form.code.as_field_group() }}</div>
-    </fieldset>
-    <fieldset>
-      <div class="form-group">{{ form.description.as_field_group() }}</div>
-    </fieldset>
-    <fieldset class="row gap">
-      <div>{{ form.club.as_field_group() }}</div>
-      <div>{{ form.product_type.as_field_group() }}</div>
-    </fieldset>
-    <fieldset><div>{{ form.icon.as_field_group() }}</div></fieldset>
-    <fieldset><div>{{ form.purchase_price.as_field_group() }}</div></fieldset>
-    <fieldset>
-      <div>{{ form.limit_age.as_field_group() }}</div>
-    </fieldset>
-    <fieldset>
-      <div class="row gap">
-        {{ form.tray }}
-        <div>
-          {{ form.tray.label_tag() }}
-          <span class="helptext">{{ form.tray.help_text }}</span>
-        </div>
-      </div>
-    </fieldset>
-    <fieldset><div>{{ form.counters.as_field_group() }}</div></fieldset>
-
-    <h3 class="margin-bottom">{% trans %}Prices{% endtrans %}</h3>
-
-    <div x-data="dynamicFormSet({ prefix: '{{ form.price_formset.prefix }}' })">
-      {{ form.price_formset.management_form }}
-      <div x-ref="formContainer">
-        {%- for form in form.price_formset.forms -%}
-          <div>
-            {{ price_form(form) }}
-          </div>
-        {%- endfor -%}
-      </div>
-      <template x-ref="formTemplate">
-        <div>
-          {{ price_form(form.price_formset.empty_form) }}
-        </div>
-      </template>
-      <button class="btn btn-grey" @click.prevent="addForm()">
-        <i class="fa fa-plus"></i> {% trans %}Add a price{% endtrans %}
-      </button>
-    </div>
 
     <br />
 
@@ -154,7 +64,7 @@
       </em>
     </p>
 
-    <div x-data="dynamicFormSet({ prefix: '{{ form.action_formset.prefix }}' })" class="margin-bottom">
+    <div x-data="dynamicFormSet" class="margin-bottom">
       {{ form.action_formset.management_form }}
       <div x-ref="formContainer">
         {%- for f in form.action_formset.forms -%}
@@ -168,7 +78,6 @@
         <i class="fa fa-plus"></i>{% trans %}Add action{% endtrans %}
       </button>
     </div>
-    <div class="row gap margin-bottom">{{ form.archived.as_field_group() }}</div>
     <p><input class="btn btn-blue" type="submit" value="{% trans %}Save{% endtrans %}" /></p>
   </form>
 {% endblock %}

counter/templates/counter/product_list.jinja

@@ -108,7 +108,7 @@
                 </template>
                 <span class="card-content">
                   <strong class="card-title" x-text="`${p.name} (${p.code})`"></strong>
-                  <p x-text="`${p.prices.map((p) => p.amount).join(' – ')} €`"></p>
+                  <p x-text="`${p.selling_price} €`"></p>
                 </span>
               </a>
             </template>

counter/tests/test_auto_actions.py

@@ -16,7 +16,7 @@ from counter.forms import (
     ScheduledProductActionForm,
     ScheduledProductActionFormSet,
 )
-from counter.models import Product, ProductType, ScheduledProductAction
+from counter.models import Product, ScheduledProductAction
 
 
 @pytest.mark.django_db
@@ -47,22 +47,20 @@ def test_create_actions_alongside_product():
     form = ProductForm(
         data={
             "name": "foo",
-            "product_type": ProductType.objects.first(),
+            "description": "bar",
+            "product_type": product.product_type_id,
             "club": product.club_id,
             "code": "FOO",
             "purchase_price": 1.0,
             "selling_price": 1.0,
             "special_selling_price": 1.0,
             "limit_age": 0,
-            "price-TOTAL_FORMS": "0",
+            "form-TOTAL_FORMS": "2",
-            "price-INITIAL_FORMS": "0",
+            "form-INITIAL_FORMS": "0",
-            "action-TOTAL_FORMS": "1",
+            "form-0-task": "counter.tasks.archive_product",
-            "action-INITIAL_FORMS": "0",
+            "form-0-trigger_at": trigger_at,
-            "action-0-task": "counter.tasks.archive_product",
-            "action-0-trigger_at": trigger_at,
         },
     )
-    form.is_valid()
     assert form.is_valid()
     product = form.save()
     action = ScheduledProductAction.objects.last()

counter/tests/test_counter.py

@@ -20,6 +20,7 @@ import pytest
 from dateutil.relativedelta import relativedelta
 from django.conf import settings
 from django.contrib.auth.models import Permission, make_password
+from django.core.cache import cache
 from django.http import HttpResponse
 from django.shortcuts import resolve_url
 from django.test import Client, TestCase
@@ -33,13 +34,13 @@ from pytest_django.asserts import assertRedirects
 
 from club.models import Membership
 from core.baker_recipes import board_user, subscriber_user, very_old_subscriber_user
-from core.models import BanGroup, Group, User
+from core.models import BanGroup, User
-from counter.baker_recipes import price_recipe, product_recipe, sale_recipe
+from counter.baker_recipes import product_recipe, sale_recipe
 from counter.models import (
     Counter,
     Customer,
     Permanency,
-    ProductType,
+    Product,
     Refilling,
     ReturnableProduct,
     Selling,
@@ -203,7 +204,7 @@ class TestRefilling(TestFullClickBase):
 
 @dataclass
 class BasketItem:
-    price_id: int | None = None
+    id: int | None = None
     quantity: int | None = None
 
     def to_form(self, index: int) -> dict[str, str]:
@@ -235,59 +236,38 @@ class TestCounterClick(TestFullClickBase):
         cls.banned_counter_customer.ban_groups.add(
             BanGroup.objects.get(pk=settings.SITH_GROUP_BANNED_COUNTER_ID)
         )
-        subscriber_group = Group.objects.get(id=settings.SITH_GROUP_SUBSCRIBERS_ID)
-        old_subscriber_group = Group.objects.get(
-            id=settings.SITH_GROUP_OLD_SUBSCRIBERS_ID
-        )
-        _product_recipe = product_recipe.extend(product_type=baker.make(ProductType))
 
-        cls.gift = price_recipe.make(
+        cls.gift = product_recipe.make(
-            amount=-1.5, groups=[subscriber_group], product=_product_recipe.make()
+            selling_price="-1.5",
+            special_selling_price="-1.5",
         )
-        cls.beer = price_recipe.make(
+        cls.beer = product_recipe.make(
-            groups=[subscriber_group],
+            limit_age=18, selling_price=1.5, special_selling_price=1
-            amount=1.5,
-            product=_product_recipe.make(limit_age=18),
         )
-        cls.beer_tap = price_recipe.make(
+        cls.beer_tap = product_recipe.make(
-            groups=[subscriber_group],
+            limit_age=18, tray=True, selling_price=1.5, special_selling_price=1
-            amount=1.5,
-            product=_product_recipe.make(limit_age=18, tray=True),
         )
-        cls.snack = price_recipe.make(
+        cls.snack = product_recipe.make(
-            groups=[subscriber_group, old_subscriber_group],
+            limit_age=0, selling_price=1.5, special_selling_price=1
-            amount=1.5,
-            product=_product_recipe.make(limit_age=0),
         )
-        cls.stamps = price_recipe.make(
+        cls.stamps = product_recipe.make(
-            groups=[subscriber_group],
+            limit_age=0, selling_price=1.5, special_selling_price=1
-            amount=1.5,
-            product=_product_recipe.make(limit_age=0),
         )
         ReturnableProduct.objects.all().delete()
-        cls.cons = price_recipe.make(
+        cls.cons = baker.make(Product, selling_price=1)
-            amount=1, groups=[subscriber_group], product=_product_recipe.make()
+        cls.dcons = baker.make(Product, selling_price=-1)
-        )
-        cls.dcons = price_recipe.make(
-            amount=-1, groups=[subscriber_group], product=_product_recipe.make()
-        )
         baker.make(
             ReturnableProduct,
-            product=cls.cons.product,
+            product=cls.cons,
-            returned_product=cls.dcons.product,
+            returned_product=cls.dcons,
             max_return=3,
         )
 
         cls.counter.products.add(
-            cls.gift.product,
+            cls.gift, cls.beer, cls.beer_tap, cls.snack, cls.cons, cls.dcons
-            cls.beer.product,
-            cls.beer_tap.product,
-            cls.snack.product,
-            cls.cons.product,
-            cls.dcons.product,
         )
-        cls.other_counter.products.add(cls.snack.product)
+        cls.other_counter.products.add(cls.snack)
-        cls.club_counter.products.add(cls.stamps.product)
+        cls.club_counter.products.add(cls.stamps)
 
     def login_in_bar(self, barmen: User | None = None):
         used_barman = barmen if barmen is not None else self.barmen
@@ -305,7 +285,10 @@ class TestCounterClick(TestFullClickBase):
     ) -> HttpResponse:
         used_counter = counter if counter is not None else self.counter
         used_client = client if client is not None else self.client
-        data = {"form-TOTAL_FORMS": str(len(basket)), "form-INITIAL_FORMS": "0"}
+        data = {
+            "form-TOTAL_FORMS": str(len(basket)),
+            "form-INITIAL_FORMS": "0",
+        }
         for index, item in enumerate(basket):
             data.update(item.to_form(index))
         return used_client.post(
@@ -348,22 +331,32 @@ class TestCounterClick(TestFullClickBase):
         res = self.submit_basket(
             self.customer, [BasketItem(self.beer.id, 2), BasketItem(self.snack.id, 1)]
         )
-        self.assertRedirects(res, self.counter.get_absolute_url())
+        assert res.status_code == 302
 
         assert self.updated_amount(self.customer) == Decimal("5.5")
 
+        # Test barmen special price
+
+        force_refill_user(self.barmen, 10)
+
+        assert (
+            self.submit_basket(self.barmen, [BasketItem(self.beer.id, 1)])
+        ).status_code == 302
+
+        assert self.updated_amount(self.barmen) == Decimal(9)
+
     def test_click_tray_price(self):
         force_refill_user(self.customer, 20)
         self.login_in_bar(self.barmen)
 
         # Not applying tray price
         res = self.submit_basket(self.customer, [BasketItem(self.beer_tap.id, 2)])
-        self.assertRedirects(res, self.counter.get_absolute_url())
+        assert res.status_code == 302
         assert self.updated_amount(self.customer) == Decimal(17)
 
         # Applying tray price
         res = self.submit_basket(self.customer, [BasketItem(self.beer_tap.id, 7)])
-        self.assertRedirects(res, self.counter.get_absolute_url())
+        assert res.status_code == 302
         assert self.updated_amount(self.customer) == Decimal(8)
 
     def test_click_alcool_unauthorized(self):
@@ -484,8 +477,7 @@ class TestCounterClick(TestFullClickBase):
             BasketItem(None, 1),
             BasketItem(self.beer.id, None),
         ]:
-            res = self.submit_basket(self.customer, [item])
+            assert self.submit_basket(self.customer, [item]).status_code == 200
-            assert res.status_code == 200
             assert self.updated_amount(self.customer) == Decimal(10)
 
     def test_click_not_enough_money(self):
@@ -514,30 +506,29 @@ class TestCounterClick(TestFullClickBase):
         res = self.submit_basket(
             self.customer, [BasketItem(self.beer.id, 1), BasketItem(self.gift.id, 1)]
         )
-        self.assertRedirects(res, self.counter.get_absolute_url())
+        assert res.status_code == 302
 
         assert self.updated_amount(self.customer) == 0
 
     def test_recordings(self):
-        force_refill_user(self.customer, self.cons.amount * 3)
+        force_refill_user(self.customer, self.cons.selling_price * 3)
         self.login_in_bar(self.barmen)
         res = self.submit_basket(self.customer, [BasketItem(self.cons.id, 3)])
         assert res.status_code == 302
         assert self.updated_amount(self.customer) == 0
         assert list(
             self.customer.customer.return_balances.values("returnable", "balance")
-        ) == [{"returnable": self.cons.product.cons.id, "balance": 3}]
+        ) == [{"returnable": self.cons.cons.id, "balance": 3}]
 
         res = self.submit_basket(self.customer, [BasketItem(self.dcons.id, 3)])
         assert res.status_code == 302
-        assert self.updated_amount(self.customer) == self.dcons.amount * -3
+        assert self.updated_amount(self.customer) == self.dcons.selling_price * -3
 
         res = self.submit_basket(
-            self.customer,
+            self.customer, [BasketItem(self.dcons.id, self.dcons.dcons.max_return)]
-            [BasketItem(self.dcons.id, self.dcons.product.dcons.max_return)],
         )
         # from now on, the user amount should not change
-        expected_amount = self.dcons.amount * (-3 - self.dcons.product.dcons.max_return)
+        expected_amount = self.dcons.selling_price * (-3 - self.dcons.dcons.max_return)
         assert res.status_code == 302
         assert self.updated_amount(self.customer) == expected_amount
 
@@ -554,57 +545,48 @@ class TestCounterClick(TestFullClickBase):
     def test_recordings_when_negative(self):
         sale_recipe.make(
             customer=self.customer.customer,
-            product=self.dcons.product,
+            product=self.dcons,
-            unit_price=self.dcons.amount,
+            unit_price=self.dcons.selling_price,
             quantity=10,
         )
         self.customer.customer.update_returnable_balance()
         self.login_in_bar(self.barmen)
         res = self.submit_basket(self.customer, [BasketItem(self.dcons.id, 1)])
         assert res.status_code == 200
-        assert self.updated_amount(self.customer) == self.dcons.amount * -10
+        assert self.updated_amount(self.customer) == self.dcons.selling_price * -10
 
         res = self.submit_basket(self.customer, [BasketItem(self.cons.id, 3)])
         assert res.status_code == 302
         assert (
             self.updated_amount(self.customer)
-            == self.dcons.amount * -10 - self.cons.amount * 3
+            == self.dcons.selling_price * -10 - self.cons.selling_price * 3
         )
 
         res = self.submit_basket(self.customer, [BasketItem(self.beer.id, 1)])
         assert res.status_code == 302
         assert (
             self.updated_amount(self.customer)
-            == self.dcons.amount * -10 - self.cons.amount * 3 - self.beer.amount
+            == self.dcons.selling_price * -10
+            - self.cons.selling_price * 3
+            - self.beer.selling_price
         )
 
     def test_no_fetch_archived_product(self):
         counter = baker.make(Counter)
-        group = baker.make(Group)
         customer = baker.make(Customer)
-        group.users.add(customer.user)
+        product_recipe.make(archived=True, counters=[counter])
-        _product_recipe = product_recipe.extend(
+        unarchived_products = product_recipe.make(
-            counters=[counter], product_type=baker.make(ProductType)
+            archived=False, counters=[counter], _quantity=3
         )
-        price_recipe.make(
+        customer_products = counter.get_products_for(customer)
-            _quantity=2,
+        assert unarchived_products == customer_products
-            product=iter(_product_recipe.make(archived=True, _quantity=2)),
-            groups=[group],
-        )
-        unarchived_prices = price_recipe.make(
-            _quantity=2,
-            product=iter(_product_recipe.make(archived=False, _quantity=2)),
-            groups=[group],
-        )
-        customer_prices = counter.get_prices_for(customer)
-        assert unarchived_prices == customer_prices
 
 
 class TestCounterStats(TestCase):
     @classmethod
     def setUpTestData(cls):
         cls.users = subscriber_user.make(_quantity=4)
-        product = price_recipe.make(amount=1).product
+        product = product_recipe.make(selling_price=1)
         cls.counter = baker.make(
             Counter, type=["BAR"], sellers=cls.users[:4], products=[product]
         )
@@ -803,6 +785,9 @@ class TestClubCounterClickAccess(TestCase):
 
         cls.user = subscriber_user.make()
 
+    def setUp(self):
+        cache.clear()
+
     def test_anonymous(self):
         res = self.client.get(self.click_url)
         assert res.status_code == 403

counter/tests/test_counter_admin.py

@@ -1,13 +1,132 @@
+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 User
+from core.models import Group, User
 from counter.baker_recipes import product_recipe
 from counter.forms import CounterEditForm
-from counter.models import Counter
+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):

counter/tests/test_customer.py

@@ -341,7 +341,7 @@ def test_update_balance():
 def test_update_returnable_balance():
     ReturnableProduct.objects.all().delete()
     customer = baker.make(Customer)
-    products = product_recipe.make(_quantity=4, _bulk_create=True)
+    products = product_recipe.make(selling_price=0, _quantity=4, _bulk_create=True)
     returnables = [
         baker.make(
             ReturnableProduct, product=products[0], returned_product=products[1]

counter/tests/test_formula.py

@@ -7,7 +7,12 @@ from counter.forms import ProductFormulaForm
 class TestFormulaForm(TestCase):
     @classmethod
     def setUpTestData(cls):
-        cls.products = product_recipe.make(_quantity=3, _bulk_create=True)
+        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(
@@ -21,6 +26,23 @@ class TestFormulaForm(TestCase):
         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={

counter/tests/test_product.py

@@ -9,7 +9,6 @@ from django.core.files.uploadedfile import SimpleUploadedFile
 from django.test import Client, TestCase
 from django.urls import reverse
 from model_bakery import baker
-from model_bakery.recipe import Recipe
 from PIL import Image
 from pytest_django.asserts import assertNumQueries, assertRedirects
 
@@ -17,8 +16,8 @@ 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, ProductPriceFormSet
+from counter.forms import ProductForm
-from counter.models import Price, Product, ProductType
+from counter.models import Product, ProductFormula, ProductType
 
 
 @pytest.mark.django_db
@@ -82,11 +81,11 @@ def test_fetch_product_access(
 def test_fetch_product_nb_queries(client: Client):
     client.force_login(baker.make(User, is_superuser=True))
     cache.clear()
-    with assertNumQueries(6):
+    with assertNumQueries(5):
         # - 2 for authentication
         # - 1 for pagination
         # - 1 for the actual request
-        # - 2 to prefetch the related prices and groups
+        # - 1 to prefetch the related buying_groups
         client.get(reverse("api:search_products_detailed"))
 
 
@@ -108,21 +107,48 @@ class TestCreateProduct(TestCase):
             "selling_price": 1.0,
             "special_selling_price": 1.0,
             "limit_age": 0,
-            "price-TOTAL_FORMS": 0,
+            "form-TOTAL_FORMS": 0,
-            "price-INITIAL_FORMS": 0,
+            "form-INITIAL_FORMS": 0,
-            "action-TOTAL_FORMS": 0,
-            "action-INITIAL_FORMS": 0,
         }
 
-    def test_form_simple(self):
+    def test_form(self):
         form = ProductForm(data=self.data)
         assert form.is_valid()
         instance = form.save()
         assert instance.club == self.club
         assert instance.product_type == self.product_type
         assert instance.name == "foo"
+        assert instance.selling_price == 1.0
 
-    def test_view_simple(self):
+    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)
         url = reverse("counter:new_product")
         response = self.client.get(url)
@@ -133,92 +159,3 @@ class TestCreateProduct(TestCase):
         assert product.name == "foo"
         assert product.club == self.club
         assert product.product_type == self.product_type
-
-
-class TestPriceFormSet(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        cls.product = product_recipe.make()
-        cls.counter_admin = baker.make(
-            User, groups=[Group.objects.get(id=settings.SITH_GROUP_COUNTER_ADMIN_ID)]
-        )
-        cls.groups = baker.make(Group, _quantity=3)
-
-    def test_add_price(self):
-        data = {
-            "prices-0-amount": 2,
-            "prices-0-label": "foo",
-            "prices-0-groups": [self.groups[0].id, self.groups[1].id],
-            "prices-0-is_always_shown": True,
-            "prices-1-amount": 1.5,
-            "prices-1-label": "",
-            "prices-1-groups": [self.groups[1].id, self.groups[2].id],
-            "prices-1-is_always_shown": False,
-            "prices-TOTAL_FORMS": 2,
-            "prices-INITIAL_FORMS": 0,
-        }
-        form = ProductPriceFormSet(instance=self.product, data=data)
-        assert form.is_valid()
-        form.save()
-        prices = list(self.product.prices.order_by("amount"))
-        assert len(prices) == 2
-        assert prices[0].amount == 1.5
-        assert prices[0].label == ""
-        assert prices[0].is_always_shown is False
-        assert set(prices[0].groups.all()) == {self.groups[1], self.groups[2]}
-        assert prices[1].amount == 2
-        assert prices[1].label == "foo"
-        assert prices[1].is_always_shown is True
-        assert set(prices[1].groups.all()) == {self.groups[0], self.groups[1]}
-
-    def test_change_prices(self):
-        price_a = baker.make(
-            Price, product=self.product, amount=1.5, groups=self.groups[:1]
-        )
-        price_b = baker.make(
-            Price, product=self.product, amount=2, groups=self.groups[1:]
-        )
-        data = {
-            "prices-0-id": price_a.id,
-            "prices-0-DELETE": True,
-            "prices-1-id": price_b.id,
-            "prices-1-DELETE": False,
-            "prices-1-amount": 3,
-            "prices-1-label": "foo",
-            "prices-1-groups": [self.groups[1].id],
-            "prices-1-is_always_shown": True,
-            "prices-TOTAL_FORMS": 2,
-            "prices-INITIAL_FORMS": 2,
-        }
-        form = ProductPriceFormSet(instance=self.product, data=data)
-        assert form.is_valid()
-        form.save()
-        prices = list(self.product.prices.order_by("amount"))
-        assert len(prices) == 1
-        assert prices[0].amount == 3
-        assert prices[0].label == "foo"
-        assert prices[0].is_always_shown is True
-        assert set(prices[0].groups.all()) == {self.groups[1]}
-        assert not Price.objects.filter(id=price_a.id).exists()
-
-
-@pytest.mark.django_db
-def test_price_for_user():
-    groups = baker.make(Group, _quantity=4)
-    users = [
-        baker.make(User, groups=groups[:2]),
-        baker.make(User, groups=groups[1:3]),
-        baker.make(User, groups=[groups[3]]),
-    ]
-    recipe = Recipe(Price, product=product_recipe.make())
-    prices = [
-        recipe.make(amount=5, groups=groups, is_always_shown=True),
-        recipe.make(amount=4, groups=[groups[0]], is_always_shown=True),
-        recipe.make(amount=3, groups=[groups[1]], is_always_shown=False),
-        recipe.make(amount=2, groups=[groups[3]], is_always_shown=False),
-        recipe.make(amount=1, groups=[groups[1]], is_always_shown=False),
-    ]
-    qs = Price.objects.order_by("-amount")
-    assert set(qs.for_user(users[0])) == {prices[0], prices[1], prices[4]}
-    assert set(qs.for_user(users[1])) == {prices[0], prices[4]}
-    assert set(qs.for_user(users[2])) == {prices[0], prices[3]}

counter/views/admin.py

@@ -16,6 +16,7 @@ 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
@@ -58,7 +59,9 @@ class CounterListView(CounterAdminTabsMixin, CanViewMixin, ListView):
     current_tab = "counters"
 
 
-class CounterEditView(CounterAdminTabsMixin, UserPassesTestMixin, UpdateView):
+class CounterEditView(
+    CounterAdminTabsMixin, UserPassesTestMixin, SuccessMessageMixin, UpdateView
+):
     """Edit a counter's main informations (for the counter's manager)."""
 
     model = Counter
@@ -66,6 +69,7 @@ class CounterEditView(CounterAdminTabsMixin, UserPassesTestMixin, UpdateView):
     pk_url_kwarg = "counter_id"
     template_name = "core/edit.jinja"
     current_tab = "counters"
+    success_message = _("Counter update done")
 
     def test_func(self):
         if self.request.user.has_perm("counter.change_counter"):

counter/views/click.py

@@ -73,7 +73,7 @@ class CounterClick(
         kwargs["form_kwargs"] = {
             "customer": self.customer,
             "counter": self.object,
-            "allowed_prices": {price.id: price for price in self.prices},
+            "allowed_products": {product.id: product for product in self.products},
         }
         return kwargs
 
@@ -103,7 +103,7 @@ class CounterClick(
         ):
             return redirect(obj)  # Redirect to counter
 
-        self.prices = obj.get_prices_for(self.customer)
+        self.products = obj.get_products_for(self.customer)
 
         return super().dispatch(request, *args, **kwargs)
 
@@ -121,31 +121,32 @@ class CounterClick(
             # This is important because some items have a negative price
             # Negative priced items gives money to the customer and should
             # be processed first so that we don't throw a not enough money error
-            for form in sorted(formset, key=lambda form: form.price.amount):
+            for form in sorted(formset, key=lambda form: form.product.price):
                 self.request.session["last_basket"].append(
-                    f"{form.cleaned_data['quantity']} x {form.price.full_label}"
+                    f"{form.cleaned_data['quantity']} x {form.product.name}"
                 )
 
-                common_kwargs = {
-                    "product": form.price.product,
-                    "club_id": form.price.product.club_id,
-                    "counter": self.object,
-                    "seller": operator,
-                    "customer": self.customer,
-                }
                 Selling(
-                    **common_kwargs,
+                    label=form.product.name,
-                    label=form.price.full_label,
+                    product=form.product,
-                    unit_price=form.price.amount,
+                    club=form.product.club,
+                    counter=self.object,
+                    unit_price=form.product.price,
                     quantity=form.cleaned_data["quantity"]
                     - form.cleaned_data["bonus_quantity"],
+                    seller=operator,
+                    customer=self.customer,
                 ).save()
                 if form.cleaned_data["bonus_quantity"] > 0:
                     Selling(
-                        **common_kwargs,
+                        label=f"{form.product.name} (Plateau)",
-                        label=f"{form.price.full_label} (Plateau)",
+                        product=form.product,
+                        club=form.product.club,
+                        counter=self.object,
                         unit_price=0,
                         quantity=form.cleaned_data["bonus_quantity"],
+                        seller=operator,
+                        customer=self.customer,
                     ).save()
 
             self.customer.update_returnable_balance()
@@ -206,13 +207,14 @@ class CounterClick(
     def get_context_data(self, **kwargs):
         """Add customer to the context."""
         kwargs = super().get_context_data(**kwargs)
-        kwargs["prices"] = self.prices
+        kwargs["products"] = self.products
         kwargs["formulas"] = ProductFormula.objects.filter(
-            result__in=[p.product_id for p in self.prices]
+            result__in=self.products
         ).prefetch_related("products")
         kwargs["categories"] = defaultdict(list)
-        for price in self.prices:
+        for product in kwargs["products"]:
-            kwargs["categories"][price.product.product_type].append(price)
+            if product.product_type:
+                kwargs["categories"][product.product_type].append(product)
         kwargs["customer"] = self.customer
         kwargs["cancel_url"] = self.get_success_url()
 

eboutic/admin.py

@@ -22,22 +22,23 @@ from eboutic.models import Basket, BasketItem, Invoice, InvoiceItem
 class BasketAdmin(admin.ModelAdmin):
     list_display = ("user", "date", "total")
     autocomplete_fields = ("user",)
-    date_hierarchy = "date"
 
     def get_queryset(self, request):
         return (
             super()
             .get_queryset(request)
             .annotate(
-                total=Sum(F("items__quantity") * F("items__unit_price"), default=0)
+                total=Sum(
+                    F("items__quantity") * F("items__product_unit_price"), default=0
+                )
             )
         )
 
 
 @admin.register(BasketItem)
 class BasketItemAdmin(admin.ModelAdmin):
-    list_display = ("label", "unit_price", "quantity")
+    list_display = ("basket", "product_name", "product_unit_price", "quantity")
-    search_fields = ("label",)
+    search_fields = ("product_name",)
 
 
 @admin.register(Invoice)
@@ -49,6 +50,5 @@ class InvoiceAdmin(admin.ModelAdmin):
 
 @admin.register(InvoiceItem)
 class InvoiceItemAdmin(admin.ModelAdmin):
-    list_display = ("label", "unit_price", "quantity")
+    list_display = ("invoice", "product_name", "product_unit_price", "quantity")
-    search_fields = ("label",)
+    search_fields = ("product_name",)
-    list_select_related = ("price",)

eboutic/migrations/0003_rename_product_name_basketitem_label_and_more.py

@@ -1,53 +0,0 @@
-# Generated by Django 5.2.11 on 2026-02-22 18:13
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [("counter", "0038_price"), ("eboutic", "0002_auto_20221005_2243")]
-
-    operations = [
-        migrations.RenameField(
-            model_name="basketitem", old_name="product_name", new_name="label"
-        ),
-        migrations.RenameField(
-            model_name="basketitem",
-            old_name="product_unit_price",
-            new_name="unit_price",
-        ),
-        migrations.RenameField(
-            model_name="basketitem", old_name="product_id", new_name="product"
-        ),
-        migrations.RenameField(
-            model_name="invoiceitem", old_name="product_name", new_name="label"
-        ),
-        migrations.RenameField(
-            model_name="invoiceitem",
-            old_name="product_unit_price",
-            new_name="unit_price",
-        ),
-        migrations.RenameField(
-            model_name="invoiceitem", old_name="product_id", new_name="product"
-        ),
-        migrations.RemoveField(model_name="basketitem", name="type_id"),
-        migrations.RemoveField(model_name="invoiceitem", name="type_id"),
-        migrations.AlterField(
-            model_name="basketitem",
-            name="product",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.PROTECT,
-                to="counter.product",
-                verbose_name="product",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="invoiceitem",
-            name="product",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.PROTECT,
-                to="counter.product",
-                verbose_name="product",
-            ),
-        ),
-    ]

eboutic/models.py

@@ -17,7 +17,7 @@ from __future__ import annotations
 import hmac
 from datetime import datetime
 from enum import Enum
-from typing import Self
+from typing import Any, Self
 
 from dict2xml import dict2xml
 from django.conf import settings
@@ -30,8 +30,8 @@ from core.models import User
 from counter.fields import CurrencyField
 from counter.models import (
     BillingInfo,
+    Counter,
     Customer,
-    Price,
     Product,
     Refilling,
     Selling,
@@ -39,6 +39,22 @@ from counter.models import (
 )
 
 
+def get_eboutic_products(user: User) -> list[Product]:
+    products = (
+        get_eboutic()
+        .products.filter(product_type__isnull=False)
+        .filter(archived=False, limit_age__lte=user.age)
+        .annotate(
+            order=F("product_type__order"),
+            category=F("product_type__name"),
+            category_comment=F("product_type__comment"),
+            price=F("selling_price"),  # <-- selected price for basket validation
+        )
+        .prefetch_related("buying_groups")  # <-- used in `Product.can_be_sold_to`
+    )
+    return [p for p in products if p.can_be_sold_to(user)]
+
+
 class BillingInfoState(Enum):
     VALID = 1
     EMPTY = 2
@@ -78,21 +94,21 @@ class Basket(models.Model):
     def __str__(self):
         return f"{self.user}'s basket ({self.items.all().count()} items)"
 
-    def can_be_viewed_by(self, user: User):
+    def can_be_viewed_by(self, user):
         return self.user == user
 
     @cached_property
     def contains_refilling_item(self) -> bool:
         return self.items.filter(
-            product__product_type_id=settings.SITH_COUNTER_PRODUCTTYPE_REFILLING
+            type_id=settings.SITH_COUNTER_PRODUCTTYPE_REFILLING
         ).exists()
 
     @cached_property
     def total(self) -> float:
         return float(
-            self.items.aggregate(total=Sum(F("quantity") * F("unit_price"), default=0))[
+            self.items.aggregate(
-                "total"
+                total=Sum(F("quantity") * F("product_unit_price"), default=0)
-            ]
+            )["total"]
         )
 
     def generate_sales(
@@ -104,8 +120,7 @@ class Basket(models.Model):
         Example:
             ```python
             counter = Counter.objects.get(name="Eboutic")
-            user = User.objects.get(username="bibou")
+            sales = basket.generate_sales(counter, "SITH_ACCOUNT")
-            sales = basket.generate_sales(counter, user, Selling.PaymentMethod.SITH_ACCOUNT)
             # here the basket is in the same state as before the method call
 
             with transaction.atomic():
@@ -116,23 +131,31 @@ class Basket(models.Model):
                 # thus only the sales remain
             ```
         """
-        customer = Customer.get_or_create(self.user)[0]
+        # I must proceed with two distinct requests instead of
-        return [
+        # only one with a join because the AbstractBaseItem model has been
-            Selling(
+        # poorly designed. If you refactor the model, please refactor this too.
-                label=item.label,
+        items = self.items.order_by("product_id")
-                counter=counter,
+        ids = [item.product_id for item in items]
-                club_id=item.product.club_id,
+        products = Product.objects.filter(id__in=ids).order_by("id")
-                product=item.product,
+        # items and products are sorted in the same order
-                seller=seller,
+        sales = []
-                customer=customer,
+        for item, product in zip(items, products, strict=False):
-                unit_price=item.unit_price,
+            sales.append(
-                quantity=item.quantity,
+                Selling(
-                payment_method=payment_method,
+                    label=product.name,
+                    counter=counter,
+                    club=product.club,
+                    product=product,
+                    seller=seller,
+                    customer=Customer.get_or_create(self.user)[0],
+                    unit_price=item.product_unit_price,
+                    quantity=item.quantity,
+                    payment_method=payment_method,
+                )
             )
-            for item in self.items.select_related("product")
+        return sales
-        ]
 
-    def get_e_transaction_data(self) -> list[tuple[str, str]]:
+    def get_e_transaction_data(self) -> list[tuple[str, Any]]:
         user = self.user
         if not hasattr(user, "customer"):
             raise Customer.DoesNotExist
@@ -178,7 +201,7 @@ class InvoiceQueryset(models.QuerySet):
     def annotate_total(self) -> Self:
         """Annotate the queryset with the total amount of each invoice.
 
-        The total amount is the sum of (unit_price * quantity)
+        The total amount is the sum of (product_unit_price * quantity)
         for all items related to the invoice.
         """
         # aggregates within subqueries require a little bit of black magic,
@@ -188,7 +211,7 @@ class InvoiceQueryset(models.QuerySet):
             total=Subquery(
                 InvoiceItem.objects.filter(invoice_id=OuterRef("pk"))
                 .values("invoice_id")
-                .annotate(total=Sum(F("unit_price") * F("quantity")))
+                .annotate(total=Sum(F("product_unit_price") * F("quantity")))
                 .values("total")
             )
         )
@@ -198,7 +221,11 @@ class Invoice(models.Model):
     """Invoices are generated once the payment has been validated."""
 
     user = models.ForeignKey(
-        User, related_name="invoices", verbose_name=_("user"), on_delete=models.CASCADE
+        User,
+        related_name="invoices",
+        verbose_name=_("user"),
+        blank=False,
+        on_delete=models.CASCADE,
     )
     date = models.DateTimeField(_("date"), auto_now=True)
     validated = models.BooleanField(_("validated"), default=False)
@@ -219,44 +246,53 @@ class Invoice(models.Model):
         if self.validated:
             raise DataError(_("Invoice already validated"))
         customer, _created = Customer.get_or_create(user=self.user)
-        kwargs = {
+        eboutic = Counter.objects.filter(type="EBOUTIC").first()
-            "counter": get_eboutic(),
+        for i in self.items.all():
-            "customer": customer,
+            if i.type_id == settings.SITH_COUNTER_PRODUCTTYPE_REFILLING:
-            "date": self.date,
+                new = Refilling(
-            "payment_method": Selling.PaymentMethod.CARD,
+                    counter=eboutic,
-        }
+                    customer=customer,
-        for i in self.items.select_related("product"):
+                    operator=self.user,
-            if i.product.product_type_id == settings.SITH_COUNTER_PRODUCTTYPE_REFILLING:
+                    amount=i.product_unit_price * i.quantity,
-                Refilling.objects.create(
+                    payment_method=Refilling.PaymentMethod.CARD,
-                    **kwargs, operator=self.user, amount=i.unit_price * i.quantity
+                    date=self.date,
                 )
+                new.save()
             else:
-                Selling.objects.create(
+                product = Product.objects.filter(id=i.product_id).first()
-                    **kwargs,
+                new = Selling(
-                    label=i.label,
+                    label=i.product_name,
-                    club_id=i.product.club_id,
+                    counter=eboutic,
-                    product=i.product,
+                    club=product.club,
+                    product=product,
                     seller=self.user,
-                    unit_price=i.unit_price,
+                    customer=customer,
+                    unit_price=i.product_unit_price,
                     quantity=i.quantity,
+                    payment_method=Selling.PaymentMethod.CARD,
+                    date=self.date,
                 )
+                new.save()
         self.validated = True
         self.save()
 
 
 class AbstractBaseItem(models.Model):
-    product = models.ForeignKey(
+    product_id = models.IntegerField(_("product id"))
-        Product, verbose_name=_("product"), on_delete=models.PROTECT
+    product_name = models.CharField(_("product name"), max_length=255)
-    )
+    type_id = models.IntegerField(_("product type id"))
-    label = models.CharField(_("product name"), max_length=255)
+    product_unit_price = CurrencyField(_("unit price"))
-    unit_price = CurrencyField(_("unit price"))
     quantity = models.PositiveIntegerField(_("quantity"))
 
     class Meta:
         abstract = True
 
     def __str__(self):
-        return "Item: %s (%s) x%d" % (self.product.name, self.unit_price, self.quantity)
+        return "Item: %s (%s) x%d" % (
+            self.product_name,
+            self.product_unit_price,
+            self.quantity,
+        )
 
 
 class BasketItem(AbstractBaseItem):
@@ -265,16 +301,21 @@ class BasketItem(AbstractBaseItem):
     )
 
     @classmethod
-    def from_price(cls, price: Price, quantity: int, basket: Basket):
+    def from_product(cls, product: Product, quantity: int, basket: Basket):
         """Create a BasketItem with the same characteristics as the
-        product price passed in parameters, with the specified quantity.
+        product passed in parameters, with the specified quantity.
+
+        Warning:
+            the basket field is not filled, so you must set
+            it yourself before saving the model.
         """
         return cls(
             basket=basket,
-            label=price.full_label,
+            product_id=product.id,
-            product_id=price.product_id,
+            product_name=product.name,
+            type_id=product.product_type_id,
             quantity=quantity,
-            unit_price=price.amount,
+            product_unit_price=product.selling_price,
         )
 
 

eboutic/static/bundled/eboutic/eboutic-index.ts

@@ -1,15 +1,13 @@
 export {};
 
 interface BasketItem {
-  priceId: number;
+  id: number;
   name: string;
   quantity: number;
-  unitPrice: number;
+  // biome-ignore lint/style/useNamingConvention: the python code is snake_case
+  unit_price: number;
 }
 
-// increment the key number if the data schema of the cached basket changes
-const BASKET_CACHE_KEY = "basket1";
-
 document.addEventListener("alpine:init", () => {
   Alpine.data("basket", (lastPurchaseTime?: number) => ({
     basket: [] as BasketItem[],
@@ -32,24 +30,24 @@ document.addEventListener("alpine:init", () => {
       // It's quite tricky to manually apply attributes to the management part
       // of a formset so we dynamically apply it here
       this.$refs.basketManagementForm
-        .getElementById("#id_form-TOTAL_FORMS")
+        .querySelector("#id_form-TOTAL_FORMS")
         .setAttribute(":value", "basket.length");
     },
 
     loadBasket(): BasketItem[] {
-      if (localStorage.getItem(BASKET_CACHE_KEY) === null) {
+      if (localStorage.basket === undefined) {
         return [];
       }
       try {
-        return JSON.parse(localStorage.getItem(BASKET_CACHE_KEY));
+        return JSON.parse(localStorage.basket);
       } catch (_err) {
         return [];
       }
     },
 
     saveBasket() {
-      localStorage.setItem(BASKET_CACHE_KEY, JSON.stringify(this.basket));
+      localStorage.basket = JSON.stringify(this.basket);
-      localStorage.setItem("basketTimestamp", Date.now().toString());
+      localStorage.basketTimestamp = Date.now();
     },
 
     /**
@@ -58,7 +56,7 @@ document.addEventListener("alpine:init", () => {
      */
     getTotal() {
       return this.basket.reduce(
-        (acc: number, item: BasketItem) => acc + item.quantity * item.unitPrice,
+        (acc: number, item: BasketItem) => acc + item.quantity * item.unit_price,
         0,
       );
     },
@@ -76,7 +74,7 @@ document.addEventListener("alpine:init", () => {
      * @param itemId the id of the item to remove
      */
     remove(itemId: number) {
-      const index = this.basket.findIndex((e: BasketItem) => e.priceId === itemId);
+      const index = this.basket.findIndex((e: BasketItem) => e.id === itemId);
 
       if (index < 0) {
         return;
@@ -85,7 +83,7 @@ document.addEventListener("alpine:init", () => {
 
       if (this.basket[index].quantity === 0) {
         this.basket = this.basket.filter(
-          (e: BasketItem) => e.priceId !== this.basket[index].id,
+          (e: BasketItem) => e.id !== this.basket[index].id,
         );
       }
     },
@@ -106,10 +104,11 @@ document.addEventListener("alpine:init", () => {
      */
     createItem(id: number, name: string, price: number): BasketItem {
       const newItem = {
-        priceId: id,
+        id,
         name,
         quantity: 0,
-        unitPrice: price,
+        // biome-ignore lint/style/useNamingConvention: the python code is snake_case
+        unit_price: price,
       } as BasketItem;
 
       this.basket.push(newItem);
@@ -126,7 +125,7 @@ document.addEventListener("alpine:init", () => {
      * @param price The unit price of the product
      */
     addFromCatalog(id: number, name: string, price: number) {
-      let item = this.basket.find((e: BasketItem) => e.priceId === id);
+      let item = this.basket.find((e: BasketItem) => e.id === id);
 
       // if the item is not in the basket, we create it
       // else we add + 1 to it

eboutic/templates/eboutic/eboutic_checkout.jinja

@@ -32,9 +32,9 @@
       <tbody>
         {% for item in basket.items.all() %}
           <tr>
-            <td>{{ item.label }}</td>
+            <td>{{ item.product_name }}</td>
             <td>{{ item.quantity }}</td>
-            <td>{{ item.unit_price }} €</td>
+            <td>{{ item.product_unit_price }} €</td>
           </tr>
         {% endfor %}
       </tbody>

eboutic/templates/eboutic/eboutic_main.jinja

@@ -41,7 +41,7 @@
           </div>
         {% endif %}
         <ul class="item-list">
-          {# Starting money #}
+                  {# Starting money #}
           <li>
             <span class="item-name">
               <strong>{% trans %}Current account amount: {% endtrans %}</strong>
@@ -51,15 +51,15 @@
             </span>
           </li>
 
-          <template x-for="(item, index) in Object.values(basket)" :key="item.priceId">
+          <template x-for="(item, index) in Object.values(basket)" :key="item.id">
             <li class="item-row" x-show="item.quantity > 0">
               <div class="item-quantity">
-                <i class="fa fa-minus fa-xs" @click="remove(item.priceId)"></i>
+                <i class="fa fa-minus fa-xs" @click="remove(item.id)"></i>
                 <span x-text="item.quantity"></span>
                 <i class="fa fa-plus" @click="add(item)"></i>
               </div>
               <span class="item-name" x-text="item.name"></span>
-              <span class="item-price" x-text="(item.unitPrice * item.quantity).toFixed(2) + ' €'"></span>
+              <span class="item-price" x-text="(item.unit_price * item.quantity).toFixed(2) + ' €'"></span>
 
               <input
                 type="hidden"
@@ -71,16 +71,16 @@
               >
               <input
                 type="hidden"
-                :value="item.priceId"
+                :value="item.id"
-                :id="`id_form-${index}-price_id`"
+                :id="`id_form-${index}-id`"
-                :name="`form-${index}-price_id`"
+                :name="`form-${index}-id`"
                 required
                 readonly
               >
 
             </li>
           </template>
-          {# Total price #}
+                  {# Total price #}
           <li style="margin-top: 20px">
             <span class="item-name"><strong>{% trans %}Basket amount: {% endtrans %}</strong></span>
             <span x-text="getTotal().toFixed(2) + ' €'" class="item-price"></span>
@@ -116,40 +116,45 @@
           </span>
         </div>
       {% endif %}
-      {% for prices in categories %}
+      {% for priority_groups in products|groupby('order') %}
-        {% set category = prices[0].product.product_type %}
+        {% for category, items in priority_groups.list|groupby('category') %}
-        <section>
+          {% if items|count > 0 %}
-          <div class="category-header">
+            <section>
-            <h3>{{ category.name }}</h3>
+                            {# I would have wholeheartedly directly used the header element instead
-            {% if category.comment %}
+                            but it has already been made messy in core/style.scss #}
-              <p><i>{{ category.comment }}</i></p>
+              <div class="category-header">
-            {% endif %}
+                <h3>{{ category }}</h3>
-          </div>
+                {% if items[0].category_comment %}
-          <div class="product-group">
+                  <p><i>{{ items[0].category_comment }}</i></p>
-            {% for price in prices %}
-              <button
-                id="{{ price.id }}"
-                class="card product-button clickable shadow"
-                :class="{selected: basket.some((i) => i.priceId === {{ price.id }})}"
-                @click='addFromCatalog({{ price.id }}, {{ price.full_label|tojson }}, {{ price.amount }})'
-              >
-                {% if price.product.icon %}
-                  <img
-                    class="card-image"
-                    src="{{ price.product.icon.url }}"
-                    alt="image de {{ price.full_label }}"
-                  >
-                {% else %}
-                  <i class="fa-regular fa-image fa-2x card-image"></i>
                 {% endif %}
-                <div class="card-content">
+              </div>
-                  <h4 class="card-title">{{ price.full_label }}</h4>
+              <div class="product-group">
-                  <p>{{ price.amount }} €</p>
+                {% for p in items %}
-                </div>
+                  <button
-              </button>
+                    id="{{ p.id }}"
-            {% endfor %}
+                    class="card product-button clickable shadow"
-          </div>
+                    :class="{selected: basket.some((i) => i.id === {{ p.id }})}"
-        </section>
+                    @click='addFromCatalog({{ p.id }}, {{ p.name|tojson }}, {{ p.selling_price }})'
+                  >
+                    {% if p.icon %}
+                      <img
+                        class="card-image"
+                        src="{{ p.icon.url }}"
+                        alt="image de {{ p.name }}"
+                      >
+                    {% else %}
+                      <i class="fa-regular fa-image fa-2x card-image"></i>
+                    {% endif %}
+                    <div class="card-content">
+                      <h4 class="card-title">{{ p.name }}</h4>
+                      <p>{{ p.selling_price }} €</p>
+                    </div>
+                  </button>
+                {% endfor %}
+              </div>
+            </section>
+          {% endif %}
+        {% endfor %}
       {% else %}
         <p>{% trans %}There are no items available for sale{% endtrans %}</p>
       {% endfor %}

eboutic/tests/test_basket.py

@@ -11,12 +11,7 @@ from pytest_django.asserts import assertRedirects
 
 from core.baker_recipes import subscriber_user
 from core.models import Group, User
-from counter.baker_recipes import (
+from counter.baker_recipes import product_recipe, refill_recipe, sale_recipe
-    price_recipe,
-    product_recipe,
-    refill_recipe,
-    sale_recipe,
-)
 from counter.models import (
     Counter,
     Customer,
@@ -152,29 +147,29 @@ class TestEboutic(TestCase):
 
         product_type = baker.make(ProductType)
 
-        cls.snack = price_recipe.make(
+        cls.snack = product_recipe.make(
-            amount=1.5, product=product_recipe.make(product_type=product_type)
+            selling_price=1.5, special_selling_price=1, product_type=product_type
         )
-        cls.beer = price_recipe.make(
+        cls.beer = product_recipe.make(
-            product=product_recipe.make(limit_age=18, product_type=product_type),
+            limit_age=18,
-            amount=2.5,
+            selling_price=2.5,
+            special_selling_price=1,
+            product_type=product_type,
         )
-        cls.not_in_counter = price_recipe.make(
+        cls.not_in_counter = product_recipe.make(
-            product=product_recipe.make(product_type=product_type), amount=3.5
+            selling_price=3.5, product_type=product_type
-        )
-        cls.cotiz = price_recipe.make(
-            amount=10, product=product_recipe.make(product_type=product_type)
         )
+        cls.cotiz = product_recipe.make(selling_price=10, product_type=product_type)
 
-        cls.group_public.prices.add(cls.snack, cls.beer, cls.not_in_counter)
+        cls.group_public.products.add(cls.snack, cls.beer, cls.not_in_counter)
-        cls.group_cotiz.prices.add(cls.cotiz)
+        cls.group_cotiz.products.add(cls.cotiz)
 
         cls.subscriber.groups.add(cls.group_cotiz, cls.group_public)
         cls.new_customer.groups.add(cls.group_public)
         cls.new_customer_adult.groups.add(cls.group_public)
 
         cls.eboutic = get_eboutic()
-        cls.eboutic.products.add(cls.cotiz.product, cls.beer.product, cls.snack.product)
+        cls.eboutic.products.add(cls.cotiz, cls.beer, cls.snack)
 
     @classmethod
     def set_age(cls, user: User, age: int):
@@ -258,7 +253,7 @@ class TestEboutic(TestCase):
             self.submit_basket([BasketItem(self.snack.id, 2)]),
             reverse("eboutic:checkout", kwargs={"basket_id": 1}),
         )
-        assert Basket.objects.get(id=1).total == self.snack.amount * 2
+        assert Basket.objects.get(id=1).total == self.snack.selling_price * 2
 
         self.client.force_login(self.new_customer_adult)
         assertRedirects(
@@ -268,7 +263,8 @@ class TestEboutic(TestCase):
             reverse("eboutic:checkout", kwargs={"basket_id": 2}),
         )
         assert (
-            Basket.objects.get(id=2).total == self.snack.amount * 2 + self.beer.amount
+            Basket.objects.get(id=2).total
+            == self.snack.selling_price * 2 + self.beer.selling_price
         )
 
         self.client.force_login(self.subscriber)
@@ -284,5 +280,7 @@ class TestEboutic(TestCase):
         )
         assert (
             Basket.objects.get(id=3).total
-            == self.snack.amount * 2 + self.beer.amount + self.cotiz.amount
+            == self.snack.selling_price * 2
+            + self.beer.selling_price
+            + self.cotiz.selling_price
         )

eboutic/tests/test_payment.py

@@ -16,7 +16,7 @@ from model_bakery import baker
 from pytest_django.asserts import assertRedirects
 
 from core.baker_recipes import old_subscriber_user, subscriber_user
-from counter.baker_recipes import price_recipe, product_recipe
+from counter.baker_recipes import product_recipe
 from counter.models import Product, ProductType, Selling
 from counter.tests.test_counter import force_refill_user
 from eboutic.models import Basket, BasketItem
@@ -32,22 +32,23 @@ class TestPaymentBase(TestCase):
         cls.basket = baker.make(Basket, user=cls.customer)
         cls.refilling = product_recipe.make(
             product_type_id=settings.SITH_COUNTER_PRODUCTTYPE_REFILLING,
-            prices=[price_recipe.make(amount=15)],
+            selling_price=15,
         )
 
         product_type = baker.make(ProductType)
 
         cls.snack = product_recipe.make(
-            product_type=product_type, prices=[price_recipe.make(amount=1.5)]
+            selling_price=1.5, special_selling_price=1, product_type=product_type
         )
         cls.beer = product_recipe.make(
             limit_age=18,
+            selling_price=2.5,
+            special_selling_price=1,
             product_type=product_type,
-            prices=[price_recipe.make(amount=2.5)],
         )
 
-        BasketItem.from_price(cls.snack.prices.first(), 1, cls.basket).save()
+        BasketItem.from_product(cls.snack, 1, cls.basket).save()
-        BasketItem.from_price(cls.beer.prices.first(), 2, cls.basket).save()
+        BasketItem.from_product(cls.beer, 2, cls.basket).save()
 
 
 class TestPaymentSith(TestPaymentBase):
@@ -115,13 +116,13 @@ class TestPaymentSith(TestPaymentBase):
         assert len(sellings) == 2
         assert sellings[0].payment_method == Selling.PaymentMethod.SITH_ACCOUNT
         assert sellings[0].quantity == 1
-        assert sellings[0].unit_price == self.snack.prices.first().amount
+        assert sellings[0].unit_price == self.snack.selling_price
         assert sellings[0].counter.type == "EBOUTIC"
         assert sellings[0].product == self.snack
 
         assert sellings[1].payment_method == Selling.PaymentMethod.SITH_ACCOUNT
         assert sellings[1].quantity == 2
-        assert sellings[1].unit_price == self.beer.prices.first().amount
+        assert sellings[1].unit_price == self.beer.selling_price
         assert sellings[1].counter.type == "EBOUTIC"
         assert sellings[1].product == self.beer
 
@@ -145,7 +146,7 @@ class TestPaymentSith(TestPaymentBase):
         )
 
     def test_refilling_in_basket(self):
-        BasketItem.from_price(self.refilling.prices.first(), 1, self.basket).save()
+        BasketItem.from_product(self.refilling, 1, self.basket).save()
         self.client.force_login(self.customer)
         force_refill_user(self.customer, self.basket.total + 1)
         self.customer.customer.refresh_from_db()
@@ -190,8 +191,8 @@ class TestPaymentCard(TestPaymentBase):
     def test_buy_success(self):
         response = self.client.get(self.generate_bank_valid_answer(self.basket))
         assert response.status_code == 200
-        assert response.content.decode() == "Payment successful"
+        assert response.content.decode("utf-8") == "Payment successful"
-        assert not Basket.objects.filter(id=self.basket.id).exists()
+        assert Basket.objects.filter(id=self.basket.id).first() is None
 
         sellings = Selling.objects.filter(customer=self.customer.customer).order_by(
             "quantity"
@@ -199,13 +200,13 @@ class TestPaymentCard(TestPaymentBase):
         assert len(sellings) == 2
         assert sellings[0].payment_method == Selling.PaymentMethod.CARD
         assert sellings[0].quantity == 1
-        assert sellings[0].unit_price == self.snack.prices.first().amount
+        assert sellings[0].unit_price == self.snack.selling_price
         assert sellings[0].counter.type == "EBOUTIC"
         assert sellings[0].product == self.snack
 
         assert sellings[1].payment_method == Selling.PaymentMethod.CARD
         assert sellings[1].quantity == 2
-        assert sellings[1].unit_price == self.beer.prices.first().amount
+        assert sellings[1].unit_price == self.beer.selling_price
         assert sellings[1].counter.type == "EBOUTIC"
         assert sellings[1].product == self.beer
 
@@ -215,9 +216,7 @@ class TestPaymentCard(TestPaymentBase):
         assert not customer.subscriptions.first().is_valid_now()
 
         basket = baker.make(Basket, user=customer)
-        BasketItem.from_price(
+        BasketItem.from_product(Product.objects.get(code="2SCOTIZ"), 1, basket).save()
-            Product.objects.get(code="2SCOTIZ").prices.first(), 1, basket
-        ).save()
         response = self.client.get(self.generate_bank_valid_answer(basket))
         assert response.status_code == 200
 
@@ -229,13 +228,12 @@ class TestPaymentCard(TestPaymentBase):
         assert subscription.location == "EBOUTIC"
 
     def test_buy_refilling(self):
-        price = self.refilling.prices.first()
+        BasketItem.from_product(self.refilling, 2, self.basket).save()
-        BasketItem.from_price(price, 2, self.basket).save()
         response = self.client.get(self.generate_bank_valid_answer(self.basket))
         assert response.status_code == 200
 
         self.customer.customer.refresh_from_db()
-        assert self.customer.customer.amount == price.amount * 2
+        assert self.customer.customer.amount == self.refilling.selling_price * 2
 
     def test_multiple_responses(self):
         bank_response = self.generate_bank_valid_answer(self.basket)
@@ -255,17 +253,17 @@ class TestPaymentCard(TestPaymentBase):
         self.basket.delete()
         response = self.client.get(bank_response)
         assert response.status_code == 500
-        assert response.text == (
+        assert (
-            "Basket processing failed with error: "
+            response.text
-            "SuspiciousOperation('Basket does not exists')"
+            == "Basket processing failed with error: SuspiciousOperation('Basket does not exists')"
         )
 
     def test_altered_basket(self):
         bank_response = self.generate_bank_valid_answer(self.basket)
-        BasketItem.from_price(self.snack.prices.first(), 1, self.basket).save()
+        BasketItem.from_product(self.snack, 1, self.basket).save()
         response = self.client.get(bank_response)
         assert response.status_code == 500
-        assert response.text == (
+        assert (
-            "Basket processing failed with error: "
+            response.text == "Basket processing failed with error: "
             "SuspiciousOperation('Basket total and amount do not match')"
         )

eboutic/views.py

@@ -17,7 +17,6 @@ from __future__ import annotations
 
 import base64
 import contextlib
-import itertools
 import json
 from typing import TYPE_CHECKING
 
@@ -29,7 +28,9 @@ from cryptography.hazmat.primitives.serialization import load_pem_public_key
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
-from django.contrib.auth.mixins import LoginRequiredMixin
+from django.contrib.auth.mixins import (
+    LoginRequiredMixin,
+)
 from django.contrib.messages.views import SuccessMessageMixin
 from django.core.exceptions import SuspiciousOperation, ValidationError
 from django.db import DatabaseError, transaction
@@ -47,16 +48,23 @@ from django_countries.fields import Country
 
 from core.auth.mixins import CanViewMixin
 from core.views.mixins import FragmentMixin, UseFragmentsMixin
-from counter.forms import BaseBasketForm, BasketItemForm, BillingInfoForm
+from counter.forms import BaseBasketForm, BasketProductForm, BillingInfoForm
 from counter.models import (
     BillingInfo,
     Customer,
-    Price,
+    Product,
     Refilling,
     Selling,
     get_eboutic,
 )
-from eboutic.models import Basket, BasketItem, BillingInfoState, Invoice, InvoiceItem
+from eboutic.models import (
+    Basket,
+    BasketItem,
+    BillingInfoState,
+    Invoice,
+    InvoiceItem,
+    get_eboutic_products,
+)
 
 if TYPE_CHECKING:
     from cryptography.hazmat.primitives.asymmetric.rsa import RSAPublicKey
@@ -70,7 +78,7 @@ class BaseEbouticBasketForm(BaseBasketForm):
 
 
 EbouticBasketForm = forms.formset_factory(
-    BasketItemForm, formset=BaseEbouticBasketForm, absolute_max=None, min_num=1
+    BasketProductForm, formset=BaseEbouticBasketForm, absolute_max=None, min_num=1
 )
 
 
@@ -80,6 +88,7 @@ class EbouticMainView(LoginRequiredMixin, FormView):
     The purchasable products are those of the eboutic which
     belong to a category of products of a product category
     (orphan products are inaccessible).
+
     """
 
     template_name = "eboutic/eboutic_main.jinja"
@@ -90,7 +99,7 @@ class EbouticMainView(LoginRequiredMixin, FormView):
         kwargs["form_kwargs"] = {
             "customer": self.customer,
             "counter": get_eboutic(),
-            "allowed_prices": {price.id: price for price in self.prices},
+            "allowed_products": {product.id: product for product in self.products},
         }
         return kwargs
 
@@ -101,25 +110,19 @@ class EbouticMainView(LoginRequiredMixin, FormView):
 
         with transaction.atomic():
             self.basket = Basket.objects.create(user=self.request.user)
-            BasketItem.objects.bulk_create(
+            for form in formset:
-                [
+                BasketItem.from_product(
-                    BasketItem.from_price(
+                    form.product, form.cleaned_data["quantity"], self.basket
-                        form.price, form.cleaned_data["quantity"], self.basket
+                ).save()
-                    )
+            self.basket.save()
-                    for form in formset
-                ]
-            )
         return super().form_valid(formset)
 
     def get_success_url(self):
         return reverse("eboutic:checkout", kwargs={"basket_id": self.basket.id})
 
     @cached_property
-    def prices(self) -> list[Price]:
+    def products(self) -> list[Product]:
-        return get_eboutic().get_prices_for(
+        return get_eboutic_products(self.request.user)
-            self.customer,
-            order_by=["product__product_type__order", "product_id", "amount"],
-        )
 
     @cached_property
     def customer(self) -> Customer:
@@ -127,12 +130,7 @@ class EbouticMainView(LoginRequiredMixin, FormView):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context["categories"] = [
+        context["products"] = self.products
-            list(i[1])
-            for i in itertools.groupby(
-                self.prices, key=lambda p: p.product.product_type_id
-            )
-        ]
         context["customer_amount"] = self.request.user.account_balance
 
         purchases = (
@@ -269,8 +267,11 @@ class EbouticPayWithSith(CanViewMixin, SingleObjectMixin, View):
     def post(self, request, *args, **kwargs):
         basket = self.get_object()
         refilling = settings.SITH_COUNTER_PRODUCTTYPE_REFILLING
-        if basket.items.filter(product__product_type_id=refilling).exists():
+        if basket.items.filter(type_id=refilling).exists():
-            messages.error(self.request, _("You can't buy a refilling with sith money"))
+            messages.error(
+                self.request,
+                _("You can't buy a refilling with sith money"),
+            )
             return redirect("eboutic:payment_result", "failure")
 
         eboutic = get_eboutic()
@@ -325,23 +326,22 @@ class EtransactionAutoAnswer(View):
                         raise SuspiciousOperation(
                             "Basket total and amount do not match"
                         )
-                    i = Invoice.objects.create(user=b.user)
+                    i = Invoice()
-                    InvoiceItem.objects.bulk_create(
+                    i.user = b.user
-                        [
+                    i.payment_method = "CARD"
-                            InvoiceItem(
+                    i.save()
-                                invoice=i,
+                    for it in b.items.all():
-                                product_id=item.product_id,
+                        InvoiceItem(
-                                label=item.label,
+                            invoice=i,
-                                unit_price=item.unit_price,
+                            product_id=it.product_id,
-                                quantity=item.quantity,
+                            product_name=it.product_name,
-                            )
+                            type_id=it.type_id,
-                            for item in b.items.all()
+                            product_unit_price=it.product_unit_price,
-                        ]
+                            quantity=it.quantity,
-                    )
+                        ).save()
                     i.validate()
                     b.delete()
             except Exception as e:
-                sentry_sdk.capture_exception(e)
                 return HttpResponse(
                     "Basket processing failed with error: " + repr(e), status=500
                 )

election/tests.py

@@ -6,6 +6,8 @@ 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
@@ -52,6 +54,102 @@ 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))

locale/fr/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-03-07 15:47+0100\n"
+"POT-Creation-Date: 2026-03-10 10:28+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"
@@ -56,7 +56,7 @@ msgstr "nom"
 msgid "owner"
 msgstr "propriétaire"
 
-#: api/models.py core/models.py counter/models.py
+#: api/models.py core/models.py
 msgid "groups"
 msgstr "groupes"
 
@@ -2937,6 +2937,29 @@ 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, "
@@ -2945,6 +2968,16 @@ 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"
@@ -2965,6 +2998,24 @@ 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 "
@@ -2973,13 +3024,19 @@ 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"
 
 #: counter/forms.py
 msgid "The selected product isn't available for this user"
-msgstr "Le produit sélectionné n'est pas disponible pour cet utilisateur"
+msgstr "Le produit sélectionné n'est pas disponnible pour cet utilisateur"
 
 #: counter/forms.py
 msgid "Submitted basket is invalid"
@@ -3093,6 +3150,18 @@ msgstr "prix d'achat"
 msgid "Initial cost of purchasing the product"
 msgstr "Coût initial d'achat du produit"
 
+#: counter/models.py
+msgid "selling price"
+msgstr "prix de vente"
+
+#: counter/models.py
+msgid "special selling price"
+msgstr "prix de vente spécial"
+
+#: counter/models.py
+msgid "Price for barmen during their permanence"
+msgstr "Prix pour les barmen durant leur permanence"
+
 #: counter/models.py
 msgid "icon"
 msgstr "icône"
@@ -3105,10 +3174,6 @@ msgstr "âge limite"
 msgid "tray price"
 msgstr "prix plateau"
 
-#: counter/models.py
-msgid "Buy five, get the sixth free"
-msgstr "Pour cinq achetés, le sixième offert"
-
 #: counter/models.py
 msgid "buying groups"
 msgstr "groupe d'achat"
@@ -3121,35 +3186,10 @@ msgstr "archivé"
 msgid "updated at"
 msgstr "mis à jour le"
 
-#: counter/models.py eboutic/models.py
+#: counter/models.py
 msgid "product"
 msgstr "produit"
 
-#: counter/models.py
-msgid "always show"
-msgstr "toujours montrer"
-
-#: counter/models.py
-msgid ""
-"If this option is enabled, people will see this price and be able to pay it, "
-"even if another cheaper price exists. Else it will visible only if it is the "
-"cheapest available price."
-msgstr ""
-"Si cette option est activée, les gens verront ce prix et pourront le payer, "
-"même si un autre moins cher existe. Dans le cas contraire, le prix sera "
-"visible uniquement s'il s'agit du prix disponible le plus faible."
-
-#: counter/models.py
-msgid ""
-"A short label for easier differentiation if a user can see multiple prices."
-msgstr ""
-"Un court libellé pour faciliter la différentiation si un utilisateur peut "
-"voir plusieurs prix."
-
-#: counter/models.py
-msgid "price"
-msgstr "prix"
-
 #: counter/models.py
 msgid "products"
 msgstr "produits"
@@ -3186,6 +3226,10 @@ 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"
@@ -3624,6 +3668,10 @@ msgstr ""
 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."
@@ -3746,10 +3794,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 price"
-msgstr "Retirer le prix"
-
 #: counter/templates/counter/product_form.jinja
 msgid "Remove this action"
 msgstr "Retirer cette action"
@@ -3771,14 +3815,6 @@ msgstr "Dernière mise à jour"
 msgid "Product creation"
 msgstr "Création de produit"
 
-#: counter/templates/counter/product_form.jinja
-msgid "Prices"
-msgstr "Prix"
-
-#: counter/templates/counter/product_form.jinja
-msgid "Add a price"
-msgstr "Ajouter un prix"
-
 #: counter/templates/counter/product_form.jinja
 msgid "Automatic actions"
 msgstr "Actions automatiques"
@@ -3906,6 +3942,10 @@ 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)"
@@ -4026,10 +4066,18 @@ msgstr "validé"
 msgid "Invoice already validated"
 msgstr "Facture déjà validée"
 
+#: eboutic/models.py
+msgid "product id"
+msgstr "ID du produit"
+
 #: eboutic/models.py
 msgid "product name"
 msgstr "nom du produit"
 
+#: eboutic/models.py
+msgid "product type id"
+msgstr "id du type du produit"
+
 #: eboutic/models.py
 msgid "basket"
 msgstr "panier"
@@ -5246,8 +5294,6 @@ msgid "One day"
 msgstr "Un jour"
 
 #: sith/settings.py
-#, fuzzy
-#| msgid "GA staff member"
 msgid "GA staff member"
 msgstr "Membre staff GA"
 

rootplace/tests/test_merge_users.py

@@ -33,6 +33,8 @@ class TestMergeUser(TestCase):
         cls.club = baker.make(Club)
         cls.eboutic = Counter.objects.get(name="Eboutic")
         cls.barbar = Product.objects.get(code="BARB")
+        cls.barbar.selling_price = 2
+        cls.barbar.save()
         cls.root = User.objects.get(username="root")
         cls.to_keep = User.objects.create(
             username="to_keep", password="plop", email="u.1@utbm.fr"

sith/settings.py

@@ -355,7 +355,6 @@ SITH_TWITTER = "@ae_utbm"
 # AE configuration
 SITH_MAIN_CLUB_ID = env.int("SITH_MAIN_CLUB_ID", default=1)
 SITH_PDF_CLUB_ID = env.int("SITH_PDF_CLUB_ID", default=2)
-SITH_LAUNDERETTE_CLUB_ID = env.int("SITH_LAUNDERETTE_CLUB_ID", default=84)
 
 # Main root for club pages
 SITH_CLUB_ROOT_PAGE = "clubs"
@@ -483,13 +482,6 @@ SITH_LOG_OPERATION_TYPE = [
 
 SITH_PEDAGOGY_UTBM_API = "https://extranet1.utbm.fr/gpedago/api/guide"
 
-SITH_ECOCUP_CONS = env.int("SITH_ECOCUP_CONS", default=1151)
-
-SITH_ECOCUP_DECO = env.int("SITH_ECOCUP_DECO", default=1152)
-
-# The limit is the maximum difference between cons and deco possible for a customer
-SITH_ECOCUP_LIMIT = 3
-
 # Defines pagination for cash summary
 SITH_COUNTER_CASH_SUMMARY_LENGTH = 50
 
@@ -512,7 +504,6 @@ SITH_PRODUCT_SUBSCRIPTION_ONE_SEMESTER = env.int(
 SITH_PRODUCT_SUBSCRIPTION_TWO_SEMESTERS = env.int(
     "SITH_PRODUCT_SUBSCRIPTION_TWO_SEMESTERS", default=2
 )
-SITH_PRODUCTTYPE_SUBSCRIPTION = env.int("SITH_PRODUCTTYPE_SUBSCRIPTION", default=2)
 
 # Number of weeks before the end of a subscription when the subscriber can resubscribe
 SITH_SUBSCRIPTION_END = 10