diff --git a/pinaxcon/templates/dashboard.html b/pinaxcon/templates/dashboard.html index 350c9d63ae8f707c846b2a50ce3bcde3f20fcb6f..b9c0408c41278909de6b26290be09371c4196d85 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/amend_registration.html b/pinaxcon/templates/registrasion/amend_registration.html new file mode 100644 index 0000000000000000000000000000000000000000..faa66c88fbeb919ad22b82fff5bac101267158c2 --- /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 %} diff --git a/pinaxcon/templates/registrasion/report.html b/pinaxcon/templates/registrasion/report.html new file mode 100644 index 0000000000000000000000000000000000000000..a76061883d757dac0cd292961bccec5cc39411b9 --- /dev/null +++ b/pinaxcon/templates/registrasion/report.html @@ -0,0 +1,41 @@ +{% extends "site_base.html" %} +{% load bootstrap %} +{% load registrasion_tags %} + +{% block body %} + +

{{ title }}

+ + {% if form %} +
+ {{ form | bootstrap}} +
+ +
+ {% endif %} +
+ +{% for report in reports %} +

{{ report.title }}

+ + + {% for heading in report.headings %} + + {% endfor %} + + {% for line in report.data %} + + {% for item in line %} + + {% endfor %} + + {% endfor %} +
{{ heading }}
+ {% if report.link_view and forloop.counter0 == 0 %} + + {% endif %} + {{ item }} +
+{% endfor %} + +{% endblock %} diff --git a/pinaxcon/templates/registrasion/reports_list.html b/pinaxcon/templates/registrasion/reports_list.html new file mode 100644 index 0000000000000000000000000000000000000000..f588359345f7c897ed51708f189a123fb688b0a9 --- /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 %} diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py index 87de23ea41c4d50d0e2101ad837f6018b2f57681..f49d94b18da2e4d9bf83c28255a8f0311a8b2124 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)