New concept for fee handling (#610)

* New concept for fee handling

* More usages

* Remove all usages, make all tests pass

* API changes

* Small fixes

* Fix order of invoice lines

* Rebase migration

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

@@ -266,28 +266,31 @@
                             <div class="clearfix"></div>
                         </div>
                     {% endfor %}
-                    {% if items.payment_fee %}
+                    {% for fee in items.fees %}
                         <div class="row-fluid product-row">
                             <div class="col-md-4 col-xs-6">
-                                <strong>{% trans "Payment method fee" %}</strong>
+                                <strong>{{ fee.get_fee_type_display }}</strong>
+                                {% if fee.description %}
+                                    – {{ fee.description }}
+                                {% endif %}
                             </div>
                             <div class="col-md-3 col-xs-6 col-md-offset-5 price">
                                 {% if event.settings.display_net_prices %}
-                                    <strong>{{ event.currency }} {{ order.payment_fee_net|floatformat:2 }}</strong>
-                                    {% if order.payment_fee_tax_rate %}
+                                    <strong>{{ event.currency }} {{ fee.net_value|floatformat:2 }}</strong>
+                                    {% if fee.tax_rate %}
                                         <br/>
                                         <small>
-                                            {% blocktrans trimmed with rate=order.payment_fee_tax_rate taxname=order.payment_fee_tax_rule.name|default:s_taxes %}
+                                            {% blocktrans trimmed with rate=fee.tax_rate taxname=fee.tax_rule.name|default:s_taxes %}
                                                 <strong>plus</strong> {{ rate }}% {{ taxname }}
                                             {% endblocktrans %}
                                         </small>
                                     {% endif %}
                                 {% else %}
-                                    <strong>{{ event.currency }} {{ items.payment_fee|floatformat:2 }}</strong>
-                                    {% if order.payment_fee_tax_rate %}
+                                    <strong>{{ event.currency }} {{ fee.value|floatformat:2 }}</strong>
+                                    {% if fee.tax_rate %}
                                         <br/>
                                         <small>
-                                            {% blocktrans trimmed with rate=order.payment_fee_tax_rate taxname=order.payment_fee_tax_rule.name|default:s_taxes %}
+                                            {% blocktrans trimmed with rate=fee.tax_rate taxname=fee.tax_rule.name|default:s_taxes %}
                                                 incl. {{ rate }}% {{ taxname }}
                                             {% endblocktrans %}
                                         </small>
@@ -296,7 +299,7 @@
                             </div>
                             <div class="clearfix"></div>
                         </div>
-                    {% endif %}
+                    {% endfor %}
                     {% if event.settings.display_net_prices and items.net_total %}
                         <div class="row-fluid product-row total">
                             <div class="col-md-4 col-xs-6">

src/pretix/control/views/event.py

@@ -29,6 +29,7 @@ from pretix.base.models import (
     Order, OrderPosition, RequiredAction, TaxRule, Voucher,
 )
 from pretix.base.models.event import EventMetaValue
+from pretix.base.models.orders import OrderFee
 from pretix.base.services import tickets
 from pretix.base.services.invoices import build_preview_invoice_pdf
 from pretix.base.signals import event_live_issues, register_ticket_outputs
@@ -957,7 +958,7 @@ class TaxDelete(EventPermissionRequiredMixin, DeleteView):
     def is_allowed(self) -> bool:
         o = self.object
         return (
-            not self.request.event.orders.filter(payment_fee_tax_rule=o).exists()
+            not OrderFee.objects.filter(tax_rule=o, order__event=self.request.event).exists()
             and not OrderPosition.objects.filter(tax_rule=o, order__event=self.request.event).exists()
             and not self.request.event.items.filter(tax_rule=o).exists()
             and self.request.event.settings.tax_rate_default != o

src/pretix/control/views/orders.py

@@ -27,6 +27,7 @@ from pretix.base.models import (
     generate_position_secret, generate_secret,
 )
 from pretix.base.models.event import SubEvent
+from pretix.base.models.orders import OrderFee
 from pretix.base.models.tax import EU_COUNTRIES
 from pretix.base.services.export import export
 from pretix.base.services.invoices import (
@@ -183,7 +184,7 @@ class OrderDetail(OrderView):
             'positions': positions,
             'raw': cartpos,
             'total': self.object.total,
-            'payment_fee': self.object.payment_fee,
+            'fees': self.object.fees.all(),
             'net_total': self.object.net_total,
             'tax_total': self.object.tax_total,
         }
@@ -860,7 +861,7 @@ class OverView(EventPermissionRequiredMixin, TemplateView):
 
         ctx['items_by_category'], ctx['total'] = order_overview(self.request.event, subevent=subevent)
         ctx['subevent_warning'] = self.request.event.has_subevents and subevent and (
-            self.request.event.orders.filter(payment_fee__gt=0).exists()
+            OrderFee.objects.filter(order__event=self.request.event).exclude(value=0).exists()
         )
         return ctx