From c2e5dff72b6bec3df01aac1414cdf9cfbcef3860 Mon Sep 17 00:00:00 2001
From: Thomas Hollstegge <thomas.hollstegge@lab25.de>
Date: Wed, 3 Apr 2019 14:58:57 +0200
Subject: [PATCH 1/3] Add service fees based on order volume

---
 pretix_servicefees/locale/ar/LC_MESSAGES/django.po |  8 ++++++++
 pretix_servicefees/locale/cs/LC_MESSAGES/django.po |  8 ++++++++
 pretix_servicefees/locale/da/LC_MESSAGES/django.po |  8 ++++++++
 pretix_servicefees/locale/de/LC_MESSAGES/django.po |  8 ++++++++
 .../locale/de_Informal/LC_MESSAGES/django.po       |  8 ++++++++
 pretix_servicefees/locale/django.pot               |  8 ++++++++
 pretix_servicefees/locale/el/LC_MESSAGES/django.po |  8 ++++++++
 pretix_servicefees/locale/es/LC_MESSAGES/django.po |  8 ++++++++
 pretix_servicefees/locale/fr/LC_MESSAGES/django.po |  8 ++++++++
 pretix_servicefees/locale/it/LC_MESSAGES/django.po |  8 ++++++++
 pretix_servicefees/locale/nl/LC_MESSAGES/django.po |  8 ++++++++
 .../locale/nl_BE/LC_MESSAGES/django.po             |  8 ++++++++
 .../locale/nl_Informal/LC_MESSAGES/django.po       |  8 ++++++++
 .../locale/pt_BR/LC_MESSAGES/django.po             |  8 ++++++++
 pretix_servicefees/locale/tr/LC_MESSAGES/django.po |  8 ++++++++
 pretix_servicefees/signals.py                      | 14 ++++++++++----
 .../templates/pretix_servicefees/settings.html     |  2 ++
 pretix_servicefees/views.py                        |  2 ++
 18 files changed, 134 insertions(+), 4 deletions(-)

diff --git a/pretix_servicefees/locale/ar/LC_MESSAGES/django.po b/pretix_servicefees/locale/ar/LC_MESSAGES/django.po
index 5683297..4c63a5e 100644
--- a/pretix_servicefees/locale/ar/LC_MESSAGES/django.po
+++ b/pretix_servicefees/locale/ar/LC_MESSAGES/django.po
@@ -45,5 +45,13 @@ msgid "Service fee"
 msgstr ""
 
 #: pretix_servicefees/views.py:12
+msgid "Service fee (%)"
+msgstr ""
+
+#: pretix_servicefees/views.py:13
 msgid "Service fee with resellers"
 msgstr ""
+
+#: pretix_servicefees/views.py:14
+msgid "Service fee with resellers (%)"
+msgstr ""
diff --git a/pretix_servicefees/locale/cs/LC_MESSAGES/django.po b/pretix_servicefees/locale/cs/LC_MESSAGES/django.po
index 3eec18b..78f387a 100644
--- a/pretix_servicefees/locale/cs/LC_MESSAGES/django.po
+++ b/pretix_servicefees/locale/cs/LC_MESSAGES/django.po
@@ -45,5 +45,13 @@ msgid "Service fee"
 msgstr ""
 
 #: pretix_servicefees/views.py:12
+msgid "Service fee (%)"
+msgstr ""
+
+#: pretix_servicefees/views.py:13
 msgid "Service fee with resellers"
 msgstr ""
+
+#: pretix_servicefees/views.py:14
+msgid "Service fee with resellers (%)"
+msgstr ""
diff --git a/pretix_servicefees/locale/da/LC_MESSAGES/django.po b/pretix_servicefees/locale/da/LC_MESSAGES/django.po
index 8d44966..23b817d 100644
--- a/pretix_servicefees/locale/da/LC_MESSAGES/django.po
+++ b/pretix_servicefees/locale/da/LC_MESSAGES/django.po
@@ -48,5 +48,13 @@ msgid "Service fee"
 msgstr ""
 
 #: pretix_servicefees/views.py:12
+msgid "Service fee (%)"
+msgstr ""
+
+#: pretix_servicefees/views.py:13
 msgid "Service fee with resellers"
 msgstr ""
