Fix #549 -- Multiple PDF ticket layouts (#938)

- [x] Data model
- [x] CRUD
- [x] Editor
- [x] Migration from old settings
- [x] Clone files when copying events
  - [x] badges?
- [x] Actual ticket output
- [x] Default layout on event creation
- [x] Link well from ticketing settings
- [x] Tests
- [x] Shipping plugin
  - [x] Migration
  - [x] Settings
  - [x] Create default
- [x] API
This commit is contained in:
Raphael Michel
2018-06-06 15:27:55 +02:00
committed by GitHub
parent 72661623f3
commit e3450baeb3
29 changed files with 1302 additions and 36 deletions

View File

@@ -0,0 +1,61 @@
import copy
import json
import pytest
from django.utils.timezone import now
from pretix.base.models import Event, Item, Organizer, Team, User
from pretix.plugins.badges.models import BadgeItem
@pytest.fixture
def env():
o = Organizer.objects.create(name='Dummy', slug='dummy')
event = Event.objects.create(
organizer=o, name='Dummy', slug='dummy',
date_from=now(), plugins='pretix.plugins.banktransfer'
)
user = User.objects.create_user('dummy@dummy.dummy', 'dummy')
t = Team.objects.create(organizer=event.organizer)
t.members.add(user)
t.limit_events.add(event)
item1 = Item.objects.create(event=event, name="Ticket", default_price=23)
tl = event.badge_layouts.create(name="Foo", default=True, layout='[{"a": 2}]')
BadgeItem.objects.create(layout=tl, item=item1)
return event, user, tl, item1
RES_LAYOUT = {
'id': 1,
'name': 'Foo',
'default': True,
'item_assignments': [{'item': 1}],
'layout': [{'a': 2}],
'background': None
}
@pytest.mark.django_db
def test_api_list(env, client):
res = copy.copy(RES_LAYOUT)
res['id'] = env[2].pk
res['item_assignments'][0]['item'] = env[3].pk
client.login(email='dummy@dummy.dummy', password='dummy')
r = json.loads(
client.get('/api/v1/organizers/{}/events/{}/badgelayouts/'.format(
env[0].slug, env[0].organizer.slug)).content.decode('utf-8')
)
assert r['results'] == [res]
@pytest.mark.django_db
def test_api_detail(env, client):
res = copy.copy(RES_LAYOUT)
res['id'] = env[2].pk
res['item_assignments'][0]['item'] = env[3].pk
client.login(email='dummy@dummy.dummy', password='dummy')
r = json.loads(
client.get('/api/v1/organizers/{}/events/{}/badgelayouts/{}/'.format(
env[0].slug, env[0].organizer.slug, env[2].pk)).content.decode('utf-8')
)
assert r == res

View File

@@ -0,0 +1,61 @@
import copy
import json
import pytest
from django.utils.timezone import now
from pretix.base.models import Event, Item, Organizer, Team, User
from pretix.plugins.ticketoutputpdf.models import TicketLayoutItem
@pytest.fixture
def env():
o = Organizer.objects.create(name='Dummy', slug='dummy')
event = Event.objects.create(
organizer=o, name='Dummy', slug='dummy',
date_from=now(), plugins='pretix.plugins.banktransfer'
)
user = User.objects.create_user('dummy@dummy.dummy', 'dummy')
t = Team.objects.create(organizer=event.organizer)
t.members.add(user)
t.limit_events.add(event)
item1 = Item.objects.create(event=event, name="Ticket", default_price=23)
tl = event.ticket_layouts.create(name="Foo", default=True, layout='[{"a": 2}]')
TicketLayoutItem.objects.create(layout=tl, item=item1)
return event, user, tl, item1
RES_LAYOUT = {
'id': 1,
'name': 'Foo',
'default': True,
'item_assignments': [{'item': 1}],
'layout': [{'a': 2}],
'background': None
}
@pytest.mark.django_db
def test_api_list(env, client):
res = copy.copy(RES_LAYOUT)
res['id'] = env[2].pk
res['item_assignments'][0]['item'] = env[3].pk
client.login(email='dummy@dummy.dummy', password='dummy')
r = json.loads(
client.get('/api/v1/organizers/{}/events/{}/ticketlayouts/'.format(
env[0].slug, env[0].organizer.slug)).content.decode('utf-8')
)
assert r['results'] == [res]
@pytest.mark.django_db
def test_api_detail(env, client):
res = copy.copy(RES_LAYOUT)
res['id'] = env[2].pk
res['item_assignments'][0]['item'] = env[3].pk
client.login(email='dummy@dummy.dummy', password='dummy')
r = json.loads(
client.get('/api/v1/organizers/{}/events/{}/ticketlayouts/{}/'.format(
env[0].slug, env[0].organizer.slug, env[2].pk)).content.decode('utf-8')
)
assert r == res

View File

