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

Fixed script prefixes in absolute URLs

Browse Source
This commit is contained in:
Raphael Michel
2015-06-18 15:33:40 +02:00
parent 32a9d9709b
commit 8b3eb14d73
6 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pretix/helpers/urls.py
View File

@@ -1,5 +1,9 @@
from urllib.parse import urljoin
from django.conf import settings
from django.core.urlresolvers import reverse
def build_absolute_uri(url):
return settings.SITE_URL + url
def build_absolute_uri(urlname, args=None, kwargs=None):
# Pass prefix='' as a possible SCRIPT_PREFIX (if pretix runs in a subdirectory)
# is included in SITE_URL _and_ is added by reverse.
return urljoin(settings.SITE_URL, reverse(urlname, args, kwargs, prefix=''))

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

@@ -89,8 +89,8 @@ class Paypal(BasePaymentProvider):
"payment_method": "paypal",
},
"redirect_urls": {
"return_url": build_absolute_uri(reverse('plugins:paypal:return')),
"cancel_url": build_absolute_uri(reverse('plugins:paypal:abort')),
"return_url": build_absolute_uri('plugins:paypal:return'),
"cancel_url": build_absolute_uri('plugins:paypal:abort'),
},
"transactions": [
{

8
src/pretix/plugins/paypal/views.py
View File

@@ -71,12 +71,12 @@ def retry(request, order):
"payment_method": "paypal",
},
"redirect_urls": {
"return_url": build_absolute_uri(reverse('plugins:paypal:retry', kwargs={
"return_url": build_absolute_uri('plugins:paypal:retry', kwargs={
'order': order.code
})),
"cancel_url": build_absolute_uri(reverse('plugins:paypal:retry', kwargs={
}),
"cancel_url": build_absolute_uri('plugins:paypal:retry', kwargs={
'order': order.code
})),
}),
},
"transactions": [
{

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

@@ -40,7 +40,7 @@ class Stripe(BasePaymentProvider):
return "<div class='alert alert-info'>%s<br /><code>%s</code></div>" % (
_('Please configure a <a href="https://dashboard.stripe.com/account/webhooks">Stripe Webhook</a> to '
'the following endpoint in order to automatically cancel orders when a charges are refunded externally.'),
build_absolute_uri(reverse('plugins:stripe:webhook'))
build_absolute_uri('plugins:stripe:webhook')
)
def checkout_is_valid_session(self, request):

6
src/pretix/presale/views/checkout.py
View File

@@ -305,7 +305,11 @@ class OrderConfirm(EventViewMixin, CartDisplayMixin, EventLoginRequiredMixin, Ch
{
'user': request.user, 'order': order,
'event': request.event,
'url': build_absolute_uri(self.get_order_url(order)),
'url': build_absolute_uri('presale:event.order', kwargs={
'event': self.request.event.slug,
'organizer': self.request.event.organizer.slug,
'order': order.code,
}),
'payment': self.payment_provider.order_pending_mail_render(order)
},
request.event

4
src/pretix/presale/views/event.py
View File

@@ -188,10 +188,10 @@ class EventForgot(EventViewMixin, TemplateView):
{
'user': user,
'event': self.request.event,
'url': build_absolute_uri(reverse('presale:event.forgot.recover', kwargs={
'url': build_absolute_uri('presale:event.forgot.recover', kwargs={
'event': self.request.event.slug,
'organizer': self.request.event.organizer.slug,
}) + '?token=' + self.generate_token(user)),
}) + '?token=' + self.generate_token(user),
},
self.request.event
)