sandwitches 2.3.3__py3-none-any.whl → 2.4.0__py3-none-any.whl

sandwitches/forms.py

@@ -138,7 +138,7 @@ class RecipeForm(forms.ModelForm):
             "instructions",
             "price",
             "is_highlighted",
-            "is_community_made",
+            "is_approved",
             "max_daily_orders",
         ]
         widgets = {

sandwitches/migrations/0012_rename_is_community_made_historicalrecipe_is_approved_and_more.py

@@ -0,0 +1,22 @@
+# Generated by Django 6.0.1 on 2026-01-25 10:53
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("sandwitches", "0011_alter_historicalrecipe_is_community_made_and_more"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="historicalrecipe",
+            old_name="is_community_made",
+            new_name="is_approved",
+        ),
+        migrations.RenameField(
+            model_name="recipe",
+            old_name="is_community_made",
+            new_name="is_approved",
+        ),
+    ]

sandwitches/migrations/0013_cartitem.py

@@ -0,0 +1,55 @@
+# Generated by Django 6.0.1 on 2026-01-25 11:12
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        (
+            "sandwitches",
+            "0012_rename_is_community_made_historicalrecipe_is_approved_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="CartItem",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("quantity", models.PositiveIntegerField(default=1)),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                ("updated_at", models.DateTimeField(auto_now=True)),
+                (
+                    "recipe",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="cart_items",
+                        to="sandwitches.recipe",
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="cart_items",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "Cart Item",
+                "verbose_name_plural": "Cart Items",
+                "unique_together": {("user", "recipe")},
+            },
+        ),
+    ]

sandwitches/migrations/0014_ensure_groups_exist.py

@@ -0,0 +1,22 @@
+from django.db import migrations
+
+
+def create_groups(apps, schema_editor):
+    Group = apps.get_model("auth", "Group")
+    Group.objects.get_or_create(name="admin")
+    Group.objects.get_or_create(name="community")
+
+
+def remove_groups(apps, schema_editor):
+    Group = apps.get_model("auth", "Group")
+    Group.objects.filter(name__in=["admin", "community"]).delete()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("sandwitches", "0013_cartitem"),
+    ]
+
+    operations = [
+        migrations.RunPython(create_groups, remove_groups),
+    ]

sandwitches/models.py

@@ -132,7 +132,7 @@ class Recipe(models.Model):
     )
     tags = models.ManyToManyField(Tag, blank=True, related_name="recipes")
     is_highlighted = models.BooleanField(default=False)
-    is_community_made = models.BooleanField(default=False)
+    is_approved = models.BooleanField(default=False)
     max_daily_orders = models.PositiveIntegerField(
         null=True, blank=True, verbose_name="Max daily orders"
     )
@@ -278,3 +278,29 @@ class Order(models.Model):
 
     def __str__(self):
         return f"Order #{self.pk} - {self.user} - {self.recipe}"
+
+
+class CartItem(models.Model):
+    user = models.ForeignKey(
+        settings.AUTH_USER_MODEL, related_name="cart_items", on_delete=models.CASCADE
+    )
+    recipe = models.ForeignKey(
+        Recipe, related_name="cart_items", on_delete=models.CASCADE
+    )
+    quantity = models.PositiveIntegerField(default=1)
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+
+    class Meta:
+        unique_together = ("user", "recipe")
+        verbose_name = "Cart Item"
+        verbose_name_plural = "Cart Items"
+
+    def __str__(self):
+        return f"{self.user.username}'s cart: {self.recipe.title} (x{self.quantity})"
+
+    @property
+    def total_price(self):
+        if self.recipe.price:
+            return self.recipe.price * self.quantity
+        return 0

sandwitches/templates/admin/admin_base.html

@@ -56,6 +56,10 @@
             <i>restaurant</i>
             <span>{% trans "Recipes" %}</span>
         </a>
+        <a href="{% url 'admin_recipe_approval_list' %}" class="{% if request.resolver_match.url_name == 'admin_recipe_approval_list' %}active{% endif %}">
+            <i>how_to_reg</i>
+            <span>{% trans "Approvals" %}</span>
+        </a>
         <a href="{% url 'admin_user_list' %}" class="{% if request.resolver_match.url_name == 'admin_user_list' %}active{% endif %}">
             <i>people</i>
             <span>{% trans "Users" %}</span>

sandwitches/templates/admin/dashboard.html

@@ -7,6 +7,7 @@
 {{ block.super }}
 <link href="{% static "dist/main.css" %}" rel="stylesheet">
 <script src="{% static "dist/main.js" %}" defer></script>
+<script src="https://cdn.jsdelivr.net/npm/chart.js"></script><!-- Chart.js TODO -->
 {% endblock %}
 
 {% block content %}

sandwitches/templates/admin/recipe_approval_list.html

