CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-10 16:04:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

PPv2: Include other fees than payment fees into the XHR-calculation

Browse Source
This commit is contained in:
Martin Gross
2022-06-01 12:10:58 +02:00
parent a8286f77d8
commit 68097291ca
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pretix/plugins/paypal2/payment.py
View File

@@ -525,7 +525,7 @@ class PaypalMethod(BasePaymentProvider):
) )
request.session['payment_paypal_payment'] = payment.pk request.session['payment_paypal_payment'] = payment.pk
elif cart and not payment: elif cart and not payment:
value = self.format_price(cart['total'] + cart['fee']) value = self.format_price(cart['cart_total'] + cart['cart_fees'] + cart['payment_fee'])
currency = request.event.currency currency = request.event.currency
description = __('Event tickets for {event}').format(event=request.event.name) description = __('Event tickets for {event}').format(event=request.event.name)
custom_id = '{prefix}{slug}{postfix}'.format( custom_id = '{prefix}{slug}{postfix}'.format(

16
src/pretix/plugins/paypal2/views.py
View File

@@ -57,6 +57,7 @@ from paypalcheckoutsdk import orders as pp_orders, payments as pp_payments
from pretix.base.models import Event, Order, OrderPayment, OrderRefund, Quota from pretix.base.models import Event, Order, OrderPayment, OrderRefund, Quota
from pretix.base.payment import PaymentException from pretix.base.payment import PaymentException
from pretix.base.services.cart import get_fees
from pretix.base.settings import GlobalSettingsObject from pretix.base.settings import GlobalSettingsObject
from pretix.control.permissions import event_permission_required from pretix.control.permissions import event_permission_required
from pretix.multidomain.urlreverse import eventreverse from pretix.multidomain.urlreverse import eventreverse
@@ -142,14 +143,21 @@ class XHRView(View):
cart = { cart = {
'positions': order.positions, 'positions': order.positions,
'total': order.pending_sum, 'cart_total': order.pending_sum,
'fee': fee, 'cart_fees': Decimal('0.00'),
'payment_fee': fee,
} }
else: else:
cart_total = get_cart_total(request)
cart_fees = Decimal('0.00')
for fee in get_fees(request.event, request, get_cart_total(request), None, prov, get_cart(request)):
cart_fees += fee.value
cart = { cart = {
'positions': get_cart(request), 'positions': get_cart(request),
'total': get_cart_total(request), 'cart_total': cart_total,
'fee': prov.calculate_fee(get_cart_total(request)), 'cart_fees': cart_fees,
'payment_fee': prov.calculate_fee(cart_total + cart_fees),
} }
paypal_order = prov._create_paypal_order(request, None, cart) paypal_order = prov._create_paypal_order(request, None, cart)