Fix get_operator on non bar counters and better display of counter with no products

counter/templates/counter/counter_click.jinja

@@ -148,33 +148,39 @@
     </div>
 
     <div id="products">
-      <ul>
+      {% if not products %}
-        {% for category in categories.keys() -%}
+        <div class="alert alert-red">
-          <li><a href="#cat_{{ category|slugify }}">{{ category }}</a></li>
+          {% trans %}No products available on this counter for this user{% endtrans %}
-        {%- endfor %}
-      </ul>
-      {% for category in categories.keys() -%}
-        <div id="cat_{{ category|slugify }}">
-          <h5 class="margin-bottom">{{ category }}</h5>
-          <div class="row gap-2x">
-            {% for product in categories[category] -%}
-              <button class="card shadow" @click="addToBasket('{{ product.id }}', 1)">
-                <strong class="card-title">{{ product.name }}</strong>
-                <img
-                  class="card-image"
-                  alt="image de {{ product.name }}"
-                  {% if product.icon %}
-                    src="{{ product.icon.url }}"
-                  {% else %}
-                    src="{{ static('core/img/na.gif') }}"
-                  {% endif %}
-                />
-                <span class="card-content">{{ product.price }} €<br>{{ product.code }}</span>
-              </button>
-            {%- endfor %}
-          </div>
         </div>
-      {%- endfor %}
+      {% else %}
+        <ul>
+          {% for category in categories.keys() -%}
+            <li><a href="#cat_{{ category|slugify }}">{{ category }}</a></li>
+          {%- endfor %}
+        </ul>
+        {% for category in categories.keys() -%}
+          <div id="cat_{{ category|slugify }}">
+            <h5 class="margin-bottom">{{ category }}</h5>
+            <div class="row gap-2x">
+              {% for product in categories[category] -%}
+                <button class="card shadow" @click="addToBasket('{{ product.id }}', 1)">
+                  <strong class="card-title">{{ product.name }}</strong>
+                  <img
+                    class="card-image"
+                    alt="image de {{ product.name }}"
+                    {% if product.icon %}
+                      src="{{ product.icon.url }}"
+                    {% else %}
+                      src="{{ static('core/img/na.gif') }}"
+                    {% endif %}
+                  />
+                  <span class="card-content">{{ product.price }} €<br>{{ product.code }}</span>
+                </button>
+              {%- endfor %}
+            </div>
+          </div>
+        {%- endfor %}
+      {% endif %}
     </div>
   </div>
 {% endblock content %}

counter/views/click.py

@@ -29,6 +29,7 @@ from django.urls import reverse_lazy
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import FormView
 from django.views.generic.detail import SingleObjectMixin
+from ninja.main import HttpRequest
 
 from core.models import User
 from core.utils import FormFragmentTemplateData
@@ -40,7 +41,9 @@ from counter.views.mixins import CounterTabsMixin
 from counter.views.student_card import StudentCardFormView
 
 
-def get_operator(counter: Counter, customer: Customer) -> User:
+def get_operator(request: HttpRequest, counter: Counter, customer: Customer) -> User:
+    if counter.type != "BAR":
+        return request.user
     if counter.customer_is_barman(customer):
         return customer.user
     return counter.get_random_barman()
@@ -181,7 +184,7 @@ class CounterClick(CounterTabsMixin, CanViewMixin, SingleObjectMixin, FormView):
         if len(formset) == 0:
             return ret
 
-        operator = get_operator(self.object, self.customer)
+        operator = get_operator(self.request, self.object, self.customer)
         with transaction.atomic():
             self.request.session["last_basket"] = []
 
@@ -291,7 +294,7 @@ class RefillingCreateView(FormView):
         if not self.counter.can_refill():
             raise PermissionDenied
 
-        self.operator = get_operator(self.counter, self.customer)
+        self.operator = get_operator(request, self.counter, self.customer)
 
         return super().dispatch(request, *args, **kwargs)