diff --git a/core/apps/orders/serializers/offer.py b/core/apps/orders/serializers/offer.py index efbefd8..81c5d66 100644 --- a/core/apps/orders/serializers/offer.py +++ b/core/apps/orders/serializers/offer.py @@ -4,6 +4,7 @@ from rest_framework import serializers from core.apps.orders.models import Offer, Order from core.apps.counterparty.models import Counterparty +from core.apps.orders.serializers.order import OrderListSerializer class OfferCreateSerializer(serializers.Serializer): @@ -54,11 +55,12 @@ class MultipleOfferCreateSerializer(serializers.Serializer): class OfferListSerializer(serializers.ModelSerializer): counterparty = serializers.SerializerMethodField(method_name='get_counterparty') + order = OrderListSerializer() class Meta: model = Offer fields = [ - 'id', 'counterparty', 'price', 'number', 'phone', 'comment', 'qqs', 'price_type' + 'id', 'counterparty', 'price', 'number', 'phone', 'comment', 'qqs', 'price_type', 'order' ] def get_counterparty(self, obj): diff --git a/core/apps/orders/views/offer.py b/core/apps/orders/views/offer.py index d911443..15dc65f 100644 --- a/core/apps/orders/views/offer.py +++ b/core/apps/orders/views/offer.py @@ -30,7 +30,7 @@ class OffersCreateApiView(generics.GenericAPIView): class OfferListApiView(generics.GenericAPIView): permission_classes = [HasRolePermission] - queryset = Offer.objects.all() + queryset = Offer.objects.select_related('order') required_permissions = ['offer'] serializer_class = serializers.OfferListSerializer