Fixed the problem that extratracking block can't be extended.

django-oscar · Apr 16, 2013 · e6e9b61 · e6e9b61
1 parent 739dd1c
commit e6e9b61
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/oscar/templates/oscar/base.html b/oscar/templates/oscar/base.html
@@ -63,9 +63,7 @@
 
         {% block tracking %}
             {# Default to using Google analytics #}
-            {% if google_analytics_id %}
-                {% include 'partials/google_analytics.html' %}
-            {% endif %}
+            {% include "partials/google_analytics.html" %}
         {% endblock %}
 
         {% comment %}

diff --git a/oscar/templates/oscar/checkout/thank_you.html b/oscar/templates/oscar/checkout/thank_you.html
@@ -197,8 +197,6 @@ <h2>{% trans "Tracking your order" %}</h2>
 </div>
 {% endblock content %}
 
-{% block extratracking %}
-    {% if google_analytics_id %}
-        {% include 'partials/google_analytics_transaction.html' %}
-    {% endif %}
+{% block tracking %}
+{% include "partials/google_analytics_transaction.html" %}
 {% endblock %}
diff --git a/oscar/templates/oscar/partials/google_analytics.html b/oscar/templates/oscar/partials/google_analytics.html
@@ -1,3 +1,4 @@
+{% if google_analytics_id %}
 <script type="text/javascript">
     var _gaq = _gaq || [];
     _gaq.push(['_setAccount', '{{ google_analytics_id }}']);
@@ -9,4 +10,4 @@
         var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
     })();
 </script>
-
+{% endif %}
diff --git a/oscar/templates/oscar/partials/google_analytics_transaction.html b/oscar/templates/oscar/partials/google_analytics_transaction.html
@@ -1,3 +1,5 @@
+{% extends "partials/google_analytics.html" %}
+{% block extratracking %}
 _gaq.push(['_addTrans',
     '{{ order.number|escapejs }}',
     '{{ shop_name|escapejs }}',
@@ -18,4 +20,4 @@
         '{{ line.quantity }}']);
 {% endfor %}
 _gaq.push(['_trackTrans']);
-
+{% endblock %}