forked from CGM_Public/pretix_original
Additional fixes
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
Item add-ons
|
||||
=====
|
||||
============
|
||||
|
||||
Resource description
|
||||
--------------------
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
Item variations
|
||||
=====
|
||||
===============
|
||||
|
||||
Resource description
|
||||
--------------------
|
||||
|
||||
@@ -101,6 +101,7 @@ unprefixed
|
||||
untrusted
|
||||
username
|
||||
url
|
||||
versa
|
||||
viewset
|
||||
viewsets
|
||||
webhook
|
||||
|
||||
@@ -8,7 +8,7 @@ The settings at "Settings" → "Display" allow you to customize the appearance o
|
||||
:class: screenshot
|
||||
|
||||
The upper part of the page contains settings that you always need to set specifically for your event. Those are
|
||||
currently::
|
||||
currently:
|
||||
|
||||
Logo image
|
||||
This logo will be shown as a banner above your shop. If you set it, the event name and date will no longer be
|
||||
|
||||
@@ -15,7 +15,7 @@ E-mail settings
|
||||
---------------
|
||||
|
||||
The upper part of the page contains settings that are relevant for the generation of all e-mails alike. Those are
|
||||
currently::
|
||||
currently:
|
||||
|
||||
Subject prefix
|
||||
This text will be prepended to the subject of all e-mails that are related to your event. For example, if you
|
||||
@@ -126,4 +126,4 @@ With the checkbox "Use custom SMTP server" you can turn using your SMTP server o
|
||||
button "Save and test custom SMTP connection", you can test if the connection and authentication to your SMTP server
|
||||
succeeds, even before turning that checkbox on.
|
||||
|
||||
.. _Sender Policy Framework: https://en.wikipedia.org/wiki/Sender_Policy_Framework
|
||||
.. _Sender Policy Framework: https://en.wikipedia.org/wiki/Sender_Policy_Framework
|
||||
|
||||
@@ -509,12 +509,15 @@ def test_item_create_with_addon(token_client, organizer, event, item, category,
|
||||
format='json'
|
||||
)
|
||||
assert resp.status_code == 400
|
||||
assert resp.content.decode() == '{"addons":["The minimum count needs to be equal to or greater than zero."]}'
|
||||
assert resp.content.decode() in [
|
||||
'{"addons":["The minimum count needs to be equal to or greater than zero."]}',
|
||||
'{"addons":[{"min_count":["Ensure this value is greater than or equal to 0."]}]}', # mysql
|
||||
]
|
||||
assert 2 == Item.objects.all().count()
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_item_update(token_client, organizer, event, item, category2, taxrule2):
|
||||
def test_item_update(token_client, organizer, event, item, category, category2, taxrule2):
|
||||
resp = token_client.patch(
|
||||
'/api/v1/organizers/{}/events/{}/items/{}/'.format(organizer.slug, event.slug, item.pk),
|
||||
{
|
||||
@@ -564,7 +567,7 @@ def test_item_update(token_client, organizer, event, item, category2, taxrule2):
|
||||
{
|
||||
"addons": [
|
||||
{
|
||||
"addon_category": 1,
|
||||
"addon_category": category.pk,
|
||||
"min_count": 0,
|
||||
"max_count": 10,
|
||||
"position": 0,
|
||||
|
||||
Reference in New Issue
Block a user