Move pretic.presale.productlist to pretix.base.storelogic.productlist

src/pretix/base/services/cross_selling.py

@@ -29,7 +29,7 @@ from typing import List
 from django.utils.functional import cached_property
 
 from pretix.base.models import CartPosition, ItemCategory, SalesChannel
-from pretix.presale.productlist import prepare_item_list_for_shop
+from pretix.base.storelogic.productlist import prepare_item_list_for_shop
 
 
 class DummyCategory:

src/pretix/base/services/orders.py

@@ -110,7 +110,7 @@ from pretix.celery_app import app
 from pretix.helpers import OF_SELF
 from pretix.helpers.models import modelcopy
 from pretix.helpers.periodic import minimum_interval
-from pretix.presale.productlist import prepare_item_list_for_shop
+from pretix.base.storelogic.productlist import prepare_item_list_for_shop
 from pretix.testutils.middleware import debugflags_var
 
 

src/pretix/presale/checkoutflow.py

@@ -87,7 +87,7 @@ from pretix.presale.forms.checkout import (
     ContactForm, InvoiceAddressForm, InvoiceNameForm, MembershipForm,
 )
 from pretix.presale.forms.customer import AuthenticationForm, RegistrationForm
-from pretix.presale.productlist import prepare_item_list_for_shop
+from pretix.base.storelogic.productlist import prepare_item_list_for_shop
 from pretix.presale.signals import (
     checkout_all_optional, checkout_confirm_messages, checkout_flow_steps,
     contact_form_fields, contact_form_fields_overrides,

src/pretix/presale/views/cart.py

@@ -68,7 +68,7 @@ from pretix.base.timemachine import time_machine_now
 from pretix.base.views.tasks import AsyncAction
 from pretix.helpers.http import redirect_to_url
 from pretix.multidomain.urlreverse import eventreverse
-from pretix.presale.productlist import (
+from pretix.base.storelogic.productlist import (
     item_group_by_category, prepare_item_list_for_shop,
 )
 from pretix.presale.views import (

src/pretix/presale/views/event.py

@@ -72,7 +72,7 @@ from pretix.helpers.formats.en.formats import (
 from pretix.helpers.http import redirect_to_url
 from pretix.multidomain.urlreverse import eventreverse
 from pretix.presale.ical import get_public_ical
-from pretix.presale.productlist import (
+from pretix.base.storelogic.productlist import (
     item_group_by_category, prepare_item_list_for_shop,
 )
 from pretix.presale.signals import seatingframe_html_head
@@ -87,7 +87,7 @@ from . import (
     iframe_entry_view_wrapper,
 )
 
-from pretix.presale.productlist import prepare_item_list_for_shop as get_grouped_items  # noqa
+from pretix.base.storelogic.productlist import prepare_item_list_for_shop as get_grouped_items  # noqa
 
 
 SessionStore = import_module(settings.SESSION_ENGINE).SessionStore

src/pretix/presale/views/order.py

@@ -92,7 +92,7 @@ from pretix.helpers.safedownload import check_token
 from pretix.multidomain.urlreverse import eventreverse, eventreverse_absolute
 from pretix.presale.forms.checkout import InvoiceAddressForm, QuestionsForm
 from pretix.presale.forms.order import OrderPositionChangeForm
-from pretix.presale.productlist import prepare_item_list_for_shop
+from pretix.base.storelogic.productlist import prepare_item_list_for_shop
 from pretix.presale.signals import question_form_fields_overrides
 from pretix.presale.views import (
     CartMixin, EventViewMixin, iframe_entry_view_wrapper,

src/pretix/presale/views/waiting.py

@@ -33,6 +33,7 @@ from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django.views.generic import FormView, TemplateView
 
 from pretix.base.models import Quota, SubEvent
+from pretix.base.storelogic.productlist import prepare_item_list_for_shop
 from pretix.base.templatetags.urlreplace import url_replace
 from pretix.multidomain.urlreverse import eventreverse
 from pretix.presale.views import EventViewMixin, iframe_entry_view_wrapper
@@ -40,7 +41,6 @@ from pretix.presale.views import EventViewMixin, iframe_entry_view_wrapper
 from ...base.i18n import get_language_without_region
 from ...base.models import Voucher, WaitingListEntry
 from ..forms.waitinglist import WaitingListForm
-from ..productlist import prepare_item_list_for_shop
 from . import allow_frame_if_namespaced
 
 

src/pretix/presale/views/widget.py

@@ -67,7 +67,7 @@ from pretix.helpers.daterange import daterange
 from pretix.helpers.thumb import get_thumbnail
 from pretix.multidomain.urlreverse import eventreverse_absolute
 from pretix.presale.forms.organizer import meta_filtersets
-from pretix.presale.productlist import (
+from pretix.base.storelogic.productlist import (
     item_group_by_category, prepare_item_list_for_shop,
 )
 from pretix.presale.style import get_theme_vars_css