Merge branch 'master' into feature/variants_dashboard

This mostly pulls in the tables2 work. I opted to just use master's
branch product_list template, and will add the variants column that
I added as part of #1441 as a tables2 column.

Conflicts:
	oscar/apps/catalogue/abstract_models.py
	oscar/apps/dashboard/catalogue/views.py
	oscar/templates/oscar/dashboard/catalogue/product_list.html

.travis.yml

@@ -11,12 +11,14 @@ env:
     secure: FuIlzEsGJiAwhaIRBmRNsq9eXmuzs25fX6BChknW4lDyVAySWMp0+Zps9Bd0JgfFYUG3Ip+OTmksYIoTUsG25ZJS9cq1IFt3QKUAN70YCI/4ZBLeIdICPEyxq+Km179+NeEXmBUug17RLMLxh3MWfO+RKUHK9yHIPNNpq0dNyoo=
   matrix:
     - DJANGO=Django==1.6.5
-    - DJANGO=https://www.djangoproject.com/download/1.7c2/tarball/
+    - DJANGO=https://www.djangoproject.com/download/1.7c2/tarball/#egg=Django
 
 matrix:
   allow_failures:
-    - python: '3.3'
-    - python: '3.4'
+    - env: "DJANGO=Django==1.6.5"
+      python: '3.3'
+    - env: "DJANGO=Django==1.6.5"
+      python: '3.4'
 
 install:
   - easy_install $DJANGO

README.rst

@@ -175,6 +175,7 @@ The following are community-written extensions:
 * django-oscar-unicredit_ - Integration with the Unicredit payment gateway
 * django-oscar-payments_ - Pluggable payments for Oscar
 * django-oscar-recurly_ - Integration with the Recurly payment gateway
+* django-oscar-adyen_ - Integration with the Adyen payment gateway
 * oscar-sagepay_ - Payment integration with Sage Pay
 * django-oscar-erp_
 
@@ -184,6 +185,7 @@ Let us know if you're writing a new one!
 .. _django-oscar-erp: https://bitbucket.org/zikzakmedia/django-oscar_erp
 .. _django-oscar-payments: https://github.com/Lacrymology/django-oscar-payments
 .. _django-oscar-recurly: https://github.com/mynameisgabe/django-oscar-recurly
+.. _django-oscar-adyen: https://github.com/oscaro/django-oscar-adyen
 .. _oscar-sagepay: https://github.com/udox/oscar-sagepay
 
 License
@@ -236,9 +238,6 @@ Selected Tangent projects:
 Non-Tangent:
 
 * Dolbeau - http://www.dolbeau.ca
-* Sobusa - http://www.sobusa.fr
-* Laivee - http://laivee.pl
-* Colinss - http://colinss.com
 * Audio App - https://audioapp.pl
 * Anything Gift - http://www.anythinggift.co.uk
 * FP Sport - http://www.fpsport.it
@@ -250,15 +249,6 @@ Non-Tangent:
 .. image:: https://github.com/tangentlabs/django-oscar/raw/master/docs/images/screenshots/dolbeau.thumb.png
     :target: http://www.dolbeau.ca
 
-.. image:: https://github.com/tangentlabs/django-oscar/raw/master/docs/images/screenshots/sobusa.thumb.png
-    :target: http://www.sobusa.fr
-
-.. image:: https://github.com/tangentlabs/django-oscar/raw/master/docs/images/screenshots/laivee.thumb.png
-    :target: http://www.laivee.pl
-
-.. image:: https://github.com/tangentlabs/django-oscar/raw/master/docs/images/screenshots/colinss.thumb.png
-    :target: http://www.colinss.com
-
 .. image:: https://github.com/tangentlabs/django-oscar/raw/master/docs/images/screenshots/audioapp.thumb.png
     :target: https://audioapp.pl
 
@@ -266,7 +256,7 @@ Non-Tangent:
     :target: http://www.anythinggift.co.uk
 
 .. image:: https://github.com/tangentlabs/django-oscar/raw/master/docs/images/screenshots/fpsport.thumb.png
-    :target: https://www.fpsport.it
+    :target: http://www.fpsport.it
 
 .. image:: https://github.com/tangentlabs/django-oscar/raw/master/docs/images/screenshots/garmsby.thumb.png
     :target: https://garmsby.co.uk

docs/source/howto/how_to_configure_shipping.rst

@@ -85,7 +85,7 @@ For more complex logic, override the ``get_available_shipping_methods`` method:
                self, basket, user=None, shipping_addr=None, 
                request=None, **kwargs):
            methods = (methods.Standard())
-           if shipping_addr and shipping.addr.country.code == 'GB':
+           if shipping_addr and shipping_addr.country.code == 'GB':
                # Express is only available in the UK
                methods = (methods.Standard(), methods.Express())
            return methods

docs/source/ref/settings.rst

@@ -312,26 +312,6 @@ used in Oscar's default templates but could be used to include static assets
 Offer settings
 ==============
 
-``OSCAR_OFFER_BLACKLIST_PRODUCT``
----------------------------------
-
-Default: ``None``
-
-A function which takes a product as its sole parameter and returns a boolean
-indicating if the product is blacklisted from offers or not.
-
-Example::
-
-    from decimal import Decimal as D
-
-    def is_expensive(product):
-        if product.has_stockrecord:
-            return product.stockrecord.price_incl_tax > D('1000.00')
-        return False
-
-    # Don't allow expensive products to be in offers
-    OSCAR_OFFER_BLACKLIST_PRODUCT = is_expensive
-
 ``OSCAR_OFFER_ROUNDING_FUNCTION``
 ---------------------------------
 

docs/source/releases/v0.8.rst

@@ -37,11 +37,12 @@ availability logic now needs to be handled with strategies.
 Compatibility
 -------------
 
-Oscar 0.8 drops supports for Django 1.5, and is compatible with Django 1.6 and
-Django 1.7.
+This release adds support for Django 1.7. Per our policy of always supporting
+two versions of Django, support for Django 1.5 has been dropped.
 
-Support for Python 2.6 has been dropped; Oscar works with Python 2.7, 3.3
-and 3.4.
+This release also adds full Python 3.3 and 3.4 support. But due to South
+not supporting Python 3, Python 3 support is only supported in combination
+with Django 1.7 and it's new migration framework.
 
 .. _new_in_0.8:
 
@@ -232,6 +233,12 @@ Minor changes
   expected. There's currently no frontend or dashboard support for it, as there
   is no good default behaviour.
 
+* Oscar has a new dependency, django-tables2_. It's a handy library that helps
+  when displaying tabular data, allowing sorting, etc. It also makes it easier
+  to adapt e.g. the product list view in the dashboard to additional fields.
+
+.. _django-tables2: http://django-tables2.readthedocs.org/en/latest/
+
 .. _incompatible_changes_in_0.8:
 
 Backwards incompatible changes in 0.8
@@ -493,6 +500,18 @@ Misc
   ``ImportError`` if a model can't be found. That brings it more in line with
   what Django does since the app refactor.
 
+* ``CommunicationEventType.category`` was storing a localised string, which
+  breaks when switching locale. It now uses ``choices`` to map between the
+  value and a localised string. Unfortunately, if you're using this feature
+  and not running an English locale, you will need to migrate the existing
+  data to the English values.
+
+* Support for the ``OSCAR_OFFER_BLACKLIST_PRODUCT`` setting has been removed.
+  It was only partially supported: it prevented products from being
+  added to a range, but offers could be applied to the products nonetheless.
+  To prevent an offer being applied to a product, use ``is_discountable`` or
+  override ``get_is_discountable`` on your product instances.
+
 .. _rewritten: https://github.com/tangentlabs/django-oscar/commit/d8b4dbfed17be90846ea4bc47b5f7b39ad944c24
 
 Basket line stockrecords

docs/source/topics/class_loading_explained.rst

@@ -64,6 +64,10 @@ use ``get_class`` when importing classes from Oscar. This means that if someday
 the class is overridden, it will not require code changes. Care should be taken
 when doing this, as this is a tricky trade-off between maintainability and
 added complexity.
+Please note that we cannot recommend ever using ``get_model`` in your own code.
+Especially pre-Django 1.7, model initialisation is a tricky process and it's
+easy to run into circular import issues.
+
 
 Testing
 -------

oscar/__init__.py

@@ -64,6 +64,7 @@ OSCAR_CORE_APPS = [
     'haystack',
     'treebeard',
     'sorl.thumbnail',
+    'django_tables2',
 ]
 
 

oscar/apps/address/abstract_models.py

@@ -2,14 +2,16 @@ import re
 import zlib
 
 from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _, pgettext_lazy
 from django.core import exceptions
 
 from oscar.core.compat import AUTH_USER_MODEL
 from oscar.models.fields import UppercaseCharField, PhoneNumberField
-from six.moves import filter
+from django.utils.six.moves import filter
 
 
+@python_2_unicode_compatible
 class AbstractAddress(models.Model):
     """
     Superclass address object
@@ -233,7 +235,7 @@ class AbstractAddress(models.Model):
     search_text = models.TextField(
         _("Search text - used only for searching addresses"), editable=False)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.summary
 
     class Meta:
@@ -373,6 +375,7 @@ class AbstractAddress(models.Model):
         return fields
 
 
+@python_2_unicode_compatible
 class AbstractCountry(models.Model):
     """
     International Organization for Standardization (ISO) 3166-1 Country list.
@@ -407,7 +410,7 @@ class AbstractCountry(models.Model):
         verbose_name_plural = _('Countries')
         ordering = ('-display_order', 'printable_name',)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.printable_name or self.name
 
     @property
@@ -436,7 +439,16 @@ class AbstractShippingAddress(AbstractAddress):
 
     A shipping address should not be edited once the order has been placed -
     it should be read-only after that.
+
+    NOTE:
+    ShippingAddress is a model of the order app. But moving it there is tricky
+    due to circular import issues that are amplified by get_model/get_class
+    calls pre-Django 1.7 to register receivers. So...
+    TODO: Once Django 1.6 support is dropped, move AbstractBillingAddress and
+    AbstractShippingAddress to the order app, and move
+    PartnerAddress to the partner app.
     """
+
     phone_number = PhoneNumberField(
         _("Phone number"), blank=True,
         help_text=_("In case we need to call you about your order"))
@@ -541,7 +553,6 @@ class AbstractUserAddress(AbstractShippingAddress):
 
 
 class AbstractBillingAddress(AbstractAddress):
-
     class Meta:
         abstract = True
         # BillingAddress is registered in order/models.py

oscar/apps/address/migrations/0001_initial.py

@@ -16,56 +16,56 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Country',
             fields=[
-                ('iso_3166_1_a2', models.CharField(max_length=2, serialize=False, verbose_name='ISO 3166-1 alpha-2', primary_key=True)),
-                ('iso_3166_1_a3', models.CharField(max_length=3, verbose_name='ISO 3166-1 alpha-3', blank=True)),
-                ('iso_3166_1_numeric', models.CharField(max_length=3, verbose_name='ISO 3166-1 numeric', blank=True)),
-                ('printable_name', models.CharField(max_length=128, verbose_name='Country name')),
-                ('name', models.CharField(max_length=128, verbose_name='Official name')),
-                ('display_order', models.PositiveSmallIntegerField(default=0, help_text='Higher the number, higher the country in the list.', verbose_name='Display order', db_index=True)),
-                ('is_shipping_country', models.BooleanField(default=False, db_index=True, verbose_name='Is shipping country')),
+                ('iso_3166_1_a2', models.CharField(verbose_name='ISO 3166-1 alpha-2', primary_key=True, serialize=False, max_length=2)),
+                ('iso_3166_1_a3', models.CharField(verbose_name='ISO 3166-1 alpha-3', blank=True, max_length=3)),
+                ('iso_3166_1_numeric', models.CharField(verbose_name='ISO 3166-1 numeric', blank=True, max_length=3)),
+                ('printable_name', models.CharField(verbose_name='Country name', max_length=128)),
+                ('name', models.CharField(verbose_name='Official name', max_length=128)),
+                ('display_order', models.PositiveSmallIntegerField(verbose_name='Display order', help_text='Higher the number, higher the country in the list.', db_index=True, default=0)),
+                ('is_shipping_country', models.BooleanField(verbose_name='Is shipping country', default=False, db_index=True)),
             ],
             options={
-                'ordering': (b'-display_order', b'printable_name'),
-                'abstract': False,
                 'verbose_name': 'Country',
                 'verbose_name_plural': 'Countries',
+                'ordering': ('-display_order', 'printable_name'),
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='UserAddress',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('title', models.CharField(blank=True, max_length=64, verbose_name='Title', choices=[(b'Mr', 'Mr'), (b'Miss', 'Miss'), (b'Mrs', 'Mrs'), (b'Ms', 'Ms'), (b'Dr', 'Dr')])),
-                ('first_name', models.CharField(max_length=255, verbose_name='First name', blank=True)),
-                ('last_name', models.CharField(max_length=255, verbose_name='Last name', blank=True)),
-                ('line1', models.CharField(max_length=255, verbose_name='First line of address')),
-                ('line2', models.CharField(max_length=255, verbose_name='Second line of address', blank=True)),
-                ('line3', models.CharField(max_length=255, verbose_name='Third line of address', blank=True)),
-                ('line4', models.CharField(max_length=255, verbose_name='City', blank=True)),
-                ('state', models.CharField(max_length=255, verbose_name='State/County', blank=True)),
-                ('postcode', oscar.models.fields.UppercaseCharField(max_length=64, verbose_name='Post/Zip-code', blank=True)),
-                ('search_text', models.TextField(verbose_name='Search text - used only for searching addresses', editable=False)),
-                ('phone_number', oscar.models.fields.PhoneNumberField(help_text='In case we need to call you about your order', verbose_name='Phone number', blank=True)),
-                ('notes', models.TextField(help_text='Tell us anything we should know when delivering your order.', verbose_name='Instructions', blank=True)),
-                ('is_default_for_shipping', models.BooleanField(default=False, verbose_name='Default shipping address?')),
-                ('is_default_for_billing', models.BooleanField(default=False, verbose_name='Default billing address?')),
-                ('num_orders', models.PositiveIntegerField(default=0, verbose_name='Number of Orders')),
-                ('hash', models.CharField(verbose_name='Address Hash', max_length=255, editable=False, db_index=True)),
-                ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Date Created')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('title', models.CharField(verbose_name='Title', choices=[('Mr', 'Mr'), ('Miss', 'Miss'), ('Mrs', 'Mrs'), ('Ms', 'Ms'), ('Dr', 'Dr')], blank=True, max_length=64)),
+                ('first_name', models.CharField(verbose_name='First name', blank=True, max_length=255)),
+                ('last_name', models.CharField(verbose_name='Last name', blank=True, max_length=255)),
+                ('line1', models.CharField(verbose_name='First line of address', max_length=255)),
+                ('line2', models.CharField(verbose_name='Second line of address', blank=True, max_length=255)),
+                ('line3', models.CharField(verbose_name='Third line of address', blank=True, max_length=255)),
+                ('line4', models.CharField(verbose_name='City', blank=True, max_length=255)),
+                ('state', models.CharField(verbose_name='State/County', blank=True, max_length=255)),
+                ('postcode', oscar.models.fields.UppercaseCharField(verbose_name='Post/Zip-code', blank=True, max_length=64)),
+                ('search_text', models.TextField(editable=False, verbose_name='Search text - used only for searching addresses')),
+                ('phone_number', oscar.models.fields.PhoneNumberField(verbose_name='Phone number', blank=True, help_text='In case we need to call you about your order')),
+                ('notes', models.TextField(verbose_name='Instructions', blank=True, help_text='Tell us anything we should know when delivering your order.')),
+                ('is_default_for_shipping', models.BooleanField(verbose_name='Default shipping address?', default=False)),
+                ('is_default_for_billing', models.BooleanField(verbose_name='Default billing address?', default=False)),
+                ('num_orders', models.PositiveIntegerField(verbose_name='Number of Orders', default=0)),
+                ('hash', models.CharField(editable=False, verbose_name='Address Hash', db_index=True, max_length=255)),
+                ('date_created', models.DateTimeField(verbose_name='Date Created', auto_now_add=True)),
                 ('country', models.ForeignKey(verbose_name='Country', to='address.Country')),
                 ('user', models.ForeignKey(verbose_name='User', to=settings.AUTH_USER_MODEL)),
             ],
             options={
-                'ordering': [b'-num_orders'],
-                'abstract': False,
                 'verbose_name': 'User address',
                 'verbose_name_plural': 'User addresses',
+                'ordering': ['-num_orders'],
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.AlterUniqueTogether(
             name='useraddress',
-            unique_together=set([(b'user', b'hash')]),
+            unique_together=set([('user', 'hash')]),
         ),
     ]

oscar/apps/analytics/abstract_models.py

@@ -1,10 +1,12 @@
 from decimal import Decimal
 
 from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 from oscar.core.compat import AUTH_USER_MODEL
 
 
+@python_2_unicode_compatible
 class AbstractProductRecord(models.Model):
     """
     A record of a how popular a product is.
@@ -34,7 +36,7 @@ class AbstractProductRecord(models.Model):
         verbose_name = _('Product record')
         verbose_name_plural = _('Product records')
 
-    def __unicode__(self):
+    def __str__(self):
         return _("Record for '%s'") % self.product
 
 
@@ -70,6 +72,7 @@ class AbstractUserRecord(models.Model):
         verbose_name_plural = _('User records')
 
 
+@python_2_unicode_compatible
 class AbstractUserProductView(models.Model):
 
     user = models.ForeignKey(AUTH_USER_MODEL, verbose_name=_("User"))
@@ -82,11 +85,12 @@ class AbstractUserProductView(models.Model):
         verbose_name = _('User product view')
         verbose_name_plural = _('User product views')
 
-    def __unicode__(self):
+    def __str__(self):
         return _("%(user)s viewed '%(product)s'") % {
             'user': self.user, 'product': self.product}
 
 
+@python_2_unicode_compatible
 class AbstractUserSearch(models.Model):
 
     user = models.ForeignKey(AUTH_USER_MODEL, verbose_name=_("User"))
@@ -99,7 +103,7 @@ class AbstractUserSearch(models.Model):
         verbose_name = _("User search query")
         verbose_name_plural = _("User search queries")
 
-    def __unicode__(self):
+    def __str__(self):
         return _("%(user)s searched for '%(query)s'") % {
             'user': self.user,
             'query': self.query}

oscar/apps/analytics/migrations/0001_initial.py

@@ -13,17 +13,17 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='ProductRecord',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('num_views', models.PositiveIntegerField(default=0, verbose_name='Views')),
-                ('num_basket_additions', models.PositiveIntegerField(default=0, verbose_name='Basket Additions')),
-                ('num_purchases', models.PositiveIntegerField(default=0, verbose_name='Purchases', db_index=True)),
-                ('score', models.FloatField(default=0.0, verbose_name='Score')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('num_views', models.PositiveIntegerField(verbose_name='Views', default=0)),
+                ('num_basket_additions', models.PositiveIntegerField(verbose_name='Basket Additions', default=0)),
+                ('num_purchases', models.PositiveIntegerField(verbose_name='Purchases', db_index=True, default=0)),
+                ('score', models.FloatField(verbose_name='Score', default=0.0)),
             ],
             options={
-                'ordering': [b'-num_purchases'],
-                'abstract': False,
                 'verbose_name': 'Product record',
                 'verbose_name_plural': 'Product records',
+                'ordering': ['-num_purchases'],
+                'abstract': False,
             },
             bases=(models.Model,),
         ),

oscar/apps/analytics/migrations/0002_auto_20140729_1113.py → oscar/apps/analytics/migrations/0002_auto_20140805_1510.py

@@ -24,50 +24,50 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='UserProductView',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Date Created')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('date_created', models.DateTimeField(verbose_name='Date Created', auto_now_add=True)),
                 ('product', models.ForeignKey(verbose_name='Product', to='catalogue.Product')),
                 ('user', models.ForeignKey(verbose_name='User', to=settings.AUTH_USER_MODEL)),
             ],
             options={
-                'abstract': False,
                 'verbose_name': 'User product view',
                 'verbose_name_plural': 'User product views',
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='UserRecord',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('num_product_views', models.PositiveIntegerField(default=0, verbose_name='Product Views')),
-                ('num_basket_additions', models.PositiveIntegerField(default=0, verbose_name='Basket Additions')),
-                ('num_orders', models.PositiveIntegerField(default=0, verbose_name='Orders', db_index=True)),
-                ('num_order_lines', models.PositiveIntegerField(default=0, verbose_name='Order Lines', db_index=True)),
-                ('num_order_items', models.PositiveIntegerField(default=0, verbose_name='Order Items', db_index=True)),
-                ('total_spent', models.DecimalField(default=Decimal('0.00'), verbose_name='Total Spent', max_digits=12, decimal_places=2)),
-                ('date_last_order', models.DateTimeField(null=True, verbose_name='Last Order Date', blank=True)),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('num_product_views', models.PositiveIntegerField(verbose_name='Product Views', default=0)),
+                ('num_basket_additions', models.PositiveIntegerField(verbose_name='Basket Additions', default=0)),
+                ('num_orders', models.PositiveIntegerField(verbose_name='Orders', db_index=True, default=0)),
+                ('num_order_lines', models.PositiveIntegerField(verbose_name='Order Lines', db_index=True, default=0)),
+                ('num_order_items', models.PositiveIntegerField(verbose_name='Order Items', db_index=True, default=0)),
+                ('total_spent', models.DecimalField(verbose_name='Total Spent', max_digits=12, decimal_places=2, default=Decimal('0.00'))),
+                ('date_last_order', models.DateTimeField(verbose_name='Last Order Date', blank=True, null=True)),
                 ('user', models.OneToOneField(verbose_name='User', to=settings.AUTH_USER_MODEL)),
             ],
             options={
-                'abstract': False,
                 'verbose_name': 'User record',
                 'verbose_name_plural': 'User records',
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='UserSearch',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('query', models.CharField(max_length=255, verbose_name='Search term', db_index=True)),
-                ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Date Created')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('query', models.CharField(verbose_name='Search term', db_index=True, max_length=255)),
+                ('date_created', models.DateTimeField(verbose_name='Date Created', auto_now_add=True)),
                 ('user', models.ForeignKey(verbose_name='User', to=settings.AUTH_USER_MODEL)),
             ],
             options={
-                'abstract': False,
                 'verbose_name': 'User search query',
                 'verbose_name_plural': 'User search queries',
+                'abstract': False,
             },
             bases=(models.Model,),
         ),

oscar/apps/basket/abstract_models.py

@@ -4,6 +4,7 @@ import zlib
 from django.db import models
 from django.db.models import Sum
 from django.conf import settings
+from django.utils.encoding import python_2_unicode_compatible
 from django.utils.timezone import now
 from django.utils.translation import ugettext_lazy as _
 from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
@@ -14,6 +15,7 @@ from oscar.core.compat import AUTH_USER_MODEL
 from oscar.templatetags.currency_filters import currency
 
 
+@python_2_unicode_compatible
 class AbstractBasket(models.Model):
     """
     Basket object
@@ -74,7 +76,7 @@ class AbstractBasket(models.Model):
         self._lines = None
         self.offer_applications = results.OfferApplications()
 
-    def __unicode__(self):
+    def __str__(self):
         return _(
             u"%(status)s basket (owner: %(owner)s, lines: %(num_lines)d)") \
             % {'status': self.status,
@@ -538,6 +540,7 @@ class AbstractBasket(models.Model):
             return 0
 
 
+@python_2_unicode_compatible
 class AbstractLine(models.Model):
     """
     A line of a basket (product and a quantity)
@@ -590,7 +593,7 @@ class AbstractLine(models.Model):
         verbose_name = _('Basket line')
         verbose_name_plural = _('Basket lines')
 
-    def __unicode__(self):
+    def __str__(self):
         return _(
             u"Basket #%(basket_id)d, Product #%(product_id)d, quantity"
             u" %(quantity)d") % {'basket_id': self.basket.pk,

oscar/apps/basket/migrations/0001_initial.py

@@ -15,17 +15,17 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Basket',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('status', models.CharField(default=b'Open', max_length=128, verbose_name='Status', choices=[(b'Open', 'Open - currently active'), (b'Merged', 'Merged - superceded by another basket'), (b'Saved', 'Saved - for items to be purchased later'), (b'Frozen', 'Frozen - the basket cannot be modified'), (b'Submitted', 'Submitted - has been ordered at the checkout')])),
-                ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Date created')),
-                ('date_merged', models.DateTimeField(null=True, verbose_name='Date merged', blank=True)),
-                ('date_submitted', models.DateTimeField(null=True, verbose_name='Date submitted', blank=True)),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('status', models.CharField(verbose_name='Status', choices=[('Open', 'Open - currently active'), ('Merged', 'Merged - superceded by another basket'), ('Saved', 'Saved - for items to be purchased later'), ('Frozen', 'Frozen - the basket cannot be modified'), ('Submitted', 'Submitted - has been ordered at the checkout')], default='Open', max_length=128)),
+                ('date_created', models.DateTimeField(verbose_name='Date created', auto_now_add=True)),
+                ('date_merged', models.DateTimeField(verbose_name='Date merged', blank=True, null=True)),
+                ('date_submitted', models.DateTimeField(verbose_name='Date submitted', blank=True, null=True)),
                 ('owner', models.ForeignKey(verbose_name='Owner', to=settings.AUTH_USER_MODEL, null=True)),
             ],
             options={
-                'abstract': False,
                 'verbose_name': 'Basket',
                 'verbose_name_plural': 'Baskets',
+                'abstract': False,
             },
             bases=(models.Model,),
         ),

oscar/apps/basket/migrations/0002_auto_20140729_1113.py → oscar/apps/basket/migrations/0002_auto_20140805_1510.py

@@ -17,46 +17,46 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='basket',
             name='vouchers',
-            field=models.ManyToManyField(to='voucher.Voucher', null=True, verbose_name='Vouchers', blank=True),
+            field=models.ManyToManyField(verbose_name='Vouchers', blank=True, to='voucher.Voucher', null=True),
             preserve_default=True,
         ),
         migrations.CreateModel(
             name='Line',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('line_reference', models.SlugField(max_length=128, verbose_name='Line Reference')),
-                ('quantity', models.PositiveIntegerField(default=1, verbose_name='Quantity')),
-                ('price_currency', models.CharField(default=b'GBP', max_length=12, verbose_name='Currency')),
-                ('price_excl_tax', models.DecimalField(null=True, verbose_name='Price excl. Tax', max_digits=12, decimal_places=2)),
-                ('price_incl_tax', models.DecimalField(null=True, verbose_name='Price incl. Tax', max_digits=12, decimal_places=2)),
-                ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Date Created')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('line_reference', models.SlugField(verbose_name='Line Reference', max_length=128)),
+                ('quantity', models.PositiveIntegerField(verbose_name='Quantity', default=1)),
+                ('price_currency', models.CharField(verbose_name='Currency', default='GBP', max_length=12)),
+                ('price_excl_tax', models.DecimalField(verbose_name='Price excl. Tax', max_digits=12, decimal_places=2, null=True)),
+                ('price_incl_tax', models.DecimalField(verbose_name='Price incl. Tax', max_digits=12, decimal_places=2, null=True)),
+                ('date_created', models.DateTimeField(verbose_name='Date Created', auto_now_add=True)),
                 ('basket', models.ForeignKey(verbose_name='Basket', to='basket.Basket')),
                 ('product', models.ForeignKey(verbose_name='Product', to='catalogue.Product')),
                 ('stockrecord', models.ForeignKey(to='partner.StockRecord')),
             ],
             options={
-                'abstract': False,
                 'verbose_name': 'Basket line',
                 'verbose_name_plural': 'Basket lines',
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.AlterUniqueTogether(
             name='line',
-            unique_together=set([(b'basket', b'line_reference')]),
+            unique_together=set([('basket', 'line_reference')]),
         ),
         migrations.CreateModel(
             name='LineAttribute',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('value', models.CharField(max_length=255, verbose_name='Value')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('value', models.CharField(verbose_name='Value', max_length=255)),
                 ('line', models.ForeignKey(verbose_name='Line', to='basket.Line')),
                 ('option', models.ForeignKey(verbose_name='Option', to='catalogue.Option')),
             ],
             options={
-                'abstract': False,
                 'verbose_name': 'Line attribute',
                 'verbose_name_plural': 'Line attributes',
+                'abstract': False,
             },
             bases=(models.Model,),
         ),

oscar/apps/basket/views.py

@@ -1,20 +1,24 @@
 import json
-from six.moves.urllib import parse
 
+from django import shortcuts
 from django.contrib import messages
+from django.shortcuts import redirect
 from django.template.loader import render_to_string
 from django.template import RequestContext
-from django.core.urlresolvers import reverse, resolve
-from django.http import HttpResponseRedirect, Http404, HttpResponse
+from django.core.urlresolvers import reverse
+from django.http import HttpResponse
 from django.views.generic import FormView, View
+from django.utils.http import is_safe_url
 from django.utils.translation import ugettext_lazy as _
 from django.core.exceptions import ObjectDoesNotExist
-from django import shortcuts
+
 from extra_views import ModelFormSetView
 
 from oscar.core import ajax
+from oscar.core.utils import redirect_to_referrer, safe_referrer
 from oscar.apps.basket import signals
 from oscar.core.loading import get_class, get_classes, get_model
+
 Applicator = get_class('offer.utils', 'Applicator')
 (BasketLineFormSet, BasketLineForm, AddToBasketForm, BasketVoucherForm,
  SavedLineFormSet, SavedLineForm) \
@@ -121,7 +125,7 @@ class BasketView(ModelFormSetView):
 
     def get_upsell_messages(self, basket):
         offers = Applicator().get_offers(self.request, basket)
-        applied_offers = basket.offer_applications.offers.values()
+        applied_offers = list(basket.offer_applications.offers.values())
         msgs = []
         for offer in offers:
             if offer.is_condition_partially_satisfied(basket) \
@@ -132,9 +136,16 @@ class BasketView(ModelFormSetView):
                 msgs.append(data)
         return msgs
 
+    def get_basket_voucher_form(self):
+        """
+        This is a separate method so that it's easy to e.g. not return a form
+        if there are no vouchers available.
+        """
+        return BasketVoucherForm()
+
     def get_context_data(self, **kwargs):
         context = super(BasketView, self).get_context_data(**kwargs)
-        context['voucher_form'] = BasketVoucherForm()
+        context['voucher_form'] = self.get_basket_voucher_form()
 
         # Shipping information is included to give an idea of the total order
         # cost.  It is also important for PayPal Express where the customer
@@ -176,7 +187,7 @@ class BasketView(ModelFormSetView):
         return context
 
     def get_success_url(self):
-        return self.request.META.get('HTTP_REFERER', reverse('basket:summary'))
+        return safe_referrer(self.request.META, 'basket:summary')
 
     def formset_valid(self, formset):
         # Store offers before any changes are made so we can inform the user of
@@ -206,11 +217,11 @@ class BasketView(ModelFormSetView):
                     msg = _("You can't save an item for later if you're "
                             "not logged in!")
                     flash_messages.error(msg)
-                    return HttpResponseRedirect(self.get_success_url())
+                    return redirect(self.get_success_url())
 
         if save_for_later:
             # No need to call super if we're moving lines to the saved basket
-            response = HttpResponseRedirect(self.get_success_url())
+            response = redirect(self.get_success_url())
         else:
             # Save changes to basket as per normal
             response = super(BasketView, self).formset_valid(formset)
@@ -305,8 +316,7 @@ class BasketAddView(FormView):
         clean_msgs = [m.replace('* ', '') for m in msgs if m.startswith('* ')]
         messages.error(self.request, ",".join(clean_msgs))
 
-        return HttpResponseRedirect(
-            self.request.META.get('HTTP_REFERER', reverse('basket:summary')))
+        return redirect_to_referrer(self.request.META, 'basket:summary')
 
     def form_valid(self, form):
         offers_before = self.request.basket.applied_offers()
@@ -335,20 +345,10 @@ class BasketAddView(FormView):
              'quantity': form.cleaned_data['quantity']})
 
     def get_success_url(self):
