diff --git a/pinaxcon/templates/registrasion/discount_list.html b/pinaxcon/templates/registrasion/discount_list.html index 74d4e0a1ff41312e8c10a90008ccb672defcc83b..7bee317cd3658b3462b19c159362a952b4340402 100644 --- a/pinaxcon/templates/registrasion/discount_list.html +++ b/pinaxcon/templates/registrasion/discount_list.html @@ -4,7 +4,7 @@
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. This discounts will be applied automatically when you check out.
{% regroup discounts by discount.description as discounts_grouped %} {% for discount_type in discounts_grouped %} -Monday 22 January–Friday 26 January 2018.
-University of Technology Sydney, New South Wales, Australia.
-{% endblock %} -{% block header_inset_image %}{% illustration "LCA18_nodate.svg" %}{% endblock %} -{% block header_background_image %}{% static "lca2018/images/wp_bg_optimised.jpg" %}{% endblock %} -{% block content %} -- NOTICE: The below invoice is automatically generated, and + NOTICE: The above invoice is automatically generated, and will be voided if you amend your selections before payment, or if discounts or products contained in the invoice become unavailable. The products and discounts are only reserved until the invoice due time, please pay before then @@ -25,27 +20,23 @@ {% url "invoice_access" invoice.user.attendee.access_code as access_url %}
Your most recent unpaid invoice will be available at {{ request.scheme }}://{{ request.get_host }}{{ access_url }} - You can print that page for your records, or give this URL to your accounts department to pay for this invoice
- -You've already paid for the following items:
{% include "registrasion/_items_list.html" with items=purchased suffix="(PAID)" %} @@ -48,25 +48,20 @@ {% endif %}You can add these items now, or you can come back and add them in a later purchase.
- {% if missing %} +{% 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: {% include "registrasion/_category_list.html" with categories=missing %} -
You can also change your selection from these categories:
diff --git a/pinaxcon/templates/registrasion/stripe/credit_card_payment.html b/pinaxcon/templates/registrasion/stripe/credit_card_payment.html index c35b96bf12c8f503125de0f289f3ca5587844d0c..37be4fdfe333a63875b8ddf3bf161b0adbfaf3a4 100644 --- a/pinaxcon/templates/registrasion/stripe/credit_card_payment.html +++ b/pinaxcon/templates/registrasion/stripe/credit_card_payment.html @@ -64,12 +64,10 @@ {% endblock %} {% block header_title %}Credit card payment for invoice #{{ invoice.id}}{% endblock %} -{% block header_inset_image %}{% illustration "casino.svg" %}{% endblock %} -{% block header_paragraph %} - Pay for your linux.conf.au attendance with your Visa, Mastercard, or American Express credit or debit card. Card payments are processed by Stripe. -{% endblock %} -{% block content %} + +{% block proposals_body %} +Pay for your linux.conf.au attendance with your Visa, Mastercard, or American Express credit or debit card. Card payments are processed by Stripe.
No data on this form is retained by {% conference_name %}, rather it is
@@ -77,7 +75,7 @@
to linux.conf.au. You must allow JavaScript from js.stripe.com
to complete payment.
You have ${{ invoice.balance_due }} remaining to pay on this invoice.
+You have ${{ invoice.balance_due }} remaining to pay on this invoice.
diff --git a/pinaxcon/templates/symposion/dashboard/_categories.html b/pinaxcon/templates/symposion/dashboard/_categories.html index a7d701347254242da1afdc1255b7c66fb78970a5..700aec03f3822ef81b1d0a125c8fadaf8ad4e390 100644 --- a/pinaxcon/templates/symposion/dashboard/_categories.html +++ b/pinaxcon/templates/symposion/dashboard/_categories.html @@ -7,7 +7,7 @@ {% load staticfiles %} {% if user.is_staff %} -If you would like to change the details on your badge or your attendee statistics, you may edit your attendee profile up until the 15th January 2018
@@ -55,10 +56,10 @@If you would like to change your registered email address or password, you can use our self-service account management portal
@@ -66,99 +67,63 @@You have ${{ credit }} leftover from refunded invoices. This credit will be automatically applied to new invoices. Contact the conference organisers to for a refund to your original payment source.
-You have ${{ credit }} leftover from refunded invoices. This credit will be automatically applied to new invoices. Contact the conference organisers to for a refund to your original payment source.
+