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

sandwitches/admin.py

@@ -84,7 +84,15 @@ class RatingAdmin(ImportExportModelAdmin):
 @admin.register(Order)
 class OrderAdmin(ImportExportModelAdmin):
     resource_classes = [OrderResource]
-    list_display = ("id", "user", "recipe", "status", "total_price", "created_at")
-    list_filter = ("status", "created_at")
+    list_display = (
+        "id",
+        "user",
+        "recipe",
+        "status",
+        "completed",
+        "total_price",
+        "created_at",
+    )
+    list_filter = ("status", "completed", "created_at")
     search_fields = ("user__username", "recipe__title")
     readonly_fields = ("total_price", "created_at", "updated_at")

sandwitches/forms.py

@@ -86,6 +86,8 @@ class UserSignupForm(UserCreationForm, BaseUserFormMixin):
 
 
 class UserProfileForm(forms.ModelForm):
+    image_data = forms.CharField(widget=forms.HiddenInput(), required=False)
+
     class Meta:
         model = User
         fields = (
@@ -96,8 +98,25 @@ class UserProfileForm(forms.ModelForm):
             "bio",
         )
 
+    def save(self, commit=True):
+        user = super().save(commit=False)
+        image_data = self.cleaned_data.get("image_data")
+        if image_data and image_data.startswith("data:image"):
+            import base64
+            from django.core.files.base import ContentFile
+
+            format, imgstr = image_data.split(";base64,")
+            ext = format.split("/")[-1]
+            data = ContentFile(base64.b64decode(imgstr), name=f"avatar.{ext}")
+            user.avatar = data
+        if commit:
+            user.save()
+        return user
+
 
 class UserEditForm(forms.ModelForm):
+    image_data = forms.CharField(widget=forms.HiddenInput(), required=False)
+
     class Meta:
         model = User
         fields = (
@@ -112,6 +131,21 @@ class UserEditForm(forms.ModelForm):
             "bio",
         )
 
+    def save(self, commit=True):
+        user = super().save(commit=False)
+        image_data = self.cleaned_data.get("image_data")
+        if image_data and image_data.startswith("data:image"):
+            import base64
+            from django.core.files.base import ContentFile
+
+            format, imgstr = image_data.split(";base64,")
+            ext = format.split("/")[-1]
+            data = ContentFile(base64.b64decode(imgstr), name=f"avatar.{ext}")
+            user.avatar = data
+        if commit:
+            user.save()
+        return user
+
 
 class TagForm(forms.ModelForm):
     class Meta:
@@ -126,6 +160,7 @@ class RecipeForm(forms.ModelForm):
         widget=forms.TextInput(attrs={"placeholder": _("e.g. spicy, vegan, quick")}),
     )
     rotation = forms.IntegerField(widget=forms.HiddenInput(), initial=0, required=False)
+    image_data = forms.CharField(widget=forms.HiddenInput(), required=False)
 
     class Meta:
         model = Recipe
@@ -153,11 +188,22 @@ class RecipeForm(forms.ModelForm):
             )
 
     def save(self, commit=True):
-        recipe = super().save(commit=commit)
+        recipe = super().save(commit=False)
+
+        # Handle base64 image data from cropper
+        image_data = self.cleaned_data.get("image_data")
+        if image_data and image_data.startswith("data:image"):
+            import base64
+            from django.core.files.base import ContentFile
 
-        # Handle rotation if an image exists and rotation is requested
+            format, imgstr = image_data.split(";base64,")
+            ext = format.split("/")[-1]
+            data = ContentFile(base64.b64decode(imgstr), name=f"recipe_image.{ext}")
+            recipe.image = data
+
+        # Handle rotation if an image exists and rotation is requested (fallback for simple rotation)
         rotation = self.cleaned_data.get("rotation", 0)
-        if rotation != 0 and recipe.image:
+        if rotation != 0 and recipe.image and not image_data:
             try:
                 from PIL import Image as PILImage
 
@@ -169,9 +215,9 @@ class RecipeForm(forms.ModelForm):
                 print(f"Error rotating image: {e}")
 
         if commit:
+            recipe.save()
             recipe.set_tags_from_string(self.cleaned_data.get("tags_string", ""))
         else:
-            # We'll need to handle this in the view if commit=False
             self.save_m2m = lambda: recipe.set_tags_from_string(
                 self.cleaned_data.get("tags_string", "")
             )
@@ -184,6 +230,7 @@ class UserRecipeSubmissionForm(forms.ModelForm):
         label=_("Tags (comma separated)"),
         widget=forms.TextInput(attrs={"placeholder": _("e.g. spicy, vegan, quick")}),
     )
+    image_data = forms.CharField(widget=forms.HiddenInput(), required=False)
 
     class Meta:
         model = Recipe
@@ -201,8 +248,21 @@ class UserRecipeSubmissionForm(forms.ModelForm):
         }
 
     def save(self, commit=True):
