align module imports with enext

Author: Gagan-Ram

eventyay_stripe/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 'stripe' is not installed.")
 
@@ -14,7 +14,7 @@ class StripePluginApp(AppConfig):
     name = 'eventyay_stripe'
     verbose_name = _("Stripe")
 
-    class PretixPluginMeta:
+    class EventyayPluginMeta:
         name = _("Stripe")
         author = "eventyay"
         version = __version__

eventyay_stripe/forms.py

@@ -1,7 +1,7 @@
 from django import forms
 from django.utils.translation import gettext_lazy as _
 
-from pretix.base.forms import SettingsForm
+from eventyay.base.forms import SettingsForm
 
 
 class StripeKeyValidator:

eventyay_stripe/management/commands/stripe_connect_fill_countries.py

@@ -2,8 +2,8 @@
 from django.core.management.base import BaseCommand
 from django_scopes import scopes_disabled
 
-from pretix.base.models import Event
-from pretix.base.settings import GlobalSettingsObject
+from eventyay.base.models import Event
+from eventyay.base.settings import GlobalSettingsObject
 
 
 class Command(BaseCommand):
@@ -18,7 +18,7 @@ def handle(self, *args, **options):
             self.stderr.write(self.style.ERROR("Stripe Connect is not set up!"))
             return
 
-        for e in Event.objects.filter(plugins__icontains="pretix.plugins.stripe"):
+        for e in Event.objects.filter(plugins__icontains="eventyay.plugins.stripe"):
             uid = e.settings.payment_stripe_connect_user_id
             if uid and not e.settings.payment_stripe_merchant_country:
                 if uid in cache:

eventyay_stripe/migrations/0001_initial.py

@@ -1,31 +1,33 @@
-from django.db import migrations, models
+# Generated by Django 5.2.5 on 2025-10-31 11:23
+
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
     initial = True
 
     dependencies = [
-        ('pretixbase', '0001_initial'),
+        ('base', '0001_initial'),
     ]
 
     operations = [
         migrations.CreateModel(
             name='RegisteredApplePayDomain',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('domain', models.CharField(max_length=190)),
                 ('account', models.CharField(max_length=190)),
             ],
         ),
         migrations.CreateModel(
             name='ReferencedStripeObject',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('reference', models.CharField(db_index=True, max_length=190, unique=True)),
-                ('order', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='pretixbase.order')),
-                ('payment', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='pretixbase.orderpayment')),
+                ('order', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='base.order')),
+                ('payment', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='base.orderpayment')),
             ],
         ),
     ]

eventyay_stripe/models.py

@@ -3,8 +3,8 @@
 
 class ReferencedStripeObject(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)
 
 
 class RegisteredApplePayDomain(models.Model):

eventyay_stripe/payment.py

@@ -26,21 +26,21 @@
 from geoip2.errors import AddressNotFoundError
 from pydantic import ValidationError
 
-from pretix.base.decimal import round_decimal
-from pretix.base.forms import SecretKeySettingsField
-from pretix.base.forms.questions import guess_country
-from pretix.base.models import (
+from eventyay.base.decimal import round_decimal
+from eventyay.base.forms import SecretKeySettingsField
+from eventyay.base.forms.questions import guess_country
+from eventyay.base.models import (
     Event, InvoiceAddress, Order, OrderPayment, OrderRefund, Quota,
 )
-from pretix.base.payment import BasePaymentProvider, PaymentException
-from pretix.base.plugins import get_all_plugins
-from pretix.base.services.mail import SendMailException
-from pretix.base.settings import SettingsSandbox
-from pretix.helpers.countries import CachedCountries
-from pretix.helpers.http import get_client_ip
-from pretix.helpers.urls import build_absolute_uri as build_global_uri
-from pretix.multidomain.urlreverse import build_absolute_uri
-from pretix.presale.views.cart import cart_session
+from eventyay.base.payment import BasePaymentProvider, PaymentException
+from eventyay.base.plugins import get_all_plugins
+from eventyay.base.services.mail import SendMailException
+from eventyay.base.settings import SettingsSandbox
+from eventyay.helpers.countries import CachedCountries
+from eventyay.helpers.http import get_client_ip
+from eventyay.helpers.urls import build_absolute_uri as build_global_uri
+from eventyay.multidomain.urlreverse import build_absolute_uri
+from eventyay.presale.views.cart import cart_session
 
 from . import __version__
 from .forms import StripeKeyValidator
@@ -91,7 +91,7 @@ def settings_content_render(self, request):
                 ).format(
                     _(
                         "To accept payments via Stripe, you will need an account at Stripe. By clicking on the "
-                        "following button, you can either create a new Stripe account connect pretix to an existing "
+                        "following button, you can either create a new Stripe account connect eventyay to an existing "
                         "one."
                     ),
                     self.get_connect_url(request),
@@ -111,7 +111,7 @@ def settings_content_render(self, request):
             )
         else:
             message = _(
-                'Please configure a %(link)s to '
+                'Please configure a %%(link)s to '
                 'the following endpoint in order to automatically cancel orders when charges are refunded '
                 'externally and to process asynchronous payment methods like SOFORT.'
             ) % {'link': '<a href="https://dashboard.stripe.com/account/webhooks">Stripe Webhook</a>'}
@@ -122,7 +122,7 @@ def settings_content_render(self, request):
 
     @property
     def settings_form_fields(self):
