Show more status about uncompleted regs

Show if invoice is created, or if bulkpay is created.

diff --git a/template/confreg/admin_registration_list.html b/template/confreg/admin_registration_list.html
index 7e06078e64edf630833900957dae9bd3648641ff..e51e85073beb0920d5297e734493fcad141124a6 100644 (file)
--- a/template/confreg/admin_registration_list.html
+++ b/template/confreg/admin_registration_list.html
@@ -33,7 +33,7 @@ a.nocolor {
   <td>{{r.firstname}}</td>
   <td>{{r.company}}</td>
   <td>{{r.regtype.regtype}}</td>
-  <td>{{r.payconfirmedat|default:""}}</td>
+  <td>{%if r.payconfirmedat%}{{r.payconfirmedat}}{%elif r.invoice%}Invoice generated{%elif r.bulkpayment%}Bulk payment generated{%endif%}</td>
 {%if waitlist_active %}
   <td>{%if r.registrationwaitlistentry %}
    {%if r.payconfirmedat%}Accepted{%else%}

diff --git a/template/confreg/admin_registration_single.html b/template/confreg/admin_registration_single.html
index a19ab31e70baaa816398f2fda8446553a2f56645..945680f65c109d3900b4fd434ecd38063c8ce9a9 100644 (file)
--- a/template/confreg/admin_registration_single.html
+++ b/template/confreg/admin_registration_single.html
@@ -90,7 +90,7 @@
  </tr>
  <tr{%if not reg.payconfirmedat%} class="danger"{%endif%}>
   <td>Registration completed</td>
-  <td>{{reg.payconfirmedat|default:"Registration is NOT completed"}}</td>
+  <td>{%if reg.payconfirmedat%}{{reg.payconfirmedat}}{%elif reg.invoice%}Invoice generated, NOT paid{%elif reg.bulkpayment%}Bulk payment generated, NOT paid{%endif%}</td>
  </tr>
 {%if reg.attendee != reg.registrator %}
  <tr>