CGM_Public/pretix_original
3
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-08-19 12:16:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

PPv2: Fix payment button on late payment page

Browse Source
This commit is contained in:
Raphael Michel
2022-08-10 14:30:24 +02:00
parent 47989fd139
commit 000407bcaf
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pretix/plugins/paypal2/payment.py
+1 -1
View File
@@ -582,7 +582,7 @@ class PaypalMethod(BasePaymentProvider):
on the 'confirm order' page. on the 'confirm order' page.
""" """
template = get_template('pretixplugins/paypal2/checkout_payment_confirm.html') template = get_template('pretixplugins/paypal2/checkout_payment_confirm.html')
ctx = {'request': request, 'event': self.event, 'settings': self.settings} ctx = {'request': request, 'event': self.event, 'settings': self.settings, 'method': self.method}
return template.render(ctx) return template.render(ctx)
def execute_payment(self, request: HttpRequest, payment: OrderPayment): def execute_payment(self, request: HttpRequest, payment: OrderPayment):
src/pretix/plugins/paypal2/signals.py
+2
View File
@@ -107,6 +107,7 @@ def html_head_presale(sender, request=None, **kwargs):
if provider.settings.get('_enabled', as_type=bool) and ( if provider.settings.get('_enabled', as_type=bool) and (
url.url_name == "event.order.pay.change" or url.url_name == "event.order.pay.change" or
url.url_name == "event.order.pay" or
(url.url_name == "event.checkout" and url.kwargs['step'] == "payment") or (url.url_name == "event.checkout" and url.kwargs['step'] == "payment") or
(url.namespace == "plugins:paypal2" and url.url_name == "pay") (url.namespace == "plugins:paypal2" and url.url_name == "pay")
): ):
@@ -137,6 +138,7 @@ def signal_process_response(sender, request: HttpRequest, response: HttpResponse
if provider.settings.get('_enabled', as_type=bool) and ( if provider.settings.get('_enabled', as_type=bool) and (
url.url_name == "event.order.pay.change" or url.url_name == "event.order.pay.change" or
url.url_name == "event.order.pay" or
(url.url_name == "event.checkout" and url.kwargs['step'] == "payment") or (url.url_name == "event.checkout" and url.kwargs['step'] == "payment") or
(url.namespace == "plugins:paypal2" and url.url_name == "pay") (url.namespace == "plugins:paypal2" and url.url_name == "pay")
): ):
src/pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js
+4 -4
View File
@@ -141,11 +141,11 @@ var pretixpaypal = {
pretixpaypal.restore(); pretixpaypal.restore();
}); });
if ($("input[name=payment][value^='paypal']").is(':checked') || $(".payment-redo-form").length) { if ($("input[name=payment][value^='paypal']").is(':checked')) {
pretixpaypal.renderButton($("input[name=payment][value^='paypal']:checked").val()); pretixpaypal.renderButton($("input[name=payment][value^='paypal']:checked").val());
} } else if ($(".payment-redo-form").length) {
pretixpaypal.renderButton($("input[name=payment][value^='paypal']").val());
if ($('#paypal-button-container').data('paypage')) { } else if ($('#paypal-button-container').data('paypage')) {
pretixpaypal.renderButton('paypal_apm'); pretixpaypal.renderButton('paypal_apm');
} }
}, },