Commits

Chris Moffitt committed 0bd6df5

Making some template changes so the unit tests don't blow up.

Comments (0)

Files changed (3)

docs/release-notes-0-9-2.txt

 - Make sure "all valid" discounts are correctly applied
 - Fix Wishlish ajax add view
 - Ensure that product variation properly inherits shipping from its parent
-- Made a couple of view and template changes to reduce the number of SQL queries per page.
+- Made a couple of view and template changes to reduce the number of SQL queries per page
+- Handling of gift certificate plus other payments fixed
+- Bug in tax processor rendering fixed
 
 Migration Notes
 ---------------

satchmo/apps/satchmo_ext/wishlist/templates/wishlist/plugins/shop_sidebar_actions.html

 {% load i18n %}
 {% if user.is_authenticated %}
-<p class="wishlist"><a href="{% url satchmo_wishlist_view %}" />{% trans 'Wishlist' %}</a></p>
+{% url satchmo_wishlist_view as wishlist_view %}
+{% if wishlist_view %}<p class="wishlist"><a href="{{ wishlist_view }}" />{% trans 'Wishlist' %}</a></p> {% endif %}
 {% endif %}

satchmo/apps/satchmo_store/shop/templates/base.html

 		{% if recenturl %}<a href="{{ recenturl }}">{% trans "Recently Added" %}</a>{% endif %}
 		{% url satchmo_product_best_selling as popularurl %}
 		{% if popularurl %}<br/><a href="{{ popularurl }}">{% trans "Best Sellers" %}</a><br/>{% endif %}
-        <a href="{% url satchmo_category_index %}">{% trans "Category Index" %}</a><br />
-        <a href="{% url satchmo_quick_order %}">{% trans "Quick Order" %}</a>
+        {% url satchmo_category_index as category_index %}
+        {% if category_index %} <a href="{{ category_index }}">{% trans "Category Index" %}</a><br /> {% endif %}
+        {% url satchmo_quick_order as quick_order %}
+        {% if quick_order %}<a href="{{ quick_order }}">{% trans "Quick Order" %}</a> {% endif %}
 		{% plugin_point "sidebar_links" %}
 
 	    <h3>{% trans "Account Information" %}</h3>
 	    {% if carturl %}<a href="{{ carturl }}">{% trans "Cart" %}</a>{% endif %}
 
 	    {% if not cart.is_empty %}
-            ({{ cart_count|normalize_decimal }} - {{ cart|discount_cart_total:sale|currency }})<br/>
+            ({{ cart_count|normalize_decimal }} - {% if sale %}{{ cart|discount_cart_total:sale|currency }}{% else %}{{cart.total|currency}}{% endif%}) <br/>
             {% url satchmo_checkout-step1 as checkouturl %}
             {% if checkouturl %}<a href="{{ checkouturl }}">{% trans "Check out" %}</a>{% endif %}
 	    {% endif %}