This invoice has been issued as a result of an application to attend {% conference_name %}. All amounts are in New Zealand Dollars (NZD).

This invoice has been issued as a result of an application to attend {% conference_name %}. All amounts are in Australian Dollars (AUD).

diff --git a/pinaxcon/templates/registrasion/base.html b/pinaxcon/templates/registrasion/base.html index 999a0e9dddd3c3ba8e66d8fc8505ad58b4244d36..a83e70e76a09bbc1aa606c7477a492fde2f46447 100644 --- a/pinaxcon/templates/registrasion/base.html +++ b/pinaxcon/templates/registrasion/base.html @@ -1,9 +1,15 @@ -{% extends "utility_page.html" %} +{% extends "site_base.html" %} {% load staticfiles %} +{% load lca2018_tags %} +{% load i18n %} +{% block head_title %}{% block page_title %}{% endblock %}{% endblock %} -{% block utility_body %} - {% block proposals_body %} - {% endblock %} +{% block content_base %} +{% block content %} +

Discounts and Complimentary Items

The following discounts and complimentary items are available to you. If you wish to take advantage of this offer, you must choose your items below. The discounts will be applied automatically when you check out.

Discounts and Complimentary Items

The following discounts and complimentary items are available to you:

{% regroup discounts by discount.description as discounts_grouped %} +

{{ discount_type.grouper }}

{{ discount.quantity }} × {{ discount.clause }}

+ {{ discount_type.grouper }} +
- {{ discount.quantity }} × {{ discount.clause }}
+

+ + Please ensure you enter a value in the form below to take advantage of this discount.
+ The discounts will be applied automatically when you check out. + +

+ + If you do not enter anything, you will not receive anything from this category. + +

{% endif %} diff --git a/pinaxcon/templates/registrasion/guided_registration.html b/pinaxcon/templates/registrasion/guided_registration.html index 93630c3582e5442e2799f5d21ce31aa5f615fe59..5900dd31bcd0f53763b81e143a7bb7643a52e0c9 100644 --- a/pinaxcon/templates/registrasion/guided_registration.html +++ b/pinaxcon/templates/registrasion/guided_registration.html @@ -1,14 +1,14 @@ {% extends "registrasion/base.html" %} {% load lca2018_tags %} -{% block header_title %}Buy Your Ticket{% endblock %} -{% block header_paragraph %}Step {{ current_step }} of {{ total_steps|add:1 }} – {{ title }} {% endblock %} +{% block page_title %}Buy Your Ticket{% endblock %} +{% block page_lead %}Step {{ current_step }} of {{ total_steps|add:1 }} – {{ title }} {% endblock %} {% block scripts_extra %} {% for section in sections %} {{ section.form.media.js }} {% endfor %} - - + {% endblock %} {% block proposals_body %} - {% csrf_token %} @@ -38,21 +35,19 @@ {% endif %}

- {% if section.discounts %} - {% include "registrasion/discount_list.html" with discounts=section.discounts %} - {% endif %} + {% if section.discounts %} + {% include "registrasion/discount_list.html" with discounts=section.discounts %} + {% endif %} - {% include "_form_snippet.html" with form=section.form %} + {% include "_form_snippet.html" with form=section.form %} -
-

- {% endfor %} +
+ + {% endfor %} - {% if current_step > 1 %} - Back - {% endif %} - + {% if current_step > 1 %} + Back + {% endif %} + - - {% endblock %} diff --git a/pinaxcon/templates/registrasion/invoice.html b/pinaxcon/templates/registrasion/invoice.html index 3cfb62c06838eee6679345241dd3aec8fd61ca9c..dcd0a017ee7ba3f6d5cabe4890be0763ddd2d347 100644 --- a/pinaxcon/templates/registrasion/invoice.html +++ b/pinaxcon/templates/registrasion/invoice.html @@ -3,11 +3,12 @@ {% load lca2018_tags %} {% load staticfiles %} -{% block header_title %}{% conference_name %}{% endblock %} +{% block head_title %}Tax Invoice/Statement #{{ invoice.id }}{% endblock %} +{% block page_title %}{% conference_name %}{% endblock %} {% block proposals_body %} {% include "registrasion/_invoice_details.html" %} -

{% if invoice.is_unpaid %}

NOTICE: The above invoice is automatically generated, and @@ -26,7 +27,7 @@ Pay this invoice by card {% if user.is_staff %} - Apply manual payment + Apply manual payment {% endif %} {% elif invoice.is_paid %} @@ -37,6 +38,4 @@ {% endif %}

