mirror of
https://github.com/pretix/pretix.git
synced 2026-05-05 15:14:04 +00:00
Waiting list: Allow transfer to other subevent (#2811)
Co-authored-by: Richard Schreiber <schreiber@rami.io> Co-authored-by: Raphael Michel <michel@rami.io>
This commit is contained in:
56
src/pretix/control/forms/waitinglist.py
Normal file
56
src/pretix/control/forms/waitinglist.py
Normal file
@@ -0,0 +1,56 @@
|
|||||||
|
#
|
||||||
|
# This file is part of pretix (Community Edition).
|
||||||
|
#
|
||||||
|
# Copyright (C) 2014-2020 Raphael Michel and contributors
|
||||||
|
# Copyright (C) 2020-2021 rami.io GmbH and contributors
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
|
||||||
|
# Public License as published by the Free Software Foundation in version 3 of the License.
|
||||||
|
#
|
||||||
|
# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
|
||||||
|
# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
|
||||||
|
# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
|
||||||
|
# this file, see <https://pretix.eu/about/en/license>.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
|
||||||
|
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
|
||||||
|
# details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU Affero General Public License along with this program. If not, see
|
||||||
|
# <https://www.gnu.org/licenses/>.
|
||||||
|
#
|
||||||
|
from django.urls import reverse
|
||||||
|
from django_scopes.forms import SafeModelChoiceField
|
||||||
|
|
||||||
|
from pretix.base.forms import I18nModelForm
|
||||||
|
from pretix.base.models import WaitingListEntry
|
||||||
|
from pretix.control.forms.widgets import Select2
|
||||||
|
|
||||||
|
|
||||||
|
class WaitingListEntryTransferForm(I18nModelForm):
|
||||||
|
|
||||||
|
def __init__(self, *args, **kwargs):
|
||||||
|
super().__init__(*args, **kwargs)
|
||||||
|
|
||||||
|
if self.event.has_subevents:
|
||||||
|
self.fields['subevent'].required = True
|
||||||
|
self.fields['subevent'].queryset = self.event.subevents.all()
|
||||||
|
self.fields['subevent'].widget = Select2(
|
||||||
|
attrs={
|
||||||
|
'data-model-select2': 'event',
|
||||||
|
'data-select2-url': reverse('control:event.subevents.select2', kwargs={
|
||||||
|
'event': self.event.slug,
|
||||||
|
'organizer': self.event.organizer.slug,
|
||||||
|
}),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
self.fields['subevent'].widget.choices = self.fields['subevent'].choices
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = WaitingListEntry
|
||||||
|
fields = [
|
||||||
|
'subevent',
|
||||||
|
]
|
||||||
|
field_classes = {
|
||||||
|
'subevent': SafeModelChoiceField,
|
||||||
|
}
|
||||||
@@ -487,6 +487,7 @@ def pretixcontrol_logentry_display(sender: Event, logentry: LogEntry, **kwargs):
|
|||||||
'pretix.event.permissions.deleted': _('A user has been removed from the event team.'),
|
'pretix.event.permissions.deleted': _('A user has been removed from the event team.'),
|
||||||
'pretix.waitinglist.voucher': _('A voucher has been sent to a person on the waiting list.'),
|
'pretix.waitinglist.voucher': _('A voucher has been sent to a person on the waiting list.'),
|
||||||
'pretix.event.orders.waitinglist.deleted': _('An entry has been removed from the waiting list.'),
|
'pretix.event.orders.waitinglist.deleted': _('An entry has been removed from the waiting list.'),
|
||||||
|
'pretix.event.orders.waitinglist.transferred': _('An entry has been transferred to another waiting list.'),
|
||||||
'pretix.event.orders.waitinglist.changed': _('An entry has been changed on the waiting list.'),
|
'pretix.event.orders.waitinglist.changed': _('An entry has been changed on the waiting list.'),
|
||||||
'pretix.event.orders.waitinglist.added': _('An entry has been added to the waiting list.'),
|
'pretix.event.orders.waitinglist.added': _('An entry has been added to the waiting list.'),
|
||||||
'pretix.team.created': _('The team has been created.'),
|
'pretix.team.created': _('The team has been created.'),
|
||||||
|
|||||||
@@ -242,6 +242,13 @@
|
|||||||
data-toggle="tooltip" title="{% trans "Move to the end of the list" %}">
|
data-toggle="tooltip" title="{% trans "Move to the end of the list" %}">
|
||||||
<span class="fa fa-thumbs-down"></span>
|
<span class="fa fa-thumbs-down"></span>
|
||||||
</button>
|
</button>
|
||||||
|
{% if request.event.has_subevents %}
|
||||||
|
<a href="{% url "control:event.orders.waitinglist.transfer" organizer=request.event.organizer.slug event=request.event.slug entry=e.id %}"
|
||||||
|
class="btn btn-default btn-sm" title="{% trans "Transfer to other date" context "subevent" %}"
|
||||||
|
data-toggle="tooltip">
|
||||||
|
<i class="fa fa-calendar" aria-hidden="true"></i>
|
||||||
|
</a>
|
||||||
|
{% endif %}
|
||||||
<a href="{% url "control:event.orders.waitinglist.delete" organizer=request.event.organizer.slug event=request.event.slug entry=e.id %}?next={{ request.get_full_path|urlencode }}" class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></a>
|
<a href="{% url "control:event.orders.waitinglist.delete" organizer=request.event.organizer.slug event=request.event.slug entry=e.id %}?next={{ request.get_full_path|urlencode }}" class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></a>
|
||||||
{% else %}
|
{% else %}
|
||||||
<button class="btn btn-default btn-sm disabled">
|
<button class="btn btn-default btn-sm disabled">
|
||||||
@@ -261,9 +268,11 @@
|
|||||||
{% if "can_change_orders" in request.eventpermset %}
|
{% if "can_change_orders" in request.eventpermset %}
|
||||||
<div class="batch-select-actions">
|
<div class="batch-select-actions">
|
||||||
<button type="submit" class="btn btn-danger btn-save" name="action" value="delete">
|
<button type="submit" class="btn btn-danger btn-save" name="action" value="delete">
|
||||||
<i class="fa fa-trash"></i>{% trans "Delete selected" %}
|
<i class="fa fa-trash"></i>
|
||||||
|
{% trans "Delete selected" %}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</form>
|
</form>
|
||||||
{% include "pretixcontrol/pagination.html" %}
|
{% include "pretixcontrol/pagination.html" %}
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
{% extends "pretixcontrol/event/base.html" %}
|
||||||
|
{% load i18n %}
|
||||||
|
{% load bootstrap3 %}
|
||||||
|
{% block title %}{% trans "Transfer entry" %}{% endblock %}
|
||||||
|
{% block content %}
|
||||||
|
<h1>{% trans "Transfer entry" %}</h1>
|
||||||
|
<form action="" method="post" class="form-horizontal">
|
||||||
|
{% csrf_token %}
|
||||||
|
<p>{% blocktrans trimmed context "subevent" %}
|
||||||
|
Please select the date to which the following waiting list entry should be
|
||||||
|
transferred: <strong>{{ entry }}</strong>?
|
||||||
|
{% endblocktrans %}</p>
|
||||||
|
{% bootstrap_field form.subevent layout="control" %}
|
||||||
|
<div class="form-group submit-group">
|
||||||
|
<a href="{% url "control:event.orders.waitinglist" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default btn-cancel">
|
||||||
|
{% trans "Cancel" %}
|
||||||
|
</a>
|
||||||
|
<button type="submit" class="btn btn-primary btn-save">
|
||||||
|
{% trans "Transfer" %}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
{% endblock %}
|
||||||
@@ -401,6 +401,8 @@ urlpatterns = [
|
|||||||
re_path(r'^waitinglist/auto_assign$', waitinglist.AutoAssign.as_view(), name='event.orders.waitinglist.auto'),
|
re_path(r'^waitinglist/auto_assign$', waitinglist.AutoAssign.as_view(), name='event.orders.waitinglist.auto'),
|
||||||
re_path(r'^waitinglist/(?P<entry>\d+)/delete$', waitinglist.EntryDelete.as_view(),
|
re_path(r'^waitinglist/(?P<entry>\d+)/delete$', waitinglist.EntryDelete.as_view(),
|
||||||
name='event.orders.waitinglist.delete'),
|
name='event.orders.waitinglist.delete'),
|
||||||
|
re_path(r'^waitinglist/(?P<entry>\d+)/transfer$', waitinglist.EntryTransfer.as_view(),
|
||||||
|
name='event.orders.waitinglist.transfer'),
|
||||||
re_path(r'^checkins/$', checkin.CheckinListView.as_view(), name='event.orders.checkins'),
|
re_path(r'^checkins/$', checkin.CheckinListView.as_view(), name='event.orders.checkins'),
|
||||||
re_path(r'^checkinlists/$', checkin.CheckinListList.as_view(), name='event.orders.checkinlists'),
|
re_path(r'^checkinlists/$', checkin.CheckinListList.as_view(), name='event.orders.checkinlists'),
|
||||||
re_path(r'^checkinlists/add$', checkin.CheckinListCreate.as_view(), name='event.orders.checkinlists.add'),
|
re_path(r'^checkinlists/add$', checkin.CheckinListCreate.as_view(), name='event.orders.checkinlists.add'),
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ from django.db import transaction
|
|||||||
from django.db.models import F, Max, Min, Q, Sum
|
from django.db.models import F, Max, Min, Q, Sum
|
||||||
from django.db.models.functions import Coalesce
|
from django.db.models.functions import Coalesce
|
||||||
from django.http import Http404, HttpResponse, HttpResponseRedirect
|
from django.http import Http404, HttpResponse, HttpResponseRedirect
|
||||||
from django.shortcuts import redirect, render
|
from django.shortcuts import get_object_or_404, redirect, render
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
from django.utils.functional import cached_property
|
from django.utils.functional import cached_property
|
||||||
from django.utils.http import is_safe_url
|
from django.utils.http import is_safe_url
|
||||||
@@ -54,9 +54,12 @@ from pretix.base.models import Item, Quota, WaitingListEntry
|
|||||||
from pretix.base.models.waitinglist import WaitingListException
|
from pretix.base.models.waitinglist import WaitingListException
|
||||||
from pretix.base.services.waitinglist import assign_automatically
|
from pretix.base.services.waitinglist import assign_automatically
|
||||||
from pretix.base.views.tasks import AsyncAction
|
from pretix.base.views.tasks import AsyncAction
|
||||||
|
from pretix.control.forms.waitinglist import WaitingListEntryTransferForm
|
||||||
from pretix.control.permissions import EventPermissionRequiredMixin
|
from pretix.control.permissions import EventPermissionRequiredMixin
|
||||||
from pretix.control.views import PaginationMixin
|
from pretix.control.views import PaginationMixin
|
||||||
|
|
||||||
|
from . import UpdateView
|
||||||
|
|
||||||
|
|
||||||
class AutoAssign(EventPermissionRequiredMixin, AsyncAction, View):
|
class AutoAssign(EventPermissionRequiredMixin, AsyncAction, View):
|
||||||
task = assign_automatically
|
task = assign_automatically
|
||||||
@@ -366,3 +369,40 @@ class EntryDelete(EventPermissionRequiredMixin, DeleteView):
|
|||||||
'event': self.request.event.slug,
|
'event': self.request.event.slug,
|
||||||
'organizer': self.request.event.organizer.slug
|
'organizer': self.request.event.organizer.slug
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
|
class EntryTransfer(EventPermissionRequiredMixin, UpdateView):
|
||||||
|
model = WaitingListEntry
|
||||||
|
template_name = 'pretixcontrol/waitinglist/transfer.html'
|
||||||
|
permission = 'can_change_orders'
|
||||||
|
form_class = WaitingListEntryTransferForm
|
||||||
|
context_object_name = 'entry'
|
||||||
|
|
||||||
|
def dispatch(self, request, *args, **kwargs):
|
||||||
|
if not self.request.event.has_subevents:
|
||||||
|
raise Http404(_("This is not an event series."))
|
||||||
|
return super().dispatch(request, *args, **kwargs)
|
||||||
|
|
||||||
|
def get_object(self, queryset=None) -> WaitingListEntry:
|
||||||
|
return get_object_or_404(WaitingListEntry, pk=self.kwargs['entry'], event=self.request.event, voucher__isnull=True)
|
||||||
|
|
||||||
|
@transaction.atomic
|
||||||
|
def form_valid(self, form):
|
||||||
|
messages.success(self.request, _('The waitinglist entry has been transferred.'))
|
||||||
|
if form.has_changed():
|
||||||
|
self.object.log_action(
|
||||||
|
'pretix.event.order.waitinglist.transferred', user=self.request.user, data={
|
||||||
|
k: form.cleaned_data.get(k) for k in form.changed_data
|
||||||
|
}
|
||||||
|
)
|
||||||
|
return super().form_valid(form)
|
||||||
|
|
||||||
|
def form_invalid(self, form):
|
||||||
|
messages.error(self.request, _('We could not save your changes. See below for details.'))
|
||||||
|
return super().form_invalid(form)
|
||||||
|
|
||||||
|
def get_success_url(self) -> str:
|
||||||
|
return reverse('control:event.orders.waitinglist', kwargs={
|
||||||
|
'event': self.request.event.slug,
|
||||||
|
'organizer': self.request.event.organizer.slug
|
||||||
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user