Merge branch 'releases/0.6'

Conflicts:
	docs/source/releases/index.rst
	oscar/__init__.py
	oscar/apps/customer/wishlists/views.py
	oscar/apps/dashboard/catalogue/views.py
	oscar/apps/offer/receivers.py
	oscar/apps/order/abstract_models.py
	oscar/templates/oscar/basket/partials/basket_totals.html
	oscar/templates/oscar/catalogue/detail.html
	oscar/templates/oscar/customer/order/order_detail.html
	oscar/templates/oscar/customer/wishlists/wishlists_delete_product.html

.mailmap

@@ -8,4 +8,5 @@ Kura <kura@deviling.net> Kura <kura@tangentlabs.co.uk>
 Mohammad Abbas <mohammad.abbas86@gmail.com> Mohammad Abbas <mohammad@mohammad-abbas.(none)> Mohammad Abbas <mohammad@mohammad-laptop.(none)>
 Oliver Randell <oliverrandell@gmail.com> OliverRandell <oliverrandell@gmail.com>
 Paweł Kowalski <bitrut@gmail.com> Paweł Kowalski <contact@pawelkowalski.info>
-Łukasz Lechowicz <llechowicz@gmail.com> Łukasz Lechowicz <owad@owad.(none)>
+Ashia Zawaduk <ashia@liftinteractive.com> Ashia <ashia@liftinteractive.com>
+Tuna Vargi <tuna40@gmail.com> tuna vargi <tuna40@gmail.com>

docs/source/howto/how_to_integrate_payment.rst

@@ -84,20 +84,20 @@ For example::
     # Subclass the core Oscar view so we can customise
     class PaymentDetailsView(views.PaymentDetailsView):
 
-        def handle_payment(self, order_number, total_incl_tax, **kwargs):
+        def handle_payment(self, order_number, total, **kwargs):
             # Talk to payment gateway.  If unsuccessful/error, raise a
             # PaymentError exception which we allow to percolate up to be caught
             # and handled by the core PaymentDetailsView.
-            reference = gateway.pre_auth(order_number, total_incl_tax, kwargs['bankcard'])
+            reference = gateway.pre_auth(order_number, total.incl_tax, kwargs['bankcard'])
 
             # Payment successful! Record payment source
             source_type, __ = models.SourceType.objects.get_or_create(
                 name="SomeGateway")
             source = models.Source(
                 source_type=source_type,
-                amount_allocated=total_incl_tax,
+                amount_allocated=total.incl_tax,
                 reference=reference)
             self.add_payment_source(source)
 
             # Record payment event
-            self.add_payment_event('pre-auth', total_incl_tax)
+            self.add_payment_event('pre-auth', total.incl_tax)

docs/source/releases/index.rst

@@ -12,4 +12,5 @@ Release notes for each version of Oscar published to PyPI.
     v0.5.2
     v0.5.3
     v0.6
+    v0.6.1
     v0.7

docs/source/releases/v0.6.1.rst