+
+#: pretix_servicefees/views.py:14
+msgid "Service fee with resellers (%)"
+msgstr ""
diff --git a/pretix_servicefees/locale/de/LC_MESSAGES/django.po b/pretix_servicefees/locale/de/LC_MESSAGES/django.po
index 0091735..e67cab1 100644
--- a/pretix_servicefees/locale/de/LC_MESSAGES/django.po
+++ b/pretix_servicefees/locale/de/LC_MESSAGES/django.po
@@ -45,5 +45,13 @@ msgid "Service fee"
 msgstr "Servicegebühr"
 
 #: pretix_servicefees/views.py:12
+msgid "Service fee (%)"
+msgstr "Servicegebühr (%)"
+
+#: pretix_servicefees/views.py:13
 msgid "Service fee with resellers"
 msgstr "Servicegebühr für Vorverkaufsstellen"
+
+#: pretix_servicefees/views.py:14
+msgid "Service fee with resellers (%)"
+msgstr "Servicegebühr für Vorverkaufsstellen (%)"
diff --git a/pretix_servicefees/locale/de_Informal/LC_MESSAGES/django.po b/pretix_servicefees/locale/de_Informal/LC_MESSAGES/django.po
index a36cda9..23ea5ea 100644
--- a/pretix_servicefees/locale/de_Informal/LC_MESSAGES/django.po
+++ b/pretix_servicefees/locale/de_Informal/LC_MESSAGES/django.po
@@ -45,5 +45,13 @@ msgid "Service fee"
 msgstr "Servicegebühr"
 
 #: pretix_servicefees/views.py:12
+msgid "Service fee (%)"
+msgstr "Servicegebühr (%)"
+
+#: pretix_servicefees/views.py:13
 msgid "Service fee with resellers"
 msgstr "Servicegebühr für Vorverkaufsstellen"
+
+#: pretix_servicefees/views.py:14
+msgid "Service fee with resellers (%)"
+msgstr "Servicegebühr für Vorverkaufsstellen (%)"
diff --git a/pretix_servicefees/locale/django.pot b/pretix_servicefees/locale/django.pot
index 7275353..db3ba21 100644
--- a/pretix_servicefees/locale/django.pot
+++ b/pretix_servicefees/locale/django.pot
@@ -46,5 +46,13 @@ msgid "Service fee"
 msgstr ""
 
 #: pretix_servicefees/views.py:12
+msgid "Service fee (%)"
+msgstr ""
+
+#: pretix_servicefees/views.py:13
 msgid "Service fee with resellers"
 msgstr ""
+
+#: pretix_servicefees/views.py:14
+msgid "Service fee with resellers (%)"
+msgstr ""
diff --git a/pretix_servicefees/locale/el/LC_MESSAGES/django.po b/pretix_servicefees/locale/el/LC_MESSAGES/django.po
index 975e3bb..d7197c5 100644
--- a/pretix_servicefees/locale/el/LC_MESSAGES/django.po
+++ b/pretix_servicefees/locale/el/LC_MESSAGES/django.po
@@ -45,5 +45,13 @@ msgid "Service fee"
 msgstr ""
 
 #: pretix_servicefees/views.py:12
+msgid "Service fee (%)"
+msgstr ""
+
+#: pretix_servicefees/views.py:13
 msgid "Service fee with resellers"
 msgstr ""
+
+#: pretix_servicefees/views.py:14
+msgid "Service fee with resellers (%)"
+msgstr ""
diff --git a/pretix_servicefees/locale/es/LC_MESSAGES/django.po b/pretix_servicefees/locale/es/LC_MESSAGES/django.po
index 00e37b0..2172e60 100644
--- a/pretix_servicefees/locale/es/LC_MESSAGES/django.po
+++ b/pretix_servicefees/locale/es/LC_MESSAGES/django.po
@@ -48,5 +48,13 @@ msgid "Service fee"
 msgstr "Tarifa por servicio"
 
 #: pretix_servicefees/views.py:12
+msgid "Service fee (%)"
+msgstr "Tarifa por servicio (%)"
+
+#: pretix_servicefees/views.py:13
 msgid "Service fee with resellers"
 msgstr ""