-        url = None
-        if self.request.POST.get('next'):
-            url = self.request.POST.get('next')
-        elif 'HTTP_REFERER' in self.request.META:
-            url = self.request.META['HTTP_REFERER']
-        if url:
-            # We only allow internal URLs so we see if the url resolves
-            try:
-                resolve(parse.urlparse(url).path)
-            except Http404:
-                url = None
-        if url is None:
-            url = reverse('basket:summary')
-        return url
+        post_url = self.request.POST.get('next')
+        if post_url and is_safe_url(post_url):
+            return post_url
+        return safe_referrer(self.request.META, 'basket:summary')
 
 
 class VoucherAddView(FormView):
@@ -357,7 +357,7 @@ class VoucherAddView(FormView):
     add_signal = signals.voucher_addition
 
     def get(self, request, *args, **kwargs):
-        return HttpResponseRedirect(reverse('basket:summary'))
+        return redirect('basket:summary')
 
     def apply_voucher_to_basket(self, voucher):
         if not voucher.is_active():
@@ -402,9 +402,7 @@ class VoucherAddView(FormView):
     def form_valid(self, form):
         code = form.cleaned_data['code']
         if not self.request.basket.id:
-            return HttpResponseRedirect(
-                self.request.META.get('HTTP_REFERER',
-                                      reverse('basket:summary')))
+            return redirect_to_referrer(self.request.META, 'basket:summary')
         if self.request.basket.contains_voucher(code):
             messages.error(
                 self.request,
@@ -420,12 +418,11 @@ class VoucherAddView(FormView):
                         'code': code})
             else:
                 self.apply_voucher_to_basket(voucher)
-        return HttpResponseRedirect(
-            self.request.META.get('HTTP_REFERER', reverse('basket:summary')))
+        return redirect_to_referrer(self.request.META, 'basket:summary')
 
     def form_invalid(self, form):
         messages.error(self.request, _("Please enter a voucher code"))
-        return HttpResponseRedirect(reverse('basket:summary') + '#voucher')
+        return redirect(reverse('basket:summary') + '#voucher')
 
 
 class VoucherRemoveView(View):
@@ -434,7 +431,7 @@ class VoucherRemoveView(View):
     http_method_names = ['post']
 
     def post(self, request, *args, **kwargs):
-        response = HttpResponseRedirect(reverse('basket:summary'))
+        response = redirect('basket:summary')
 
         voucher_id = kwargs['pk']
         if not request.basket.id:
@@ -465,7 +462,7 @@ class SavedView(ModelFormSetView):
     can_delete = True
 
     def get(self, request, *args, **kwargs):
-        return HttpResponseRedirect(reverse('basket:summary'))
+        return redirect('basket:summary')
 
     def get_queryset(self):
         try:
@@ -477,7 +474,7 @@ class SavedView(ModelFormSetView):
             return []
 
     def get_success_url(self):
-        return self.request.META.get('HTTP_REFERER', reverse('basket:summary'))
+        return safe_referrer(self.request.META, 'basket:summary')
 
     def get_formset_kwargs(self):
         kwargs = super(SavedView, self).get_formset_kwargs()
@@ -504,7 +501,7 @@ class SavedView(ModelFormSetView):
             # As we're changing the basket, we need to check if it qualifies
             # for any new offers.
             apply_messages(self.request, offers_before)
-            response = HttpResponseRedirect(self.get_success_url())
+            response = redirect(self.get_success_url())
         else:
             response = super(SavedView, self).formset_valid(formset)
         return response
@@ -515,5 +512,4 @@ class SavedView(ModelFormSetView):
             '\n'.join(
                 error for ed in formset.errors for el
                 in ed.values() for error in el))
-        return HttpResponseRedirect(
-            self.request.META.get('HTTP_REFERER', reverse('basket:summary')))
+        return redirect_to_referrer(self.request.META, 'basket:summary')

oscar/apps/catalogue/abstract_models.py

@@ -1,6 +1,5 @@
-from django.core.urlresolvers import reverse
 import os
-import six
+from django.utils import six
 from itertools import chain
 from datetime import datetime, date
 import logging
@@ -11,17 +10,19 @@ from django.conf import settings
 from django.contrib.staticfiles.finders import find
 from django.core.exceptions import ValidationError, ImproperlyConfigured
 from django.core.files.base import File
+from django.core.urlresolvers import reverse
 from django.core.validators import RegexValidator
 from django.db import models
 from django.db.models import Sum, Count
+from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _, pgettext_lazy
 from django.utils.functional import cached_property
 from django.contrib.contenttypes.generic import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
 
 from treebeard.mp_tree import MP_Node
-from oscar.core.decorators import deprecated
 
+from oscar.core.decorators import deprecated
 from oscar.core.utils import slugify
 from oscar.core.loading import get_classes, get_model
 from oscar.models.fields import NullCharField, AutoSlugField
@@ -30,6 +31,7 @@ ProductManager, BrowsableProductManager = get_classes(
     'catalogue.managers', ['ProductManager', 'BrowsableProductManager'])
 
 
+@python_2_unicode_compatible
 class AbstractProductClass(models.Model):
     """
     Used for defining options and attributes for a subset of products.
@@ -66,7 +68,7 @@ class AbstractProductClass(models.Model):
         verbose_name = _("Product class")
         verbose_name_plural = _("Product classes")
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
     @property
@@ -74,6 +76,7 @@ class AbstractProductClass(models.Model):
         return self.attributes.exists()
 
 
+@python_2_unicode_compatible
 class AbstractCategory(MP_Node):
     """
     A product category. Merely used for navigational purposes; has no
@@ -93,7 +96,7 @@ class AbstractCategory(MP_Node):
     _slug_separator = '/'
     _full_name_separator = ' > '
 
-    def __unicode__(self):
+    def __str__(self):
         return self.full_name
 
     def update_slug(self, commit=True):
@@ -179,6 +182,7 @@ class AbstractCategory(MP_Node):
         return self.get_children().count()
 
 
+@python_2_unicode_compatible
 class AbstractProductCategory(models.Model):
     """
     Joining model between products and categories. Exists to allow customising.
@@ -195,10 +199,11 @@ class AbstractProductCategory(models.Model):
         verbose_name = _('Product category')
         verbose_name_plural = _('Product categories')
 
-    def __unicode__(self):
+    def __str__(self):
         return u"<productcategory for product '%s'>" % self.product
 
 
+@python_2_unicode_compatible
 class AbstractProduct(models.Model):
     """
     The base product object
@@ -308,7 +313,7 @@ class AbstractProduct(models.Model):
         super(AbstractProduct, self).__init__(*args, **kwargs)
         self.attr = ProductAttributesContainer(product=self)
 
-    def __unicode__(self):
+    def __str__(self):
         if self.is_child:
             return u"%s (%s)" % (self.get_title(), self.attribute_summary)
         return self.get_title()
@@ -559,6 +564,16 @@ class AbstractProduct(models.Model):
         else:
             return self.is_discountable
 
+    def get_categories(self):
+        """
+        Return a product's categories or parent's if there is a parent product.
+        """
+        if self.is_child:
+            return self.parent.categories
+        else:
+            return self.categories
+    get_categories.short_description = _("Categories")
+
     # Images
 
     def get_missing_image(self):
@@ -685,7 +700,7 @@ class ProductAttributesContainer(object):
 
     def __getattr__(self, name):
         if not name.startswith('_') and not self.initialised:
-            values = list(self.get_values().select_related('attribute'))
+            values = self.get_values().select_related('attribute')
             for v in values:
                 setattr(self, v.attribute.code, v.value)
             self.initialised = True
@@ -732,6 +747,7 @@ class ProductAttributesContainer(object):
                 attribute.save_value(self.product, value)
 
 
+@python_2_unicode_compatible
 class AbstractProductAttribute(models.Model):
     """
     Defines an attribute for a product class. (For example, number_of_pages for
@@ -796,7 +812,7 @@ class AbstractProductAttribute(models.Model):
     def is_file(self):
         return self.type in [self.FILE, self.IMAGE]
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
     def save_value(self, product, value):
@@ -887,6 +903,7 @@ class AbstractProductAttribute(models.Model):
     _validate_image = _validate_file
 
 
+@python_2_unicode_compatible
 class AbstractProductAttributeValue(models.Model):
     """
     The "through" model for the m2m relationship between catalogue.Product and
@@ -943,7 +960,7 @@ class AbstractProductAttributeValue(models.Model):
         verbose_name = _('Product attribute value')
         verbose_name_plural = _('Product attribute values')
 
-    def __unicode__(self):
+    def __str__(self):
         return self.summary()
 
     def summary(self):
@@ -973,7 +990,7 @@ class AbstractProductAttributeValue(models.Model):
         Returns the unicode representation of the related model. You likely
         want to customise this (and maybe _entity_as_html) if you use entities.
         """
-        return unicode(self.value)
+        return six.text_type(self.value)
 
     @property
     def value_as_html(self):
@@ -990,6 +1007,7 @@ class AbstractProductAttributeValue(models.Model):
         return mark_safe(self.value)
 
 
+@python_2_unicode_compatible
 class AbstractAttributeOptionGroup(models.Model):
     """
     Defines a group of options that collectively may be used as an
@@ -999,7 +1017,7 @@ class AbstractAttributeOptionGroup(models.Model):
     """
     name = models.CharField(_('Name'), max_length=128)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
     class Meta:
@@ -1014,6 +1032,7 @@ class AbstractAttributeOptionGroup(models.Model):
         return ", ".join(options)
 
 
+@python_2_unicode_compatible
 class AbstractAttributeOption(models.Model):
     """
     Provides an option within an option group for an attribute type
@@ -1024,7 +1043,7 @@ class AbstractAttributeOption(models.Model):
         verbose_name=_("Group"))
     option = models.CharField(_('Option'), max_length=255)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.option
 
     class Meta:
@@ -1034,6 +1053,7 @@ class AbstractAttributeOption(models.Model):
         verbose_name_plural = _('Attribute options')
 
 
+@python_2_unicode_compatible
 class AbstractOption(models.Model):
     """
     An option that can be selected for a particular item when the product
@@ -1064,7 +1084,7 @@ class AbstractOption(models.Model):
         verbose_name = _("Option")
         verbose_name_plural = _("Options")
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
     @property
@@ -1110,6 +1130,7 @@ class MissingProductImage(object):
                                            settings.MEDIA_ROOT))
 
 
+@python_2_unicode_compatible
 class AbstractProductImage(models.Model):
     """
     An image of a product
@@ -1137,7 +1158,7 @@ class AbstractProductImage(models.Model):
         verbose_name = _('Product image')
         verbose_name_plural = _('Product images')
 
-    def __unicode__(self):
+    def __str__(self):
         return u"Image of '%s'" % self.product
 
     def is_primary(self):
@@ -1145,3 +1166,13 @@ class AbstractProductImage(models.Model):
         Return bool if image display order is 0
         """
         return self.display_order == 0
+
+    def delete(self, *args, **kwargs):
+        """
+        Always keep the display_order as consecutive integers. This avoids
+        issue #855.
+        """
+        super(AbstractProductImage, self).delete(*args, **kwargs)
+        for idx, image in enumerate(self.product.images.all()):
+            image.display_order = idx
+            image.save()

oscar/apps/catalogue/migrations/0001_initial.py

@@ -2,42 +2,42 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
-import oscar.models.fields.autoslugfield
 import oscar.models.fields
-import django.db.models.deletion
 import django.core.validators
+import django.db.models.deletion
+import oscar.models.fields.autoslugfield
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('contenttypes', '__latest__'),
+        ('contenttypes', '0001_initial'),
     ]
 
     operations = [
         migrations.CreateModel(
             name='AttributeOption',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('option', models.CharField(max_length=255, verbose_name='Option')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('option', models.CharField(verbose_name='Option', max_length=255)),
             ],
             options={
-                'abstract': False,
                 'verbose_name': 'Attribute option',
                 'verbose_name_plural': 'Attribute options',
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='AttributeOptionGroup',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('name', models.CharField(max_length=128, verbose_name='Name')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('name', models.CharField(verbose_name='Name', max_length=128)),
             ],
             options={
-                'abstract': False,
                 'verbose_name': 'Attribute option group',
                 'verbose_name_plural': 'Attribute option groups',
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
@@ -50,108 +50,108 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Category',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
                 ('path', models.CharField(unique=True, max_length=255)),
                 ('depth', models.PositiveIntegerField()),
                 ('numchild', models.PositiveIntegerField(default=0)),
-                ('name', models.CharField(max_length=255, verbose_name='Name', db_index=True)),
+                ('name', models.CharField(verbose_name='Name', db_index=True, max_length=255)),
                 ('description', models.TextField(verbose_name='Description', blank=True)),
-                ('image', models.ImageField(max_length=255, upload_to=b'categories', null=True, verbose_name='Image', blank=True)),
-                ('slug', models.SlugField(verbose_name='Slug', max_length=255, editable=False)),
-                ('full_name', models.CharField(verbose_name='Full Name', max_length=255, editable=False, db_index=True)),
+                ('image', models.ImageField(verbose_name='Image', upload_to='categories', blank=True, null=True, max_length=255)),
+                ('slug', models.SlugField(editable=False, verbose_name='Slug', max_length=255)),
+                ('full_name', models.CharField(editable=False, verbose_name='Full Name', db_index=True, max_length=255)),
             ],
             options={
-                'ordering': [b'full_name'],
-                'abstract': False,
                 'verbose_name': 'Category',
                 'verbose_name_plural': 'Categories',
+                'ordering': ['full_name'],
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='Option',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('name', models.CharField(max_length=128, verbose_name='Name')),
-                ('code', oscar.models.fields.autoslugfield.AutoSlugField(populate_from=b'name', editable=False, max_length=128, blank=True, unique=True, verbose_name='Code')),
-                ('type', models.CharField(default=b'Required', max_length=128, verbose_name='Status', choices=[(b'Required', 'Required - a value for this option must be specified'), (b'Optional', 'Optional - a value for this option can be omitted')])),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('name', models.CharField(verbose_name='Name', max_length=128)),
+                ('code', oscar.models.fields.autoslugfield.AutoSlugField(editable=False, verbose_name='Code', blank=True, max_length=128, populate_from='name', unique=True)),
+                ('type', models.CharField(verbose_name='Status', choices=[('Required', 'Required - a value for this option must be specified'), ('Optional', 'Optional - a value for this option can be omitted')], default='Required', max_length=128)),
             ],
             options={
-                'abstract': False,
                 'verbose_name': 'Option',
                 'verbose_name_plural': 'Options',
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='Product',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('structure', models.CharField(default=b'standalone', max_length=10, verbose_name='Product structure', choices=[(b'standalone', 'Stand-alone product'), (b'parent', 'Parent product'), (b'child', 'Child product')])),
-                ('upc', oscar.models.fields.NullCharField(max_length=64, help_text='Universal Product Code (UPC) is an identifier for a product which is not specific to a particular  supplier. Eg an ISBN for a book.', unique=True, verbose_name='UPC')),
-                ('title', models.CharField(max_length=255, verbose_name='Title', blank=True)),
-                ('slug', models.SlugField(max_length=255, verbose_name='Slug')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('structure', models.CharField(verbose_name='Product structure', choices=[('standalone', 'Stand-alone product'), ('parent', 'Parent product'), ('child', 'Child product')], default='standalone', max_length=10)),
+                ('upc', oscar.models.fields.NullCharField(verbose_name='UPC', max_length=64, help_text='Universal Product Code (UPC) is an identifier for a product which is not specific to a particular  supplier. Eg an ISBN for a book.', unique=True)),
+                ('title', models.CharField(verbose_name='Title', blank=True, max_length=255)),
+                ('slug', models.SlugField(verbose_name='Slug', max_length=255)),
                 ('description', models.TextField(verbose_name='Description', blank=True)),
-                ('rating', models.FloatField(verbose_name='Rating', null=True, editable=False)),
-                ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Date created')),
-                ('date_updated', models.DateTimeField(auto_now=True, verbose_name='Date updated', db_index=True)),
-                ('is_discountable', models.BooleanField(default=True, help_text='This flag indicates if this product can be used in an offer or not', verbose_name='Is discountable?')),
-                ('parent', models.ForeignKey(blank=True, to='catalogue.Product', help_text="Only choose a parent product if you're creating a child product.  For example if this is a size 4 of a particular t-shirt.  Leave blank if this is a stand-alone product (i.e. there is only one version of this product).", null=True, verbose_name='Parent product')),
-                ('product_options', models.ManyToManyField(to='catalogue.Option', verbose_name='Product Options', blank=True)),
+                ('rating', models.FloatField(editable=False, verbose_name='Rating', null=True)),
+                ('date_created', models.DateTimeField(verbose_name='Date created', auto_now_add=True)),
+                ('date_updated', models.DateTimeField(verbose_name='Date updated', auto_now=True, db_index=True)),
+                ('is_discountable', models.BooleanField(verbose_name='Is discountable?', help_text='This flag indicates if this product can be used in an offer or not', default=True)),
+                ('parent', models.ForeignKey(verbose_name='Parent product', blank=True, help_text="Only choose a parent product if you're creating a child product.  For example if this is a size 4 of a particular t-shirt.  Leave blank if this is a stand-alone product (i.e. there is only one version of this product).", to='catalogue.Product', null=True)),
+                ('product_options', models.ManyToManyField(verbose_name='Product Options', blank=True, to='catalogue.Option')),
             ],
             options={
-                'ordering': [b'-date_created'],
-                'abstract': False,
                 'verbose_name': 'Product',
                 'verbose_name_plural': 'Products',
+                'ordering': ['-date_created'],
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='ProductAttribute',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('name', models.CharField(max_length=128, verbose_name='Name')),
-                ('code', models.SlugField(max_length=128, verbose_name='Code', validators=[django.core.validators.RegexValidator(regex=b'^[a-zA-Z\\-_][0-9a-zA-Z\\-_]*$', message="Code can only contain the letters a-z, A-Z, digits, minus and underscores, and can't start with a digit")])),
-                ('type', models.CharField(default=b'text', max_length=20, verbose_name='Type', choices=[(b'text', 'Text'), (b'integer', 'Integer'), (b'boolean', 'True / False'), (b'float', 'Float'), (b'richtext', 'Rich Text'), (b'date', 'Date'), (b'option', 'Option'), (b'entity', 'Entity'), (b'file', 'File'), (b'image', 'Image')])),
-                ('required', models.BooleanField(default=False, verbose_name='Required')),
-                ('option_group', models.ForeignKey(blank=True, to='catalogue.AttributeOptionGroup', help_text='Select an option group if using type "Option"', null=True, verbose_name='Option Group')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('name', models.CharField(verbose_name='Name', max_length=128)),
+                ('code', models.SlugField(verbose_name='Code', validators=[django.core.validators.RegexValidator(regex='^[a-zA-Z\\-_][0-9a-zA-Z\\-_]*$', message="Code can only contain the letters a-z, A-Z, digits, minus and underscores, and can't start with a digit")], max_length=128)),
+                ('type', models.CharField(verbose_name='Type', choices=[('text', 'Text'), ('integer', 'Integer'), ('boolean', 'True / False'), ('float', 'Float'), ('richtext', 'Rich Text'), ('date', 'Date'), ('option', 'Option'), ('entity', 'Entity'), ('file', 'File'), ('image', 'Image')], default='text', max_length=20)),
+                ('required', models.BooleanField(verbose_name='Required', default=False)),
+                ('option_group', models.ForeignKey(verbose_name='Option Group', blank=True, help_text='Select an option group if using type "Option"', to='catalogue.AttributeOptionGroup', null=True)),
             ],
             options={
-                'ordering': [b'code'],
-                'abstract': False,
                 'verbose_name': 'Product attribute',
                 'verbose_name_plural': 'Product attributes',
+                'ordering': ['code'],
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='ProductAttributeValue',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('value_text', models.TextField(null=True, verbose_name='Text', blank=True)),
-                ('value_integer', models.IntegerField(null=True, verbose_name='Integer', blank=True)),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('value_text', models.TextField(verbose_name='Text', blank=True, null=True)),
+                ('value_integer', models.IntegerField(verbose_name='Integer', blank=True, null=True)),
                 ('value_boolean', models.NullBooleanField(verbose_name='Boolean')),
-                ('value_float', models.FloatField(null=True, verbose_name='Float', blank=True)),
-                ('value_richtext', models.TextField(null=True, verbose_name='Richtext', blank=True)),
-                ('value_date', models.DateField(null=True, verbose_name='Date', blank=True)),
-                ('value_file', models.FileField(max_length=255, null=True, upload_to=b'images/products/%Y/%m/', blank=True)),
-                ('value_image', models.ImageField(max_length=255, null=True, upload_to=b'images/products/%Y/%m/', blank=True)),
-                ('entity_object_id', models.PositiveIntegerField(null=True, editable=False, blank=True)),
+                ('value_float', models.FloatField(verbose_name='Float', blank=True, null=True)),
+                ('value_richtext', models.TextField(verbose_name='Richtext', blank=True, null=True)),
+                ('value_date', models.DateField(verbose_name='Date', blank=True, null=True)),
+                ('value_file', models.FileField(null=True, upload_to='images/products/%Y/%m/', blank=True, max_length=255)),
+                ('value_image', models.ImageField(null=True, upload_to='images/products/%Y/%m/', blank=True, max_length=255)),
+                ('entity_object_id', models.PositiveIntegerField(editable=False, blank=True, null=True)),
                 ('attribute', models.ForeignKey(verbose_name='Attribute', to='catalogue.ProductAttribute')),
-                ('entity_content_type', models.ForeignKey(blank=True, editable=False, to='contenttypes.ContentType', null=True)),
+                ('entity_content_type', models.ForeignKey(editable=False, blank=True, to='contenttypes.ContentType', null=True)),
             ],
             options={
-                'abstract': False,
                 'verbose_name': 'Product attribute value',
                 'verbose_name_plural': 'Product attribute values',
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.AddField(
             model_name='product',
             name='attributes',
-            field=models.ManyToManyField(to='catalogue.ProductAttribute', verbose_name='Attributes', through='catalogue.ProductAttributeValue'),
+            field=models.ManyToManyField(verbose_name='Attributes', through='catalogue.ProductAttributeValue', to='catalogue.ProductAttribute'),
             preserve_default=True,
         ),
         migrations.AddField(
@@ -168,26 +168,26 @@ class Migration(migrations.Migration):
         ),
         migrations.AlterUniqueTogether(
             name='productattributevalue',
-            unique_together=set([(b'attribute', b'product')]),
+            unique_together=set([('attribute', 'product')]),
         ),
         migrations.CreateModel(
             name='ProductCategory',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
                 ('category', models.ForeignKey(verbose_name='Category', to='catalogue.Category')),
             ],
             options={
-                'ordering': [b'product', b'category'],
-                'abstract': False,
                 'verbose_name': 'Product category',
                 'verbose_name_plural': 'Product categories',
+                'ordering': ['product', 'category'],
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.AddField(
             model_name='product',
             name='categories',
-            field=models.ManyToManyField(to='catalogue.Category', verbose_name='Categories', through='catalogue.ProductCategory'),
+            field=models.ManyToManyField(verbose_name='Categories', through='catalogue.ProductCategory', to='catalogue.Category'),
             preserve_default=True,
         ),
         migrations.AddField(
@@ -198,23 +198,23 @@ class Migration(migrations.Migration):
         ),
         migrations.AlterUniqueTogether(
             name='productcategory',
-            unique_together=set([(b'product', b'category')]),
+            unique_together=set([('product', 'category')]),
         ),
         migrations.CreateModel(
             name='ProductClass',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('name', models.CharField(max_length=128, verbose_name='Name')),
-                ('slug', oscar.models.fields.autoslugfield.AutoSlugField(populate_from=b'name', editable=False, max_length=128, blank=True, unique=True, verbose_name='Slug')),
-                ('requires_shipping', models.BooleanField(default=True, verbose_name='Requires shipping?')),
-                ('track_stock', models.BooleanField(default=True, verbose_name='Track stock levels?')),
-                ('options', models.ManyToManyField(to='catalogue.Option', verbose_name='Options', blank=True)),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('name', models.CharField(verbose_name='Name', max_length=128)),
+                ('slug', oscar.models.fields.autoslugfield.AutoSlugField(editable=False, verbose_name='Slug', blank=True, max_length=128, populate_from='name', unique=True)),
+                ('requires_shipping', models.BooleanField(verbose_name='Requires shipping?', default=True)),
+                ('track_stock', models.BooleanField(verbose_name='Track stock levels?', default=True)),
+                ('options', models.ManyToManyField(verbose_name='Options', blank=True, to='catalogue.Option')),
             ],
             options={
-                'ordering': [b'name'],
-                'abstract': False,
                 'verbose_name': 'Product class',
                 'verbose_name_plural': 'Product classes',
+                'ordering': ['name'],
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
@@ -227,49 +227,49 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='product',
             name='product_class',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, verbose_name='Product Type', to='catalogue.ProductClass', help_text='Choose what type of product this is', null=True),
+            field=models.ForeignKey(verbose_name='Product Type', on_delete=django.db.models.deletion.PROTECT, help_text='Choose what type of product this is', to='catalogue.ProductClass', null=True),
             preserve_default=True,
         ),
         migrations.CreateModel(
             name='ProductImage',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('original', models.ImageField(upload_to=b'images/products/%Y/%m/', max_length=255, verbose_name='Original')),
-                ('caption', models.CharField(max_length=200, verbose_name='Caption', blank=True)),
-                ('display_order', models.PositiveIntegerField(default=0, help_text='An image with a display order of zero will be the primary image for a product', verbose_name='Display Order')),
-                ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Date Created')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('original', models.ImageField(verbose_name='Original', upload_to='images/products/%Y/%m/', max_length=255)),
+                ('caption', models.CharField(verbose_name='Caption', blank=True, max_length=200)),
+                ('display_order', models.PositiveIntegerField(verbose_name='Display Order', help_text='An image with a display order of zero will be the primary image for a product', default=0)),
+                ('date_created', models.DateTimeField(verbose_name='Date Created', auto_now_add=True)),
                 ('product', models.ForeignKey(verbose_name='Product', to='catalogue.Product')),
             ],
             options={
-                'ordering': [b'display_order'],
-                'abstract': False,
                 'verbose_name': 'Product image',
                 'verbose_name_plural': 'Product images',
+                'ordering': ['display_order'],
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.AlterUniqueTogether(
             name='productimage',
-            unique_together=set([(b'product', b'display_order')]),
+            unique_together=set([('product', 'display_order')]),
         ),
         migrations.CreateModel(
             name='ProductRecommendation',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('ranking', models.PositiveSmallIntegerField(default=0, help_text='Determines order of the products. A product with a higher value will appear before one with a lower ranking.', verbose_name='Ranking')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('ranking', models.PositiveSmallIntegerField(verbose_name='Ranking', help_text='Determines order of the products. A product with a higher value will appear before one with a lower ranking.', default=0)),
             ],
             options={
-                'ordering': [b'primary', b'-ranking'],
-                'abstract': False,
                 'verbose_name': 'Product recommendation',
                 'verbose_name_plural': 'Product recomendations',
+                'ordering': ['primary', '-ranking'],
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.AddField(
             model_name='product',
             name='recommended_products',
-            field=models.ManyToManyField(to='catalogue.Product', verbose_name='Recommended Products', through='catalogue.ProductRecommendation', blank=True),
+            field=models.ManyToManyField(verbose_name='Recommended Products', through='catalogue.ProductRecommendation', blank=True, to='catalogue.Product'),
             preserve_default=True,
         ),
         migrations.AddField(
@@ -286,6 +286,6 @@ class Migration(migrations.Migration):
         ),
         migrations.AlterUniqueTogether(
             name='productrecommendation',
-            unique_together=set([(b'primary', b'recommendation')]),
+            unique_together=set([('primary', 'recommendation')]),
         ),
     ]

oscar/apps/catalogue/reviews/abstract_models.py

@@ -3,6 +3,7 @@ from django.core.exceptions import ValidationError
 from django.core.urlresolvers import reverse
 from django.db import models
 from django.db.models import Sum, Count
+from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _, pgettext_lazy
 
 from oscar.apps.catalogue.reviews.managers import ApprovedReviewsManager
@@ -10,6 +11,7 @@ from oscar.core.compat import AUTH_USER_MODEL
 from oscar.core import validators
 
 
+@python_2_unicode_compatible
 class AbstractProductReview(models.Model):
     """
     A review of a product
@@ -43,7 +45,7 @@ class AbstractProductReview(models.Model):
     email = models.EmailField(_("Email"), blank=True)
     homepage = models.URLField(_("URL"), blank=True)
 