@@ -0,0 +1,88 @@
+=========================
+Oscar 0.6.1 release notes
+=========================
+
+This is Oscar 0.6.1.  It fixes one potentially serious data loss issue and a
+few minor bugs.
+
+Possible data loss from deleted users
+-------------------------------------
+
+Before this release, the foreign key from the 
+:class:`~oscar.apps.order.abstract_models.Order` model to the ``User`` model
+did not specify an ``on_delete`` behaviour.  The default is for deletes to
+cascade to related objects, even if the field is nullable.  Hence, deleting a
+user would also delete any orders they had placed.
+
+As of 0.6.1, the foreign keys to user, shipping address and billing address on
+the ``Order`` model specify ``on_delete=SET_NULL`` to avoid orders being
+deleted accidentally.
+
+See `Django's docs`_ for more info on ``on_delete`` options.
+
+Missing translations
+~~~~~~~~~~~~~~~~~~~~
+
+The 0.6 release failed to include several translations from Transifex due to a
+problem in the way we updated translation files before release.  This
+release rectifies that and includes the latest translation files.
+
+Known issues
+============
+
+* Django 1.4 only: The changes in `#1127`_ mean you explicitly need to register
+  a call to ``migrate_alerts_to_users`` when the ``post_save`` signal is
+  emitted for a ``User`` model.
+
+Bug fixes
+=========
+
+The following bugs were fixed:
+
+* `#1109`_ - Workaround for a bug in Bootstrap regarding the collapsing of the
+  navigation bar.
+
+* `#1121`_ - Added a confirmation view to removing products from wish lists
+  because one can't POST to it in all cases.
+
+* `#1127`_ required that the ``migrate_alerts_to_user`` function is now
+  explicitly called in Oscar's base User class. It previously was wired up as
+  a ``post_save`` signal receiver on the User model, which does not work in
+  Django 1.5+.
+
+* `#1128`_ - Calls to ``Source.debit`` without an ``amount`` argument were
+  failing as ``balance`` was being called as a method instead of a property.
+
+* `#1130`_ - Variant products were not fetching the product class instance
+  correctly within ``is_shipping_required``.
+
+* `#1132`_ and `#1149`_ - Rich text attributes were not supported. Should be
+  displayed correctly now. Also introduced hooks for adding support for e.g.
+  ``file`` and ``image`` types.
+
+* `#1133`_ - The order detail page for anonymous checkouts failed to render if
+  reviews were disabled.
+
+* `#1134`_ - Fixed a bug caused where unicode characters in child products'
+  titles were incorrectly handled.
+
+* `#1138`_ - Adjust the 
+  :class:`~oscar.apps.shipping.models.OrderAndItemCharges` shipping method to
+  not count lines that don't require shipping.
+
+* `#1146`_ - Various templates were adjusted to gracefully handle deleted
+  products.
+
+.. _`#1109`: https://github.com/tangentlabs/django-oscar/issues/1109
+.. _`#1121`: https://github.com/tangentlabs/django-oscar/issues/1121
+.. _`#1127`: https://github.com/tangentlabs/django-oscar/issues/1127
+.. _`#1128`: https://github.com/tangentlabs/django-oscar/issues/1128
+.. _`#1130`: https://github.com/tangentlabs/django-oscar/issues/1130
+.. _`#1132`: https://github.com/tangentlabs/django-oscar/issues/1132
+.. _`#1133`: https://github.com/tangentlabs/django-oscar/issues/1133
+.. _`#1134`: https://github.com/tangentlabs/django-oscar/issues/1134
+.. _`#1138`: https://github.com/tangentlabs/django-oscar/issues/1138
+.. _`#1146`: https://github.com/tangentlabs/django-oscar/issues/1146
+.. _`#1149`: https://github.com/tangentlabs/django-oscar/issues/1149
+.. _`Django's docs`: https://docs.djangoproject.com/en/dev/ref/models/fields/#django.db.models.ForeignKey.on_delete
+

docs/source/releases/v0.6.rst

@@ -94,7 +94,7 @@ fulfillment partners.
 It also allows better support for international sites as stockrecords can be
 created for partners in different countries, who sell in different currencies.
 
-See the `documentation on pricing and availability`_ for more details.
+See the :doc:`documentation on pricing and availability </topics/prices_and_availability>` for more details.
 
 .. warning::
 
@@ -102,7 +102,6 @@ See the `documentation on pricing and availability`_ for more details.
     one stockrecord per product.
 
 .. _`deprecated`: `Features deprecated in 0.6`_
-.. _`documentation on pricing and availability`: topics/prices_and_availability
 
 Pricing and availability
 ~~~~~~~~~~~~~~~~~~~~~~~~

oscar/apps/analytics/__init__.py

@@ -0,0 +1 @@
+from . import receivers  # noqa

oscar/apps/analytics/models.py

@@ -17,7 +17,3 @@ class UserProductView(AbstractUserProductView):
 
 class UserSearch(AbstractUserSearch):
     pass
-
-
-# Import receiver functions
-from oscar.apps.analytics.receivers import *  # noqa

oscar/apps/catalogue/__init__.py

@@ -0,0 +1 @@
+from . import receivers  # noqa

oscar/apps/catalogue/abstract_models.py

@@ -1,6 +1,8 @@
 from itertools import chain
 from datetime import datetime, date
 import logging
