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

Merge branch 'master' of github.com:pretix/pretix

Browse Source
This commit is contained in:
Raphael Michel
2015-03-08 14:00:36 +01:00
parent 230d1772cc a08b43ad45
commit c4e20bd7d1
19 changed files with 553 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/pretix/presale/templates/pretixpresale/event/checkout_confirm.html Normal file
View File

@@ -0,0 +1,66 @@
{% extends "pretixpresale/event/base.html" %}
{% load i18n %}
{% load bootstrap3 %}
{% block title %}{% trans "Confirm order" %}{% endblock %}
{% block content %}
<h2>{% trans "Confirm order" %}</h2>
<p>{% trans "Please review the details below and confirm your order." %}</p>
<form method="post">
{% csrf_token %}
<div class="panel panel-primary cart">
<div class="panel-heading">
<div class="pull-right">
<a href="{% url "presale:event.index" organizer=request.event.organizer.slug event=request.event.slug %}">{% trans "Modify" %}</a>
</div>
<h3 class="panel-title">
{% trans "Your cart" %}
</h3>
</div>
<div class="panel-body">
{% include "pretixpresale/event/fragment_cart.html" with cart=cart event=request.event editable=False %}
<div class="row-fluid">
<div class="col-md-6 col-xs-12">
{% if cart.minutes_left > 0 %}
<em>{% blocktrans trimmed with minutes=cart.minutes_left %}
The items in your cart are reserved for you for {{ minutes }} minutes.
{% endblocktrans %}</em>
{% else %}
<em>{% trans "The items in your cart are no longer reserved for you." %}</em>
{% endif %}
</div>
<div class="clearfix"></div>
</div>
</div>
</div>
{# TODO: Question answers #}
<div class="row-fluid">
<div class="panel panel-primary">
<div class="panel-heading">
<div class="pull-right">
<a href="{% url "presale:event.checkout.payment" organizer=request.event.organizer.slug event=request.event.slug %}">{% trans "Modify" %}</a>
</div>
<h3 class="panel-title">
{% trans "Payment" %}
</h3>
</div>
<div class="panel-body">
{{ payment }}
</div>
</div>
</div>
<div class="row checkout-button-row">
<div class="col-md-4">
<a class="btn btn-block btn-default btn-lg"
href="{{ view.get_payment_url }}">
{% trans "Go back" %}
</a>
</div>
<div class="col-md-4 col-md-offset-4">
<button class="btn btn-block btn-primary btn-lg" type="submit">
{% trans "Place binding order" %}
</button>
</div>
<div class="clearfix"></div>
</div>
</form>
{% endblock %}

10
src/pretix/presale/templates/pretixpresale/event/checkout_payment.html
View File

@@ -16,14 +16,16 @@
<strong class="pull-right">+ {{ p.fee|floatformat:2 }} {{ event.currency }}</strong>
<input type="radio" name="payment" value="{{ p.provider.identifier }}"
data-parent="#payment_accordion"
required="True"
{% if selected == p.provider.identifier %}checked="checked"{% endif %}
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 id="payment_{{ p.provider.identifier }}"
class="panel-collapse collapse {% if selected == p.provider.identifier %}in{% endif %}">
<div class="panel-body form-horizontal">
{{ p.form }}
</div>
</div>
</div>
@@ -32,7 +34,7 @@
<div class="row checkout-button-row">
<div class="col-md-4">
<a class="btn btn-block btn-default btn-lg"
href="{{ view.get_previous_url }}">
href="{{ view.get_questions_url }}">
{% trans "Go back" %}
</a>
</div>
@@ -44,4 +46,4 @@
<div class="clearfix"></div>
</div>
</form>
{% endblock %}
{% endblock %}

2
src/pretix/presale/templates/pretixpresale/event/checkout_payment_form_default.html Normal file
View File

@@ -0,0 +1,2 @@
{% load bootstrap3 %}
{% bootstrap_form form layout='horizontal' %}

4
src/pretix/presale/templates/pretixpresale/event/checkout_questions.html
View File

@@ -33,7 +33,7 @@
<div class="row checkout-button-row">
<div class="col-md-4">
<a class="btn btn-block btn-default btn-lg"
href="{{ view.get_previous_url }}">
href="{{ view.get_index_url }}">
{% trans "Go back" %}
</a>
</div>
@@ -45,4 +45,4 @@
<div class="clearfix"></div>
</div>
</form>
{% endblock %}
{% endblock %}

12
src/pretix/presale/templates/pretixpresale/event/fragment_cart.html
View File

@@ -52,6 +52,18 @@
<div class="clearfix"></div>
</div>
{% endfor %}
{% if cart.payment_fee %}
{# TODO: Tax rate? #}
<div class="row-fluid cart-row">
<div class="col-md-4 col-xs-6">
<strong>{% trans "Payment method fee" %}</strong>
</div>
<div class="col-md-3 col-xs-6 col-md-offset-5 price">
<strong>{{ event.currency }} {{ cart.payment_fee|floatformat:2 }}</strong>
</div>
<div class="clearfix"></div>
</div>
{% endif %}
<div class="row-fluid cart-row total">
<div class="col-md-4 col-xs-6">
<strong>{% trans "Total" %}</strong>