diff --git a/pinaxcon/templates/dashboard.html b/pinaxcon/templates/dashboard.html index cee89a3..67dffdd 100644 --- a/pinaxcon/templates/dashboard.html +++ b/pinaxcon/templates/dashboard.html @@ -141,9 +141,7 @@ {% endif %}
Add/Update items
{% available_categories as categories %} - {% for category in categories %} -
  • {{ category.name }}
  • - {% endfor %} + {% include "registrasion/_category_list.html" with categories=categories %} {% invoices as invoices %} diff --git a/pinaxcon/templates/registrasion/_category_list.html b/pinaxcon/templates/registrasion/_category_list.html new file mode 100644 index 0000000..16d9426 --- /dev/null +++ b/pinaxcon/templates/registrasion/_category_list.html @@ -0,0 +1,7 @@ + diff --git a/pinaxcon/templates/registrasion/guided_registration_complete.html b/pinaxcon/templates/registrasion/guided_registration_complete.html index 2683957..30dc3ce 100644 --- a/pinaxcon/templates/registrasion/guided_registration_complete.html +++ b/pinaxcon/templates/registrasion/guided_registration_complete.html @@ -4,21 +4,57 @@ {% block body %} -

    Conference Registration – Review

    +

    Review your selection

    {% items_pending as pending %} {% if pending %} -

    Step 4 of 4

    +

    Current selection

    -

    You're almost done! You've selected the following items:

    +

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

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

    You've already paid for the following items:

    + {% items_purchased as purchased %} + {% if purchased %} + {% include "registrasion/items_list.html" with items=purchased suffix="(PAID)" %} + {% endif %} + + + {% missing_categories as missing %} + +

    Add to your selection

    + +

    You can add these items now, or you can come back and add them in a + later purchase.

    + + {% if missing %} + +

    + You have not selected any items from the following + categories: +

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

    + +

    You can also select more items from these categories:

    + + {% available_categories as available %} + {% include "registrasion/_category_list.html" with categories=available exclude=missing %} + +

    What next?

    +

    You can either generate an invoice and pay for your registration, or return to - the dashboard to make amendments.

    + the dashboard.

    - Check out and pay + + Check out and pay + Return to dashboard
    diff --git a/pinaxcon/templates/registrasion/items_list.html b/pinaxcon/templates/registrasion/items_list.html index 1a21424..9926bc4 100644 --- a/pinaxcon/templates/registrasion/items_list.html +++ b/pinaxcon/templates/registrasion/items_list.html @@ -1,7 +1,7 @@ {% if items %} {% endif %}