smash
/
pretix-servicefees
forked from github/pretix-servicefees
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #20 from pretix/reseller-config 

Adjust to new pretix-resellers branch
This commit is contained in:
Raphael Michel 2020-09-28 09:38:15 +02:00 committed by GitHub
parent 62c632e3af c1700682b9
commit 134f3fa62a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pretix_servicefees/signals.py
View File

@ -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)