From 0d16743997f515332250a365f7442697dcd58ab6 Mon Sep 17 00:00:00 2001 From: Thomas Hollstegge Date: Wed, 3 Apr 2019 17:08:41 +0200 Subject: [PATCH] Correctly display relative fee --- pretix_servicefees/signals.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pretix_servicefees/signals.py b/pretix_servicefees/signals.py index 974b2b4..3b6d968 100644 --- a/pretix_servicefees/signals.py +++ b/pretix_servicefees/signals.py @@ -90,10 +90,18 @@ def order_fee(sender: Event, invoice_address, total, meta_info, **kwargs): @receiver(front_page_top, dispatch_uid="service_fee_front_page_top") def front_page_top_recv(sender: Event, **kwargs): - fee = sender.settings.get('service_fee_abs', as_type=Decimal) - if fee: + fees = [] + fee_abs = sender.settings.get('service_fee_abs', as_type=Decimal) + if fee_abs: + fees = fees + [money_filter(fee_abs, sender.currency)] + + fee_percent = sender.settings.get('service_fee_percent', as_type=Decimal) + if fee_percent: + fees = fees + ['{} %'.format(fee_percent)] + + if fee_abs or fee_percent: return '

%s

' % ugettext('A service fee of {} will be added on top of each order.').format( - money_filter(fee, sender.currency) + ' + '.join(fees) )