CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Allow to manually exclude quotas from calendar availability

Browse Source
This commit is contained in:
Raphael Michel
2021-05-27 12:05:03 +02:00
parent 49a9b71ea3
commit 93da4801db
9 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/pretix/base/migrations/0190_quota_ignore_for_event_availability.py Normal file
View File

@@ -0,0 +1,18 @@
# Generated by Django 3.2.3 on 2021-05-27 09:50
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('pretixbase', '0189_auto_20210525_1311'),
]
operations = [
migrations.AddField(
model_name='quota',
name='ignore_for_event_availability',
field=models.BooleanField(default=False),
),
]

4
src/pretix/base/models/event.py
View File

@@ -260,7 +260,9 @@ class EventMixin:
Prefetch(
'quotas',
to_attr='active_quotas',
queryset=Quota.objects.using(settings.DATABASE_REPLICA).annotate(
queryset=Quota.objects.using(settings.DATABASE_REPLICA).filter(
ignore_for_event_availability=False
).annotate(
active_items=Subquery(sq_active_item, output_field=models.TextField()),
active_variations=Subquery(sq_active_variation, output_field=models.TextField()),
).exclude(

8
src/pretix/base/models/items.py
View File

@@ -1517,6 +1517,14 @@ class Quota(LoggedModel):
verbose_name=_("Variations")
)
ignore_for_event_availability = models.BooleanField(
verbose_name=_('Ignore this quota when determining event availability'),
help_text=_('If you enable this, this quota will be ignored when determining event availability in your event calendar. '
'This is useful e.g. for merchandise that is added to each event but should not stop the event from being shown '
'as sold out.'),
default=False,
)
close_when_sold_out = models.BooleanField(
verbose_name=_('Close this quota permanently once it is sold out'),
help_text=_('If you enable this, when the quota is sold out once, no more tickets will be sold, '

1
src/pretix/control/forms/item.py
View File

@@ -244,6 +244,7 @@ class QuotaForm(I18nModelForm):
'subevent',
'close_when_sold_out',
'release_after_exit',
'ignore_for_event_availability',
]
field_classes = {
'subevent': SafeModelChoiceField,

1
src/pretix/control/templates/pretixcontrol/items/quota_edit.html
View File

@@ -41,6 +41,7 @@
<legend>{% trans "Advanced options" %}</legend>
{% bootstrap_field form.close_when_sold_out layout="control" %}
{% bootstrap_field form.release_after_exit layout="control" %}
{% bootstrap_field form.ignore_for_event_availability layout="control" %}
</fieldset>
<div class="form-group submit-group">
<button type="submit" class="btn btn-primary btn-save">

3
src/pretix/control/templates/pretixcontrol/items/quotas.html
View File

@@ -66,6 +66,9 @@
<tr>
<td>
<strong><a href="{% url "control:event.items.quotas.show" organizer=request.event.organizer.slug event=request.event.slug quota=q.id %}">{{ q.name }}</a></strong>
{% if q.ignore_for_event_availability %}
<span class="fa fa-eye-slash text-muted" data-toggle="tooltip" title="{% trans "Ignore this quota when determining event availability" %}"></span>
{% endif %}
</td>
<td>
<ul>

2
src/pretix/control/templates/pretixcontrol/subevents/bulk.html
View File

@@ -442,6 +442,7 @@
{% bootstrap_field form.size layout="control" %}
{% bootstrap_field form.itemvars layout="control" %}
{% bootstrap_field form.release_after_exit layout="control" %}
{% bootstrap_field form.ignore_for_event_availability layout="control" %}
</div>
</div>
{% endfor %}
@@ -470,6 +471,7 @@
{% bootstrap_field formset.empty_form.size layout="control" %}
{% bootstrap_field formset.empty_form.itemvars layout="control" %}
{% bootstrap_field formset.empty_form.release_after_exit layout="control" %}
{% bootstrap_field formset.empty_form.ignore_for_event_availability layout="control" %}
</div>
</div>
{% endescapescript %}

2
src/pretix/control/templates/pretixcontrol/subevents/bulk_edit.html
View File

@@ -221,6 +221,7 @@
{% bootstrap_field form.size layout="control" %}
{% bootstrap_field form.itemvars layout="control" %}
{% bootstrap_field form.release_after_exit layout="control" %}
{% bootstrap_field form.ignore_for_event_availability layout="control" %}
</div>
</div>
{% endfor %}
@@ -249,6 +250,7 @@
{% bootstrap_field formset.empty_form.size layout="control" %}
{% bootstrap_field formset.empty_form.itemvars layout="control" %}
{% bootstrap_field formset.empty_form.release_after_exit layout="control" %}
{% bootstrap_field formset.empty_form.ignore_for_event_availability layout="control" %}
</div>
</div>
{% endescapescript %}

2
src/pretix/control/templates/pretixcontrol/subevents/detail.html
View File

@@ -84,6 +84,7 @@
{% bootstrap_field form.size layout="control" %}
{% bootstrap_field form.itemvars layout="control" %}
{% bootstrap_field form.release_after_exit layout="control" %}
{% bootstrap_field form.ignore_for_event_availability layout="control" %}
</div>
</div>
{% endfor %}
@@ -112,6 +113,7 @@
{% bootstrap_field formset.empty_form.size layout="control" %}
{% bootstrap_field formset.empty_form.itemvars layout="control" %}
{% bootstrap_field formset.empty_form.release_after_exit layout="control" %}
{% bootstrap_field formset.empty_form.ignore_for_event_availability layout="control" %}
</div>
</div>
{% endescapescript %}