@@ -0,0 +1,56 @@
+{% extends "admin/admin_base.html" %}
+{% load i18n %}
+
+{% block admin_title %}{% trans "Pending Approvals" %}{% endblock %}
+
+{% block content %}
+<div class="row align-center mb-2">
+    <h5 class="max bold">{% trans "Recipes Awaiting Approval" %}</h5>
+</div>
+
+<table class="border striped no-space">
+    <thead>
+        <tr>
+            <th class="min">{% trans "Image" %}</th>
+            <th class="max">{% trans "Title" %}</th>
+            <th>{% trans "Uploader" %}</th>
+            <th>{% trans "Created" %}</th>
+            <th class="right-align">{% trans "Actions" %}</th>
+        </tr>
+    </thead>
+    <tbody>
+        {% for recipe in recipes %}
+        <tr class="pointer" onclick="location.href='{% url 'admin_recipe_edit' recipe.pk %}'">
+            <td class="min">
+                {% if recipe.image %}
+                <img src="{{ recipe.image_thumbnail.url }}" class="admin-thumb round">
+                {% else %}
+                <div class="admin-thumb round gray1 middle-align center-align">
+                    <i class="extra">restaurant</i>
+                </div>
+                {% endif %}
+            </td>
+            <td class="max">
+                <b>{{ recipe.title }}</b>
+            </td>
+            <td>{{ recipe.uploaded_by.username|default:"-" }}</td>
+            <td>{{ recipe.created_at|date:"SHORT_DATETIME_FORMAT" }}</td>
+            <td class="right-align">
+                <a href="{% url 'admin_recipe_approve' recipe.pk %}" class="button tiny primary round" onclick="event.stopPropagation();">
+                    <i>check</i>
+                    <span>{% trans "Approve" %}</span>
+                </a>
+                <a href="{% url 'admin_recipe_edit' recipe.pk %}" class="button circle transparent" onclick="event.stopPropagation();" title="{% trans 'Edit' %}"><i>edit</i></a>
+                <a href="{% url 'admin_recipe_delete' recipe.pk %}" class="button circle transparent" onclick="event.stopPropagation();" title="{% trans 'Delete' %}"><i>delete</i></a>
+            </td>
+        </tr>
+        {% empty %}
+        <tr>
+            <td colspan="5" class="center-align padding">
+                {% trans "No recipes pending approval." %}
+            </td>
+        </tr>
+        {% endfor %}
+    </tbody>
+</table>
+{% endblock %}

sandwitches/templates/admin/recipe_form.html

@@ -82,8 +82,8 @@
 
                 <div class="field middle-align mt-1">
                     <label class="checkbox">
-                        {{ form.is_community_made }}
-                        <span>{{ form.is_community_made.label }}</span>
+                        {{ form.is_approved }}
+                        <span>{{ form.is_approved.label }}</span>
                     </label>
                 </div>
             </article>

sandwitches/templates/admin/recipe_list.html

@@ -88,7 +88,7 @@
                 </div>
             </td>
             <td class="min center-align">
-                {% if recipe.is_community_made %}
+                {% if recipe.is_approved %}
                 <i class="primary-text">check_circle</i>
                 {% else %}
                 <a href="{% url 'admin_recipe_approve' recipe.pk %}" class="button tiny primary round" onclick="event.stopPropagation();">

sandwitches/templates/cart.html

