Compare commits

...

4 Commits

Author SHA1 Message Date
Raphael Michel
17eb0a3817 Bump release 2017-08-01 21:07:10 +02:00
Nicole Klünder
a87cb75ed5 fix wrong stripe version in setup.py (#588) 2017-08-01 21:06:06 +02:00
Raphael Michel
f70eb95346 Hide quota options when creating a product with variations 2017-08-01 21:05:38 +02:00
Raphael Michel
9abdc6a3cc Fix reversal bug 2017-08-01 21:05:32 +02:00
5 changed files with 11 additions and 4 deletions

View File

@@ -1 +1 @@
__version__ = "1.6.0"
__version__ = "1.6.1"

View File

@@ -195,7 +195,7 @@ class ItemCreateForm(I18nModelForm):
instance = super().save(*args, **kwargs)
if not self.event.has_subevents:
if not self.event.has_subevents and not self.cleaned_data.get('has_variations'):
if self.cleaned_data.get('quota_option') == self.EXISTING and self.cleaned_data.get('quota_add_existing') is not None:
quota = self.cleaned_data.get('quota_add_existing')
quota.items.add(self.instance)

View File

@@ -4,7 +4,7 @@
{% block inner %}
<h2>{% trans "Import result" %}</h2>
{% if job.state == "running" or job.state == "pending" %}
<div class="empty-collection" data-job-waiting data-job-waiting-url="{% url "plugins:banktransfer:import.job" event=request.event.slug organizer=request.event.organizer.slug job=job.pk %}?ajax=1">
<div class="empty-collection" data-job-waiting data-job-waiting-url="{% if request.event %}{% url "plugins:banktransfer:import.job" event=request.event.slug organizer=request.event.organizer.slug job=job.pk %}{% else %}{% url "plugins:banktransfer:import.job" organizer=request.organizer.slug job=job.pk %}{% endif %}?ajax=1">
<p>
<span class="fa big-grey-icon fa-cog fa big-rotating-icon"></span>
</p>

View File

@@ -26,4 +26,11 @@ $(document).ready(function () {
hideDeselected(true);
}
);
function toggleblock() {
$("#new-quota-group").closest('fieldset').toggle(!$("#id_has_variations").prop('checked'));
}
$("#id_has_variations").change(toggleblock);
toggleblock();
});

View File

@@ -97,7 +97,7 @@ setup(
'pycparser==2.13',
'django-redis==4.7.*',
'redis==2.10.5',
'stripe==1.22.*',
'stripe==1.62.*',
'chardet<3.1.0,>=3.0.2',
'mt-940==4.7',
'django-i18nfield>=1.0.1',