diff --git a/aleksis/apps/tezor/apps.py b/aleksis/apps/tezor/apps.py index d29ef8e854194d3eca0c848f9b66195c9809a61e..194ffad797675f5a7d9708c4d1c0df1c72281e7d 100644 --- a/aleksis/apps/tezor/apps.py +++ b/aleksis/apps/tezor/apps.py @@ -17,7 +17,6 @@ class DefaultConfig(AppConfig): def ready(self): from django.conf import settings # noqa - settings.PAYMENT_MODEL = "tezor.Invoice" settings.PAYMENT_VARIANTS = {} for app_config in apps.app_configs.values(): diff --git a/aleksis/apps/tezor/migrations/0002_invoice_due_date.py b/aleksis/apps/tezor/migrations/0002_invoice_due_date.py new file mode 100644 index 0000000000000000000000000000000000000000..373f9dc61f94d613cce82d789b85d50d2c1154bd --- /dev/null +++ b/aleksis/apps/tezor/migrations/0002_invoice_due_date.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.12 on 2022-03-12 21:25 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('tezor', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='invoice', + name='due_date', + field=models.DateField(null=True, verbose_name='Payment due date'), + ), + ] diff --git a/aleksis/apps/tezor/models/invoice.py b/aleksis/apps/tezor/models/invoice.py index 1c0b5ef961fc4eb4e063f1d864cb390fbcabbbfe..e4f24c581faf9a8f8847512c27cbb7871dbc840b 100644 --- a/aleksis/apps/tezor/models/invoice.py +++ b/aleksis/apps/tezor/models/invoice.py @@ -57,6 +57,7 @@ class Invoice(BasePayment, PureDjangoModel): ) number = models.CharField(verbose_name=_("Invoice number"), max_length=255) + due_date = models.DateField(verbose_name=_("Payment due date"), null=True) for_content_type = models.ForeignKey(ContentType, on_delete=models.SET_NULL, null=True) for_object_id = models.PositiveIntegerField() diff --git a/aleksis/apps/tezor/settings.py b/aleksis/apps/tezor/settings.py index 3cab1e66223d9ec51e3ae9170ecfae19d16385f0..e7277712f384d2170c04e46ce10634a01ac71785 100644 --- a/aleksis/apps/tezor/settings.py +++ b/aleksis/apps/tezor/settings.py @@ -1 +1,5 @@ INSTALLED_APPS = ["payments", "djp_sepa"] + +PAYMENT_MODEL = "tezor.Invoice" + +overrides = ["PAYMENT_MODEL"] diff --git a/aleksis/apps/tezor/templates/tezor/invoice/full.html b/aleksis/apps/tezor/templates/tezor/invoice/full.html index 2e0d735acda5b27ec16482d6ccfd380d4bd01f9c..345aed939f0ef2ad1e2e8a15b58d18286c0c9eae 100644 --- a/aleksis/apps/tezor/templates/tezor/invoice/full.html +++ b/aleksis/apps/tezor/templates/tezor/invoice/full.html @@ -72,12 +72,20 @@ </tr> <tr> <td> - <i class="material-icons iconify" data-icon="object.get_status_icon"></i> + <i class="material-icons iconify" data-icon="{{ object.get_status_icon }}"></i> </td> <td> {{ object.get_status_display }} </td> </tr> + <tr> + <td> + <i class="material-icons iconify" data-icon="mdi:calendar-end"></i> + </td> + <td> + {{ object.due_date }} + </td> + </tr> </table> </div> {% if object.status == "waiting" or object.status == "rejected" or object.status == "input" and can_do_payment %} diff --git a/pyproject.toml b/pyproject.toml index 155e9e96a0c2bffd77b41429360e194f04f27770..cdbd8becfc928118b2f2098f0ff40db2f7516e8f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,9 +30,8 @@ secondary = true [tool.poetry.dependencies] python = "^3.9" -aleksis-core = "^2.7" +aleksis-core = "^2.8.1.dev0" django-payments = "^0.15.1" -pycountry = "22.1.10" django-payments-sepa = "^1.0.dev0" [tool.poetry.dev-dependencies]