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

aleksis/apps/tezor/models/invoice.py

@@ -7,7 +7,7 @@ from django.shortcuts import reverse
 from django.utils.translation import gettext_lazy as _
 
 from djmoney.models.fields import CurrencyField, MoneyField
-from payments import PurchasedItem
+from payments import PaymentStatus, PurchasedItem
 from payments.models import BasePayment
 
 from aleksis.core.mixins import ExtensibleModel, PureDjangoModel
@@ -42,6 +42,15 @@ class Invoice(BasePayment, PureDjangoModel):
         "pledge": (_("Payment pledge / manual payment"), "mdi:hand-coin"),
         "sdd": (_("SEPA Direct Debit"), "mdi:bank-transfer"),
     }
+    STATUS_ICONS = {
+        PaymentStatus.WAITING: "mdi:cash-lock-open",
+        PaymentStatus.INPUT: "mdi:cash-lock-open",
+        PaymentStatus.PREAUTH: "mdi:cash-lock",
+        PaymentStatus.CONFIRMED: "mdi:cash-check",
+        PaymentStatus.REFUNDED: "mdi:cash-refund",
+        PaymentStatus.REJECTED: "mdi:cash-remove",
+        PaymentStatus.ERROR: "mdi:cash-remove",
+    }
 
     group = models.ForeignKey(
         InvoiceGroup, verbose_name=_("Invoice group"), related_name="invoices", on_delete=models.SET_NULL, null=True
@@ -70,6 +79,9 @@ class Invoice(BasePayment, PureDjangoModel):
     def get_variant_icon(self):
         return self.__class__.VARIANT_DISPLAY[self.variant][1]
 
+    def get_status_icon(self):
+        return self.__class__.STATUS_ICONS[self.status]
+
     def get_purchased_items(self):
         for item in self.items.all():
             yield item.as_purchased_item()

aleksis/apps/tezor/templates/tezor/invoice/full.html

@@ -72,17 +72,7 @@
               </tr>
               <tr>
                 <td>
-                  {% if object.status == "waiting" or object.status == "input" %}
-                  <i class="material-icons iconify" data-icon="mdi:cash-lock-open"></i>
-                  {% elif object.status == "rejected" or object.status == "error" %}
-                  <i class="material-icons iconify" data-icon="mdi:cash-remove"></i>
-                  {% elif object.status == "preauth" %}
-                  <i class="material-icons iconify" data-icon="mdi:cash-lock"></i>
-                  {% elif object.status == "confirmed" %}
-                  <i class="material-icons iconify" data-icon="mdi:cash-check"></i>
-                  {% elif object.status == "refunded" %}
-                  <i class="material-icons iconify" data-icon="mdi:cash-refund"></i>
-                  {% endif %}
+                  <i class="material-icons iconify" data-icon="object.get_status_icon"></i>
                 </td>
                 <td>
                   {{ object.get_status_display }}