From 7965ac4111afc746849dad825ddd2b16b8d0414d Mon Sep 17 00:00:00 2001
From: James Polley <jp@jamezpolley.com>
Date: Sun, 1 Oct 2017 14:44:41 +1100
Subject: [PATCH] De-dupe discount header/text

The version with the header was better, so let's use that in both
places by moving it inside the template.
---
 pinaxcon/templates/registrasion/discount_list.html       | 7 +++++++
 pinaxcon/templates/registrasion/guided_registration.html | 8 --------
 pinaxcon/templates/registrasion/product_category.html    | 6 ------
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/pinaxcon/templates/registrasion/discount_list.html b/pinaxcon/templates/registrasion/discount_list.html
index ea5542a7..8fafb241 100644
--- a/pinaxcon/templates/registrasion/discount_list.html
+++ b/pinaxcon/templates/registrasion/discount_list.html
@@ -1,4 +1,6 @@
 {% if discounts %}
+<h3>Discounts and Complimentary Items</h3>
+<div class="vertical-small"></div>
 
   {% regroup discounts by discount.description as discounts_grouped %}
   {% for discount_type in discounts_grouped %}
@@ -9,4 +11,9 @@
     {% endfor %}
   </ul>
   {% endfor %}
+  <blockquote><small>Any applicable discounts will be applied automatically when you check out.</small></blockquote>
+
+  <hr />
+
+
 {% endif %}
diff --git a/pinaxcon/templates/registrasion/guided_registration.html b/pinaxcon/templates/registrasion/guided_registration.html
index d3b30b85..a24ab235 100644
--- a/pinaxcon/templates/registrasion/guided_registration.html
+++ b/pinaxcon/templates/registrasion/guided_registration.html
@@ -26,14 +26,6 @@
 
         {% if section.discounts %}
           {% include "registrasion/discount_list.html" with discounts=section.discounts %}
-
-          <blockquote><small>
-            You must select a product to receive any discounts.<br/>
-            Applicable discounts will be applied automatically when you check out.
-          </small></blockquote>
-
-          <hr />
-
         {% endif %}
 
         <h3>Available options</h3>
diff --git a/pinaxcon/templates/registrasion/product_category.html b/pinaxcon/templates/registrasion/product_category.html
index fa2e518a..182e8247 100644
--- a/pinaxcon/templates/registrasion/product_category.html
+++ b/pinaxcon/templates/registrasion/product_category.html
@@ -50,13 +50,7 @@
     <fieldset>
 
       {% if discounts %}
-        <h3>Discounts and Complimentary Items</h3>
-        <div class="vertical-small"></div>
         {% include "registrasion/discount_list.html" with discounts=discounts %}
-        <blockquote><small>Any applicable discounts will be applied automatically when you check out.</small></blockquote>
-
-        <hr />
-
       {% endif %}
 
       <h3>Make a selection</h3>