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

PayPal: Validate proper payee set with ISU integration (#4206)

Browse Source
This commit is contained in:
Raphael Michel
2024-06-10 14:10:02 +02:00
committed by GitHub
parent d0184c1f48
commit 5bc622bcfe
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/pretix/plugins/paypal/payment.py
View File

@@ -229,7 +229,10 @@ class Paypal(BasePaymentProvider):
kwargs['cart_namespace'] = request.resolver_match.kwargs['cart_namespace']
try:
if request.event.settings.payment_paypal_connect_user_id:
if self.settings.connect_client_id and not self.settings.secret:
if not request.event.settings.payment_paypal_connect_user_id:
raise PaymentException('Payment method misconfigured')
try:
tokeninfo = Tokeninfo.create_with_refresh_token(request.event.settings.payment_paypal_connect_refresh_token)
except BadRequest as ex:

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

@@ -524,10 +524,13 @@ class PaypalMethod(BasePaymentProvider):
kwargs['cart_namespace'] = request.resolver_match.kwargs['cart_namespace']
# ISU
if request.event.settings.payment_paypal_isu_merchant_id:
payee = {
"merchant_id": request.event.settings.payment_paypal_isu_merchant_id,
}
if self.settings.connect_client_id and self.settings.connect_secret_key and not self.settings.secret:
if request.event.settings.payment_paypal_isu_merchant_id:
payee = {
"merchant_id": request.event.settings.payment_paypal_isu_merchant_id,
}
else:
raise PaymentException('Payment method misconfigured')
# Manual API integration
else:
payee = {}