diff --git a/devices/serializers.py b/devices/serializers.py index 8ae13ef..80ce6ff 100644 --- a/devices/serializers.py +++ b/devices/serializers.py @@ -2,6 +2,7 @@ from rest_framework import serializers from .models import Device from api.serializers import CustomReadOnlyUserSerializer from billing.models import Payment # Import the Payment model +from django.utils import timezone class CreateDeviceSerializer(serializers.ModelSerializer): @@ -48,7 +49,13 @@ class DeviceSerializer(serializers.ModelSerializer): def get_pending_payment_id(self, obj): # Query the last unpaid payment for the device unpaid_payment = ( - Payment.objects.filter(devices=obj, paid=False) + Payment.objects.filter( + devices=obj, + paid=False, + status="PENDING", + expires_at__gt=timezone.now(), + expires_at__isnull=True, + ) .order_by("-created_at") .first() )