{% endblock %}
+
+{% block extra_js %}
+
+{% endblock %}
diff --git a/myproject/orders/templatetags/__init__.py b/myproject/orders/templatetags/__init__.py
new file mode 100644
index 0000000..431ce7f
--- /dev/null
+++ b/myproject/orders/templatetags/__init__.py
@@ -0,0 +1 @@
+# Инициализация пакета templatetags
diff --git a/myproject/orders/templatetags/filter_tags.py b/myproject/orders/templatetags/filter_tags.py
new file mode 100644
index 0000000..c92e0f6
--- /dev/null
+++ b/myproject/orders/templatetags/filter_tags.py
@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+"""
+Кастомные templatetags для работы с фильтрами django-filter
+"""
+
+from django import template
+from django.utils.http import urlencode
+
+register = template.Library()
+
+
+@register.simple_tag(takes_context=True)
+def param_replace(context, **kwargs):
+ """
+ Заменяет или добавляет GET-параметры, сохраняя существующие
+
+ Использование в шаблоне:
+ {% load filter_tags %}
+
Страница 2
+
+ Это сохранит все текущие фильтры и заменит только параметр page
+ """
+ query = context['request'].GET.copy()
+
+ for key, value in kwargs.items():
+ if value is not None:
+ query[key] = value
+ elif key in query:
+ query.pop(key)
+
+ return query.urlencode()
+
+
+@register.simple_tag(takes_context=True)
+def get_filter_url(context, **kwargs):
+ """
+ Генерирует полный URL с параметрами фильтров
+
+ Использование:
+ {% get_filter_url status='confirmed' page=1 %}
+ """
+ return '?' + param_replace(context, **kwargs)
+
+
+@register.filter
+def get_verbose_name(instance, field_name):
+ """
+ Получить verbose_name поля модели
+
+ Использование:
+ {{ order|get_verbose_name:'status' }}
+ """
+ return instance._meta.get_field(field_name).verbose_name
diff --git a/myproject/orders/views.py b/myproject/orders/views.py
index c636660..bb95f5f 100644
--- a/myproject/orders/views.py
+++ b/myproject/orders/views.py
@@ -2,50 +2,35 @@
from django.shortcuts import render, redirect, get_object_or_404
from django.contrib import messages
from django.core.paginator import Paginator
-from django.db.models import Q
from .models import Order, OrderItem
from .forms import OrderForm, OrderItemFormSet
+from .filters import OrderFilter
def order_list(request):
- """Список всех заказов с фильтрацией и поиском"""
- orders = Order.objects.select_related('customer', 'delivery_address', 'pickup_shop').all()
+ """
+ Список всех заказов с фильтрацией и поиском
+ Использует django-filter для фильтрации данных
+ """
+ # Базовый queryset с оптимизацией запросов
+ orders = Order.objects.select_related(
+ 'customer', 'delivery_address', 'pickup_shop'
+ ).all()
- # Поиск
- search_query = request.GET.get('search', '')
- if search_query:
- orders = orders.filter(
- Q(order_number__icontains=search_query) |
- Q(customer__name__icontains=search_query) |
- Q(customer__phone__icontains=search_query) |
- Q(customer__email__icontains=search_query)
- )
-
- # Фильтр по статусу
- status_filter = request.GET.get('status', '')
- if status_filter:
- orders = orders.filter(status=status_filter)
-
- # Фильтр по типу доставки
- delivery_filter = request.GET.get('delivery_type', '')
- if delivery_filter == 'delivery':
- orders = orders.filter(is_delivery=True)
- elif delivery_filter == 'pickup':
- orders = orders.filter(is_delivery=False)
+ # Применяем фильтры через django-filter
+ order_filter = OrderFilter(request.GET, queryset=orders)
# Сортировка
- orders = orders.order_by('-created_at')
+ filtered_orders = order_filter.qs.order_by('-created_at')
# Пагинация
- paginator = Paginator(orders, 25)
+ paginator = Paginator(filtered_orders, 25)
page_number = request.GET.get('page')
page_obj = paginator.get_page(page_number)
context = {
+ 'filter': order_filter,
'page_obj': page_obj,
- 'search_query': search_query,
- 'status_filter': status_filter,
- 'delivery_filter': delivery_filter,
'status_choices': Order.STATUS_CHOICES,
}
diff --git a/myproject/requirements.txt b/myproject/requirements.txt
index 1250552..5d23531 100644
--- a/myproject/requirements.txt
+++ b/myproject/requirements.txt
@@ -1,13 +1,16 @@
asgiref==3.9.0
Django==5.0.10
django-environ==0.12.0
+django-filter==24.3
django-nested-admin==4.1.5
django-phonenumber-field==8.3.0
+django-simple-history==3.10.1
django-tenants==3.7.0
phonenumbers==9.0.17
pillow==11.0.0
-psycopg2-binary>=2.9.6
+psycopg2-binary==2.9.11
python-monkey-business==1.1.0
sqlparse==0.5.3
+typing_extensions==4.15.0
tzdata==2025.2
Unidecode==1.4.0
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..b256ee7
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,11 @@
+Django==5.0.10
+django-tenants==3.7.0
+django-filter==24.3
+django-simple-history==3.10.1
+django-nested-admin==4.1.5
+django-phonenumber-field==8.3.0
+django-environ==0.12.0
+psycopg2-binary==2.9.11
+Pillow==11.0.0
+phonenumbers==9.0.17
+Unidecode==1.4.0