@@ -0,0 +1,102 @@
+{% extends "base_beer.html" %}
+{% load i18n static %}
+
+{% block title %}{% trans "Your Cart" %}{% endblock %}
+
+{% block content %}
+<main class="responsive">
+    <div class="large-space"></div>
+    <div class="row align-center">
+        <i class="extra">shopping_cart</i>
+        <h4 class="max">{% trans "Your Shopping Cart" %}</h4>
+    </div>
+    <div class="space"></div>
+
+    {% if cart_items %}
+    <div class="grid">
+        <div class="s12 m8">
+            <div class="padding border round surface">
+                <table class="border striped no-space">
+                    <thead>
+                        <tr>
+                            <th class="min">{% trans "Item" %}</th>
+                            <th class="max">{% trans "Description" %}</th>
+                            <th class="min">{% trans "Quantity" %}</th>
+                            <th class="min">{% trans "Price" %}</th>
+                            <th class="min"></th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {% for item in cart_items %}
+                        <tr>
+                            <td class="min">
+                                {% if item.recipe.image %}
+                                <img src="{{ item.recipe.image_thumbnail.url }}" class="circle small">
+                                {% else %}
+                                <i class="circle small gray1">restaurant</i>
+                                {% endif %}
+                            </td>
+                            <td class="max">
+                                <a href="{% url 'recipe_detail' item.recipe.slug %}" class="bold">{{ item.recipe.title }}</a>
+                            </td>
+                            <td class="min">
+                                <form action="{% url 'update_cart_quantity' item.pk %}" method="post" class="row no-space align-center">
+                                    {% csrf_token %}
+                                    <div class="field border round small no-margin" style="width: 80px;">
+                                        <input type="number" name="quantity" value="{{ item.quantity }}" min="1" onchange="this.form.submit()">
+                                    </div>
+                                </form>
+                            </td>
+                            <td class="min no-wrap">{{ item.total_price }} €</td>
+                            <td class="min">
+                                <a href="{% url 'remove_from_cart' item.pk %}" class="button circle transparent">
+                                    <i>delete</i>
+                                </a>
+                            </td>
+                        </tr>
+                        {% endfor %}
+                    </tbody>
+                </table>
+            </div>
+        </div>
+        <div class="s12 m4">
+            <article class="round padding border primary-container">
+                <h6 class="bold">{% trans "Summary" %}</h6>
+                <div class="row mt-1">
+                    <div class="max">{% trans "Subtotal" %}</div>
+                    <div class="bold">{{ total }} €</div>
+                </div>
+                <div class="divider mt-1 mb-1"></div>
+                <div class="row">
+                    <div class="max bold">{% trans "Total" %}</div>
+                    <div class="bold large-text">{{ total }} €</div>
+                </div>
+                <div class="space"></div>
+                <form action="{% url 'checkout_cart' %}" method="post">
+                    {% csrf_token %}
+                    <button type="submit" class="button primary round extend">
+                        <i>check</i>
+                        <span>{% trans "Checkout" %}</span>
+                    </button>
+                </form>
+            </article>
+            <div class="space"></div>
+            <a href="{% url 'index' %}" class="button transparent extend">
+                <i>arrow_back</i>
+                <span>{% trans "Continue Shopping" %}</span>
+            </a>
+        </div>
+    </div>
+    {% else %}
+    <div class="center-align padding">
+        <i class="extra gray-text">shopping_cart_off</i>
+        <h5 class="gray-text">{% trans "Your cart is empty." %}</h5>
+        <div class="space"></div>
+        <a href="{% url 'index' %}" class="button primary round">
+            <span>{% trans "Start Shopping" %}</span>
+        </a>
+    </div>
+    {% endif %}
+    <div class="large-space"></div>
+</main>
+{% endblock %}

sandwitches/templates/components/navbar.html

@@ -15,6 +15,12 @@
   </button>
 
   {% if user.is_authenticated %}
+    <a href="{% url 'view_cart' %}" class="button circle transparent">
+        <i>shopping_cart</i>
+        {% if user.cart_items.exists %}
+        <badge class="red">{{ user.cart_items.count }}</badge>
+        {% endif %}
+    </a>
     <a href="{% url 'user_profile' %}">
       {% if user.avatar %}
       <img src="{{ user.avatar.url }}" class="circle">

sandwitches/templates/components/recipe_header.html

@@ -37,11 +37,11 @@
     <i class="primary-text">euro_symbol</i>
     <h5 class="bold ml-1">{{ recipe.price }}</h5>
     {% if user.is_authenticated %}
-    <form action="{% url 'order_recipe' recipe.pk %}" method="post" class="ml-2">
+    <form action="{% url 'add_to_cart' recipe.pk %}" method="post" class="ml-2">
         {% csrf_token %}
         <button type="submit" class="button primary round">
-            <i>shopping_cart</i>
-            <span>{% trans "Order Now" %}</span>
+            <i>add_shopping_cart</i>
+            <span>{% trans "Add to Cart" %}</span>
         </button>
     </form>
     {% endif %}

sandwitches/templates/partials/recipe_list.html

@@ -72,11 +72,19 @@
          </div>
        </div>
 
-       <div class="padding pt-0">
-         <a href="{% url 'recipe_detail' recipe.slug %}" class="button fill round responsive">
-           <span>{% trans 'View Recipe' %}</span>
+       <div class="padding pt-0 row no-space">
+         <a href="{% url 'recipe_detail' recipe.slug %}" class="button fill round max">
+           <span>{% trans 'View' %}</span>
            <i class="suffix">arrow_forward</i>
          </a>
+         {% if user.is_authenticated and recipe.price %}
+         <form action="{% url 'add_to_cart' recipe.pk %}" method="post" class="ml-1">
+            {% csrf_token %}
+            <button type="submit" class="button circle primary" title="{% trans 'Add to Cart' %}">
+              <i>add_shopping_cart</i>
+            </button>
+         </form>
+         {% endif %}
        </div>
     </article>
   </div>

sandwitches/urls.py

