|
|
|
@ -7,16 +7,10 @@ from . import models, old_models |
|
|
|
|
|
|
|
|
|
#custom_error = lambda x: ValidationError(dict(non_field_errors=x)) |
|
|
|
|
|
|
|
|
|
class TransactionSerializer(serializers.ModelSerializer): |
|
|
|
|
class Meta: |
|
|
|
|
model = models.Transaction |
|
|
|
|
fields = '__all__' |
|
|
|
|
|
|
|
|
|
class UserSerializer(serializers.ModelSerializer): |
|
|
|
|
|
|
|
|
|
class Meta: |
|
|
|
|
model = User |
|
|
|
|
fields = ['id', 'username', 'email', 'member', 'transactions'] |
|
|
|
|
fields = ['id', 'username', 'email', 'member', 'transactions', 'cards'] |
|
|
|
|
depth = 1 |
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -33,6 +27,12 @@ class AdminMemberSerializer(serializers.ModelSerializer): |
|
|
|
|
read_only_fields = ['id', 'user'] |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class TransactionSerializer(serializers.ModelSerializer): |
|
|
|
|
class Meta: |
|
|
|
|
model = models.Transaction |
|
|
|
|
fields = '__all__' |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class RegistrationSerializer(RegisterSerializer): |
|
|
|
|
first_name = serializers.CharField(max_length=32) |
|
|
|
|
last_name = serializers.CharField(max_length=32) |
|
|
|
@ -65,6 +65,11 @@ class RegistrationSerializer(RegisterSerializer): |
|
|
|
|
t.user = user |
|
|
|
|
t.save() |
|
|
|
|
|
|
|
|
|
cards = models.Card.objects.filter(member_id=member.id) |
|
|
|
|
for c in cards: |
|
|
|
|
c.user = user |
|
|
|
|
c.save() |
|
|
|
|
|
|
|
|
|
else: |
|
|
|
|
models.Member.objects.create( |
|
|
|
|
user=user, |
|
|
|
|