import - sync_livestock/herd_rancher_sync/purchase_policy & service_area in organization

This commit is contained in:
2025-12-30 11:54:09 +03:30
parent fe68b2db78
commit b94484eaaf
11 changed files with 982 additions and 29 deletions

View File

@@ -4,7 +4,7 @@ from datetime import timedelta
from django.db import transaction
from django.utils.timezone import now
from rest_framework import status
from rest_framework import status, filters
from rest_framework import viewsets
from rest_framework.decorators import action
from rest_framework.exceptions import APIException
@@ -70,7 +70,7 @@ class ProviderCompanyViewSet(SoftDeleteMixin, viewsets.ModelViewSet): # noqa
class DeviceViewSet(BaseViewSet, SoftDeleteMixin, viewsets.ModelViewSet, AdminFilterMixin):
queryset = pos_models.Device.objects.all()
serializer_class = device_serializer.DeviceSerializer
# filter_backends = [filters.SearchFilter]
filter_backends = [filters.SearchFilter]
search_fields = [
'device_identity',
'acceptor',
@@ -176,7 +176,7 @@ class DeviceViewSet(BaseViewSet, SoftDeleteMixin, viewsets.ModelViewSet, AdminFi
def devices_by_psp(self, request, pk=None):
""" list of devices by their psp """
devices = self.queryset.filter(organization__id=pk).order_by('-create_date')
devices = self.filter_queryset(self.queryset.filter(organization__id=pk).order_by('-create_date'))
# paginate devices
page = self.paginate_queryset(devices)