chore: align plugin against enext branch

eventyay_paypal/apps.py

@@ -4,7 +4,7 @@
 from . import __version__
 
 try:
-    from pretix.base.plugins import PluginConfig
+    from eventyay.base.plugins import PluginConfig
 except ImportError:
     raise RuntimeError("Python package 'paypal' is not installed.")
 
@@ -14,7 +14,7 @@ class PaypalPluginApp(AppConfig):
     name = "eventyay_paypal"
     verbose_name = _("PayPal")
 
-    class PretixPluginMeta:
+    class EventyayPluginMeta:
         name = _("PayPal")
         author = "eventyay"
         version = __version__

eventyay_paypal/migrations/0002_initial.py

@@ -8,18 +8,18 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('eventyay_paypal', '0001_initial'),
-        ('pretixbase', '0001_initial'),
+        ('base', '0001_initial'),
     ]
 
     operations = [
         migrations.AddField(
             model_name='referencedpaypalobject',
             name='order',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='pretixbase.order'),
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='base.order'),
         ),
         migrations.AddField(
             model_name='referencedpaypalobject',
             name='payment',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='pretixbase.orderpayment'),
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='base.orderpayment'),
         ),
     ]

eventyay_paypal/models.py

@@ -3,5 +3,5 @@
 
 class ReferencedPayPalObject(models.Model):
     reference = models.CharField(max_length=190, db_index=True, unique=True)
-    order = models.ForeignKey('pretixbase.Order', on_delete=models.CASCADE)
-    payment = models.ForeignKey('pretixbase.OrderPayment', null=True, blank=True, on_delete=models.CASCADE)
+    order = models.ForeignKey('base.Order', on_delete=models.CASCADE)
+    payment = models.ForeignKey('base.OrderPayment', null=True, blank=True, on_delete=models.CASCADE)

eventyay_paypal/payment.py

@@ -17,19 +17,19 @@
 from django.utils.translation import gettext as __
 from django.utils.translation import gettext_lazy as _
 from i18nfield.strings import LazyI18nString
-from pretix.base.decimal import round_decimal
-from pretix.base.models import Event, Order, OrderPayment, OrderRefund, Quota
-from pretix.base.payment import BasePaymentProvider, PaymentException
-from pretix.base.services.mail import SendMailException
-from pretix.base.settings import SettingsSandbox
-from pretix.helpers.urls import build_absolute_uri as build_global_uri
-from pretix.multidomain.urlreverse import build_absolute_uri
+from eventyay.base.decimal import round_decimal
+from eventyay.base.models import Event, Order, OrderPayment, OrderRefund, Quota
+from eventyay.base.payment import BasePaymentProvider, PaymentException
+from eventyay.base.services.mail import SendMailException
+from eventyay.base.settings import SettingsSandbox
+from eventyay.helpers.urls import build_absolute_uri as build_global_uri
+from eventyay.multidomain.urlreverse import build_absolute_uri
 
 from .models import ReferencedPayPalObject
 from .paypal_rest import PaypalRequestHandler
 from .utils import safe_get
 
