diff --git a/doc/development/api/quality.rst b/doc/development/api/quality.rst index 46ff5e1fc..26fff4e90 100644 --- a/doc/development/api/quality.rst +++ b/doc/development/api/quality.rst @@ -94,7 +94,7 @@ F. Functionality #. Refunds are implemented, if possible. - #. In case of overpayment or external refunds, a "required action" is created to notify the event organizer. + #. In case of overpayment or external refunds, an external refund is properly created. #. If the plugin adds steps to the checkout process, it has been tested in combination with the pretix widget. diff --git a/doc/development/implementation/models.rst b/doc/development/implementation/models.rst index 99f5a8b59..c5cae2616 100644 --- a/doc/development/implementation/models.rst +++ b/doc/development/implementation/models.rst @@ -34,9 +34,6 @@ Organizers and events .. autoclass:: pretix.base.models.TeamAPIToken :members: -.. autoclass:: pretix.base.models.RequiredAction - :members: - .. autoclass:: pretix.base.models.EventMetaProperty :members: diff --git a/src/pretix/base/migrations/0188_delete_requiredaction.py b/src/pretix/base/migrations/0188_delete_requiredaction.py new file mode 100644 index 000000000..1047d1077 --- /dev/null +++ b/src/pretix/base/migrations/0188_delete_requiredaction.py @@ -0,0 +1,16 @@ +# Generated by Django 3.2.2 on 2021-05-13 18:20 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('pretixbase', '0187_normalize_salutation'), + ] + + operations = [ + migrations.DeleteModel( + name='RequiredAction', + ), + ] diff --git a/src/pretix/base/models/__init__.py b/src/pretix/base/models/__init__.py index 9f5d805ec..e90e0c6f9 100644 --- a/src/pretix/base/models/__init__.py +++ b/src/pretix/base/models/__init__.py @@ -27,7 +27,7 @@ from .customers import Customer from .devices import Device, Gate from .event import ( Event, Event_SettingsStore, EventLock, EventMetaProperty, EventMetaValue, - RequiredAction, SubEvent, SubEventMetaValue, generate_invite_token, + SubEvent, SubEventMetaValue, generate_invite_token, ) from .giftcards import GiftCard, GiftCardAcceptance, GiftCardTransaction from .invoices import Invoice, InvoiceLine, invoice_filename diff --git a/src/pretix/base/models/event.py b/src/pretix/base/models/event.py index 192b8940c..646937f2e 100644 --- a/src/pretix/base/models/event.py +++ b/src/pretix/base/models/event.py @@ -1389,60 +1389,6 @@ class EventLock(models.Model): token = models.UUIDField(default=uuid.uuid4) -class RequiredAction(models.Model): - """ - Represents an action that is to be done by an admin. The admin will be - displayed a list of actions to do. - - :param datatime: The timestamp of the required action - :type datetime: datetime - :param user: The user that performed the action - :type user: User - :param done: If this action has been completed or dismissed - :type done: bool - :param action_type: The type of action that has to be performed. This is - used to look up the renderer used to describe the action in a human- - readable way. This should be some namespaced value using dotted - notation to avoid duplicates, e.g. - ``"pretix.plugins.banktransfer.incoming_transfer"``. - :type action_type: str - :param data: Arbitrary data that can be used by the log action renderer - :type data: str - """ - datetime = models.DateTimeField(auto_now_add=True, db_index=True) - done = models.BooleanField(default=False) - user = models.ForeignKey('User', null=True, blank=True, on_delete=models.PROTECT) - event = models.ForeignKey('Event', null=True, blank=True, on_delete=models.CASCADE) - action_type = models.CharField(max_length=255) - data = models.TextField(default='{}') - - class Meta: - ordering = ('datetime',) - - def display(self, request): - from ..signals import requiredaction_display - - for receiver, response in requiredaction_display.send(self.event, action=self, request=request): - if response: - return response - return self.action_type - - def save(self, *args, **kwargs): - created = not self.pk - super().save(*args, **kwargs) - if created: - from ..services.notifications import notify - from .log import LogEntry - - logentry = LogEntry.objects.create( - content_object=self, - action_type='pretix.event.action_required', - event=self.event, - visible=False - ) - notify.apply_async(args=(logentry.pk,)) - - class EventMetaProperty(LoggedModel): """ An organizer account can have EventMetaProperty objects attached to define meta information fields diff --git a/src/pretix/base/notifications.py b/src/pretix/base/notifications.py index 58c67eceb..f4f661786 100644 --- a/src/pretix/base/notifications.py +++ b/src/pretix/base/notifications.py @@ -150,31 +150,6 @@ def get_all_notification_types(event=None): return types -class ActionRequiredNotificationType(NotificationType): - required_permission = "can_change_orders" - action_type = "pretix.event.action_required" - verbose_name = _("Administrative action required") - - def build_notification(self, logentry: LogEntry): - control_url = build_absolute_uri( - 'control:event.requiredactions', - kwargs={ - 'organizer': logentry.event.organizer.slug, - 'event': logentry.event.slug, - } - ) - - n = Notification( - event=logentry.event, - title=_('Administrative action required'), - detail=_('Something happened in your event that our system cannot handle automatically, e.g. an external ' - 'refund. You need to resolve it manually or choose to ignore it, depending on the issue at hand.'), - url=control_url - ) - n.add_action(_('View all unresolved problems'), control_url) - return n - - class ParametrizedOrderNotificationType(NotificationType): required_permission = "can_view_orders" @@ -324,7 +299,4 @@ def register_default_notification_types(sender, **kwargs): _('Refund requested'), _('You have been requested to issue a refund for {order.code}.') ), - ActionRequiredNotificationType( - sender, - ) ) diff --git a/src/pretix/base/signals.py b/src/pretix/base/signals.py index b044db101..634a1ea41 100644 --- a/src/pretix/base/signals.py +++ b/src/pretix/base/signals.py @@ -502,16 +502,7 @@ As with all event-plugin signals, the ``sender`` keyword argument will contain t requiredaction_display = EventPluginSignal() """ -Arguments: ``action``, ``request`` - -To display an instance of the ``RequiredAction`` model to a human user, -``pretix.base.signals.requiredaction_display`` will be sent out with a ``action`` argument. -You will also get the current ``request`` in a different argument. - -The first received response that is not ``None`` will be used to display the log entry -to the user. The receivers are expected to return HTML code. - -As with all event-plugin signals, the ``sender`` keyword argument will contain the event. +**DEPRECATED**, will no longer be called. """ event_copy_data = EventPluginSignal() diff --git a/src/pretix/control/templates/pretixcontrol/event/actions.html b/src/pretix/control/templates/pretixcontrol/event/actions.html deleted file mode 100644 index 155c02a5f..000000000 --- a/src/pretix/control/templates/pretixcontrol/event/actions.html +++ /dev/null @@ -1,25 +0,0 @@ -{% extends "pretixcontrol/items/base.html" %} -{% load i18n %} -{% block title %}{% trans "Current issues" %}{% endblock %} -{% block inside %} -

