Bruce Kroeze committed 25a8f11 Merge

merging upstream

Comments (0)

Files changed (2)


 - Add a new config for the persistent cart to provide more options for how it handles returning users
 - New template tag to show tiered shipping pricing table
 - Control product variations inclusion in searching view the settings
+- UPS module will display actual shipping times
 - Improvements to South migrations
 - Update Paypal IPN docs
 - Fix issue where inactive or out of stock products could be purchased if there was a time lag between cart addition and checkout
+- Cart template tag now allows show_discount
 Performance Improvements


         show_discount = False
-    return CartTotalNode(cart, show_currency, show_tax)
+    return CartTotalNode(cart, show_currency, show_tax, show_discount)
 cart_total = register.tag(cart_total)