-        recipe = super().save(commit=commit)
+        recipe = super().save(commit=False)
+
+        # Handle base64 image data from cropper
+        image_data = self.cleaned_data.get("image_data")
+        if image_data and image_data.startswith("data:image"):
+            import base64
+            from django.core.files.base import ContentFile
+
+            format, imgstr = image_data.split(";base64,")
+            ext = format.split("/")[-1]
+            data = ContentFile(base64.b64decode(imgstr), name=f"recipe_image.{ext}")
+            recipe.image = data
+
         if commit:
+            recipe.save()
             recipe.set_tags_from_string(self.cleaned_data.get("tags_string", ""))
         else:
             self.save_m2m = lambda: recipe.set_tags_from_string(

sandwitches/migrations/0015_order_completed_alter_order_status_and_more.py

@@ -0,0 +1,56 @@
+# Generated by Django 6.0.1 on 2026-01-27 08:33
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("sandwitches", "0014_ensure_groups_exist"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="order",
+            name="completed",
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AlterField(
+            model_name="order",
+            name="status",
+            field=models.CharField(
+                choices=[
+                    ("PENDING", "Pending"),
+                    ("PREPARING", "Preparing"),
+                    ("MADE", "Made"),
+                    ("SHIPPED", "Shipped"),
+                    ("COMPLETED", "Completed"),
+                    ("CANCELLED", "Cancelled"),
+                ],
+                default="PENDING",
+                max_length=20,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="setting",
+            name="email",
+            field=models.EmailField(
+                blank=True,
+                max_length=254,
+                null=True,
+                validators=[django.core.validators.EmailValidator()],
+            ),
+        ),
+        migrations.AlterField(
+            model_name="user",
+            name="email",
+            field=models.EmailField(
+                max_length=254, validators=[django.core.validators.EmailValidator()]
+            ),
+        ),
+        migrations.AlterField(
+            model_name="user",
+            name="username",
+            field=models.CharField(max_length=150, unique=True),
+        ),
+    ]

sandwitches/models.py

@@ -11,6 +11,7 @@ import logging
 from django.urls import reverse
 from solo.models import SingletonModel
 from django.core.exceptions import ValidationError
+from django.core.validators import EmailValidator
 
 from imagekit.models import ImageSpecField
 from imagekit.processors import ResizeToFill
@@ -21,7 +22,7 @@ hashed_storage = HashedFilenameStorage()
 class Setting(SingletonModel):
     site_name = models.CharField(max_length=255, default="Sandwitches")
     site_description = models.TextField(blank=True, null=True)
-    email = models.EmailField(blank=True, null=True)
+    email = models.EmailField(blank=True, null=True, validators=[EmailValidator()])
     ai_connection_point = models.URLField(blank=True, null=True)
     ai_model = models.CharField(max_length=255, blank=True, null=True)
     ai_api_key = models.CharField(max_length=255, blank=True, null=True)
@@ -34,6 +35,8 @@ class Setting(SingletonModel):
 
 
 class User(AbstractUser):
+    username = models.CharField(max_length=150, unique=True)
+    email = models.EmailField(validators=[EmailValidator()])
     avatar = models.ImageField(upload_to="avatars", blank=True, null=True)
     avatar_thumbnail = ImageSpecField(
         source="avatar",
@@ -230,6 +233,9 @@ class Rating(models.Model):
 class Order(models.Model):
     STATUS_CHOICES = (
         ("PENDING", "Pending"),
+        ("PREPARING", "Preparing"),
+        ("MADE", "Made"),
+        ("SHIPPED", "Shipped"),
         ("COMPLETED", "Completed"),
         ("CANCELLED", "Cancelled"),
     )
@@ -239,6 +245,7 @@ class Order(models.Model):
     )
     recipe = models.ForeignKey(Recipe, related_name="orders", on_delete=models.CASCADE)
     status = models.CharField(max_length=20, choices=STATUS_CHOICES, default="PENDING")
+    completed = models.BooleanField(default=False)
     total_price = models.DecimalField(max_digits=6, decimal_places=2)
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)

sandwitches/templates/admin/partials/order_rows.html

@@ -15,7 +15,7 @@
     <td>{{ order.recipe.title }}</td>
     <td>{{ order.total_price }} €</td>
     <td>
-        <span class="chip {% if order.status == 'PENDING' %}surface-variant{% elif order.status == 'COMPLETED' %}primary{% else %}error{% endif %}">
+        <span class="chip {% if order.status == 'PENDING' %}surface-variant{% elif order.status == 'COMPLETED' %}primary{% elif order.status == 'CANCELLED' %}error{% else %}secondary{% endif %}">
             {{ order.get_status_display }}
         </span>
     </td>

sandwitches/templates/admin/recipe_form.html

@@ -31,6 +31,14 @@
     .form-section {
         margin-bottom: 2rem;
     }
+    /* Cropper styles */
+    .cropper-container {
+        max-height: 70vh;
+    }
+    #cropper-image {
+        display: block;
+        max-width: 100%;
+    }
 </style>
 {% endblock %}
 