-logger = logging.getLogger("pretix.plugins.eventyay_paypal")
+logger = logging.getLogger("eventyay.plugins.eventyay_paypal")
 
 SUPPORTED_CURRENCIES = [
     "AUD",
@@ -712,7 +712,7 @@ def execute_refund(self, refund: OrderRefund):
         if errors := refund_payment.get("errors"):
             logger.error("execute_refund: %s", errors["reason"])
             refund.order.log_action(
-                "pretix.event.order.refund.failed",
+                "eventyay.event.order.refund.failed",
                 {
                     "local_id": refund.local_id,
                     "provider": refund.provider,
@@ -737,7 +737,7 @@ def execute_refund(self, refund: OrderRefund):
 
         if errors := refund_detail.get("errors"):
             refund.order.log_action(
-                "pretix.event.order.refund.failed",
+                "eventyay.event.order.refund.failed",
                 {
                     "local_id": refund.local_id,
                     "provider": refund.provider,
@@ -761,7 +761,7 @@ def execute_refund(self, refund: OrderRefund):
             refund.save(update_fields=["state"])
         else:
             refund.order.log_action(
-                "pretix.event.order.refund.failed",
+                "eventyay.event.order.refund.failed",
                 {
                     "local_id": refund.local_id,
                     "provider": refund.provider,
@@ -873,7 +873,7 @@ def shred_payment_info(self, obj: Union[OrderPayment, OrderRefund]):
 
         for le in (
             obj.order.all_logentries()
-            .filter(action_type="pretix.plugins.eventyay_paypal.event")
+            .filter(action_type="eventyay.plugins.eventyay_paypal.event")
             .exclude(data="")
         ):
             d = le.parsed_data

eventyay_paypal/paypal_rest.py

@@ -13,7 +13,7 @@
 from cryptography.fernet import Fernet
 from django.core.cache import cache
 
-logger = logging.getLogger("pretix.plugins.eventyay_paypal")
+logger = logging.getLogger("eventyay.plugins.eventyay_paypal")
 
 
 class PaypalRequestHandler:

eventyay_paypal/signals.py

@@ -5,8 +5,8 @@
 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,
+from eventyay.base.forms import SecretKeySettingsField
+from eventyay.base.signals import (logentry_display, register_global_settings,
                                  register_payment_providers,
                                  requiredaction_display)
 
@@ -19,7 +19,7 @@ def register_payment_provider(sender, **kwargs):
 
 @receiver(signal=logentry_display, dispatch_uid="paypal_logentry_display")
 def pretixcontrol_logentry_display(sender, logentry, **kwargs):
-    if logentry.action_type != 'pretix.plugins.eventyay_paypal.event':
+    if logentry.action_type != 'eventyay.plugins.eventyay_paypal.event':
         return
 
     data = json.loads(logentry.data)
@@ -44,16 +44,16 @@ def pretixcontrol_logentry_display(sender, logentry, **kwargs):
 
 @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.eventyay_paypal'):
+    if not action.action_type.startswith('eventyay.plugins.eventyay_paypal'):
         return
 
     data = json.loads(action.data)
 
-    if action.action_type == 'pretix.plugins.eventyay_paypal.refund':
+    if action.action_type == 'eventyay.plugins.eventyay_paypal.refund':
         template = get_template('plugins/paypal/action_refund.html')
-    elif action.action_type == 'pretix.plugins.eventyay_paypal.overpaid':
+    elif action.action_type == 'eventyay.plugins.eventyay_paypal.overpaid':
         template = get_template('plugins/paypal/action_overpaid.html')
-    elif action.action_type == 'pretix.plugins.eventyay_paypal.double':
+    elif action.action_type == 'eventyay.plugins.eventyay_paypal.double':
         template = get_template('plugins/paypal/action_double.html')
 
     ctx = {'data': data, 'event': sender, 'action': action}

eventyay_paypal/urls.py

@@ -1,6 +1,6 @@
 from django.urls import include
 from django.urls import re_path as url
-from pretix.multidomain import event_url
+from eventyay.multidomain import event_url
 
 from .views import (abort, oauth_disconnect, oauth_return, redirect_view,
                     success, webhook)

eventyay_paypal/views.py

@@ -16,16 +16,16 @@
 from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.http import require_POST
 from django_scopes import scopes_disabled
-from pretix.base.models import Event, Order, OrderPayment, OrderRefund, Quota
-from pretix.base.payment import PaymentException
-from pretix.control.permissions import event_permission_required
-from pretix.multidomain.urlreverse import eventreverse
+from eventyay.base.models import Event, Order, OrderPayment, OrderRefund, Quota
+from eventyay.base.payment import PaymentException
+from eventyay.control.permissions import event_permission_required
+from eventyay.multidomain.urlreverse import eventreverse
 
 from .models import ReferencedPayPalObject
 from .payment import Paypal
 from .utils import safe_get
 
-logger = logging.getLogger("pretix.plugins.eventyay_paypal")
+logger = logging.getLogger("eventyay.plugins.eventyay_paypal")
 
 
 @xframe_options_exempt
@@ -360,7 +360,7 @@ def webhook(request, *args, **kwargs):
     if order_detail is None or payment is None:
         return HttpResponse("Order or payment not found", status=HTTPStatus.BAD_REQUEST)
 
-    payment.order.log_action("pretix.plugins.eventyay_paypal.event", data=event_json)
+    payment.order.log_action("eventyay.plugins.eventyay_paypal.event", data=event_json)
 
     def handle_refund():
         refund_id_in_event = safe_get(event_json, ["resource", "id"])