diff --git a/apps/pg/admin.py b/apps/pg/admin.py index 7188deb..a98a722 100644 --- a/apps/pg/admin.py +++ b/apps/pg/admin.py @@ -14,6 +14,7 @@ from django.urls import path from .constans import StateChoices from .forms import ApplicationGatewayPolicyForm from .models import PaymentRequest, PNA, Fake, ApplicationGatewayPolicy, SEP +from rangefilter.filters import DateTimeRangeFilter logger = logging.getLogger(__name__) @@ -74,7 +75,7 @@ class PaymentRequestAdmin(admin.ModelAdmin): list_display = ['state', 'check_success_again', 'uuid', 'splited_amount', 'user_id', 'jajali_datetime', 'is_registered', 'created_at', 'application', 'gateway'] search_fields = ['application__uuid', 'application__client_id', 'amount', 'user__uuid'] - list_filter = ['application', 'state', 'gateway'] + list_filter = ['application', 'state', 'gateway', ('created_at', DateTimeRangeFilter), ('updated_at', DateTimeRangeFilter)] actions = [export_exel, mark_as_registered] def changelist_view(self, request, extra_context=None): diff --git a/main/settings.py b/main/settings.py index ef8008e..b89efd6 100644 --- a/main/settings.py +++ b/main/settings.py @@ -49,6 +49,7 @@ INSTALLED_APPS = [ 'django_filters', 'jalali_date', 'django_admin_logs', + 'rangefilter', # local apps 'apps.core', @@ -63,7 +64,7 @@ MIDDLEWARE = [ 'corsheaders.middleware.CorsMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.locale.LocaleMiddleware', - 'utils.i18n.ForceAdminLanguageMiddleware', + # 'utils.i18n.ForceAdminLanguageMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'oauth2_provider.middleware.OAuth2TokenMiddleware', diff --git a/requirements.in b/requirements.in index c6a14d0..445b91e 100644 --- a/requirements.in +++ b/requirements.in @@ -19,4 +19,5 @@ httpx django-redis xlsxwriter xlrd -django_admin_logs \ No newline at end of file +django_admin_logs +django-admin-rangefilter \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 65e6719..62c3012 100644 --- a/requirements.txt +++ b/requirements.txt @@ -182,6 +182,7 @@ zope-event==5.0 # via gevent zope-interface==7.2 # via gevent +django-admin-rangefilter==0.13.5 # The following packages are considered to be unsafe in a requirements file: # setuptools