CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Protect against fee signal returning None

Browse Source
This commit is contained in:
Raphael Michel
2019-07-05 14:33:43 +02:00
parent 09ef7aac6e
commit a5e94bf63f
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/pretix/base/services/cart.py
View File

@@ -940,7 +940,8 @@ def get_fees(event, request, total, invoice_address, provider):
for recv, resp in fee_calculation_for_cart.send(sender=event, request=request, invoice_address=invoice_address, for recv, resp in fee_calculation_for_cart.send(sender=event, request=request, invoice_address=invoice_address,
total=total): total=total):
fees += resp if resp:
fees += resp
total = total + sum(f.value for f in fees) total = total + sum(f.value for f in fees)
if provider and total != 0: if provider and total != 0:

3
src/pretix/base/services/orders.py
View File

@@ -594,7 +594,8 @@ def _get_fees(positions: List[CartPosition], payment_provider: BasePaymentProvid
for recv, resp in order_fee_calculation.send(sender=event, invoice_address=address, total=total, for recv, resp in order_fee_calculation.send(sender=event, invoice_address=address, total=total,
meta_info=meta_info, positions=positions): meta_info=meta_info, positions=positions):
fees += resp if resp:
fees += resp
total += sum(f.value for f in fees) total += sum(f.value for f in fees)
if payment_provider: if payment_provider: