Skip to content
Snippets Groups Projects

Resolve "Move payment status icon to Invoice method"

Merged Nik | Klampfradler requested to merge 9-move-payment-status-icon-to-invoice-method into master
1 unresolved thread
2 files
+ 14
12
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -6,7 +6,7 @@ from django.shortcuts import reverse
@@ -6,7 +6,7 @@ from django.shortcuts import reverse
from django.utils.translation import gettext_lazy as _
from django.utils.translation import gettext_lazy as _
from djmoney.models.fields import CurrencyField, MoneyField
from djmoney.models.fields import CurrencyField, MoneyField
from payments import PurchasedItem
from payments import PaymentStatus, PurchasedItem
from payments.models import BasePayment
from payments.models import BasePayment
from aleksis.core.mixins import ExtensibleModel, PureDjangoModel
from aleksis.core.mixins import ExtensibleModel, PureDjangoModel
@@ -40,6 +40,15 @@ class Invoice(BasePayment, PureDjangoModel):
@@ -40,6 +40,15 @@ class Invoice(BasePayment, PureDjangoModel):
"pledge": (_("Payment pledge / manual payment"), "mdi:hand-coin"),
"pledge": (_("Payment pledge / manual payment"), "mdi:hand-coin"),
"sdd": (_("SEPA Direct Debit"), "mdi:bank-transfer"),
"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(
group = models.ForeignKey(
InvoiceGroup, verbose_name=_("Invoice group"), related_name="invoices", on_delete=models.SET_NULL, null=True
InvoiceGroup, verbose_name=_("Invoice group"), related_name="invoices", on_delete=models.SET_NULL, null=True
@@ -64,6 +73,9 @@ class Invoice(BasePayment, PureDjangoModel):
@@ -64,6 +73,9 @@ class Invoice(BasePayment, PureDjangoModel):
def get_variant_icon(self):
def get_variant_icon(self):
return self.__class__.VARIANT_DISPLAY[self.variant][1]
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):
def get_purchased_items(self):
return self.for_object.get_purchased_items()
return self.for_object.get_purchased_items()
Loading