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

Refs #340 -- Allow order changes for paid orders if they don't change the total

Browse Source
This commit is contained in:
Raphael Michel
2017-02-15 18:42:46 +01:00
parent 0db927407d
commit c4bf73c8d6
7 changed files with 49 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
from django import forms
from django.core.exceptions import ValidationError
from django.db import models
from django.utils.formats import localize
from django.utils.timezone import now
from django.utils.translation import ugettext_lazy as _
@@ -94,9 +95,12 @@ class OrderPositionChangeForm(forms.Form):
variations = list(i.variations.all())
if variations:
for v in variations:
choices.append(('%d-%d' % (i.pk, v.pk), '%s – %s' % (pname, v.value)))
choices.append(('%d-%d' % (i.pk, v.pk),
'%s – %s (%s %s)' % (pname, v.value, localize(v.price),
instance.order.event.currency)))
else:
choices.append((str(i.pk), pname))
choices.append((str(i.pk), '%s (%s %s)' % (pname, localize(i.default_price),
instance.order.event.currency)))
self.fields['itemvar'].choices = choices
def clean(self):