{% trans "Payment settings" %}
@@ -30,8 +31,13 @@#{{ i.pk }} - {% for k, c in sales_channels.items %} - {% if k in i.sales_channels %} - + {% for c in sales_channels %} + {% if i.all_sales_channels or c in i.limit_sales_channels.all %} + {% if "." in c.icon %} +
{% trans "Orders" %}
@@ -201,8 +202,13 @@ {% endif %}{% trans "Add sales channel" %}
+ +{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/organizers/channel_add_choice.html b/src/pretix/control/templates/pretixcontrol/organizers/channel_add_choice.html new file mode 100644 index 0000000000..ed2076c7a1 --- /dev/null +++ b/src/pretix/control/templates/pretixcontrol/organizers/channel_add_choice.html @@ -0,0 +1,26 @@ +{% extends "pretixcontrol/organizers/base.html" %} +{% load i18n %} +{% load static %} +{% load bootstrap3 %} +{% block inner %} +{% trans "Add sales channel" %}
+
+ {% if "." in t.icon %}
+ 
+ {% else %}
+
+ {% endif %}
+ {{ t.verbose_name }}
+
+ {% if t.description %}
+ + {{ t.description }} +
+ {% endif %} + + {% endfor %} +{% trans "Delete sales channel:" %} {{ channel.label }}
+ +{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/organizers/channel_edit.html b/src/pretix/control/templates/pretixcontrol/organizers/channel_edit.html new file mode 100644 index 0000000000..975373a603 --- /dev/null +++ b/src/pretix/control/templates/pretixcontrol/organizers/channel_edit.html @@ -0,0 +1,27 @@ +{% extends "pretixcontrol/organizers/base.html" %} +{% load i18n %} +{% load formset_tags %} +{% load bootstrap3 %} +{% block inner %} +{% trans "Sales channel:" %} {{ channel.label }}
+ +{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/organizers/channels.html b/src/pretix/control/templates/pretixcontrol/organizers/channels.html new file mode 100644 index 0000000000..9ef398a1e7 --- /dev/null +++ b/src/pretix/control/templates/pretixcontrol/organizers/channels.html @@ -0,0 +1,64 @@ +{% extends "pretixcontrol/organizers/base.html" %} +{% load i18n %} +{% load bootstrap3 %} +{% load static %} +{% block inner %} +{% trans "Sales channels" %}
++ {% blocktrans trimmed %} + On this page, you can manage the different channels your tickets can be sold through. This is useful + to unlock new revenue streams or to separate revenue between different sources for reporting purchases. + {% endblocktrans %} +
+ + + {% trans "Add a new channel" %} + + +{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/organizers/customer.html b/src/pretix/control/templates/pretixcontrol/organizers/customer.html index b39bbd5f7a..8d79ebdffd 100644 --- a/src/pretix/control/templates/pretixcontrol/organizers/customer.html +++ b/src/pretix/control/templates/pretixcontrol/organizers/customer.html @@ -2,6 +2,7 @@ {% load i18n %} {% load bootstrap3 %} {% load money %} +{% load static %} {% block title %} {% blocktrans trimmed with id=customer.identifier %} Customer #{{ id }} @@ -225,8 +226,13 @@ {{ o.event }}{% trans "Warning" context "alert-messages" %}: @@ -194,7 +194,7 @@
{% trans "Warning" context "alert-messages" %}:
diff --git a/src/pretix/presale/templates/pretixpresale/event/checkout_payment.html b/src/pretix/presale/templates/pretixpresale/event/checkout_payment.html
index f0f05523f1..b17a711ff8 100644
--- a/src/pretix/presale/templates/pretixpresale/event/checkout_payment.html
+++ b/src/pretix/presale/templates/pretixpresale/event/checkout_payment.html
@@ -89,7 +89,7 @@
{{ p.provider.test_mode_message }}
{% trans "This sales channel does not provide support for test mode." %}
diff --git a/src/pretix/presale/utils.py b/src/pretix/presale/utils.py
index 297d8cb55c..b933cc39c5 100644
--- a/src/pretix/presale/utils.py
+++ b/src/pretix/presale/utils.py
@@ -415,6 +415,12 @@ def _event_view(function=None, require_live=True, require_plugin=None):
else:
with scope(organizer=getattr(request, 'organizer', None)), \
time_machine_now_assigned_from_request(request):
+ if not hasattr(request, 'sales_channel') and hasattr(request, 'organizer'):
+ # The environ lookup is only relevant during unit testing
+ request.sales_channel = request.organizer.sales_channels.get(
+ identifier=request.environ.get('PRETIX_SALES_CHANNEL', 'web')
+ )
+
response = func(request=request, *args, **kwargs)
if getattr(request, 'event', None):
for receiver, r in process_response.send(request.event, request=request, response=response):
diff --git a/src/pretix/presale/views/cart.py b/src/pretix/presale/views/cart.py
index 92c1880562..1d73d22fa6 100644
--- a/src/pretix/presale/views/cart.py
+++ b/src/pretix/presale/views/cart.py
@@ -515,7 +515,7 @@ class CartAdd(EventViewMixin, CartActionMixin, AsyncAction, View):
return u
def post(self, request, *args, **kwargs):
- if request.sales_channel.identifier not in request.event.sales_channels:
+ if not request.event.all_sales_channels and request.sales_channel.identifier not in (s.identifier for s in request.event.limit_sales_channels.all()):
raise Http404(_('Tickets for this event cannot be purchased on this sales channel.'))
cart_id = get_or_create_cart_id(self.request)
@@ -564,9 +564,9 @@ class RedeemView(NoSearchIndexViewMixin, EventViewMixin, CartMixin, TemplateView
# Fetch all items
items, display_add_to_cart = get_grouped_items(
self.request.event,
- self.subevent,
+ subevent=self.subevent,
voucher=self.voucher,
- channel=self.request.sales_channel.identifier,
+ channel=self.request.sales_channel,
memberships=(
self.request.customer.usable_memberships(
for_event=self.subevent or self.request.event,
diff --git a/src/pretix/presale/views/event.py b/src/pretix/presale/views/event.py
index c1b56c5255..1106dc16c4 100644
--- a/src/pretix/presale/views/event.py
+++ b/src/pretix/presale/views/event.py
@@ -63,10 +63,9 @@ from django.views import View
from django.views.decorators.csrf import csrf_exempt
from django.views.generic import TemplateView
-from pretix.base.channels import get_all_sales_channels
from pretix.base.forms.widgets import SplitDateTimePickerWidget
from pretix.base.models import (
- ItemVariation, Quota, SeatCategoryMapping, Voucher,
+ ItemVariation, Quota, SalesChannel, SeatCategoryMapping, Voucher,
)
from pretix.base.models.event import Event, SubEvent
from pretix.base.models.items import (
@@ -110,7 +109,7 @@ def item_group_by_category(items):
)
-def get_grouped_items(event, subevent=None, voucher=None, channel='web', require_seat=0, base_qs=None, allow_addons=False,
+def get_grouped_items(event, *, channel: SalesChannel, subevent=None, voucher=None, require_seat=0, base_qs=None, allow_addons=False,
quota_cache=None, filter_items=None, filter_categories=None, memberships=None,
ignore_hide_sold_out_for_item_ids=None):
base_qs_set = base_qs is not None
@@ -152,8 +151,8 @@ def get_grouped_items(event, subevent=None, voucher=None, channel='web', require
),
).filter(
variation_q,
+ Q(all_sales_channels=True) | Q(limit_sales_channels__identifier=channel.identifier),
active=True,
- sales_channels__contains=channel,
quotas__isnull=False,
subevent_disabled=False
).prefetch_related(
@@ -192,7 +191,7 @@ def get_grouped_items(event, subevent=None, voucher=None, channel='web', require
)
)
- items = base_qs.using(settings.DATABASE_REPLICA).filter_available(channel=channel, voucher=voucher, allow_addons=allow_addons).select_related(
+ items = base_qs.using(settings.DATABASE_REPLICA).filter_available(channel=channel.identifier, voucher=voucher, allow_addons=allow_addons).select_related(
'category', 'tax_rule', # for re-grouping
'hidden_if_available',
).prefetch_related(
@@ -244,7 +243,7 @@ def get_grouped_items(event, subevent=None, voucher=None, channel='web', require
items = items.filter(category_id__in=[a for a in filter_categories if a.isdigit()])
display_add_to_cart = False
- quota_cache_key = f'item_quota_cache:{subevent.id if subevent else 0}:{channel}:{bool(require_seat)}'
+ quota_cache_key = f'item_quota_cache:{subevent.id if subevent else 0}:{channel.identifier}:{bool(require_seat)}'
quota_cache = quota_cache or event.cache.get(quota_cache_key) or {}
quota_cache_existed = bool(quota_cache)
@@ -284,7 +283,7 @@ def get_grouped_items(event, subevent=None, voucher=None, channel='web', require
item.available_variations = [v for v in item.available_variations
if v.pk == voucher.variation_id]
- if get_all_sales_channels()[channel].unlimited_items_per_order:
+ if channel.type_instance.unlimited_items_per_order:
max_per_order = sys.maxsize
else:
max_per_order = item.max_per_order or int(event.settings.max_items_per_order)
@@ -527,7 +526,7 @@ class EventIndex(EventViewMixin, EventListMixin, CartMixin, TemplateView):
r._csp_ignore = True
return r
- if request.sales_channel.identifier not in request.event.sales_channels:
+ if not request.event.all_sales_channels and request.sales_channel.identifier not in (s.identifier for s in request.event.limit_sales_channels.all()):
raise Http404(_('Tickets for this event cannot be purchased on this sales channel.'))
if request.event.has_subevents:
@@ -565,11 +564,12 @@ class EventIndex(EventViewMixin, EventListMixin, CartMixin, TemplateView):
if not self.request.event.has_subevents or self.subevent:
# Fetch all items
items, display_add_to_cart = get_grouped_items(
- self.request.event, self.subevent,
+ self.request.event,
+ subevent=self.subevent,
filter_items=self.request.GET.getlist('item'),
filter_categories=self.request.GET.getlist('category'),
require_seat=None,
- channel=self.request.sales_channel.identifier,
+ channel=self.request.sales_channel,
memberships=(
self.request.customer.usable_memberships(
for_event=self.subevent or self.request.event,
diff --git a/src/pretix/presale/views/order.py b/src/pretix/presale/views/order.py
index d6f35f80ff..2541d4947a 100644
--- a/src/pretix/presale/views/order.py
+++ b/src/pretix/presale/views/order.py
@@ -705,7 +705,7 @@ class OrderPayChangeMethod(EventViewMixin, OrderDetailMixin, TemplateView):
def can_generate_invoice(event, order, ignore_payments=False):
v = (
- order.sales_channel in event.settings.get('invoice_generate_sales_channels')
+ order.sales_channel.identifier in event.settings.get('invoice_generate_sales_channels')
and (
event.settings.get('invoice_generate') in ('user', 'True')
or (
diff --git a/src/pretix/presale/views/organizer.py b/src/pretix/presale/views/organizer.py
index f389dff3fd..2b0ce53876 100644
--- a/src/pretix/presale/views/organizer.py
+++ b/src/pretix/presale/views/organizer.py
@@ -185,7 +185,7 @@ class EventListMixin:
def _get_event_list_queryset(self):
query = Q(is_public=True) & Q(live=True)
qs = self.request.organizer.events.using(settings.DATABASE_REPLICA).filter(query)
- qs = qs.filter(sales_channels__contains=self.request.sales_channel.identifier)
+ qs = qs.filter(Q(all_sales_channels=True) | Q(limit_sales_channels__identifier=self.request.sales_channel.identifier))
qs = qs.annotate(
min_from=Min('subevents__date_from'),
min_to=Min('subevents__date_to'),
@@ -724,13 +724,13 @@ class CalendarView(OrganizerViewMixin, EventListMixin, TemplateView):
ctx['has_before'], ctx['has_after'] = has_before_after(
self.request.organizer.events.filter(
- sales_channels__contains=self.request.sales_channel.identifier
+ Q(all_sales_channels=True) | Q(limit_sales_channels__identifier=self.request.sales_channel.identifier),
),
SubEvent.objects.filter(
+ Q(event__all_sales_channels=True) | Q(event__limit_sales_channels__identifier=self.request.sales_channel.identifier),
event__organizer=self.request.organizer,
event__is_public=True,
event__live=True,
- event__sales_channels__contains=self.request.sales_channel.identifier
),
before,
after,
@@ -749,13 +749,14 @@ class CalendarView(OrganizerViewMixin, EventListMixin, TemplateView):
add_events_for_days(self.request, Event.annotated(self.request.organizer.events, 'web').using(
settings.DATABASE_REPLICA
).filter(
- sales_channels__contains=self.request.sales_channel.identifier
+ Q(all_sales_channels=True) | Q(limit_sales_channels__identifier=self.request.sales_channel.identifier),
), before, after, ebd, timezones)
add_subevents_for_days(filter_qs_by_attr(SubEvent.annotated(SubEvent.objects.filter(
+ Q(event__all_sales_channels=True) |
+ Q(event__limit_sales_channels__identifier=self.request.sales_channel.identifier),
event__organizer=self.request.organizer,
event__is_public=True,
event__live=True,
- event__sales_channels__contains=self.request.sales_channel.identifier
).prefetch_related(
Prefetch(
'event',
@@ -806,13 +807,14 @@ class WeekCalendarView(OrganizerViewMixin, EventListMixin, TemplateView):
ctx['has_before'], ctx['has_after'] = has_before_after(
self.request.organizer.events.filter(
- sales_channels__contains=self.request.sales_channel.identifier
+ Q(all_sales_channels=True) | Q(limit_sales_channels__identifier=self.request.sales_channel.identifier),
),
SubEvent.objects.filter(
+ Q(event__all_sales_channels=True) |
+ Q(event__limit_sales_channels__identifier=self.request.sales_channel.identifier),
event__organizer=self.request.organizer,
event__is_public=True,
event__live=True,
- event__sales_channels__contains=self.request.sales_channel.identifier
),
before,
after,
@@ -843,13 +845,14 @@ class WeekCalendarView(OrganizerViewMixin, EventListMixin, TemplateView):
add_events_for_days(self.request, Event.annotated(self.request.organizer.events, 'web').using(
settings.DATABASE_REPLICA
).filter(
- sales_channels__contains=self.request.sales_channel.identifier
+ Q(all_sales_channels=True) | Q(limit_sales_channels__identifier=self.request.sales_channel.identifier),
), before, after, ebd, timezones)
add_subevents_for_days(filter_qs_by_attr(SubEvent.annotated(SubEvent.objects.filter(
+ Q(event__all_sales_channels=True) |
+ Q(event__limit_sales_channels__identifier=self.request.sales_channel.identifier),
event__organizer=self.request.organizer,
event__is_public=True,
event__live=True,
- event__sales_channels__contains=self.request.sales_channel.identifier
).prefetch_related(
Prefetch(
'event',
@@ -943,13 +946,14 @@ class DayCalendarView(OrganizerViewMixin, EventListMixin, TemplateView):
ctx['has_before'], ctx['has_after'] = has_before_after(
self.request.organizer.events.filter(
- sales_channels__contains=self.request.sales_channel.identifier
+ Q(all_sales_channels=True) | Q(limit_sales_channels__identifier=self.request.sales_channel.identifier),
),
SubEvent.objects.filter(
+ Q(event__all_sales_channels=True) |
+ Q(event__limit_sales_channels__identifier=self.request.sales_channel.identifier),
event__organizer=self.request.organizer,
event__is_public=True,
event__live=True,
- event__sales_channels__contains=self.request.sales_channel.identifier
),
before,
after,
@@ -1193,13 +1197,14 @@ class DayCalendarView(OrganizerViewMixin, EventListMixin, TemplateView):
add_events_for_days(self.request, Event.annotated(self.request.organizer.events, 'web').using(
settings.DATABASE_REPLICA
).filter(
- sales_channels__contains=self.request.sales_channel.identifier
+ Q(all_sales_channels=True) | Q(limit_sales_channels__identifier=self.request.sales_channel.identifier),
), before, after, ebd, timezones)
add_subevents_for_days(filter_qs_by_attr(SubEvent.annotated(SubEvent.objects.filter(
+ Q(event__all_sales_channels=True) |
+ Q(event__limit_sales_channels__identifier=self.request.sales_channel.identifier),
event__organizer=self.request.organizer,
event__is_public=True,
event__live=True,
- event__sales_channels__contains=self.request.sales_channel.identifier
).prefetch_related(
Prefetch(
'event',
@@ -1224,10 +1229,10 @@ class OrganizerIcalDownload(OrganizerViewMixin, View):
filter_qs_by_attr(
self.request.organizer.events.filter(
Q(date_from__gt=cutoff) | Q(date_to__gt=cutoff),
+ Q(all_sales_channels=True) | Q(limit_sales_channels__identifier=self.request.sales_channel.identifier),
is_public=True,
live=True,
has_subevents=False,
- sales_channels__contains=self.request.sales_channel.identifier,
),
request
).order_by(
@@ -1244,12 +1249,13 @@ class OrganizerIcalDownload(OrganizerViewMixin, View):
filter_qs_by_attr(
SubEvent.objects.filter(
Q(date_from__gt=cutoff) | Q(date_to__gt=cutoff),
+ Q(event__all_sales_channels=True) |
+ Q(event__limit_sales_channels__identifier=self.request.sales_channel.identifier),
event__organizer=self.request.organizer,
event__is_public=True,
event__live=True,
is_public=True,
active=True,
- event__sales_channels__contains=self.request.sales_channel.identifier
),
request
).prefetch_related(
diff --git a/src/pretix/presale/views/widget.py b/src/pretix/presale/views/widget.py
index cfd3b842e5..94af5e79e1 100644
--- a/src/pretix/presale/views/widget.py
+++ b/src/pretix/presale/views/widget.py
@@ -274,7 +274,7 @@ class WidgetAPIProductList(EventListMixin, View):
self.request.event,
subevent=self.subevent,
voucher=self.voucher,
- channel=self.request.sales_channel.identifier,
+ channel=self.request.sales_channel,
base_qs=qs,
require_seat=None,
memberships=(
@@ -372,7 +372,7 @@ class WidgetAPIProductList(EventListMixin, View):
'error': gettext('This ticket shop is currently disabled.')
})
- if request.sales_channel.identifier not in request.event.sales_channels:
+ if not request.event.all_sales_channels and request.sales_channel.identifier not in (s.identifier for s in request.event.limit_sales_channels.all()):
return self.response({
'error': gettext('Tickets for this event cannot be purchased on this sales channel.')
})
@@ -546,7 +546,8 @@ class WidgetAPIProductList(EventListMixin, View):
add_subevents_for_days(
filter_qs_by_attr(
self.request.event.subevents_annotated('web').filter(
- event__sales_channels__contains=self.request.sales_channel.identifier
+ Q(event__all_sales_channels=True) |
+ Q(event__limit_sales_channels__identifier=self.request.sales_channel.identifier),
), self.request
),
limit_before, after, ebd, set(), self.request.event,
@@ -558,16 +559,17 @@ class WidgetAPIProductList(EventListMixin, View):
self.request,
filter_qs_by_attr(
Event.annotated(self.request.organizer.events, 'web').filter(
- sales_channels__contains=self.request.sales_channel.identifier
+ Q(all_sales_channels=True) | Q(limit_sales_channels__identifier=self.request.sales_channel.identifier),
), self.request
),
limit_before, after, ebd, timezones
)
add_subevents_for_days(filter_qs_by_attr(SubEvent.annotated(SubEvent.objects.filter(
+ Q(event__all_sales_channels=True) |
+ Q(event__limit_sales_channels__identifier=self.request.sales_channel.identifier),
event__organizer=self.request.organizer,
event__is_public=True,
event__live=True,
- event__sales_channels__contains=self.request.sales_channel.identifier
).prefetch_related(
'event___settings_objects', 'event__organizer___settings_objects'
)), self.request), limit_before, after, ebd, timezones)
diff --git a/src/pretix/static/pretixcontrol/js/ui/variations.js b/src/pretix/static/pretixcontrol/js/ui/variations.js
index c00994fb89..f15520c2a3 100644
--- a/src/pretix/static/pretixcontrol/js/ui/variations.js
+++ b/src/pretix/static/pretixcontrol/js/ui/variations.js
@@ -45,9 +45,26 @@ $(function () {
$el.find(".variation-error").toggleClass("hidden", !(
$el.find(".alert-danger, .has-error").length
));
- $el.find("input[name$=-sales_channels]").each(function () {
+ $el.find("input[name$=-limit_sales_channels]").each(function () {
+ console.log(
+ $(this).val(),
+ $el.find(".variation-channel-" + $(this).val()),
+ (
+ $(this).closest("[data-formset-form]").find("input[name$=-all_sales_channels]").prop("checked") ||
+ $(this).prop("checked")
+ ), (
+ $("input[name=all_sales_channels]").prop("checked") ||
+ $("input[name=limit_sales_channels][value=" + $(this).val() + "]").prop("checked")
+ )
+ )
$el.find(".variation-channel-" + $(this).val()).toggleClass("variation-icon-hidden", !(
- $(this).prop("checked") && $("input[name=sales_channels][value=" + $(this).val() + "]").prop("checked")
+ (
+ $(this).closest("[data-formset-form]").find("input[name$=-all_sales_channels]").prop("checked") ||
+ $(this).prop("checked")
+ ) && (
+ $("input[name=all_sales_channels]").prop("checked") ||
+ $("input[name=limit_sales_channels][value=" + $(this).val() + "]").prop("checked")
+ )
));
})
}
@@ -57,7 +74,7 @@ $(function () {
update_variation_summary($el);
$(this).on("change dp.change", "input", function () {update_variation_summary($el)});
});
- $("input[name=sales_channels]").on("change", function() {
+ $("input[name=limit_sales_channels] input[name=all_sales_channels]").on("change", function() {
$("#item_variations [data-formset-form]").each(function () {
update_variation_summary($(this));
});
diff --git a/src/pretix/static/pretixcontrol/scss/main.scss b/src/pretix/static/pretixcontrol/scss/main.scss
index a8404a628a..c5edae22cd 100644
--- a/src/pretix/static/pretixcontrol/scss/main.scss
+++ b/src/pretix/static/pretixcontrol/scss/main.scss
@@ -925,6 +925,11 @@ tbody th {
margin-left: -1px;
}
+.fa-like-image {
+ width: 1.28571em;
+ height: auto;
+}
+
@import "../../pretixbase/scss/_rtl.scss";
@import "../../bootstrap/scss/_rtl.scss";
@import "_rtl.scss";
diff --git a/src/tests/api/test_checkin.py b/src/tests/api/test_checkin.py
index 7965e0808b..f3f1f18634 100644
--- a/src/tests/api/test_checkin.py
+++ b/src/tests/api/test_checkin.py
@@ -65,7 +65,8 @@ def order(event, item, other_item, taxrule):
status=Order.STATUS_PAID, secret="k24fiuwvu8kxz3y1",
datetime=datetime.datetime(2017, 12, 1, 10, 0, 0, tzinfo=datetime.timezone.utc),
expires=datetime.datetime(2017, 12, 10, 10, 0, 0, tzinfo=datetime.timezone.utc),
- total=46, locale='en'
+ total=46, locale='en',
+ sales_channel=event.organizer.sales_channels.get(identifier="web"),
)
InvoiceAddress.objects.create(order=o, company="Sample company", country=Country('NZ'))
op1 = OrderPosition.objects.create(
@@ -250,7 +251,7 @@ def test_list_list(token_client, organizer, event, clist, item, subevent, django
res["limit_products"] = [item.pk]
res["auto_checkin_sales_channels"] = []
- with django_assert_num_queries(11):
+ with django_assert_num_queries(12):
resp = token_client.get('/api/v1/organizers/{}/events/{}/checkinlists/'.format(organizer.slug, event.slug))
assert resp.status_code == 200
assert [res] == resp.data['results']
@@ -335,7 +336,7 @@ def test_list_create(token_client, organizer, event, item, item_on_wrong_event):
assert cl.name == "VIP"
assert cl.limit_products.count() == 1
assert not cl.all_products
- assert "web" in cl.auto_checkin_sales_channels
+ assert cl.auto_checkin_sales_channels.filter(identifier="web").exists()
resp = token_client.post(
'/api/v1/organizers/{}/events/{}/checkinlists/'.format(organizer.slug, event.slug),
@@ -381,7 +382,7 @@ def test_list_create_with_subevent(token_client, organizer, event, event3, item,
assert resp.status_code == 201
with scopes_disabled():
cl = CheckinList.objects.get(pk=resp.data['id'])
- assert "web" in cl.auto_checkin_sales_channels
+ assert cl.auto_checkin_sales_channels.filter(identifier="web").exists()
resp = token_client.post(
'/api/v1/organizers/{}/events/{}/checkinlists/'.format(organizer.slug, event.slug),
@@ -448,7 +449,7 @@ def test_list_update(token_client, organizer, event, clist):
assert resp.status_code == 200
with scopes_disabled():
cl = CheckinList.objects.get(pk=resp.data['id'])
- assert "web" in cl.auto_checkin_sales_channels
+ assert cl.auto_checkin_sales_channels.filter(identifier="web").exists()
@pytest.mark.django_db
diff --git a/src/tests/api/test_checkinrpc.py b/src/tests/api/test_checkinrpc.py
index f1ea62c37c..b23795aa67 100644
--- a/src/tests/api/test_checkinrpc.py
+++ b/src/tests/api/test_checkinrpc.py
@@ -67,6 +67,7 @@ def order(event, item, other_item, taxrule):
status=Order.STATUS_PAID, secret="k24fiuwvu8kxz3y1",
datetime=datetime.datetime(2017, 12, 1, 10, 0, 0, tzinfo=datetime.timezone.utc),
expires=datetime.datetime(2017, 12, 10, 10, 0, 0, tzinfo=datetime.timezone.utc),
+ sales_channel=event.organizer.sales_channels.get(identifier="web"),
total=46, locale='en'
)
InvoiceAddress.objects.create(order=o, company="Sample company", country=Country('NZ'))
@@ -114,6 +115,7 @@ def order2(event2, item_on_event2):
status=Order.STATUS_PAID, secret="ylptCPNOxTyA",
datetime=datetime.datetime(2017, 12, 1, 10, 0, 0, tzinfo=datetime.timezone.utc),
expires=datetime.datetime(2017, 12, 10, 10, 0, 0, tzinfo=datetime.timezone.utc),
+ sales_channel=event2.organizer.sales_channels.get(identifier="web"),
total=46, locale='en'
)
InvoiceAddress.objects.create(order=o, company="Sample company", country=Country('NZ'))
diff --git a/src/tests/api/test_discounts.py b/src/tests/api/test_discounts.py
index 355ae2e6a5..e5347a33ac 100644
--- a/src/tests/api/test_discounts.py
+++ b/src/tests/api/test_discounts.py
@@ -41,7 +41,9 @@ TEST_DISCOUNT_RES = {
"active": True,
"internal_name": "3 for 2",
"position": 1,
- "sales_channels": ["web"],
+ "all_sales_channels": True,
+ "limit_sales_channels": [],
+ "sales_channels": ["bar", "baz", "web"],
"available_from": None,
"available_until": None,
"subevent_mode": "mixed",
diff --git a/src/tests/api/test_events.py b/src/tests/api/test_events.py
index 35255c0291..82b8ab3b4e 100644
--- a/src/tests/api/test_events.py
+++ b/src/tests/api/test_events.py
@@ -70,6 +70,7 @@ def order(event, item, taxrule):
status=Order.STATUS_PENDING, secret="k24fiuwvu8kxz3y1",
datetime=datetime(2017, 12, 1, 10, 0, 0, tzinfo=timezone.utc),
expires=datetime(2017, 12, 10, 10, 0, 0, tzinfo=timezone.utc),
+ sales_channel=event.organizer.sales_channels.get(identifier="web"),
total=23, locale='en'
)
o.fees.create(fee_type=OrderFee.FEE_TYPE_PAYMENT, value=Decimal('0.25'), tax_rate=Decimal('19.00'),
@@ -121,7 +122,9 @@ TEST_EVENT_RES = {
'item_meta_properties': {
'day': 'Monday',
},
- 'sales_channels': ['web', 'bar', 'baz'],
+ 'sales_channels': ['bar', 'baz', 'web'],
+ 'all_sales_channels': True,
+ 'limit_sales_channels': [],
'public_url': 'http://example.com/dummy/dummy/'
}
diff --git a/src/tests/api/test_giftcards.py b/src/tests/api/test_giftcards.py
index 58c389bc15..2df4c922f1 100644
--- a/src/tests/api/test_giftcards.py
+++ b/src/tests/api/test_giftcards.py
@@ -103,6 +103,7 @@ def test_giftcard_detail_expand(token_client, organizer, event, giftcard):
o = Order.objects.create(
code='FOO', event=event, email='dummy@dummy.test',
status=Order.STATUS_PENDING, datetime=now(), expires=now() + timedelta(days=10),
+ sales_channel=event.organizer.sales_channels.get(identifier="web"),
total=14, locale='en'
)
ticket = event.items.create(name='Early-bird ticket', category=None, default_price=23, admission=True,
@@ -196,6 +197,7 @@ def test_giftcard_patch_owner_by_id(token_client, organizer, event, giftcard):
o = Order.objects.create(
code='FOO', event=event, email='dummy@dummy.test',
status=Order.STATUS_PENDING, datetime=now(), expires=now() + timedelta(days=10),
+ sales_channel=event.organizer.sales_channels.get(identifier="web"),
total=14, locale='en'
)
ticket = event.items.create(name='Early-bird ticket', category=None, default_price=23, admission=True,
@@ -220,6 +222,7 @@ def test_giftcard_patch_owner_by_secret(token_client, organizer, event, giftcard
o = Order.objects.create(
code='FOO', event=event, email='dummy@dummy.test',
status=Order.STATUS_PENDING, datetime=now(), expires=now() + timedelta(days=10),
+ sales_channel=event.organizer.sales_channels.get(identifier="web"),
total=14, locale='en'
)
ticket = event.items.create(name='Early-bird ticket', category=None, default_price=23, admission=True,
diff --git a/src/tests/api/test_idempotency.py b/src/tests/api/test_idempotency.py
index e5602599e5..884df388c0 100644
--- a/src/tests/api/test_idempotency.py
+++ b/src/tests/api/test_idempotency.py
@@ -160,6 +160,7 @@ def order(event):
status=Order.STATUS_PENDING, secret="k24fiuwvu8kxz3y1",
datetime=datetime.datetime(2017, 12, 1, 10, 0, 0, tzinfo=datetime.timezone.utc),
expires=datetime.datetime(2017, 12, 10, 10, 0, 0, tzinfo=datetime.timezone.utc),
+ sales_channel=event.organizer.sales_channels.get(identifier="web"),
total=23, locale='en'
)
diff --git a/src/tests/api/test_invoices.py b/src/tests/api/test_invoices.py
index 0cf7f8d81e..4be83047ac 100644
--- a/src/tests/api/test_invoices.py
+++ b/src/tests/api/test_invoices.py
@@ -85,6 +85,7 @@ def order(event, item, taxrule, question):
status=Order.STATUS_PENDING, secret="k24fiuwvu8kxz3y1",
datetime=datetime.datetime(2017, 12, 1, 10, 0, 0, tzinfo=datetime.timezone.utc),
expires=datetime.datetime(2017, 12, 10, 10, 0, 0, tzinfo=datetime.timezone.utc),
+ sales_channel=event.organizer.sales_channels.get(identifier="web"),
total=23, locale='en'
)
p1 = o.payments.create(
@@ -148,6 +149,7 @@ def order2(event2, item2):
status=Order.STATUS_PENDING, secret="asd436cvbfd1",
datetime=datetime.datetime(2017, 12, 1, 10, 0, 0, tzinfo=datetime.timezone.utc),
expires=datetime.datetime(2017, 12, 10, 10, 0, 0, tzinfo=datetime.timezone.utc),
+ sales_channel=event2.organizer.sales_channels.get(identifier="web"),
total=23, locale='en'
)
o.payments.create(
diff --git a/src/tests/api/test_items.py b/src/tests/api/test_items.py
index 88340751d5..a0a606a851 100644
--- a/src/tests/api/test_items.py
+++ b/src/tests/api/test_items.py
@@ -44,7 +44,6 @@ from django_countries.fields import Country
from django_scopes import scopes_disabled
from tests.const import SAMPLE_PNG
-from pretix.base.channels import get_all_sales_channels
from pretix.base.models import (
CartPosition, InvoiceAddress, Item, ItemAddOn, ItemBundle, ItemCategory,
ItemVariation, Order, OrderPosition, Question, QuestionOption, Quota,
@@ -81,6 +80,7 @@ def order(event, item, taxrule):
status=Order.STATUS_PENDING, secret="k24fiuwvu8kxz3y1",
datetime=datetime(2017, 12, 1, 10, 0, 0, tzinfo=timezone.utc),
expires=datetime(2017, 12, 10, 10, 0, 0, tzinfo=timezone.utc),
+ sales_channel=event.organizer.sales_channels.get(identifier="web"),
total=23, locale='en'
)
o.fees.create(fee_type=OrderFee.FEE_TYPE_PAYMENT, value=Decimal('0.25'), tax_rate=Decimal('19.00'),
@@ -254,7 +254,9 @@ TEST_ITEM_RES = {
"name": {"en": "Budget Ticket"},
"internal_name": None,
"default_price": "23.00",
- "sales_channels": ["web"],
+ "sales_channels": ["bar", "baz", "web"],
+ "all_sales_channels": True,
+ "limit_sales_channels": [],
"category": None,
"active": True,
"description": None,
@@ -383,32 +385,34 @@ def test_item_detail(token_client, organizer, event, team, item):
def test_item_detail_variations(token_client, organizer, event, team, item):
with scopes_disabled():
var = item.variations.create(value="Children")
- res = dict(TEST_ITEM_RES)
- res["id"] = item.pk
- res["variations"] = [{
- "id": var.pk,
- "value": {"en": "Children"},
- "default_price": None,
- "free_price_suggestion": None,
- "price": "23.00",
- "active": True,
- "description": None,
- "position": 0,
- "checkin_attention": False,
- "checkin_text": None,
- "require_approval": False,
- "require_membership": False,
- "require_membership_hidden": False,
- "require_membership_types": [],
- "sales_channels": list(get_all_sales_channels().keys()),
- "available_from": None,
- "available_until": None,
- "available_from_mode": "hide",
- "available_until_mode": "hide",
- "hide_without_voucher": False,
- "original_price": None,
- "meta_data": {}
- }]
+ res = dict(TEST_ITEM_RES)
+ res["id"] = item.pk
+ res["variations"] = [{
+ "id": var.pk,
+ "value": {"en": "Children"},
+ "default_price": None,
+ "free_price_suggestion": None,
+ "price": "23.00",
+ "active": True,
+ "description": None,
+ "position": 0,
+ "checkin_attention": False,
+ "checkin_text": None,
+ "require_approval": False,
+ "require_membership": False,
+ "require_membership_hidden": False,
+ "require_membership_types": [],
+ "sales_channels": sorted(organizer.sales_channels.values_list("identifier", flat=True)),
+ "all_sales_channels": True,
+ "limit_sales_channels": [],
+ "available_from": None,
+ "available_until": None,
+ "available_from_mode": "hide",
+ "available_until_mode": "hide",
+ "hide_without_voucher": False,
+ "original_price": None,
+ "meta_data": {}
+ }]
res["has_variations"] = True
resp = token_client.get('/api/v1/organizers/{}/events/{}/items/{}/'.format(organizer.slug, event.slug,
item.pk))
@@ -466,7 +470,7 @@ def test_item_create(token_client, organizer, event, item, category, taxrule, me
"en": "Ticket"
},
"active": True,
- "sales_channels": ["web", "pretixpos"],
+ "sales_channels": ["web", "bar"],
"description": None,
"default_price": "23.00",
"free_price": False,
@@ -496,7 +500,8 @@ def test_item_create(token_client, organizer, event, item, category, taxrule, me
assert resp.status_code == 201
with scopes_disabled():
i = Item.objects.get(pk=resp.data['id'])
- assert i.sales_channels == ["web", "pretixpos"]
+ assert not i.all_sales_channels
+ assert sorted(i.limit_sales_channels.values_list("identifier", flat=True)) == ["bar", "web"]
assert i.meta_data == {'day': 'Wednesday'}
assert i.require_membership_types.count() == 1
assert i.personalized is True # auto-set for backwards-compatibility
@@ -596,7 +601,8 @@ def test_item_create_with_variation(token_client, organizer, event, item, catego
assert new_item.variations.first().value.localize('de') == "Kommentar"
assert new_item.variations.first().value.localize('en') == "Comment"
assert new_item.variations.first().require_approval is True
- assert set(new_item.variations.first().sales_channels) == set(get_all_sales_channels().keys())
+ assert new_item.variations.first().all_sales_channels is True
+ assert not new_item.variations.first().limit_sales_channels.exists()
assert new_item.variations.first().meta_data == {"day": "Wednesday"}
@@ -1192,7 +1198,7 @@ def test_item_file_upload(token_client, organizer, event, item):
"en": "Ticket"
},
"active": True,
- "sales_channels": ["web", "pretixpos"],
+ "sales_channels": ["web"],
"picture": file_id_png,
"description": None,
"default_price": "23.00",
@@ -1331,7 +1337,8 @@ TEST_VARIATIONS_RES = {
"require_membership": False,
"require_membership_hidden": False,
"require_membership_types": [],
- "sales_channels": list(get_all_sales_channels().keys()),
+ "all_sales_channels": True,
+ "limit_sales_channels": [],
"available_from": None,
"available_until": None,
"available_from_mode": "hide",
@@ -1357,6 +1364,8 @@ TEST_VARIATIONS_UPDATE = {
"require_membership_hidden": False,
"require_membership_types": [],
"sales_channels": ["web"],
+ "all_sales_channels": False,
+ "limit_sales_channels": ["web"],
"available_from": None,
"available_until": None,
"available_from_mode": "hide",
@@ -1372,6 +1381,8 @@ TEST_VARIATIONS_UPDATE = {
def test_variations_list(token_client, organizer, event, item, variation):
res = dict(TEST_VARIATIONS_RES)
res["id"] = variation.pk
+ with scopes_disabled():
+ res["sales_channels"] = sorted(organizer.sales_channels.values_list("identifier", flat=True))
resp = token_client.get('/api/v1/organizers/{}/events/{}/items/{}/variations/'.format(organizer.slug, event.slug, item.pk))
assert resp.status_code == 200
assert res['value'] == resp.data['results'][0]['value']
@@ -1383,6 +1394,8 @@ def test_variations_list(token_client, organizer, event, item, variation):
def test_variations_detail(token_client, organizer, event, item, variation):
res = dict(TEST_VARIATIONS_RES)
res["id"] = variation.pk
+ with scopes_disabled():
+ res["sales_channels"] = sorted(organizer.sales_channels.values_list("identifier", flat=True))
resp = token_client.get('/api/v1/organizers/{}/events/{}/items/{}/variations/{}/'.format(organizer.slug, event.slug, item.pk, variation.pk))
assert resp.status_code == 200
assert res == resp.data
@@ -1413,7 +1426,9 @@ def test_variations_create(token_client, organizer, event, item, variation):
var = ItemVariation.objects.get(pk=resp.data['id'])
assert var.position == 1
assert var.price == 23.0
- assert set(var.sales_channels) == set(get_all_sales_channels().keys())
+ assert var.all_sales_channels
+ with scopes_disabled():
+ assert not var.limit_sales_channels.exists()
assert var.meta_data == {"day": "Wednesday"}
diff --git a/src/tests/api/test_order_change.py b/src/tests/api/test_order_change.py
index 2f85d91b19..964b18ef3e 100644
--- a/src/tests/api/test_order_change.py
+++ b/src/tests/api/test_order_change.py
@@ -100,7 +100,8 @@ def order(event, item, taxrule, question):
status=Order.STATUS_PENDING, secret="k24fiuwvu8kxz3y1",
datetime=datetime.datetime(2017, 12, 1, 10, 0, 0, tzinfo=datetime.timezone.utc),
expires=datetime.datetime(2017, 12, 10, 10, 0, 0, tzinfo=datetime.timezone.utc),
- total=23, locale='en'
+ total=23, locale='en',
+ sales_channel=event.organizer.sales_channels.get(identifier="web"),
)
p1 = o.payments.create(
provider='stripe',
diff --git a/src/tests/api/test_order_create.py b/src/tests/api/test_order_create.py
index 3e53f7a19a..daab41cd54 100644
--- a/src/tests/api/test_order_create.py
+++ b/src/tests/api/test_order_create.py
@@ -112,6 +112,7 @@ def order(event, item, taxrule, question):
status=Order.STATUS_PENDING, secret="k24fiuwvu8kxz3y1",
datetime=datetime.datetime(2017, 12, 1, 10, 0, 0, tzinfo=datetime.timezone.utc),
expires=datetime.datetime(2017, 12, 10, 10, 0, 0, tzinfo=datetime.timezone.utc),
+ sales_channel=event.organizer.sales_channels.get(identifier="web"),
total=23, locale='en'
)
p1 = o.payments.create(
@@ -166,7 +167,8 @@ def order(event, item, taxrule, question):
@pytest.fixture
def clist_autocheckin(event):
- c = event.checkin_lists.create(name="Default", all_products=True, auto_checkin_sales_channels=['web'])
+ c = event.checkin_lists.create(name="Default", all_products=True)
+ c.auto_checkin_sales_channels.add(event.organizer.sales_channels.get(identifier="web"))
return c
@@ -245,7 +247,7 @@ def test_order_create(token_client, organizer, event, item, quota, question):
assert o.locale == "en"
assert o.total == Decimal('23.25')
assert o.status == Order.STATUS_PENDING
- assert o.sales_channel == "web"
+ assert o.sales_channel.identifier == "web"
assert o.valid_if_pending
assert o.expires > now()
assert not o.testmode
@@ -550,11 +552,10 @@ def test_order_create_autocheckin(token_client, organizer, event, item, quota, q
assert resp.status_code == 201
with scopes_disabled():
o = Order.objects.get(code=resp.data['code'])
- assert "web" in clist_autocheckin.auto_checkin_sales_channels
+ assert clist_autocheckin.auto_checkin_sales_channels.contains(organizer.sales_channels.get(identifier="web"))
assert o.positions.first().checkins.first().auto_checked_in
- clist_autocheckin.auto_checkin_sales_channels = []
- clist_autocheckin.save()
+ clist_autocheckin.auto_checkin_sales_channels.clear()
resp = token_client.post(
'/api/v1/organizers/{}/events/{}/orders/'.format(
@@ -564,7 +565,7 @@ def test_order_create_autocheckin(token_client, organizer, event, item, quota, q
assert resp.status_code == 201
with scopes_disabled():
o = Order.objects.get(code=resp.data['code'])
- assert clist_autocheckin.auto_checkin_sales_channels == []
+ assert clist_autocheckin.auto_checkin_sales_channels.count() == 0
assert o.positions.first().checkins.count() == 0
@@ -625,7 +626,7 @@ def test_order_create_sales_channel_optional(token_client, organizer, event, ite
assert resp.status_code == 201
with scopes_disabled():
o = Order.objects.get(code=resp.data['code'])
- assert o.sales_channel == "web"
+ assert o.sales_channel.identifier == "web"
@pytest.mark.django_db
@@ -640,7 +641,7 @@ def test_order_create_sales_channel_invalid(token_client, organizer, event, item
), format='json', data=res
)
assert resp.status_code == 400
- assert resp.data == {'sales_channel': ['Unknown sales channel.']}
+ assert resp.data == {'sales_channel': ['Object with identifier=foo does not exist.']}
@pytest.mark.django_db
diff --git a/src/tests/api/test_orders.py b/src/tests/api/test_orders.py
index 78d9d23180..0ed8ee28f6 100644
--- a/src/tests/api/test_orders.py
+++ b/src/tests/api/test_orders.py
@@ -88,6 +88,7 @@ def order(event, item, taxrule, question):
status=Order.STATUS_PENDING, secret="k24fiuwvu8kxz3y1",
datetime=datetime.datetime(2017, 12, 1, 10, 0, 0, tzinfo=datetime.timezone.utc),
expires=datetime.datetime(2017, 12, 10, 10, 0, 0, tzinfo=datetime.timezone.utc),
+ sales_channel=event.organizer.sales_channels.get(identifier="web"),
total=23, locale='en'
)
p1 = o.payments.create(
@@ -151,6 +152,7 @@ def order2(event2, item2):
status=Order.STATUS_PENDING, secret="asd436cvbfd1",
datetime=datetime.datetime(2017, 12, 1, 10, 0, 0, tzinfo=datetime.timezone.utc),
expires=datetime.datetime(2017, 12, 10, 10, 0, 0, tzinfo=datetime.timezone.utc),
+ sales_channel=event2.organizer.sales_channels.get(identifier="web"),
total=23, locale='en'
)
o.payments.create(
@@ -173,7 +175,8 @@ def order2(event2, item2):
@pytest.fixture
def clist_autocheckin(event):
- c = event.checkin_lists.create(name="Default", all_products=True, auto_checkin_sales_channels=['web'])
+ c = event.checkin_lists.create(name="Default", all_products=True)
+ c.auto_checkin_sales_channels.add(event.organizer.sales_channels.get(identifier="web"))
return c
diff --git a/src/tests/api/test_permissions.py b/src/tests/api/test_permissions.py
index 3b5cf49449..a96054c206 100644
--- a/src/tests/api/test_permissions.py
+++ b/src/tests/api/test_permissions.py
@@ -215,6 +215,12 @@ org_permission_sub_urls = [
('patch', 'can_manage_customers', 'memberships/1/', 404),
('put', 'can_manage_customers', 'memberships/1/', 404),
('delete', 'can_manage_customers', 'memberships/1/', 404),
+ ('get', 'can_change_organizer_settings', 'saleschannels/', 200),
+ ('post', 'can_change_organizer_settings', 'saleschannels/', 400),
+ ('get', 'can_change_organizer_settings', 'saleschannels/web/', 200),
+ ('patch', 'can_change_organizer_settings', 'saleschannels/web/', 200),
+ ('put', 'can_change_organizer_settings', 'saleschannels/api.1/', 404),
+ ('delete', 'can_change_organizer_settings', 'saleschannels/api.1/', 404),
('get', 'can_change_organizer_settings', 'membershiptypes/', 200),
('post', 'can_change_organizer_settings', 'membershiptypes/', 400),
('get', 'can_change_organizer_settings', 'membershiptypes/1/', 404),
diff --git a/src/tests/api/test_reusable_media.py b/src/tests/api/test_reusable_media.py
index 242dddaf92..0d0f564f97 100644
--- a/src/tests/api/test_reusable_media.py
+++ b/src/tests/api/test_reusable_media.py
@@ -132,6 +132,7 @@ def test_medium_detail(token_client, organizer, event, medium, giftcard, custome
o = Order.objects.create(
code='FOO', event=event, email='dummy@dummy.test',
status=Order.STATUS_PENDING, datetime=now(), expires=now() + timedelta(days=10),
+ sales_channel=event.organizer.sales_channels.get(identifier="web"),
total=14, locale='en'
)
ticket = event.items.create(name='Early-bird ticket', category=None, default_price=23, admission=True,
@@ -409,6 +410,7 @@ def test_medium_lookup_cross_organizer(token_client, organizer, organizer2, org2
o = Order.objects.create(
code='FOO', event=org2_event, email='dummy@dummy.test',
status=Order.STATUS_PENDING, datetime=now(), expires=now() + timedelta(days=10),
+ sales_channel=org2_event.organizer.sales_channels.get(identifier="web"),
total=14, locale='en'
)
ticket = org2_event.items.create(name='Early-bird ticket', category=None, default_price=23, admission=True,
diff --git a/src/tests/api/test_saleschannels.py b/src/tests/api/test_saleschannels.py
new file mode 100644
index 0000000000..09a60004aa
--- /dev/null
+++ b/src/tests/api/test_saleschannels.py
@@ -0,0 +1,176 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020 Raphael Michel and contributors
+# Copyright (C) 2020-2021 rami.io GmbH and contributors
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+# Public License as published by the Free Software Foundation in version 3 of the License.
+#
+# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
+# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
+# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
+# this file, see