{% trans "Current issues" %}

- - {% include "pretixcontrol/pagination.html" %} -{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/event/index.html b/src/pretix/control/templates/pretixcontrol/event/index.html index 131d41873..1c9c46e0b 100644 --- a/src/pretix/control/templates/pretixcontrol/event/index.html +++ b/src/pretix/control/templates/pretixcontrol/event/index.html @@ -65,36 +65,6 @@ {% endif %} {% eventsignal request.event "pretix.control.signals.event_dashboard_top" request=request %} - {% if actions|length > 0 %} -
-
-

- {% trans "Your attention is required to resolve the following issues" %} -

-
- - -
- {% endif %} {% if request.event.has_subevents %}
diff --git a/src/pretix/control/urls.py b/src/pretix/control/urls.py index 5cf8c80e2..f4e4769fd 100644 --- a/src/pretix/control/urls.py +++ b/src/pretix/control/urls.py @@ -197,9 +197,6 @@ urlpatterns = [ re_path(r'^live/$', event.EventLive.as_view(), name='event.live'), re_path(r'^logs/$', event.EventLog.as_view(), name='event.log'), re_path(r'^delete/$', event.EventDelete.as_view(), name='event.delete'), - re_path(r'^requiredactions/$', event.EventActions.as_view(), name='event.requiredactions'), - re_path(r'^requiredactions/(?P\d+)/discard$', event.EventActionDiscard.as_view(), - name='event.requiredaction.discard'), re_path(r'^comment/$', event.EventComment.as_view(), name='event.comment'), re_path(r'^quickstart/$', event.QuickSetupView.as_view(), name='event.quick'), diff --git a/src/pretix/control/views/dashboards.py b/src/pretix/control/views/dashboards.py index 1cf0579c8..66446a33a 100644 --- a/src/pretix/control/views/dashboards.py +++ b/src/pretix/control/views/dashboards.py @@ -39,8 +39,7 @@ import pytz from django.conf import settings from django.contrib.contenttypes.models import ContentType from django.db.models import ( - Count, Exists, IntegerField, Max, Min, OuterRef, Prefetch, Q, Subquery, - Sum, + Count, IntegerField, Max, Min, OuterRef, Prefetch, Q, Subquery, Sum, ) from django.db.models.functions import Coalesce, Greatest from django.dispatch import receiver @@ -57,7 +56,7 @@ from django.utils.translation import gettext_lazy as _, pgettext, ungettext from pretix.base.decimal import round_decimal from pretix.base.models import ( Item, ItemCategory, ItemVariation, Order, OrderPosition, OrderRefund, - Question, Quota, RequiredAction, SubEvent, Voucher, WaitingListEntry, + Question, Quota, SubEvent, Voucher, WaitingListEntry, ) from pretix.base.services.quotas import QuotaAvailability from pretix.base.timeline import timeline_for_event @@ -349,8 +348,6 @@ def event_index(request, organizer, event): can_view_orders = request.user.has_event_permission(request.organizer, request.event, 'can_view_orders', request=request) - can_change_orders = request.user.has_event_permission(request.organizer, request.event, 'can_change_orders', - request=request) can_change_event_settings = request.user.has_event_permission(request.organizer, request.event, 'can_change_event_settings', request=request) @@ -359,12 +356,9 @@ def event_index(request, organizer, event): for r, result in event_dashboard_widgets.send(sender=request.event, subevent=subevent, lazy=True): widgets.extend(result) - a_qs = request.event.requiredaction_set.filter(done=False) - ctx = { 'widgets': rearrange(widgets), 'subevent': subevent, - 'actions': a_qs[:5] if can_change_orders else [], 'comment_form': CommentForm(initial={'comment': request.event.comment}, readonly=not can_change_event_settings), } @@ -387,9 +381,6 @@ def event_index(request, organizer, event): order__event=request.event ).exists() - for a in ctx['actions']: - a.display = a.display(request) - ctx['timeline'] = [ { 'date': t.datetime.astimezone(request.event.timezone).date(), @@ -470,15 +461,10 @@ def annotated_event_query(request, lazy=False): 'c' ) - required_actions = RequiredAction.objects.filter( - event=OuterRef('pk'), - done=False - ) qs = request.user.get_events_with_any_permission(request) if not lazy: qs = qs.annotate( order_count=Subquery(active_orders, output_field=IntegerField()), - has_ra=Exists(required_actions) ) qs = qs.annotate( min_from=Min('subevents__date_from'), @@ -539,9 +525,7 @@ def widgets_for_event_qs(request, qs, user, nmax, lazy=False): else: dr = date_format(event.date_from.astimezone(tz), "DATE_FORMAT") - if event.has_ra: - status = ('danger', _('Action required')) - elif not event.live: + if not event.live: status = ('warning', _('Shop disabled')) elif event.presale_has_ended: status = ('default', _('Sale over')) diff --git a/src/pretix/control/views/event.py b/src/pretix/control/views/event.py index 4949f17dd..f19a75ef2 100644 --- a/src/pretix/control/views/event.py +++ b/src/pretix/control/views/event.py @@ -66,9 +66,7 @@ from pytz import timezone from pretix.base.channels import get_all_sales_channels from pretix.base.email import get_available_placeholders -from pretix.base.models import ( - Event, LogEntry, Order, RequiredAction, TaxRule, Voucher, -) +from pretix.base.models import Event, LogEntry, Order, TaxRule, Voucher from pretix.base.models.event import EventMetaValue from pretix.base.services import tickets from pretix.base.services.invoices import build_preview_invoice_pdf @@ -1048,42 +1046,6 @@ class EventLog(EventPermissionRequiredMixin, PaginationMixin, ListView): return ctx -class EventActions(EventPermissionRequiredMixin, ListView): - template_name = 'pretixcontrol/event/actions.html' - model = RequiredAction - context_object_name = 'actions' - paginate_by = 20 - permission = 'can_change_orders' - - def get_queryset(self): - qs = self.request.event.requiredaction_set.filter(done=False) - return qs - - def get_context_data(self, **kwargs): - ctx = super().get_context_data() - for a in ctx['actions']: - a.display = a.display(self.request) - return ctx - - -class EventActionDiscard(EventPermissionRequiredMixin, View): - permission = 'can_change_orders' - - def get(self, request, **kwargs): - action = get_object_or_404(RequiredAction, event=request.event, pk=kwargs.get('id')) - action.done = True - action.user = request.user - action.save() - messages.success(self.request, _('The issue has been marked as resolved!')) - return redirect(self.get_success_url()) - - def get_success_url(self) -> str: - return reverse('control:event.index', kwargs={ - 'organizer': self.request.event.organizer.slug, - 'event': self.request.event.slug - }) - - class EventComment(EventPermissionRequiredMixin, View): permission = 'can_change_event_settings' diff --git a/src/pretix/plugins/paypal/signals.py b/src/pretix/plugins/paypal/signals.py index 460e1d628..669838fc0 100644 --- a/src/pretix/plugins/paypal/signals.py +++ b/src/pretix/plugins/paypal/signals.py @@ -24,13 +24,11 @@ from collections import OrderedDict from django import forms from django.dispatch import receiver -from django.template.loader import get_template from django.utils.translation import gettext_lazy as _ from pretix.base.forms import SecretKeySettingsField from pretix.base.signals import ( logentry_display, register_global_settings, register_payment_providers, - requiredaction_display, ) @@ -65,24 +63,6 @@ def pretixcontrol_logentry_display(sender, logentry, **kwargs): return _('PayPal reported an event: {}').format(text) -@receiver(signal=requiredaction_display, dispatch_uid="paypal_requiredaction_display") -def pretixcontrol_action_display(sender, action, request, **kwargs): - if not action.action_type.startswith('pretix.plugins.paypal'): - return - - data = json.loads(action.data) - - if action.action_type == 'pretix.plugins.paypal.refund': - template = get_template('pretixplugins/paypal/action_refund.html') - elif action.action_type == 'pretix.plugins.paypal.overpaid': - template = get_template('pretixplugins/paypal/action_overpaid.html') - elif action.action_type == 'pretix.plugins.paypal.double': - template = get_template('pretixplugins/paypal/action_double.html') - - ctx = {'data': data, 'event': sender, 'action': action} - return template.render(ctx, request) - - @receiver(register_global_settings, dispatch_uid='paypal_global_settings') def register_global_settings(sender, **kwargs): return OrderedDict([ diff --git a/src/pretix/plugins/paypal/templates/pretixplugins/paypal/action_double.html b/src/pretix/plugins/paypal/templates/pretixplugins/paypal/action_double.html deleted file mode 100644 index a63444bf3..000000000 --- a/src/pretix/plugins/paypal/templates/pretixplugins/paypal/action_double.html +++ /dev/null @@ -1,9 +0,0 @@ -{% load i18n %} - -

- {% url "control:event.order" organizer=event.organizer.slug event=event.slug code=data.order as ourl %} - {% blocktrans trimmed with payment=data.payment order=""|add:data.order|add:""|safe %} - The PayPal transaction {{ payment }} has succeeded, but the order {{ order }} has already been paid by other - means. Please double check and refund the money via PayPal's interface. - {% endblocktrans %} -

diff --git a/src/pretix/plugins/paypal/templates/pretixplugins/paypal/action_overpaid.html b/src/pretix/plugins/paypal/templates/pretixplugins/paypal/action_overpaid.html deleted file mode 100644 index 5e97c0cf2..000000000 --- a/src/pretix/plugins/paypal/templates/pretixplugins/paypal/action_overpaid.html +++ /dev/null @@ -1,10 +0,0 @@ -{% load i18n %} - -

- {% url "control:event.order" organizer=event.organizer.slug event=event.slug code=data.order as ourl %} - {% blocktrans trimmed with payment=data.payment order=""|add:data.order|add:""|safe %} - The PayPal transaction {{ payment }} has succeeded, but the order {{ order }} is expired and the product - was sold out in the meantime. Therefore, the payment could not be accepted. Please contact the user and refund - the money via PayPal's interface. - {% endblocktrans %} -

diff --git a/src/pretix/plugins/paypal/templates/pretixplugins/paypal/action_refund.html b/src/pretix/plugins/paypal/templates/pretixplugins/paypal/action_refund.html deleted file mode 100644 index 0eb8f9784..000000000 --- a/src/pretix/plugins/paypal/templates/pretixplugins/paypal/action_refund.html +++ /dev/null @@ -1,9 +0,0 @@ -{% load i18n %} - -

- {% url "control:event.order" organizer=event.organizer.slug event=event.slug code=data.order as ourl %} - {% blocktrans trimmed with payment=data.resource.id order=""|add:data.order|add:""|safe %} - PayPal reported that the payment {{ payment }} has been refunded or reversed. - Do you want to mark the matching order ({{ order }}) as refunded? - {% endblocktrans %} -

diff --git a/src/pretix/plugins/stripe/signals.py b/src/pretix/plugins/stripe/signals.py index da9187aaf..88b2efa2b 100644 --- a/src/pretix/plugins/stripe/signals.py +++ b/src/pretix/plugins/stripe/signals.py @@ -32,7 +32,6 @@ from pretix.base.forms import SecretKeySettingsField from pretix.base.settings import settings_hierarkey from pretix.base.signals import ( logentry_display, register_global_settings, register_payment_providers, - requiredaction_display, ) from pretix.control.signals import nav_organizer from pretix.plugins.stripe.forms import StripeKeyValidator @@ -164,25 +163,6 @@ def register_global_settings(sender, **kwargs): ]) -@receiver(signal=requiredaction_display, dispatch_uid="stripe_requiredaction_display") -def pretixcontrol_action_display(sender, action, request, **kwargs): - # DEPRECATED - if not action.action_type.startswith('pretix.plugins.stripe'): - return - - data = json.loads(action.data) - - if action.action_type == 'pretix.plugins.stripe.refund': - template = get_template('pretixplugins/stripe/action_refund.html') - elif action.action_type == 'pretix.plugins.stripe.overpaid': - template = get_template('pretixplugins/stripe/action_overpaid.html') - elif action.action_type == 'pretix.plugins.stripe.double': - template = get_template('pretixplugins/stripe/action_double.html') - - ctx = {'data': data, 'event': sender, 'action': action} - return template.render(ctx, request) - - @receiver(nav_organizer, dispatch_uid="stripe_nav_organizer") def nav_o(sender, request, organizer, **kwargs): if request.user.has_active_staff_session(request.session.session_key): diff --git a/src/pretix/plugins/stripe/templates/pretixplugins/stripe/action_double.html b/src/pretix/plugins/stripe/templates/pretixplugins/stripe/action_double.html deleted file mode 100644 index e0ceaf8d2..000000000 --- a/src/pretix/plugins/stripe/templates/pretixplugins/stripe/action_double.html +++ /dev/null @@ -1,9 +0,0 @@ -{% load i18n %} - -

- {% url "control:event.order" organizer=event.organizer.slug event=event.slug code=data.order as ourl %} - {% blocktrans trimmed with charge=data.charge stripe_href="href='https://dashboard.stripe.com/payments/"|add:data.charge|add:"' target='_blank'"|safe order=""|add:data.order|add:""|safe %} - The Stripe transaction {{ charge }} has succeeded, but the order {{ order }} has - already been paid by other means. Please double-check and refund the money via Stripe's interface. - {% endblocktrans %} -

diff --git a/src/pretix/plugins/stripe/templates/pretixplugins/stripe/action_overpaid.html b/src/pretix/plugins/stripe/templates/pretixplugins/stripe/action_overpaid.html deleted file mode 100644 index 8d7d68ba1..000000000 --- a/src/pretix/plugins/stripe/templates/pretixplugins/stripe/action_overpaid.html +++ /dev/null @@ -1,10 +0,0 @@ -{% load i18n %} - -

- {% url "control:event.order" organizer=event.organizer.slug event=event.slug code=data.order as ourl %} - {% blocktrans trimmed with charge=data.charge stripe_href="href='https://dashboard.stripe.com/payments/"|add:data.charge|add:"' target='_blank'"|safe order=""|add:data.order|add:""|safe %} - The Stripe transaction {{ charge }} has succeeded, but the order {{ order }} is - expired and the product was sold out in the meantime. Therefore, the payment could not be accepted. Please - contact the user and refund the money via Stripe's interface. - {% endblocktrans %} -

diff --git a/src/pretix/plugins/stripe/templates/pretixplugins/stripe/action_refund.html b/src/pretix/plugins/stripe/templates/pretixplugins/stripe/action_refund.html deleted file mode 100644 index 30e0a4442..000000000 --- a/src/pretix/plugins/stripe/templates/pretixplugins/stripe/action_refund.html +++ /dev/null @@ -1,9 +0,0 @@ -{% load i18n %} - -

- {% url "control:event.order" organizer=event.organizer.slug event=event.slug code=data.order as ourl %} - {% blocktrans trimmed with charge=data.charge stripe_href="href='https://dashboard.stripe.com/payments/"|add:data.charge|add:"' target='_blank'"|safe order=""|add:data.order|add:""|safe %} - Stripe reported that the transaction {{ charge }} has been refunded. - Do you want to refund mark the matching order ({{ order }}) as refunded? - {% endblocktrans %} -

diff --git a/src/tests/control/test_permissions.py b/src/tests/control/test_permissions.py index c560e85dc..c2d000857 100644 --- a/src/tests/control/test_permissions.py +++ b/src/tests/control/test_permissions.py @@ -340,7 +340,6 @@ event_permission_urls = [ ("can_view_orders", "orders/FOO/answer/5/", 404), ("can_change_orders", "cancel/", 200), ("can_change_vouchers", "vouchers/add", 200), - ("can_change_orders", "requiredactions/", 200), ("can_change_vouchers", "vouchers/bulk_add", 200), ("can_view_vouchers", "vouchers/", 200), ("can_view_vouchers", "vouchers/tags/", 200),