From 288d90332b1a04fcb16994b5de944ce509bbd1e0 Mon Sep 17 00:00:00 2001
From: Thomas Steen Rasmussen <tykling@bornhack.org>
Date: Tue, 10 Aug 2021 21:10:31 +0200
Subject: [PATCH] fix a few things in the invoice list

---
 .../templates/includes/invoice_list_panel.html     | 14 +++++++-------
 src/shop/models.py                                 |  7 +++++++
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/backoffice/templates/includes/invoice_list_panel.html b/src/backoffice/templates/includes/invoice_list_panel.html
index 934fe65a..5d5ca65a 100644
--- a/src/backoffice/templates/includes/invoice_list_panel.html
+++ b/src/backoffice/templates/includes/invoice_list_panel.html
@@ -1,14 +1,14 @@
 {% load bornhack %}
 {% if invoice_list %}
-<table class="table table-hover">
+<table class="table table-hover datatable">
   <thead>
   <tr>
     <th>Invoice #</th>
     <th>Username</th>
     <th>Email</th>
     <th>Invoice Date</th>
-    <th>Paid</th>
     <th>Order</th>
+    <th>Paid</th>
     <th>Actions</th>
   </tr>
   </thead>
@@ -16,11 +16,11 @@
     {% for invoice in invoice_list %}
     <tr>
       <td>{{ invoice.id }}</td>
-      <td>{{ invoice.user.username }}</td>
-      <td>{{ invoice.user.email }} DKK</td>
-      <td>{{ invoice.invoice_date }}</td>
-      <td>{{ invoice.paid|truefalseicon }}</td>
-      <td>{{ invoice.order }}</td>
+      <td>{{ invoice.get_order.user.username }}</td>
+      <td>{{ invoice.get_order.user.email }}</td>
+      <td>{{ invoice.created|date }}</td>
+      <td>{{ invoice.get_order }}</td>
+      <td>{{ invoice.get_order.paid|truefalseicon }}</td>
       <td>
           n/a
       </td>
diff --git a/src/shop/models.py b/src/shop/models.py
index 5ca2d1b0..1fdb2863 100644
--- a/src/shop/models.py
+++ b/src/shop/models.py
@@ -683,6 +683,13 @@ class Invoice(CreatedUpdatedModel):
     def regretdate(self):
         return self.created + timedelta(days=15)
 
+    @property
+    def get_order(self):
+        if self.order:
+            return self.order
+        else:
+            return self.customorder
+
 
 class CoinifyAPIInvoice(CreatedUpdatedModel):
     coinify_id = models.IntegerField(null=True)