+
+#: pretix_servicefees/views.py:14
+msgid "Service fee with resellers (%)"
+msgstr ""
diff --git a/pretix_servicefees/locale/fr/LC_MESSAGES/django.po b/pretix_servicefees/locale/fr/LC_MESSAGES/django.po
index 6628fba..eca00e1 100644
--- a/pretix_servicefees/locale/fr/LC_MESSAGES/django.po
+++ b/pretix_servicefees/locale/fr/LC_MESSAGES/django.po
@@ -48,7 +48,15 @@ msgid "Service fee"
 msgstr "Frais de service"
 
 #: pretix_servicefees/views.py:12
+msgid "Service fee (%)"
+msgstr "Frais de service (%)"
+
+#: pretix_servicefees/views.py:13
 #, fuzzy
 #| msgid "Service fees"
 msgid "Service fee with resellers"
 msgstr "Frais de service"
+
+#: pretix_servicefees/views.py:14
+msgid "Service fee with resellers (%)"
+msgstr "Frais de service (%)"
diff --git a/pretix_servicefees/locale/it/LC_MESSAGES/django.po b/pretix_servicefees/locale/it/LC_MESSAGES/django.po
index b4744f5..e6b18af 100644
--- a/pretix_servicefees/locale/it/LC_MESSAGES/django.po
+++ b/pretix_servicefees/locale/it/LC_MESSAGES/django.po
@@ -45,5 +45,13 @@ msgid "Service fee"
 msgstr ""
 
 #: pretix_servicefees/views.py:12
+msgid "Service fee (%)"
+msgstr ""
+
+#: pretix_servicefees/views.py:13
 msgid "Service fee with resellers"
 msgstr ""
+
+#: pretix_servicefees/views.py:14
+msgid "Service fee with resellers (%)"
+msgstr ""
diff --git a/pretix_servicefees/locale/nl/LC_MESSAGES/django.po b/pretix_servicefees/locale/nl/LC_MESSAGES/django.po
index 0e9b43d..7f8ee23 100644
--- a/pretix_servicefees/locale/nl/LC_MESSAGES/django.po
+++ b/pretix_servicefees/locale/nl/LC_MESSAGES/django.po
@@ -50,5 +50,13 @@ msgid "Service fee"
 msgstr "Servicekosten"
 
 #: pretix_servicefees/views.py:12
+msgid "Service fee (%)"
+msgstr "Servicekosten (%)"
+
+#: pretix_servicefees/views.py:13
 msgid "Service fee with resellers"
 msgstr "Servicekosten voor wederverkopers"
+
+#: pretix_servicefees/views.py:14
+msgid "Service fee with resellers (%)"
+msgstr "Servicekosten voor wederverkopers (%)"
diff --git a/pretix_servicefees/locale/nl_BE/LC_MESSAGES/django.po b/pretix_servicefees/locale/nl_BE/LC_MESSAGES/django.po
index 7c1b2af..8ca95a5 100644
--- a/pretix_servicefees/locale/nl_BE/LC_MESSAGES/django.po
+++ b/pretix_servicefees/locale/nl_BE/LC_MESSAGES/django.po
@@ -45,5 +45,13 @@ msgid "Service fee"
 msgstr ""
 
 #: pretix_servicefees/views.py:12
+msgid "Service fee (%)"
+msgstr ""
+
+#: pretix_servicefees/views.py:13
 msgid "Service fee with resellers"
 msgstr ""
+
+#: pretix_servicefees/views.py:14
+msgid "Service fee with resellers (%)"
+msgstr ""
diff --git a/pretix_servicefees/locale/nl_Informal/LC_MESSAGES/django.po b/pretix_servicefees/locale/nl_Informal/LC_MESSAGES/django.po
index d5029f9..06167b8 100644
--- a/pretix_servicefees/locale/nl_Informal/LC_MESSAGES/django.po
+++ b/pretix_servicefees/locale/nl_Informal/LC_MESSAGES/django.po
@@ -50,5 +50,13 @@ msgid "Service fee"
 msgstr "Servicekosten"
 
 #: pretix_servicefees/views.py:12
+msgid "Service fee (%)"
+msgstr "Servicekosten (%)"
+
+#: pretix_servicefees/views.py:13
 msgid "Service fee with resellers"
 msgstr "Servicekosten voor wederverkopers"
