Bump to 1.11.1

src/pretix/__init__.py

@@ -1 +1 @@
-__version__ = "1.11.0"
+__version__ = "1.11.1"

src/pretix/plugins/pretixdroid/migrations/0003_appconfiguration_squashed_0005_auto_20180106_2122.py

@@ -7,17 +7,6 @@ import django.db.models.deletion
 from django.db import migrations, models
 
 
-def assign_checkin_lists(apps, schema_editor):
-    AppConfiguration = apps.get_model('pretixdroid', 'AppConfiguration')
-
-    for ac in AppConfiguration.objects.all():
-        cl = ac.event.checkin_lists.get_or_create(subevent=ac.subevent, all_products=True, defaults={
-            'name': ac.subevent.name if ac.subevent else 'Default'
-        })[0]
-        ac.list = cl
-        ac.save()
-
-
 def runfwd(app, schema_editor):
     EventSettingsStore = app.get_model('pretixbase', 'Event_SettingsStore')
     AppConfiguration = app.get_model('pretixdroid', 'AppConfiguration')
@@ -30,6 +19,7 @@ def runfwd(app, schema_editor):
         )
         setting.delete()
 
+
 class Migration(migrations.Migration):
 
     replaces = [('pretixdroid', '0003_appconfiguration'), ('pretixdroid', '0004_auto_20171124_1657'), ('pretixdroid', '0005_auto_20180106_2122')]
@@ -51,7 +41,6 @@ class Migration(migrations.Migration):
                 ('show_info', models.BooleanField(default=True)),
                 ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='pretixbase.Event')),
                 ('items', models.ManyToManyField(blank=True, to='pretixbase.Item')),
-                ('subevent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='pretixbase.SubEvent')),
             ],
         ),
         migrations.RunPython(
@@ -83,14 +72,6 @@ class Migration(migrations.Migration):
             name='show_info',
             field=models.BooleanField(default=True, help_text='If disabled, the device can not see how many tickets exist and how many are already scanned. pretixdroid 1.6 or newer only.', verbose_name='Show information'),
         ),
-        migrations.RunPython(
-            code=assign_checkin_lists,
-            reverse_code=django.db.migrations.operations.special.RunPython.noop,
-        ),
-        migrations.RemoveField(
-            model_name='appconfiguration',
-            name='subevent',
-        ),
         migrations.AlterField(
             model_name='appconfiguration',
             name='list',

src/pretix/presale/views/order.py

@@ -15,7 +15,9 @@ from django.views.decorators.clickjacking import xframe_options_exempt
 from django.views.generic import TemplateView, View
 
 from pretix.base.models import CachedTicket, Invoice, Order, OrderPosition
-from pretix.base.models.orders import InvoiceAddress, OrderFee, QuestionAnswer
+from pretix.base.models.orders import (
+    CachedCombinedTicket, InvoiceAddress, OrderFee, QuestionAnswer,
+)
 from pretix.base.payment import PaymentException
 from pretix.base.services.invoices import (
     generate_cancellation, generate_invoice, invoice_pdf, invoice_qualified,
@@ -463,6 +465,7 @@ class OrderModify(EventViewMixin, OrderDetailMixin, QuestionsViewMixin, Template
             messages.success(self.request, _(success_message))
 
         CachedTicket.objects.filter(order_position__order=self.order).delete()
+        CachedCombinedTicket.objects.filter(order=self.order).delete()
         return redirect(self.get_order_url())
 
     def get(self, request, *args, **kwargs):

src/pretix/static/pretixpresale/js/widget/widget.js

@@ -203,9 +203,9 @@ Vue.component('pricebox', {
     computed: {
         display_price: function () {
             if (this.$root.display_net_prices) {
-                return floatformat(this.price.net, 2);
+                return roundTo(parseFloat(this.price.net), 2).toFixed(2);
             } else {
-                return floatformat(this.price.gross, 2);
+                return roundTo(parseFloat(this.price.gross), 2).toFixed(2);
             }
         },
         priceline: function () {