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

Fix bug when modifying an order with an address in a country with a state

Browse Source
This commit is contained in:
Raphael Michel
2021-02-09 18:23:24 +01:00
parent 25c35b0f73
commit b630174f72
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/pretix/base/forms/questions.py
View File

@@ -452,14 +452,17 @@ class BaseQuestionsForm(forms.Form):
types, form = COUNTRIES_WITH_STATE_IN_ADDRESS[cc] types, form = COUNTRIES_WITH_STATE_IN_ADDRESS[cc]
statelist = [s for s in pycountry.subdivisions.get(country_code=cc) if s.type in types] statelist = [s for s in pycountry.subdivisions.get(country_code=cc) if s.type in types]
c += sorted([(s.code[3:], s.name) for s in statelist], key=lambda s: s[1]) c += sorted([(s.code[3:], s.name) for s in statelist], key=lambda s: s[1])
state = (cartpos.state if cartpos else orderpos.state)
elif fprefix + 'state' in self.data: elif fprefix + 'state' in self.data:
self.data = self.data.copy() self.data = self.data.copy()
state = None
del self.data[fprefix + 'state'] del self.data[fprefix + 'state']
add_fields['state'] = forms.ChoiceField( add_fields['state'] = forms.ChoiceField(
label=pgettext_lazy('address', 'State'), label=pgettext_lazy('address', 'State'),
required=False, required=False,
choices=c, choices=c,
initial=state,
widget=forms.Select(attrs={ widget=forms.Select(attrs={
'autocomplete': 'address-level1', 'autocomplete': 'address-level1',
}), }),

2
src/pretix/static/pretixcontrol/js/ui/main.js
View File

@@ -343,7 +343,7 @@ var form_handlers = function (el) {
$("select[name$=state]:not([data-static])").each(function () { $("select[name$=state]:not([data-static])").each(function () {
var dependent = $(this), var dependent = $(this),
counter = 0, counter = 0,
dependency = $(this).closest("form").find('select[name$=country]'), dependency = $(this).closest(".panel-body, form").find('select[name$=country]'),
update = function (ev) { update = function (ev) {
counter++; counter++;
var curCounter = counter; var curCounter = counter;