From c1700682b956c423ce4b0e2522339ed73fe3a3bb Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Sat, 26 Sep 2020 19:14:21 +0200 Subject: [PATCH] Adjust to new pretix-resellers branch --- pretix_servicefees/signals.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pretix_servicefees/signals.py b/pretix_servicefees/signals.py index 3ef6a92..124d41c 100644 --- a/pretix_servicefees/signals.py +++ b/pretix_servicefees/signals.py @@ -88,7 +88,8 @@ def cart_fee(sender: Event, request: HttpRequest, invoice_address, total, **kwar else: try: reseller, user = get_reseller_and_user(request) - if getattr(reseller, 'do_not_charge_service_fees', False): + config = reseller.configs.get(organizer_id=sender.organizer_id) + if config.skip_default_service_fees: return [] except ResellerException: pass @@ -108,7 +109,8 @@ def order_fee(sender: Event, positions, invoice_address, total, meta_info, gift_ pass else: r = Reseller.objects.get(pk=meta_info.get('servicefees_reseller_id')) - if getattr(r, 'do_not_charge_service_fees', False): + config = r.configs.get(organizer_id=sender.organizer_id) + if config.skip_default_service_fees: return [] return get_fees(sender, total, invoice_address, mod, positions=positions, gift_cards=gift_cards)