diff --git a/aleksis/apps/tezor/migrations/0001_initial.py b/aleksis/apps/tezor/migrations/0001_initial.py
index 98802cabe1a043e935049e80df04c07b1ce497e7..78902e2c22002582ad57b32b646b851d9f328a94 100644
--- a/aleksis/apps/tezor/migrations/0001_initial.py
+++ b/aleksis/apps/tezor/migrations/0001_initial.py
@@ -1,7 +1,7 @@
# Generated by Django 3.2.12 on 2022-03-06 21:33
import aleksis.core.mixins
-import django.contrib.sites.managers
+import aleksis.core.managers
from django.db import migrations, models
import django.db.models.deletion
@@ -25,7 +25,7 @@ class Migration(migrations.Migration):
('site', models.ForeignKey(default=1, editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.site')),
],
managers=[
- ('objects', django.contrib.sites.managers.CurrentSiteManager()),
+ ('objects', aleksis.core.managers.AlekSISBaseManager()),
],
),
migrations.CreateModel(
@@ -39,7 +39,7 @@ class Migration(migrations.Migration):
('site', models.ForeignKey(default=1, editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.site')),
],
managers=[
- ('objects', django.contrib.sites.managers.CurrentSiteManager()),
+ ('objects', aleksis.core.managers.AlekSISBaseManager()),
],
),
migrations.CreateModel(
diff --git a/aleksis/apps/tezor/migrations/0003_manual_invoicing.py b/aleksis/apps/tezor/migrations/0003_manual_invoicing.py
index 90b7100ced2bcb58c6016004b88dcc38d15e5ee9..125bae2603ba33764d4dcb3c245d92dc06a2255e 100644
--- a/aleksis/apps/tezor/migrations/0003_manual_invoicing.py
+++ b/aleksis/apps/tezor/migrations/0003_manual_invoicing.py
@@ -1,6 +1,6 @@
# Generated by Django 3.2.12 on 2022-03-12 21:41
-import django.contrib.sites.managers
+import aleksis.core.managers
from django.db import migrations, models
import django.db.models.deletion
@@ -29,7 +29,7 @@ class Migration(migrations.Migration):
'abstract': False,
},
managers=[
- ('objects', django.contrib.sites.managers.CurrentSiteManager()),
+ ('objects', aleksis.core.managers.AlekSISBaseManager()),
],
),
migrations.AddField(
diff --git a/aleksis/apps/tezor/migrations/0007_client_payment_variants.py b/aleksis/apps/tezor/migrations/0007_client_payment_variants.py
index 26e258ef53333dc9644b69f289b2d54f6947e9a1..92b9380215f1a1fa285e615ebe39efde0c9a353d 100644
--- a/aleksis/apps/tezor/migrations/0007_client_payment_variants.py
+++ b/aleksis/apps/tezor/migrations/0007_client_payment_variants.py
@@ -39,7 +39,7 @@ def configure_clients(apps, schema_editor):
values[f"{variant}_enabled"] = False
warnings.warn(f"Payment variant {variant} enabled but {field.name} not configured!")
- Client.objects.update(**values)
+ Client._base_manager.update(**values)
class Migration(migrations.Migration):
diff --git a/aleksis/apps/tezor/migrations/0010_alter_client_options_alter_invoice_options_and_more.py b/aleksis/apps/tezor/migrations/0010_alter_client_options_alter_invoice_options_and_more.py
new file mode 100644
index 0000000000000000000000000000000000000000..45e0a284018bdca6cfcd10fea7e791ba6dc6aa7c
--- /dev/null
+++ b/aleksis/apps/tezor/migrations/0010_alter_client_options_alter_invoice_options_and_more.py
@@ -0,0 +1,31 @@
+# Generated by Django 4.2.3 on 2023-07-22 15:41
+
+import aleksis.core.managers
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('sites', '0002_alter_domain_unique'),
+ ('tezor', '0009_invoice_billing_phone'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='client',
+ name='managed_by_app_label',
+ field=models.CharField(blank=True, editable=False, max_length=255, verbose_name='App label of app responsible for managing this instance'),
+ ),
+ migrations.AddField(
+ model_name='invoicegroup',
+ name='managed_by_app_label',
+ field=models.CharField(blank=True, editable=False, max_length=255, verbose_name='App label of app responsible for managing this instance'),
+ ),
+ migrations.AddField(
+ model_name='invoiceitem',
+ name='managed_by_app_label',
+ field=models.CharField(blank=True, editable=False, max_length=255, verbose_name='App label of app responsible for managing this instance'),
+ ),
+ ]
diff --git a/aleksis/apps/tezor/views.py b/aleksis/apps/tezor/views.py
index 66af774f7f1863911513ac0857fdd1569d32bad5..2f8d2cc0e03b7d245abb43f2d6a8677e9ce9a3f4 100644
--- a/aleksis/apps/tezor/views.py
+++ b/aleksis/apps/tezor/views.py
@@ -131,10 +131,10 @@ class ClientDetailView(PermissionRequiredMixin, DetailView):
permission_required = "tezor.view_client_rule"
template_name = "tezor/client/full.html"
- def get_context_data(self, obj):
+ def get_context_data(self, object):
context = super().get_context_data()
- invoice_groups = obj.invoice_groups.all()
+ invoice_groups = object.invoice_groups.all()
invoice_groups_table = InvoiceGroupsTable(invoice_groups)
RequestConfig(self.request).configure(invoice_groups_table)
context["invoice_groups_table"] = invoice_groups_table
@@ -156,10 +156,10 @@ class InvoiceGroupDetailView(PermissionRequiredMixin, DetailView):
self.invoices_action_form.execute()
return r
- def get_context_data(self, obj):
+ def get_context_data(self, object):
context = super().get_context_data()
- qs = obj.invoices.all()
+ qs = object.invoices.all()
invoices_filter = InvoicesFilter(self.request.GET, qs)
context["filter"] = invoices_filter
diff --git a/pyproject.toml b/pyproject.toml
index be70b5b60dd9d2166ed1f6f7ba8480c974700dca..dfd2d24e55b11cca61dbc7ca891df91f902d4fed 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
[tool.poetry]
name = "AlekSIS-App-Tezor"
-version = "1.2.1.dev0"
+version = "2.0.dev0"
packages = [
{ include = "aleksis" }
]
@@ -34,7 +34,7 @@ url = "https://edugit.org/api/v4/projects/461/packages/pypi/simple"
priority = "supplemental"
[tool.poetry.dependencies]
python = "^3.9"
-aleksis-core = "^3.0"
+aleksis-core = "^4.0.0.dev0"
django-payments = { version = "^1.0.0", extras = ["sofort"] }
django-payments-sepa = "^1.0.1"