Merge branch 'master' into 2-add-manual-invoicing

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():

aleksis/apps/tezor/migrations/0002_invoice_due_date.py

+# 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'),
+        ),
+    ]

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()

aleksis/apps/tezor/settings.py

 INSTALLED_APPS = ["payments", "djp_sepa"]
+
+PAYMENT_MODEL = "tezor.Invoice"
+
+overrides = ["PAYMENT_MODEL"]

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 %}

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]