+from django.utils.html import strip_tags
+from django.utils.safestring import mark_safe
 import os
 import warnings
 
@@ -413,7 +415,7 @@ class AbstractProduct(models.Model):
 
     @property
     def is_shipping_required(self):
-        return self.product_class.requires_shipping
+        return self.get_product_class().requires_shipping
 
     @property
     def has_stockrecords(self):
@@ -433,8 +435,7 @@ class AbstractProduct(models.Model):
         """
         pairs = []
         for value in self.attribute_values.select_related().all():
-            pairs.append("%s: %s" % (value.attribute.name,
-                                     value.value))
+            pairs.append(value.summary())
         return ", ".join(pairs)
 
     # Deprecated stockrecord methods
@@ -921,7 +922,43 @@ class AbstractProductAttributeValue(models.Model):
         verbose_name_plural = _('Product Attribute Values')
 
     def __unicode__(self):
-        return u"%s: %s" % (self.attribute.name, self.value)
+        return self.summary()
+
+    def summary(self):
+        """
+        Gets a string representation of both the attribute and it's value,
+        used e.g in product summaries.
+        """
+        return u"%s: %s" % (self.attribute.name, self.value_as_text)
+
+    @property
+    def value_as_text(self):
+        """
+        Returns a string representation of the attribute's value. To customise
+        e.g. image attribute values, declare a _image_as_text property and
+        return something appropriate.
+        """
+        property_name = '_%s_as_text' % self.attribute.type
+        return getattr(self, property_name, self.value)
+
+    @property
+    def _richtext_as_text(self):
+        return strip_tags(self.value)
+
+    @property
+    def value_as_html(self):
+        """
+        Returns a HTML representation of the attribute's value. To customise
+        e.g. image attribute values, declare a _image_as_html property and
+        return e.g. an <img> tag.
+        Defaults to the _as_text representation.
+        """
+        property_name = '_%s_as_html' % self.attribute.type
+        return getattr(self, property_name, self.value_as_text)
+
+    @property
+    def _richtext_as_html(self):
+        return mark_safe(self.value)
 
 
 class AbstractAttributeOptionGroup(models.Model):

oscar/apps/catalogue/models.py

@@ -62,5 +62,3 @@ class Option(AbstractOption):
 
 class ProductImage(AbstractProductImage):
     pass
-
-from .receivers import *  # noqa

oscar/apps/catalogue/receivers.py

@@ -26,6 +26,7 @@ def delete_image_files(sender, instance, **kwargs):
             except ThumbnailError:
                 pass
 
+
 # connect for all models with ImageFields - add as needed
 models_with_images = [ProductImage, Category]
 for sender in models_with_images:

oscar/apps/customer/__init__.py

@@ -0,0 +1,2 @@
+from oscar.apps.customer.history import *  # noqa
+from oscar.apps.customer.alerts.receivers import *  # noqa

oscar/apps/customer/abstract_models.py

@@ -13,7 +13,10 @@ from django.utils.translation import ugettext_lazy as _
 from oscar.apps.customer.managers import CommunicationTypeManager
 from oscar.core.compat import AUTH_USER_MODEL
 
+
 if hasattr(auth_models, 'BaseUserManager'):
+    ProductAlert = models.get_model('customer', 'ProductAlert')
+
     # Only define custom UserModel when Django >= 1.5
     class UserManager(auth_models.BaseUserManager):
 
@@ -83,6 +86,23 @@ if hasattr(auth_models, 'BaseUserManager'):
         def get_short_name(self):
             return self.first_name
 
+        def _migrate_alerts_to_user(self):
+            """
+            Transfer any active alerts linked to a user's email address to the
+            newly registered user.
+            """
+            alerts = ProductAlert.objects.filter(
+                email=self.email, status=ProductAlert.ACTIVE)
+            alerts.update(user=self, key=None, email=None)
+
+        def save(self, *args, **kwargs):
+            super(AbstractUser, self).save(*args, **kwargs)
+            # Migrate any "anonymous" product alerts to the registered user
+            # Ideally, this would be done via a post-save signal. But we can't
+            # use get_user_model to wire up signals to custom user models
+            # see Oscar ticket #1127, Django ticket #19218
+            self._migrate_alerts_to_user()
+
 
 class AbstractEmail(models.Model):
     """