@@ -39,6 +39,13 @@ urlpatterns = [
     path("api/", api.urls),
     path("media/<path:file_path>", views.media, name="media"),
     path("favorites/", views.favorites, name="favorites"),
+    path("cart/", views.view_cart, name="view_cart"),
+    path("cart/add/<int:pk>/", views.add_to_cart, name="add_to_cart"),
+    path("cart/remove/<int:pk>/", views.remove_from_cart, name="remove_from_cart"),
+    path(
+        "cart/update/<int:pk>/", views.update_cart_quantity, name="update_cart_quantity"
+    ),
+    path("cart/checkout/", views.checkout_cart, name="checkout_cart"),
     path("", views.index, name="index"),
     path("feeds/latest/", LatestRecipesFeed(), name="latest_recipes_feed"),
     path(
@@ -54,6 +61,11 @@ urlpatterns += i18n_patterns(
     path("recipes/<int:pk>/favorite/", views.toggle_favorite, name="toggle_favorite"),
     path("dashboard/", views.admin_dashboard, name="admin_dashboard"),
     path("dashboard/recipes/", views.admin_recipe_list, name="admin_recipe_list"),
+    path(
+        "dashboard/approvals/",
+        views.admin_recipe_approval_list,
+        name="admin_recipe_approval_list",
+    ),
     path("dashboard/recipes/add/", views.admin_recipe_add, name="admin_recipe_add"),
     path(
         "dashboard/recipes/<int:pk>/edit/",

sandwitches/views.py

@@ -8,7 +8,7 @@ from django.contrib.auth import get_user_model
 from django.contrib.auth.decorators import login_required
 from django.contrib.admin.views.decorators import staff_member_required
 from django.utils.translation import gettext as _
-from .models import Recipe, Rating, Tag, Order
+from .models import Recipe, Rating, Tag, Order, CartItem
 from .forms import (
     RecipeForm,
     AdminSetupForm,
@@ -42,7 +42,7 @@ def community(request):
         if form.is_valid():
             recipe = form.save(commit=False)
             recipe.uploaded_by = request.user
-            recipe.is_community_made = True
+            recipe.is_approved = False
             recipe.save()
             form.save_m2m()
             messages.success(
@@ -53,16 +53,17 @@ def community(request):
     else:
         form = UserRecipeSubmissionForm()
 
-    # Community recipes = non-staff uploaded
-    recipes = Recipe.objects.filter(is_community_made=True).prefetch_related(  # ty:ignore[unresolved-attribute]
-        "favorited_by"
-    )
+    # Community recipes = uploaded by users in 'community' group
+    recipes = Recipe.objects.filter(  # ty:ignore[unresolved-attribute]
+        uploaded_by__groups__name="community"
+    ).prefetch_related("favorited_by")
 
-    if not request.user.is_staff:
+    if not (request.user.is_staff or request.user.groups.filter(name="admin").exists()):
         # Regular users only see approved community recipes or their own
-        recipes = recipes.filter(
-            Q(is_community_made=True) | Q(uploaded_by=request.user)
-        )
+        recipes = recipes.filter(Q(is_approved=True) | Q(uploaded_by=request.user))
+    else:
+        # Admins see all community recipes
+        pass
 
     recipes = recipes.order_by("-created_at")
 
@@ -155,7 +156,7 @@ def admin_dashboard(request):
     order_counts = [d["count"] for d in order_data]
 
     pending_recipes = Recipe.objects.filter(  # ty:ignore[unresolved-attribute]
-        uploaded_by__is_staff=False, uploaded_by__is_superuser=False
+        is_approved=False, uploaded_by__groups__name="community"
     ).order_by("-created_at")
     context = {
         "recipe_count": recipe_count,
@@ -220,6 +221,21 @@ def admin_recipe_list(request):
     )
 
 
+@staff_member_required
+def admin_recipe_approval_list(request):
+    recipes = Recipe.objects.filter(  # ty:ignore[unresolved-attribute]
+        is_approved=False, uploaded_by__groups__name="community"
+    ).order_by("-created_at")
+    return render(
+        request,
+        "admin/recipe_approval_list.html",
+        {
+            "recipes": recipes,
+            "version": sandwitches_version,
+        },
+    )
+
+
 @staff_member_required
 def admin_recipe_add(request):
     if request.method == "POST":
@@ -266,11 +282,14 @@ def admin_recipe_edit(request, pk):
 @staff_member_required
 def admin_recipe_approve(request, pk):
     recipe = get_object_or_404(Recipe, pk=pk)
-    recipe.is_community_made = True
+    recipe.is_approved = True
     recipe.save()
     messages.success(
         request, _("Recipe '%(title)s' approved.") % {"title": recipe.title}
     )
+    referer = request.META.get("HTTP_REFERER")
+    if referer and "dashboard/approvals" in referer:
+        return redirect("admin_recipe_approval_list")
     return redirect("admin_recipe_list")
 
 
@@ -494,10 +513,19 @@ def admin_order_list(request):
 def recipe_detail(request, slug):
     recipe = get_object_or_404(Recipe, slug=slug)
 
-    if not recipe.is_community_made:
+    # If it's a community recipe, it must be approved or viewed by staff/owner
+    is_community = (
+        recipe.uploaded_by
+        and recipe.uploaded_by.groups.filter(name="community").exists()
+    )
+    if is_community and not recipe.is_approved:
         if not (
             request.user.is_authenticated
-            and (request.user.is_staff or recipe.uploaded_by == request.user)
+            and (
+                request.user.is_staff
+                or recipe.uploaded_by == request.user
+                or request.user.groups.filter(name="admin").exists()
+            )
         ):
             raise Http404("Recipe not found or pending approval.")
 
@@ -668,8 +696,8 @@ def index(request):
 
     recipes = Recipe.objects.all().prefetch_related("favorited_by")  # ty:ignore[unresolved-attribute]
 
-    # Only show "normal" recipes (uploaded by staff or no uploader)
-    recipes = recipes.filter(Q(is_community_made=False))
+    # Only show recipes from people in the admin group
+    recipes = recipes.filter(uploaded_by__groups__name="admin")
 
     # Filtering
     q = request.GET.get("q")
@@ -743,6 +771,8 @@ def setup(request):
     First-time setup page: create initial superuser if none exists.
     Visible only while there are no superusers in the DB.
     """
+    from django.contrib.auth.models import Group
+
     # do not allow access if a superuser already exists
     if User.objects.filter(is_superuser=True).exists():
         return redirect("index")
@@ -751,6 +781,12 @@ def setup(request):
         form = AdminSetupForm(request.POST)
         if form.is_valid():
             user = form.save()
+
+            # Ensure groups exist and add user to admin group
+            admin_group, created = Group.objects.get_or_create(name="admin")
+            Group.objects.get_or_create(name="community")
+            user.groups.add(admin_group)
+
             user.backend = "django.contrib.auth.backends.ModelBackend"
             login(request, user)
             messages.success(request, _("Admin account created and signed in."))
@@ -765,10 +801,17 @@ def signup(request):
     """
     User signup page: create new regular user accounts.
     """
+    from django.contrib.auth.models import Group
+
     if request.method == "POST":
         form = UserSignupForm(request.POST, request.FILES)
         if form.is_valid():
             user = form.save()
+
+            # Add user to community group
+            community_group, created = Group.objects.get_or_create(name="community")
+            user.groups.add(community_group)
+
             # log in the newly created user
             user.backend = "django.contrib.auth.backends.ModelBackend"
             login(request, user)
@@ -818,3 +861,102 @@ def user_profile(request):
     return render(
         request, "profile.html", {"form": form, "version": sandwitches_version}
     )
+
+
+@login_required
+def view_cart(request):
+    cart_items = CartItem.objects.filter(user=request.user).select_related("recipe")  # ty:ignore[unresolved-attribute]
+    total = sum(item.total_price for item in cart_items)
+    return render(
+        request,
+        "cart.html",
+        {
+            "cart_items": cart_items,
+            "total": total,
+            "version": sandwitches_version,
+        },
+    )
+
+
+@login_required
+def add_to_cart(request, pk):
+    recipe = get_object_or_404(Recipe, pk=pk)
+    if not recipe.price:
+        messages.error(request, _("This recipe cannot be ordered (no price set)."))
+        return redirect("recipe_detail", slug=recipe.slug)
+
+    cart_item, created = CartItem.objects.get_or_create(  # ty:ignore[unresolved-attribute]
+        user=request.user, recipe=recipe
+    )
+    if not created:
+        cart_item.quantity += 1
+        cart_item.save()
+
+    messages.success(
+        request, _("Added %(title)s to your cart.") % {"title": recipe.title}
+    )
+    return redirect("view_cart")
+
+
+@login_required
+def remove_from_cart(request, pk):
+    cart_item = get_object_or_404(CartItem, pk=pk, user=request.user)
+    cart_item.delete()
+    messages.success(request, _("Removed from cart."))
+    return redirect("view_cart")
+
+
+@login_required
+def update_cart_quantity(request, pk):
+    if request.method == "POST":
+        cart_item = get_object_or_404(CartItem, pk=pk, user=request.user)
+        try:
+            quantity = int(request.POST.get("quantity", 1))
+            if quantity > 0:
+                cart_item.quantity = quantity
+                cart_item.save()
+            else:
+                cart_item.delete()
+        except ValueError:
+            pass
+    return redirect("view_cart")
+
+
+@login_required
+def checkout_cart(request):
+    cart_items = CartItem.objects.filter(user=request.user)  # ty:ignore[unresolved-attribute]
+    if not cart_items.exists():
+        messages.error(request, _("Your cart is empty."))
+        return redirect("view_cart")
+
+    created_orders = []  # noqa: F841
+    errors = []
+
+    # We use a transaction to ensure either all orders are created or none if something goes wrong
+    from django.db import transaction
+
+    try:
+        with transaction.atomic():
+            for item in cart_items:
+                # Create Order for each recipe in cart (quantity times?)
+                # Current Order model doesn't have quantity, so we create multiple orders or update Order model.
+                # For now, let's create 'quantity' number of orders as per current schema
+                # OR we could update Order model to support quantity.
+                # Let's see if Order has quantity. (Checked: it does not).
+                for i in range(item.quantity):
+                    try:
+                        Order.objects.create(user=request.user, recipe=item.recipe)  # ty:ignore[unresolved-attribute]
+                    except (ValidationError, ValueError) as e:
+                        errors.append(f"{item.recipe.title}: {str(e)}")
+                        raise e  # Trigger rollback
+
+            cart_items.delete()
+            messages.success(request, _("Orders submitted successfully!"))
+            return redirect("user_profile")
+    except Exception:
+        if errors:
+            for error in errors:
+                messages.error(request, error)
+        else:
+            messages.error(request, _("An error occurred during checkout."))
+        return redirect("view_cart")

{sandwitches-2.3.3.dist-info → sandwitches-2.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sandwitches
-Version: 2.3.3
+Version: 2.4.0
 Summary: Add your description here
 Author: Martyn van Dijke
 Author-email: Martyn van Dijke <martijnvdijke600@gmail.com>

{sandwitches-2.3.3.dist-info → sandwitches-2.4.0.dist-info}/RECORD

@@ -3,7 +3,7 @@ sandwitches/admin.py,sha256=-02WqE8U3rxrVCoNB7sfvtyE4v_e3pt7mFwXfUlindo,2421
 sandwitches/api.py,sha256=ruD5QeOPY-l9PvkJQiaOYoI0sRARDpqpFrFDgBxo9cQ,6389
 sandwitches/asgi.py,sha256=cygnXdXSSVspM7ZXuj47Ef6oz7HSTw4D7BPzgE2PU5w,399
 sandwitches/feeds.py,sha256=iz1d11dV0utA0ZNsB7VIAp0h8Zr5mFNSKJWHbw_j6YM,683
-sandwitches/forms.py,sha256=rcXAL-Dn1gY3mWIPV9X9tZpFp2z6Xrkv6k9f2YUp8OU,7158
+sandwitches/forms.py,sha256=YvkSTa9h_ag_b58ToOHCQIHBa3VeHMC9RKB9F7qI-gk,7152
 sandwitches/locale/nl/LC_MESSAGES/django.mo,sha256=EzQWzIhz_Na3w9AS7F-YjB-Xv63t4sMRSAkEQ1-g32M,5965
 sandwitches/locale/nl/LC_MESSAGES/django.po,sha256=znxspEoMwkmktusZtbVrt1KG1LDUwIEi4ZEIE3XGeoI,25904
 sandwitches/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -20,20 +20,24 @@ sandwitches/migrations/0008_historicalrecipe_daily_orders_count_and_more.py,sha2
 sandwitches/migrations/0009_historicalrecipe_is_approved_recipe_is_approved.py,sha256=XP76J2_HiMOFeIU17Yu8AYXtswE-dcsNZq3lJGFgGtg,588
 sandwitches/migrations/0010_rename_is_approved_historicalrecipe_is_community_made_and_more.py,sha256=9Xv-rBRUvx5UWbr7i4BeWbllCcVkcNuC8T3sxKSdWyU,575
 sandwitches/migrations/0011_alter_historicalrecipe_is_community_made_and_more.py,sha256=O2D57bAsSwBklYqfMTWrHE3Zxj3lrk-CO9yDP8sQS0M,659
+sandwitches/migrations/0012_rename_is_community_made_historicalrecipe_is_approved_and_more.py,sha256=bCDPpHmZTIW70-YeL30WhuJ2mORktkrsntKqTw0vj94,577
+sandwitches/migrations/0013_cartitem.py,sha256=KYMinpnZiLHwjo7p7EdJHQExuEGC9jtpcZcbm1r7JFo,1787
+sandwitches/migrations/0014_ensure_groups_exist.py,sha256=5FSA742bEQtwHZl5CWZQYIdmS8FBxMgWS079dOaOltY,564
 sandwitches/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sandwitches/models.py,sha256=MmSP1P7Kq2ObjYTJs9AKTEVeWcD5-Pqumj1BTnmBqTc,9986
+sandwitches/models.py,sha256=ptEdQP4oOvyjdhYQlTtnZD-3eIUAY-8nU17G-hmN_2I,10796
 sandwitches/settings.py,sha256=5_eQAJCAV093hnhr3XOxHekT4IF-PEJcRiTecq71_SQ,5841
 sandwitches/storage.py,sha256=ibBG6tVtArqzgEKsRimZPwsqW7i9j4WiPLLHrOJchow,3578
 sandwitches/tasks.py,sha256=YiliAT2rj0fh7hrwKq5_qWtv9AGhd5iulj_iBwZBBKg,6024
-sandwitches/templates/admin/admin_base.html,sha256=Mzq0A6Pl-x61gXv15XegW26X7HKHS0aGcAD-WBSwSG4,4249
+sandwitches/templates/admin/admin_base.html,sha256=aXba3MKFOKhaauFf0z0fFRjPpFHEbT_fREQx31TyxAM,4497
 sandwitches/templates/admin/confirm_delete.html,sha256=HfsZI_gV8JQTKz215TYgPWBrgrFhGv1UB3N-0Hln-14,804
-sandwitches/templates/admin/dashboard.html,sha256=1aZd5AQ2opWjzAsP1q_d15EWZIC04NWoKSH8RTgSyTg,5832
+sandwitches/templates/admin/dashboard.html,sha256=Ial8zH2odIPpstSkQmzGrasl0QxvgGhFPAGy7V5xRzY,5916
 sandwitches/templates/admin/order_list.html,sha256=eHFUn2speXaaj5_SFUG0Z0HfWVUR9-VCDRBeb8ufFb0,819
 sandwitches/templates/admin/partials/dashboard_charts.html,sha256=NYrt-LDZO4__2KDWhAYL5K_f-2Zgj0iiuaZQiRZlBWg,3639
 sandwitches/templates/admin/partials/order_rows.html,sha256=Ye35liahKbQ3rqa6fIGSTwb7seoXoqyqSw0wyNq2C_o,893
 sandwitches/templates/admin/rating_list.html,sha256=8CHAsBfKfs4izhb-IyOiDjJXqAZxFcStoRSGh4pRlgM,1365
-sandwitches/templates/admin/recipe_form.html,sha256=OpDnsB6WsoC45POtil54qHGn93P4A3DiccKVisM5NGM,8746
-sandwitches/templates/admin/recipe_list.html,sha256=cVsAm1TRP4bsE7rkcxIVsThKs3FLr5MWvebSvJoRmAo,5365
+sandwitches/templates/admin/recipe_approval_list.html,sha256=M6GFYI45lAkLkvqP44cu5tDYVOeeVNklEphof1euesM,2281
+sandwitches/templates/admin/recipe_form.html,sha256=23wHT4hs128xnv2nkS6AtcKzY3sblia_dGVNnaeIp5Y,8734
+sandwitches/templates/admin/recipe_list.html,sha256=5fGnRIQ7JfvM3yfG-sngEIEgiPnPDkjK1Tn3nO8EDh4,5359
 sandwitches/templates/admin/tag_form.html,sha256=JRWgAl4fz_Oy-Kuo1K6Mex_CXdsHMABzzyPazthr1Kg,989
 sandwitches/templates/admin/tag_list.html,sha256=ttxwXgfdxkEs4Cmrz5RHaGmaqLd7JDmWhjv80XIQqyw,1246
 sandwitches/templates/admin/task_detail.html,sha256=dO5zHOG-yTY1ly3VPA3o3jjie0wmxw0gdddtSKpN-W8,3825
@@ -42,6 +46,7 @@ sandwitches/templates/admin/user_form.html,sha256=7_6GShLROFeJJexL1XLFUXdW9_lYF8
 sandwitches/templates/admin/user_list.html,sha256=6O1YctULY-tqJnagybJof9ERA_NL1LX_a8cAu6_aWVQ,2193
 sandwitches/templates/base.html,sha256=mwCESNirfvvdyMg2e1Siy_LA8fLH29m0aS_Jv0Qom4U,3597
 sandwitches/templates/base_beer.html,sha256=4QgU4_gu_RRMtimmRAhATDJ3mj_WANxtilQJYNgAL60,2077
+sandwitches/templates/cart.html,sha256=YqmrzOLLPAXSqeXeUTrt9AwTTWOitOLTaD_k3mYYVpM,4537
 sandwitches/templates/community.html,sha256=6x-Z8E0W3Ii-d0aG7DdCJoWQM9bVKNP_NSP8fTqpo6o,5324
 sandwitches/templates/components/carousel_scripts.html,sha256=9vEL5JJv8zUUjEtsnHW-BwwXUNWqQ6w_vf6UdxgEv_I,1934
 sandwitches/templates/components/favorites_search_form.html,sha256=tpD8SpS47TUDJBwxhMuvjhTN9pjWoRGFW50TBv48Ld4,5202
@@ -50,9 +55,9 @@ sandwitches/templates/components/ingredients_scripts.html,sha256=2zKTC65GYF589uW
 sandwitches/templates/components/ingredients_section.html,sha256=XsaVXTs9MIwjfJeLjlzah3GWWj8oFU-_HJd9i9l1HAo,665
 sandwitches/templates/components/instructions_section.html,sha256=RFlA4uPiI6vf1e2QgiD5KzGoy7Vg7y7nFY7TFabCYLA,277
 sandwitches/templates/components/language_dialog.html,sha256=iz-6QhFe4f_dsVhGDhVx6KKKLgQz4grX8tbIqSQjDsg,1184
-sandwitches/templates/components/navbar.html,sha256=X2qOPHhVrSl4TkTk4YY-60YjpwCG7IEe4L6a9ywMih4,1164
+sandwitches/templates/components/navbar.html,sha256=t-ZWvd9Z3UQRR2RswcsRXRNbygiesOD0Bh1jhmm2vEY,1396
 sandwitches/templates/components/rating_section.html,sha256=8O5IsFfQwnElMQZLnDpJiuCvvQMLa3jCS67u_RhMi7o,2717
-sandwitches/templates/components/recipe_header.html,sha256=jH9bnT6tis3OuePBq-xzP87IIx2ipDTuw2LO0BQwLXg,1996
+sandwitches/templates/components/recipe_header.html,sha256=U6CxuR275QD9TIqo3VQftqvV6tqmH1rJdDcQotnXxYM,2001
 sandwitches/templates/components/search_form.html,sha256=B8579Jo44gLrlmvkkc2-Vuv_QD93Ljt6F2J1WgTDV60,6617
 sandwitches/templates/components/search_scripts.html,sha256=HvsO5e50DoTZeoFiYeNP5S8S5h7Zfr9VULOWKKR1i_M,3423
 sandwitches/templates/components/side_menu.html,sha256=qXYyk8W-GnG-u_mJ65ADa4HWfUa2ubxnQAKwxwacF9M,1787
@@ -61,17 +66,17 @@ sandwitches/templates/detail.html,sha256=g-O_RsW9Ix9ivWC0nZ4FwHY2NhgYZ3bEGLpqGY0
 sandwitches/templates/favorites.html,sha256=0cPpW07N6Isrb8XpvA5Eh97L2-12QFZ43EzeJvbOlXo,917
 sandwitches/templates/index.html,sha256=7anU7k8s80JYk59Rwsm8EdlNYd7B5clCvV7pKq2IUy0,2518
 sandwitches/templates/login.html,sha256=LiQskhkOkfx0EE4ssA1ToqQ3oEll08OPYLDIkLjHfU8,2177
-sandwitches/templates/partials/recipe_list.html,sha256=oF5zlgAyX_uG63BwulyhFywrn8QLnWXatXVtZPVcPmE,4186
+sandwitches/templates/partials/recipe_list.html,sha256=LUHKFKG90D72K9X2X3d1osvj2jX1QU_MbPe0lNwRSII,4555
 sandwitches/templates/profile.html,sha256=PQTL6_xn0pGUxqEOYuz5j0pmqAyG0Wr3KvyFBO8_k1s,4156
 sandwitches/templates/setup.html,sha256=iNveFgePATsCSO4XMbGPa8TnWHyvj8S_5WwcW6i7pbo,4661
 sandwitches/templates/signup.html,sha256=pNBSlRGZI_B5ccF3dWpUgWBcjODkdLlq7HhyJLYIHCI,6176
 sandwitches/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sandwitches/templatetags/custom_filters.py,sha256=0KDFlFz4b5LwlcURBAmzyYWKKea-LwydZytJGVkkuKA,243
 sandwitches/templatetags/markdown_extras.py,sha256=0ibmRzxE3r85x4k7kK71R-9UT0CgeegYF7MHzj3juTI,344
-sandwitches/urls.py,sha256=4VeccEtx2dz-Y8IjqD7Cj24nnd89PteoXo2NUUfWJiU,4339
+sandwitches/urls.py,sha256=1GyqdrWsCIbKN8wsT4eeE98blx-bBHc6tJgvXzta2nc,4859
 sandwitches/utils.py,sha256=SJP-TkeRZ0OIfaMigYrOSbxRqYXswoqoWhwll3nFuAM,7245
-sandwitches/views.py,sha256=bFe1y8FJ00Tke6yUJteY0j3VysXUsZJkuQXmmbK_yso,25876
+sandwitches/views.py,sha256=WF17_nRo6wDdC8oVjGBcPHGRtoi_Ji7x8W9HdcjAyQA,30890
 sandwitches/wsgi.py,sha256=Eyncpnahq_4s3Lr9ruB-R3Lu9j9zBXqgPbUj7qhIbwU,399
-sandwitches-2.3.3.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-sandwitches-2.3.3.dist-info/METADATA,sha256=TltlxFRdT55B1vxKqYv9CjjUEwITAOgFXvw3UwWKA2k,3111
-sandwitches-2.3.3.dist-info/RECORD,,
+sandwitches-2.4.0.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+sandwitches-2.4.0.dist-info/METADATA,sha256=E9TYl5ZmaC1n9_NM-va3fhaloK8HkrYiP_rei8B_DhE,3111
+sandwitches-2.4.0.dist-info/RECORD,,