mirror of
https://github.com/pretix/pretix.git
synced 2026-05-07 15:34:02 +00:00
Payment step: Fix edge case when redeeming gift cards with service fees
This commit is contained in:
@@ -1124,8 +1124,13 @@ class PaymentStep(CartMixin, TemplateFlowStep):
|
|||||||
def _total_order_value(self):
|
def _total_order_value(self):
|
||||||
cart = get_cart(self.request)
|
cart = get_cart(self.request)
|
||||||
total = get_cart_total(self.request)
|
total = get_cart_total(self.request)
|
||||||
total += sum([f.value for f in get_fees(self.request.event, self.request, total, self.invoice_address, None,
|
total += sum([
|
||||||
cart)])
|
f.value for f in get_fees(
|
||||||
|
self.request.event, self.request, total, self.invoice_address,
|
||||||
|
[p for p in self.cart_session.get('payments', []) if p.get('multi_use_supported')],
|
||||||
|
cart,
|
||||||
|
)
|
||||||
|
])
|
||||||
return Decimal(total)
|
return Decimal(total)
|
||||||
|
|
||||||
@cached_property
|
@cached_property
|
||||||
@@ -1211,6 +1216,7 @@ class PaymentStep(CartMixin, TemplateFlowStep):
|
|||||||
f'and returned True from payment_prepare, but did not call '
|
f'and returned True from payment_prepare, but did not call '
|
||||||
f'add_payment_to_cart')
|
f'add_payment_to_cart')
|
||||||
|
|
||||||
|
cart = self.get_cart()
|
||||||
valid, remainder = self.current_payments_valid(cart['total'])
|
valid, remainder = self.current_payments_valid(cart['total'])
|
||||||
if valid:
|
if valid:
|
||||||
return redirect(self.get_next_url(request))
|
return redirect(self.get_next_url(request))
|
||||||
|
|||||||
Reference in New Issue
Block a user