From dc24e64d4f9956017eec56b1a5725ed581a1ec59 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Fri, 2 Sep 2016 09:59:10 +1000 Subject: [PATCH 1/6] Fixes catch-all URLs --- pinaxcon/urls.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py index 87de23e..f49d94b 100644 --- a/pinaxcon/urls.py +++ b/pinaxcon/urls.py @@ -24,15 +24,17 @@ urlpatterns = [ url(r"^teams/", include("symposion.teams.urls")), - url(r"^boxes/", include("pinax.boxes.urls")), - url(r"^", include("pinax.pages.urls")), - # Required by registrasion url(r'^register/', include('registrasion.urls')), url(r'^nested_admin/', include('nested_admin.urls')), # Demo payment gateway and related features url(r"^register/pinaxcon/", include("pinaxcon.registrasion.urls")), + + url(r"^boxes/", include("pinax.boxes.urls")), + + # Catch-all MUST go last. + #url(r"^", include("pinax.pages.urls")), ] urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) From f0868a896be6b1569076bf485b38a2eaa7636624 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Fri, 2 Sep 2016 09:59:17 +1000 Subject: [PATCH 2/6] Adds report HTML view --- pinaxcon/templates/registrasion/report.html | 31 +++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pinaxcon/templates/registrasion/report.html diff --git a/pinaxcon/templates/registrasion/report.html b/pinaxcon/templates/registrasion/report.html new file mode 100644 index 0000000..bca0d20 --- /dev/null +++ b/pinaxcon/templates/registrasion/report.html @@ -0,0 +1,31 @@ +{% extends "site_base.html" %} +{% load bootstrap %} +{% load registrasion_tags %} + +{% block body %} + +

{{ title }}

+ +
+ {{ form | bootstrap}} +
+ +
+
+ + + + {% for heading in report.headings %} + + {% endfor %} + + {% for line in report.data %} + + {% for item in line %} + + {% endfor %} + + {% endfor %} +
{{ heading }}
{{ item }}
+ +{% endblock %} From c8e21b8011e31156346f4d04fd5ffca26f9e04b6 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Fri, 2 Sep 2016 09:59:28 +1000 Subject: [PATCH 3/6] Adds link to all reports. --- pinaxcon/templates/dashboard.html | 7 +++++++ .../templates/registrasion/reports_list.html | 21 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 pinaxcon/templates/registrasion/reports_list.html diff --git a/pinaxcon/templates/dashboard.html b/pinaxcon/templates/dashboard.html index 350c9d6..b9c0408 100644 --- a/pinaxcon/templates/dashboard.html +++ b/pinaxcon/templates/dashboard.html @@ -164,6 +164,13 @@ to put this toward other purchases, or to refund it.

{% endif %} {% endif %} + + {% if user.is_staff %} +

Registration reports

+ +

View available reports. +

+ {% endif %} diff --git a/pinaxcon/templates/registrasion/reports_list.html b/pinaxcon/templates/registrasion/reports_list.html new file mode 100644 index 0000000..f588359 --- /dev/null +++ b/pinaxcon/templates/registrasion/reports_list.html @@ -0,0 +1,21 @@ +{% extends "site_base.html" %} +{% load bootstrap %} +{% load registrasion_tags %} +{% block body %} + +

Registration reports

+ + + {% for report in reports %} + + + + + {% endfor %} +
+ {{ report.name }} + + {{ report.description }} +
+ +{% endblock %} From b6222c5eba3a1b74a28c06bad13b5fb2e8ec5e67 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Fri, 2 Sep 2016 11:06:46 +1000 Subject: [PATCH 4/6] Changes to report.html --- pinaxcon/templates/registrasion/report.html | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pinaxcon/templates/registrasion/report.html b/pinaxcon/templates/registrasion/report.html index bca0d20..03232f0 100644 --- a/pinaxcon/templates/registrasion/report.html +++ b/pinaxcon/templates/registrasion/report.html @@ -6,11 +6,13 @@

{{ title }}

-
- {{ form | bootstrap}} -
- -
+ {% if form %} +
+ {{ form | bootstrap}} +
+ +
+ {% endif %}
@@ -22,7 +24,12 @@ {% for line in report.data %} {% for item in line %} - + {% endfor %} {% endfor %} From 32340c9a983494ec26f8f10747bc123132f54e5b Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Sat, 3 Sep 2016 13:51:21 +1000 Subject: [PATCH 5/6] Show sectioned reports --- pinaxcon/templates/registrasion/report.html | 35 +++++++++++---------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/pinaxcon/templates/registrasion/report.html b/pinaxcon/templates/registrasion/report.html index 03232f0..a760618 100644 --- a/pinaxcon/templates/registrasion/report.html +++ b/pinaxcon/templates/registrasion/report.html @@ -15,24 +15,27 @@ {% endif %}
-
{{ item }} + {% if report.link_view and forloop.counter0 == 0 %} + + {% endif %} + {{ item }} +
- - {% for heading in report.headings %} - - {% endfor %} - - {% for line in report.data %} +{% for report in reports %} +

{{ report.title }}

+
{{ heading }}
- {% for item in line %} - + {% for heading in report.headings %} + {% endfor %} - {% endfor %} -
- {% if report.link_view and forloop.counter0 == 0 %} - - {% endif %} - {{ item }} - {{ heading }}
+ {% for line in report.data %} + + {% for item in line %} + + {% if report.link_view and forloop.counter0 == 0 %} + + {% endif %} + {{ item }} + + {% endfor %} + + {% endfor %} + +{% endfor %} {% endblock %} From 8d58ac0e064b96510c1bd8d7d83efccb321a716b Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Sat, 3 Sep 2016 15:55:25 +1000 Subject: [PATCH 6/6] Adds amend_registration template --- .../registrasion/amend_registration.html | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 pinaxcon/templates/registrasion/amend_registration.html diff --git a/pinaxcon/templates/registrasion/amend_registration.html b/pinaxcon/templates/registrasion/amend_registration.html new file mode 100644 index 0000000..faa66c8 --- /dev/null +++ b/pinaxcon/templates/registrasion/amend_registration.html @@ -0,0 +1,46 @@ +{% extends "site_base.html" %} +{% load bootstrap %} +{% load registrasion_tags %} + +{% block body %} + +

Item summary for {{ user.attendee.attendeeprofilebase.attendee_name }} + (id={{user.id}})

+ +

Paid Items

+ +

You cannot remove paid items from someone's registration. You must first + cancel the invoice that added those items. You will need to re-add the items + from that invoice for the user to have them available again.

+ +{% include "registrasion/items_list.html" with items=paid %} + +

Cancelled Items

+ +{% include "registrasion/items_list.html" with items=cancelled %} + +

Amend pending items

+ +
+ {% csrf_token %} + {{ form | bootstrap}} +
+ +
+ +

Generate invoice

+ +
+ Check out cart and view invoice +
+ +

Apply voucher

+ +
+ {% csrf_token %} + {{ voucher_form | bootstrap}} +
+ +
+ +{% endblock %}