@@ -38,6 +46,7 @@
 <form method="post" enctype="multipart/form-data" id="recipe-form">
     {% csrf_token %}
     {{ form.rotation }}
+    {{ form.image_data }}
     <div class="grid">
         <!-- Top Section: Title, Tags, and Image -->
         <div class="s12 m8">
@@ -107,25 +116,21 @@
 
                 <div class="relative mb-1" style="overflow: hidden; min-height: 200px; display: flex; align-items: center; justify-content: center;">
                     {% if recipe.image %}
-                    <img src="{{ recipe.image_medium.url }}?v={% now "U" %}" class="responsive round" id="image-preview" style="max-height: 300px; width: 100%; object-fit: contain; transition: transform 0.3s ease;">
+                    <img src="{{ recipe.image_medium.url }}?v={% now "U" %}" class="responsive round" id="image-preview" style="max-height: 300px; width: 100%; object-fit: contain;">
                     {% else %}
+                    <img src="" class="responsive round" id="image-preview" style="max-height: 300px; width: 100%; object-fit: contain; display: none;">
                     <div class="medium-height middle-align center-align gray1 round" id="image-placeholder" style="width: 100%;">
                         <i class="extra">image</i>
                     </div>
                     {% endif %}
                 </div>
 
-                {% if recipe.image %}
-                <div class="row no-space border round mb-1">
-                    <button type="button" class="button transparent max" onclick="rotatePreview(-90)" title="{% trans 'Rotate 90° CCW' %}">
-                        <i>rotate_left</i>
-                    </button>
-                    <div class="divider vertical"></div>
-                    <button type="button" class="button transparent max" onclick="rotatePreview(90)" title="{% trans 'Rotate 90° CW' %}">
-                        <i>rotate_right</i>
+                <div id="image-tools" class="row no-space border round mb-1" style="{% if not recipe.image %}display: none;{% endif %}">
+                    <button type="button" class="button transparent max" onclick="openCropper()" title="{% trans 'Edit Image' %}">
+                        <i>crop_rotate</i>
+                        <span>{% trans "Edit" %}</span>
                     </button>
                 </div>
-                {% endif %}
 
                 <div class="field file border round">
                     <input type="text" readonly>
@@ -174,21 +179,111 @@
         </button>
     </nav>
 </form>
+
+<dialog id="cropper-dialog" class="large">
+    <div class="padding">
+        <h5 class="bold mb-1">{% trans "Edit Image" %}</h5>
+        <div class="cropper-container mb-1">
+            <img id="cropper-image" src="">
+        </div>
+        <div class="row scroll no-space border round mb-1">
+            <button type="button" class="button transparent max" onclick="cropper.rotate(-90)" title="{% trans 'Rotate Left' %}">
+                <i>rotate_left</i>
+            </button>
+            <button type="button" class="button transparent max" onclick="cropper.rotate(90)" title="{% trans 'Rotate Right' %}">
+                <i>rotate_right</i>
+            </button>
+            <div class="divider vertical"></div>
+            <button type="button" class="button transparent max" onclick="cropper.scaleX(-cropper.getData().scaleX || -1)" title="{% trans 'Flip Horizontal' %}">
+                <i>flip</i>
+            </button>
+            <button type="button" class="button transparent max" onclick="cropper.scaleY(-cropper.getData().scaleY || -1)" title="{% trans 'Flip Vertical' %}">
+                <i>flip</i>
+            </button>
+            <div class="divider vertical"></div>
+            <button type="button" class="button transparent max" onclick="cropper.setAspectRatio(1)" title="{% trans '1:1' %}">1:1</button>
+            <button type="button" class="button transparent max" onclick="cropper.setAspectRatio(4/3)" title="{% trans '4:3' %}">4:3</button>
+            <button type="button" class="button transparent max" onclick="cropper.setAspectRatio(16/9)" title="{% trans '16:9' %}">16:9</button>
+            <button type="button" class="button transparent max" onclick="cropper.setAspectRatio(NaN)" title="{% trans 'Free' %}">
+                <i>crop_free</i>
+            </button>
+        </div>
+        <nav class="right-align">
+            <button type="button" class="button transparent" onclick="ui('#cropper-dialog')">{% trans "Cancel" %}</button>
+            <button type="button" class="button primary" onclick="applyCrop()">{% trans "Apply" %}</button>
+        </nav>
+    </div>
+</dialog>
 {% endblock %}
 
 {% block admin_scripts %}
 <script>
