Add checkin_attetion field to Order model

src/pretix/api/serializers/order.py

@@ -135,7 +135,7 @@ class OrderSerializer(I18nAwareModelSerializer):
         model = Order
         fields = ('code', 'status', 'secret', 'email', 'locale', 'datetime', 'expires', 'payment_date',
                   'payment_provider', 'fees', 'total', 'comment', 'invoice_address', 'positions', 'downloads',
-                  'payment_fee', 'payment_fee_tax_rate', 'payment_fee_tax_value')
+                  'payment_fee', 'payment_fee_tax_rate', 'payment_fee_tax_value', 'checkin_attention')
 
 
 class InlineInvoiceLineSerializer(I18nAwareModelSerializer):

src/pretix/base/migrations/0082_auto_20180222_0938.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2018-02-22 09:38
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0081_auto_20180220_1031'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='order',
+            name='checkin_attention',
+            field=models.BooleanField(default=False, help_text='If you set this, the check-in app will show a visible warning that tickets of this order require special attention. This will not show any details or custom message, so you need to brief your check-in staff how to handle these cases.', verbose_name='Requires special attention'),
+        ),
+        migrations.AlterField(
+            model_name='checkinlist',
+            name='include_pending',
+            field=models.BooleanField(default=False, help_text='With this option, people will be able to check in even if the order have not been paid. This only works with pretixdesk 0.3.0 or newer or pretixdroid 1.9 or newer.', verbose_name='Include pending orders'),
+        ),
+    ]

src/pretix/base/models/orders.py

@@ -162,6 +162,13 @@ class Order(LoggedModel):
         help_text=_("The text entered in this field will not be visible to the user and is available for your "
                     "convenience.")
     )
+    checkin_attention = models.BooleanField(
+        verbose_name=_('Requires special attention'),
+        default=False,
+        help_text=_('If you set this, the check-in app will show a visible warning that tickets of this order require '
+                    'special attention. This will not show any details or custom message, so you need to brief your '
+                    'check-in staff how to handle these cases.')
+    )
     expiry_reminder_sent = models.BooleanField(
         default=False
     )

src/pretix/control/forms/orders.py

@@ -62,7 +62,7 @@ class ExporterForm(forms.Form):
 class CommentForm(I18nModelForm):
     class Meta:
         model = Order
-        fields = ['comment']
+        fields = ['comment', 'checkin_attention']
         widgets = {
             'comment': forms.Textarea(attrs={
                 'rows': 3,

src/pretix/control/logdisplay.py

@@ -124,6 +124,8 @@ def pretixcontrol_logentry_display(sender: Event, logentry: LogEntry, **kwargs):
         'pretix.event.order.invoice.regenerated': _('The invoice has been regenerated.'),
         'pretix.event.order.invoice.reissued': _('The invoice has been reissued.'),
         'pretix.event.order.comment': _('The order\'s internal comment has been updated.'),
+        'pretix.event.order.checkin_attention': _('The order\'s flag to require attention at check-in has been '
+                                                  'toggled.'),
         'pretix.event.order.payment.changed': _('The payment method has been changed.'),
         'pretix.event.order.email.sent': _('An unidentified type email has been sent.'),
         'pretix.event.order.email.custom_sent': _('A custom email has been sent.'),

src/pretix/control/templates/pretixcontrol/order/index.html

@@ -435,6 +435,7 @@
                         {% csrf_token %}
                         <div class="row">
                             {% bootstrap_field comment_form.comment layout="horizontal" show_help=True show_label=False horizontal_field_class="col-md-12" %}
+                            {% bootstrap_field comment_form.checkin_attention layout="horizontal" show_help=True show_label=False horizontal_field_class="col-md-12" %}
                         </div>
                         <button class="btn btn-default">
                             {% trans "Update comment" %}

src/pretix/control/views/orders.py

@@ -136,7 +136,10 @@ class OrderDetail(OrderView):
         ctx['event'] = self.request.event
         ctx['payment'] = self.payment_provider.order_control_render(self.request, self.object)
         ctx['invoices'] = list(self.order.invoices.all().select_related('event'))
-        ctx['comment_form'] = CommentForm(initial={'comment': self.order.comment})
+        ctx['comment_form'] = CommentForm(initial={
+            'comment': self.order.comment,
+            'checkin_attention': self.order.checkin_attention
+        })
         ctx['display_locale'] = dict(settings.LANGUAGES)[self.object.locale or self.request.event.settings.locale]
         return ctx
 
@@ -191,11 +194,18 @@ class OrderComment(OrderView):
     def post(self, *args, **kwargs):
         form = CommentForm(self.request.POST)
         if form.is_valid():
-            self.order.comment = form.cleaned_data.get('comment')
+            if form.cleaned_data.get('comment') != self.order.comment:
+                self.order.comment = form.cleaned_data.get('comment')
+                self.order.log_action('pretix.event.order.comment', user=self.request.user, data={
+                    'new_comment': form.cleaned_data.get('comment')
+                })
+
+            if form.cleaned_data.get('checkin_attention') != self.order.checkin_attention:
+                self.order.checkin_attention = form.cleaned_data.get('checkin_attention')
+                self.order.log_action('pretix.event.order.checkin_attention', user=self.request.user, data={
+                    'new_value': form.cleaned_data.get('checkin_attention')
+                })
             self.order.save()
-            self.order.log_action('pretix.event.order.comment', user=self.request.user, data={
-                'new_comment': form.cleaned_data.get('comment')
-            })
             messages.success(self.request, _('The comment has been updated.'))
         else:
             messages.error(self.request, _('Could not update the comment.'))

src/pretix/plugins/pretixdroid/views.py

@@ -337,7 +337,7 @@ def serialize_op(op, redeemed, clist):
         'variation': str(op.variation) if op.variation else None,
         'variation_id': op.variation_id,
         'attendee_name': name,
-        'attention': op.item.checkin_attention,
+        'attention': op.item.checkin_attention or op.order.checkin_attention,
         'redeemed': redeemed,
         'paid': op.order.status == Order.STATUS_PAID,
         'checkin_allowed': checkin_allowed