- - {% endblock %} diff --git a/pinaxcon/templates/registrasion/product_category.html b/pinaxcon/templates/registrasion/product_category.html index 42b9c26e66d71f0a7fefe40d8fe7f70d850c2554..df61fbfa9938b4719bb4a9a304e9b02196199026 100644 --- a/pinaxcon/templates/registrasion/product_category.html +++ b/pinaxcon/templates/registrasion/product_category.html @@ -2,35 +2,26 @@ {% load registrasion_tags %} {% load lca2018_tags %} -{% block header_title %}Product Category: {{ category.name }}{% endblock %} -{% block header_inset_image %}{% illustration "lavender.svg" %}{% endblock %} +{% block page_title %}Product Category: {{ category.name }}{% endblock %} {% block scripts_extra %} {{ voucher_form.media.js }} {{ form.media.js }} - - {% endblock %} {% block proposals_body %} - {% csrf_token %} - -

- {% items_purchased category as items %} {% if items %}

Paid items

You have already paid for the following items:

{% include "registrasion/_items_list.html" with items=items %} - {% endif %} - -

{{ category.description|safe }}

@@ -38,16 +29,13 @@ {% include "registrasion/discount_list.html" with discounts=discounts %} {% endif %} -

Make a selection

{% include "_form_snippet.html" with form=form %}
-

- - Return to dashboard -

+ + Return to dashboard

- {% endblock %} diff --git a/pinaxcon/templates/registrasion/review.html b/pinaxcon/templates/registrasion/review.html index a8ced98097fd8ef32afda54ed1d75821f6563638..da2f5dbc5b9f6d5de549287bd52573a6c1969b2a 100644 --- a/pinaxcon/templates/registrasion/review.html +++ b/pinaxcon/templates/registrasion/review.html @@ -2,9 +2,8 @@ {% load registrasion_tags %} {% load lca2018_tags %} -{% block header_title %}Review your selection{% endblock %} -{% block header_inset_image %}{% illustration "wineglass.svg" %}{% endblock %} -{% block header_paragraph %} +{% block page_title %}Review your selection{% endblock %} +{% block page_lead %} Please ensure that you have selected all of the products you require, including t-shirts and social event tickets. {% endblock %} @@ -22,8 +21,7 @@ {% if pending %}

Current selection

You've selected the following items, which will be in your invoice when - you check out:

You've selected the following items, which will be in your invoice when you check out:

{% include "registrasion/_items_list.html" with items=pending %}

{% endif %} @@ -39,20 +37,22 @@

Modify your selection

+ {% missing_categories as missing %} {% if missing %} - You have not selected anything from the following - categories. If your ticket includes any of these, you still need to - make a selection: - +

You have empty categories

You have not selected anything from the following + categories. If your ticket includes any of these, you still need to + make a selection: +

{% include "registrasion/_category_list.html" with categories=missing %} - {% endif %} -

+ {% endif %}

- You can also change your selection from these categories: + You can change your selection from these categories: {% available_categories as available %} {% include "registrasion/_category_list.html" with categories=available exclude=missing %}

@@ -64,7 +64,6 @@

What next?

{% if pending %} @@ -88,6 +87,4 @@ {% endif %}

- - {% endblock %} diff --git a/pinaxcon/templates/registrasion/stripe/credit_card_payment.html b/pinaxcon/templates/registrasion/stripe/credit_card_payment.html index 4d5ff2b67fc1933492d95f8259855e3aa44ad24e..0317b36ab06d4e531e3ac3a9b2d6883abc49de02 100644 --- a/pinaxcon/templates/registrasion/stripe/credit_card_payment.html +++ b/pinaxcon/templates/registrasion/stripe/credit_card_payment.html @@ -63,7 +63,7 @@ {% endblock %} -{% block header_title %}Credit card payment for invoice #{{ invoice.id}}{% endblock %} +{% block page_title %}Credit card payment for invoice #{{ invoice.id}}{% endblock %} {% block proposals_body %} diff --git a/pinaxcon/templates/site_base.html b/pinaxcon/templates/site_base.html index b172663ac9bfdc1cb8701d81eabab6c1a7d6e08c..50ecb81916a03b352536753a625bdd749df731b5 100644 --- a/pinaxcon/templates/site_base.html +++ b/pinaxcon/templates/site_base.html @@ -31,14 +31,14 @@ {% block template_overrides %}{% endblock %} -

{% block alert %}{% endblock %} {% block navbar %}{% include 'nav.html' %}{% endblock %}

{% if messages %}

{{ message }} {% endfor %} @@ -47,11 +47,13 @@ {% endif %}

{% block page_title %}{% endblock %}

+ {% block body_base %} {% block body_out %} -

{% block body_outer %} @@ -98,7 +100,7 @@ {% endblock %}

Tax Invoice/Statement

Linux Australia

GST #90-792-369

ABN 56 987 117 479

Discounts and Complimentary Items

Discounts and Complimentary Items