-        if 'pretix_resellers' in [p.module for p in get_all_plugins()]:
+        if 'eventyay_resellers' in [p.module for p in get_all_plugins()]:
             moto_settings = [
                 (
                     "reseller_moto",
@@ -996,7 +996,7 @@ def shred_payment_info(self, obj: OrderPayment):
 
         for le in (
             obj.order.all_logentries()
-            .filter(action_type="pretix.plugins.stripe.event")
+            .filter(action_type="eventyay.plugins.stripe.event")
             .exclude(data="", shredded=True)
         ):
             d = le.parsed_data
@@ -1058,7 +1058,7 @@ def execute_refund(self, refund: OrderRefund):
             refund.execution_date = now()
             refund.save()
             refund.order.log_action(
-                "pretix.event.order.refund.failed",
+                "eventyay.event.order.refund.failed",
                 {
                     "local_id": refund.local_id,
                     "provider": refund.provider,

eventyay_stripe/signals.py

@@ -7,13 +7,13 @@
 from django.urls import resolve, reverse
 from django.utils.translation import gettext_lazy as _
 
-from pretix.base.forms import SecretKeySettingsField
-from pretix.base.settings import settings_hierarkey
-from pretix.base.signals import (
+from eventyay.base.forms import SecretKeySettingsField
+from eventyay.base.settings import settings_hierarkey
+from eventyay.base.signals import (
     logentry_display, register_global_settings, register_payment_providers,
 )
-from pretix.control.signals import nav_organizer
-from pretix.presale.signals import html_head
+from eventyay.control.signals import nav_organizer
+from eventyay.presale.signals import html_head
 
 from .forms import StripeKeyValidator
 
@@ -59,7 +59,7 @@ def html_head_presale(sender, request=None, **kwargs):
 
 @receiver(signal=logentry_display, dispatch_uid="stripe_logentry_display")
 def pretixcontrol_logentry_display(sender, logentry, **kwargs):
-    if logentry.action_type != 'pretix.plugins.stripe.event':
+    if logentry.action_type != 'eventyay.plugins.stripe.event':
         return
 
     data = json.loads(logentry.data)

eventyay_stripe/tasks.py

@@ -4,9 +4,9 @@
 import stripe
 from django.conf import settings
 
-from pretix.base.services.tasks import EventTask
-from pretix.celery_app import app
-from pretix.multidomain.urlreverse import get_event_domain
+from eventyay.base.services.tasks import EventTask
+from eventyay.celery_app import app
+from eventyay.multidomain.urlreverse import get_event_domain
 
 from .models import RegisteredApplePayDomain
 

eventyay_stripe/urls.py

@@ -1,6 +1,6 @@
 from django.urls import include, re_path
 
-from pretix.multidomain import event_url
+from eventyay.multidomain import event_url
 
 from .views import (
     OrganizerSettingsFormView, ReturnView, ScaReturnView, ScaView,

eventyay_stripe/views.py

@@ -21,21 +21,21 @@
 from django.views.generic import FormView
 from django_scopes import scopes_disabled
 
-from pretix.base.models import Event, Order, OrderPayment, Organizer, Quota
-from pretix.base.payment import PaymentException
-from pretix.base.services.locking import LockTimeoutException
-from pretix.base.settings import GlobalSettingsObject
-from pretix.control.permissions import (
+from eventyay.base.models import Event, Order, OrderPayment, Organizer, Quota
+from eventyay.base.payment import PaymentException
+from eventyay.base.services.locking import LockTimeoutException
+from eventyay.base.settings import GlobalSettingsObject
+from eventyay.control.permissions import (
     AdministratorPermissionRequiredMixin, event_permission_required,
 )
-from pretix.control.views.event import DecoupleMixin
-from pretix.control.views.organizer import OrganizerDetailViewMixin
-from pretix.helpers import OF_SELF
-from pretix.helpers.http import redirect_to_url
-from pretix.helpers.stripe_utils import (
+from eventyay.control.views.event import DecoupleMixin
+from eventyay.control.views.organizer import OrganizerDetailViewMixin
+from eventyay.helpers import OF_SELF
+from eventyay.helpers.http import redirect_to_url
+from eventyay.helpers.stripe_utils import (
     get_stripe_secret_key, get_stripe_webhook_secret_key,
 )
-from pretix.multidomain.urlreverse import build_absolute_uri, eventreverse
+from eventyay.multidomain.urlreverse import build_absolute_uri, eventreverse
 
 from .forms import OrganizerStripeSettingsForm
 from .models import ReferencedStripeObject
@@ -315,7 +315,7 @@ def charge_webhook(event, event_json, charge_id, rso):
             prov = payment.payment_provider
             prov._init_api()
 
-        order.log_action('pretix.plugins.stripe.event', data=event_json)
+        order.log_action('eventyay.plugins.stripe.event', data=event_json)
 
         is_refund = charge['amount_refunded'] or charge['refunds']['total_count'] or charge['dispute']
         if is_refund:
@@ -418,7 +418,7 @@ def source_webhook(event, event_json, source_id, rso):
             prov = payment.payment_provider
             prov._init_api()
 
-        order.log_action('pretix.plugins.stripe.event', data=event_json)
+        order.log_action('eventyay.plugins.stripe.event', data=event_json)
         go = (event_json['type'] == 'source.chargeable' and
               payment.state in (OrderPayment.PAYMENT_STATE_PENDING, OrderPayment.PAYMENT_STATE_CREATED) and
               src.status == 'chargeable')
@@ -707,7 +707,7 @@ def post(self, request, *args, **kwargs):
             form.save()
             if form.has_changed():
                 self.request.organizer.log_action(
-                    'pretix.organizer.settings', user=self.request.user, data={
+                    'eventyay.organizer.settings', user=self.request.user, data={
                         k: form.cleaned_data.get(k) for k in form.changed_data
                     }
                 )