-    FOR_MODERATION, APPROVED, REJECTED = list(range(0, 3))
+    FOR_MODERATION, APPROVED, REJECTED = 0, 1, 2
     STATUS_CHOICES = (
         (FOR_MODERATION, _("Requires moderation")),
         (APPROVED, _("Approved")),
@@ -83,7 +85,7 @@ class AbstractProductReview(models.Model):
         }
         return reverse('catalogue:reviews-detail', kwargs=kwargs)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.title
 
     def clean(self):
@@ -175,6 +177,7 @@ class AbstractProductReview(models.Model):
         return True, ""
 
 
+@python_2_unicode_compatible
 class AbstractVote(models.Model):
     """
     Records user ratings as yes/no vote.
@@ -200,7 +203,7 @@ class AbstractVote(models.Model):
         verbose_name = _('Vote')
         verbose_name_plural = _('Votes')
 
-    def __unicode__(self):
+    def __str__(self):
         return u"%s vote for %s" % (self.delta, self.review)
 
     def clean(self):

oscar/apps/catalogue/reviews/migrations/0001_initial.py

@@ -18,51 +18,51 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='ProductReview',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
                 ('score', models.SmallIntegerField(verbose_name='Score', choices=[(0, 0), (1, 1), (2, 2), (3, 3), (4, 4), (5, 5)])),
-                ('title', models.CharField(max_length=255, verbose_name='Title', validators=[oscar.core.validators.non_whitespace])),
+                ('title', models.CharField(verbose_name='Title', validators=[oscar.core.validators.non_whitespace], max_length=255)),
                 ('body', models.TextField(verbose_name='Body')),
-                ('name', models.CharField(max_length=255, verbose_name='Name', blank=True)),
-                ('email', models.EmailField(max_length=75, verbose_name='Email', blank=True)),
+                ('name', models.CharField(verbose_name='Name', blank=True, max_length=255)),
+                ('email', models.EmailField(verbose_name='Email', blank=True, max_length=75)),
                 ('homepage', models.URLField(verbose_name='URL', blank=True)),
-                ('status', models.SmallIntegerField(default=1, verbose_name='Status', choices=[(0, 'Requires moderation'), (1, 'Approved'), (2, 'Rejected')])),
-                ('total_votes', models.IntegerField(default=0, verbose_name='Total Votes')),
-                ('delta_votes', models.IntegerField(default=0, verbose_name='Delta Votes', db_index=True)),
+                ('status', models.SmallIntegerField(verbose_name='Status', choices=[(0, 'Requires moderation'), (1, 'Approved'), (2, 'Rejected')], default=1)),
+                ('total_votes', models.IntegerField(verbose_name='Total Votes', default=0)),
+                ('delta_votes', models.IntegerField(verbose_name='Delta Votes', db_index=True, default=0)),
                 ('date_created', models.DateTimeField(auto_now_add=True)),
-                ('product', models.ForeignKey(to='catalogue.Product', on_delete=django.db.models.deletion.SET_NULL, null=True)),
+                ('product', models.ForeignKey(on_delete=django.db.models.deletion.SET_NULL, to='catalogue.Product', null=True)),
                 ('user', models.ForeignKey(blank=True, to=settings.AUTH_USER_MODEL, null=True)),
             ],
             options={
-                'ordering': [b'-delta_votes', b'id'],
-                'abstract': False,
                 'verbose_name': 'Product review',
                 'verbose_name_plural': 'Product reviews',
+                'ordering': ['-delta_votes', 'id'],
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.AlterUniqueTogether(
             name='productreview',
-            unique_together=set([(b'product', b'user')]),
+            unique_together=set([('product', 'user')]),
         ),
         migrations.CreateModel(
             name='Vote',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
                 ('delta', models.SmallIntegerField(verbose_name='Delta', choices=[(1, 'Up'), (-1, 'Down')])),
                 ('date_created', models.DateTimeField(auto_now_add=True)),
                 ('review', models.ForeignKey(to='reviews.ProductReview')),
                 ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
             ],
             options={
-                'ordering': [b'-date_created'],
-                'abstract': False,
                 'verbose_name': 'Vote',
                 'verbose_name_plural': 'Votes',
+                'ordering': ['-date_created'],
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.AlterUniqueTogether(
             name='vote',
-            unique_together=set([(b'user', b'review')]),
+            unique_together=set([('user', 'review')]),
         ),
     ]

oscar/apps/catalogue/reviews/views.py

@@ -1,11 +1,11 @@
-from django.http import HttpResponseRedirect
-from django.shortcuts import get_object_or_404
+from django.shortcuts import get_object_or_404, redirect
 from django.views.generic import ListView, DetailView, CreateView, View
 from django.contrib import messages
 from oscar.core.loading import get_model
 from django.utils.translation import ugettext_lazy as _
 
 from oscar.core.loading import get_classes
+from oscar.core.utils import redirect_to_referrer
 from oscar.apps.catalogue.reviews.signals import review_added
 
 ProductReviewForm, VoteForm = get_classes(
@@ -32,7 +32,7 @@ class CreateProductReview(CreateView):
             else:
                 message = _("You can't leave a review for this product.")
             messages.warning(self.request, message)
-            return HttpResponseRedirect(self.product.get_absolute_url())
+            return redirect(self.product.get_absolute_url())
 
         return super(CreateProductReview, self).dispatch(
             request, *args, **kwargs)
@@ -98,8 +98,7 @@ class AddVoteView(View):
             for error_list in form.errors.values():
                 for msg in error_list:
                     messages.error(request, msg)
-        return HttpResponseRedirect(
-            request.META.get('HTTP_REFERER', product.get_absolute_url()))
+        return redirect_to_referrer(request.META, product.get_absolute_url())
 
 
 class ProductReviewList(ListView):

oscar/apps/checkout/mixins.py

@@ -11,7 +11,6 @@ OrderCreator = get_class('order.utils', 'OrderCreator')
 Dispatcher = get_class('customer.utils', 'Dispatcher')
 CheckoutSessionMixin = get_class('checkout.session', 'CheckoutSessionMixin')
 ShippingAddress = get_model('order', 'ShippingAddress')
-CommunicationEvent = get_model('order', 'CommunicationEvent')
 OrderNumberGenerator = get_class('order.utils', 'OrderNumberGenerator')
 PaymentEventType = get_model('order', 'PaymentEventType')
 PaymentEvent = get_model('order', 'PaymentEvent')
@@ -235,7 +234,7 @@ class OrderPlacementMixin(CheckoutSessionMixin):
         order is submitted.
         """
         # Send confirmation message (normally an email)
-        self.send_confirmation_message(order)
+        self.send_confirmation_message(order, self.communication_type_code)
 
         # Flush all session data
         self.checkout_session.flush()
@@ -255,27 +254,8 @@ class OrderPlacementMixin(CheckoutSessionMixin):
     def get_success_url(self):
         return reverse('checkout:thank-you')
 
-    def send_confirmation_message(self, order, **kwargs):
-        code = self.communication_type_code
-        ctx = {'user': self.request.user,
-               'order': order,
-               'site': get_current_site(self.request),
-               'lines': order.lines.all()}
-
-        if not self.request.user.is_authenticated():
-            # Attempt to add the anon order status URL to the email template
-            # ctx.
-            try:
-                path = reverse('customer:anon-order',
-                               kwargs={'order_number': order.number,
-                                       'hash': order.verification_hash()})
-            except NoReverseMatch:
-                # We don't care that much if we can't resolve the URL
-                pass
-            else:
-                site = Site.objects.get_current()
-                ctx['status_url'] = 'http://%s%s' % (site.domain, path)
-
+    def send_confirmation_message(self, order, code, **kwargs):
+        ctx = self.get_message_context(order)
         try:
             event_type = CommunicationEventType.objects.get(code=code)
         except CommunicationEventType.DoesNotExist:
@@ -286,9 +266,6 @@ class OrderPlacementMixin(CheckoutSessionMixin):
             messages = CommunicationEventType.objects.get_and_render(code, ctx)
             event_type = None
         else:
-            # Create CommunicationEvent
-            CommunicationEvent._default_manager.create(
-                order=order, event_type=event_type)
             messages = event_type.get_messages(ctx)
 
         if messages and messages['body']:
@@ -300,6 +277,29 @@ class OrderPlacementMixin(CheckoutSessionMixin):
             logger.warning("Order #%s - no %s communication event type",
                            order.number, code)
 
+    def get_message_context(self, order):
+        ctx = {
+            'user': self.request.user,
+            'order': order,
+            'site': get_current_site(self.request),
+            'lines': order.lines.all()
+        }
+
+        if not self.request.user.is_authenticated():
+            # Attempt to add the anon order status URL to the email template
+            # ctx.
+            try:
+                path = reverse('customer:anon-order',
+                               kwargs={'order_number': order.number,
+                                       'hash': order.verification_hash()})
+            except NoReverseMatch:
+                # We don't care that much if we can't resolve the URL
+                pass
+            else:
+                site = Site.objects.get_current()
+                ctx['status_url'] = 'http://%s%s' % (site.domain, path)
+        return ctx
+
     # Basket helpers
     # --------------
 

oscar/apps/checkout/views.py

@@ -1,4 +1,4 @@
-import six
+from django.utils import six
 import logging
 
 from django import http

oscar/apps/customer/abstract_models.py

@@ -1,4 +1,4 @@
-import six
+from django.utils import six
 import hashlib
 import random
 
@@ -9,6 +9,7 @@ from django.db import models
 from django.template import Template, Context, TemplateDoesNotExist
 from django.template.loader import get_template
 from django.utils import timezone
+from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 
 from oscar.apps.customer.managers import CommunicationTypeManager
@@ -104,6 +105,7 @@ class AbstractUser(auth_models.AbstractBaseUser,
         self._migrate_alerts_to_user()
 
 
+@python_2_unicode_compatible
 class AbstractEmail(models.Model):
     """
     This is a record of all emails sent to a customer.
@@ -122,11 +124,12 @@ class AbstractEmail(models.Model):
         verbose_name = _('Email')
         verbose_name_plural = _('Emails')
 
-    def __unicode__(self):
-        return _("Email to %(user)s with subject '%(subject)s'") % {
+    def __str__(self):
+        return _(u"Email to %(user)s with subject '%(subject)s'") % {
             'user': self.user.get_username(), 'subject': self.subject}
 
 
+@python_2_unicode_compatible
 class AbstractCommunicationEventType(models.Model):
     """
     A 'type' of communication.  Like a order confirmation email.
@@ -146,10 +149,17 @@ class AbstractCommunicationEventType(models.Model):
         help_text=_("This is just used for organisational purposes"))
 
     # We allow communication types to be categorised
-    ORDER_RELATED = _('Order related')
-    USER_RELATED = _('User related')
-    category = models.CharField(_('Category'), max_length=255,
-                                default=ORDER_RELATED)
+    # For backwards-compatibility, the choice values are quite verbose
+    ORDER_RELATED = 'Order related'
+    USER_RELATED = 'User related'
+    CATEGORY_CHOICES = (
+        (ORDER_RELATED, _('Order related')),
+        (USER_RELATED, _('User related'))
+    )
+
+    category = models.CharField(
+        _('Category'), max_length=255, default=ORDER_RELATED,
+        choices=CATEGORY_CHOICES)
 
     # Template content for emails
     # NOTE: There's an intentional distinction between None and ''. None
@@ -228,7 +238,7 @@ class AbstractCommunicationEventType(models.Model):
 
         return messages
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
     def is_order_related(self):
@@ -238,6 +248,7 @@ class AbstractCommunicationEventType(models.Model):
         return self.category == self.USER_RELATED
 
 
+@python_2_unicode_compatible
 class AbstractNotification(models.Model):
     recipient = models.ForeignKey(AUTH_USER_MODEL,
                                   related_name='notifications', db_index=True)
@@ -270,7 +281,7 @@ class AbstractNotification(models.Model):
         verbose_name = _('Notification')
         verbose_name_plural = _('Notifications')
 
-    def __unicode__(self):
+    def __str__(self):
         return self.subject
 
     def archive(self):

oscar/apps/customer/auth_backends.py

@@ -1,7 +1,9 @@
+import warnings
+
 from django.contrib.auth.backends import ModelBackend
 from django.core.exceptions import ImproperlyConfigured
-from oscar.apps.customer.utils import normalise_email
 
+from oscar.apps.customer.utils import normalise_email
 from oscar.core.compat import get_user_model
 
 User = get_user_model()
@@ -53,5 +55,14 @@ class EmailBackend(ModelBackend):
                 "password")
         return None
 
-# Deprecated in Oscar 0.8: Spelling
-Emailbackend = EmailBackend
+
+# Deprecated since Oscar 0.8 because of the spelling.
+class Emailbackend(EmailBackend):
+
+    def __init__(self):
+        warnings.warn(
+            "Oscar's auth backend EmailBackend has been renamed in Oscar 0.8 "
+            " and you're using the old name of Emailbackend. Please rename "
+            " all references; most likely in the AUTH_BACKENDS setting.",
+            DeprecationWarning)
+        super(Emailbackend, self).__init__()

oscar/apps/customer/config.py

@@ -8,5 +8,5 @@ class CustomerConfig(AppConfig):
     verbose_name = _('Customer')
 
     def ready(self):
-        from oscar.apps.customer import history  # noqa
+        from . import receivers  # noqa
         from .alerts import receivers  # noqa

oscar/apps/customer/forms.py

@@ -1,6 +1,5 @@
 import string
 import random
-from six.moves.urllib import parse
 
 from django import forms
 from django.conf import settings
@@ -8,6 +7,7 @@ from django.contrib.auth import forms as auth_forms
 from django.contrib.auth.forms import AuthenticationForm
 from django.contrib.sites.models import get_current_site
 from django.core.exceptions import ValidationError
+from django.utils.http import is_safe_url
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import pgettext_lazy
 
@@ -107,11 +107,8 @@ class EmailAuthenticationForm(AuthenticationForm):
 
     def clean_redirect_url(self):
         url = self.cleaned_data['redirect_url'].strip()
-        if url:
-            # Ensure URL is not to a different host
-            host = parse.urlparse(url)[1]
-            if host and host == self.host:
-                return url
+        if url and is_safe_url(url):
+            return url
 
 
 class ConfirmPasswordForm(forms.Form):
@@ -172,12 +169,9 @@ class EmailUserCreationForm(forms.ModelForm):
 
     def clean_redirect_url(self):
         url = self.cleaned_data['redirect_url'].strip()
-        if not url:
-            return settings.LOGIN_REDIRECT_URL
-        host = parse.urlparse(url)[1]
-        if host and self.host and host != self.host:
-            return settings.LOGIN_REDIRECT_URL
-        return url
+        if url and is_safe_url(url):
+            return url
+        return settings.LOGIN_REDIRECT_URL
 
     def save(self, commit=True):
         user = super(EmailUserCreationForm, self).save(commit=False)
@@ -310,7 +304,7 @@ if Profile:
             super(UserAndProfileForm, self).__init__(*args, **kwargs)
 
             # Get profile field names to help with ordering later
-            profile_field_names = self.fields.keys()
+            profile_field_names = list(self.fields.keys())
 
             # Get user field names (we look for core user fields first)
             core_field_names = set([f.name for f in User._meta.fields])

oscar/apps/customer/history.py

@@ -2,11 +2,9 @@ import json
 
 from django.conf import settings
 from oscar.core.loading import get_model
-from django.dispatch import receiver
 
 from oscar.core.loading import get_class
 
-Product = get_model('catalogue', 'Product')
 product_viewed = get_class('catalogue.signals', 'product_viewed')
 
 
@@ -16,6 +14,11 @@ def get(request):
     """
     ids = extract(request)
 
+    # Needs to live in local scope because receivers in this module get
+    # registered during model initialisation
+    # TODO Move this back to global scope once Django < 1.7 support is removed
+    Product = get_model('catalogue', 'Product')
+
     # Reordering as the ID order gets messed up in the query
     product_dict = Product.browsable.in_bulk(ids)
     ids.reverse()
@@ -67,15 +70,3 @@ def update(product, request, response):
         json.dumps(updated_ids),
         max_age=settings.OSCAR_RECENTLY_VIEWED_COOKIE_LIFETIME,
         httponly=True)
-
-
-# Receivers
-
-@receiver(product_viewed)
-def receive_product_view(sender, product, user, request, response, **kwargs):
-    """
-    Receiver to handle viewing single product pages
-
-    Requires the request and response objects due to dependence on cookies
-    """
-    return update(product, request, response)

oscar/apps/customer/migrations/0001_initial.py

@@ -17,80 +17,80 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='CommunicationEventType',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('code', oscar.models.fields.autoslugfield.AutoSlugField(populate_from=b'name', editable=False, max_length=128, separator='_', blank=True, help_text='Code used for looking up this event programmatically', unique=True, verbose_name='Code')),
-                ('name', models.CharField(help_text='This is just used for organisational purposes', max_length=255, verbose_name='Name')),
-                ('category', models.CharField(default='Order related', max_length=255, verbose_name='Category')),
-                ('email_subject_template', models.CharField(max_length=255, null=True, verbose_name='Email Subject Template', blank=True)),
-                ('email_body_template', models.TextField(null=True, verbose_name='Email Body Template', blank=True)),
-                ('email_body_html_template', models.TextField(help_text='HTML template', null=True, verbose_name='Email Body HTML Template', blank=True)),
-                ('sms_template', models.CharField(help_text='SMS template', max_length=170, null=True, verbose_name='SMS Template', blank=True)),
-                ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Date Created')),
-                ('date_updated', models.DateTimeField(auto_now=True, verbose_name='Date Updated')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('code', oscar.models.fields.autoslugfield.AutoSlugField(editable=False, verbose_name='Code', blank=True, max_length=128, separator='_', populate_from='name', help_text='Code used for looking up this event programmatically', unique=True)),
+                ('name', models.CharField(verbose_name='Name', help_text='This is just used for organisational purposes', max_length=255)),
+                ('category', models.CharField(verbose_name='Category', default='Order related', max_length=255)),
+                ('email_subject_template', models.CharField(verbose_name='Email Subject Template', blank=True, null=True, max_length=255)),
+                ('email_body_template', models.TextField(verbose_name='Email Body Template', blank=True, null=True)),
+                ('email_body_html_template', models.TextField(verbose_name='Email Body HTML Template', blank=True, help_text='HTML template', null=True)),
+                ('sms_template', models.CharField(verbose_name='SMS Template', blank=True, help_text='SMS template', null=True, max_length=170)),
+                ('date_created', models.DateTimeField(verbose_name='Date Created', auto_now_add=True)),
+                ('date_updated', models.DateTimeField(verbose_name='Date Updated', auto_now=True)),
             ],
             options={
-                'abstract': False,
                 'verbose_name': 'Communication event type',
                 'verbose_name_plural': 'Communication event types',
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='Email',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('subject', models.TextField(max_length=255, verbose_name='Subject')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('subject', models.TextField(verbose_name='Subject', max_length=255)),
                 ('body_text', models.TextField(verbose_name='Body Text')),
                 ('body_html', models.TextField(verbose_name='Body HTML', blank=True)),
-                ('date_sent', models.DateTimeField(auto_now_add=True, verbose_name='Date Sent')),
+                ('date_sent', models.DateTimeField(verbose_name='Date Sent', auto_now_add=True)),
                 ('user', models.ForeignKey(verbose_name='User', to=settings.AUTH_USER_MODEL)),
             ],
             options={
-                'abstract': False,
                 'verbose_name': 'Email',
                 'verbose_name_plural': 'Emails',
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='Notification',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
                 ('subject', models.CharField(max_length=255)),
                 ('body', models.TextField()),
-                ('category', models.CharField(max_length=255, blank=True)),
-                ('location', models.CharField(default=b'Inbox', max_length=32, choices=[(b'Inbox', 'Inbox'), (b'Archive', 'Archive')])),
+                ('category', models.CharField(blank=True, max_length=255)),
+                ('location', models.CharField(choices=[('Inbox', 'Inbox'), ('Archive', 'Archive')], default='Inbox', max_length=32)),
                 ('date_sent', models.DateTimeField(auto_now_add=True)),
-                ('date_read', models.DateTimeField(null=True, blank=True)),
+                ('date_read', models.DateTimeField(blank=True, null=True)),
                 ('recipient', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
                 ('sender', models.ForeignKey(to=settings.AUTH_USER_MODEL, null=True)),
             ],
             options={
-                'ordering': (b'-date_sent',),
-                'abstract': False,
                 'verbose_name': 'Notification',
                 'verbose_name_plural': 'Notifications',
+                'ordering': ('-date_sent',),
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='ProductAlert',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('email', models.EmailField(db_index=True, max_length=75, verbose_name='Email', blank=True)),
-                ('key', models.CharField(db_index=True, max_length=128, verbose_name='Key', blank=True)),
-                ('status', models.CharField(default=b'Active', max_length=20, verbose_name='Status', choices=[(b'Unconfirmed', 'Not yet confirmed'), (b'Active', 'Active'), (b'Cancelled', 'Cancelled'), (b'Closed', 'Closed')])),
-                ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Date created')),
-                ('date_confirmed', models.DateTimeField(null=True, verbose_name='Date confirmed', blank=True)),
-                ('date_cancelled', models.DateTimeField(null=True, verbose_name='Date cancelled', blank=True)),
-                ('date_closed', models.DateTimeField(null=True, verbose_name='Date closed', blank=True)),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('email', models.EmailField(verbose_name='Email', blank=True, db_index=True, max_length=75)),
+                ('key', models.CharField(verbose_name='Key', blank=True, db_index=True, max_length=128)),
+                ('status', models.CharField(verbose_name='Status', choices=[('Unconfirmed', 'Not yet confirmed'), ('Active', 'Active'), ('Cancelled', 'Cancelled'), ('Closed', 'Closed')], default='Active', max_length=20)),
+                ('date_created', models.DateTimeField(verbose_name='Date created', auto_now_add=True)),
+                ('date_confirmed', models.DateTimeField(verbose_name='Date confirmed', blank=True, null=True)),
+                ('date_cancelled', models.DateTimeField(verbose_name='Date cancelled', blank=True, null=True)),
+                ('date_closed', models.DateTimeField(verbose_name='Date closed', blank=True, null=True)),
                 ('product', models.ForeignKey(to='catalogue.Product')),
                 ('user', models.ForeignKey(verbose_name='User', blank=True, to=settings.AUTH_USER_MODEL, null=True)),
             ],
             options={
-                'abstract': False,
                 'verbose_name': 'Product alert',
                 'verbose_name_plural': 'Product alerts',
+                'abstract': False,
             },
             bases=(models.Model,),
         ),

oscar/apps/customer/migrations/0002_auto_20140808_1205.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('customer', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='communicationeventtype',
+            name='category',
+            field=models.CharField(choices=[('Order related', 'Order related'), ('User related', 'User related')], verbose_name='Category', max_length=255, default='Order related'),
+        ),
+    ]

oscar/apps/customer/models.py

@@ -26,5 +26,5 @@ if not is_model_registered('customer', 'ProductAlert'):
 
 
 if django.VERSION < (1, 7):
-    from oscar.apps.customer.history import *  # noqa
+    from .receivers import *  # noqa
     from .alerts import receivers  # noqa

oscar/apps/customer/notifications/views.py

@@ -1,12 +1,11 @@
-from django.core.urlresolvers import reverse
 from django.utils.html import strip_tags
 from django.utils.translation import ugettext_lazy as _, ungettext
 from django.utils.timezone import now
 from django.contrib import messages
-from django import http
 from django.views import generic
-from oscar.core.loading import get_model
 
+from oscar.core.loading import get_model
+from oscar.core.utils import redirect_to_referrer
 from oscar.apps.customer.mixins import PageTitleMixin
 from oscar.views.generic import BulkEditMixin
 
@@ -82,9 +81,8 @@ class UpdateView(BulkEditMixin, generic.RedirectView):
             recipient=self.request.user).in_bulk(ids)
 
     def get_success_response(self):
-        default = reverse('customer:notifications-inbox')
-        return http.HttpResponseRedirect(
-            self.request.META.get('HTTP_REFERER', default))
+        return redirect_to_referrer(
+            self.request.META, 'customer:notifications-inbox')
 
     def archive(self, request, notifications):
         for notification in notifications:

oscar/apps/customer/receivers.py

@@ -0,0 +1,17 @@
+from django.dispatch import receiver
+
+from oscar.core.loading import get_class
+
+from . import history
+
+product_viewed = get_class('catalogue.signals', 'product_viewed')
+
+
+@receiver(product_viewed)
+def receive_product_view(sender, product, user, request, response, **kwargs):
+    """
+    Receiver to handle viewing single product pages
+
+    Requires the request and response objects due to dependence on cookies
+    """
+    return history.update(product, request, response)

oscar/apps/customer/utils.py

@@ -43,10 +43,10 @@ class Dispatcher(object):
         else:
             self.dispatch_user_messages(order.user, messages)
 
-        # Create order comms event for audit
-        if event_type:
-            CommunicationEvent._default_manager.create(order=order,
-                                                       event_type=event_type)
+        # Create order communications event for audit
+        if event_type is not None:
+            CommunicationEvent._default_manager.create(
+                order=order, event_type=event_type)
 
     def dispatch_user_messages(self, user, messages):
         """

oscar/apps/customer/views.py

@@ -9,10 +9,11 @@ from django.contrib.auth import logout as auth_logout, login as auth_login
 from django.contrib.sites.models import get_current_site
 from django.conf import settings
 
-from oscar.core.loading import get_model
+from oscar.core.utils import safe_referrer
 from oscar.views.generic import PostActionMixin
 from oscar.apps.customer.utils import get_password_reset_url
-from oscar.core.loading import get_class, get_profile_class, get_classes
+from oscar.core.loading import (
+    get_class, get_profile_class, get_classes, get_model)
 from oscar.core.compat import get_user_model
 from . import signals
 
@@ -59,7 +60,7 @@ class AccountRegistrationView(RegisterUserMixin, generic.FormView):
 
     def get(self, request, *args, **kwargs):
         if request.user.is_authenticated():
-            return http.HttpResponseRedirect(settings.LOGIN_REDIRECT_URL)
+            return redirect(settings.LOGIN_REDIRECT_URL)
         return super(AccountRegistrationView, self).get(
             request, *args, **kwargs)
 
@@ -78,13 +79,12 @@ class AccountRegistrationView(RegisterUserMixin, generic.FormView):
     def get_context_data(self, *args, **kwargs):
         ctx = super(AccountRegistrationView, self).get_context_data(
             *args, **kwargs)
-        ctx['cancel_url'] = self.request.META.get('HTTP_REFERER', None)
+        ctx['cancel_url'] = safe_referrer(self.request.META, '')
         return ctx
 
     def form_valid(self, form):
         self.register_user(form)
-        return http.HttpResponseRedirect(
-            form.cleaned_data['redirect_url'])
+        return redirect(form.cleaned_data['redirect_url'])
 
 
 class AccountAuthView(RegisterUserMixin, generic.TemplateView):
@@ -100,7 +100,7 @@ class AccountAuthView(RegisterUserMixin, generic.TemplateView):
 
     def get(self, request, *args, **kwargs):
         if request.user.is_authenticated():
-            return http.HttpResponseRedirect(settings.LOGIN_REDIRECT_URL)
+            return redirect(settings.LOGIN_REDIRECT_URL)
         return super(AccountAuthView, self).get(
             request, *args, **kwargs)
 
@@ -160,8 +160,7 @@ class AccountAuthView(RegisterUserMixin, generic.TemplateView):
             msg = self.get_login_success_message(form)
             messages.success(self.request, msg)
 
-            url = self.get_login_success_url(form)
-            return http.HttpResponseRedirect(url)
+            return redirect(self.get_login_success_url(form))
 
         ctx = self.get_context_data(login_form=form)
         return self.render_to_response(ctx)
@@ -209,8 +208,7 @@ class AccountAuthView(RegisterUserMixin, generic.TemplateView):
             msg = self.get_registration_success_message(form)
             messages.success(self.request, msg)
 
-            url = self.get_registration_success_url(form)
-            return http.HttpResponseRedirect(url)
+            return redirect(self.get_registration_success_url(form))
 
         ctx = self.get_context_data(registration_form=form)
         return self.render_to_response(ctx)
@@ -354,7 +352,7 @@ class ProfileDeleteView(PageTitleMixin, generic.FormView):
         messages.success(
             self.request,
             _("Your profile has now been deleted. Thanks for using the site."))
-        return http.HttpResponseRedirect(self.get_success_url())
+        return redirect(self.get_success_url())
 
 
 class ChangePasswordView(PageTitleMixin, generic.FormView):
@@ -451,9 +449,8 @@ class OrderHistoryView(PageTitleMixin, generic.ListView):
                 except Order.DoesNotExist:
                     pass
                 else:
-                    return http.HttpResponseRedirect(
-                        reverse('customer:order',
-                                kwargs={'order_number': order.number}))
+                    return redirect(
+                        'customer:order', order_number=order.number)
         else:
             self.form = self.form_class()
         return super(OrderHistoryView, self).get(request, *args, **kwargs)
@@ -553,9 +550,8 @@ class OrderLineView(PostActionMixin, generic.DetailView):
         return order.lines.get(id=self.kwargs['line_id'])
 
     def do_reorder(self, line):
