CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

ItemVariation API: Integrate memberships

Browse Source
This commit is contained in:
Raphael Michel
2021-05-28 17:26:41 +02:00
parent 398f264dbc
commit 2c5d544391
5 changed files with 68 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/pretix/api/serializers/item.py
View File

@@ -36,7 +36,8 @@ from decimal import Decimal
from django.core.exceptions import ValidationError
from django.db import transaction
from django.utils.functional import cached_property
from django.db.models import QuerySet
from django.utils.functional import cached_property, lazy
from django.utils.translation import gettext_lazy as _
from rest_framework import serializers
@@ -56,7 +57,12 @@ class InlineItemVariationSerializer(I18nAwareModelSerializer):
class Meta:
model = ItemVariation
fields = ('id', 'value', 'active', 'description',
'position', 'default_price', 'price', 'original_price')
'position', 'default_price', 'price', 'original_price',
'require_membership', 'require_membership_types',)
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.fields['require_membership_types'].queryset = lazy(lambda: self.context['event'].organizer.membership_types.all(), QuerySet)
class ItemVariationSerializer(I18nAwareModelSerializer):
@@ -66,7 +72,12 @@ class ItemVariationSerializer(I18nAwareModelSerializer):
class Meta:
model = ItemVariation
fields = ('id', 'value', 'active', 'description',
'position', 'default_price', 'price', 'original_price')
'position', 'default_price', 'price', 'original_price',
'require_membership', 'require_membership_types',)
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.fields['require_membership_types'].queryset = self.context['event'].organizer.membership_types.all()
class InlineItemBundleSerializer(serializers.ModelSerializer):
@@ -237,7 +248,10 @@ class ItemSerializer(I18nAwareModelSerializer):
item = Item.objects.create(**validated_data)
for variation_data in variations_data:
ItemVariation.objects.create(item=item, **variation_data)
require_membership_types = variation_data.pop('require_membership_types')
v = ItemVariation.objects.create(item=item, **variation_data)
if require_membership_types:
v.require_membership_types.add(*require_membership_types)
for addon_data in addons_data:
ItemAddOn.objects.create(base_item=item, **addon_data)
for bundle_data in bundles_data:

1
src/pretix/api/views/item.py
View File

@@ -152,6 +152,7 @@ class ItemVariationViewSet(viewsets.ModelViewSet):
def get_serializer_context(self):
ctx = super().get_serializer_context()
ctx['item'] = self.item
ctx['event'] = self.request.event
return ctx
def perform_create(self, serializer):

8
src/tests/api/test_items.py
View File

@@ -372,6 +372,8 @@ def test_item_detail_variations(token_client, organizer, event, team, item):
"active": True,
"description": None,
"position": 0,
"require_membership": False,
"require_membership_types": [],
"original_price": None
}]
res["has_variations"] = True
@@ -497,6 +499,8 @@ def test_item_create_with_variation(token_client, organizer, event, item, catego
"en": "Comment"
},
"active": True,
"require_membership": False,
"require_membership_types": [],
"description": None,
"position": 0,
"default_price": None,
@@ -1123,6 +1127,8 @@ TEST_VARIATIONS_RES = {
"position": 0,
"default_price": None,
"price": "23.00",
"require_membership": False,
"require_membership_types": [],
"original_price": None
}
@@ -1134,6 +1140,8 @@ TEST_VARIATIONS_UPDATE = {
"description": None,
"position": 1,
"default_price": "20.0",
"require_membership": False,
"require_membership_types": [],
"original_price": None
}