@@ -0,0 +1,125 @@
import datetime
from tests.base import SoupTest, extract_form_fields
from pretix.base.models import Event, Item, Organizer, Team, User
from pretix.plugins.ticketoutputpdf.models import TicketLayoutItem
class TicketLayoutFormTest(SoupTest):
def setUp(self):
super().setUp()
self.user = User.objects.create_user('dummy@dummy.dummy', 'dummy')
self.orga1 = Organizer.objects.create(name='CCC', slug='ccc')
self.orga2 = Organizer.objects.create(name='MRM', slug='mrm')
self.event1 = Event.objects.create(
organizer=self.orga1, name='30C3', slug='30c3',
plugins='pretix.plugins.ticketoutputpdf',
date_from=datetime.datetime(2013, 12, 26, tzinfo=datetime.timezone.utc),
)
self.item1 = Item.objects.create(event=self.event1, name="Standard", default_price=0, position=1)
t = Team.objects.create(organizer=self.orga1, can_change_event_settings=True, can_view_orders=True,
can_change_items=True, all_events=True, can_create_events=True)
t.members.add(self.user)
t.limit_events.add(self.event1)
self.client.login(email='dummy@dummy.dummy', password='dummy')
def test_create(self):
doc = self.get_doc('/control/event/%s/%s/pdfoutput/add' % (self.orga1.slug, self.event1.slug))
form_data = extract_form_fields(doc.select('.container-fluid form')[0])
form_data['name'] = 'Layout 1'
doc = self.post_doc('/control/event/%s/%s/pdfoutput/add' % (self.orga1.slug, self.event1.slug), form_data)
assert doc.select(".alert-success")
self.assertIn("Layout 1", doc.select("#page-wrapper")[0].text)
assert self.event1.ticket_layouts.get(
default=True, name='Layout 1'
)
def test_set_default(self):
bl1 = self.event1.ticket_layouts.create(name="Layout 1", default=True)
bl2 = self.event1.ticket_layouts.create(name="Layout 2")
self.post_doc('/control/event/%s/%s/pdfoutput/%s/default' % (self.orga1.slug, self.event1.slug, bl2.id), {})
bl1.refresh_from_db()
assert not bl1.default
bl2.refresh_from_db()
assert bl2.default
def test_delete(self):
bl1 = self.event1.ticket_layouts.create(name="Layout 1", default=True)
bl2 = self.event1.ticket_layouts.create(name="Layout 2")
doc = self.get_doc('/control/event/%s/%s/pdfoutput/%s/delete' % (self.orga1.slug, self.event1.slug, bl1.id))
form_data = extract_form_fields(doc.select('.container-fluid form')[0])
doc = self.post_doc('/control/event/%s/%s/pdfoutput/%s/delete' % (self.orga1.slug, self.event1.slug, bl1.id),
form_data)
assert doc.select(".alert-success")
self.assertNotIn("Layout 1", doc.select("#page-wrapper")[0].text)
assert self.event1.ticket_layouts.count() == 1
bl2.refresh_from_db()
assert bl2.default
def test_set_on_item(self):
self.event1.ticket_layouts.create(name="Layout 1", default=True)
bl2 = self.event1.ticket_layouts.create(name="Layout 2")
self.client.post('/control/event/%s/%s/items/%d/' % (self.orga1.slug, self.event1.slug, self.item1.id), {
'name_0': 'Standard',
'default_price': '23.00',
'tax_rate': '19.00',
'active': 'yes',
'allow_cancel': 'yes',
'ticketlayoutitem-layout': bl2.pk
})
assert TicketLayoutItem.objects.get(item=self.item1, layout=bl2)
self.client.post('/control/event/%s/%s/items/%d/' % (self.orga1.slug, self.event1.slug, self.item1.id), {
'name_0': 'Standard',
'default_price': '23.00',
'tax_rate': '19.00',
'active': 'yes',
'allow_cancel': 'yes',
})
assert not TicketLayoutItem.objects.filter(item=self.item1, layout=bl2).exists()
def test_item_copy(self):
bl2 = self.event1.ticket_layouts.create(name="Layout 2")
TicketLayoutItem.objects.create(item=self.item1, layout=bl2)
self.client.post('/control/event/%s/%s/items/add' % (self.orga1.slug, self.event1.slug), {
'name_0': 'Intermediate',
'default_price': '23.00',
'tax_rate': '19.00',
'copy_from': str(self.item1.pk),
'has_variations': '1'
})
i_new = Item.objects.get(name__icontains='Intermediate')
assert TicketLayoutItem.objects.get(item=i_new, layout=bl2)
assert TicketLayoutItem.objects.get(item=self.item1, layout=bl2)
def test_copy_event(self):
bl2 = self.event1.ticket_layouts.create(name="Layout 2")
TicketLayoutItem.objects.create(item=self.item1, layout=bl2)
self.post_doc('/control/events/add', {
'event_wizard-current_step': 'foundation',
'foundation-organizer': self.orga1.pk,
'foundation-locales': ('en',)
})
self.post_doc('/control/events/add', {
'event_wizard-current_step': 'basics',
'basics-name_0': '33C3',
'basics-slug': '33c3',
'basics-date_from_0': '2016-12-27',
'basics-date_from_1': '10:00:00',
'basics-date_to_0': '2016-12-30',
'basics-date_to_1': '19:00:00',
'basics-location_0': 'Hamburg',
'basics-currency': 'EUR',
'basics-tax_rate': '19.00',
'basics-locale': 'en',
'basics-timezone': 'Europe/Berlin',
})
self.post_doc('/control/events/add', {
'event_wizard-current_step': 'copy',
'copy-copy_from_event': self.event1.pk
})
ev = Event.objects.get(slug='33c3')
i_new = ev.items.first()
bl_new = ev.ticket_layouts.first()
assert TicketLayoutItem.objects.get(item=i_new, layout=bl_new)

View File

@@ -13,7 +13,7 @@ from pretix.plugins.ticketoutputpdf.ticketoutput import PdfTicketOutput
@pytest.fixture
def env():
def env0():
o = Organizer.objects.create(name='Dummy', slug='dummy')
event = Event.objects.create(
organizer=o, name='Dummy', slug='dummy',
@@ -39,8 +39,8 @@ def env():
@pytest.mark.django_db
def test_generate_pdf(env):
event, order = env
def test_generate_pdf(env0):
event, order = env0
event.settings.set('ticketoutput_pdf_code_x', 30)
event.settings.set('ticketoutput_pdf_code_y', 50)
event.settings.set('ticketoutput_pdf_code_s', 2)