-        self.response = http.HttpResponseRedirect(
-            reverse('customer:order',
-                    args=(int(self.kwargs['order_number']),)))
+        self.response = redirect(
+            'customer:order', int(self.kwargs['order_number']))
         basket = self.request.basket
 
         line_available_to_reorder, reason = line.is_available_to_reorder(
@@ -567,7 +563,7 @@ class OrderLineView(PostActionMixin, generic.DetailView):
 
         # We need to pass response to the get_or_create... method
         # as a new basket might need to be created
-        self.response = http.HttpResponseRedirect(reverse('basket:summary'))
+        self.response = redirect('basket:summary')
 
         # Convert line attributes into basket options
         options = []

oscar/apps/customer/wishlists/views.py

@@ -3,15 +3,15 @@ from django.contrib import messages
 from django.core.exceptions import (
     ObjectDoesNotExist, MultipleObjectsReturned, PermissionDenied)
 from django.core.urlresolvers import reverse
-from oscar.core.loading import get_model
-from django.http import Http404, HttpResponseRedirect
-from django.shortcuts import get_object_or_404
+from django.http import Http404
+from django.shortcuts import get_object_or_404, redirect
 from django.views.generic import (ListView, CreateView, UpdateView, DeleteView,
                                   View, FormView)
 from django.utils.translation import ugettext_lazy as _
 
 from oscar.apps.customer.mixins import PageTitleMixin
-from oscar.core.loading import get_classes
+from oscar.core.loading import get_classes, get_model
+from oscar.core.utils import redirect_to_referrer, safe_referrer
 
 WishList = get_model('wishlists', 'WishList')
 Line = get_model('wishlists', 'Line')
@@ -76,8 +76,7 @@ class WishListDetailView(PageTitleMixin, FormView):
             else:
                 subform.save()
         messages.success(self.request, _('Quantities updated.'))
-        return HttpResponseRedirect(reverse('customer:wishlists-detail',
-                                            kwargs={'key': self.object.key}))
+        return redirect('customer:wishlists-detail', key=self.object.key)
 
 
 class WishListCreateView(PageTitleMixin, CreateView):
@@ -101,7 +100,7 @@ class WishListCreateView(PageTitleMixin, CreateView):
             except ObjectDoesNotExist:
                 messages.error(
                     request, _("The requested product no longer exists"))
-                return HttpResponseRedirect(reverse('wishlists-create'))
+                return redirect('wishlists-create')
         return super(WishListCreateView, self).dispatch(
             request, *args, **kwargs)
 
@@ -125,7 +124,7 @@ class WishListCreateView(PageTitleMixin, CreateView):
         else:
             msg = _("Your wishlist has been created")
         messages.success(self.request, msg)
-        return HttpResponseRedirect(wishlist.get_absolute_url())
+        return redirect(wishlist.get_absolute_url())
 
 
 class WishListCreateWithProductView(View):
@@ -147,8 +146,7 @@ class WishListCreateWithProductView(View):
         messages.success(
             request, _("%(title)s has been added to your wishlist") % {
                 'title': product.get_title()})
-        return HttpResponseRedirect(request.META.get(
-            'HTTP_REFERER', wishlist.get_absolute_url()))
+        return redirect_to_referrer(request.META, wishlist.get_absolute_url())
 
 
 class WishListUpdateView(PageTitleMixin, UpdateView):
@@ -237,9 +235,8 @@ class WishListAddProduct(View):
         self.wishlist.add(self.product)
         msg = _("'%s' was added to your wish list.") % self.product.get_title()
         messages.success(self.request, msg)
-        return HttpResponseRedirect(
-            self.request.META.get('HTTP_REFERER',
-                                  self.product.get_absolute_url()))
+        return redirect_to_referrer(
+            self.request.META, self.product.get_absolute_url())
 
 
 class LineMixin(object):
@@ -292,8 +289,9 @@ class WishListRemoveProduct(LineMixin, PageTitleMixin, DeleteView):
 
         # 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 and self.product.get_absolute_url() in referrer:
+        referrer = safe_referrer(self.request.META, '')
+        if (referrer and self.product and
+                self.product.get_absolute_url() in referrer):
             return referrer
         else:
             return reverse(
@@ -324,5 +322,4 @@ class WishListMoveProductToAnotherWishList(LineMixin, View):
 
         default_url = reverse(
             'customer:wishlists-detail', kwargs={'key': self.wishlist.key})
-        return HttpResponseRedirect(self.request.META.get(
-            'HTTP_REFERER', default_url))
+        return redirect_to_referrer(self.request.META, default_url)

oscar/apps/dashboard/catalogue/tables.py

@@ -0,0 +1,58 @@
+from django.utils.safestring import mark_safe
+from django.utils.translation import ugettext_lazy as _
+
+from django_tables2 import Table, Column, LinkColumn, TemplateColumn, A
+
+from oscar.core.loading import get_class, get_model
+
+DashboardTable = get_class('dashboard.tables', 'DashboardTable')
+Product = get_model('catalogue', 'Product')
+Category = get_model('catalogue', 'Category')
+
+
+class ProductTable(Table):
+    title = TemplateColumn(
+        template_name='dashboard/catalogue/product_row_title.html',
+        order_by='title', accessor=A('get_title'))
+    image = TemplateColumn(
+        template_name='dashboard/catalogue/product_row_image.html',
+        orderable=False)
+    product_class = Column(verbose_name=_("Type"),
+                           accessor=A('get_product_class.name'),
+                           order_by=('product_class__name'))
+    parent = LinkColumn('dashboard:catalogue-product',
+                        verbose_name=_("Parent"), args=[A('parent.pk')],
+                        accessor=A('parent.title'))
+    children = Column(accessor=A('children.count'), orderable=False)
+    stock_records = Column(accessor=A('stockrecords.count'), orderable=False)
+    actions = TemplateColumn(
+        template_name='dashboard/catalogue/product_row_actions.html',
+        orderable=False)
+
+    class Meta(DashboardTable.Meta):
+        model = Product
+        fields = ('upc', 'date_created')
+        sequence = ('title', 'upc', 'image', 'product_class',
+                    'parent', 'children', 'stock_records', '...', 'date_created', 'actions')
+        order_by = '-date_created'
+
+
+class CategoryTable(Table):
+    name = LinkColumn('dashboard:catalogue-category-update', args=[A('pk')])
+    description = TemplateColumn(
+        template_code='{{ record.description|default:""|striptags'
+                      '|cut:" "|truncatewords:6 }}')
+    # mark_safe is needed because of
+    # https://github.com/bradleyayers/django-tables2/issues/187
+    num_children = LinkColumn(
+        'dashboard:catalogue-category-detail-list', args=[A('pk')],
+        verbose_name=mark_safe(_('Number of child categories')),
+        accessor='get_num_children',
+        orderable=False)
+    actions = TemplateColumn(
+        template_name='dashboard/catalogue/category_row_actions.html',
+        orderable=False)
+
+    class Meta(DashboardTable.Meta):
+        model = Category
+        fields = ('name', 'description')

oscar/apps/dashboard/catalogue/views.py

@@ -1,16 +1,16 @@
-from django.shortcuts import get_object_or_404, redirect
-import six
-
 from django.views import generic
 from django.db.models import Q
 from django.http import HttpResponseRedirect
 from django.contrib import messages
 from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext_lazy as _
+from django.shortcuts import get_object_or_404, redirect
 from django.template.loader import render_to_string
 
 from oscar.core.loading import get_classes, get_model
-from oscar.views import sort_queryset
+
+from django_tables2 import SingleTableMixin
+
 from oscar.views.generic import ObjectLookupView
 
 (ProductForm,
@@ -34,6 +34,9 @@ from oscar.views.generic import ObjectLookupView
                    'ProductCategoryFormSet',
                    'ProductImageFormSet',
                    'ProductRecommendationFormSet'))
+ProductTable, CategoryTable \
+    = get_classes('dashboard.catalogue.tables',
+                  ('ProductTable', 'CategoryTable'))
 Product = get_model('catalogue', 'Product')
 Category = get_model('catalogue', 'Category')
 ProductImage = get_model('catalogue', 'ProductImage')
@@ -57,20 +60,19 @@ def filter_products(queryset, user):
     return queryset.filter(stockrecords__partner__users__pk=user.pk).distinct()
 
 
-class ProductListView(generic.ListView):
+class ProductListView(SingleTableMixin, generic.TemplateView):
     """
     Dashboard view of the product list.
     Supports the permission-based dashboard.
     """
 
     template_name = 'dashboard/catalogue/product_list.html'
-    model = Product
-    context_object_name = 'products'
     form_class = ProductSearchForm
     productclass_form_class = ProductClassSelectForm
     description_template = _(u'Products %(upc_filter)s %(title_filter)s')
-    paginate_by = 20
     recent_products = 5
+    table_class = ProductTable
+    context_table_name = 'products'
 
     def get_context_data(self, **kwargs):
         ctx = super(ProductListView, self).get_context_data(**kwargs)
@@ -85,6 +87,15 @@ class ProductListView(generic.ListView):
 
         return ctx
 
+    def get_table(self, **kwargs):
+        if 'recently_edited' in self.request.GET:
+            kwargs.update(dict(orderable=False))
+
+        return super(ProductListView, self).get_table(**kwargs)
+
+    def get_table_pagination(self):
+        return dict(per_page=20)
+
     def filter_queryset(self, queryset):
         """
         Apply any filters to restrict the products that appear on the list
@@ -107,10 +118,7 @@ class ProductListView(generic.ListView):
             # Just show recently edited
             queryset = queryset.order_by('-date_updated')
             queryset = queryset[:self.recent_products]
-        else:
-            # Allow sorting when all
-            queryset = sort_queryset(queryset, self.request,
-                                     ['title'], '-date_created')
+
         return queryset
 
     def apply_search(self, queryset):
@@ -267,7 +275,7 @@ class ProductCreateUpdateView(generic.UpdateView):
         ctx['parent'] = self.parent
         ctx['title'] = self.get_page_title()
 
-        for ctx_name, formset_class in six.iteritems(self.formsets):
+        for ctx_name, formset_class in self.formsets.items():
             if ctx_name not in ctx:
                 ctx[ctx_name] = formset_class(self.product_class,
                                               self.request.user,
@@ -306,7 +314,7 @@ class ProductCreateUpdateView(generic.UpdateView):
             self.object = form.save()
 
         formsets = {}
-        for ctx_name, formset_class in six.iteritems(self.formsets):
+        for ctx_name, formset_class in self.formsets.items():
             formsets[ctx_name] = formset_class(self.product_class,
                                                self.request.user,
                                                self.request.POST,
@@ -401,6 +409,7 @@ class ProductCreateUpdateView(generic.UpdateView):
             {
                 'product': self.object,
                 'creating': self.creating,
+                'request': self.request
             })
         messages.success(self.request, msg, extra_tags="safe noicon")
 
@@ -521,25 +530,37 @@ class StockAlertListView(generic.ListView):
         return self.model.objects.all()
 
 
-class CategoryListView(generic.TemplateView):
+class CategoryListView(SingleTableMixin, generic.TemplateView):
     template_name = 'dashboard/catalogue/category_list.html'
+    table_class = CategoryTable
+    context_table_name = 'categories'
+
+    def get_queryset(self):
+        return Category.get_root_nodes()
 
     def get_context_data(self, *args, **kwargs):
         ctx = super(CategoryListView, self).get_context_data(*args, **kwargs)
         ctx['child_categories'] = Category.get_root_nodes()
+        ctx['queryset_description'] = _("Categories")
         return ctx
 
 
-class CategoryDetailListView(generic.DetailView):
+class CategoryDetailListView(SingleTableMixin, generic.DetailView):
     template_name = 'dashboard/catalogue/category_list.html'
     model = Category
     context_object_name = 'category'
+    table_class = CategoryTable
+    context_table_name = 'categories'
+
+    def get_table_data(self):
+        return self.object.get_children()
 
     def get_context_data(self, *args, **kwargs):
         ctx = super(CategoryDetailListView, self).get_context_data(*args,
                                                                    **kwargs)
         ctx['child_categories'] = self.object.get_children()
         ctx['ancestors'] = self.object.get_ancestors()
+        ctx['queryset_description'] = _("Categories")
         return ctx
 
 

oscar/apps/dashboard/communications/forms.py

@@ -1,11 +1,11 @@
+from django.utils import six
+
 from django import forms
 from oscar.core.loading import get_model
 from django.template import Template, TemplateSyntaxError
 from django.utils.translation import ugettext_lazy as _
 from oscar.apps.customer.utils import normalise_email
 
-from oscar.forms import widgets
-
 CommunicationEventType = get_model('customer', 'CommunicationEventType')
 Order = get_model('order', 'Order')
 
@@ -18,7 +18,7 @@ class CommunicationEventTypeForm(forms.ModelForm):
         widget=forms.widgets.Textarea(attrs={'class': 'plain'}))
     email_body_html_template = forms.CharField(
         label=_("Email body HTML template"), required=True,
-        widget=widgets.WYSIWYGTextArea)
+        widget=forms.Textarea)
 
     preview_order_number = forms.CharField(
         label=_("Order number"), required=False)
@@ -37,7 +37,7 @@ class CommunicationEventTypeForm(forms.ModelForm):
         try:
             Template(value)
         except TemplateSyntaxError as e:
-            raise forms.ValidationError(e.message)
+            raise forms.ValidationError(six.text_type(e))
 
     def clean_email_subject_template(self):
         subject = self.cleaned_data['email_subject_template']
@@ -84,4 +84,7 @@ class CommunicationEventTypeForm(forms.ModelForm):
 
     class Meta:
         model = CommunicationEventType
-        exclude = ('code', 'category', 'sms_template')
+        fields = [
+            'name', 'email_subject_template', 'email_body_template',
+            'email_body_html_template', 'preview_order_number', 'preview_email'
+        ]

oscar/apps/dashboard/communications/views.py

@@ -1,3 +1,5 @@
+from django.utils import six
+
 from django.contrib import messages
 from django.contrib.sites.models import get_current_site
 from oscar.core.loading import get_model
@@ -56,7 +58,7 @@ class UpdateView(generic.UpdateView):
         try:
             msgs = commtype.get_messages(commtype_ctx)
         except TemplateSyntaxError as e:
-            form.errors['__all__'] = form.error_class([e.message])
+            form.errors['__all__'] = form.error_class([six.text_type(e)])
             return self.render_to_response(ctx)
 
         ctx['show_preview'] = True
@@ -72,7 +74,7 @@ class UpdateView(generic.UpdateView):
         try:
             msgs = commtype.get_messages(commtype_ctx)
         except TemplateSyntaxError as e:
-            form.errors['__all__'] = form.error_class([e.message])
+            form.errors['__all__'] = form.error_class([six.text_type(e)])
             return self.render_to_response(ctx)
 
         email = form.cleaned_data['preview_email']

oscar/apps/dashboard/offers/forms.py

@@ -1,9 +1,10 @@
 import datetime
+from django.utils import six
 
 from django import forms
-from oscar.core.loading import get_model
 from django.utils.translation import ugettext_lazy as _
 
+from oscar.core.loading import get_model
 from oscar.forms import widgets
 
 ConditionalOffer = get_model('offer', 'ConditionalOffer')
@@ -60,7 +61,7 @@ class ConditionForm(forms.ModelForm):
             proxy_class=None)
         if len(custom_conditions) > 0:
             # Initialise custom_condition field
-            choices = [(c.id, c.__unicode__()) for c in custom_conditions]
+            choices = [(c.id, six.text_type(c)) for c in custom_conditions]
             choices.insert(0, ('', ' --------- '))
             self.fields['custom_condition'].choices = choices
             condition = kwargs.get('instance')
@@ -114,7 +115,7 @@ class BenefitForm(forms.ModelForm):
             proxy_class=None)
         if len(custom_benefits) > 0:
             # Initialise custom_benefit field
-            choices = [(c.id, c.__unicode__()) for c in custom_benefits]
+            choices = [(c.id, six.text_type(c)) for c in custom_benefits]
             choices.insert(0, ('', ' --------- '))
             self.fields['custom_benefit'].choices = choices
             benefit = kwargs.get('instance')

oscar/apps/dashboard/orders/views.py

@@ -655,9 +655,7 @@ class OrderDetailView(DetailView):
 
         # If no amount passed, then we add up the total of the selected lines
         if not amount_str:
-            amount = D('0.00')
-            for line, quantity in zip(lines, quantities):
-                amount += int(quantity) * line.line_price_incl_tax
+            amount = sum([line.line_price_incl_tax for line in lines])
         else:
             try:
                 amount = D(amount_str)

oscar/apps/dashboard/tables.py

@@ -0,0 +1,7 @@
+from django_tables2 import Table
+
+
+class DashboardTable(Table):
+    class Meta:
+        template = 'dashboard/table.html'
+        attrs = {'class': 'table table-striped table-bordered'}

oscar/apps/dashboard/users/tables.py

@@ -0,0 +1,25 @@
+from django_tables2 import Table, LinkColumn, TemplateColumn, Column, A
+
+from oscar.core.loading import get_class
+
+DashboardTable = get_class('dashboard.tables', 'DashboardTable')
+
+
+class UserTable(Table):
+    check = TemplateColumn(
+        template_name='dashboard/users/user_row_checkbox.html',
+        verbose_name=' ', orderable=False)
+    email = LinkColumn('dashboard:user-detail', args=[A('id')],
+                       accessor='email')
+    name = Column(accessor='get_full_name',
+                  order_by=('last_name', 'first_name'))
+    active = Column(accessor='is_active')
+    staff = Column(accessor='is_staff')
+    date_registered = Column(accessor='date_joined')
+    num_orders = Column(accessor='orders.count', orderable=False)
+    actions = TemplateColumn(
+        template_name='dashboard/users/user_row_actions.html',
+        verbose_name=' ')
+
+    class Meta(DashboardTable.Meta):
+        template = 'dashboard/users/table.html'

oscar/apps/dashboard/users/views.py

@@ -4,10 +4,13 @@ from django.shortcuts import redirect
 from django.utils.translation import ugettext_lazy as _
 from django.core.urlresolvers import reverse
 from django.views.generic import ListView, DetailView, DeleteView, \
-    UpdateView, FormView
+    UpdateView, FormView, TemplateView
 from django.views.generic.detail import SingleObjectMixin
-from oscar.apps.customer.utils import normalise_email
+from django.views.generic.edit import FormMixin
+
+from django_tables2 import SingleTableMixin
 
+from oscar.apps.customer.utils import normalise_email
 from oscar.views.generic import BulkEditMixin
 from oscar.core.compat import get_user_model
 from oscar.core.loading import get_class, get_classes, get_model
@@ -16,39 +19,60 @@ UserSearchForm, ProductAlertSearchForm, ProductAlertUpdateForm = get_classes(
     'dashboard.users.forms', ('UserSearchForm', 'ProductAlertSearchForm',
                               'ProductAlertUpdateForm'))
 PasswordResetForm = get_class('customer.forms', 'PasswordResetForm')
+UserTable = get_class('dashboard.users.tables', 'UserTable')
 ProductAlert = get_model('customer', 'ProductAlert')
 User = get_user_model()
 
 
-class IndexView(BulkEditMixin, ListView):
+class IndexView(BulkEditMixin, SingleTableMixin, FormMixin, TemplateView):
     template_name = 'dashboard/users/index.html'
-    paginate_by = 25
+    table_pagination = True
     model = User
     actions = ('make_active', 'make_inactive', )
     form_class = UserSearchForm
+    table_class = UserTable
+    context_table_name = 'users'
     desc_template = _('%(main_filter)s %(email_filter)s %(name_filter)s')
     description = ''
-    context_object_name = 'user_list'
+
+    def dispatch(self, request, *args, **kwargs):
+        form_class = self.get_form_class()
+        self.form = self.get_form(form_class)
+        return super(IndexView, self).dispatch(request, *args, **kwargs)
+
+    def get_form_kwargs(self):
+        """
+        Only bind search form if it was submitted.
+        """
+        kwargs = super(IndexView, self).get_form_kwargs()
+
+        if 'search' in self.request.GET:
+            kwargs.update({
+                'data': self.request.GET,
+            })
+
+        return kwargs
 
     def get_queryset(self):
         queryset = self.model.objects.all().order_by('-date_joined')
+        return self.apply_search(queryset)
+
+    def apply_search(self, queryset):
+        # Set initial queryset description, used for template context
         self.desc_ctx = {
             'main_filter': _('All users'),
             'email_filter': '',
             'name_filter': '',
         }
-
-        if 'email' not in self.request.GET:
-            self.form = self.form_class()
+        if self.form.is_valid():
+            return self.apply_search_filters(queryset, self.form.cleaned_data)
+        else:
             return queryset
 
-        self.form = self.form_class(self.request.GET)
-
-        if not self.form.is_valid():
-            return queryset
-
-        data = self.form.cleaned_data
-
+    def apply_search_filters(self, queryset, data):
+        """
+        Function is split out to allow customisation with little boilerplate.
+        """
         if data['email']:
             email = normalise_email(data['email'])
             queryset = queryset.filter(email__istartswith=email)
@@ -74,6 +98,7 @@ class IndexView(BulkEditMixin, ListView):
         context = super(IndexView, self).get_context_data(**kwargs)
         context['form'] = self.form
         context['queryset_description'] = self.desc_template % self.desc_ctx
+        context['queryset_icon'] = 'group'
         return context
 
     def make_inactive(self, request, users):

oscar/apps/dashboard/views.py

@@ -123,7 +123,7 @@ class IndexView(TemplateView):
 
             y_range = []
             y_axis_steps = max_value / D(str(segments))
-            for idx in reversed(list(range(segments + 1))):
+            for idx in reversed(range(segments + 1)):
                 y_range.append(idx * y_axis_steps)
         else:
             y_range = []

oscar/apps/offer/admin.py

@@ -12,7 +12,7 @@ class ConditionAdmin(admin.ModelAdmin):
 
 
 class BenefitAdmin(admin.ModelAdmin):
-    list_display = ('__unicode__', 'type', 'value', 'range')
+    list_display = ('__str__', 'type', 'value', 'range')
 
 
 class ConditionalOfferAdmin(admin.ModelAdmin):

oscar/apps/offer/custom.py

@@ -1,6 +1,5 @@
-import six
-
 from django.core import exceptions
+from django.db import IntegrityError
 
 from oscar.apps.offer.models import Range, Condition, Benefit
 
@@ -25,22 +24,11 @@ def create_range(range_class):
         raise exceptions.ValidationError(
             "Custom ranges must have text names (not ugettext proxies)")
 
-    # In Django versions further than 1.6 it will be update_or_create
-    # https://docs.djangoproject.com/en/dev/ref/models/querysets/#update-or-create # noqa
-    values = {
-        'name': range_class.name,
-        'proxy_class': _class_path(range_class),
-    }
     try:
-        obj = Range.objects.get(**values)
-    except Range.DoesNotExist:
-        obj = Range(**values)
-    else:
-        for key, value in six.iteritems(values):
-            setattr(obj, key, value)
-    obj.save()
-
-    return obj
+        return Range.objects.create(
+            name=range_class.name, proxy_class=_class_path(range_class))
+    except IntegrityError:
+        raise ValueError("The passed range already exists in the database.")
 
 
 def create_condition(condition_class):
@@ -55,7 +43,7 @@ def create_benefit(benefit_class):
     """
     Create a custom benefit instance
     """
-    # The custom benefit_class must override __unicode__ and description to
+    # The custom benefit_class must override __str__ and description to
     # avoid a recursion error
     if benefit_class.description is Benefit.description:
         raise RuntimeError("Your custom benefit must implement its own "

oscar/apps/offer/migrations/0001_initial.py

@@ -2,9 +2,9 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
-import oscar.models.fields.autoslugfield
-from decimal import Decimal
 import oscar.models.fields
+from decimal import Decimal
+import oscar.models.fields.autoslugfield
 from django.conf import settings
 
 
@@ -19,11 +19,11 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Benefit',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('type', models.CharField(blank=True, max_length=128, verbose_name='Type', choices=[(b'Percentage', "Discount is a percentage off of the product's value"), (b'Absolute', "Discount is a fixed amount off of the product's value"), (b'Multibuy', 'Discount is to give the cheapest product for free'), (b'Fixed price', 'Get the products that meet the condition for a fixed price'), (b'Shipping absolute', 'Discount is a fixed amount of the shipping cost'), (b'Shipping fixed price', 'Get shipping for a fixed price'), (b'Shipping percentage', 'Discount is a percentage off of the shipping cost')])),
-                ('value', oscar.models.fields.PositiveDecimalField(null=True, verbose_name='Value', max_digits=12, decimal_places=2, blank=True)),
-                ('max_affected_items', models.PositiveIntegerField(help_text='Set this to prevent the discount consuming all items within the range that are in the basket.', null=True, verbose_name='Max Affected Items', blank=True)),
-                ('proxy_class', oscar.models.fields.NullCharField(default=None, max_length=255, unique=True, verbose_name='Custom class')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('type', models.CharField(verbose_name='Type', choices=[('Percentage', "Discount is a percentage off of the product's value"), ('Absolute', "Discount is a fixed amount off of the product's value"), ('Multibuy', 'Discount is to give the cheapest product for free'), ('Fixed price', 'Get the products that meet the condition for a fixed price'), ('Shipping absolute', 'Discount is a fixed amount of the shipping cost'), ('Shipping fixed price', 'Get shipping for a fixed price'), ('Shipping percentage', 'Discount is a percentage off of the shipping cost')], blank=True, max_length=128)),
+                ('value', oscar.models.fields.PositiveDecimalField(verbose_name='Value', max_digits=12, decimal_places=2, blank=True, null=True)),
+                ('max_affected_items', models.PositiveIntegerField(verbose_name='Max Affected Items', blank=True, help_text='Set this to prevent the discount consuming all items within the range that are in the basket.', null=True)),
+                ('proxy_class', oscar.models.fields.NullCharField(verbose_name='Custom class', default=None, max_length=255, unique=True)),
             ],
             options={
                 'verbose_name': 'Benefit',
@@ -34,10 +34,10 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Condition',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('type', models.CharField(blank=True, max_length=128, verbose_name='Type', choices=[(b'Count', 'Depends on number of items in basket that are in condition range'), (b'Value', 'Depends on value of items in basket that are in condition range'), (b'Coverage', 'Needs to contain a set number of DISTINCT items from the condition range')])),
-                ('value', oscar.models.fields.PositiveDecimalField(null=True, verbose_name='Value', max_digits=12, decimal_places=2, blank=True)),
-                ('proxy_class', oscar.models.fields.NullCharField(default=None, max_length=255, unique=True, verbose_name='Custom class')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('type', models.CharField(verbose_name='Type', choices=[('Count', 'Depends on number of items in basket that are in condition range'), ('Value', 'Depends on value of items in basket that are in condition range'), ('Coverage', 'Needs to contain a set number of DISTINCT items from the condition range')], blank=True, max_length=128)),
+                ('value', oscar.models.fields.PositiveDecimalField(verbose_name='Value', max_digits=12, decimal_places=2, blank=True, null=True)),
+                ('proxy_class', oscar.models.fields.NullCharField(verbose_name='Custom class', default=None, max_length=255, unique=True)),
             ],
             options={
                 'verbose_name': 'Condition',
@@ -48,48 +48,48 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='ConditionalOffer',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('name', models.CharField(help_text="This is displayed within the customer's basket", unique=True, max_length=128, verbose_name='Name')),
-                ('slug', oscar.models.fields.autoslugfield.AutoSlugField(populate_from=b'name', editable=False, max_length=128, blank=True, unique=True, verbose_name='Slug')),
-                ('description', models.TextField(help_text='This is displayed on the offer browsing page', verbose_name='Description', blank=True)),
-                ('offer_type', models.CharField(default=b'Site', max_length=128, verbose_name='Type', choices=[(b'Site', 'Site offer - available to all users'), (b'Voucher', 'Voucher offer - only available after entering the appropriate voucher code'), (b'User', 'User offer - available to certain types of user'), (b'Session', 'Session offer - temporary offer, available for a user for the duration of their session')])),
-                ('status', models.CharField(default=b'Open', max_length=64, verbose_name='Status')),
-                ('priority', models.IntegerField(default=0, help_text='The highest priority offers are applied first', verbose_name='Priority')),
-                ('start_datetime', models.DateTimeField(null=True, verbose_name='Start date', blank=True)),
-                ('end_datetime', models.DateTimeField(help_text="Offers are active until the end of the 'end date'", null=True, verbose_name='End date', blank=True)),
-                ('max_global_applications', models.PositiveIntegerField(help_text='The number of times this offer can be used before it is unavailable', null=True, verbose_name='Max global applications', blank=True)),
-                ('max_user_applications', models.PositiveIntegerField(help_text='The number of times a single user can use this offer', null=True, verbose_name='Max user applications', blank=True)),
-                ('max_basket_applications', models.PositiveIntegerField(help_text='The number of times this offer can be applied to a basket (and order)', null=True, verbose_name='Max basket applications', blank=True)),
-                ('max_discount', models.DecimalField(decimal_places=2, max_digits=12, blank=True, help_text='When an offer has given more discount to orders than this threshold, then the offer becomes unavailable', null=True, verbose_name='Max discount')),
-                ('total_discount', models.DecimalField(default=Decimal('0.00'), verbose_name='Total Discount', max_digits=12, decimal_places=2)),
-                ('num_applications', models.PositiveIntegerField(default=0, verbose_name='Number of applications')),
-                ('num_orders', models.PositiveIntegerField(default=0, verbose_name='Number of Orders')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('name', models.CharField(verbose_name='Name', unique=True, help_text="This is displayed within the customer's basket", max_length=128)),
+                ('slug', oscar.models.fields.autoslugfield.AutoSlugField(editable=False, verbose_name='Slug', blank=True, max_length=128, populate_from='name', unique=True)),
+                ('description', models.TextField(verbose_name='Description', blank=True, help_text='This is displayed on the offer browsing page')),
+                ('offer_type', models.CharField(verbose_name='Type', choices=[('Site', 'Site offer - available to all users'), ('Voucher', 'Voucher offer - only available after entering the appropriate voucher code'), ('User', 'User offer - available to certain types of user'), ('Session', 'Session offer - temporary offer, available for a user for the duration of their session')], default='Site', max_length=128)),
+                ('status', models.CharField(verbose_name='Status', default='Open', max_length=64)),
+                ('priority', models.IntegerField(verbose_name='Priority', help_text='The highest priority offers are applied first', default=0)),
+                ('start_datetime', models.DateTimeField(verbose_name='Start date', blank=True, null=True)),
+                ('end_datetime', models.DateTimeField(verbose_name='End date', blank=True, help_text="Offers are active until the end of the 'end date'", null=True)),
+                ('max_global_applications', models.PositiveIntegerField(verbose_name='Max global applications', blank=True, help_text='The number of times this offer can be used before it is unavailable', null=True)),
+                ('max_user_applications', models.PositiveIntegerField(verbose_name='Max user applications', blank=True, help_text='The number of times a single user can use this offer', null=True)),
+                ('max_basket_applications', models.PositiveIntegerField(verbose_name='Max basket applications', blank=True, help_text='The number of times this offer can be applied to a basket (and order)', null=True)),
+                ('max_discount', models.DecimalField(verbose_name='Max discount', decimal_places=2, blank=True, max_digits=12, help_text='When an offer has given more discount to orders than this threshold, then the offer becomes unavailable', null=True)),
+                ('total_discount', models.DecimalField(verbose_name='Total Discount', max_digits=12, decimal_places=2, default=Decimal('0.00'))),
+                ('num_applications', models.PositiveIntegerField(verbose_name='Number of applications', default=0)),
+                ('num_orders', models.PositiveIntegerField(verbose_name='Number of Orders', default=0)),
                 ('redirect_url', oscar.models.fields.ExtendedURLField(verbose_name='URL redirect (optional)', blank=True)),
-                ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Date Created')),
+                ('date_created', models.DateTimeField(verbose_name='Date Created', auto_now_add=True)),
                 ('benefit', models.ForeignKey(verbose_name='Benefit', to='offer.Benefit')),
                 ('condition', models.ForeignKey(verbose_name='Condition', to='offer.Condition')),
             ],
             options={
-                'ordering': [b'-priority'],
                 'verbose_name': 'Conditional offer',
                 'verbose_name_plural': 'Conditional offers',
+                'ordering': ['-priority'],
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='Range',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('name', models.CharField(unique=True, max_length=128, verbose_name='Name')),
-                ('slug', oscar.models.fields.autoslugfield.AutoSlugField(populate_from=b'name', editable=False, max_length=128, blank=True, unique=True, verbose_name='Slug')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('name', models.CharField(verbose_name='Name', unique=True, max_length=128)),
+                ('slug', oscar.models.fields.autoslugfield.AutoSlugField(editable=False, verbose_name='Slug', blank=True, max_length=128, populate_from='name', unique=True)),
                 ('description', models.TextField(blank=True)),
-                ('is_public', models.BooleanField(default=False, help_text='Public ranges have a customer-facing page', verbose_name='Is public?')),
-                ('includes_all_products', models.BooleanField(default=False, verbose_name='Includes all products?')),
-                ('proxy_class', oscar.models.fields.NullCharField(default=None, max_length=255, unique=True, verbose_name='Custom class')),
-                ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Date Created')),
-                ('classes', models.ManyToManyField(to='catalogue.ProductClass', verbose_name='Product Types', blank=True)),
-                ('excluded_products', models.ManyToManyField(to='catalogue.Product', verbose_name='Excluded Products', blank=True)),
-                ('included_categories', models.ManyToManyField(to='catalogue.Category', verbose_name='Included Categories', blank=True)),
+                ('is_public', models.BooleanField(verbose_name='Is public?', help_text='Public ranges have a customer-facing page', default=False)),
+                ('includes_all_products', models.BooleanField(verbose_name='Includes all products?', default=False)),
+                ('proxy_class', oscar.models.fields.NullCharField(verbose_name='Custom class', default=None, max_length=255, unique=True)),
+                ('date_created', models.DateTimeField(verbose_name='Date Created', auto_now_add=True)),
+                ('classes', models.ManyToManyField(verbose_name='Product Types', blank=True, to='catalogue.ProductClass')),
+                ('excluded_products', models.ManyToManyField(verbose_name='Excluded Products', blank=True, to='catalogue.Product')),
+                ('included_categories', models.ManyToManyField(verbose_name='Included Categories', blank=True, to='catalogue.Category')),
             ],
             options={
                 'verbose_name': 'Range',
@@ -112,7 +112,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='RangeProduct',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
                 ('display_order', models.IntegerField(default=0)),
                 ('product', models.ForeignKey(to='catalogue.Product')),
             ],
@@ -123,7 +123,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='range',
             name='included_products',
-            field=models.ManyToManyField(to='catalogue.Product', verbose_name='Included Products', through='offer.RangeProduct', blank=True),
+            field=models.ManyToManyField(verbose_name='Included Products', through='offer.RangeProduct', blank=True, to='catalogue.Product'),
             preserve_default=True,
         ),
         migrations.AddField(
@@ -134,28 +134,28 @@ class Migration(migrations.Migration):
         ),
         migrations.AlterUniqueTogether(
             name='rangeproduct',
-            unique_together=set([(b'range', b'product')]),
+            unique_together=set([('range', 'product')]),
         ),
         migrations.CreateModel(
             name='RangeProductFileUpload',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('filepath', models.CharField(max_length=255, verbose_name='File Path')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('filepath', models.CharField(verbose_name='File Path', max_length=255)),
                 ('size', models.PositiveIntegerField(verbose_name='Size')),
-                ('date_uploaded', models.DateTimeField(auto_now_add=True, verbose_name='Date Uploaded')),
-                ('status', models.CharField(default=b'Pending', max_length=32, verbose_name='Status', choices=[(b'Pending', b'Pending'), (b'Failed', b'Failed'), (b'Processed', b'Processed')])),
-                ('error_message', models.CharField(max_length=255, verbose_name='Error Message', blank=True)),
-                ('date_processed', models.DateTimeField(null=True, verbose_name='Date Processed')),
-                ('num_new_skus', models.PositiveIntegerField(null=True, verbose_name='Number of New SKUs')),
-                ('num_unknown_skus', models.PositiveIntegerField(null=True, verbose_name='Number of Unknown SKUs')),
-                ('num_duplicate_skus', models.PositiveIntegerField(null=True, verbose_name='Number of Duplicate SKUs')),
+                ('date_uploaded', models.DateTimeField(verbose_name='Date Uploaded', auto_now_add=True)),
+                ('status', models.CharField(verbose_name='Status', choices=[('Pending', 'Pending'), ('Failed', 'Failed'), ('Processed', 'Processed')], default='Pending', max_length=32)),
+                ('error_message', models.CharField(verbose_name='Error Message', blank=True, max_length=255)),
+                ('date_processed', models.DateTimeField(verbose_name='Date Processed', null=True)),
+                ('num_new_skus', models.PositiveIntegerField(verbose_name='Number of New SKUs', null=True)),
+                ('num_unknown_skus', models.PositiveIntegerField(verbose_name='Number of Unknown SKUs', null=True)),
+                ('num_duplicate_skus', models.PositiveIntegerField(verbose_name='Number of Duplicate SKUs', null=True)),
                 ('range', models.ForeignKey(verbose_name='Range', to='offer.Range')),
                 ('uploaded_by', models.ForeignKey(verbose_name='Uploaded By', to=settings.AUTH_USER_MODEL)),
             ],
             options={
-                'ordering': (b'-date_uploaded',),
                 'verbose_name': 'Range Product Uploaded File',
                 'verbose_name_plural': 'Range Product Uploaded Files',
+                'ordering': ('-date_uploaded',),
             },
             bases=(models.Model,),
         ),

oscar/apps/offer/models.py

@@ -1,21 +1,22 @@
+import itertools
 import os
 import re
-import six
 import operator
 from decimal import Decimal as D, ROUND_DOWN, ROUND_UP
 
 from django.core import exceptions
 from django.template.defaultfilters import date as date_filter
 from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
 from django.utils.timezone import now, get_current_timezone
 from django.utils.translation import ungettext, ugettext_lazy as _
 from django.utils.importlib import import_module
+from django.utils import six
 from django.core.exceptions import ValidationError
 from django.core.urlresolvers import reverse
 from django.conf import settings
 
 from oscar.core.compat import AUTH_USER_MODEL
-from oscar.core.utils import slugify
 from oscar.core.loading import get_class, get_model
 from oscar.apps.offer.managers import ActiveOfferManager
 from oscar.templatetags.currency_filters import currency
@@ -60,6 +61,7 @@ def apply_discount(line, discount, quantity):
     line.discount(discount, quantity, incl_tax=False)
 
 
+@python_2_unicode_compatible
 class ConditionalOffer(models.Model):
     """
     A conditional offer (eg buy 1, get 10% off)
@@ -193,7 +195,7 @@ class ConditionalOffer(models.Model):
     def get_absolute_url(self):
         return reverse('offer:detail', kwargs={'slug': self.slug})
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
     def clean(self):
@@ -402,15 +404,19 @@ class ConditionalOffer(models.Model):
         cond_range = self.condition.range
         if cond_range.includes_all_products:
             # Return ALL the products
-            return Product.browsable.select_related('product_class',
-                                                    'stockrecord')\
-                .filter(is_discountable=True)\
-                .prefetch_related('children', 'images',
-                                  'product_class__options', 'product_options')
-        return cond_range.included_products.filter(is_discountable=True)
+            queryset = Product.browsable
+        else:
+            queryset = cond_range.included_products
+        return queryset.filter(is_discountable=True).exclude(
+            structure=Product.CHILD)
 
 
+@python_2_unicode_compatible
 class Condition(models.Model):
+    """
+    A condition for an offer to be applied. You can either specify a custom
+    proxy class, or need to specify a type, range and value.
+    """
     COUNT, VALUE, COVERAGE = ("Count", "Value", "Coverage")
     TYPE_CHOICES = (
         (COUNT, _("Depends on number of items in basket that are in "
@@ -452,9 +458,9 @@ class Condition(models.Model):
             self.COVERAGE: CoverageCondition}
         if self.type in klassmap:
             return klassmap[self.type](**field_dict)
-        return self
+        raise RuntimeError("Unrecognised condition type (%s)" % self.type)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.proxy().name
 
     @property
@@ -524,6 +530,7 @@ class Condition(models.Model):
         return sorted(line_tuples, key=key)
 
 
+@python_2_unicode_compatible
 class Benefit(models.Model):
     range = models.ForeignKey(
         'offer.Range', null=True, blank=True, verbose_name=_("Range"))
@@ -592,7 +599,7 @@ class Benefit(models.Model):
             return klassmap[self.type](**field_dict)
         raise RuntimeError("Unrecognised benefit type (%s)" % self.type)
 
-    def __unicode__(self):
+    def __str__(self):
         name = self.proxy().name
         if self.max_affected_items:
             name += ungettext(
@@ -746,9 +753,13 @@ class Benefit(models.Model):
         return D('0.00')
 
 
+@python_2_unicode_compatible
 class Range(models.Model):
     """
-    Represents a range of products that can be used within an offer
+    Represents a range of products that can be used within an offer.
+
+    Ranges only support adding parent or stand-alone products. Offers will
+    consider child products automatically.
     """
     name = models.CharField(_("Name"), max_length=128, unique=True)
     slug = fields.AutoSlugField(
@@ -795,15 +806,12 @@ class Range(models.Model):
         verbose_name = _("Range")
         verbose_name_plural = _("Ranges")
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
     def get_absolute_url(self):
-        return reverse('catalogue:range', kwargs={
-            'slug': self.slug})
-
-    def _save(self, *args, **kwargs):
-        super(Range, self).save(*args, **kwargs)
+        return reverse(
+            'catalogue:range', kwargs={'slug': self.slug})
 
     def add_product(self, product, display_order=None):
         """ Add product to the range
@@ -811,18 +819,14 @@ class Range(models.Model):
         When adding product that is already in the range, prevent re-adding it.
         If display_order is specified, update it.
 
-        Standard display_order for a new product in the range (0) puts
+        Default display_order for a new product in the range is 0; this puts
         the product at the top of the list.
-
-        display_order needs to be tested for None because
-
-          >>> display_order = 0
-          >>> not display_order
-          True
-          >>> display_order is None
-          False
         """
-        initial_order = 0 if display_order is None else display_order
+        if product.is_child:
+            raise ValueError(
+                "Ranges can only contain parent and stand-alone products.")
+
+        initial_order = display_order or 0
         relation, __ = RangeProduct.objects.get_or_create(
             range=self, product=product,
             defaults={'display_order': initial_order})
@@ -833,19 +837,19 @@ class Range(models.Model):
             relation.save()
 
     def remove_product(self, product):
-        """ Remove product from range """
+        """
+        Remove product from range. To save on queries, this function does not
+        check if the product is in fact in the range.
+        """
         RangeProduct.objects.filter(range=self, product=product).delete()
 
     def contains_product(self, product):  # noqa (too complex (12))
         """
-        Check whether the passed product is part of this range
+        Check whether the passed product is part of this range.
         """
-        # We look for shortcircuit checks first before
-        # the tests that require more database queries.
-
-        if settings.OSCAR_OFFER_BLACKLIST_PRODUCT and \
-                settings.OSCAR_OFFER_BLACKLIST_PRODUCT(product):
-            return False
+        # Child products are never part of the range, but the parent may be.
+        if product.is_child:
+            product = product.parent
 
         # Delegate to a proxy class if one is provided
         if self.proxy_class:
@@ -863,7 +867,7 @@ class Range(models.Model):
             return True
         test_categories = self.included_categories.all()
         if test_categories:
-            for category in product.categories.all():
+            for category in product.get_categories().all():
                 for test_category in test_categories:
                     if category == test_category \
                             or category.is_descendant_of(test_category):
@@ -873,23 +877,39 @@ class Range(models.Model):
     # Shorter alias
     contains = contains_product
 
+    def __get_pks_and_child_pks(self, queryset):
+        """
+        Expects a product queryset; gets the primary keys of the passed
+        products and their children.
+
+        Verbose, but database and memory friendly.
+        """
+        # One query to get parent and children; [(4, None), (5, 10), (5, 11)]
+        pk_tuples_iterable = queryset.values_list('pk', 'children__pk')
+        # Flatten list without unpacking; [4, None, 5, 10, 5, 11]
+        flat_iterable = itertools.chain.from_iterable(pk_tuples_iterable)
+        # Ensure uniqueness and remove None; {4, 5, 10, 11}
+        return set(flat_iterable) - {None}
+
     def _included_product_ids(self):
+        if not self.id:
+            return []
         if self.__included_product_ids is None:
-            self.__included_product_ids = [row['id'] for row in
-                                           self.included_products.values('id')]
+            self.__included_product_ids = self.__get_pks_and_child_pks(
+                self.included_products)
         return self.__included_product_ids
 
     def _excluded_product_ids(self):
         if not self.id:
             return []
         if self.__excluded_product_ids is None:
-            self.__excluded_product_ids = [row['id'] for row in
-                                           self.excluded_products.values('id')]
+            self.__excluded_product_ids = self.__get_pks_and_child_pks(
+                self.excluded_products)
         return self.__excluded_product_ids
 
     def _class_ids(self):
         if None == self.__class_ids:
-            self.__class_ids = [row['id'] for row in self.classes.values('id')]
+            self.__class_ids = self.classes.values_list('pk', flat=True)
         return self.__class_ids
 
     def num_products(self):
@@ -1218,7 +1238,7 @@ class ApplicationResult(object):
     # (a) Give a discount off the BASKET total
     # (b) Give a discount off the SHIPPING total
     # (a) Trigger a post-order action
-    BASKET, SHIPPING, POST_ORDER = list(range(0, 3))
+    BASKET, SHIPPING, POST_ORDER = 0, 1, 2
     affects = None
 
     @property
@@ -1423,13 +1443,13 @@ class FixedPriceBenefit(Benefit):
     _description = _("The products that meet the condition are sold "
                      "for %(amount)s")
 
-    def __unicode__(self):
+    def __str__(self):
         return self._description % {
             'amount': currency(self.value)}
 
     @property
     def description(self):
-        return self.__unicode__()
+        return six.text_type(self)
 
     class Meta:
         proxy = True

oscar/apps/order/abstract_models.py

@@ -6,6 +6,7 @@ from django.conf import settings
 from django.db import models
 from django.db.models import Sum
 from django.utils import timezone
+from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _, pgettext_lazy
 from django.utils.datastructures import SortedDict
 
@@ -14,6 +15,7 @@ from oscar.models.fields import AutoSlugField
 from . import exceptions
 
 
+@python_2_unicode_compatible
 class AbstractOrder(models.Model):
     """
     The main order model
@@ -95,7 +97,7 @@ class AbstractOrder(models.Model):
         """
         Return all possible statuses for an order
         """
-        return cls.pipeline.keys()
+        return list(cls.pipeline.keys())
 
     def available_statuses(self):
         """
@@ -272,7 +274,7 @@ class AbstractOrder(models.Model):
         verbose_name = _("Order")
         verbose_name_plural = _("Orders")
 
-    def __unicode__(self):
+    def __str__(self):
         return u"#%s" % (self.number,)
 
     def verification_hash(self):
@@ -304,6 +306,7 @@ class AbstractOrder(models.Model):
             category=AbstractOrderDiscount.DEFERRED)
 
 
+@python_2_unicode_compatible
 class AbstractOrderNote(models.Model):
     """
     A note against an order.
@@ -336,7 +339,7 @@ class AbstractOrderNote(models.Model):
         verbose_name = _("Order Note")
         verbose_name_plural = _("Order Notes")
 
-    def __unicode__(self):
+    def __str__(self):
         return u"'%s' (%s)" % (self.message[0:50], self.user)
 
     def is_editable(self):
@@ -346,6 +349,7 @@ class AbstractOrderNote(models.Model):
         return delta.seconds < self.editable_lifetime
 
 
+@python_2_unicode_compatible
 class AbstractCommunicationEvent(models.Model):
     """
     An order-level event involving a communication to the customer, such
@@ -365,7 +369,7 @@ class AbstractCommunicationEvent(models.Model):
         verbose_name_plural = _("Communication Events")
         ordering = ['-date_created']
 
-    def __unicode__(self):
+    def __str__(self):
         return _("'%(type)s' event for order #%(number)s") \
             % {'type': self.event_type.name, 'number': self.order.number}
 
@@ -373,6 +377,7 @@ class AbstractCommunicationEvent(models.Model):
 # LINES
 
 
+@python_2_unicode_compatible
 class AbstractLine(models.Model):
     """
     An order line
@@ -479,7 +484,7 @@ class AbstractLine(models.Model):
         verbose_name = _("Order Line")
         verbose_name_plural = _("Order Lines")
 
-    def __unicode__(self):
+    def __str__(self):
         if self.product:
             title = self.product.title
         else:
@@ -492,7 +497,7 @@ class AbstractLine(models.Model):
         """
         Return all possible statuses for an order line
         """
-        return cls.pipeline.keys()
+        return list(cls.pipeline.keys())
 
     def available_statuses(self):
         """
@@ -641,7 +646,9 @@ class AbstractLine(models.Model):
 
     def is_payment_event_permitted(self, event_type, quantity):
         """
-        Test whether a payment event with the given quantity is permitted
+        Test whether a payment event with the given quantity is permitted.
+
+        Allow each payment event type to occur only once per quantity.
         """
         current_qty = self.payment_event_quantity(event_type)
         return (current_qty + quantity) <= self.quantity
@@ -686,6 +693,7 @@ class AbstractLine(models.Model):
         return True, None
 
 
+@python_2_unicode_compatible
 class AbstractLineAttribute(models.Model):
     """
     An attribute of a line
@@ -705,10 +713,11 @@ class AbstractLineAttribute(models.Model):
         verbose_name = _("Line Attribute")
         verbose_name_plural = _("Line Attributes")
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s = %s" % (self.type, self.value)
 
 
+@python_2_unicode_compatible
 class AbstractLinePrice(models.Model):
     """
     For tracking the prices paid for each unit within a line.
@@ -738,7 +747,7 @@ class AbstractLinePrice(models.Model):
         verbose_name = _("Line Price")
         verbose_name_plural = _("Line Prices")
 
-    def __unicode__(self):
+    def __str__(self):
         return _("Line '%(number)s' (quantity %(qty)d) price %(price)s") % {
             'number': self.line,
             'qty': self.quantity,
@@ -748,6 +757,7 @@ class AbstractLinePrice(models.Model):
 # PAYMENT EVENTS
 
 
+@python_2_unicode_compatible
 class AbstractPaymentEventType(models.Model):
     """
     Payment event types are things like 'Paid', 'Failed', 'Refunded'.
@@ -765,10 +775,11 @@ class AbstractPaymentEventType(models.Model):
         verbose_name_plural = _("Payment Event Types")
         ordering = ('name', )
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
 
+@python_2_unicode_compatible
 class AbstractPaymentEvent(models.Model):
     """
     A payment event for an order
@@ -807,7 +818,7 @@ class AbstractPaymentEvent(models.Model):
         verbose_name_plural = _("Payment Events")
         ordering = ['-date_created']
 
-    def __unicode__(self):
+    def __str__(self):
         return _("Payment event for order %s") % self.order
 
     def num_affected_lines(self):
@@ -836,6 +847,7 @@ class PaymentEventQuantity(models.Model):
 # SHIPPING EVENTS
 
 
+@python_2_unicode_compatible
 class AbstractShippingEvent(models.Model):
     """
     An event is something which happens to a group of lines such as
@@ -861,7 +873,7 @@ class AbstractShippingEvent(models.Model):
         verbose_name_plural = _("Shipping Events")
         ordering = ['-date_created']
 
-    def __unicode__(self):
+    def __str__(self):
         return _("Order #%(number)s, type %(type)s") % {
             'number': self.order.number,
             'type': self.event_type}
@@ -870,6 +882,7 @@ class AbstractShippingEvent(models.Model):
         return self.lines.count()
 
 
+@python_2_unicode_compatible
 class ShippingEventQuantity(models.Model):
     """
     A "through" model linking lines to shipping events.
@@ -901,12 +914,13 @@ class ShippingEventQuantity(models.Model):
             raise exceptions.InvalidShippingEvent
         super(ShippingEventQuantity, self).save(*args, **kwargs)
 
-    def __unicode__(self):
+    def __str__(self):
         return _("%(product)s - quantity %(qty)d") % {
             'product': self.line.product,
             'qty': self.quantity}
 
 
+@python_2_unicode_compatible
 class AbstractShippingEventType(models.Model):
     """
     A type of shipping/fulfillment event
@@ -926,13 +940,14 @@ class AbstractShippingEventType(models.Model):
         verbose_name_plural = _("Shipping Event Types")
         ordering = ('name', )
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
 
 # DISCOUNTS
 
 
+@python_2_unicode_compatible
 class AbstractOrderDiscount(models.Model):
     """
     A discount against an order.
@@ -1006,7 +1021,7 @@ class AbstractOrderDiscount(models.Model):
 
         super(AbstractOrderDiscount, self).save(**kwargs)
 
-    def __unicode__(self):
+    def __str__(self):
         return _("Discount of %(amount)r from order %(order)s") % {
             'amount': self.amount, 'order': self.order}
 

oscar/apps/order/admin.py

@@ -58,15 +58,6 @@ class PaymentEventTypeAdmin(admin.ModelAdmin):
     pass
 
 
-class OrderNoteAdmin(admin.ModelAdmin):
-    exclude = ('user',)
-
-    def save_model(self, request, obj, form, change):
-        if not change:
-            obj.user = request.user
-        obj.save()
-
-
 class OrderDiscountAdmin(admin.ModelAdmin):
     readonly_fields = ('order', 'category', 'offer_id', 'offer_name',
                        'voucher_id', 'voucher_code', 'amount')
@@ -75,7 +66,7 @@ class OrderDiscountAdmin(admin.ModelAdmin):
 
 
 admin.site.register(Order, OrderAdmin)
-admin.site.register(OrderNote, OrderNoteAdmin)
+admin.site.register(OrderNote)
 admin.site.register(ShippingAddress)
 admin.site.register(Line, LineAdmin)
 admin.site.register(LinePrice, LinePriceAdmin)

oscar/apps/order/migrations/0001_initial.py

@@ -2,8 +2,8 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
-import oscar.models.fields.autoslugfield
 import oscar.models.fields
+import oscar.models.fields.autoslugfield
 import django.db.models.deletion
 from django.conf import settings
 
@@ -12,145 +12,145 @@ class Migration(migrations.Migration):
 
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('address', '0001_initial'),
-        ('sites', '__latest__'),
         ('partner', '0001_initial'),
-        ('customer', '0001_initial'),
-        ('catalogue', '0001_initial'),
         ('basket', '0001_initial'),
+        ('catalogue', '0001_initial'),
+        ('customer', '0001_initial'),
+        ('sites', '0001_initial'),
+        ('address', '0001_initial'),
     ]
 
     operations = [
         migrations.CreateModel(
             name='BillingAddress',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('title', models.CharField(blank=True, max_length=64, verbose_name='Title', choices=[(b'Mr', 'Mr'), (b'Miss', 'Miss'), (b'Mrs', 'Mrs'), (b'Ms', 'Ms'), (b'Dr', 'Dr')])),
-                ('first_name', models.CharField(max_length=255, verbose_name='First name', blank=True)),
-                ('last_name', models.CharField(max_length=255, verbose_name='Last name', blank=True)),
-                ('line1', models.CharField(max_length=255, verbose_name='First line of address')),
-                ('line2', models.CharField(max_length=255, verbose_name='Second line of address', blank=True)),
-                ('line3', models.CharField(max_length=255, verbose_name='Third line of address', blank=True)),
-                ('line4', models.CharField(max_length=255, verbose_name='City', blank=True)),
-                ('state', models.CharField(max_length=255, verbose_name='State/County', blank=True)),
-                ('postcode', oscar.models.fields.UppercaseCharField(max_length=64, verbose_name='Post/Zip-code', blank=True)),
-                ('search_text', models.TextField(verbose_name='Search text - used only for searching addresses', editable=False)),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('title', models.CharField(verbose_name='Title', choices=[('Mr', 'Mr'), ('Miss', 'Miss'), ('Mrs', 'Mrs'), ('Ms', 'Ms'), ('Dr', 'Dr')], blank=True, max_length=64)),
+                ('first_name', models.CharField(verbose_name='First name', blank=True, max_length=255)),
+                ('last_name', models.CharField(verbose_name='Last name', blank=True, max_length=255)),
+                ('line1', models.CharField(verbose_name='First line of address', max_length=255)),
+                ('line2', models.CharField(verbose_name='Second line of address', blank=True, max_length=255)),
+                ('line3', models.CharField(verbose_name='Third line of address', blank=True, max_length=255)),
+                ('line4', models.CharField(verbose_name='City', blank=True, max_length=255)),
+                ('state', models.CharField(verbose_name='State/County', blank=True, max_length=255)),
+                ('postcode', oscar.models.fields.UppercaseCharField(verbose_name='Post/Zip-code', blank=True, max_length=64)),
+                ('search_text', models.TextField(editable=False, verbose_name='Search text - used only for searching addresses')),
                 ('country', models.ForeignKey(verbose_name='Country', to='address.Country')),
             ],
             options={
-                'abstract': False,
                 'verbose_name': 'Billing address',
                 'verbose_name_plural': 'Billing addresses',
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='CommunicationEvent',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Date')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('date_created', models.DateTimeField(verbose_name='Date', auto_now_add=True)),
                 ('event_type', models.ForeignKey(verbose_name='Event Type', to='customer.CommunicationEventType')),
             ],
             options={
-                'ordering': [b'-date_created'],
-                'abstract': False,
                 'verbose_name': 'Communication Event',
                 'verbose_name_plural': 'Communication Events',
+                'ordering': ['-date_created'],
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='Line',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('partner_name', models.CharField(max_length=128, verbose_name='Partner name', blank=True)),
-                ('partner_sku', models.CharField(max_length=128, verbose_name='Partner SKU')),
-                ('partner_line_reference', models.CharField(help_text='This is the item number that the partner uses within their system', max_length=128, verbose_name='Partner reference', blank=True)),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('partner_name', models.CharField(verbose_name='Partner name', blank=True, max_length=128)),
+                ('partner_sku', models.CharField(verbose_name='Partner SKU', max_length=128)),
+                ('partner_line_reference', models.CharField(verbose_name='Partner reference', blank=True, help_text='This is the item number that the partner uses within their system', max_length=128)),
                 ('partner_line_notes', models.TextField(verbose_name='Partner Notes', blank=True)),
-                ('title', models.CharField(max_length=255, verbose_name='Title')),
-                ('upc', models.CharField(max_length=128, null=True, verbose_name='UPC', blank=True)),
-                ('quantity', models.PositiveIntegerField(default=1, verbose_name='Quantity')),
+                ('title', models.CharField(verbose_name='Title', max_length=255)),
+                ('upc', models.CharField(verbose_name='UPC', blank=True, null=True, max_length=128)),
+                ('quantity', models.PositiveIntegerField(verbose_name='Quantity', default=1)),
                 ('line_price_incl_tax', models.DecimalField(verbose_name='Price (inc. tax)', max_digits=12, decimal_places=2)),
                 ('line_price_excl_tax', models.DecimalField(verbose_name='Price (excl. tax)', max_digits=12, decimal_places=2)),
                 ('line_price_before_discounts_incl_tax', models.DecimalField(verbose_name='Price before discounts (inc. tax)', max_digits=12, decimal_places=2)),
                 ('line_price_before_discounts_excl_tax', models.DecimalField(verbose_name='Price before discounts (excl. tax)', max_digits=12, decimal_places=2)),
-                ('unit_cost_price', models.DecimalField(null=True, verbose_name='Unit Cost Price', max_digits=12, decimal_places=2, blank=True)),
-                ('unit_price_incl_tax', models.DecimalField(null=True, verbose_name='Unit Price (inc. tax)', max_digits=12, decimal_places=2, blank=True)),
-                ('unit_price_excl_tax', models.DecimalField(null=True, verbose_name='Unit Price (excl. tax)', max_digits=12, decimal_places=2, blank=True)),
-                ('unit_retail_price', models.DecimalField(null=True, verbose_name='Unit Retail Price', max_digits=12, decimal_places=2, blank=True)),
-                ('status', models.CharField(max_length=255, verbose_name='Status', blank=True)),
-                ('est_dispatch_date', models.DateField(null=True, verbose_name='Estimated Dispatch Date', blank=True)),
-                ('partner', models.ForeignKey(on_delete=django.db.models.deletion.SET_NULL, verbose_name='Partner', blank=True, to='partner.Partner', null=True)),
-                ('product', models.ForeignKey(on_delete=django.db.models.deletion.SET_NULL, verbose_name='Product', blank=True, to='catalogue.Product', null=True)),
-                ('stockrecord', models.ForeignKey(on_delete=django.db.models.deletion.SET_NULL, verbose_name='Stock record', blank=True, to='partner.StockRecord', null=True)),
+                ('unit_cost_price', models.DecimalField(verbose_name='Unit Cost Price', max_digits=12, decimal_places=2, blank=True, null=True)),
+                ('unit_price_incl_tax', models.DecimalField(verbose_name='Unit Price (inc. tax)', max_digits=12, decimal_places=2, blank=True, null=True)),
+                ('unit_price_excl_tax', models.DecimalField(verbose_name='Unit Price (excl. tax)', max_digits=12, decimal_places=2, blank=True, null=True)),
+                ('unit_retail_price', models.DecimalField(verbose_name='Unit Retail Price', max_digits=12, decimal_places=2, blank=True, null=True)),
+                ('status', models.CharField(verbose_name='Status', blank=True, max_length=255)),
+                ('est_dispatch_date', models.DateField(verbose_name='Estimated Dispatch Date', blank=True, null=True)),
+                ('partner', models.ForeignKey(verbose_name='Partner', on_delete=django.db.models.deletion.SET_NULL, blank=True, to='partner.Partner', null=True)),
+                ('product', models.ForeignKey(verbose_name='Product', on_delete=django.db.models.deletion.SET_NULL, blank=True, to='catalogue.Product', null=True)),
+                ('stockrecord', models.ForeignKey(verbose_name='Stock record', on_delete=django.db.models.deletion.SET_NULL, blank=True, to='partner.StockRecord', null=True)),
             ],
             options={
-                'abstract': False,
                 'verbose_name': 'Order Line',
                 'verbose_name_plural': 'Order Lines',
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='LineAttribute',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('type', models.CharField(max_length=128, verbose_name='Type')),
-                ('value', models.CharField(max_length=255, verbose_name='Value')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('type', models.CharField(verbose_name='Type', max_length=128)),
+                ('value', models.CharField(verbose_name='Value', max_length=255)),
                 ('line', models.ForeignKey(verbose_name='Line', to='order.Line')),
-                ('option', models.ForeignKey(on_delete=django.db.models.deletion.SET_NULL, verbose_name='Option', to='catalogue.Option', null=True)),
+                ('option', models.ForeignKey(verbose_name='Option', on_delete=django.db.models.deletion.SET_NULL, to='catalogue.Option', null=True)),
             ],
             options={
-                'abstract': False,
                 'verbose_name': 'Line Attribute',
                 'verbose_name_plural': 'Line Attributes',
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='LinePrice',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('quantity', models.PositiveIntegerField(default=1, verbose_name='Quantity')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('quantity', models.PositiveIntegerField(verbose_name='Quantity', default=1)),
                 ('price_incl_tax', models.DecimalField(verbose_name='Price (inc. tax)', max_digits=12, decimal_places=2)),
                 ('price_excl_tax', models.DecimalField(verbose_name='Price (excl. tax)', max_digits=12, decimal_places=2)),
-                ('shipping_incl_tax', models.DecimalField(default=0, verbose_name='Shiping (inc. tax)', max_digits=12, decimal_places=2)),
-                ('shipping_excl_tax', models.DecimalField(default=0, verbose_name='Shipping (excl. tax)', max_digits=12, decimal_places=2)),
+                ('shipping_incl_tax', models.DecimalField(verbose_name='Shiping (inc. tax)', max_digits=12, decimal_places=2, default=0)),
+                ('shipping_excl_tax', models.DecimalField(verbose_name='Shipping (excl. tax)', max_digits=12, decimal_places=2, default=0)),
                 ('line', models.ForeignKey(verbose_name='Line', to='order.Line')),
             ],
             options={
-                'ordering': (b'id',),
-                'abstract': False,
                 'verbose_name': 'Line Price',
                 'verbose_name_plural': 'Line Prices',
+                'ordering': ('id',),
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='Order',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('number', models.CharField(unique=True, max_length=128, verbose_name='Order number', db_index=True)),
-                ('currency', models.CharField(default=b'GBP', max_length=12, verbose_name='Currency')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('number', models.CharField(verbose_name='Order number', unique=True, db_index=True, max_length=128)),
+                ('currency', models.CharField(verbose_name='Currency', default='GBP', max_length=12)),
                 ('total_incl_tax', models.DecimalField(verbose_name='Order total (inc. tax)', max_digits=12, decimal_places=2)),
                 ('total_excl_tax', models.DecimalField(verbose_name='Order total (excl. tax)', max_digits=12, decimal_places=2)),
-                ('shipping_incl_tax', models.DecimalField(default=0, verbose_name='Shipping charge (inc. tax)', max_digits=12, decimal_places=2)),
-                ('shipping_excl_tax', models.DecimalField(default=0, verbose_name='Shipping charge (excl. tax)', max_digits=12, decimal_places=2)),
-                ('shipping_method', models.CharField(max_length=128, verbose_name='Shipping method', blank=True)),
-                ('shipping_code', models.CharField(default=b'', max_length=128, blank=True)),
-                ('status', models.CharField(max_length=100, verbose_name='Status', blank=True)),
-                ('guest_email', models.EmailField(max_length=75, verbose_name='Guest email address', blank=True)),
+                ('shipping_incl_tax', models.DecimalField(verbose_name='Shipping charge (inc. tax)', max_digits=12, decimal_places=2, default=0)),
+                ('shipping_excl_tax', models.DecimalField(verbose_name='Shipping charge (excl. tax)', max_digits=12, decimal_places=2, default=0)),
+                ('shipping_method', models.CharField(verbose_name='Shipping method', blank=True, max_length=128)),
+                ('shipping_code', models.CharField(blank=True, default='', max_length=128)),
+                ('status', models.CharField(verbose_name='Status', blank=True, max_length=100)),
+                ('guest_email', models.EmailField(verbose_name='Guest email address', blank=True, max_length=75)),
                 ('date_placed', models.DateTimeField(auto_now_add=True, db_index=True)),
-                ('basket', models.ForeignKey(on_delete=django.db.models.deletion.SET_NULL, verbose_name='Basket', blank=True, to='basket.Basket', null=True)),
-                ('billing_address', models.ForeignKey(on_delete=django.db.models.deletion.SET_NULL, verbose_name='Billing Address', blank=True, to='order.BillingAddress', null=True)),
-                ('site', models.ForeignKey(on_delete=django.db.models.deletion.SET_NULL, verbose_name='Site', to='sites.Site', null=True)),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.SET_NULL, verbose_name='User', blank=True, to=settings.AUTH_USER_MODEL, null=True)),
+                ('basket', models.ForeignKey(verbose_name='Basket', on_delete=django.db.models.deletion.SET_NULL, blank=True, to='basket.Basket', null=True)),
+                ('billing_address', models.ForeignKey(verbose_name='Billing Address', on_delete=django.db.models.deletion.SET_NULL, blank=True, to='order.BillingAddress', null=True)),
+                ('site', models.ForeignKey(verbose_name='Site', on_delete=django.db.models.deletion.SET_NULL, to='sites.Site', null=True)),
+                ('user', models.ForeignKey(verbose_name='User', on_delete=django.db.models.deletion.SET_NULL, blank=True, to=settings.AUTH_USER_MODEL, null=True)),
             ],
             options={
-                'ordering': [b'-date_placed'],
-                'abstract': False,
                 'verbose_name': 'Order',
                 'verbose_name_plural': 'Orders',
+                'ordering': ['-date_placed'],
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
@@ -175,63 +175,63 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='OrderDiscount',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('category', models.CharField(default=b'Basket', max_length=64, verbose_name='Discount category', choices=[(b'Basket', 'Basket'), (b'Shipping', 'Shipping'), (b'Deferred', 'Deferred')])),
-                ('offer_id', models.PositiveIntegerField(null=True, verbose_name='Offer ID', blank=True)),
-                ('offer_name', models.CharField(db_index=True, max_length=128, verbose_name='Offer name', blank=True)),
-                ('voucher_id', models.PositiveIntegerField(null=True, verbose_name='Voucher ID', blank=True)),
-                ('voucher_code', models.CharField(db_index=True, max_length=128, verbose_name='Code', blank=True)),
-                ('frequency', models.PositiveIntegerField(null=True, verbose_name='Frequency')),
-                ('amount', models.DecimalField(default=0, verbose_name='Amount', max_digits=12, decimal_places=2)),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('category', models.CharField(verbose_name='Discount category', choices=[('Basket', 'Basket'), ('Shipping', 'Shipping'), ('Deferred', 'Deferred')], default='Basket', max_length=64)),
+                ('offer_id', models.PositiveIntegerField(verbose_name='Offer ID', blank=True, null=True)),
+                ('offer_name', models.CharField(verbose_name='Offer name', blank=True, db_index=True, max_length=128)),
+                ('voucher_id', models.PositiveIntegerField(verbose_name='Voucher ID', blank=True, null=True)),
+                ('voucher_code', models.CharField(verbose_name='Code', blank=True, db_index=True, max_length=128)),
+                ('frequency', models.PositiveIntegerField(verbose_name='Frequency', null=True)),
+                ('amount', models.DecimalField(verbose_name='Amount', max_digits=12, decimal_places=2, default=0)),
                 ('message', models.TextField(blank=True)),
                 ('order', models.ForeignKey(verbose_name='Order', to='order.Order')),
             ],
             options={
-                'abstract': False,
                 'verbose_name': 'Order Discount',
                 'verbose_name_plural': 'Order Discounts',
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='OrderNote',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('note_type', models.CharField(max_length=128, verbose_name='Note Type', blank=True)),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('note_type', models.CharField(verbose_name='Note Type', blank=True, max_length=128)),
                 ('message', models.TextField(verbose_name='Message')),
-                ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Date Created')),
-                ('date_updated', models.DateTimeField(auto_now=True, verbose_name='Date Updated')),
+                ('date_created', models.DateTimeField(verbose_name='Date Created', auto_now_add=True)),
+                ('date_updated', models.DateTimeField(verbose_name='Date Updated', auto_now=True)),
                 ('order', models.ForeignKey(verbose_name='Order', to='order.Order')),
                 ('user', models.ForeignKey(verbose_name='User', to=settings.AUTH_USER_MODEL, null=True)),
             ],
             options={
-                'abstract': False,
                 'verbose_name': 'Order Note',
                 'verbose_name_plural': 'Order Notes',
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='PaymentEvent',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
                 ('amount', models.DecimalField(verbose_name='Amount', max_digits=12, decimal_places=2)),
-                ('reference', models.CharField(max_length=128, verbose_name='Reference', blank=True)),
-                ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Date created')),
+                ('reference', models.CharField(verbose_name='Reference', blank=True, max_length=128)),
+                ('date_created', models.DateTimeField(verbose_name='Date created', auto_now_add=True)),
                 ('order', models.ForeignKey(verbose_name='Order', to='order.Order')),
             ],
             options={
-                'ordering': [b'-date_created'],
-                'abstract': False,
                 'verbose_name': 'Payment Event',
                 'verbose_name_plural': 'Payment Events',
+                'ordering': ['-date_created'],
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='PaymentEventQuantity',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
                 ('quantity', models.PositiveIntegerField(verbose_name='Quantity')),
             ],
             options={
@@ -243,7 +243,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='paymentevent',
             name='lines',
-            field=models.ManyToManyField(to='order.Line', verbose_name='Lines', through='order.PaymentEventQuantity'),
+            field=models.ManyToManyField(verbose_name='Lines', through='order.PaymentEventQuantity', to='order.Line'),
             preserve_default=True,
         ),
         migrations.AddField(
@@ -260,20 +260,20 @@ class Migration(migrations.Migration):
         ),
         migrations.AlterUniqueTogether(
             name='paymenteventquantity',
-            unique_together=set([(b'event', b'line')]),
+            unique_together=set([('event', 'line')]),
         ),
         migrations.CreateModel(
             name='PaymentEventType',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('name', models.CharField(unique=True, max_length=128, verbose_name='Name')),
-                ('code', oscar.models.fields.autoslugfield.AutoSlugField(populate_from=b'name', editable=False, max_length=128, blank=True, unique=True, verbose_name='Code')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('name', models.CharField(verbose_name='Name', unique=True, max_length=128)),
+                ('code', oscar.models.fields.autoslugfield.AutoSlugField(editable=False, verbose_name='Code', blank=True, max_length=128, populate_from='name', unique=True)),
             ],
             options={
-                'ordering': (b'name',),
-                'abstract': False,
                 'verbose_name': 'Payment Event Type',
                 'verbose_name_plural': 'Payment Event Types',
+                'ordering': ('name',),
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
@@ -286,47 +286,47 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='ShippingAddress',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('title', models.CharField(blank=True, max_length=64, verbose_name='Title', choices=[(b'Mr', 'Mr'), (b'Miss', 'Miss'), (b'Mrs', 'Mrs'), (b'Ms', 'Ms'), (b'Dr', 'Dr')])),
-                ('first_name', models.CharField(max_length=255, verbose_name='First name', blank=True)),
-                ('last_name', models.CharField(max_length=255, verbose_name='Last name', blank=True)),
-                ('line1', models.CharField(max_length=255, verbose_name='First line of address')),
-                ('line2', models.CharField(max_length=255, verbose_name='Second line of address', blank=True)),
-                ('line3', models.CharField(max_length=255, verbose_name='Third line of address', blank=True)),
-                ('line4', models.CharField(max_length=255, verbose_name='City', blank=True)),
-                ('state', models.CharField(max_length=255, verbose_name='State/County', blank=True)),
-                ('postcode', oscar.models.fields.UppercaseCharField(max_length=64, verbose_name='Post/Zip-code', blank=True)),
-                ('search_text', models.TextField(verbose_name='Search text - used only for searching addresses', editable=False)),
-                ('phone_number', oscar.models.fields.PhoneNumberField(help_text='In case we need to call you about your order', verbose_name='Phone number', blank=True)),
-                ('notes', models.TextField(help_text='Tell us anything we should know when delivering your order.', verbose_name='Instructions', blank=True)),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('title', models.CharField(verbose_name='Title', choices=[('Mr', 'Mr'), ('Miss', 'Miss'), ('Mrs', 'Mrs'), ('Ms', 'Ms'), ('Dr', 'Dr')], blank=True, max_length=64)),
+                ('first_name', models.CharField(verbose_name='First name', blank=True, max_length=255)),
+                ('last_name', models.CharField(verbose_name='Last name', blank=True, max_length=255)),
+                ('line1', models.CharField(verbose_name='First line of address', max_length=255)),
+                ('line2', models.CharField(verbose_name='Second line of address', blank=True, max_length=255)),
+                ('line3', models.CharField(verbose_name='Third line of address', blank=True, max_length=255)),
+                ('line4', models.CharField(verbose_name='City', blank=True, max_length=255)),
+                ('state', models.CharField(verbose_name='State/County', blank=True, max_length=255)),
+                ('postcode', oscar.models.fields.UppercaseCharField(verbose_name='Post/Zip-code', blank=True, max_length=64)),
+                ('search_text', models.TextField(editable=False, verbose_name='Search text - used only for searching addresses')),
+                ('phone_number', oscar.models.fields.PhoneNumberField(verbose_name='Phone number', blank=True, help_text='In case we need to call you about your order')),
+                ('notes', models.TextField(verbose_name='Instructions', blank=True, help_text='Tell us anything we should know when delivering your order.')),
                 ('country', models.ForeignKey(verbose_name='Country', to='address.Country')),
             ],
             options={
-                'abstract': False,
                 'verbose_name': 'Shipping address',
                 'verbose_name_plural': 'Shipping addresses',
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.AddField(
             model_name='order',
             name='shipping_address',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.SET_NULL, verbose_name='Shipping Address', blank=True, to='order.ShippingAddress', null=True),
+            field=models.ForeignKey(verbose_name='Shipping Address', on_delete=django.db.models.deletion.SET_NULL, blank=True, to='order.ShippingAddress', null=True),
             preserve_default=True,
         ),
         migrations.CreateModel(
             name='ShippingEvent',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('notes', models.TextField(help_text='This could be the dispatch reference, or a tracking number', verbose_name='Event notes', blank=True)),
-                ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Date Created')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('notes', models.TextField(verbose_name='Event notes', blank=True, help_text='This could be the dispatch reference, or a tracking number')),
+                ('date_created', models.DateTimeField(verbose_name='Date Created', auto_now_add=True)),
                 ('order', models.ForeignKey(verbose_name='Order', to='order.Order')),
             ],
             options={
-                'ordering': [b'-date_created'],
-                'abstract': False,
                 'verbose_name': 'Shipping Event',
                 'verbose_name_plural': 'Shipping Events',
+                'ordering': ['-date_created'],
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
@@ -339,7 +339,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='ShippingEventQuantity',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
                 ('quantity', models.PositiveIntegerField(verbose_name='Quantity')),
             ],
             options={
@@ -351,7 +351,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='shippingevent',
             name='lines',
-            field=models.ManyToManyField(to='order.Line', verbose_name='Lines', through='order.ShippingEventQuantity'),
+            field=models.ManyToManyField(verbose_name='Lines', through='order.ShippingEventQuantity', to='order.Line'),
             preserve_default=True,
         ),
         migrations.AddField(
@@ -368,20 +368,20 @@ class Migration(migrations.Migration):
         ),
         migrations.AlterUniqueTogether(
             name='shippingeventquantity',
-            unique_together=set([(b'event', b'line')]),
+            unique_together=set([('event', 'line')]),
         ),
         migrations.CreateModel(
             name='ShippingEventType',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('name', models.CharField(unique=True, max_length=255, verbose_name='Name')),
-                ('code', oscar.models.fields.autoslugfield.AutoSlugField(populate_from=b'name', editable=False, max_length=128, blank=True, unique=True, verbose_name='Code')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('name', models.CharField(verbose_name='Name', unique=True, max_length=255)),
+                ('code', oscar.models.fields.autoslugfield.AutoSlugField(editable=False, verbose_name='Code', blank=True, max_length=128, populate_from='name', unique=True)),
             ],
             options={
-                'ordering': (b'name',),
-                'abstract': False,
                 'verbose_name': 'Shipping Event Type',
                 'verbose_name_plural': 'Shipping Event Types',
+                'ordering': ('name',),
+                'abstract': False,
             },
             bases=(models.Model,),
         ),

oscar/apps/order/processing.py

@@ -38,7 +38,7 @@ class EventHandler(object):
         # Example implementation
         self.validate_shipping_event(
             order, event_type, lines, line_quantities, **kwargs)
-        self.create_shipping_event(
+        return self.create_shipping_event(
             order, event_type, lines, line_quantities, **kwargs)
 
     def handle_payment_event(self, order, event_type, amount, lines=None,
@@ -53,7 +53,7 @@ class EventHandler(object):
         """
         self.validate_payment_event(
             order, event_type, amount, lines, line_quantities, **kwargs)
-        self.create_payment_event(
+        return self.create_payment_event(
             order, event_type, amount, lines, line_quantities, **kwargs)
 
     def handle_order_status_change(self, order, new_status, note_msg=None):

oscar/apps/partner/abstract_models.py

@@ -1,5 +1,6 @@
 from django.db import models
 from django.conf import settings
+from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _, pgettext_lazy
 
 from oscar.core.compat import AUTH_USER_MODEL
@@ -7,6 +8,7 @@ from oscar.models.fields import AutoSlugField
 from oscar.apps.partner.exceptions import InvalidStockAdjustment
 
 
+@python_2_unicode_compatible
 class AbstractPartner(models.Model):
     """
     A fulfillment partner. An individual or company who can fulfil products.
@@ -68,10 +70,11 @@ class AbstractPartner(models.Model):
         verbose_name = _('Fulfillment partner')
         verbose_name_plural = _('Fulfillment partners')
 
-    def __unicode__(self):
+    def __str__(self):
         return self.display_name
 
 
+@python_2_unicode_compatible
 class AbstractStockRecord(models.Model):
     """
     A stock record.
@@ -142,7 +145,7 @@ class AbstractStockRecord(models.Model):
     date_updated = models.DateTimeField(_("Date updated"), auto_now=True,
                                         db_index=True)
 
-    def __unicode__(self):
+    def __str__(self):
         msg = u"Partner: %s, product: %s" % (
             self.partner.display_name, self.product,)
         if self.partner_sku:
@@ -221,6 +224,7 @@ class AbstractStockRecord(models.Model):
         return self.net_stock_level < self.low_stock_threshold
 
 
+@python_2_unicode_compatible
 class AbstractStockAlert(models.Model):
     """
     A stock alert. E.g. used to notify users when a product is 'back in stock'.
@@ -244,7 +248,7 @@ class AbstractStockAlert(models.Model):
         self.save()
     close.alters_data = True
 
-    def __unicode__(self):
+    def __str__(self):
         return _('<stockalert for "%(stock)s" status %(status)s>') \
             % {'stock': self.stockrecord, 'status': self.status}
 

oscar/apps/partner/migrations/0001_initial.py

@@ -2,9 +2,9 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
+import oscar.models.fields
 import oscar.models.fields.autoslugfield
 from django.conf import settings
-import oscar.models.fields
 
 
 class Migration(migrations.Migration):
@@ -19,81 +19,81 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Partner',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('code', oscar.models.fields.autoslugfield.AutoSlugField(populate_from=b'name', editable=False, max_length=128, blank=True, unique=True, verbose_name='Code')),
-                ('name', models.CharField(max_length=128, verbose_name='Name', blank=True)),
-                ('users', models.ManyToManyField(to=settings.AUTH_USER_MODEL, null=True, verbose_name='Users', blank=True)),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('code', oscar.models.fields.autoslugfield.AutoSlugField(editable=False, verbose_name='Code', blank=True, max_length=128, populate_from='name', unique=True)),
+                ('name', models.CharField(verbose_name='Name', blank=True, max_length=128)),
+                ('users', models.ManyToManyField(verbose_name='Users', blank=True, to=settings.AUTH_USER_MODEL, null=True)),
             ],
             options={
-                'abstract': False,
                 'verbose_name': 'Fulfillment partner',
                 'verbose_name_plural': 'Fulfillment partners',
-                'permissions': ((b'dashboard_access', b'Can access dashboard'),),
+                'permissions': (('dashboard_access', 'Can access dashboard'),),
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='PartnerAddress',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('title', models.CharField(blank=True, max_length=64, verbose_name='Title', choices=[(b'Mr', 'Mr'), (b'Miss', 'Miss'), (b'Mrs', 'Mrs'), (b'Ms', 'Ms'), (b'Dr', 'Dr')])),
-                ('first_name', models.CharField(max_length=255, verbose_name='First name', blank=True)),
-                ('last_name', models.CharField(max_length=255, verbose_name='Last name', blank=True)),
-                ('line1', models.CharField(max_length=255, verbose_name='First line of address')),
-                ('line2', models.CharField(max_length=255, verbose_name='Second line of address', blank=True)),
-                ('line3', models.CharField(max_length=255, verbose_name='Third line of address', blank=True)),
-                ('line4', models.CharField(max_length=255, verbose_name='City', blank=True)),
-                ('state', models.CharField(max_length=255, verbose_name='State/County', blank=True)),
-                ('postcode', oscar.models.fields.UppercaseCharField(max_length=64, verbose_name='Post/Zip-code', blank=True)),
-                ('search_text', models.TextField(verbose_name='Search text - used only for searching addresses', editable=False)),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('title', models.CharField(verbose_name='Title', choices=[('Mr', 'Mr'), ('Miss', 'Miss'), ('Mrs', 'Mrs'), ('Ms', 'Ms'), ('Dr', 'Dr')], blank=True, max_length=64)),
+                ('first_name', models.CharField(verbose_name='First name', blank=True, max_length=255)),
+                ('last_name', models.CharField(verbose_name='Last name', blank=True, max_length=255)),
+                ('line1', models.CharField(verbose_name='First line of address', max_length=255)),
+                ('line2', models.CharField(verbose_name='Second line of address', blank=True, max_length=255)),
+                ('line3', models.CharField(verbose_name='Third line of address', blank=True, max_length=255)),
+                ('line4', models.CharField(verbose_name='City', blank=True, max_length=255)),
+                ('state', models.CharField(verbose_name='State/County', blank=True, max_length=255)),
+                ('postcode', oscar.models.fields.UppercaseCharField(verbose_name='Post/Zip-code', blank=True, max_length=64)),
+                ('search_text', models.TextField(editable=False, verbose_name='Search text - used only for searching addresses')),
                 ('country', models.ForeignKey(verbose_name='Country', to='address.Country')),
                 ('partner', models.ForeignKey(verbose_name='Partner', to='partner.Partner')),
             ],
             options={
-                'abstract': False,
                 'verbose_name': 'Partner address',
                 'verbose_name_plural': 'Partner addresses',
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='StockAlert',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
                 ('threshold', models.PositiveIntegerField(verbose_name='Threshold')),
-                ('status', models.CharField(default=b'Open', max_length=128, verbose_name='Status', choices=[(b'Open', 'Open'), (b'Closed', 'Closed')])),
-                ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Date Created')),
-                ('date_closed', models.DateTimeField(null=True, verbose_name='Date Closed', blank=True)),
+                ('status', models.CharField(verbose_name='Status', choices=[('Open', 'Open'), ('Closed', 'Closed')], default='Open', max_length=128)),
+                ('date_created', models.DateTimeField(verbose_name='Date Created', auto_now_add=True)),
+                ('date_closed', models.DateTimeField(verbose_name='Date Closed', blank=True, null=True)),
             ],
             options={
-                'ordering': (b'-date_created',),
-                'abstract': False,
                 'verbose_name': 'Stock alert',
                 'verbose_name_plural': 'Stock alerts',
+                'ordering': ('-date_created',),
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='StockRecord',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('partner_sku', models.CharField(max_length=128, verbose_name='Partner SKU')),
-                ('price_currency', models.CharField(default=b'GBP', max_length=12, verbose_name='Currency')),
-                ('price_excl_tax', models.DecimalField(null=True, verbose_name='Price (excl. tax)', max_digits=12, decimal_places=2, blank=True)),
-                ('price_retail', models.DecimalField(null=True, verbose_name='Price (retail)', max_digits=12, decimal_places=2, blank=True)),
-                ('cost_price', models.DecimalField(null=True, verbose_name='Cost Price', max_digits=12, decimal_places=2, blank=True)),
-                ('num_in_stock', models.PositiveIntegerField(null=True, verbose_name='Number in stock', blank=True)),
-                ('num_allocated', models.IntegerField(null=True, verbose_name='Number allocated', blank=True)),
-                ('low_stock_threshold', models.PositiveIntegerField(null=True, verbose_name='Low Stock Threshold', blank=True)),
-                ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Date created')),
-                ('date_updated', models.DateTimeField(auto_now=True, verbose_name='Date updated', db_index=True)),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('partner_sku', models.CharField(verbose_name='Partner SKU', max_length=128)),
+                ('price_currency', models.CharField(verbose_name='Currency', default='GBP', max_length=12)),
+                ('price_excl_tax', models.DecimalField(verbose_name='Price (excl. tax)', max_digits=12, decimal_places=2, blank=True, null=True)),
+                ('price_retail', models.DecimalField(verbose_name='Price (retail)', max_digits=12, decimal_places=2, blank=True, null=True)),
+                ('cost_price', models.DecimalField(verbose_name='Cost Price', max_digits=12, decimal_places=2, blank=True, null=True)),
+                ('num_in_stock', models.PositiveIntegerField(verbose_name='Number in stock', blank=True, null=True)),
+                ('num_allocated', models.IntegerField(verbose_name='Number allocated', blank=True, null=True)),
+                ('low_stock_threshold', models.PositiveIntegerField(verbose_name='Low Stock Threshold', blank=True, null=True)),
+                ('date_created', models.DateTimeField(verbose_name='Date created', auto_now_add=True)),
+                ('date_updated', models.DateTimeField(verbose_name='Date updated', auto_now=True, db_index=True)),
                 ('partner', models.ForeignKey(verbose_name='Partner', to='partner.Partner')),
                 ('product', models.ForeignKey(verbose_name='Product', to='catalogue.Product')),
             ],
             options={
-                'abstract': False,
                 'verbose_name': 'Stock record',
                 'verbose_name_plural': 'Stock records',
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
@@ -105,6 +105,6 @@ class Migration(migrations.Migration):
         ),
         migrations.AlterUniqueTogether(
             name='stockrecord',
-            unique_together=set([(b'partner', b'partner_sku')]),
+            unique_together=set([('partner', 'partner_sku')]),
         ),
     ]

oscar/apps/payment/abstract_models.py

@@ -1,6 +1,7 @@
 from decimal import Decimal
 
 from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 from django.conf import settings
 
@@ -11,6 +12,7 @@ from oscar.models.fields import AutoSlugField
 from . import bankcards
 
 
+@python_2_unicode_compatible
 class AbstractTransaction(models.Model):
     """
     A transaction for a particular payment source.
@@ -39,7 +41,7 @@ class AbstractTransaction(models.Model):
     status = models.CharField(_("Status"), max_length=128, blank=True)
     date_created = models.DateTimeField(_("Date Created"), auto_now_add=True)
 
-    def __unicode__(self):
+    def __str__(self):
         return _(u"%(type)s of %(amount).2f") % {
             'type': self.txn_type,
             'amount': self.amount}
@@ -52,6 +54,7 @@ class AbstractTransaction(models.Model):
         verbose_name_plural = _("Transactions")
 
 
+@python_2_unicode_compatible
 class AbstractSource(models.Model):
     """
     A source of payment for an order.
@@ -104,7 +107,7 @@ class AbstractSource(models.Model):
         verbose_name = _("Source")
         verbose_name_plural = _("Sources")
 
-    def __unicode__(self):
+    def __str__(self):
         description = _("Allocation of %(amount)s from type %(type)s") % {
             'amount': currency(self.amount_allocated, self.currency),
             'type': self.source_type}
@@ -191,6 +194,7 @@ class AbstractSource(models.Model):
         return self.amount_debited - self.amount_refunded
 
 
+@python_2_unicode_compatible
 class AbstractSourceType(models.Model):
     """
     A type of payment source.
@@ -209,10 +213,11 @@ class AbstractSourceType(models.Model):
         verbose_name = _("Source Type")
         verbose_name_plural = _("Source Types")
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
 
+@python_2_unicode_compatible
 class AbstractBankcard(models.Model):
     """
     Model representing a user's bankcard.  This is used for two purposes:
@@ -256,7 +261,7 @@ class AbstractBankcard(models.Model):
     issue_number = None
     ccv = None
 
-    def __unicode__(self):
+    def __str__(self):
         return _(u"%(card_type)s %(number)s (Expires: %(expiry)s)") % {
             'card_type': self.card_type,
             'number': self.number,

oscar/apps/payment/bankcards.py

@@ -1,4 +1,4 @@
-from six.moves import map
+from django.utils.six.moves import map
 VISA, VISA_ELECTRON, MASTERCARD, AMEX, MAESTRO, DISCOVER = (
     'Visa', 'Visa Electron', 'Mastercard', 'American Express',
     'Maestro', 'Discover')

oscar/apps/payment/forms.py

@@ -1,7 +1,6 @@
 from datetime import date
 from calendar import monthrange
 import re
-import six
 
 from django import forms
 from django.core.exceptions import ImproperlyConfigured
@@ -124,10 +123,10 @@ class BankcardExpiryMonthField(BankcardMonthField):
         super(BankcardExpiryMonthField, self).__init__(*args, **_kwargs)
 
     def month_choices(self):
-        return [("%.2d" % x, "%.2d" % x) for x in six.moves.xrange(1, 13)]
+        return [("%.2d" % x, "%.2d" % x) for x in range(1, 13)]
 
     def year_choices(self):
-        return [(x, x) for x in six.moves.xrange(
+        return [(x, x) for x in range(
             date.today().year,
             date.today().year + self.num_years)]
 
@@ -165,13 +164,13 @@ class BankcardStartingMonthField(BankcardMonthField):
         super(BankcardStartingMonthField, self).__init__(*args, **_kwargs)
 
     def month_choices(self):
-        months = [("%.2d" % x, "%.2d" % x) for x in six.moves.xrange(1, 13)]
+        months = [("%.2d" % x, "%.2d" % x) for x in range(1, 13)]
         months.insert(0, ("", "--"))
         return months
 
     def year_choices(self):
         today = date.today()
-        years = [(x, x) for x in six.moves.xrange(
+        years = [(x, x) for x in range(
             today.year - self.num_years,
             today.year + 1)]
         years.insert(0, ("", "--"))

oscar/apps/payment/migrations/0001_initial.py

@@ -10,59 +10,59 @@ from decimal import Decimal
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('order', '0001_initial'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('order', '0001_initial'),
     ]
 
     operations = [
         migrations.CreateModel(
             name='Bankcard',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('card_type', models.CharField(max_length=128, verbose_name='Card Type')),
-                ('name', models.CharField(max_length=255, verbose_name='Name', blank=True)),
-                ('number', models.CharField(max_length=32, verbose_name='Number')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('card_type', models.CharField(verbose_name='Card Type', max_length=128)),
+                ('name', models.CharField(verbose_name='Name', blank=True, max_length=255)),
+                ('number', models.CharField(verbose_name='Number', max_length=32)),
                 ('expiry_date', models.DateField(verbose_name='Expiry Date')),
-                ('partner_reference', models.CharField(max_length=255, verbose_name='Partner Reference', blank=True)),
+                ('partner_reference', models.CharField(verbose_name='Partner Reference', blank=True, max_length=255)),
                 ('user', models.ForeignKey(verbose_name='User', to=settings.AUTH_USER_MODEL)),
             ],
             options={
-                'abstract': False,
                 'verbose_name': 'Bankcard',
                 'verbose_name_plural': 'Bankcards',
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='Source',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('currency', models.CharField(default=b'GBP', max_length=12, verbose_name='Currency')),
-                ('amount_allocated', models.DecimalField(default=Decimal('0.00'), verbose_name='Amount Allocated', max_digits=12, decimal_places=2)),
-                ('amount_debited', models.DecimalField(default=Decimal('0.00'), verbose_name='Amount Debited', max_digits=12, decimal_places=2)),
-                ('amount_refunded', models.DecimalField(default=Decimal('0.00'), verbose_name='Amount Refunded', max_digits=12, decimal_places=2)),
-                ('reference', models.CharField(max_length=128, verbose_name='Reference', blank=True)),
-                ('label', models.CharField(max_length=128, verbose_name='Label', blank=True)),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('currency', models.CharField(verbose_name='Currency', default='GBP', max_length=12)),
+                ('amount_allocated', models.DecimalField(verbose_name='Amount Allocated', max_digits=12, decimal_places=2, default=Decimal('0.00'))),
+                ('amount_debited', models.DecimalField(verbose_name='Amount Debited', max_digits=12, decimal_places=2, default=Decimal('0.00'))),
+                ('amount_refunded', models.DecimalField(verbose_name='Amount Refunded', max_digits=12, decimal_places=2, default=Decimal('0.00'))),
+                ('reference', models.CharField(verbose_name='Reference', blank=True, max_length=128)),
+                ('label', models.CharField(verbose_name='Label', blank=True, max_length=128)),
                 ('order', models.ForeignKey(verbose_name='Order', to='order.Order')),
             ],
             options={
-                'abstract': False,
                 'verbose_name': 'Source',
                 'verbose_name_plural': 'Sources',
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='SourceType',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('name', models.CharField(max_length=128, verbose_name='Name')),
-                ('code', oscar.models.fields.autoslugfield.AutoSlugField(populate_from=b'name', editable=False, max_length=128, blank=True, help_text='This is used within forms to identify this source type', unique=True, verbose_name='Code')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('name', models.CharField(verbose_name='Name', max_length=128)),
+                ('code', oscar.models.fields.autoslugfield.AutoSlugField(editable=False, verbose_name='Code', blank=True, max_length=128, populate_from='name', help_text='This is used within forms to identify this source type', unique=True)),
             ],
             options={
-                'abstract': False,
                 'verbose_name': 'Source Type',
                 'verbose_name_plural': 'Source Types',
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
@@ -75,19 +75,19 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Transaction',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('txn_type', models.CharField(max_length=128, verbose_name='Type', blank=True)),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('txn_type', models.CharField(verbose_name='Type', blank=True, max_length=128)),
                 ('amount', models.DecimalField(verbose_name='Amount', max_digits=12, decimal_places=2)),
-                ('reference', models.CharField(max_length=128, verbose_name='Reference', blank=True)),
-                ('status', models.CharField(max_length=128, verbose_name='Status', blank=True)),
-                ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Date Created')),
+                ('reference', models.CharField(verbose_name='Reference', blank=True, max_length=128)),
+                ('status', models.CharField(verbose_name='Status', blank=True, max_length=128)),
+                ('date_created', models.DateTimeField(verbose_name='Date Created', auto_now_add=True)),
                 ('source', models.ForeignKey(verbose_name='Source', to='payment.Source')),
             ],
             options={
-                'ordering': [b'-date_created'],
-                'abstract': False,
                 'verbose_name': 'Transaction',
                 'verbose_name_plural': 'Transactions',
+                'ordering': ['-date_created'],
+                'abstract': False,
             },
             bases=(models.Model,),
         ),

oscar/apps/promotions/admin.py

@@ -17,14 +17,6 @@ class PagePromotionAdmin(admin.ModelAdmin):
     list_display = ['page_url', 'content_object', 'position']
     exclude = ['clicks']
 
-    def get_form(self, request, obj=None, **kwargs):
-        form = super(PagePromotionAdmin, self).get_form(request, obj, **kwargs)
-        # Only allow links to models within the promotions app
-        form.base_fields['content_type'].queryset \
-            = form.base_fields['content_type'].queryset\
-            .filter(app_label='promotions')
-        return form
-
 
 class KeywordPromotionAdmin(admin.ModelAdmin):
     list_display = ['keyword', 'position', 'clicks']

oscar/apps/promotions/migrations/0001_initial.py

@@ -9,21 +9,21 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('catalogue', '0001_initial'),
-        ('contenttypes', '__latest__'),
+        ('contenttypes', '0001_initial'),
     ]
 
     operations = [
         migrations.CreateModel(
             name='AutomaticProductList',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('name', models.CharField(max_length=255, verbose_name='Title')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('name', models.CharField(verbose_name='Title', max_length=255)),
                 ('description', models.TextField(verbose_name='Description', blank=True)),
                 ('link_url', oscar.models.fields.ExtendedURLField(verbose_name='Link URL', blank=True)),
-                ('link_text', models.CharField(max_length=255, verbose_name='Link text', blank=True)),
+                ('link_text', models.CharField(verbose_name='Link text', blank=True, max_length=255)),
                 ('date_created', models.DateTimeField(auto_now_add=True)),
-                ('method', models.CharField(max_length=128, verbose_name='Method', choices=[(b'Bestselling', 'Bestselling products'), (b'RecentlyAdded', 'Recently added products')])),
-                ('num_products', models.PositiveSmallIntegerField(default=4, verbose_name='Number of Products')),
+                ('method', models.CharField(verbose_name='Method', choices=[('Bestselling', 'Bestselling products'), ('RecentlyAdded', 'Recently added products')], max_length=128)),
+                ('num_products', models.PositiveSmallIntegerField(verbose_name='Number of Products', default=4)),
             ],
             options={
                 'verbose_name': 'Automatic product list',
@@ -34,11 +34,11 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='HandPickedProductList',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('name', models.CharField(max_length=255, verbose_name='Title')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('name', models.CharField(verbose_name='Title', max_length=255)),
                 ('description', models.TextField(verbose_name='Description', blank=True)),
                 ('link_url', oscar.models.fields.ExtendedURLField(verbose_name='Link URL', blank=True)),
-                ('link_text', models.CharField(max_length=255, verbose_name='Link text', blank=True)),
+                ('link_text', models.CharField(verbose_name='Link text', blank=True, max_length=255)),
                 ('date_created', models.DateTimeField(auto_now_add=True)),
             ],
             options={
@@ -50,10 +50,10 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Image',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('name', models.CharField(max_length=128, verbose_name='Name')),
-                ('link_url', oscar.models.fields.ExtendedURLField(help_text='This is where this promotion links to', verbose_name='Link URL', blank=True)),
-                ('image', models.ImageField(upload_to=b'images/promotions/', max_length=255, verbose_name='Image')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('name', models.CharField(verbose_name='Name', max_length=128)),
+                ('link_url', oscar.models.fields.ExtendedURLField(verbose_name='Link URL', blank=True, help_text='This is where this promotion links to')),
+                ('image', models.ImageField(verbose_name='Image', upload_to='images/promotions/', max_length=255)),
                 ('date_created', models.DateTimeField(auto_now_add=True)),
             ],
             options={
@@ -65,31 +65,31 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='KeywordPromotion',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
                 ('object_id', models.PositiveIntegerField()),
-                ('position', models.CharField(help_text=b'Position on page', max_length=100, verbose_name='Position')),
-                ('display_order', models.PositiveIntegerField(default=0, verbose_name='Display Order')),
-                ('clicks', models.PositiveIntegerField(default=0, verbose_name='Clicks')),
-                ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Date Created')),
-                ('keyword', models.CharField(max_length=200, verbose_name='Keyword')),
-                ('filter', models.CharField(max_length=200, verbose_name='Filter', blank=True)),
+                ('position', models.CharField(verbose_name='Position', help_text='Position on page', max_length=100)),
+                ('display_order', models.PositiveIntegerField(verbose_name='Display Order', default=0)),
+                ('clicks', models.PositiveIntegerField(verbose_name='Clicks', default=0)),
+                ('date_created', models.DateTimeField(verbose_name='Date Created', auto_now_add=True)),
+                ('keyword', models.CharField(verbose_name='Keyword', max_length=200)),
+                ('filter', models.CharField(verbose_name='Filter', blank=True, max_length=200)),
                 ('content_type', models.ForeignKey(to='contenttypes.ContentType')),
             ],
             options={
-                'ordering': [b'-clicks'],
-                'abstract': False,
                 'verbose_name': 'Keyword Promotion',
                 'verbose_name_plural': 'Keyword Promotions',
+                'ordering': ['-clicks'],
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='MultiImage',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('name', models.CharField(max_length=128, verbose_name='Name')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('name', models.CharField(verbose_name='Name', max_length=128)),
                 ('date_created', models.DateTimeField(auto_now_add=True)),
-                ('images', models.ManyToManyField(to='promotions.Image', null=True, blank=True)),
+                ('images', models.ManyToManyField(blank=True, to='promotions.Image', null=True)),
             ],
             options={
                 'verbose_name': 'Multi Image',
@@ -100,20 +100,20 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='OrderedProduct',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('display_order', models.PositiveIntegerField(default=0, verbose_name='Display Order')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('display_order', models.PositiveIntegerField(verbose_name='Display Order', default=0)),
             ],
             options={
-                'ordering': (b'display_order',),
                 'verbose_name': 'Ordered product',
                 'verbose_name_plural': 'Ordered product',
+                'ordering': ('display_order',),
             },
             bases=(models.Model,),
         ),
         migrations.AddField(
             model_name='handpickedproductlist',
             name='products',
-            field=models.ManyToManyField(to='catalogue.Product', null=True, verbose_name='Products', through='promotions.OrderedProduct', blank=True),
+            field=models.ManyToManyField(verbose_name='Products', through='promotions.OrderedProduct', blank=True, to='catalogue.Product', null=True),
             preserve_default=True,
         ),
         migrations.AddField(
@@ -130,47 +130,47 @@ class Migration(migrations.Migration):
         ),
         migrations.AlterUniqueTogether(
             name='orderedproduct',
-            unique_together=set([(b'list', b'product')]),
+            unique_together=set([('list', 'product')]),
         ),
         migrations.CreateModel(
             name='OrderedProductList',
             fields=[
-                ('handpickedproductlist_ptr', models.OneToOneField(auto_created=True, primary_key=True, serialize=False, to='promotions.HandPickedProductList')),
-                ('display_order', models.PositiveIntegerField(default=0, verbose_name='Display Order')),
+                ('handpickedproductlist_ptr', models.OneToOneField(primary_key=True, serialize=False, auto_created=True, to='promotions.HandPickedProductList')),
+                ('display_order', models.PositiveIntegerField(verbose_name='Display Order', default=0)),
             ],
             options={
-                'ordering': (b'display_order',),
                 'verbose_name': 'Ordered Product List',
                 'verbose_name_plural': 'Ordered Product Lists',
+                'ordering': ('display_order',),
             },
             bases=('promotions.handpickedproductlist',),
         ),
         migrations.CreateModel(
             name='PagePromotion',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
                 ('object_id', models.PositiveIntegerField()),
-                ('position', models.CharField(help_text=b'Position on page', max_length=100, verbose_name='Position')),
-                ('display_order', models.PositiveIntegerField(default=0, verbose_name='Display Order')),
-                ('clicks', models.PositiveIntegerField(default=0, verbose_name='Clicks')),
-                ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Date Created')),
-                ('page_url', oscar.models.fields.ExtendedURLField(max_length=128, verbose_name='Page URL', verify_exists=True, db_index=True)),
+                ('position', models.CharField(verbose_name='Position', help_text='Position on page', max_length=100)),
+                ('display_order', models.PositiveIntegerField(verbose_name='Display Order', default=0)),
+                ('clicks', models.PositiveIntegerField(verbose_name='Clicks', default=0)),
+                ('date_created', models.DateTimeField(verbose_name='Date Created', auto_now_add=True)),
+                ('page_url', oscar.models.fields.ExtendedURLField(verbose_name='Page URL', verify_exists=True, db_index=True, max_length=128)),
                 ('content_type', models.ForeignKey(to='contenttypes.ContentType')),
             ],
             options={
-                'ordering': [b'-clicks'],
-                'abstract': False,
                 'verbose_name': 'Page Promotion',
                 'verbose_name_plural': 'Page Promotions',
+                'ordering': ['-clicks'],
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='RawHTML',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('name', models.CharField(max_length=128, verbose_name='Name')),
-                ('display_type', models.CharField(help_text='This can be used to have different types of HTML blocks (eg different widths)', max_length=128, verbose_name='Display type', blank=True)),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('name', models.CharField(verbose_name='Name', max_length=128)),
+                ('display_type', models.CharField(verbose_name='Display type', blank=True, help_text='This can be used to have different types of HTML blocks (eg different widths)', max_length=128)),
                 ('body', models.TextField(verbose_name='HTML')),
                 ('date_created', models.DateTimeField(auto_now_add=True)),
             ],
@@ -183,8 +183,8 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='SingleProduct',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('name', models.CharField(max_length=128, verbose_name='Name')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('name', models.CharField(verbose_name='Name', max_length=128)),
                 ('description', models.TextField(verbose_name='Description', blank=True)),
                 ('date_created', models.DateTimeField(auto_now_add=True)),
                 ('product', models.ForeignKey(to='catalogue.Product')),
@@ -198,9 +198,9 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='TabbedBlock',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('name', models.CharField(max_length=255, verbose_name='Title')),
-                ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Date Created')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('name', models.CharField(verbose_name='Title', max_length=255)),
+                ('date_created', models.DateTimeField(verbose_name='Date Created', auto_now_add=True)),
             ],
             options={
                 'verbose_name': 'Tabbed Block',

oscar/apps/promotions/models.py

@@ -1,5 +1,6 @@
 from django.db import models
 from django.conf import settings
+from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _, pgettext_lazy
 from django.core.urlresolvers import reverse
 from django.contrib.contenttypes.models import ContentType
@@ -38,6 +39,7 @@ class LinkedPromotion(models.Model):
     record_click.alters_data = True
 
 
+@python_2_unicode_compatible
 class PagePromotion(LinkedPromotion):
     """
     A promotion embedded on a particular page.
@@ -45,7 +47,7 @@ class PagePromotion(LinkedPromotion):
     page_url = ExtendedURLField(
         _('Page URL'), max_length=128, db_index=True, verify_exists=True)
 
-    def __unicode__(self):
+    def __str__(self):
         return u"%s on %s" % (self.content_object, self.page_url)
 
     def get_link(self):
@@ -134,6 +136,7 @@ class AbstractPromotion(models.Model):
         return page_count + keyword_count
 
 
+@python_2_unicode_compatible
 class RawHTML(AbstractPromotion):
     """
     Simple promotion - just raw HTML
@@ -156,10 +159,11 @@ class RawHTML(AbstractPromotion):
         verbose_name = _('Raw HTML')
         verbose_name_plural = _('Raw HTML')
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
 
+@python_2_unicode_compatible
 class Image(AbstractPromotion):
     """
     An image promotion is simply a named image which has an optional
@@ -177,7 +181,7 @@ class Image(AbstractPromotion):
         max_length=255)
     date_created = models.DateTimeField(auto_now_add=True)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
     class Meta:
@@ -186,6 +190,7 @@ class Image(AbstractPromotion):
         verbose_name_plural = _("Image")
 
 
+@python_2_unicode_compatible
 class MultiImage(AbstractPromotion):
     """
     A multi-image promotion is simply a collection of image promotions
@@ -201,7 +206,7 @@ class MultiImage(AbstractPromotion):
             "(You may need to create some first)."))
     date_created = models.DateTimeField(auto_now_add=True)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
     class Meta:
@@ -210,6 +215,7 @@ class MultiImage(AbstractPromotion):
         verbose_name_plural = _("Multi Images")
 
 
+@python_2_unicode_compatible
 class SingleProduct(AbstractPromotion):
     _type = 'Single product'
     name = models.CharField(_("Name"), max_length=128)
@@ -217,7 +223,7 @@ class SingleProduct(AbstractPromotion):
     description = models.TextField(_("Description"), blank=True)
     date_created = models.DateTimeField(auto_now_add=True)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
     def template_context(self, request):
@@ -229,6 +235,7 @@ class SingleProduct(AbstractPromotion):
         verbose_name_plural = _("Single product")
 
 
+@python_2_unicode_compatible
 class AbstractProductList(AbstractPromotion):
     """
     Abstract superclass for promotions which are essentially a list
@@ -248,7 +255,7 @@ class AbstractProductList(AbstractPromotion):
         verbose_name = _("Product list")
         verbose_name_plural = _("Product lists")
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
     def template_context(self, request):

oscar/apps/search/facets.py

@@ -1,6 +1,6 @@
 from django.conf import settings
 from purl import URL
-from six.moves import map
+from django.utils.six.moves import map
 
 
 def facet_data(request, form, results):  # noqa (too complex (10))

oscar/apps/shipping/abstract_models.py

@@ -2,6 +2,7 @@
 from decimal import Decimal as D
 
 from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 from django.core.validators import MinValueValidator
 
@@ -11,6 +12,7 @@ from oscar.models.fields import AutoSlugField
 Scale = loading.get_class('shipping.scales', 'Scale')
 
 
+@python_2_unicode_compatible
 class AbstractBase(models.Model):
     """
     Implements the interface declared by shipping.base.Base
@@ -34,7 +36,7 @@ class AbstractBase(models.Model):
         verbose_name = _("Shipping Method")
         verbose_name_plural = _("Shipping Methods")
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
 
@@ -174,6 +176,7 @@ class AbstractWeightBased(AbstractBase):
             return None
 
 
+@python_2_unicode_compatible
 class AbstractWeightBand(models.Model):
     """
     Represents a weight band which are used by the WeightBasedShipping method.
@@ -208,5 +211,5 @@ class AbstractWeightBand(models.Model):
         verbose_name = _("Weight Band")
         verbose_name_plural = _("Weight Bands")
 
-    def __unicode__(self):
+    def __str__(self):
         return _('Charge for weights up to %s kg') % (self.upper_limit,)

oscar/apps/shipping/methods.py

@@ -44,6 +44,9 @@ class Base(object):
 
 
 class Free(Base):
+    """
+    This shipping method specifies that shipping is free.
+    """
     code = 'free-shipping'
     name = _('Free shipping')
 
@@ -65,6 +68,10 @@ class NoShippingRequired(Free):
 
 
 class FixedPrice(Base):
+    """
+    This shipping method indicates that shipping costs a fixed price and
+    requires no special calculation.
+    """
     code = 'fixed-price-shipping'
     name = _('Fixed price shipping')
 
@@ -88,8 +95,8 @@ class FixedPrice(Base):
 
 class OfferDiscount(Base):
     """
-    Wrapper class that applies a discount to an existing shipping method's
-    charges
+    Wrapper class that applies a discount to an existing shipping 
+    method's charges.
     """
     is_discounted = True
 
@@ -120,6 +127,9 @@ class OfferDiscount(Base):
 
 
 class TaxExclusiveOfferDiscount(OfferDiscount):
+    """
+    Wrapper class which extends OfferDiscount to be exclusive of tax.
+    """
 
     def calculate(self, basket):
         base_charge = self.method.calculate(basket)
@@ -135,6 +145,9 @@ class TaxExclusiveOfferDiscount(OfferDiscount):
 
 
 class TaxInclusiveOfferDiscount(OfferDiscount):
+    """
+    Wrapper class which extends OfferDiscount to be inclusive of tax.
+    """
 
     def calculate(self, basket):
         base_charge = self.method.calculate(basket)

oscar/apps/shipping/migrations/0001_initial.py

@@ -2,9 +2,9 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
-import oscar.models.fields.autoslugfield
 from decimal import Decimal
 import django.core.validators
+import oscar.models.fields.autoslugfield
 
 
 class Migration(migrations.Migration):
@@ -17,53 +17,53 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='OrderAndItemCharges',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('code', oscar.models.fields.autoslugfield.AutoSlugField(populate_from=b'name', editable=False, max_length=128, blank=True, unique=True, verbose_name='Slug')),
-                ('name', models.CharField(unique=True, max_length=128, verbose_name='Name')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('code', oscar.models.fields.autoslugfield.AutoSlugField(editable=False, verbose_name='Slug', blank=True, max_length=128, populate_from='name', unique=True)),
+                ('name', models.CharField(verbose_name='Name', unique=True, max_length=128)),
                 ('description', models.TextField(verbose_name='Description', blank=True)),
-                ('price_per_order', models.DecimalField(default=Decimal('0.00'), verbose_name='Price per order', max_digits=12, decimal_places=2)),
-                ('price_per_item', models.DecimalField(default=Decimal('0.00'), verbose_name='Price per item', max_digits=12, decimal_places=2)),
-                ('free_shipping_threshold', models.DecimalField(null=True, verbose_name='Free Shipping', max_digits=12, decimal_places=2, blank=True)),
-                ('countries', models.ManyToManyField(to='address.Country', null=True, verbose_name='Countries', blank=True)),
+                ('price_per_order', models.DecimalField(verbose_name='Price per order', max_digits=12, decimal_places=2, default=Decimal('0.00'))),
+                ('price_per_item', models.DecimalField(verbose_name='Price per item', max_digits=12, decimal_places=2, default=Decimal('0.00'))),
+                ('free_shipping_threshold', models.DecimalField(verbose_name='Free Shipping', max_digits=12, decimal_places=2, blank=True, null=True)),
+                ('countries', models.ManyToManyField(verbose_name='Countries', blank=True, to='address.Country', null=True)),
             ],
             options={
-                'ordering': [b'name'],
-                'abstract': False,
                 'verbose_name': 'Order and Item Charge',
                 'verbose_name_plural': 'Order and Item Charges',
+                'ordering': ['name'],
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='WeightBand',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('upper_limit', models.DecimalField(help_text='Enter upper limit of this weight band in kg. The lower limit will be determined by the other weight bands.', verbose_name='Upper Limit', max_digits=12, decimal_places=3, validators=[django.core.validators.MinValueValidator(Decimal('0.00'))])),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('upper_limit', models.DecimalField(verbose_name='Upper Limit', max_digits=12, decimal_places=3, validators=[django.core.validators.MinValueValidator(Decimal('0.00'))], help_text='Enter upper limit of this weight band in kg. The lower limit will be determined by the other weight bands.')),
                 ('charge', models.DecimalField(verbose_name='Charge', max_digits=12, decimal_places=2, validators=[django.core.validators.MinValueValidator(Decimal('0.00'))])),
             ],
             options={
-                'ordering': [b'method', b'upper_limit'],
-                'abstract': False,
                 'verbose_name': 'Weight Band',
                 'verbose_name_plural': 'Weight Bands',
+                'ordering': ['method', 'upper_limit'],
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='WeightBased',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('code', oscar.models.fields.autoslugfield.AutoSlugField(populate_from=b'name', editable=False, max_length=128, blank=True, unique=True, verbose_name='Slug')),
-                ('name', models.CharField(unique=True, max_length=128, verbose_name='Name')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('code', oscar.models.fields.autoslugfield.AutoSlugField(editable=False, verbose_name='Slug', blank=True, max_length=128, populate_from='name', unique=True)),
+                ('name', models.CharField(verbose_name='Name', unique=True, max_length=128)),
                 ('description', models.TextField(verbose_name='Description', blank=True)),
-                ('default_weight', models.DecimalField(decimal_places=3, default=Decimal('0.000'), max_digits=12, validators=[django.core.validators.MinValueValidator(Decimal('0.00'))], help_text='Default product weight in kg when no weight attribute is defined', verbose_name='Default Weight')),
-                ('countries', models.ManyToManyField(to='address.Country', null=True, verbose_name='Countries', blank=True)),
+                ('default_weight', models.DecimalField(verbose_name='Default Weight', decimal_places=3, default=Decimal('0.000'), max_digits=12, validators=[django.core.validators.MinValueValidator(Decimal('0.00'))], help_text='Default product weight in kg when no weight attribute is defined')),
+                ('countries', models.ManyToManyField(verbose_name='Countries', blank=True, to='address.Country', null=True)),
             ],
             options={
-                'ordering': [b'name'],
-                'abstract': False,
                 'verbose_name': 'Weight-based Shipping Method',
                 'verbose_name_plural': 'Weight-based Shipping Methods',
+                'ordering': ['name'],
+                'abstract': False,
             },
             bases=(models.Model,),
         ),

oscar/apps/voucher/abstract_models.py

@@ -2,11 +2,13 @@ from decimal import Decimal
 
 from django.core import exceptions
 from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 from django.utils import timezone
 from oscar.core.compat import AUTH_USER_MODEL
 
 
+@python_2_unicode_compatible
 class AbstractVoucher(models.Model):
     """
     A voucher.  This is simply a link to a collection of offers.
@@ -57,7 +59,7 @@ class AbstractVoucher(models.Model):
         verbose_name = _("Voucher")
         verbose_name_plural = _("Vouchers")
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
     def clean(self):
@@ -129,6 +131,7 @@ class AbstractVoucher(models.Model):
         return self.offers.all()[0].benefit
 
 
+@python_2_unicode_compatible
 class AbstractVoucherApplication(models.Model):
     """
     For tracking how often a voucher has been used
@@ -150,7 +153,7 @@ class AbstractVoucherApplication(models.Model):
         verbose_name = _("Voucher Application")
         verbose_name_plural = _("Voucher Applications")
 
-    def __unicode__(self):
+    def __str__(self):
         return _("'%(voucher)s' used by '%(user)s'") % {
             'voucher': self.voucher,
             'user': self.user}

oscar/apps/voucher/migrations/0001_initial.py

@@ -18,39 +18,39 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Voucher',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('name', models.CharField(help_text='This will be shown in the checkout and basket once the voucher is entered', max_length=128, verbose_name='Name')),
-                ('code', models.CharField(help_text='Case insensitive / No spaces allowed', unique=True, max_length=128, verbose_name='Code', db_index=True)),
-                ('usage', models.CharField(default=b'Multi-use', max_length=128, verbose_name='Usage', choices=[(b'Single use', 'Can be used once by one customer'), (b'Multi-use', 'Can be used multiple times by multiple customers'), (b'Once per customer', 'Can only be used once per customer')])),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('name', models.CharField(verbose_name='Name', help_text='This will be shown in the checkout and basket once the voucher is entered', max_length=128)),
+                ('code', models.CharField(verbose_name='Code', unique=True, help_text='Case insensitive / No spaces allowed', db_index=True, max_length=128)),
+                ('usage', models.CharField(verbose_name='Usage', choices=[('Single use', 'Can be used once by one customer'), ('Multi-use', 'Can be used multiple times by multiple customers'), ('Once per customer', 'Can only be used once per customer')], default='Multi-use', max_length=128)),
                 ('start_datetime', models.DateTimeField(verbose_name='Start datetime')),
                 ('end_datetime', models.DateTimeField(verbose_name='End datetime')),
-                ('num_basket_additions', models.PositiveIntegerField(default=0, verbose_name='Times added to basket')),
-                ('num_orders', models.PositiveIntegerField(default=0, verbose_name='Times on orders')),
-                ('total_discount', models.DecimalField(default=Decimal('0.00'), verbose_name='Total discount', max_digits=12, decimal_places=2)),
+                ('num_basket_additions', models.PositiveIntegerField(verbose_name='Times added to basket', default=0)),
+                ('num_orders', models.PositiveIntegerField(verbose_name='Times on orders', default=0)),
+                ('total_discount', models.DecimalField(verbose_name='Total discount', max_digits=12, decimal_places=2, default=Decimal('0.00'))),
                 ('date_created', models.DateField(auto_now_add=True)),
-                ('offers', models.ManyToManyField(to='offer.ConditionalOffer', verbose_name='Offers')),
+                ('offers', models.ManyToManyField(verbose_name='Offers', to='offer.ConditionalOffer')),
             ],
             options={
-                'abstract': False,
-                'get_latest_by': b'date_created',
                 'verbose_name': 'Voucher',
                 'verbose_name_plural': 'Vouchers',
+                'abstract': False,
+                'get_latest_by': 'date_created',
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='VoucherApplication',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('date_created', models.DateField(auto_now_add=True, verbose_name='Date Created')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('date_created', models.DateField(verbose_name='Date Created', auto_now_add=True)),
                 ('order', models.ForeignKey(verbose_name='Order', to='order.Order')),
                 ('user', models.ForeignKey(verbose_name='User', blank=True, to=settings.AUTH_USER_MODEL, null=True)),
                 ('voucher', models.ForeignKey(verbose_name='Voucher', to='voucher.Voucher')),
             ],
             options={
-                'abstract': False,
                 'verbose_name': 'Voucher Application',
                 'verbose_name_plural': 'Voucher Applications',
+                'abstract': False,
             },
             bases=(models.Model,),
         ),

oscar/apps/wishlists/abstract_models.py

@@ -1,14 +1,16 @@
 import hashlib
 import random
-import six
+from django.utils import six
 
 from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _, pgettext_lazy
 from django.core.urlresolvers import reverse
 
 from oscar.core.compat import AUTH_USER_MODEL
 
 
+@python_2_unicode_compatible
 class AbstractWishList(models.Model):
     """
     Represents a user's wish lists of products.
@@ -48,7 +50,7 @@ class AbstractWishList(models.Model):
     date_created = models.DateTimeField(
         _('Date created'), auto_now_add=True, editable=False)
 
-    def __unicode__(self):
+    def __str__(self):
         return u"%s's Wish List '%s'" % (self.owner, self.name)
 
     def save(self, *args, **kwargs):
@@ -101,6 +103,7 @@ class AbstractWishList(models.Model):
             line.save()
 
 
+@python_2_unicode_compatible
 class AbstractLine(models.Model):
     """
     One entry in a wish list. Similar to order lines or basket lines.
@@ -116,7 +119,7 @@ class AbstractLine(models.Model):
     title = models.CharField(
         pgettext_lazy(u"Product title", u"Title"), max_length=255)
 
-    def __unicode__(self):
+    def __str__(self):
         return u'%sx %s on %s' % (self.quantity, self.title,
                                   self.wishlist.name)
 

oscar/apps/wishlists/migrations/0001_initial.py

@@ -17,31 +17,31 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Line',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('quantity', models.PositiveIntegerField(default=1, verbose_name='Quantity')),
-                ('title', models.CharField(max_length=255, verbose_name='Title')),
-                ('product', models.ForeignKey(on_delete=django.db.models.deletion.SET_NULL, verbose_name='Product', blank=True, to='catalogue.Product', null=True)),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('quantity', models.PositiveIntegerField(verbose_name='Quantity', default=1)),
+                ('title', models.CharField(verbose_name='Title', max_length=255)),
+                ('product', models.ForeignKey(verbose_name='Product', on_delete=django.db.models.deletion.SET_NULL, blank=True, to='catalogue.Product', null=True)),
             ],
             options={
-                'abstract': False,
                 'verbose_name': 'Wish list line',
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='WishList',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('name', models.CharField(default='Default', max_length=255, verbose_name='Name')),
-                ('key', models.CharField(verbose_name='Key', unique=True, max_length=6, editable=False, db_index=True)),
-                ('visibility', models.CharField(default=b'Private', max_length=20, verbose_name='Visibility', choices=[(b'Private', 'Private - Only the owner can see the wish list'), (b'Shared', 'Shared - Only the owner and people with access to the obfuscated link can see the wish list'), (b'Public', 'Public - Everybody can see the wish list')])),
-                ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Date created')),
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('name', models.CharField(verbose_name='Name', default='Default', max_length=255)),
+                ('key', models.CharField(editable=False, verbose_name='Key', unique=True, db_index=True, max_length=6)),
+                ('visibility', models.CharField(verbose_name='Visibility', choices=[('Private', 'Private - Only the owner can see the wish list'), ('Shared', 'Shared - Only the owner and people with access to the obfuscated link can see the wish list'), ('Public', 'Public - Everybody can see the wish list')], default='Private', max_length=20)),
+                ('date_created', models.DateTimeField(verbose_name='Date created', auto_now_add=True)),
                 ('owner', models.ForeignKey(verbose_name='Owner', to=settings.AUTH_USER_MODEL)),
             ],
             options={
-                'ordering': (b'owner', b'date_created'),
-                'abstract': False,
                 'verbose_name': 'Wish List',
+                'ordering': ('owner', 'date_created'),
+                'abstract': False,
             },
             bases=(models.Model,),
         ),
@@ -53,6 +53,6 @@ class Migration(migrations.Migration):
         ),
         migrations.AlterUniqueTogether(
             name='line',
-            unique_together=set([(b'wishlist', b'product')]),
+            unique_together=set([('wishlist', 'product')]),
         ),
     ]

oscar/core/ajax.py

@@ -1,4 +1,4 @@
-import six
+from django.utils import six
 from django.contrib import messages
 
 

oscar/core/application.py

@@ -1,5 +1,3 @@
-import six
-
 from oscar.core.loading import feature_hidden
 from oscar.views.decorators import permissions_required
 
@@ -26,7 +24,7 @@ class Application(object):
     def __init__(self, app_name=None, **kwargs):
         self.app_name = app_name
         # Set all kwargs as object attributes
-        for key, value in six.iteritems(kwargs):
+        for key, value in kwargs.items():
             setattr(self, key, value)
 
     def get_urls(self):

oscar/core/compat.py

@@ -1,4 +1,4 @@
-import six
+from django.utils import six
 
 from django.conf import settings
 from django.contrib.auth import get_user_model as django_get_user_model

oscar/core/context_processors.py

@@ -2,7 +2,7 @@ import oscar
 import re
 import platform
 import django
-from six.moves.urllib import parse
+from django.utils.six.moves.urllib import parse
 from django.conf import settings
 from django.utils.safestring import mark_safe
 

oscar/core/loading.py

@@ -4,7 +4,7 @@ from importlib import import_module
 
 import django
 from django.conf import settings
-from django.utils import six as django_six
+from django.utils import six
 
 from oscar.core.exceptions import (ModuleNotFoundError, ClassNotFoundError,
                                    AppNotFoundError)
@@ -23,7 +23,7 @@ def import_string(dotted_path):
         module_path, class_name = dotted_path.rsplit('.', 1)
     except ValueError:
         msg = "%s doesn't look like a module path" % dotted_path
-        django_six.reraise(ImportError, ImportError(msg), sys.exc_info()[2])
+        six.reraise(ImportError, ImportError(msg), sys.exc_info()[2])
 
     module = import_module(module_path)
 
@@ -32,12 +32,12 @@ def import_string(dotted_path):
     except AttributeError:
         msg = 'Module "%s" does not define a "%s" attribute/class' % (
             dotted_path, class_name)
-        django_six.reraise(ImportError, ImportError(msg), sys.exc_info()[2])
+        six.reraise(ImportError, ImportError(msg), sys.exc_info()[2])
     try:
         module_path, class_name = dotted_path.rsplit('.', 1)
     except ValueError:
         msg = "%s doesn't look like a module path" % dotted_path
-        django_six.reraise(ImportError, ImportError(msg), sys.exc_info()[2])
+        six.reraise(ImportError, ImportError(msg), sys.exc_info()[2])
 
     module = __import__(module_path, fromlist=[class_name])
 
@@ -46,7 +46,7 @@ def import_string(dotted_path):
     except AttributeError:
         msg = 'Module "%s" does not define a "%s" attribute/class' % (
             dotted_path, class_name)
-        django_six.reraise(ImportError, ImportError(msg), sys.exc_info()[2])
+        six.reraise(ImportError, ImportError(msg), sys.exc_info()[2])
 
 
 def get_class(module_label, classname):
@@ -278,6 +278,15 @@ if django.VERSION < (1, 7):
         This is merely a thin wrapper around Django's get_model function.
         Raises LookupError if model isn't found.
         """
+
+        # The snippet below is not useful in production, but helpful to
+        # investigate circular import issues
+        # from django.db.models.loading import app_cache_ready
+        # if not app_cache_ready():
+        #     print(
+        #         "%s.%s accessed before app cache is fully populated!" %
+        #         (app_label, model_name))
+
         model = django_get_model(app_label, model_name, *args, **kwargs)
         if model is None:
             raise LookupError(

oscar/core/phonenumber.py

@@ -26,16 +26,18 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
 
-import six
+from django.utils import six
 
 from django.core import validators
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.utils.translation import ugettext_lazy as _
+from django.utils.encoding import python_2_unicode_compatible
 
 import phonenumbers
 
 
+@python_2_unicode_compatible
 class PhoneNumber(phonenumbers.phonenumber.PhoneNumber):
     """
     A extended version of phonenumbers.phonenumber.PhoneNumber that provides
@@ -58,7 +60,7 @@ class PhoneNumber(phonenumbers.phonenumber.PhoneNumber):
                            keep_raw_input=True, numobj=phone_number_obj)
         return phone_number_obj
 
-    def __unicode__(self):
+    def __str__(self):
         format_string = getattr(
             settings, 'PHONENUMBER_DEFAULT_FORMAT', 'INTERNATIONAL')
         fmt = self.format_map[format_string]
@@ -66,9 +68,6 @@ class PhoneNumber(phonenumbers.phonenumber.PhoneNumber):
             return self.format_as(fmt)
         return self.raw_input
 
-    def __str__(self):
-        return str(self.__unicode__())
-
     def is_valid(self):
         """
         checks whether the number supplied is actually valid
@@ -98,7 +97,7 @@ class PhoneNumber(phonenumbers.phonenumber.PhoneNumber):
         return self.format_as(phonenumbers.PhoneNumberFormat.RFC3966)
 
     def __len__(self):
-        return len(self.__unicode__())
+        return len(six.text_type(self))
 
     def __eq__(self, other):
         if type(other) == PhoneNumber:

oscar/core/prices.py

@@ -46,3 +46,11 @@ class Price(object):
                 self.incl_tax, self.tax)
         return "%s(currency=%r, excl_tax=%r)" % (
             self.__class__.__name__, self.currency, self.excl_tax)
+
+    def __eq__(self, other):
+        """
+        Two price objects are equal if currency, price.excl_tax and tax match.
+        """
+        return (self.currency == other.currency and
+                self.excl_tax == other.excl_tax and
+                self.incl_tax == other.incl_tax)

oscar/core/utils.py

@@ -1,7 +1,9 @@
 from __future__ import absolute_import  # for logging import below
 import logging
-import six
 
+from django.shortcuts import redirect, resolve_url
+from django.utils import six
+from django.utils.http import is_safe_url
 from django.utils.timezone import get_current_timezone, is_naive, make_aware
 from django.conf import settings
 from django.template.defaultfilters import (date as date_filter,
@@ -81,3 +83,32 @@ def format_datetime(dt, format=None):
     else:
         localtime = dt.astimezone(get_current_timezone())
     return date_filter(localtime, format)
+
+
+def safe_referrer(meta, default):
+    """
+    Takes request.META and a default URL. Returns HTTP_REFERER if it's safe
+    to use and set, and the default URL otherwise.
+
+    The default URL can be a model with get_absolute_url defined, a urlname
+    or a regular URL
+    """
+    referrer = meta.get('HTTP_REFERER')
+    if referrer and is_safe_url(referrer):
+        return referrer
+    if default:
+        # try to resolve
+        return resolve_url(default)
+    else:
+        # Allow passing in '' and None as default
+        return default
+
+
+def redirect_to_referrer(meta, default):
+    """
+    Takes request.META and a default URL to redirect to.
+
+    Returns a HttpResponseRedirect to HTTP_REFERER if it exists and is a safe
+    URL; to the default URL otherwise.
+    """
+    return redirect(safe_referrer(meta, default))

oscar/defaults.py

@@ -70,9 +70,6 @@ OSCAR_EAGER_ALERTS = True
 OSCAR_SEND_REGISTRATION_EMAIL = True
 OSCAR_FROM_EMAIL = 'oscar@example.com'
 
-# Offers
-OSCAR_OFFER_BLACKLIST_PRODUCT = None
-
 # Slug handling
 OSCAR_SLUG_FUNCTION = 'oscar.core.utils.default_slugifier'
 OSCAR_SLUG_MAP = {}

oscar/forms/widgets.py

@@ -1,7 +1,7 @@
 import re
-import six
-from six.moves import filter
-from six.moves import map
+from django.utils import six
+from django.utils.six.moves import filter
+from django.utils.six.moves import map
 
 import django
 from django import forms
@@ -73,7 +73,7 @@ def datetime_format_to_js_date_format(format):
         '%d': 'dd',
         '%H:%M': '',
     }
-    for search, replace in six.iteritems(replacements):
+    for search, replace in replacements.items():
         converted = converted.replace(search, replace)
     return converted.strip()
 
@@ -91,7 +91,7 @@ def datetime_format_to_js_time_format(format):
         '%H': 'HH',
         '%M': 'mm',
     }
-    for search, replace in six.iteritems(replacements):
+    for search, replace in replacements.items():
         converted = converted.replace(search, replace)
 
     converted = re.sub('[-/][^%]', '', converted)

oscar/management/commands/oscar_fork_app.py

@@ -1,5 +1,7 @@
 import logging
 
+from django.utils import six
+
 from django.core.management.base import BaseCommand, CommandError
 
 from oscar.core import customisation
@@ -28,4 +30,4 @@ class Command(BaseCommand):
         try:
             customisation.fork_app(app_label, folder_path, logger)
         except Exception as e:
-            raise CommandError(e)
+            raise CommandError(six.text_type(e))

oscar/management/commands/oscar_fork_statics.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-from __future__ import print_function
 import logging
 import os
 import shutil

oscar/management/commands/oscar_generate_email_content.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from django.core.management.base import BaseCommand, CommandError
 from oscar.core.loading import get_model
 

oscar/models/fields/__init__.py

@@ -1,9 +1,8 @@
-import six
 
 from django.core.exceptions import ImproperlyConfigured
 from django.db.models.fields import CharField, DecimalField, Field
 from django.db.models import SubfieldBase
-from django.utils import six as django_six
+from django.utils import six
 from django.utils.translation import ugettext_lazy as _
 from django.core.validators import MaxLengthValidator
 
@@ -84,7 +83,7 @@ class PositiveDecimalField(DecimalField):
         return super(PositiveDecimalField, self).formfield(min_value=0)
 
 
-class UppercaseCharField(django_six.with_metaclass(SubfieldBase, CharField)):
+class UppercaseCharField(six.with_metaclass(SubfieldBase, CharField)):
     """
     A simple subclass of ``django.db.models.fields.CharField`` that
     restricts all text to be uppercase.
@@ -101,7 +100,7 @@ class UppercaseCharField(django_six.with_metaclass(SubfieldBase, CharField)):
             return val
 
 
-class NullCharField(django_six.with_metaclass(SubfieldBase, CharField)):
+class NullCharField(six.with_metaclass(SubfieldBase, CharField)):
     """
     CharField that stores '' as None and returns None as ''
     Useful when using unique=True and forms. Implies null==blank==True.

oscar/models/fields/autoslugfield.py

@@ -25,7 +25,7 @@ THE SOFTWARE.
 """
 
 import re
-import six
+from django.utils import six
 
 from django.db.models import SlugField
 

oscar/profiling/decorators.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-from __future__ import print_function
 import cProfile
 import pstats
 import time

oscar/profiling/middleware.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-from __future__ import print_function
 import sys
 import tempfile
 import hotshot

oscar/static/oscar/css/dashboard.css

@@ -3023,6 +3023,12 @@ input[type=text].hasDatepicker,
 .table {
   background-color: #ffffff;
 }
+.table thead tr th.asc i:before {
+  content: "\f077";
+}
+.table thead tr th.desc i:before {
+  content: "\f078";
+}
 .table-striped tbody tr:nth-child(odd) td,
 .table-striped tbody tr:nth-child(odd) th {
   background-color: #efefef;

oscar/static/oscar/css/styles.css

@@ -7569,25 +7569,21 @@ h1,
 .h1 {
   font-size: 30.099999999999998px;
   line-height: 40px;
-  font-weight: bold;
 }
 h2,
 .h2 {
   font-size: 24.5px;
   line-height: 40px;
-  font-weight: bold;
 }
 h3,
 .h3 {
   font-size: 17.5px;
   line-height: 24px;
-  font-weight: bold;
 }
 h4,
 .h4 {
   font-size: 16.099999999999998px;
   line-height: 24px;
-  font-weight: bold;
 }
 h5,
 .h5 {
@@ -7760,7 +7756,6 @@ ul.row-fluid {
 .product_pod .price_color {
   font-size: 16.099999999999998px;
   line-height: 24px;
-  font-weight: bold;
 }
 .product_pod .availability,
 .product_pod .price_color {
@@ -7940,7 +7935,6 @@ a:hover .thumbnail {
 .sidebar .promotion_single h2 {
   font-size: 17.5px;
   line-height: 24px;
-  font-weight: bold;
 }
 .sidebar .promotion_single h3 {
   font-size: 14px;

oscar/static/oscar/js/oscar/ui.js

@@ -115,7 +115,7 @@ var oscar = (function(o, $) {
         },
         initNav: function() {
             // Initial navigation for desktop
-            var $sidebar = $('aside.span3'), 
+            var $sidebar = $('aside.span3'),
                 $browse = $('[data-navigation="dropdown-menu"]'),
                 $browseOpen = $browse.parent().find('> a[data-toggle]');
             // Set width of nav dropdown to be same as sidebar
@@ -212,6 +212,7 @@ var oscar = (function(o, $) {
         showVoucherForm: function() {
             $('#voucher_form_container').show();
             $('#voucher_form_link').hide();
+            $('#id_code').focus();
         },
         hideVoucherForm: function() {
             $('#voucher_form_container').hide();

oscar/static/oscar/less/dashboard.less

@@ -229,6 +229,12 @@ input[type=text].hasDatepicker,
 .table {
   background-color: @white;
 }
+.table thead tr th.asc i:before {
+  content: "\f077";
+}
+.table thead tr th.desc i:before {
+  content: "\f078";
+}
 .table-striped tbody tr:nth-child(odd) td,
 .table-striped tbody tr:nth-child(odd) th {
   background-color: #efefef;

oscar/templates/oscar/500.html

@@ -2,14 +2,14 @@
 {% load i18n %}
 
 {% block title %}
-{% trans 'Server error!' %} | {{ block.super }}
+    {% trans 'Server error!' %} | {{ block.super }}
 {% endblock %}
 
 {% block error_heading %}
-{% trans "Server error!" %}
+    {% trans "Server error!" %}
 {% endblock %}
 
 {% block error_message %}
-<p>{% trans "We're sorry but something went terribly wrong." %}</p>
-<p>{% trans "This incident has been logged and will be addressed by an engineer as soon as possible." %}</p>
+    <p>{% trans "We're sorry but something went terribly wrong and we've been unable to generate the page you requested." %}</p>
+    <p>{% trans "This incident has been logged and will be addressed by an engineer as soon as possible." %}</p>
 {% endblock %}

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

@@ -108,22 +108,25 @@
 
     <div class="row-fluid">
         {% block vouchers %}
-            <div class="span6">
-                <div class="sub-header">
-                    <h2>{% trans "Voucher/promo code" %}</h2>
-                </div>
-                <p id="voucher_form_link"><a href="#voucher" class="btn btn-full">{% trans "I have a voucher code..." %}</a></p>
+            {# Hide the entire section if a custom BasketView doesn't pass in a voucher form #}
+            {% if voucher_form %}
+                <div class="span6">
+                    <div class="sub-header">
+                        <h2>{% trans "Voucher/promo code" %}</h2>
+                    </div>
+                    <p id="voucher_form_link"><a href="#voucher" class="btn btn-full">{% trans "I have a voucher code..." %}</a></p>
 
-                <div id="voucher_form_container" style="display:none">
-                    <h3>{% trans "Voucher code" %}</h3>
-                    <form id="voucher_form" action="{% url 'basket:vouchers-add' %}" method="post">
-                        {% csrf_token %}
-                        {% include "partials/form_fields.html" with form=voucher_form %}
-                        <button type="submit" class="btn btn-info">{% trans "Add voucher" %}</button>
-                        {% trans "or" %} <a href="#" id="voucher_form_cancel">{% trans "cancel" %}</a>
-                    </form>
+                    <div id="voucher_form_container" style="display:none">
+                        <h3>{% trans "Voucher code" %}</h3>
+                        <form id="voucher_form" action="{% url 'basket:vouchers-add' %}" method="post">
+                            {% csrf_token %}
+                            {% include "partials/form_fields.html" with form=voucher_form %}
+                            <button type="submit" class="btn btn-info">{% trans "Add voucher" %}</button>
+                            {% trans "or" %} <a href="#" id="voucher_form_cancel">{% trans "cancel" %}</a>
+                        </form>
+                    </div>
                 </div>
-            </div>
+            {% endif %}
         {% endblock vouchers %}
 
         {% block baskettotals %}

oscar/templates/oscar/dashboard/catalogue/category_list.html

@@ -1,6 +1,7 @@
 {% extends 'dashboard/layout.html' %}
 {% load category_tags %}
 {% load i18n %}
+{% load render_table from django_tables2 %}
 
 {% block body_class %}{{ block.super }} catalogue{% endblock %}
 
@@ -38,65 +39,9 @@
         </p>
     </div>
 
-    {% if child_categories %}
-        <table class="table table-striped table-bordered table-hover">
-            <caption><i class="icon-sitemap icon-large"></i>{% trans 'Categories' %}</caption>
-            <thead>
-                <tr>
-                    <th>{% trans "Name" %}</th>
-                    <th>{% trans "Description" %}</th>
-                    <th>{% trans "Number of child categories" %}</th>
-                    <th></th>
-                </tr>
-            </thead>
-            <tbody>
-                {% for category in child_categories %}
-                    <tr>
-                        <td><a href="{% url 'dashboard:catalogue-category-update' category.id %}">{{ category.name }}</a></td>
-                        <td>{{ category.description|default:""|striptags|cut:"&nbsp;"|truncatewords:6 }}</td>
-                        <td><a href="{% url 'dashboard:catalogue-category-detail-list' pk=category.pk %}">{{ category.get_num_children }}</a></td>
-                        <td>
-                            <div class="btn-toolbar">
-                                <div class="btn-group">
-                                    <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
-                                        {% trans "Actions" %}
-                                        <span class="caret"></span>
-                                    </a>
-                                    <ul class="nav dropdown-menu pull-right">
-                                        <li>
-                                            <a href="{% url 'dashboard:catalogue-category-update' pk=category.id %}">
-                                                {% trans "Edit category" %}
-                                            </a>
-                                        </li>
-                                        <li>
-                                            <a href="{% url 'dashboard:catalogue-category-create-child' parent=category.pk %}">
-                                                {% trans "Add child category" %}
-                                            </a>
-                                        </li>
-                                        <li{% if not category.has_children %} class="disabled"{% endif %}>
-                                            <a href="{% url 'dashboard:catalogue-category-detail-list' pk=category.pk %}">
-                                                {% trans "Edit children" %}
-                                            </a>
-                                        </li>
-                                        <li>
-                                            <a href="{{ category.get_absolute_url }}">
-                                                {% trans "View on site" %}
-                                            </a>
-                                        </li>
-                                        <li>
-                                            <a href="{% url 'dashboard:catalogue-category-delete' pk=category.id %}">
-                                                {% trans "Delete" %}
-                                            </a>
-                                        </li>
-                                    </ul>
-                                </div>
-                            </div>
-                        </td>
-                    </tr>
-                {% endfor %}
-            </tbody>
-        </table>
-    {% else %}
+    {% render_table categories %}
+
+    {% if not child_categories %}
         <p>{% trans "There are no categories." %}</p>
     {% endif %}
 {% endblock dashboard_content %}

oscar/templates/oscar/dashboard/catalogue/category_row_actions.html

@@ -0,0 +1,37 @@
+{% load django_tables2 %}
+{% load i18n %}
+<div class="btn-toolbar">
+    <div class="btn-group">
+        <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+            {% trans "Actions" %}
+            <span class="caret"></span>
+        </a>
+        <ul class="nav dropdown-menu pull-right">
+            <li>
+                <a href="{% url 'dashboard:catalogue-category-update' pk=record.id %}">
+                    {% trans "Edit category" %}
+                </a>
+            </li>
+            <li>
+                <a href="{% url 'dashboard:catalogue-category-create-child' parent=record.pk %}">
+                    {% trans "Add child category" %}
+                </a>
+            </li>
+            <li{% if not record.has_children %} class="disabled"{% endif %}>
+                <a href="{% url 'dashboard:catalogue-category-detail-list' pk=record.pk %}">
+                    {% trans "Edit children" %}
+                </a>
+            </li>
+            <li>
+                <a href="{{ record.get_absolute_url }}">
+                    {% trans "View on site" %}
+                </a>
+            </li>
+            <li>
+                <a href="{% url 'dashboard:catalogue-category-delete' pk=record.id %}">
+                    {% trans "Delete" %}
+                </a>
+            </li>
+        </ul>
+    </div>
+</div>

oscar/templates/oscar/dashboard/catalogue/messages/product_saved.html

@@ -1,4 +1,5 @@
 {% load i18n %}
+{% load django_tables2 %}
 
 <p>
 {% with name=product.title parent_name=product.parent.title %}
@@ -44,6 +45,6 @@
 </p>
 
 <p>
-    <a href="{% url 'dashboard:catalogue-product' pk=product.pk %}" class="btn btn-success">{% trans "Edit again" %}</a>
+    <a href="{% url 'dashboard:catalogue-product' pk=product.pk %}{% querystring %}" class="btn btn-success">{% trans "Edit again" %}</a>
     <a href="{{ product.get_absolute_url }}" class="btn btn-success">{% trans "View it on the site" %}</a>
 </p>

oscar/templates/oscar/dashboard/catalogue/product_list.html

@@ -3,6 +3,7 @@
 {% load thumbnail %}
 {% load staticfiles %}
 {% load sorting_tags %}
+{% load render_table from django_tables2 %}
 
 {% block body_class %}{{ block.super }} catalogue{% endblock %}
 
@@ -69,101 +70,9 @@
                     <li{% if 'recently_edited' in request.GET %} class="active"{% endif %}> <a href="?recently_edited=1">{% trans "Recently edited" %}</a> </li>
                 </ul>
             {% endblock %}
-            <div class="table-header">
-                <h2><i class="icon-sitemap icon-large"></i>{{ queryset_description }}</h2>
-            </div>
             <form action="." method="post">
                 {% csrf_token %}
-                <table class="table table-striped table-bordered">
-                    {% block product_list_header %}
-                        <tr>
-                            <th>
-                                {% if 'recently_edited' in request.GET %}
-                                    {% trans "Title" context "Product title" %}
-                                {% else %}
-                                    {% anchor 'title' _("Title") %}
-                                {% endif %}
-                            </th>
-                            <th>{% trans "UPC" %}</th>
-                            <th>{% trans "Image" %}</th>
-                            <th>{% trans "Product Type" %}</th>
-                            <th>{% trans "Variants" %}</th>
-                            <th>{% trans "Stock records" %}</th>
-                            <th></th>
-                        </tr>
-                    {% endblock %}
-                    {% for product in products %}
-                        {% block product %}
-                            <tr>
-                                <td><a href="{% url 'dashboard:catalogue-product' pk=product.id %}">{{ product.get_title }}</a></td>
-                                <td>{{ product.upc|default:"-" }}</td>
-                                <td>
-                                    {% if product.primary_image.original.url %}
-                                        {% with image=product.primary_image %}
-                                            {% thumbnail image.original "70x70" upscale=False as thumb %}
-                                            <a href="{{ image.original.url }}" rel="lightbox_{{ product.upc|default:"-" }}" class="sub-image">
-                                                <img src="{{ thumb.url }}" alt="{{ product.get_title }}" data-description="{% if image.caption %}{{ image.caption }}{% endif %}">
-                                            </a>
-                                            {% endthumbnail %}
-                                        {% endwith %}
-                                    {% else %}
-                                        -
-                                    {% endif %}
-                                </td>
-                                <td>{{ product.get_product_class.name }}</td>
-                                <td>
-                                    {% if product.is_standalone %}
-                                        -
-                                    {% else %}
-                                        {{ product.children.count }}
-                                    {% endif %}
-                                </td>
-                                <td>
-                                    {% if product.is_parent %}
-                                        -
-                                    {% else %}
-                                        {{ product.stockrecords.count }}
-                                    {% endif %}
-                                </td>
-                                <td>
-                                    <div class="btn-toolbar">
-                                        <div class="btn-group">
-                                            <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
-                                                {% trans "Actions" %}
-                                                <span class="caret"></span>
-                                            </a>
-                                            <ul class="dropdown-menu pull-right">
-                                                <li>
-                                                    <a href="{% url 'dashboard:catalogue-product' pk=product.id %}{% if request.GET.urlencode %}?{{ request.GET.urlencode }}{% endif %}">
-                                                        {% trans "Edit" %}
-                                                    </a>
-                                                </li>
-                                                {% if product.can_be_parent %}
-                                                    <li>
-                                                        <a href="{% url 'dashboard:catalogue-product-create-child' product.id %}{% if request.GET.urlencode %}?{{ request.GET.urlencode }}{% endif %}">
-                                                            {% trans "Add variant" %}
-                                                        </a>
-                                                    </li>
-                                                {% endif %}
-                                                <li>
-                                                    <a href="{{ product.get_absolute_url }}">
-                                                        {% trans "View on site" %}
-                                                    </a>
-                                                </li>
-                                                <li>
-                                                    <a href="{% url 'dashboard:catalogue-product-delete' pk=product.id %}">
-                                                        {% trans "Delete" %}
-                                                    </a>
-                                                </li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </td>
-                            </tr>
-                        {% endblock product %}
-                    {% endfor %}
-                </table>
-                {% include "partials/pagination.html" %}
+                {% render_table products %}
             </form>
         {% endblock product_list %}
     {% else %}

oscar/templates/oscar/dashboard/catalogue/product_row_actions.html

@@ -0,0 +1,21 @@
+{% load django_tables2 %}
+{% load i18n %}
+<div class="btn-toolbar">
+    <div class="btn-group">
+        <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+            {% trans "Actions" %}
+            <span class="caret"></span>
+        </a>
+        <ul class="dropdown-menu pull-right">
+            <li>
+                <a href="{% url 'dashboard:catalogue-product' pk=record.id %}{% querystring %}">{% trans "Edit" %}</a>
+            </li>
+            <li>
+                <a href="{{ record.get_absolute_url }}"> {% trans "View on site" %}</a>
+            </li>
+            <li>
+                <a href="{% url 'dashboard:catalogue-product-delete' pk=record.id %}">{% trans "Delete" %}</a>
+            </li>
+        </ul>
+    </div>
+</div>