diff --git a/config/settings/environ.py b/config/settings/environ.py index d0bc024..877e6bd 100644 --- a/config/settings/environ.py +++ b/config/settings/environ.py @@ -49,4 +49,4 @@ REDSYS_TERMINAL = env.str("REDSYS_TERMINAL", "001") REDSYS_CURRENCY_CODE = env.str("REDSYS_CURRENCY_CODE", "978") REDSYS_TPV_DOMAIN = env.str("REDSYS_TPV_DOMAIN", "") -ITEMS_PER_PAGE = env.int("ITEMS_PER_PAGE", 10) +ITEMS_PER_PAGE = env.int("ITEMS_PER_PAGE", 20) diff --git a/requirements.txt b/requirements.txt index bc8af28..26042c9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ django-watchman==1.3.0 django-silk==5.1.0 django-storages==1.13.2 django-tailwind==3.8.0 -django-unfold==0.12.0 +django-unfold==0.42.0 djangorestframework==3.15.2 dj-database-url==1.0.0 djangorestframework-simplejwt==5.3.1 diff --git a/shop/filters.py b/shop/filters.py index c2c5564..5ab9c84 100644 --- a/shop/filters.py +++ b/shop/filters.py @@ -11,6 +11,7 @@ class ProductFilter(django_filters.FilterSet): ) tags = django_filters.BaseInFilter(field_name="tags", label=_("Etiquetas")) price_lt = django_filters.NumberFilter(method="filter_price_lt") + price_gt = django_filters.NumberFilter(method="filter_price_gt") o = OrderingFilter( fields=( ("name", "name"), @@ -26,6 +27,14 @@ class ProductFilter(django_filters.FilterSet): return queryset.filter(pk__in=product_ids) + def filter_price_gt(self, queryset, name, value): + ids = queryset.values("id") + product_ids = ProductPrice.objects.filter( + product_id__in=ids, current=True, price_with_tax__gte=value + ).values("product_id") + + return queryset.filter(pk__in=product_ids) + class Meta: model = Product fields = ( diff --git a/users/admin.py b/users/admin.py index 8c38f3f..ea353ee 100644 --- a/users/admin.py +++ b/users/admin.py @@ -1,3 +1,20 @@ from django.contrib import admin +from django.contrib.auth.admin import UserAdmin as BaseUserAdmin +from django.contrib.auth.admin import GroupAdmin as BaseGroupAdmin +from django.contrib.auth.models import User, Group -# Register your models here. +from unfold.admin import ModelAdmin + + +admin.site.unregister(User) +admin.site.unregister(Group) + + +@admin.register(User) +class UserAdmin(BaseUserAdmin, ModelAdmin): + pass + + +@admin.register(Group) +class GroupAdmin(BaseGroupAdmin, ModelAdmin): + pass