oscar/apps/customer/alerts/receivers.py

@@ -1,12 +1,6 @@
 from django.conf import settings
 from django.db.models import get_model
 from django.db.models.signals import post_save
-from django.db import connection
-
-from oscar.core.compat import get_user_model
-
-
-User = get_user_model()
 
 
 def send_product_alerts(sender, instance, created, **kwargs):
@@ -16,28 +10,6 @@ def send_product_alerts(sender, instance, created, **kwargs):
     utils.send_product_alerts(instance.product)
 
 
-def migrate_alerts_to_user(sender, instance, created, **kwargs):
-    """
-    Transfer any active alerts linked to a user's email address to the newly
-    registered user.
-    """
-    if not created:
-        return
-    ProductAlert = get_model('customer', 'ProductAlert')
-
-    # This signal will be raised when creating a superuser as part of syncdb,
-    # at which point only a subset of tables will be created.  Thus, we test if
-    # the alert table exists before trying to exercise the ORM.
-    table = ProductAlert._meta.db_table
-    if table in connection.introspection.table_names():
-        alerts = ProductAlert.objects.filter(
-            email=instance.email, status=ProductAlert.ACTIVE)
-        alerts.update(user=instance, key=None, email=None)
-
-
-post_save.connect(migrate_alerts_to_user, sender=User)
-
-
 if settings.OSCAR_EAGER_ALERTS:
     StockRecord = get_model('partner', 'StockRecord')
     post_save.connect(send_product_alerts, sender=StockRecord)

oscar/apps/customer/models.py

@@ -15,7 +15,3 @@ class Notification(abstract_models.AbstractNotification):
 
 class ProductAlert(abstract_models.AbstractProductAlert):
     pass
-
-
-from oscar.apps.customer.history import *  # noqa
-from oscar.apps.customer.alerts.receivers import *  # noqa

oscar/apps/customer/wishlists/views.py

@@ -265,7 +265,7 @@ class WishListRemoveProduct(LineMixin, PageTitleMixin, DeleteView):
     active_tab = "wishlists"
 
     def get_page_title(self):
