Approvals

src/pretix/control/views/dashboards.py

@@ -269,12 +269,18 @@ def event_index(request, organizer, event):
     ctx['has_overpaid_orders'] = Order.annotate_overpayments(request.event.orders).filter(
         Q(~Q(status__in=(Order.STATUS_REFUNDED, Order.STATUS_CANCELED)) & Q(pending_sum_t__lt=0))
         | Q(Q(status__in=(Order.STATUS_REFUNDED, Order.STATUS_CANCELED)) & Q(pending_sum_rc__lt=0))
-        | Q(Q(status__in=(Order.STATUS_EXPIRED, Order.STATUS_PENDING)) & Q(pending_sum_t__lte=0))
+        | Q(Q(status__in=(Order.STATUS_EXPIRED, Order.STATUS_PENDING)) & Q(pending_sum_t__lt=0))
+        | Q(Q(status__in=(Order.STATUS_EXPIRED, Order.STATUS_PENDING)) & Q(pending_sum_t__lte=0)
+            & Q(require_approval=False))
     ).exists()
     ctx['has_pending_refunds'] = OrderRefund.objects.filter(
         order__event=request.event,
         state__in=(OrderRefund.REFUND_STATE_CREATED, OrderRefund.REFUND_STATE_EXTERNAL)
-    )
+    ).exists()
+    ctx['has_pending_approvals'] = request.event.orders.filter(
+        status=Order.STATUS_PENDING,
+        require_approval=True
+    ).exists()
 
     for a in ctx['actions']:
         a.display = a.display(request)

src/pretix/control/views/event.py

@@ -541,7 +541,13 @@ class MailSettingsPreview(EventPermissionRequiredMixin, View):
             'mail_text_order_canceled': ['code', 'event', 'url'],
             'mail_text_order_custom_mail': ['expire_date', 'event', 'code', 'date', 'url',
                                             'invoice_name', 'invoice_company'],
-            'mail_text_download_reminder': ['event', 'url']
+            'mail_text_download_reminder': ['event', 'url'],
+            'mail_text_order_placed_require_approval': ['total', 'currency', 'date', 'invoice_company',
+                                                        'total_with_currency', 'event', 'url', 'invoice_name'],
+            'mail_text_order_approved': ['total', 'currency', 'date', 'invoice_company',
+                                         'total_with_currency', 'event', 'url', 'invoice_name'],
+            'mail_text_order_denied': ['total', 'currency', 'date', 'invoice_company',
+                                       'total_with_currency', 'event', 'url', 'invoice_name'],
         }
 
     @cached_property
@@ -566,6 +572,7 @@ class MailSettingsPreview(EventPermissionRequiredMixin, View):
             'code': '68CYU2H6ZTP3WLK5',
             'invoice_name': _('John Doe'),
             'invoice_company': _('Sample Corporation'),
+            'common': _('An individial text with a reason can be inserted here.'),
             'payment_info': _('Please transfer money to this bank account: 9999-9999-9999-9999')
         }
 

src/pretix/control/views/orders.py

@@ -44,8 +44,8 @@ from pretix.base.services.invoices import (
 from pretix.base.services.locking import LockTimeoutException
 from pretix.base.services.mail import SendMailException, render_mail
 from pretix.base.services.orders import (
-    OrderChangeManager, OrderError, cancel_order, extend_order,
-    mark_order_expired, mark_order_refunded,
+    OrderChangeManager, OrderError, approve_order, cancel_order, deny_order,
+    extend_order, mark_order_expired, mark_order_refunded,
 )
 from pretix.base.services.stats import order_overview
 from pretix.base.signals import register_data_exporters
@@ -228,6 +228,46 @@ class OrderComment(OrderView):
         return HttpResponseNotAllowed(['POST'])
 
 
+class OrderApprove(OrderView):
+    permission = 'can_change_orders'
+
+    def post(self, *args, **kwargs):
+        if self.order.require_approval:
+            try:
+                approve_order(self.order, user=self.request.user)
+            except OrderError as e:
+                messages.error(self.request, str(e))
+            else:
+                messages.success(self.request, _('The order has been approved.'))
+        return redirect(self.get_order_url())
+
+    def get(self, *args, **kwargs):
+        return render(self.request, 'pretixcontrol/order/approve.html', {
+            'order': self.order,
+        })
+
+
+class OrderDeny(OrderView):
+    permission = 'can_change_orders'
+
+    def post(self, *args, **kwargs):
+        if self.order.require_approval:
+            try:
+                deny_order(self.order, user=self.request.user,
+                           comment=self.request.POST.get('comment'),
+                           send_mail=self.request.POST.get('send_email') == 'on')
+            except OrderError as e:
+                messages.error(self.request, str(e))
+            else:
+                messages.success(self.request, _('The order has been denied and is therefore now canceled.'))
+        return redirect(self.get_order_url())
+
+    def get(self, *args, **kwargs):
+        return render(self.request, 'pretixcontrol/order/deny.html', {
+            'order': self.order,
+        })
+
+
 class OrderPaymentCancel(OrderView):
     permission = 'can_change_orders'