Merge pull request #337 from bruecksen/175-genussrechtler

175 Genussrechtler, option to sell product to a specific user group

Author: bruecksen

bakeup/pages/models.py

@@ -86,7 +86,7 @@ def get_context(self, request, *args, **kwargs):
             context['production_day_next'] = self.production_day
             current_customer_order = CustomerOrder.objects.filter(customer=customer, production_day=self.production_day).first()
             context['current_customer_order'] = current_customer_order
-            production_day_products = self.production_day.production_day_products.published()
+            production_day_products = self.production_day.production_day_products.published().available_to_user(request.user)
             # TODO this needs to go at one place, code duplication, very bad idea shop/views
             production_day_products = production_day_products.annotate(
                 ordered_quantity=Subquery(

bakeup/shop/forms.py

@@ -164,7 +164,7 @@ def clean(self):
 
 
 ProductionDayProductFormSet = modelformset_factory(
-    ProductionDayProduct, fields=("product", "max_quantity", "is_published"), extra=1,  can_delete=True, formset=BaseProductionDayProductFormSet
+    ProductionDayProduct, fields=("product", "max_quantity", "is_published", "group"), extra=1,  can_delete=True, formset=BaseProductionDayProductFormSet
 )
 
 CustomerOrderPositionFormSet = modelformset_factory(

bakeup/shop/migrations/0031_productiondayproduct_group.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.2.12 on 2023-09-14 09:33
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('auth', '0012_alter_user_first_name_max_length'),
+        ('shop', '0030_alter_productionday_day_of_sale'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='productiondayproduct',
+            name='group',
+            field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='auth.group', verbose_name='Group'),
+        ),
+    ]

bakeup/shop/migrations/0032_alter_productiondayproduct_group.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.2.12 on 2023-09-14 12:15
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('auth', '0012_alter_user_first_name_max_length'),
+        ('shop', '0031_productiondayproduct_group'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='productiondayproduct',
+            name='group',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='auth.group', verbose_name='Group'),
+        ),
+    ]

bakeup/shop/models.py

@@ -59,6 +59,15 @@ def upcoming(self):
         today = timezone.now().date()
         return self.filter(day_of_sale__gte=today).order_by('day_of_sale')
 
+    def available_to_user(self, user):
+        return self.filter(
+            Q(production_day_products__group__isnull=True) |
+            Q(production_day_products__group__in=[group.pk for group in user.groups.all()])
+        )
+
+    def available(self):
+        return self.filter(production_day_products__group__isnull=True)
+
 
 class ProductionDay(CommonBaseClass):
     day_of_sale = models.DateField(unique=True, verbose_name=_("Day of Sale"), db_index=True)
@@ -223,6 +232,15 @@ def update_order_positions_product(self, production_plan_product):
         positions.update(product=production_plan_product)
 
 class ProductionDayProductQuerySet(models.QuerySet):
+    def available_to_user(self, user):
+        return self.filter(
+            Q(group__isnull=True) |
+            Q(group__in=[group.pk for group in user.groups.all()])
+        )
+    
+    def available(self):
+        return self.filter(group__isnull=True)
+
     def published(self):
         return self.filter(is_published=True)
 
@@ -245,6 +263,7 @@ class ProductionDayProduct(CommonBaseClass):
     max_quantity = models.PositiveSmallIntegerField(blank=False, null=False, verbose_name=_("Max quantity"))
     production_plan = models.ForeignKey('workshop.ProductionPlan', on_delete=models.SET_NULL, blank=True, null=True)
     is_published = models.BooleanField(default=False, verbose_name=_("Published?"))
+    group = models.ForeignKey('auth.Group', blank=True, null=True, verbose_name=_('Group'), on_delete=models.SET_NULL)
 
     objects = ProductionDayProductQuerySet.as_manager()
 
@@ -318,6 +337,13 @@ def calculate_max_quantity(self, exclude_customer=None):
         ordered_quantity = orders.aggregate(quantity_sum=Sum('quantity'))['quantity_sum'] or 0
         return max(self.max_quantity - ordered_quantity, 0)
 
+    def is_available_to_customer(self, customer):
+        if not self.group:
+            return True
+        if self.group and self.group in customer.user.groups.all():
+            return True
+        return False
+
 
 class PointOfSale(CommonBaseClass):
     name = models.CharField(max_length=255)
@@ -427,7 +453,6 @@ def has_abo(self):
 
     @classmethod
     def create_or_update_customer_order(cls, request, production_day, customer, products, point_of_sale=None):
