Merge branch 'hotfix/LIL-708' into 'master'

LIL-708 Ошибка с подарочными сертификатами в админке

See merge request lilcity/backend!215
remotes/origin/feature/LIL-711
cfwme 7 years ago
commit c7e53bf51f
  1. 21
      api/v1/serializers/payment.py

@ -3,7 +3,7 @@ from rest_framework import serializers
from apps.payment.models import ( from apps.payment.models import (
AuthorBalance, Payment, AuthorBalance, Payment,
CoursePayment, SchoolPayment, CoursePayment, SchoolPayment,
) GiftCertificatePayment)
from .user import UserSerializer from .user import UserSerializer
from .course import CourseSerializer from .course import CourseSerializer
@ -114,6 +114,8 @@ class PaymentSerializer(serializers.ModelSerializer):
return CoursePaymentSerializer(instance, context=self.context).to_representation(instance) return CoursePaymentSerializer(instance, context=self.context).to_representation(instance)
elif isinstance(instance, SchoolPayment): elif isinstance(instance, SchoolPayment):
return SchoolPaymentSerializer(instance, context=self.context).to_representation(instance) return SchoolPaymentSerializer(instance, context=self.context).to_representation(instance)
elif isinstance(instance, GiftCertificatePayment):
return GiftCertificatePaymentSerializer(instance, context=self.context).to_representation(instance)
class CoursePaymentCreateSerializer(serializers.ModelSerializer): class CoursePaymentCreateSerializer(serializers.ModelSerializer):
@ -181,3 +183,20 @@ class SchoolPaymentSerializer(serializers.ModelSerializer):
'created_at', 'created_at',
'update_at', 'update_at',
) )
class GiftCertificatePaymentSerializer(serializers.ModelSerializer):
user = UserSerializer()
class Meta:
model = GiftCertificatePayment
fields = BASE_PAYMENT_FIELDS + (
'gift_certificate',
)
read_only_fields = (
'id',
'user',
'course',
'created_at',
'update_at',
)

Loading…
Cancel
Save