mirror of
https://github.com/pretix/pretix.git
synced 2026-05-08 15:44:02 +00:00
codestyle
This commit is contained in:
@@ -459,7 +459,6 @@ class ItemCategorySerializer(I18nAwareModelSerializer):
|
|||||||
return data
|
return data
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class QuestionOptionSerializer(I18nAwareModelSerializer):
|
class QuestionOptionSerializer(I18nAwareModelSerializer):
|
||||||
identifier = serializers.CharField(allow_null=True)
|
identifier = serializers.CharField(allow_null=True)
|
||||||
|
|
||||||
|
|||||||
@@ -96,7 +96,7 @@ class CrossSellingService:
|
|||||||
match = set(match.pk for match in category.cross_selling_match_products.only('pk')) # TODO prefetch this
|
match = set(match.pk for match in category.cross_selling_match_products.only('pk')) # TODO prefetch this
|
||||||
return (category.items.all(), {}) if any(pos.item.pk in match for pos in self.cartpositions) else (None, {})
|
return (category.items.all(), {}) if any(pos.item.pk in match for pos in self.cartpositions) else (None, {})
|
||||||
if category.cross_selling_condition == 'discounts':
|
if category.cross_selling_condition == 'discounts':
|
||||||
my_item_pks = [item.id for item in category.items.all()] #category.items.values_list('pk', flat=True)
|
my_item_pks = [item.id for item in category.items.all()]
|
||||||
potential_discount_items = {
|
potential_discount_items = {
|
||||||
item.pk: (max_count, discount_rule)
|
item.pk: (max_count, discount_rule)
|
||||||
for item, max_count, discount_rule in self._potential_discounts_by_item_for_current_cart
|
for item, max_count, discount_rule in self._potential_discounts_by_item_for_current_cart
|
||||||
|
|||||||
@@ -40,7 +40,6 @@ from urllib.parse import urlencode
|
|||||||
from django import forms
|
from django import forms
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.core.exceptions import ValidationError
|
from django.core.exceptions import ValidationError
|
||||||
from django.core.files.uploadedfile import UploadedFile
|
|
||||||
from django.db.models import Max, Q
|
from django.db.models import Max, Q
|
||||||
from django.forms import ChoiceField, RadioSelect
|
from django.forms import ChoiceField, RadioSelect
|
||||||
from django.forms.formsets import DELETION_FIELD_NAME
|
from django.forms.formsets import DELETION_FIELD_NAME
|
||||||
|
|||||||
@@ -27,10 +27,10 @@ from typing import List, Tuple
|
|||||||
import pytest
|
import pytest
|
||||||
from django.utils.timezone import now
|
from django.utils.timezone import now
|
||||||
from django_scopes import scopes_disabled
|
from django_scopes import scopes_disabled
|
||||||
|
from tests import assert_num_queries
|
||||||
|
|
||||||
from pretix.base.models import CartPosition, Discount, Event, Organizer
|
from pretix.base.models import CartPosition, Discount, Event, Organizer
|
||||||
from pretix.base.services.cross_selling import CrossSellingService
|
from pretix.base.services.cross_selling import CrossSellingService
|
||||||
from tests import assert_num_queries
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
@@ -467,6 +467,7 @@ def test_five_tickets_one_free(event):
|
|||||||
'''
|
'''
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@scopes_disabled()
|
@scopes_disabled()
|
||||||
@pytest.mark.django_db
|
@pytest.mark.django_db
|
||||||
@pytest.mark.parametrize("itemcount", [3, 10, 50])
|
@pytest.mark.parametrize("itemcount", [3, 10, 50])
|
||||||
|
|||||||
Reference in New Issue
Block a user