-        # TODO order_nr, address, should point of sale really be saved in order?
         # TODO check quantity with availalbe quantity
         with transaction.atomic():
             point_of_sale = point_of_sale and PointOfSale.objects.get(pk=point_of_sale) or customer.point_of_sale
@@ -441,6 +466,9 @@ def create_or_update_customer_order(cls, request, production_day, customer, prod
             for product, quantity in products.items():
                 # print(product, quantity)
                 production_day_product = ProductionDayProduct.objects.get(production_day=production_day, product=product)
+                if not production_day_product.is_available_to_customer(customer):
+                    messages.add_message(request, messages.INFO, "Leider ist das Produkt {} nicht verfügbar.".format(product.get_display_name()))
+                    continue
                 max_quantity = production_day_product.calculate_max_quantity(customer)
                 if quantity > 0 and production_day_product.is_sold_out and max_quantity <= quantity:
                     messages.add_message(request, messages.INFO, "Leider ist das Produkt {} schon ausverkauft und konnte nicht mehr bestellt werden.".format(product.get_display_name()))
@@ -478,7 +506,7 @@ def create_or_update_customer_order(cls, request, production_day, customer, prod
             return customer_order, created
 
     def get_production_day_products_ordered_list(self):
-        production_day_products = self.production_day.production_day_products.published()
+        production_day_products = self.production_day.production_day_products.published().available_to_user(self.customer.user)
         production_day_products = production_day_products.annotate(
             ordered_quantity=Subquery(self.positions.filter(Q(product=OuterRef('product__pk')) | Q(product__product_template=OuterRef('product__pk')),).values("quantity"))
         ).annotate(

bakeup/shop/templatetags/shop_tags.py

@@ -16,6 +16,22 @@ def customer_quantity(context, production_day_product):
     ).first()
     return position and position.quantity or None
 
+@register.simple_tag(takes_context=True)
+def upcoming_available_production_days(context, product):
+    user = context['request'].user
+    if user.is_authenticated:
+        return product.production_days.published().upcoming().available_to_user(user)
+    else:
+        return product.production_days.published().upcoming().available()
+
+@register.simple_tag(takes_context=True)
+def available_products(context, production_day):
+    user = context['request'].user
+    if user.is_authenticated:
+        return production_day.production_day_products.published().upcoming().available_to_user(user)
+    else:
+        return production_day.production_day_products.published().upcoming().available()
+
 @register.simple_tag(takes_context=True)
 def max_quantity(context, production_day, product):
     production_day_product = ProductionDayProduct.objects.get(production_day=production_day, product=product)

bakeup/shop/views.py

@@ -233,8 +233,8 @@ def get_context_data(self, **kwargs):
         if self.production_day:
             context['abo_product_days'] = ProductionDayProduct.get_available_abo_product_days(self.production_day, customer)
             context['production_day_next'] = self.production_day
-            context['production_day_products'] = self.production_day.production_day_products.published()
-            production_day_products = self.production_day.production_day_products.published()
+            production_day_products = self.production_day.production_day_products.published().available_to_user(self.request.user)
+            context['production_day_products'] = production_day_products
             current_customer_order = CustomerOrder.objects.filter(customer=customer, production_day=self.production_day).first()
             context['current_customer_order'] = current_customer_order
             # TODO this needs to go at one place, code duplication, very bad idea pages/models

bakeup/static/css/project.css

@@ -13181,6 +13181,15 @@ textarea {
   z-index: 10;
 }
 
+.badge.top {
+  position: absolute;
+  left: 50%;
+  top: 0;
+  z-index: 10;
+  -webkit-transform: translateX(-50%) translateY(-50%);
+          transform: translateX(-50%) translateY(-50%);
+}
+
 .badge.top-middle {
   position: absolute;
   left: 50%;

bakeup/static/css/project.min.css

@@ -575,6 +575,13 @@ textarea {
   top: -10px;
   z-index: 10;
 }
+.badge.top {
+  position: absolute;
+  left: 50%;
+  top: 0;
+  z-index: 10;
+  transform: translateX(-50%) translateY(-50%);
+}
 .badge.top-middle {
   position: absolute;
   left: 50%;

bakeup/static/sass/project.scss

@@ -1,4 +1,8 @@
 {% extends "shop/base_page.html" %}
+{% load wagtailcore_tags %}
+
 {% block page_content %}
- {{ page.content }}
+    {% for block in page.content %}
+        {% include_block block %}
+    {% endfor %}
 {% endblock %}

bakeup/templates/pages/content_page.html

@@ -4,12 +4,15 @@
 {% customer_quantity production_day_product as customer_quantity %}
 {% endif %}
 <div class="card h-100 product-card" id="product-{{ production_day_product.pk }}" data-product="{{ production_day_product.product.pk }}" data-ordered-quantity="{{ customer_quantity|default:0 }}">
+    {% if production_day_product.group %}
+    <span class="badge bg-primary top text-uppercase fs-5">{{ production_day_product.group }}</span>
+    {% endif %}
     {% if production_day_product.production_plan.is_production %}
-    <span class="badge bg-dark top-middle text-uppercase fs-5">In Produktion</span>
+    <span class="badge bg-dark top-middle text-uppercase fs-6">In Produktion</span>
     {% elif production_day_product.production_plan.is_produced %}
-    <span class="badge bg-dark top-middle text-uppercase fs-5">Produziert</span>
+    <span class="badge bg-dark top-middle text-uppercase fs-6">Produziert</span>
     {% elif production_day_product.is_sold_out %}
-    <span class="badge bg-dark top-middle text-uppercase fs-5 opacity-100 shadow">Ausverkauft</span>
+    <span class="badge bg-dark top-middle text-uppercase fs-6 opacity-100 shadow">Ausverkauft</span>
     {% endif %}
     {% if production_day_product.is_locked or production_day_product.is_sold_out%}<div class="opacity-60">{% endif %}
 

bakeup/templates/shop/includes/product_card.html

@@ -35,7 +35,8 @@ <h2 class="card-title hyphens-auto fw-bold">{{ product.get_display_name }}
             {% if product.production_days.upcoming %}
             <h4>Nächste Backtage:</h4>
             <div class="d-grid gap-2">
-                {% for production_day in product.production_days.upcoming %}
+                {% upcoming_available_production_days product as production_days %}
+                {% for production_day in production_days %}
                 <a href="{% url 'shop:shop-production-day' production_day=production_day.production_day.pk %}#product-{{production_day.pk}}" class="btn btn-primary"><span class="fw-bold">{{ production_day.production_day.day_of_sale|date:'d.m.Y' }}</span> ({{ production_day.calculate_max_quantity }} verfügbar)</a>
                 {% endfor %}
             </div>

bakeup/templates/shop/includes/product_card_overview.html

@@ -3,19 +3,20 @@
 <div class="card h-100 production-day-card">
     <div class="position-relative">
         <div class="row g-0">
-            {% if production_day.production_day_products.published.with_pictures.count == 1 %}
-                {% thumbnail production_day.production_day_products.published.first.product.image "600x450" crop="center" as im %}
+            {% available_products production_day as products %}
+            {% if products.with_pictures.count == 1 %}
+                {% thumbnail products.first.product.image "600x450" crop="center" as im %}
                 <img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" class="card-img-top img-fluid" alt="product image">
                 {% endthumbnail %}
             {% else %}
             <div id="carousel-production-day-{{ production_day.pk }}" class="carousel slide" data-bs-ride="true">
                 <div class="carousel-indicators">
-                    {% for production_day_product in production_day.production_day_products.published.with_pictures.all %}
+                    {% for production_day_product in products.with_pictures.all %}
                         <button type="button" data-bs-target="#carousel-production-day-{{ production_day.pk }}" data-bs-slide-to="{{ forloop.counter0 }}" {% if forloop.first %}class="active"{% endif %} aria-current="true" aria-label="Slide {{ forloop.counter }}"></button>
                     {% endfor %}
                 </div>
                 <div class="carousel-inner">
-                    {% for production_day_product in production_day.production_day_products.published.with_pictures.all %}
+                    {% for production_day_product in products.with_pictures.all %}
                         <div class="carousel-item{% if forloop.first %} active{% endif %}">
                             {% thumbnail production_day_product.product.image "600x450" crop="center" as im %}
                             <img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" class="card-img-top img-fluid" alt="product image">
@@ -39,7 +40,7 @@
     <div class="card-body pb-0">
         <h2 class="card-title fw-bold">{{ production_day.day_of_sale|date:'d.m.Y' }}</h2>
         <p>{{ production_day.description|safe|linebreaksbr|urlize }}</p>
-        {% for product in production_day.production_day_products.published.all %}<span class="badge bg-dark me-2 mb-2 fs-6">{{ product.product.get_display_name }}</span>{% endfor %}
+        {% for product in products %}<span class="badge bg-dark me-2 mb-2 fs-6">{{ product.product.get_display_name }}</span>{% endfor %}
     </div>
     <div class="card-footer">
         <div class="d-grid">

bakeup/templates/shop/includes/production_day_card.html

@@ -0,0 +1,4 @@
+<div class="btn-group btn-group-sm" role="group" aria-label="Column action links">
+    <a href="{% url 'workshop:group-update' pk=record.pk %}" class="btn btn-primary"><i class="fas fa-edit"></i></a>
+    <a href="{% url 'workshop:group-delete' pk=record.pk %}" class="btn btn-primary"><i class="fas fa-trash"></i></a>
+</div>

bakeup/templates/tables/group_actions_column.html

@@ -16,36 +16,36 @@
 
 {% block page_content %}
 <div class="row">
-  <div class="col col-md-6">
+  <div class="col col-md-7">
     <div class="card p-3">
-      <h3>Account:</h3>
+      <h3>{% trans "Account" %}:</h3>
       <div class="row">
         <div class="col-4 fw-bold">
-          Email:
+          {% trans "Email" %}:
         </div>
         <div class="col-8">
           <a href="mailto:{{ object.user.email }}">{{ object.user.email }}</a>
         </div>
       </div>
       <div class="row">
         <div class="col-4 fw-bold">
-          First name:
+          {% trans "First name" %}:
         </div>
         <div class="col-8">
           {{ object.user.first_name }}
         </div>
       </div>
       <div class="row">
         <div class="col-4 fw-bold">
-          Last name:
+          {% trans "Last name" %}:
         </div>
         <div class="col-8">
           {{ object.user.last_name }}
         </div>
       </div>
       <div class="row">
         <div class="col-4 fw-bold">
-          Point of sale:
+          {% trans "Point of sale" %}:
         </div>
         <div class="col-8">
           {{ object.point_of_sale }}
@@ -54,7 +54,7 @@ <h3>Account:</h3>
       {% if object.street %}
       <div class="row">
         <div class="col-4 fw-bold">
-          Street:
+          {% trans "Street" %}:
         </div>
         <div class="col-8">
           {{ object.street }} {{ object.street_number }}
@@ -64,7 +64,7 @@ <h3>Account:</h3>
       {% if object.city or object.postal_code %}
       <div class="row">
         <div class="col-4 fw-bold">
-          City:
+          {% trans "City" %}:
         </div>
         <div class="col-8">
           {{ object.postal_code }} {{ object.city }}
@@ -74,7 +74,7 @@ <h3>Account:</h3>
       {% if object.telephone_number %}
       <div class="row">
         <div class="col-4 fw-bold">
-          Telephone:
+          {% trans "Telephone" %}:
         </div>
         <div class="col-8">
           {{ object.telephone_number }}
@@ -89,6 +89,14 @@ <h3>Account:</h3>
           {% if object.user.is_active %}<i class="fas fa-check-circle"></i>{% else %}<i class="fas fa-times-circle"></i>{% endif%}
         </div>
       </div>
+      <div class="row">
+        <div class="col-4 fw-bold">
+          {% trans "Groups" %}:
+        </div>
+        <div class="col-8">
+          {% for group in object.user.groups.all %}<span class="badge text-bg-dark me-2">{{ group }}</span>{% empty %} - {% endfor %}
+        </div>
+      </div>
       <div class="row">
         <div class="col-4 fw-bold">
           {% trans "date joined" %}:
@@ -109,7 +117,7 @@ <h3>Account:</h3>
   </div>
 </div>
 <div class="row mt-4">
-  <div class="col col-md-6">
+  <div class="col col-md-7">
     <div class="card p-3">
       <h3>Abo:</h3>
       <ul class="list-unstyled">
@@ -125,17 +133,17 @@ <h3>Abo:</h3>
   </div>
 </div>
 <div class="row mt-4">
-  <div class="col col-md-6">
+  <div class="col col-md-7">
     <div class="card p-3">
       <h3>Order history:</h3>
       <p>Total orders: <strong>{{ object.orders.all.count }}</strong><br>
         Total positions: <strong>{{ object.total_ordered_positions }}</strong></p>
       {% for order in customer.orders.all %}
         <div class="row border-bottom">
-          <div class="col-4 fw-bold">
+          <div class="col-3 fw-bold">
             {{ order.production_day }}
           </div>
-          <div class="col-8">
+          <div class="col-9">
             {% include "workshop/includes/order_positions.html" with positions=order.positions.all %}
           </div>
         </div>