+
+#: pretix_servicefees/views.py:14
+msgid "Service fee with resellers (%)"
+msgstr "Servicekosten voor wederverkopers (%)"
diff --git a/pretix_servicefees/locale/pt_BR/LC_MESSAGES/django.po b/pretix_servicefees/locale/pt_BR/LC_MESSAGES/django.po
index 6395c96..e05a1b1 100644
--- a/pretix_servicefees/locale/pt_BR/LC_MESSAGES/django.po
+++ b/pretix_servicefees/locale/pt_BR/LC_MESSAGES/django.po
@@ -45,5 +45,13 @@ msgid "Service fee"
 msgstr ""
 
 #: pretix_servicefees/views.py:12
+msgid "Service fee (%)"
+msgstr ""
+
+#: pretix_servicefees/views.py:13
 msgid "Service fee with resellers"
 msgstr ""
+
+#: pretix_servicefees/views.py:14
+msgid "Service fee with resellers (%)"
+msgstr ""
diff --git a/pretix_servicefees/locale/tr/LC_MESSAGES/django.po b/pretix_servicefees/locale/tr/LC_MESSAGES/django.po
index efaf1b9..89587c5 100644
--- a/pretix_servicefees/locale/tr/LC_MESSAGES/django.po
+++ b/pretix_servicefees/locale/tr/LC_MESSAGES/django.po
@@ -50,7 +50,15 @@ msgid "Service fee"
 msgstr "Servis ücreti"
 
 #: pretix_servicefees/views.py:12
+msgid "Service fee (%)"
+msgstr "Servis ücreti (%)"
+
+#: pretix_servicefees/views.py:13
 #, fuzzy
 #| msgid "Service fees"
 msgid "Service fee with resellers"
 msgstr "Servis ücretleri"
+
+#: pretix_servicefees/views.py:14
+msgid "Service fee with resellers (%)"
+msgstr "Servis ücretleri (%)"
diff --git a/pretix_servicefees/signals.py b/pretix_servicefees/signals.py
index aee8859..ec6588d 100644
--- a/pretix_servicefees/signals.py
+++ b/pretix_servicefees/signals.py
@@ -26,10 +26,16 @@ def navbar_settings(sender, request, **kwargs):
 
 
 def get_fees(event, total, invoice_address, mod=''):
-    fee = event.settings.get('service_fee_abs' + mod, as_type=Decimal)
-    if mod and fee is None:
-        fee = event.settings.get('service_fee_abs', as_type=Decimal)
-    if fee and total != Decimal('0.00'):
+    fee_abs = event.settings.get('service_fee_abs' + mod, as_type=Decimal)
+    if mod and fee_abs is None:
+        fee_abs = event.settings.get('service_fee_abs', as_type=Decimal)
+
+    fee_percent = event.settings.get('service_fee_percent' + mod, as_type=Decimal)
+    if mod and fee_percent is None:
+        fee_percent = event.settings.get('service_fee_percent', as_type=Decimal)
+
+    if fee_abs and fee_percent and total != Decimal('0.00'):
+        fee = fee_abs + total * (fee_percent / 100)
         tax_rule = event.settings.tax_rate_default or TaxRule.zero()
         if tax_rule.tax_applicable(invoice_address):
             tax = tax_rule.tax(fee)
diff --git a/pretix_servicefees/templates/pretix_servicefees/settings.html b/pretix_servicefees/templates/pretix_servicefees/settings.html
index 0185fbe..a3d62ac 100644
--- a/pretix_servicefees/templates/pretix_servicefees/settings.html
+++ b/pretix_servicefees/templates/pretix_servicefees/settings.html
@@ -8,7 +8,9 @@
         {% bootstrap_form_errors form %}
         <fieldset>
             {% bootstrap_field form.service_fee_abs layout="control" %}
+            {% bootstrap_field form.service_fee_percent layout="control" %}
             {% bootstrap_field form.service_fee_abs_resellers layout="control" %}
+            {% bootstrap_field form.service_fee_percent_resellers layout="control" %}
         </fieldset>
         <div class="form-group submit-group">
             <button type="submit" class="btn btn-primary btn-save">
