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

Cosmetic changes to locale change form

Browse Source
This commit is contained in:
Raphael Michel
2017-04-11 10:54:12 +02:00
parent ccb981e6ce
commit 03d8cfb401
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/pretix/control/forms/orders.py
View File

@@ -130,4 +130,5 @@ class OrderLocaleForm(forms.ModelForm):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self.fields['locale'].choices = [(a, a) for a in self.instance.event.settings.locales] locale_names = dict(settings.LANGUAGES)
self.fields['locale'].choices = [(a, locale_names[a]) for a in self.instance.event.settings.locales]

6
src/pretix/control/templates/pretixcontrol/order/index.html
View File

@@ -71,15 +71,15 @@
<dl class="dl-horizontal"> <dl class="dl-horizontal">
<dt>{% trans "Order code" %}</dt> <dt>{% trans "Order code" %}</dt>
<dd>{{ order.code }}</dd> <dd>{{ order.code }}</dd>
<dt>{% trans "Order date" %}</dt>
<dd>{{ order.datetime }}</dd>
<dt>{% trans "Order locale" %}</dt> <dt>{% trans "Order locale" %}</dt>
<dd> <dd>
{{ order.locale }} {{ display_locale }}
<a href="{% url "control:event.order.locale" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}" class="btn btn-default btn-xs"> <a href="{% url "control:event.order.locale" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}" class="btn btn-default btn-xs">
<span class="fa fa-edit"></span> <span class="fa fa-edit"></span>
</a> </a>
</dd> </dd>
<dt>{% trans "Order date" %}</dt>
<dd>{{ order.datetime }}</dd>
{% if order.status == "p" %} {% if order.status == "p" %}
<dt>{% trans "Payment date" %}</dt> <dt>{% trans "Payment date" %}</dt>
<dd>{{ order.payment_date }}</dd> <dd>{{ order.payment_date }}</dd>

2
src/pretix/control/views/orders.py
View File

@@ -1,5 +1,6 @@
from datetime import timedelta from datetime import timedelta
from django.conf import settings
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
@@ -152,6 +153,7 @@ class OrderDetail(OrderView):
ctx['payment'] = self.payment_provider.order_control_render(self.request, self.object) ctx['payment'] = self.payment_provider.order_control_render(self.request, self.object)
ctx['invoices'] = list(self.order.invoices.all().select_related('event')) ctx['invoices'] = list(self.order.invoices.all().select_related('event'))
ctx['comment_form'] = CommentForm(initial={'comment': self.order.comment}) ctx['comment_form'] = CommentForm(initial={'comment': self.order.comment})
ctx['display_locale'] = dict(settings.LANGUAGES)[self.object.locale]
return ctx return ctx
def get_items(self): def get_items(self):