-    let currentRotation = 0;
-
-    function rotatePreview(angle) {
-        currentRotation = (currentRotation + angle) % 360;
-        const img = document.getElementById('image-preview');
-        if (img) {
-            img.style.transform = `rotate(${currentRotation}deg)`;
-            document.getElementsByName('rotation')[0].value = currentRotation;
+    let cropper;
+    const imagePreview = document.getElementById('image-preview');
+    const imagePlaceholder = document.getElementById('image-placeholder');
+    const imageTools = document.getElementById('image-tools');
+    const imageInput = document.getElementById('id_image');
+    const imageDataInput = document.getElementById('id_image_data');
+    const cropperImage = document.getElementById('cropper-image');
+
+    function openCropper() {
+        if (!imagePreview.src || imagePreview.src === window.location.href) return;
+        cropperImage.src = imagePreview.src;
+        ui('#cropper-dialog');
+
+        if (cropper) {
+            cropper.destroy();
         }
+
+        setTimeout(() => {
+            cropper = new Cropper(cropperImage, {
+                viewMode: 1,
+                autoCropArea: 1,
+                responsive: true,
+                restore: false,
+                checkCrossOrigin: true,
+                guides: true,
+                center: true,
+                highlight: false,
+                cropBoxMovable: true,
+                cropBoxResizable: true,
+                toggleDragModeOnDblclick: false,
+            });
+        }, 100);
     }
 
+    function applyCrop() {
+        const canvas = cropper.getCroppedCanvas({
+            maxWidth: 2000,
+            maxHeight: 2000,
+        });
+
+        const croppedData = canvas.toDataURL('image/jpeg', 0.9);
+        imagePreview.src = croppedData;
+        imagePreview.style.display = 'block';
+        if (imagePlaceholder) imagePlaceholder.style.display = 'none';
+        imageTools.style.display = 'flex';
+        imageDataInput.value = croppedData;
+
+        ui('#cropper-dialog');
+    }
+
+    imageInput.addEventListener('change', function(e) {
+        const files = e.target.files;
+        if (files && files.length > 0) {
+            const reader = new FileReader();
+            reader.onload = function(event) {
+                imagePreview.src = event.target.result;
+                imagePreview.style.display = 'block';
+                if (imagePlaceholder) imagePlaceholder.style.display = 'none';
+                imageTools.style.display = 'flex';
+                // Automatically open cropper for new images
+                openCropper();
+            };
+            reader.readAsDataURL(files[0]);
+        }
+    });
+
     document.addEventListener('DOMContentLoaded', function() {
         const fields = ['id_description', 'id_ingredients', 'id_instructions'];
         fields.forEach(id => {

sandwitches/templates/community.html

@@ -4,6 +4,15 @@
 {% block title %}{% trans "Community" %}{% endblock %}
 
 {% block content %}
+<style>
+    .cropper-container {
+        max-height: 70vh;
+    }
+    #cropper-image {
+        display: block;
+        max-width: 100%;
+    }
+</style>
 <main class="responsive">
 <div class="large-space"></div>
 <article class="round s12 m10 l8 offset-m1 offset-l2 elevate">
@@ -15,6 +24,7 @@
 
         <form method="post" enctype="multipart/form-data">
             {% csrf_token %}
+            {{ form.image_data }}
 
             <div class="grid">
                 <div class="s12">
@@ -53,15 +63,21 @@
 
                 <!-- Image Upload with Preview -->
                 <div class="s12 m6">
-                     <div class="field label border round">
+                     <div class="field file label border round">
+                        <input type="text" readonly>
                         {{ form.image }}
                         <label>{% trans "Image" %}</label>
+                        <i>publish</i>
                     </div>
                 </div>
                 <div class="s12 m6 center-align relative">
-                    <div class="padding border round dashed surface-variant" style="min-height: 150px; display: flex; align-items: center; justify-content: center;">
-                         <img id="image-preview" src="{% if recipe.image %}{{ recipe.image.url }}{% endif %}" class="responsive round" style="max-height: 200px; {% if not recipe.image %}display:none;{% endif %}">
+                    <div class="padding border round dashed surface-variant" style="min-height: 150px; display: flex; align-items: center; justify-content: center; flex-direction: column;">
+                         <img id="image-preview" src="{% if recipe.image %}{{ recipe.image.url }}{% endif %}" class="responsive round mb-1" style="max-height: 200px; {% if not recipe.image %}display:none;{% endif %}">
                          <span id="image-placeholder" class="gray-text" {% if recipe.image %}style="display:none;"{% endif %}>{% trans "Image Preview" %}</span>
+                         <button type="button" id="edit-image-btn" class="button transparent border round" style="display: none;" onclick="openCropper()">
+                            <i>crop_rotate</i>
+                            <span>{% trans "Edit Image" %}</span>
+                         </button>
                     </div>
                 </div>
 
@@ -101,6 +117,41 @@
     </div>
 </article>
 
+<dialog id="cropper-dialog" class="large">
+    <div class="padding">
+        <h5 class="bold mb-1">{% trans "Edit Image" %}</h5>
+        <div class="cropper-container mb-1">
+            <img id="cropper-image" src="">
+        </div>
+        <div class="row scroll no-space border round mb-1">
+            <button type="button" class="button transparent max" onclick="cropper.rotate(-90)" title="{% trans 'Rotate Left' %}">
+                <i>rotate_left</i>
+            </button>
+            <button type="button" class="button transparent max" onclick="cropper.rotate(90)" title="{% trans 'Rotate Right' %}">
+                <i>rotate_right</i>
+            </button>
+            <div class="divider vertical"></div>
+            <button type="button" class="button transparent max" onclick="cropper.scaleX(-cropper.getData().scaleX || -1)" title="{% trans 'Flip Horizontal' %}">
+                <i>flip</i>
+            </button>
+            <button type="button" class="button transparent max" onclick="cropper.scaleY(-cropper.getData().scaleY || -1)" title="{% trans 'Flip Vertical' %}">
+                <i>flip</i>
+            </button>
+            <div class="divider vertical"></div>
+            <button type="button" class="button transparent max" onclick="cropper.setAspectRatio(1)" title="{% trans '1:1' %}">1:1</button>
+            <button type="button" class="button transparent max" onclick="cropper.setAspectRatio(4/3)" title="{% trans '4:3' %}">4:3</button>
+            <button type="button" class="button transparent max" onclick="cropper.setAspectRatio(16/9)" title="{% trans '16:9' %}">16:9</button>
+            <button type="button" class="button transparent max" onclick="cropper.setAspectRatio(NaN)" title="{% trans 'Free' %}">
+                <i>crop_free</i>
+            </button>
+        </div>
+        <nav class="right-align">
+            <button type="button" class="button transparent" onclick="ui('#cropper-dialog')">{% trans "Cancel" %}</button>
+            <button type="button" class="button primary" onclick="applyCrop()">{% trans "Apply" %}</button>
+        </nav>
+    </div>
+</dialog>
+
 
 <div class="large-space"></div>
 
@@ -117,21 +168,67 @@
 
 {% block page_scripts %}
 <script>
-    // Image Preview Logic
-    var imageInput = document.querySelector('input[type="file"]');
+    let cropper;
+    const imageInput = document.querySelector('input[type="file"]');
+    const imagePreview = document.getElementById('image-preview');
+    const imagePlaceholder = document.getElementById('image-placeholder');
+    const editImageBtn = document.getElementById('edit-image-btn');
+    const imageDataInput = document.getElementsByName('image_data')[0];
+    const cropperImage = document.getElementById('cropper-image');
+
+    function openCropper() {
+        if (!imagePreview.src || imagePreview.src === window.location.href) return;
+        cropperImage.src = imagePreview.src;
+        ui('#cropper-dialog');
+
+        if (cropper) {
+            cropper.destroy();
+        }
+
+        setTimeout(() => {
+            cropper = new Cropper(cropperImage, {
+                viewMode: 1,
+                autoCropArea: 1,
+                responsive: true,
+                restore: false,
+                checkCrossOrigin: true,
+                guides: true,
+                center: true,
+                highlight: false,
+                cropBoxMovable: true,
+                cropBoxResizable: true,
+                toggleDragModeOnDblclick: false,
+            });
+        }, 100);
+    }
+
+    function applyCrop() {
+        const canvas = cropper.getCroppedCanvas({
+            maxWidth: 2000,
+            maxHeight: 2000,
+        });
+
+        const croppedData = canvas.toDataURL('image/jpeg', 0.9);
+        imagePreview.src = croppedData;
+        imagePreview.style.display = 'block';
+        if (imagePlaceholder) imagePlaceholder.style.display = 'none';
+        if (editImageBtn) editImageBtn.style.display = 'inline-flex';
+        imageDataInput.value = croppedData;
+
+        ui('#cropper-dialog');
+    }
+
     if (imageInput) {
         imageInput.onchange = function (evt) {
-            var tgt = evt.target || window.event.srcElement,
-                files = tgt.files;
-
+            const files = evt.target.files;
             if (FileReader && files && files.length) {
-                var fr = new FileReader();
+                const fr = new FileReader();
                 fr.onload = function () {
-                    var preview = document.getElementById('image-preview');
-                    var placeholder = document.getElementById('image-placeholder');
-                    preview.src = fr.result;
-                    preview.style.display = 'block';
-                    if(placeholder) placeholder.style.display = 'none';
+                    imagePreview.src = fr.result;
+                    imagePreview.style.display = 'block';
+                    if (imagePlaceholder) imagePlaceholder.style.display = 'none';
+                    if (editImageBtn) editImageBtn.style.display = 'inline-flex';
+                    openCropper();
                 }
                 fr.readAsDataURL(files[0]);
             }

sandwitches/templates/order_detail.html

@@ -0,0 +1,68 @@
+{% extends "base_beer.html" %}
+{% load static i18n %}
+
+{% block title %}{% trans "Order Details" %} #{{ order.id }}{% endblock %}
+
+{% block content %}
+<div class="large-space"></div>
+
+<div class="grid">
+  <div class="s12 m10 l8 xl6 middle-align center-align" style="margin: 0 auto;">
+    <article class="round elevate left-align">
+      <div class="padding">
+          <nav>
+              <a href="{% url 'user_profile' %}" class="button transparent circle">
+                  <i>arrow_back</i>
+              </a>
+              <h5 class="max">{% trans "Order" %} #{{ order.id }}</h5>
+              <span class="chip {% if order.status == 'PENDING' %}surface-variant{% elif order.status == 'COMPLETED' %}primary{% elif order.status == 'CANCELLED' %}error{% else %}secondary{% endif %}">
+                  {{ order.get_status_display }}
+              </span>
+          </nav>
+          <div class="divider"></div>
+
+          <div class="grid">
+              <div class="s12 m6">
+                  <p class="small-text">{% trans "Date Ordered" %}</p>
+                  <p>{{ order.created_at|date:"d F Y, H:i" }}</p>
+              </div>
+              <div class="s12 m6">
+                   <p class="small-text">{% trans "Last Update" %}</p>
+                   <p>{{ order.updated_at|date:"d F Y, H:i" }}</p>
+              </div>
+          </div>
+
+          <div class="divider"></div>
+
+          <h6>{% trans "Item Details" %}</h6>
+          <div class="row">
+              <div class="max">
+                  <a href="{% url 'recipe_detail' order.recipe.slug %}" class="bold primary-text">{{ order.recipe.title }}</a>
+                  <p class="small-text">{{ order.recipe.description|truncatewords:20 }}</p>
+              </div>
+              <div class="min">
+                  <span class="bold">{{ order.total_price }} €</span>
+              </div>
+          </div>
+
+          {% if order.recipe.image %}
+          <div class="space"></div>
+          <img src="{{ order.recipe.image.url }}" class="responsive round border" alt="{{ order.recipe.title }}">
+          {% endif %}
+
+          <div class="divider"></div>
+
+          <div class="row">
+              <div class="max text-right">
+                  <span class="bold">{% trans "Total" %}</span>
+              </div>
+               <div class="min">
+                  <span class="bold text-primary">{{ order.total_price }} €</span>
+              </div>
+          </div>
+
+      </div>
+    </article>
+  </div>
+</div>
+{% endblock %}

sandwitches/templates/profile.html

@@ -90,6 +90,96 @@
 
       </form>
     </article>
+
+    <div class="large-space"></div>
+
+    <h4 class="center-align primary-text">{% trans "Order History" %}</h4>
+
+    <form method="get" class="row no-wrap middle-align">
+        <div class="field label border round small">
+            <select name="status" onchange="this.form.submit()">
+                <option value="">{% trans "All Statuses" %}</option>
+                {% for code, label in status_choices %}
+                <option value="{{ code }}" {% if current_status == code %}selected{% endif %}>{{ label }}</option>
+                {% endfor %}
+            </select>
+            <label>{% trans "Filter by Status" %}</label>
+        </div>
+        <div class="space"></div>
+        <div class="field label border round small">
+             <select name="sort" onchange="this.form.submit()">
+                <option value="date_desc" {% if current_sort == 'date_desc' %}selected{% endif %}>{% trans "Newest First" %}</option>
+                <option value="date_asc" {% if current_sort == 'date_asc' %}selected{% endif %}>{% trans "Oldest First" %}</option>
+                <option value="price_desc" {% if current_sort == 'price_desc' %}selected{% endif %}>{% trans "Price: High to Low" %}</option>
+                <option value="price_asc" {% if current_sort == 'price_asc' %}selected{% endif %}>{% trans "Price: Low to High" %}</option>
+            </select>
+            <label>{% trans "Sort by" %}</label>
+        </div>
+    </form>
+
+    {% if orders %}
+    <div class="padding border round surface left-align">
+        <table class="border striped">
+            <thead>
+                <tr>
+                    <th class="min">#</th>
+                    <th class="max">{% trans "Recipe" %}</th>
+                    <th class="min">{% trans "Date" %}</th>
+                    <th class="min">{% trans "Status" %}</th>
+                    <th class="min">{% trans "Price" %}</th>
+                    <th class="min"></th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for order in orders %}
+                <tr>
+                    <td>{{ order.id }}</td>
+                    <td>
+                        <a href="{% url 'recipe_detail' order.recipe.slug %}">{{ order.recipe.title }}</a>
+                    </td>
+                    <td class="no-wrap">{{ order.created_at|date:"d/m/Y" }}</td>
+                    <td>
+                        <span class="chip tiny {% if order.status == 'PENDING' %}surface-variant{% elif order.status == 'COMPLETED' %}primary{% elif order.status == 'CANCELLED' %}error{% else %}secondary{% endif %}">
+                            {{ order.get_status_display }}
+                        </span>
+                    </td>
+                    <td class="no-wrap">{{ order.total_price }} €</td>
+                    <td>
+                        <a href="{% url 'user_order_detail' order.id %}" class="button circle transparent small">
+                            <i>visibility</i>
+                        </a>
+                    </td>
+                </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    </div>
+
+    {% if orders.paginator.num_pages > 1 %}
+    <div class="center-align padding">
+        <nav class="row">
+            {% if orders.has_previous %}
+                <a href="?page={{ orders.previous_page_number }}{% if current_status %}&status={{ current_status }}{% endif %}{% if current_sort %}&sort={{ current_sort }}{% endif %}" class="button transparent circle"><i>chevron_left</i></a>
+            {% else %}
+                <button class="button transparent circle" disabled><i>chevron_left</i></button>
+            {% endif %}
+
+            <span class="padding">{{ orders.number }} / {{ orders.paginator.num_pages }}</span>
+
+            {% if orders.has_next %}
+                 <a href="?page={{ orders.next_page_number }}{% if current_status %}&status={{ current_status }}{% endif %}{% if current_sort %}&sort={{ current_sort }}{% endif %}" class="button transparent circle"><i>chevron_right</i></a>
+            {% else %}
+                <button class="button transparent circle" disabled><i>chevron_right</i></button>
+            {% endif %}
+        </nav>
+    </div>
+    {% endif %}
+
+    {% else %}
+    <div class="padding border round surface">
+        <p class="center-align">{% trans "No previous orders found." %}</p>
+    </div>
+    {% endif %}
   </div>
 </div>
 {% endblock %}

sandwitches/urls.py

@@ -34,6 +34,7 @@ urlpatterns = [
     path("login/", views.CustomLoginView.as_view(), name="login"),
     path("logout/", LogoutView.as_view(next_page="index"), name="logout"),
     path("profile/", views.user_profile, name="user_profile"),
+    path("orders/<int:pk>/", views.user_order_detail, name="user_order_detail"),
     path("community/", views.community, name="community"),
     path("admin/", admin.site.urls),
     path("api/", api.urls),

sandwitches/views.py

@@ -28,6 +28,7 @@ from PIL import Image
 from django.db.models import Q, Avg
 from django_tasks.backends.database.models import DBTaskResult
 from django.contrib.auth.views import LoginView
+from django.core.paginator import Paginator
 
 
 from sandwitches import __version__ as sandwitches_version
@@ -858,8 +859,52 @@ def user_profile(request):
             return redirect("user_profile")
     else:
         form = UserProfileForm(instance=request.user)
+
+    orders = request.user.orders.select_related("recipe").all()
+
+    # Filtering
+    status_filter = request.GET.get("status")
+    if status_filter:
+        orders = orders.filter(status=status_filter)
+
+    # Sorting
+    sort_param = request.GET.get("sort", "-created_at")
+    allowed_sorts = {
+        "date_asc": "created_at",
+        "date_desc": "-created_at",
+        "price_asc": "total_price",
+        "price_desc": "-total_price",
+        "status": "status",
+    }
+    order_by = allowed_sorts.get(sort_param, "-created_at")
+    orders = orders.order_by(order_by)
+
+    # Pagination
+    paginator = Paginator(orders, 5)  # Show 5 orders per page
+    page_number = request.GET.get("page")
+    page_obj = paginator.get_page(page_number)
+
     return render(
-        request, "profile.html", {"form": form, "version": sandwitches_version}
+        request,
+        "profile.html",
+        {
+            "form": form,
+            "version": sandwitches_version,
+            "orders": page_obj,
+            "current_status": status_filter,
+            "current_sort": sort_param,
+            "status_choices": Order.STATUS_CHOICES,
+        },
+    )
+
+
+@login_required
+def user_order_detail(request, pk):
+    order = get_object_or_404(Order, pk=pk, user=request.user)
+    return render(
+        request,
+        "order_detail.html",
+        {"order": order, "version": sandwitches_version},
     )
 
 

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

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

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

@@ -1,9 +1,9 @@
 sandwitches/__init__.py,sha256=YTDsQDSdJmxV2Z0dTbBqZhuJRuXcNLSKL0SX73Lu2u8,195
-sandwitches/admin.py,sha256=-02WqE8U3rxrVCoNB7sfvtyE4v_e3pt7mFwXfUlindo,2421
+sandwitches/admin.py,sha256=-4QA5InEvLHyb6VFAGKapWbJO9mXdiV4GeQcGsM4xlI,2510
 sandwitches/api.py,sha256=ruD5QeOPY-l9PvkJQiaOYoI0sRARDpqpFrFDgBxo9cQ,6389
 sandwitches/asgi.py,sha256=cygnXdXSSVspM7ZXuj47Ef6oz7HSTw4D7BPzgE2PU5w,399
 sandwitches/feeds.py,sha256=iz1d11dV0utA0ZNsB7VIAp0h8Zr5mFNSKJWHbw_j6YM,683
-sandwitches/forms.py,sha256=YvkSTa9h_ag_b58ToOHCQIHBa3VeHMC9RKB9F7qI-gk,7152
+sandwitches/forms.py,sha256=VoQ81COBCgwuS161dhF8IVeeAp8dLiQakzs56SV6-T8,9541
 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
@@ -23,8 +23,9 @@ sandwitches/migrations/0011_alter_historicalrecipe_is_community_made_and_more.py
 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/0015_order_completed_alter_order_status_and_more.py,sha256=PTXQZUE8RqTAK8l0vkZhiGKv2T0PDiWEue7f6qz3AQ0,1670
 sandwitches/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sandwitches/models.py,sha256=ptEdQP4oOvyjdhYQlTtnZD-3eIUAY-8nU17G-hmN_2I,10796
+sandwitches/models.py,sha256=kU71fC9Lf6Ij_8vpN0nB0OUKWpzWxi9WxqIYEzP4Ogg,11144
 sandwitches/settings.py,sha256=5_eQAJCAV093hnhr3XOxHekT4IF-PEJcRiTecq71_SQ,5841
 sandwitches/storage.py,sha256=ibBG6tVtArqzgEKsRimZPwsqW7i9j4WiPLLHrOJchow,3578
 sandwitches/tasks.py,sha256=YiliAT2rj0fh7hrwKq5_qWtv9AGhd5iulj_iBwZBBKg,6024
@@ -33,10 +34,10 @@ sandwitches/templates/admin/confirm_delete.html,sha256=HfsZI_gV8JQTKz215TYgPWBrg
 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/partials/order_rows.html,sha256=C7_ArHw1udaGjx6CRJHhksje0OReP7UUhdsHcdFPqCc,940
 sandwitches/templates/admin/rating_list.html,sha256=8CHAsBfKfs4izhb-IyOiDjJXqAZxFcStoRSGh4pRlgM,1365
 sandwitches/templates/admin/recipe_approval_list.html,sha256=M6GFYI45lAkLkvqP44cu5tDYVOeeVNklEphof1euesM,2281
-sandwitches/templates/admin/recipe_form.html,sha256=23wHT4hs128xnv2nkS6AtcKzY3sblia_dGVNnaeIp5Y,8734
+sandwitches/templates/admin/recipe_form.html,sha256=wVKKBFl3vN11aknnmv2Hxkj66zZk9iZ0x_iS1j_X_Ro,12884
 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
@@ -47,7 +48,7 @@ sandwitches/templates/admin/user_list.html,sha256=6O1YctULY-tqJnagybJof9ERA_NL1L
 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/community.html,sha256=-YhpPtLbrVK9mc2Go1XBInLK-7OXrtb7kKukjl7rGbg,9607
 sandwitches/templates/components/carousel_scripts.html,sha256=9vEL5JJv8zUUjEtsnHW-BwwXUNWqQ6w_vf6UdxgEv_I,1934
 sandwitches/templates/components/favorites_search_form.html,sha256=tpD8SpS47TUDJBwxhMuvjhTN9pjWoRGFW50TBv48Ld4,5202
 sandwitches/templates/components/footer.html,sha256=Qk-myRtXS6-1b3fMowVGnSuFb_UkUgX6BYX9zgh_SV8,486
@@ -66,17 +67,18 @@ 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/order_detail.html,sha256=D6MjUVibQuED2VRNHSjKVnLHcLgFtLvcVmuwlzfoJzo,2498
 sandwitches/templates/partials/recipe_list.html,sha256=LUHKFKG90D72K9X2X3d1osvj2jX1QU_MbPe0lNwRSII,4555
-sandwitches/templates/profile.html,sha256=PQTL6_xn0pGUxqEOYuz5j0pmqAyG0Wr3KvyFBO8_k1s,4156
+sandwitches/templates/profile.html,sha256=m3-31b_z5QhHLgol-QwHrb3MM9B9kk5kybL3B1nWC5Y,8539
 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=1GyqdrWsCIbKN8wsT4eeE98blx-bBHc6tJgvXzta2nc,4859
+sandwitches/urls.py,sha256=TysY6JhOV2kGC-9KloZjLDfk4TUZS6xX95A_RfG971g,4940
 sandwitches/utils.py,sha256=SJP-TkeRZ0OIfaMigYrOSbxRqYXswoqoWhwll3nFuAM,7245
-sandwitches/views.py,sha256=WF17_nRo6wDdC8oVjGBcPHGRtoi_Ji7x8W9HdcjAyQA,30890
+sandwitches/views.py,sha256=pDDDXaojPstj5E_k5gBQmW901Lol0R3gUl3qWGwUmI0,32145
 sandwitches/wsgi.py,sha256=Eyncpnahq_4s3Lr9ruB-R3Lu9j9zBXqgPbUj7qhIbwU,399
-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,,
+sandwitches-2.4.1.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+sandwitches-2.4.1.dist-info/METADATA,sha256=97JvkhJ7rzJpQIfULxJ-0yz3rN1EfGZkhB-zpihx4wg,3111
+sandwitches-2.4.1.dist-info/RECORD,,