CGM_Public/pretix_original
3
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-08-28 13:34:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

First steps towards payment provider selection

Browse Source
This commit is contained in:
Raphael Michel
2015-03-06 15:22:09 +01:00
parent eca4964d98
commit 29cedbaac3
8 changed files with 101 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pretix/presale/static/pretixpresale/js/ui/main.js
+5
View File
@@ -1,3 +1,8 @@
"use strict"; "use strict";
$(function () { $(function () {
$("input[data-toggle=radiocollapse]").change(function () {
$($(this).attr("data-parent")).find(".collapse.in").collapse('hide');
$($(this).attr("data-target")).collapse('show');
});
}); });
src/pretix/presale/static/pretixpresale/less/forms.less
+3
View File
@@ -0,0 +1,3 @@
.panel-title .radio {
margin-left: 20px;
}
src/pretix/presale/static/pretixpresale/less/main.less
+1
View File
@@ -3,3 +3,4 @@
@fa-font-path: "../../fontawesome/fonts"; @fa-font-path: "../../fontawesome/fonts";
@import "event.less"; @import "event.less";
@import "forms.less";
src/pretix/presale/templates/pretixpresale/event/base.html
+1
View File
@@ -12,6 +12,7 @@
<script type="text/javascript" src="{% static "jquery/js/jquery-2.1.1.min.js" %}"></script> <script type="text/javascript" src="{% static "jquery/js/jquery-2.1.1.min.js" %}"></script>
<script type="text/javascript" src="{% static "js/jquery.formset.js" %}"></script> <script type="text/javascript" src="{% static "js/jquery.formset.js" %}"></script>
<script type="text/javascript" src="{% static "bootstrap/dist/js/bootstrap.js" %}"></script> <script type="text/javascript" src="{% static "bootstrap/dist/js/bootstrap.js" %}"></script>
<script type="text/javascript" src="{% static "pretixpresale/js/ui/main.js" %}"></script>
{% endcompress %} {% endcompress %}
</head> </head>
<body> <body>
src/pretix/presale/templates/pretixpresale/event/checkout_payment.html
+40
View File
@@ -0,0 +1,40 @@
{% extends "pretixpresale/event/base.html" %}
{% load i18n %}
{% load bootstrap3 %}
{% block title %}{% trans "Checkout" %}{% endblock %}
{% block content %}
<h2>{% trans "Checkout" %}</h2>
<p>{% trans "Please select how you want to pay." %}</p>
<form method="post">
{% csrf_token %}
<div class="panel-group" id="payment_accordion">
{% for p in providers %}
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title">
<label class="radio">
<strong class="pull-right">+ {{ p.fee|floatformat:2 }} {{ event.currency }}</strong>
<input type="radio" name="payment" value="{{ p.provider.identifier }}"
data-parent="#payment_accordion"
data-toggle="radiocollapse" data-target="#payment_{{ p.provider.identifier }}" />
<strong>{{ p.provider.verbose_name }}</strong>
</label>
</h4>
</div>
<div id="payment_{{ p.provider.identifier }}" class="panel-collapse collapse">
<div class="panel-body form-horizontal">
</div>
</div>
</div>
{% endfor %}
</div>
<div class="row checkout-button-row">
<div class="col-md-4 col-md-offset-8">
<button class="btn btn-block btn-primary btn-lg" type="submit">
{% trans "Continue" %}
</button>
</div>
<div class="clearfix"></div>
</div>
</form>
{% endblock %}
src/pretix/presale/templates/pretixpresale/event/checkout_questions.html
+1 -1
View File
@@ -29,7 +29,7 @@
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
<div class="row-fluid checkout-button-row"> <div class="row checkout-button-row">
<div class="col-md-4 col-md-offset-8"> <div class="col-md-4 col-md-offset-8">
<button class="btn btn-block btn-primary btn-lg" type="submit"> <button class="btn btn-block btn-primary btn-lg" type="submit">
{% trans "Continue" %} {% trans "Continue" %}
src/pretix/presale/urls.py
+2
View File
@@ -14,6 +14,8 @@ urlpatterns = patterns(
url(r'^cart/add$', pretix.presale.views.cart.CartAdd.as_view(), name='event.cart.add'), url(r'^cart/add$', pretix.presale.views.cart.CartAdd.as_view(), name='event.cart.add'),
url(r'^cart/remove$', pretix.presale.views.cart.CartRemove.as_view(), name='event.cart.remove'), url(r'^cart/remove$', pretix.presale.views.cart.CartRemove.as_view(), name='event.cart.remove'),
url(r'^checkout$', pretix.presale.views.checkout.CheckoutStart.as_view(), name='event.checkout.start'), url(r'^checkout$', pretix.presale.views.checkout.CheckoutStart.as_view(), name='event.checkout.start'),
url(r'^checkout/payment$', pretix.presale.views.checkout.PaymentDetails.as_view(),
name='event.checkout.payment'),
url(r'^login$', pretix.presale.views.event.EventLogin.as_view(), name='event.checkout.login'), url(r'^login$', pretix.presale.views.event.EventLogin.as_view(), name='event.checkout.login'),
) )
)), )),
src/pretix/presale/views/checkout.py
+48 -2
View File
@@ -1,12 +1,13 @@
from django.contrib import messages from django.contrib import messages
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.db.models import Q from django.db.models import Q, Sum
from django import forms from django import forms
from django.shortcuts import redirect from django.shortcuts import redirect
from django.utils.functional import cached_property from django.utils.functional import cached_property
from django.views.generic import View, TemplateView from django.views.generic import View, TemplateView
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from pretix.base.models import CartPosition, Question, QuestionAnswer from pretix.base.models import CartPosition, Question, QuestionAnswer
from pretix.base.signals import register_payment_providers
from pretix.presale.views import EventViewMixin, CartDisplayMixin, EventLoginRequiredMixin from pretix.presale.views import EventViewMixin, CartDisplayMixin, EventLoginRequiredMixin
@@ -78,7 +79,7 @@ class CheckoutStart(EventViewMixin, CartDisplayMixin, EventLoginRequiredMixin, T
template_name = "pretixpresale/event/checkout_questions.html" template_name = "pretixpresale/event/checkout_questions.html"
def get_success_url(self): def get_success_url(self):
return reverse('presale:event.index', kwargs={ return reverse('presale:event.checkout.payment', kwargs={
'event': self.request.event.slug, 'event': self.request.event.slug,
'organizer': self.request.event.organizer.slug, 'organizer': self.request.event.organizer.slug,
}) })
@@ -179,3 +180,48 @@ class CheckoutStart(EventViewMixin, CartDisplayMixin, EventLoginRequiredMixin, T
ctx = super().get_context_data(**kwargs) ctx = super().get_context_data(**kwargs)
ctx['forms'] = self.forms ctx['forms'] = self.forms
return ctx return ctx
class PaymentDetails(EventViewMixin, CartDisplayMixin, EventLoginRequiredMixin, TemplateView):
template_name = "pretixpresale/event/checkout_payment.html"
def get_success_url(self):
return reverse('presale:event.index', kwargs={
'event': self.request.event.slug,
'organizer': self.request.event.organizer.slug,
})
def get_url(self):
return reverse('presale:event.checkout.payment', kwargs={
'event': self.request.event.slug,
'organizer': self.request.event.organizer.slug,
})
def get_previous_url(self):
return reverse('presale:event.checkout.start', kwargs={
'event': self.request.event.slug,
'organizer': self.request.event.organizer.slug,
})
@cached_property
def provider_forms(self):
total = CartPosition.objects.current.filter(
Q(user=self.request.user) & Q(event=self.request.event)
).aggregate(sum=Sum('price'))['sum']
providers = []
responses = register_payment_providers.send(self.request.event)
for receiver, response in responses:
provider = response(self.request.event)
if not provider.is_enabled:
continue
fee = provider.calculate_fee(total)
providers.append({
'provider': provider,
'fee': fee,
})
return providers
def get_context_data(self, **kwargs):
ctx = super().get_context_data(**kwargs)
ctx['providers'] = self.provider_forms
return ctx