-        return _(u'Remove %s') % self.object.product.get_title()
+        return _(u'Remove %s') % self.object.get_title()
 
     def get_object(self, queryset=None):
         self.fetch_line(
@@ -281,14 +281,14 @@ class WishListRemoveProduct(LineMixin, PageTitleMixin, DeleteView):
 
     def get_success_url(self):
         msg = _("'%(title)s' was removed from your '%(name)s' wish list") % {
-            'title': self.product.get_title(),
+            'title': self.line.get_title(),
             'name': self.wishlist.name}
         messages.success(self.request, msg)
 
         # We post directly to this view on product pages; and should send the
         # user back there if that was the case
         referrer = self.request.META.get('HTTP_REFERER', '')
-        if self.product.get_absolute_url() in referrer:
+        if self.product and self.product.get_absolute_url() in referrer:
             return referrer
         else:
             return reverse(

oscar/apps/partner/__init__.py

@@ -0,0 +1 @@
+from oscar.apps.partner.receivers import *  # noqa

oscar/apps/partner/models.py

@@ -17,6 +17,3 @@ class StockRecord(AbstractStockRecord):
 
 class StockAlert(AbstractStockAlert):
     pass
-
-
-from oscar.apps.partner.receivers import *  # noqa

oscar/apps/payment/abstract_models.py

@@ -152,7 +152,7 @@ class AbstractSource(models.Model):
         Convenience method for recording debits against this source
         """
         if amount is None:
-            amount = self.balance()
+            amount = self.balance
         self.amount_debited += amount
         self.save()
         self._create_transaction(

oscar/apps/shipping/models.py

@@ -78,7 +78,8 @@ class OrderAndItemCharges(ShippingMethod):
 
         charge = self.price_per_order
         for line in self._basket.lines.all():
-            charge += line.quantity * self.price_per_item
+            if line.product.is_shipping_required:
+                charge += line.quantity * self.price_per_item
         return charge
 
     @property
@@ -115,6 +116,9 @@ class WeightBased(ShippingMethod):
 
     @property
     def charge_incl_tax(self):
+        # Note, when weighing the basket, we don't check whether the item
+        # requires shipping or not.  It is assumed that if something has a
+        # weight, then it requires shipping.
         scales = Scales(attribute_code=self.weight_attribute,
                         default_weight=self.default_weight)
         weight = scales.weigh_basket(self._basket)

oscar/defaults.py

@@ -61,15 +61,12 @@ OSCAR_MODERATE_REVIEWS = False
 # Accounts
 OSCAR_ACCOUNTS_REDIRECT_URL = 'customer:profile-view'
 
-# This enables sending alert notifications/emails
-# instantly when products get back in stock
-# by listening to stock record update signals
-# this might impact performace for large numbers
-# stock record updates.
-# Alternatively, the management command
-# ``oscar_send_alerts`` can be used to
-# run periodically, e.g. as a cronjob. In this case
-# instant alerts should be disabled.
+# This enables sending alert notifications/emails instantly when products get
+# back in stock by listening to stock record update signals.
+# This might impact performance for large numbers of stock record updates.
+# Alternatively, the management command ``oscar_send_alerts`` can be used to
+# run periodically, e.g. as a cron job. In this case eager alerts should be
+# disabled.
 OSCAR_EAGER_ALERTS = True
 
 # Registration

oscar/templates/oscar/basket/partials/basket_content.html

@@ -27,8 +27,8 @@
         <div class="basket-title hidden-phone">
             <div class="row-fluid">
                 <h4 class="span6">{% trans "Items to buy now" %}</h4>
-                <h4 class="span2">{% trans "Quantity" %}</h4>
-                <h4 class="span2 align-right">{% trans "Price" %}</h4>
+                <h4 class="span3">{% trans "Quantity" %}</h4>
+                <h4 class="span1 align-right">{% trans "Price" %}</h4>
                 <h4 class="span2 align-right">{% trans "Total" %}</h4>
             </div>
         </div>
@@ -58,26 +58,28 @@
                                 <h4><a href="{{ product.get_absolute_url }}">{{ line.description }}</a></h4>
                                 <p class="availability {{ session.availability.code }}">{{ session.availability.message }}</p>
                             </div>
-                            <div class="span2">
+                            <div class="span3">
                                 <div class="checkout-quantity control-group {% if form.errors %}error{% endif %}">
                                     {{ form.quantity }}
                                     <button class="btn" type="submit">{% trans "Update" %}</button>
-                                    <a href="#" data-id="{{ forloop.counter0 }}" data-behaviours="remove" class="inline">{% trans "Remove" %}</a>
-                                    {% if request.user.is_authenticated %}
-                                        | <a href="#" data-id="{{ forloop.counter0 }}" data-behaviours="save" class="inline">{% trans "Save for later" %}</a>
-                                    {% endif %}
-                                    <div style="display:none">
-                                        {{ form.save_for_later }}
-                                        {{ form.DELETE }}
-                                    </div>
-                                    {% for field_errors in form.errors.values %}
-                                        {% for error in field_errors %}
-                                            <span class="help-block"><i class="icon-exclamation-sign"></i> {{ error }}</span>
+                                    <p>
+                                        <a href="#" data-id="{{ forloop.counter0 }}" data-behaviours="remove" class="inline">{% trans "Remove" %}</a>
+                                        {% if request.user.is_authenticated %}
+                                            | <a href="#" data-id="{{ forloop.counter0 }}" data-behaviours="save" class="inline">{% trans "Save for later" %}</a>
+                                        {% endif %}
+                                        <div style="display:none">
+                                            {{ form.save_for_later }}
+                                            {{ form.DELETE }}
+                                        </div>
+                                        {% for field_errors in form.errors.values %}
+                                            {% for error in field_errors %}
+                                                <span class="help-block"><i class="icon-exclamation-sign"></i> {{ error }}</span>
+                                            {% endfor %}
                                         {% endfor %}
-                                    {% endfor %}
+                                    </p>
                                 </div>
                             </div>
-                            <div class="span2">
+                            <div class="span1">
                                 <p class="price_color align-right">
                                     {% if line.is_tax_known %}
                                         {{ line.unit_price_incl_tax|currency:line.price_currency }}

oscar/templates/oscar/catalogue/detail.html

@@ -155,16 +155,10 @@
             </tr>
         {% endif %}
         {% for av in product.attribute_values.all %}
-        <tr>
-            <th>{{ av.attribute.name }}</th>
-            <td>
-                {% if av.attribute.type == "richtext" %}
-                    {{ av.value|safe }}
-                {% else %}
-                    {{ av.value }}
-                {% endif %}
-            </td>
-        </tr>
+            <tr>
+                <th>{{ av.attribute.name }}</th>
+                <td>{{ av.value_as_html }}</td>
+            </tr>
         {% endfor %}
         {% iffeature "reviews" %}
             <tr>

oscar/templates/oscar/customer/order/order_detail.html

@@ -26,31 +26,41 @@
         </thead>
         <tbody>
             {% for line in order.lines.all %}
-            <tr>
-                <td>
-                    <p><a href="{{ line.product.get_absolute_url }}">{{ line.description }}</a></p>
-                    {% iffeature "reviews" %}
-                        {% if line.product|is_review_permitted:user %}
-                            <a class="btn" href="{% url 'catalogue:reviews-add' product_slug=line.product.slug product_pk=line.product.id %}">{% trans 'Write a review' %}</a>
-                        {% endif %}
-                    {% endiffeature %}
-                </td>
-                <td>{{ line.est_dispatch_date|default:"-" }}</td>
-                <td>{{ line.quantity }}</td>
-                <td>{{ line.line_price_before_discounts_excl_tax|currency:order.currency }}</td>
-                <td>{{ line.line_price_before_discounts_incl_tax|currency:order.currency }}</td>
-                <td width="90">
-                    {% if line.product %}
-                    <form id="line_form_{{ line.id }}" action="{% url 'customer:order-line' order_number=order.number line_id=line.id %}" method="POST">
-                        {% csrf_token %}
-                        <input type="hidden" name="action" value="reorder" />
-                        <button class="btn btn-success" type="submit">{% trans 'Re-order' %}</button>
-                    </form>
-                    {% else %}
-                        {% trans 'Not available anymore' %}
-                    {% endif %}
-                </td>
-            </tr>
+                {% with product=line.product %}
+                    <tr>
+                        <td>
+                            {% if product %}
+                                <p>
+                                    <a href="{{ product.get_absolute_url }}">{{ line.description }}</a>
+                                </p>
+                                {% iffeature "reviews" %}
+                                    {% if product|is_review_permitted:user %}
+                                        <a class="btn" href="{% url 'catalogue:reviews-add' product_slug=product.slug product_pk=product.id %}">{% trans 'Write a review' %}</a>
+                                    {% endif %}
+                                {% endiffeature %}
+                            {% else %}
+                                <p>
+                                    {{ line.description }}
+                                </p>
+                            {% endif %}
+                        </td>
+                        <td>{{ line.est_dispatch_date|default:"-" }}</td>
+                        <td>{{ line.quantity }}</td>
+                        <td>{{ line.line_price_before_discounts_excl_tax|currency:order.currency }}</td>
+                        <td>{{ line.line_price_before_discounts_incl_tax|currency:order.currency }}</td>
+                        <td width="90">
+                            {% if product %}
+                                <form id="line_form_{{ line.id }}" action="{% url 'customer:order-line' order_number=order.number line_id=line.id %}" method="POST">
+                                    {% csrf_token %}
+                                    <input type="hidden" name="action" value="reorder" />
+                                    <button class="btn btn-success" type="submit">{% trans 'Re-order' %}</button>
+                                </form>
+                            {% else %}
+                                {% trans 'Not available anymore' %}
+                            {% endif %}
+                        </td>
+                    </tr>
+                {% endwith %}
             {% endfor %}
 
             {% with discounts=order.basket_discounts %}
@@ -136,11 +146,11 @@
 
     <h3>{% trans 'Shipping Method' %}</h3>
     <p>{{ order.shipping_method }}</p>
-    
+
     <hr>
 
     <h3>{% trans 'Shipping Address' %}</h3>
-    
+
     <table class="table table-striped table-bordered">
         <tr>
             <th>{% trans 'Address:' %}</th>
@@ -150,8 +160,8 @@
         <tr>
             <td>
                 <p>{% for field in order.shipping_address.active_address_fields %}
-                {{ field }}<br/>
-                {% endfor %}</p>
+                        {{ field }}<br/>
+                    {% endfor %}</p>
             </td>
             <td><p>{{ order.shipping_address.phone_number }}</p></td>
             <td><p>{{ order.shipping_address.notes }}</p></td>

oscar/templates/oscar/customer/wishlists/wishlists_delete_product.html

@@ -34,8 +34,7 @@
         </p>
 
         <div class="form-actions">
-            <button type="submit" class="btn btn-large">{% trans 'Remove' %}</button> {% trans 'or' %} <a href="{{ wishlist.get_absolute_url }}">{% trans 'cancel' %}</a>
+            <button type="submit" class="btn btn-large btn-danger">{% trans 'Remove' %}</button> {% trans 'or' %} <a href="{{ wishlist.get_absolute_url }}">{% trans 'cancel' %}</a>
         </div>
     </form>
 {% endblock tabcontent %}
-

oscar/templates/oscar/customer/wishlists/wishlists_detail.html

@@ -37,21 +37,24 @@
                     </tr>
 
                     {% for form in form %}
-                        {% with line=form.instance %}
+                        {% with line=form.instance product=line.instance.product %}
                             <tr>
                                 <td>
-                                    {% with image=form.instance.product.primary_image %}
-                                        {% thumbnail image.original "100x100" upscale=False as thumb %}
-                                            <a href="{{ form.instance.product.get_absolute_url }}">
-                                                <img class="thumbnail" src="{{ thumb.url }}" alt="{{ form.instance.product.get_title }}" />
-                                            </a>
-                                        {% endthumbnail %}
-                                    {% endwith %}
+                                    {% if product %}
+                                        {% with image=product.primary_image %}
+                                            {% thumbnail image.original "100x100" upscale=False as thumb %}
+                                                <a href="{{ product.get_absolute_url }}">
+                                                    <img class="thumbnail" src="{{ thumb.url }}" alt="{{ product.get_title }}" />
+                                                </a>
+                                            {% endthumbnail %}
+                                        {% endwith %}
+                                    {% endif %}
                                 </td>
                                 <td>
-                                    <a href="{{ line.product.get_absolute_url }}">{{ line.get_title }}</a>
-                                    {% if not line.product %}
-                                        <em>({% trans 'Not available anymore' %})</em>
+                                    {% if product %}
+                                        <a href="{{ line.product.get_absolute_url }}">{{ line.get_title }}</a>
+                                    {% else %}
+                                        <em>{{ line.get_title }} ({% trans 'Not available anymore' %})</em>
                                     {% endif %}
                                 </td>
                                 <td>
@@ -66,7 +69,7 @@
                                 </td>
                                 <td>
                                     <div class="btn-group">
-                                        {% if line.product %}
+                                        {% if product %}
                                             <a class="btn" href="{{ line.product.get_absolute_url }}">{% trans 'View product' %}</a>
                                             <button class="btn dropdown-toggle" data-toggle="dropdown">
                                                 <span class="caret"></span>

oscar/templates/oscar/dashboard/catalogue/product_update.html

@@ -3,6 +3,7 @@
 {% load i18n %}
 {% load thumbnail %}
 {% load staticfiles %}
+{% load form_tags %}
 
 
 {% block body_class %}{{ block.super }} create-page catalogue{% endblock %}
@@ -146,14 +147,29 @@
                             <div class="well product-details">
                                 {% block product_details_content %}
                                     <span class="help-block">{{ form.non_field_errors }}</span>
-                                    {% for field in form %}
-                                        {% if field.is_hidden %}
+                                        {% for field in form.hidden_fields %}
                                             {{ field }}
-                                        {% endif %}
-                                        {% if 'attr' not in field.id_for_label %}
-                                            {% include "partials/form_field.html" with field=field %}
-                                        {% endif %}
-                                    {% endfor %}
+                                        {% endfor %}
+
+                                        {% for field in form.visible_fields %}
+                                            {% if 'attr' not in field.id_for_label %}
+                                                {% comment %}
+                                                    Make the field widget type available to templates so we can mark-up
+                                                    checkboxes differently to other widgets.
+                                                {% endcomment %}
+                                                {% annotate_form_field field %}
+
+                                                {% comment %}
+                                                    We use a separate template for each field so that forms can be rendered
+                                                    field-by-field easily #}
+                                                {% endcomment %}
+                                                {% if field.widget_type == 'CheckboxInput' %}
+                                                    {% include 'partials/form_field_checkbox.html' with field=field %}
+                                                {% else %}
+                                                    {% include 'partials/form_field.html' with field=field %}
+                                                {% endif %}
+                                            {% endif %}
+                                        {% endfor %}
 
                                     {% with parent=product.parent %}
                                         {% if parent %}

oscar/templates/oscar/dashboard/reviews/review_list.html

@@ -107,7 +107,7 @@
                                                 <span class="caret"></span>
                                             </a>
                                             <ul class="dropdown-menu pull-right">
-                                                {% if review.title %}
+                                                {% if review.title and review.product %}
                                                     <li><a href="{% url 'catalogue:reviews-detail' product_slug=review.product.slug product_pk=review.product.id pk=review.id %}">{% trans "View on site" %}</a></li>
                                                 {% endif %}
                                                 <li><a href="{% url 'dashboard:reviews-update' pk=review.id %}">{% trans "Edit" %}</a></li>

oscar/templatetags/reviews_tags.py

@@ -35,4 +35,4 @@ def may_vote(review, user):
 
 @register.filter
 def is_review_permitted(product, user):
-    return product.is_review_permitted(user)
+    return product and product.is_review_permitted(user)

tests/integration/catalogue/product_tests.py

@@ -10,7 +10,8 @@ from oscar.apps.catalogue.models import (Product, ProductClass,
 class ProductTests(TestCase):
 
     def setUp(self):
-        self.product_class,_ = ProductClass.objects.get_or_create(name='Clothing')
+        self.product_class, _ = ProductClass.objects.get_or_create(
+            name='Clothing')
 
 
 class ProductCreationTests(ProductTests):
@@ -61,6 +62,19 @@ class VariantProductTests(ProductTests):
         self.assertEquals("Clothing", p.get_product_class().name)
 
 
+class TestAVariant(TestCase):
+
+    def setUp(self):
+        clothing = ProductClass.objects.create(
+            name='Clothing', requires_shipping=True)
+        self.parent = clothing.products.create(
+            title="Parent")
+        self.variant = self.parent.variants.create()
+
+    def test_delegates_requires_shipping_logic(self):
+        self.assertTrue(self.variant.is_shipping_required)
+
+
 class ProductAttributeCreationTests(TestCase):
 
     def setUp(self):

tests/integration/payment/model_tests.py

@@ -22,6 +22,11 @@ class TestAPaymentSource(TestCase):
         self.source.allocate(D('100.00'))
         self.source.debit(D('80.00'))
 
+    def test_full_debit_doesnt_error(self):
+        self.source.allocate(D('100.00'))
+        self.source.debit()
+        self.assertEquals(D('0.00'), self.source.balance)
+
     def test_refund_doesnt_error(self):
         self.source.allocate(D('100.00'))
         self.source.debit(D('80.00'))

tests/integration/shipping/model_method_tests.py

@@ -32,6 +32,16 @@ class OrderAndItemChargesTests(TestCase):
         self.assertEquals(D('5.00') + D('1.00'),
                           self.method.charge_incl_tax)
 
+    def test_single_item_basket_that_doesnt_require_shipping(self):
+        # Create a product that doesn't require shipping
+        record = factories.create_stockrecord()
+        product = record.product
+        product.product_class.requires_shipping = False
+        product.product_class.save()
+
+        self.basket.add_product(record.product)
+        self.assertEquals(D('5.00'), self.method.charge_incl_tax)
+
     def test_multi_item_basket(self):
         record = factories.create_stockrecord()
         self.basket.add_product(record.product, 7)