diff --git a/pretix_servicefees/views.py b/pretix_servicefees/views.py
index 053c1f4..5358aa4 100644
--- a/pretix_servicefees/views.py
+++ b/pretix_servicefees/views.py
@@ -9,7 +9,9 @@ from pretix.control.views.event import EventSettingsViewMixin, EventSettingsForm
 
 class ServiceFeeSettingsForm(SettingsForm):
     service_fee_abs = forms.DecimalField(label=_('Service fee'))
+    service_fee_percent = forms.DecimalField(label=_('Service fee (%)'))
     service_fee_abs_resellers = forms.DecimalField(label=_('Service fee with resellers'))
+    service_fee_percent_resellers = forms.DecimalField(label=_('Service fee with resellers (%)'))
 
 
 class SettingsView(EventSettingsViewMixin, EventSettingsFormView):

From dc6f8ee299b31b755eb130c6ad82028f35fca6d4 Mon Sep 17 00:00:00 2001
From: Thomas Hollstegge <thomas.hollstegge@lab25.de>
Date: Wed, 3 Apr 2019 15:31:16 +0200
Subject: [PATCH 2/3] Relative fees: Add disclaimer

---
 pretix_servicefees/views.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pretix_servicefees/views.py b/pretix_servicefees/views.py
index 5358aa4..304532d 100644
--- a/pretix_servicefees/views.py
+++ b/pretix_servicefees/views.py
@@ -9,9 +9,19 @@ from pretix.control.views.event import EventSettingsViewMixin, EventSettingsForm
 
 class ServiceFeeSettingsForm(SettingsForm):
     service_fee_abs = forms.DecimalField(label=_('Service fee'))
-    service_fee_percent = forms.DecimalField(label=_('Service fee (%)'))
+    service_fee_percent = forms.DecimalField(
+        label=_('Service fee (%)'),
+        help_text=_('Percentage of the order total. Note that this percentage will currently only '
+                    'be calculated on the summed price of sold tickets, not on other fees like e.'
+                    'g. shipping fees, if there are any.')
+    )
     service_fee_abs_resellers = forms.DecimalField(label=_('Service fee with resellers'))
-    service_fee_percent_resellers = forms.DecimalField(label=_('Service fee with resellers (%)'))
+    service_fee_percent_resellers = forms.DecimalField(
+        label=_('Service fee with resellers (%)'),
+        help_text=_('Percentage of the order total. Note that this percentage will currently only '
+                    'be calculated on the summed price of sold tickets, not on other fees like e.'
+                    'g. shipping fees, if there are any.')
+    )
 
 
 class SettingsView(EventSettingsViewMixin, EventSettingsFormView):

From b7c242b8f3edbe7217205fb55acc7cd7bea6a03a Mon Sep 17 00:00:00 2001
From: Thomas Hollstegge <thomas.hollstegge@lab25.de>
Date: Wed, 3 Apr 2019 15:38:03 +0200
Subject: [PATCH 3/3] Relative fees: Round fee to event currency decimal places

---
 pretix_servicefees/signals.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pretix_servicefees/signals.py b/pretix_servicefees/signals.py
index ec6588d..cecbc6e 100644
--- a/pretix_servicefees/signals.py
+++ b/pretix_servicefees/signals.py
@@ -4,6 +4,7 @@ from django.urls import resolve, reverse
 from django.dispatch import receiver
 from django.http import HttpRequest
 from django.utils.translation import ugettext_lazy as _, ugettext, get_language
+from pretix.base.decimal import round_decimal
 from pretix.base.models import Event, Order, TaxRule
 from pretix.base.models.orders import OrderFee
 from pretix.base.signals import order_fee_calculation
@@ -35,7 +36,7 @@ def get_fees(event, total, invoice_address, mod=''):
         fee_percent = event.settings.get('service_fee_percent', as_type=Decimal)
 
     if fee_abs and fee_percent and total != Decimal('0.00'):
-        fee = fee_abs + total * (fee_percent / 100)
+        fee = round_decimal(fee_abs + total * (fee_percent / 100), event.currency)
         tax_rule = event.settings.tax_rate_default or TaxRule.zero()
         if tax_rule.tax_applicable(invoice_address):
             tax = tax_rule.tax(fee)