From 4f46c715289a3dd2111e1eb3d89cdc5a84db318c 2016-09-14 03:51:16
From: Christopher Neugebauer <chrisjrn@gmail.com>
Date: 2016-09-14 03:51:16
Subject: [PATCH] Makes the review screen *much* more comprehensive.

Fixes #7

---

diff --git a/pinaxcon/templates/dashboard.html b/pinaxcon/templates/dashboard.html
index cee89a3561108fa24837b6822ec1a52005c539b6..67dffddf4e2302f05f1ba3f72169ec05a2ac454b 100644
--- a/pinaxcon/templates/dashboard.html
+++ b/pinaxcon/templates/dashboard.html
@@ -141,9 +141,7 @@
                 {% endif %}
                 <h5>Add/Update items</h5>
                 {% available_categories as categories %}
-                {% for category in categories %}
-                  <li><a href="{% url "product_category" category.id %}">{{ category.name }}</a></li>
-                {% endfor %}
+                {% include "registrasion/_category_list.html" with categories=categories %}
               </ul>
 
               {% invoices as invoices %}
diff --git a/pinaxcon/templates/registrasion/_category_list.html b/pinaxcon/templates/registrasion/_category_list.html
new file mode 100644
index 0000000000000000000000000000000000000000..16d94263c492cd54f5b5d48f3c866bc074aad9e5
--- /dev/null
+++ b/pinaxcon/templates/registrasion/_category_list.html
@@ -0,0 +1,7 @@
+<ul>
+  {% for category in categories %}
+    {% if not category in exclude %}
+      <li><a href="{% url "product_category" category.id %}">{{ category.name }}</a></li>
+    {% endif %}
+  {% endfor %}
+</ul>
diff --git a/pinaxcon/templates/registrasion/guided_registration_complete.html b/pinaxcon/templates/registrasion/guided_registration_complete.html
index 2683957016d40d7929108ee7ee86e645feff80b3..30dc3ce241a8da7aa8735f8e7d7bcb5558aca998 100644
--- a/pinaxcon/templates/registrasion/guided_registration_complete.html
+++ b/pinaxcon/templates/registrasion/guided_registration_complete.html
@@ -4,21 +4,57 @@
 
 {% block body %}
 
-  <h1>Conference Registration – Review</h1>
+  <h1>Review your selection</h1>
 
   {% items_pending as pending %}
   {% if pending %}
 
-  <p><em>Step 4 of 4</em></p>
+  <h3>Current selection</h3>
 
-  <p>You're almost done! You've selected the following items:<p>
+  <p>You've selected the following items, which will be in your invoice when
+    you check out:<p>
   {% include "registrasion/items_list.html" with items=pending %}
 
+  <p>You've already paid for the following items:</p>
+  {% items_purchased as purchased %}
+  {% if purchased %}
+    {% include "registrasion/items_list.html" with items=purchased suffix="(PAID)" %}
+  {% endif %}
+
+
+  {% missing_categories as missing %}
+
+  <h3>Add to your selection</h3>
+
+  <p>You can add these items now, or you can come back and add them in a
+    later purchase. </p>
+
+  {% if missing %}
+
+    <p>
+      <strong>You have <em>not</em> selected any items from the following
+        categories:</strong>
+    </p>
+    {% include "registrasion/_category_list.html" with categories=missing %}
+
+  {% endif %}
+
+  <h3></h3>
+
+  <p><strong>You can also select more items from these categories:</strong></p>
+
+  {% available_categories as available %}
+  {% include "registrasion/_category_list.html" with categories=available exclude=missing %}
+
+  <h3>What next?</h3>
+
   <p>You can either generate an invoice and pay for your registration, or return to
-    the dashboard to make amendments.</p>
+      the dashboard.</p>
 
   <div class="form-actions">
-    <a class="btn btn-default" href="{% url "checkout" %}">Check out and pay</a>
+    <a class="btn btn-default" href="{% url "checkout" %}">
+      <i class="fa fa-credit-card"></i> Check out and pay
+    </a>
     <a class="btn btn-default" href="{% url "dashboard" %}">Return to dashboard</a>
   </div>
 
diff --git a/pinaxcon/templates/registrasion/items_list.html b/pinaxcon/templates/registrasion/items_list.html
index 1a214243f4ece54e91896098dcf490867de73fa9..9926bc44d6c7d067cc0afbee91dc0fef5356d047 100644
--- a/pinaxcon/templates/registrasion/items_list.html
+++ b/pinaxcon/templates/registrasion/items_list.html
@@ -1,7 +1,7 @@
 {% if items %}
   <ul>
     {% for item in items %}
-      <li>{{ item.quantity }} &times; {{ item.product }}</li>
+      <li>{{ item.quantity }} &times; {{ item.product }} {{ suffix }}</li>
     {% endfor %}
   </ul>
 {% endif %}