Merge branch 'master' into issue/1093/search

Conflicts:
	oscar/apps/dashboard/catalogue/views.py
	oscar/apps/search/facets.py
	tests/functional/catalogue/catalogue_tests.py

.travis.yml

@@ -10,16 +10,18 @@ env:
     # $TRANSIFEX_PASSWORD for oscar_bot (used in transifex.sh)
     secure: FuIlzEsGJiAwhaIRBmRNsq9eXmuzs25fX6BChknW4lDyVAySWMp0+Zps9Bd0JgfFYUG3Ip+OTmksYIoTUsG25ZJS9cq1IFt3QKUAN70YCI/4ZBLeIdICPEyxq+Km179+NeEXmBUug17RLMLxh3MWfO+RKUHK9yHIPNNpq0dNyoo=
   matrix:
-    - DJANGO_VERSION=1.5.8
-    - DJANGO_VERSION=1.6.5
+    - DJANGO=Django==1.6.5
+    - 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==$DJANGO_VERSION
+  - easy_install $DJANGO
 
 before_script:
     # Create testing databases for running migrations against

Makefile

@@ -12,10 +12,11 @@ sandbox: install
 	-rm -rf sites/sandbox/public/static
 	-rm -f sites/sandbox/db.sqlite
 	# Create database
+	# 'syncdb' is identical to migrate in Django 1.7+; but calling it twice should have no effect
 	sites/sandbox/manage.py syncdb --noinput
 	sites/sandbox/manage.py migrate
 	# Import some fixtures. Order is important as JSON fixtures include primary keys
-	sites/sandbox/manage.py loaddata sites/sandbox/fixtures/variants.json
+	sites/sandbox/manage.py loaddata sites/sandbox/fixtures/child_products.json
 	sites/sandbox/manage.py oscar_import_catalogue sites/sandbox/fixtures/*.csv
 	sites/sandbox/manage.py oscar_import_catalogue_images sites/sandbox/fixtures/images.tar.gz
 	sites/sandbox/manage.py oscar_populate_countries
@@ -121,3 +122,10 @@ clean:
 preflight: lint
     # Bare minimum of tests to run before pushing to master
 	./runtests.py
+
+todo:
+	# Look for areas of the code that need updating when some event has taken place (like 
+	# Oscar dropping support for a Django version)
+	-grep -rnH TODO *.txt
+	-grep -rnH TODO oscar/apps/
+	-grep -rnH "django.VERSION" oscar/apps

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

create_migration.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+#
+# Rather verbose and destructive script to create both South migrations and the
+# new native migrations (which we need as we support both Django 1.6 and 1.7).
+# This will install and uninstall Django versions in your virtualenv, only work
+# with the default SQLite database, destroy that database repeatedly
+
+# Grab current version of Django from virtualenv
+DJANGO_VERSION=$(pip freeze | awk 'BEGIN {FS="=="} /Django/ {print $2}')
+SOUTH_VERSION=$(pip freeze | awk 'BEGIN {FS="=="} /South/ {print $2}')
+
+APPS=( analytics checkout address shipping catalogue reviews partner basket payment \
+       offer order customer promotions search voucher wishlists )
+
+echo "Uninstalling Django(==$DJANGO_VERSION) and South(==$SOUTH_VERSION)"
+pip uninstall Django South -y
+
+echo "Generating Django-native (>=1.7) migrations"
+pip install https://www.djangoproject.com/download/1.7c2/tarball/
+rm -f sites/sandbox/db.sqlite
+sites/sandbox/manage.py migrate
+sites/sandbox/manage.py makemigrations ${APPS[@]}
+
+echo "Generating Django 1.6 migrations"
+pip install "Django==1.6.5" "South==1.0"
+rm -f sites/sandbox/db.sqlite
+sites/sandbox/manage.py syncdb --noinput
+sites/sandbox/manage.py migrate
+for APP in "${APPS[@]}"
+do
+    sites/sandbox/manage.py schemamigration $APP --auto
+done
+
+echo "Restoring Django(==$DJANGO_VERSION) and South(==$SOUTH_VERSION)"
+pip install "Django==$DJANGO_VERSION" "South==$SOUTH_VERSION"

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/internals/getting_started.rst

@@ -84,7 +84,6 @@ and append Oscar's core apps:
         'django.contrib.staticfiles',
         'django.contrib.flatpages',
         ...
-        'south',
         'compressor',
     ] + get_core_apps()
 
@@ -107,21 +106,16 @@ More info about installing ``flatpages`` is in the `Django docs`_.
 
 Next, add ``oscar.apps.basket.middleware.BasketMiddleware`` and
 ``django.contrib.flatpages.middleware.FlatpageFallbackMiddleware`` to
-your ``MIDDLEWARE_CLASSES`` setting. If you're running on Django 1.5, it is
-also recommended to use ``django.middleware.transaction.TransactionMiddleware``:
+your ``MIDDLEWARE_CLASSES`` setting.
 
 .. code-block:: django
 
     MIDDLEWARE_CLASSES = (
         ...
         'oscar.apps.basket.middleware.BasketMiddleware',
-        'django.middleware.transaction.TransactionMiddleware',  # Django 1.5 only
         'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',
     )
 
-If you're running Django 1.6 or above, you should enable ``ATOMIC_REQUESTS``
-instead (see database settings above).
-
 Set your auth backends to:
 
 .. code-block:: django
@@ -237,7 +231,7 @@ Check your database settings. A quick way to get started is to use SQLite:
             'PASSWORD': '',
             'HOST': '',
             'PORT': '',
-            'ATOMIC_REQUESTS': True,  # Django 1.6+
+            'ATOMIC_REQUESTS': True,
         }
     }
 
@@ -255,8 +249,32 @@ Then create the database and the shop should be browsable:
 You should now have an empty, but running Oscar install that you can browse at
 http://localhost:8000.
 
-Fixtures
-========
+Migrations
+----------
+
+Oscar ships with two sets of migrations. If you're running Django 1.7, you
+don't need to do anything; Django's migration framework will detect them
+automatically and will do the right thing.
+If you're running Django 1.6, you need to install `South`_::
+
+.. code-block:: bash
+
+    $ pip install South
+
+And you need to add it to your installed apps:
+
+.. code-block:: django
+
+    INSTALLED_APPS = [
+        ...
+        'south',
+    ] + get_core_apps()
+
+.. _South: http://south.readthedocs.org/en/latest/
+
+
+Initial data
+============
 
 The default checkout process requires a shipping address with a country.  Oscar
 uses a model for countries with flags that indicate which are valid shipping

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``
 ---------------------------------
 
@@ -364,13 +344,6 @@ Default: ``'oscar_open_basket'``
 
 The name of the cookie for the open basket.
 
-``OSCAR_BASKET_COOKIE_SAVED``
------------------------------
-
-Default: ``'oscar_saved_basket'``
-
-The name of the cookie for the saved basket.
-
 Currency settings
 =================
 

docs/source/releases/v0.8.rst

@@ -37,10 +37,12 @@ availability logic now needs to be handled with strategies.
 Compatibility
 -------------
 
-Oscar 0.8 is compatible with Django 1.5-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:
 
@@ -80,6 +82,27 @@ has been altered to be:
 Some properties and method names have also been updated to the new naming. The
 old ones will throw a deprecation warning.
 
+Better handling of child products in product dashboard
+------------------------------------------------------
+Together with the changes above, the dashboard experience for child products
+has been improved. The difference between a parent product and a stand-alone
+product is hidden from the user; a user can now add and remove child products
+on any suitable product. When the first child product is added, a stand-alone
+product becomes a parent product; and vice versa.
+In the front-end, the old name of "product variants" has been kept.
+
+Django 1.7 support
+------------------
+
+Oscar 0.8 comes with support for Django 1.7 out of the box. The app refactor
+and the new migration framework are both great improvements to Django. Oscar
+now ships with sets of migrations both for South and the new native
+migrations framework.
+Unfortunately, the changes in Django required a few breaking changes when
+upgrading Oscar both for users staying on Django 1.6 and for users upgrading to
+Django 1.7 at the same time. These are detailed in the section for
+backwards-incompatible changes.
+
 Reworked shipping app
 ~~~~~~~~~~~~~~~~~~~~~
 
@@ -204,17 +227,60 @@ Minor changes
   populate the country databases. It replaces the ``countries.json`` fixture.
   The command relies on the ``pycountry`` library being installed.
 
+* It is now possible to use product attributes to add a relation to arbitrary
+  model instances. There was some (presumably broken) support for it before,
+  but you should now be able to use product attributes of type ``entity`` as
+  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.
+
+* ``jquery-ui-datepicker`` has been replaced in the dashboard by
+  bootstrap-datetimepicker_. We still ship with ``jquery-ui-datepicker`` and
+  ``JQuery UI`` as it's in use in the frontend.
+
+.. _django-tables2: http://django-tables2.readthedocs.org/en/latest/
+.. _bootstrap-datetimepicker: http://www.malot.fr/bootstrap-datetimepicker/
+
 .. _incompatible_changes_in_0.8:
 
 Backwards incompatible changes in 0.8
 -------------------------------------
 
-.. _incompatible_shipping_changes_in_0.8:
+Migrations
+~~~~~~~~~~
+
+* South is not a dependency of Oscar anymore: This means it won't get installed
+  automatically when you install Oscar. If you are on Django 1.6 and want to
+  use South, you will need to explicitly install it and add it to your
+  requirements.
+* Only South >= 1.0 is supported: South 1.0 is a backwards compatible release
+  explicitly released to help with the upgrade path to Django 1.7. Please make
+  sure you update accordingly if you intend to keep using South. Older versions
+  of South will look in the wrong directories and will break with this Oscar
+  release.
+* Rename your South ``migrations`` directories: To avoid
+  clashes between Django's migrations and South's migrations, you should rename
+  all your South migrations directories (including those of forked Oscar apps)
+  to ``south_migrations``. South 1.0 will check those first before falling back
+  to ``migrations``.
+* Upgrading to new-style migrations: If you're upgrading to Django 1.7, you
+  will need to follow the `instructions to upgrade from South`_ for your own
+  apps. For any forked Oscar apps, you will need to copy Oscar's initial
+  migrations into your emptied ``migrations`` directory first, because Oscar's
+  set of migrations depend on each other. You can then create migrations for
+  your changes by calling ``./manage.py makemigrations``. Django should
+  detect that the database layout already matches the state of migrations; so
+  a call to ``migrate`` should fake the migrations.
+
+.. _instructions to upgrade from South: https://docs.djangoproject.com/en/1.7/topics/migrations/#upgrading-from-south
 
 Product structure
 ~~~~~~~~~~~~~~~~~
 
-Generally, backwards compatibility has been preserved. Two changes are
+Generally, backwards compatibility has been preserved. Those changes are
 unavoidable:
 
 * You now need to explicitly set product structure when creating a product;
@@ -224,6 +290,7 @@ unavoidable:
   deprecation warning), but if you used the old related name in a query lookup
   (e.g. ``products.filter(variants__title='foo')``, you will have to change it
   to ``children``.
+* Template blocks and CSS classes have been renamed.
 
 The following methods and properties have been deprecated:
 
@@ -236,6 +303,22 @@ The following methods and properties have been deprecated:
 * ``Strategy.select_variant_stockrecords`` - Use
   ``select_children_stockrecords`` instead.
 
+Furthermore, CSS classes and template blocks have been updated. Please follow
+the following renaming pattern:
+* ``variant-product`` becomes ``child-product``
+* ``product_variants`` becomes ``child_products``
+* ``variants`` becomes ``children``
+* ``variant`` becomes ``child``
+
+Product editing
+---------------
+The dashboard improvements for child products meant slight changes to both
+``ProductCreateUpdateView`` and ``ProductForm``. Notably, ``ProductForm`` now
+gets a ``parent`` kwarg. Please review your customisations for compatibility
+with the updated code.
+
+.. _incompatible_shipping_changes_in_0.8:
+
 Shipping
 ~~~~~~~~
 
@@ -341,6 +424,41 @@ Other potentially breaking changes related to shipping include:
 * ``oscar.apps.shipping.Scales`` has been renamed and moved to
   ``oscar.apps.shipping.scales.Scale``, and is now overridable.
 
+Email address handling
+----------------------
+
+In theory, the local part of an email is case-sensitive. In practice, many
+users don't know about this and most email servers don't consider the
+capitalisation. Because of this, Oscar now disregards capitalisation when
+looking up emails (e.g. when a user logs in).
+Storing behaviour is unaltered: When a user's email address is stored (e.g.
+when registering or checking out), the local part is unaltered and
+the host portion is lowercased.
+
+.. warning::
+
+   Those changes mean you might now have multiple users with email addresses
+   that Oscar considers identical. Please use the new
+   ``oscar_find_duplicate_emails`` management command to check your database
+   and deal with any conflicts accordingly.
+
+Django 1.7 support
+------------------
+
+If you have any plans to upgrade to Django 1.7, more changes beyond
+addressing migrations are necessary:
+
+* You should be aware that Django 1.7 now enforces uniqueness of app labels.
+  Oscar dashboard apps now ship with app configs that set their app label
+  to ``{oldname}_dashboard``.
+* If you have forked any Oscar apps, you must add app configs to them, and
+  have them inherit from the Oscar one. See the appropriate section in
+  :doc:`/topics/fork_app` for an example.
+* Double-check that you address migrations as detailed above.
+* Django now enforces that no calls happen to the model registry during
+  app startup. This mostly means that you should avoid module-level calls to
+  ``get_model``, as that only works with a fully initialised model registry.
+
 Misc
 ~~~~
 
@@ -377,11 +495,27 @@ Misc
   trivial ``ProductAttribute.get_validator`` and the unused
   ``ProductAttribute.is_value_valid`` methods have been removed.
 
-* It is now possible to use product attributes to add a relation to arbitrary
-  model instances. There was some (presumably broken) support for it before,
-  but you should now be able to use product attributes of type ``entity`` as
-  expected. There's currently no frontend or dashboard support for it, as there
-  is no good default behaviour.
+* The ``RangeProductFileUpload`` model has been moved from the ranges
+  dashboard app to the offers app. The migrations that have been naively
+  drop and re-create the model; any data is lost! This is probably not an
+  issue, as the model is only used while an range upload is in progress. If
+  you need to keep the data, ensure you migrate it across.
+
+* ``oscar.core.loading.get_model`` now raises a ``LookupError`` instead of an
+  ``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.
 
 * ``Category.get_ancestors`` used to return a list of ancestors and would
   default to include itself. For consistency with get_descendants and to avoid
@@ -455,6 +589,12 @@ Migrations
     Please double-check it's outcome and make sure to do something similar
     if you have forked the catalogue app.
 
+.. note::
+
+    The migration numbers below refer to the numbers of the South migrations.
+    Oscar 0.8 ships with a set of new initial migrations for Django's new
+    native migrations framework. They include all the changes detailed below.
+
 .. note::
 
     Be sure to read the detailed instructions for
@@ -475,6 +615,11 @@ Migrations
       and do entity attribute changes and model deletions.
     - ``0025`` & ``0026`` - Schema & data migration to determine and save Product structure.
 
+* Offer:
+
+    - ``0033`` - Use an ``AutoSlug`` field for ``Range`` models
+    - ``0034`` - Add moved ``RangedProductFileUpload`` model.
+
 * Order:
 
     - ``0029`` - Add ``unique_together`` to ``PaymentEventQuantity`` and ``ShippingEventQuantity``
@@ -489,6 +634,11 @@ Migrations
 
     - ``0006`` - Add ``unique_together`` to ``OrderedProduct``
 
+* Ranges dashboard:
+
+    - ``0003`` - Drop ``RangeProductFileUpload`` from ``ranges`` app. This is
+                 a destructive change!
+
 * Shipping:
 
     - ``0007`` - Change ``WeightBand.upper_limit`` from ``FloatField`` to ``DecimalField``

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
 -------

docs/source/topics/fork_app.rst

@@ -52,3 +52,23 @@ the core app's ``admin.py`` (which will run the register code)::
     import oscar.apps.order.admin
 
 This isn't great but we haven't found a better way as of yet.
+
+Django 1.7+: Use supplied app config
+====================================
+
+Oscar ships with an app config for each app, which sets app labels and
+runs startup code. You need to make sure that happens.
+
+.. code-block: django
+
+    # yourproject/order/config.py
+
+    from oscar.apps.order import config
+
+
+    class OrderConfig(config.OrderConfig):
+        name = 'yourproject.order'
+
+    # yourproject/order/__init__.py
+
+    default_app_config = 'yourproject.order.config.OrderConfig'

docs/source/topics/prices_and_availability.rst

@@ -276,7 +276,7 @@ Here's an example ``strategy.py`` module which is used to charge VAT on prices.
         """
 
         def strategy(self, request=None, user=None, **kwargs):
-            return UKStrategy(territory)
+            return UKStrategy()
 
 
     class IncludingVAT(strategy.FixedRateTax):

oscar/__init__.py

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

oscar/app.py

@@ -48,37 +48,27 @@ class Shop(Application):
                 login_forbidden(auth_views.password_reset_done),
                 name='password-reset-done')]
 
-        # Django <=1.5: uses uidb36 to encode the user's primary key
+        # Django <=1.5: uses uidb36 to encode the user's primary key (support has been removed)
         # Django 1.6:   uses uidb64 to encode the user's primary key, but
         #               but supports legacy links
         # Django > 1.7: used uidb64 to encode the user's primary key
         # see https://docs.djangoproject.com/en/dev/releases/1.6/#django-contrib-auth-password-reset-uses-base-64-encoding-of-user-pk
-        if django.VERSION < (1, 6):
+        urls.append(
+            url(r'^password-reset/confirm/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>.+)/$',
+                login_forbidden(auth_views.password_reset_confirm),
+                {
+                    'post_reset_redirect': reverse_lazy('password-reset-complete'),
+                    'set_password_form': self.set_password_form,
+                },
+                name='password-reset-confirm'))
+        if django.VERSION < (1, 7):
             urls.append(
                 url(r'^password-reset/confirm/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$',
-                    login_forbidden(auth_views.password_reset_confirm),
+                    login_forbidden(auth_views.password_reset_confirm_uidb36),
                     {
                         'post_reset_redirect': reverse_lazy('password-reset-complete'),
                         'set_password_form': self.set_password_form,
-                    },
-                    name='password-reset-confirm'))
-        else:
-            urls.append(
-                url(r'^password-reset/confirm/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>.+)/$',
-                    login_forbidden(auth_views.password_reset_confirm),
-                    {
-                        'post_reset_redirect': reverse_lazy('password-reset-complete'),
-                        'set_password_form': self.set_password_form,
-                    },
-                    name='password-reset-confirm'))
-            if django.VERSION < (1, 7):
-                urls.append(
-                    url(r'^password-reset/confirm/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$',
-                        login_forbidden(auth_views.password_reset_confirm_uidb36),
-                        {
-                            'post_reset_redirect': reverse_lazy('password-reset-complete'),
-                            'set_password_form': self.set_password_form,
-                        }))
+                    }))
 
         urls += [
             url(r'^password-reset/complete/$',

oscar/apps/address/__init__.py

@@ -0,0 +1 @@
+default_app_config = 'oscar.apps.address.config.AddressConfig'

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.
@@ -402,11 +405,12 @@ class AbstractCountry(models.Model):
 
     class Meta:
         abstract = True
+        app_label = 'address'
         verbose_name = _('Country')
         verbose_name_plural = _('Countries')
         ordering = ('-display_order', 'printable_name',)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.printable_name or self.name
 
     @property
@@ -435,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"))
@@ -446,6 +459,8 @@ class AbstractShippingAddress(AbstractAddress):
 
     class Meta:
         abstract = True
+        # ShippingAddress is registered in order/models.py
+        app_label = 'order'
         verbose_name = _("Shipping address")
         verbose_name_plural = _("Shipping addresses")
 
@@ -518,6 +533,7 @@ class AbstractUserAddress(AbstractShippingAddress):
 
     class Meta:
         abstract = True
+        app_label = 'address'
         verbose_name = _("User address")
         verbose_name_plural = _("User addresses")
         ordering = ['-num_orders']
@@ -537,9 +553,10 @@ class AbstractUserAddress(AbstractShippingAddress):
 
 
 class AbstractBillingAddress(AbstractAddress):
-
     class Meta:
         abstract = True
+        # BillingAddress is registered in order/models.py
+        app_label = 'order'
         verbose_name = _("Billing address")
         verbose_name_plural = _("Billing addresses")
 
@@ -564,5 +581,6 @@ class AbstractPartnerAddress(AbstractAddress):
 
     class Meta:
         abstract = True
+        app_label = 'partner'
         verbose_name = _("Partner address")
         verbose_name_plural = _("Partner addresses")

oscar/apps/address/config.py

@@ -0,0 +1,8 @@
+from django.apps import AppConfig
+from django.utils.translation import ugettext_lazy as _
+
+
+class AddressConfig(AppConfig):
+    label = 'address'
+    name = 'oscar.apps.address'
+    verbose_name = _('Address')

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

@@ -1,131 +1,71 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
-class Migration(SchemaMigration):
+from django.db import models, migrations
+import oscar.models.fields
+from django.conf import settings
 
-    def forwards(self, orm):
 
-        # Adding model 'UserAddress'
-        db.create_table('address_useraddress', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('title', self.gf('django.db.models.fields.CharField')(max_length=64, null=True, blank=True)),
-            ('first_name', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
-            ('last_name', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)),
-            ('line1', self.gf('django.db.models.fields.CharField')(max_length=255)),
-            ('line2', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
-            ('line3', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
-            ('line4', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
-            ('state', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
-            ('postcode', self.gf('django.db.models.fields.CharField')(max_length=64)),
-            ('country', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['address.Country'])),
-            ('search_text', self.gf('django.db.models.fields.CharField')(max_length=1000)),
-            ('phone_number', self.gf('django.db.models.fields.CharField')(max_length=32, null=True, blank=True)),
-            ('notes', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
-            ('user', self.gf('django.db.models.fields.related.ForeignKey')(related_name='addresses', to=orm[AUTH_USER_MODEL])),
-            ('is_default_for_shipping', self.gf('django.db.models.fields.BooleanField')(default=False)),
-            ('is_default_for_billing', self.gf('django.db.models.fields.BooleanField')(default=False)),
-            ('num_orders', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
-            ('hash', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)),
-            ('date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
-        ))
-        db.send_create_signal('address', ['UserAddress'])
+class Migration(migrations.Migration):
 
-        # Adding model 'Country'
-        db.create_table('address_country', (
-            ('iso_3166_1_a2', self.gf('django.db.models.fields.CharField')(max_length=2, primary_key=True)),
-            ('iso_3166_1_a3', self.gf('django.db.models.fields.CharField')(max_length=3, null=True, db_index=True)),
-            ('iso_3166_1_numeric', self.gf('django.db.models.fields.PositiveSmallIntegerField')(null=True, db_index=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=128)),
-            ('printable_name', self.gf('django.db.models.fields.CharField')(max_length=128)),
-            ('is_highlighted', self.gf('django.db.models.fields.BooleanField')(default=False, db_index=True)),
-            ('is_shipping_country', self.gf('django.db.models.fields.BooleanField')(default=False, db_index=True)),
-        ))
-        db.send_create_signal('address', ['Country'])
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
 
-
-    def backwards(self, orm):
-
-        # Deleting model 'UserAddress'
-        db.delete_table('address_useraddress')
-
-        # Deleting model 'Country'
-        db.delete_table('address_country')
-
-
-    models = {
-        'address.country': {
-            'Meta': {'ordering': "('-is_highlighted', 'name')", 'object_name': 'Country'},
-            'is_highlighted': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'is_shipping_country': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'iso_3166_1_a2': ('django.db.models.fields.CharField', [], {'max_length': '2', 'primary_key': 'True'}),
-            'iso_3166_1_a3': ('django.db.models.fields.CharField', [], {'max_length': '3', 'null': 'True', 'db_index': 'True'}),
-            'iso_3166_1_numeric': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'db_index': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'printable_name': ('django.db.models.fields.CharField', [], {'max_length': '128'})
-        },
-        'address.useraddress': {
-            'Meta': {'ordering': "['-num_orders']", 'object_name': 'UserAddress'},
-            'country': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['address.Country']"}),
-            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'hash': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_default_for_billing': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_default_for_shipping': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'line1': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'line2': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'line3': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'line4': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'notes': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'num_orders': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
-            'phone_number': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'postcode': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
-            'search_text': ('django.db.models.fields.CharField', [], {'max_length': '1000'}),
-            'state': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'title': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'addresses'", 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
-        },
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        AUTH_USER_MODEL: {
-            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        }
-    }
-
-    complete_apps = ['address']
+    operations = [
+        migrations.CreateModel(
+            name='Country',
+            fields=[
+                ('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={
+                '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(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={
+                'verbose_name': 'User address',
+                'verbose_name_plural': 'User addresses',
+                'ordering': ['-num_orders'],
+                'abstract': False,
+            },
+            bases=(models.Model,),
+        ),
+        migrations.AlterUniqueTogether(
+            name='useraddress',
+            unique_together=set([('user', 'hash')]),
+        ),
+    ]

oscar/apps/address/models.py

@@ -1,10 +1,13 @@
+from oscar.core.loading import is_model_registered
 from oscar.apps.address.abstract_models import (
     AbstractUserAddress, AbstractCountry)
 
 
-class UserAddress(AbstractUserAddress):
-    pass
+if not is_model_registered('address', 'UserAddress'):
+    class UserAddress(AbstractUserAddress):
+        pass
 
 
-class Country(AbstractCountry):
-    pass
+if not is_model_registered('address', 'Country'):
+    class Country(AbstractCountry):
+        pass

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

@@ -0,0 +1,131 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Adding model 'UserAddress'
+        db.create_table('address_useraddress', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('title', self.gf('django.db.models.fields.CharField')(max_length=64, null=True, blank=True)),
+            ('first_name', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
+            ('last_name', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)),
+            ('line1', self.gf('django.db.models.fields.CharField')(max_length=255)),
+            ('line2', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
+            ('line3', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
+            ('line4', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
+            ('state', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
+            ('postcode', self.gf('django.db.models.fields.CharField')(max_length=64)),
+            ('country', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['address.Country'])),
+            ('search_text', self.gf('django.db.models.fields.CharField')(max_length=1000)),
+            ('phone_number', self.gf('django.db.models.fields.CharField')(max_length=32, null=True, blank=True)),
+            ('notes', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(related_name='addresses', to=orm[AUTH_USER_MODEL])),
+            ('is_default_for_shipping', self.gf('django.db.models.fields.BooleanField')(default=False)),
+            ('is_default_for_billing', self.gf('django.db.models.fields.BooleanField')(default=False)),
+            ('num_orders', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
+            ('hash', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)),
+            ('date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
+        ))
+        db.send_create_signal('address', ['UserAddress'])
+
+        # Adding model 'Country'
+        db.create_table('address_country', (
+            ('iso_3166_1_a2', self.gf('django.db.models.fields.CharField')(max_length=2, primary_key=True)),
+            ('iso_3166_1_a3', self.gf('django.db.models.fields.CharField')(max_length=3, null=True, db_index=True)),
+            ('iso_3166_1_numeric', self.gf('django.db.models.fields.PositiveSmallIntegerField')(null=True, db_index=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=128)),
+            ('printable_name', self.gf('django.db.models.fields.CharField')(max_length=128)),
+            ('is_highlighted', self.gf('django.db.models.fields.BooleanField')(default=False, db_index=True)),
+            ('is_shipping_country', self.gf('django.db.models.fields.BooleanField')(default=False, db_index=True)),
+        ))
+        db.send_create_signal('address', ['Country'])
+
+
+    def backwards(self, orm):
+
+        # Deleting model 'UserAddress'
+        db.delete_table('address_useraddress')
+
+        # Deleting model 'Country'
+        db.delete_table('address_country')
+
+
+    models = {
+        'address.country': {
+            'Meta': {'ordering': "('-is_highlighted', 'name')", 'object_name': 'Country'},
+            'is_highlighted': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
+            'is_shipping_country': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
+            'iso_3166_1_a2': ('django.db.models.fields.CharField', [], {'max_length': '2', 'primary_key': 'True'}),
+            'iso_3166_1_a3': ('django.db.models.fields.CharField', [], {'max_length': '3', 'null': 'True', 'db_index': 'True'}),
+            'iso_3166_1_numeric': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'db_index': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'printable_name': ('django.db.models.fields.CharField', [], {'max_length': '128'})
+        },
+        'address.useraddress': {
+            'Meta': {'ordering': "['-num_orders']", 'object_name': 'UserAddress'},
+            'country': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['address.Country']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'hash': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_default_for_billing': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_default_for_shipping': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'line1': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'line2': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'line3': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'line4': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'notes': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'num_orders': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'phone_number': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'postcode': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'search_text': ('django.db.models.fields.CharField', [], {'max_length': '1000'}),
+            'state': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'addresses'", 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
+        },
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        AUTH_USER_MODEL: {
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        }
+    }
+
+    complete_apps = ['address']

oscar/apps/analytics/__init__.py

@@ -0,0 +1 @@
+default_app_config = 'oscar.apps.analytics.config.AnalyticsConfig'

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.
@@ -29,11 +31,12 @@ class AbstractProductRecord(models.Model):
 
     class Meta:
         abstract = True
+        app_label = 'analytics'
         ordering = ['-num_purchases']
         verbose_name = _('Product record')
         verbose_name_plural = _('Product records')
 
-    def __unicode__(self):
+    def __str__(self):
         return _("Record for '%s'") % self.product
 
 
@@ -64,10 +67,12 @@ class AbstractUserRecord(models.Model):
 
     class Meta:
         abstract = True
+        app_label = 'analytics'
         verbose_name = _('User record')
         verbose_name_plural = _('User records')
 
 
+@python_2_unicode_compatible
 class AbstractUserProductView(models.Model):
 
     user = models.ForeignKey(AUTH_USER_MODEL, verbose_name=_("User"))
@@ -76,14 +81,16 @@ class AbstractUserProductView(models.Model):
 
     class Meta:
         abstract = True
+        app_label = 'analytics'
         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"))
@@ -92,10 +99,11 @@ class AbstractUserSearch(models.Model):
 
     class Meta:
         abstract = True
+        app_label = 'analytics'
         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/config.py

@@ -0,0 +1,11 @@
+from django.apps import AppConfig
+from django.utils.translation import ugettext_lazy as _
+
+
+class AnalyticsConfig(AppConfig):
+    label = 'analytics'
+    name = 'oscar.apps.analytics'
+    verbose_name = _('Analytics')
+
+    def ready(self):
+        from . import receivers  # noqa

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

@@ -1,254 +1,30 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
-
-class Migration(SchemaMigration):
-    depends_on = (
-        ('customer', '0001_initial'),
-        ('catalogue', '0001_initial'),
-    )
-
-    def forwards(self, orm):
-        
-        # Adding model 'ProductRecord'
-        db.create_table('analytics_productrecord', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('product', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['catalogue.Product'], unique=True)),
-            ('num_views', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
-            ('num_basket_additions', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
-            ('num_purchases', self.gf('django.db.models.fields.PositiveIntegerField')(default=0, db_index=True)),
-            ('score', self.gf('django.db.models.fields.FloatField')(default=0.0)),
-        ))
-        db.send_create_signal('analytics', ['ProductRecord'])
-
-        # Adding model 'UserRecord'
-        db.create_table('analytics_userrecord', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('user', self.gf('django.db.models.fields.related.OneToOneField')(to=orm[AUTH_USER_MODEL], unique=True)),
-            ('num_product_views', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
-            ('num_basket_additions', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
-            ('num_orders', self.gf('django.db.models.fields.PositiveIntegerField')(default=0, db_index=True)),
-            ('num_order_lines', self.gf('django.db.models.fields.PositiveIntegerField')(default=0, db_index=True)),
-            ('num_order_items', self.gf('django.db.models.fields.PositiveIntegerField')(default=0, db_index=True)),
-            ('total_spent', self.gf('django.db.models.fields.DecimalField')(default='0.00', max_digits=12, decimal_places=2)),
-            ('date_last_order', self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True)),
-        ))
-        db.send_create_signal('analytics', ['UserRecord'])
-
-        # Adding model 'UserProductView'
-        db.create_table('analytics_userproductview', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm[AUTH_USER_MODEL])),
-            ('product', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.Product'])),
-            ('date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
-        ))
-        db.send_create_signal('analytics', ['UserProductView'])
-
-        # Adding model 'UserSearch'
-        db.create_table('analytics_usersearch', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm[AUTH_USER_MODEL])),
-            ('query', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)),
-            ('date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
-        ))
-        db.send_create_signal('analytics', ['UserSearch'])
-
-
-    def backwards(self, orm):
-        
-        # Deleting model 'ProductRecord'
-        db.delete_table('analytics_productrecord')
-
-        # Deleting model 'UserRecord'
-        db.delete_table('analytics_userrecord')
-
-        # Deleting model 'UserProductView'
-        db.delete_table('analytics_userproductview')
-
-        # Deleting model 'UserSearch'
-        db.delete_table('analytics_usersearch')
-
-
-    models = {
-        'analytics.productrecord': {
-            'Meta': {'ordering': "['-num_purchases']", 'object_name': 'ProductRecord'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'num_basket_additions': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
-            'num_purchases': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0', 'db_index': 'True'}),
-            'num_views': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
-            'product': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['catalogue.Product']", 'unique': 'True'}),
-            'score': ('django.db.models.fields.FloatField', [], {'default': '0.0'})
-        },
-        'analytics.userproductview': {
-            'Meta': {'object_name': 'UserProductView'},
-            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'product': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Product']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['{0}']".format(AUTH_USER_MODEL)})
-        },
-        'analytics.userrecord': {
-            'Meta': {'object_name': 'UserRecord'},
-            'date_last_order': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'num_basket_additions': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
-            'num_order_items': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0', 'db_index': 'True'}),
-            'num_order_lines': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0', 'db_index': 'True'}),
-            'num_orders': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0', 'db_index': 'True'}),
-            'num_product_views': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
-            'total_spent': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '12', 'decimal_places': '2'}),
-            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['{0}']".format(AUTH_USER_MODEL), 'unique': 'True'})
-        },
-        'analytics.usersearch': {
-            'Meta': {'object_name': 'UserSearch'},
-            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'query': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['{0}']".format(AUTH_USER_MODEL)})
-        },
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        AUTH_USER_MODEL: {
-            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'catalogue.attributeentity': {
-            'Meta': {'object_name': 'AttributeEntity'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'slug': ('django.db.models.fields.SlugField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
-            'type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'entities'", 'to': "orm['catalogue.AttributeEntityType']"})
-        },
-        'catalogue.attributeentitytype': {
-            'Meta': {'object_name': 'AttributeEntityType'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'slug': ('django.db.models.fields.SlugField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'})
-        },
-        'catalogue.attributeoption': {
-            'Meta': {'object_name': 'AttributeOption'},
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'options'", 'to': "orm['catalogue.AttributeOptionGroup']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'option': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'catalogue.attributeoptiongroup': {
-            'Meta': {'object_name': 'AttributeOptionGroup'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'})
-        },
-        'catalogue.category': {
-            'Meta': {'ordering': "['name']", 'object_name': 'Category'},
-            'depth': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'full_name': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
-            'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
-            'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
-            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '1024', 'db_index': 'True'})
-        },
-        'catalogue.option': {
-            'Meta': {'object_name': 'Option'},
-            'code': ('django.db.models.fields.SlugField', [], {'max_length': '128', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'type': ('django.db.models.fields.CharField', [], {'default': "'Required'", 'max_length': '128'})
-        },
-        'catalogue.product': {
-            'Meta': {'ordering': "['-date_created']", 'object_name': 'Product'},
-            'attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.ProductAttribute']", 'through': "orm['catalogue.ProductAttributeValue']", 'symmetrical': 'False'}),
-            'categories': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.Category']", 'through': "orm['catalogue.ProductCategory']", 'symmetrical': 'False'}),
-            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'date_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'variants'", 'null': 'True', 'to': "orm['catalogue.Product']"}),
-            'product_class': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.ProductClass']", 'null': 'True'}),
-            'product_options': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.Option']", 'symmetrical': 'False', 'blank': 'True'}),
-            'recommended_products': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.Product']", 'symmetrical': 'False', 'through': "orm['catalogue.ProductRecommendation']", 'blank': 'True'}),
-            'related_products': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'relations'", 'blank': 'True', 'to': "orm['catalogue.Product']"}),
-            'score': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}),
-            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '255', 'db_index': 'True'}),
-            'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'upc': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'null': 'True', 'blank': 'True'})
-        },
-        'catalogue.productattribute': {
-            'Meta': {'ordering': "['code']", 'object_name': 'ProductAttribute'},
-            'code': ('django.db.models.fields.SlugField', [], {'max_length': '128', 'db_index': 'True'}),
-            'entity_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.AttributeEntityType']", 'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'option_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.AttributeOptionGroup']", 'null': 'True', 'blank': 'True'}),
-            'product_class': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'attributes'", 'null': 'True', 'to': "orm['catalogue.ProductClass']"}),
-            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'type': ('django.db.models.fields.CharField', [], {'default': "'text'", 'max_length': '20'})
-        },
-        'catalogue.productattributevalue': {
-            'Meta': {'object_name': 'ProductAttributeValue'},
-            'attribute': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.ProductAttribute']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'product': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Product']"}),
-            'value_boolean': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'value_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
-            'value_entity': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.AttributeEntity']", 'null': 'True', 'blank': 'True'}),
-            'value_float': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
-            'value_integer': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'value_option': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.AttributeOption']", 'null': 'True', 'blank': 'True'}),
-            'value_richtext': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'value_text': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
-        },
-        'catalogue.productcategory': {
-            'Meta': {'ordering': "['-is_canonical']", 'object_name': 'ProductCategory'},
-            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Category']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_canonical': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'product': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Product']"})
-        },
-        'catalogue.productclass': {
-            'Meta': {'ordering': "['name']", 'object_name': 'ProductClass'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'options': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.Option']", 'symmetrical': 'False', 'blank': 'True'}),
-            'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '128', 'db_index': 'True'})
-        },
-        'catalogue.productrecommendation': {
-            'Meta': {'object_name': 'ProductRecommendation'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'primary': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'primary_recommendations'", 'to': "orm['catalogue.Product']"}),
-            'ranking': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}),
-            'recommendation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Product']"})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        }
-    }
-
-    complete_apps = ['analytics']
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ProductRecord',
+            fields=[
+                ('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={
+                'verbose_name': 'Product record',
+                'verbose_name_plural': 'Product records',
+                'ordering': ['-num_purchases'],
+                'abstract': False,
+            },
+            bases=(models.Model,),
+        ),
+    ]

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

@@ -0,0 +1,74 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+from django.conf import settings
+from decimal import Decimal
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('catalogue', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('analytics', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='productrecord',
+            name='product',
+            field=models.OneToOneField(verbose_name='Product', to='catalogue.Product'),
+            preserve_default=True,
+        ),
+        migrations.CreateModel(
+            name='UserProductView',
+            fields=[
+                ('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={
+                'verbose_name': 'User product view',
+                'verbose_name_plural': 'User product views',
+                'abstract': False,
+            },
+            bases=(models.Model,),
+        ),
+        migrations.CreateModel(
+            name='UserRecord',
+            fields=[
+                ('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={
+                'verbose_name': 'User record',
+                'verbose_name_plural': 'User records',
+                'abstract': False,
+            },
+            bases=(models.Model,),
+        ),
+        migrations.CreateModel(
+            name='UserSearch',
+            fields=[
+                ('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={
+                'verbose_name': 'User search query',
+                'verbose_name_plural': 'User search queries',
+                'abstract': False,
+            },
+            bases=(models.Model,),
+        ),
+    ]

oscar/apps/analytics/models.py

@@ -1,22 +1,30 @@
+import django
+
+from oscar.core.loading import is_model_registered
 from oscar.apps.analytics.abstract_models import (
     AbstractProductRecord, AbstractUserRecord,
     AbstractUserProductView, AbstractUserSearch)
 
 
-class ProductRecord(AbstractProductRecord):
-    pass
+if not is_model_registered('analytics', 'ProductRecord'):
+    class ProductRecord(AbstractProductRecord):
+        pass
 
 
-class UserRecord(AbstractUserRecord):
-    pass
+if not is_model_registered('analytics', 'UserRecord'):
+    class UserRecord(AbstractUserRecord):
+        pass
 
 
-class UserProductView(AbstractUserProductView):
-    pass
+if not is_model_registered('analytics', 'UserProductView'):
+    class UserProductView(AbstractUserProductView):
+        pass
 
 
-class UserSearch(AbstractUserSearch):
-    pass
+if not is_model_registered('analytics', 'UserSearch'):
+    class UserSearch(AbstractUserSearch):
+        pass
 
 
-from .receivers import *  # noqa
+if django.VERSION < (1, 7):
+    from . import receivers  # noqa

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

@@ -0,0 +1,254 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
+
+class Migration(SchemaMigration):
+    depends_on = (
+        ('customer', '0001_initial'),
+        ('catalogue', '0001_initial'),
+    )
+
+    def forwards(self, orm):
+        
+        # Adding model 'ProductRecord'
+        db.create_table('analytics_productrecord', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('product', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['catalogue.Product'], unique=True)),
+            ('num_views', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
+            ('num_basket_additions', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
+            ('num_purchases', self.gf('django.db.models.fields.PositiveIntegerField')(default=0, db_index=True)),
+            ('score', self.gf('django.db.models.fields.FloatField')(default=0.0)),
+        ))
+        db.send_create_signal('analytics', ['ProductRecord'])
+
+        # Adding model 'UserRecord'
+        db.create_table('analytics_userrecord', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('user', self.gf('django.db.models.fields.related.OneToOneField')(to=orm[AUTH_USER_MODEL], unique=True)),
+            ('num_product_views', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
+            ('num_basket_additions', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
+            ('num_orders', self.gf('django.db.models.fields.PositiveIntegerField')(default=0, db_index=True)),
+            ('num_order_lines', self.gf('django.db.models.fields.PositiveIntegerField')(default=0, db_index=True)),
+            ('num_order_items', self.gf('django.db.models.fields.PositiveIntegerField')(default=0, db_index=True)),
+            ('total_spent', self.gf('django.db.models.fields.DecimalField')(default='0.00', max_digits=12, decimal_places=2)),
+            ('date_last_order', self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True)),
+        ))
+        db.send_create_signal('analytics', ['UserRecord'])
+
+        # Adding model 'UserProductView'
+        db.create_table('analytics_userproductview', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm[AUTH_USER_MODEL])),
+            ('product', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.Product'])),
+            ('date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
+        ))
+        db.send_create_signal('analytics', ['UserProductView'])
+
+        # Adding model 'UserSearch'
+        db.create_table('analytics_usersearch', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm[AUTH_USER_MODEL])),
+            ('query', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)),
+            ('date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
+        ))
+        db.send_create_signal('analytics', ['UserSearch'])
+
+
+    def backwards(self, orm):
+        
+        # Deleting model 'ProductRecord'
+        db.delete_table('analytics_productrecord')
+
+        # Deleting model 'UserRecord'
+        db.delete_table('analytics_userrecord')
+
+        # Deleting model 'UserProductView'
+        db.delete_table('analytics_userproductview')
+
+        # Deleting model 'UserSearch'
+        db.delete_table('analytics_usersearch')
+
+
+    models = {
+        'analytics.productrecord': {
+            'Meta': {'ordering': "['-num_purchases']", 'object_name': 'ProductRecord'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'num_basket_additions': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'num_purchases': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0', 'db_index': 'True'}),
+            'num_views': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'product': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['catalogue.Product']", 'unique': 'True'}),
+            'score': ('django.db.models.fields.FloatField', [], {'default': '0.0'})
+        },
+        'analytics.userproductview': {
+            'Meta': {'object_name': 'UserProductView'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'product': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Product']"}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['{0}']".format(AUTH_USER_MODEL)})
+        },
+        'analytics.userrecord': {
+            'Meta': {'object_name': 'UserRecord'},
+            'date_last_order': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'num_basket_additions': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'num_order_items': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0', 'db_index': 'True'}),
+            'num_order_lines': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0', 'db_index': 'True'}),
+            'num_orders': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0', 'db_index': 'True'}),
+            'num_product_views': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'total_spent': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '12', 'decimal_places': '2'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['{0}']".format(AUTH_USER_MODEL), 'unique': 'True'})
+        },
+        'analytics.usersearch': {
+            'Meta': {'object_name': 'UserSearch'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'query': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['{0}']".format(AUTH_USER_MODEL)})
+        },
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        AUTH_USER_MODEL: {
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'catalogue.attributeentity': {
+            'Meta': {'object_name': 'AttributeEntity'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
+            'type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'entities'", 'to': "orm['catalogue.AttributeEntityType']"})
+        },
+        'catalogue.attributeentitytype': {
+            'Meta': {'object_name': 'AttributeEntityType'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'})
+        },
+        'catalogue.attributeoption': {
+            'Meta': {'object_name': 'AttributeOption'},
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'options'", 'to': "orm['catalogue.AttributeOptionGroup']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'option': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'catalogue.attributeoptiongroup': {
+            'Meta': {'object_name': 'AttributeOptionGroup'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'})
+        },
+        'catalogue.category': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Category'},
+            'depth': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'full_name': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '1024', 'db_index': 'True'})
+        },
+        'catalogue.option': {
+            'Meta': {'object_name': 'Option'},
+            'code': ('django.db.models.fields.SlugField', [], {'max_length': '128', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "'Required'", 'max_length': '128'})
+        },
+        'catalogue.product': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'Product'},
+            'attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.ProductAttribute']", 'through': "orm['catalogue.ProductAttributeValue']", 'symmetrical': 'False'}),
+            'categories': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.Category']", 'through': "orm['catalogue.ProductCategory']", 'symmetrical': 'False'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'date_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'variants'", 'null': 'True', 'to': "orm['catalogue.Product']"}),
+            'product_class': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.ProductClass']", 'null': 'True'}),
+            'product_options': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.Option']", 'symmetrical': 'False', 'blank': 'True'}),
+            'recommended_products': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.Product']", 'symmetrical': 'False', 'through': "orm['catalogue.ProductRecommendation']", 'blank': 'True'}),
+            'related_products': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'relations'", 'blank': 'True', 'to': "orm['catalogue.Product']"}),
+            'score': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '255', 'db_index': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'upc': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'null': 'True', 'blank': 'True'})
+        },
+        'catalogue.productattribute': {
+            'Meta': {'ordering': "['code']", 'object_name': 'ProductAttribute'},
+            'code': ('django.db.models.fields.SlugField', [], {'max_length': '128', 'db_index': 'True'}),
+            'entity_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.AttributeEntityType']", 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'option_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.AttributeOptionGroup']", 'null': 'True', 'blank': 'True'}),
+            'product_class': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'attributes'", 'null': 'True', 'to': "orm['catalogue.ProductClass']"}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "'text'", 'max_length': '20'})
+        },
+        'catalogue.productattributevalue': {
+            'Meta': {'object_name': 'ProductAttributeValue'},
+            'attribute': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.ProductAttribute']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'product': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Product']"}),
+            'value_boolean': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'value_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'value_entity': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.AttributeEntity']", 'null': 'True', 'blank': 'True'}),
+            'value_float': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'value_integer': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'value_option': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.AttributeOption']", 'null': 'True', 'blank': 'True'}),
+            'value_richtext': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'value_text': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
+        },
+        'catalogue.productcategory': {
+            'Meta': {'ordering': "['-is_canonical']", 'object_name': 'ProductCategory'},
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Category']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_canonical': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
+            'product': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Product']"})
+        },
+        'catalogue.productclass': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ProductClass'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'options': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.Option']", 'symmetrical': 'False', 'blank': 'True'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '128', 'db_index': 'True'})
+        },
+        'catalogue.productrecommendation': {
+            'Meta': {'object_name': 'ProductRecommendation'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'primary': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'primary_recommendations'", 'to': "orm['catalogue.Product']"}),
+            'ranking': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}),
+            'recommendation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Product']"})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        }
+    }
+
+    complete_apps = ['analytics']

oscar/apps/basket/__init__.py

@@ -0,0 +1 @@
+default_app_config = 'oscar.apps.basket.config.BasketConfig'

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
@@ -55,6 +57,7 @@ class AbstractBasket(models.Model):
 
     class Meta:
         abstract = True
+        app_label = 'basket'
         verbose_name = _('Basket')
         verbose_name_plural = _('Baskets')
 
@@ -73,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,
@@ -537,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)
@@ -584,11 +588,12 @@ class AbstractLine(models.Model):
 
     class Meta:
         abstract = True
+        app_label = 'basket'
         unique_together = ("basket", "line_reference")
         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,
@@ -831,5 +836,6 @@ class AbstractLineAttribute(models.Model):
 
     class Meta:
         abstract = True
+        app_label = 'basket'
         verbose_name = _('Line attribute')
         verbose_name_plural = _('Line attributes')

oscar/apps/basket/config.py

@@ -0,0 +1,8 @@
+from django.apps import AppConfig
+from django.utils.translation import ugettext_lazy as _
+
+
+class BasketConfig(AppConfig):
+    label = 'basket'
+    name = 'oscar.apps.basket'
+    verbose_name = _('Basket')

oscar/apps/basket/forms.py

@@ -135,11 +135,11 @@ class AddToBasketForm(forms.Form):
 
     def __init__(self, basket, product, *args, **kwargs):
         # Note, the product passed in here isn't necessarily the product being
-        # added to the basket. For group products, it is the *parent* product
+        # added to the basket. For child products, it is the *parent* product
         # that gets passed to the form. An optional product_id param is passed
         # to indicate the ID of the child product being added to the basket.
         self.basket = basket
-        self.base_product = product
+        self.parent_product = product
 
         super(AddToBasketForm, self).__init__(*args, **kwargs)
 
@@ -200,7 +200,7 @@ class AddToBasketForm(forms.Form):
 
     def clean_child_id(self):
         try:
-            child = self.base_product.children.get(
+            child = self.parent_product.children.get(
                 id=self.cleaned_data['child_id'])
         except Product.DoesNotExist:
             raise forms.ValidationError(
@@ -235,7 +235,7 @@ class AddToBasketForm(forms.Form):
         """
         # Note, the child product attribute is saved in the clean_child_id
         # method
-        return getattr(self, 'child_product', self.base_product)
+        return getattr(self, 'child_product', self.parent_product)
 
     def clean(self):
         info = self.basket.strategy.fetch_for_product(self.product)
@@ -265,7 +265,7 @@ class AddToBasketForm(forms.Form):
         Return submitted options in a clean format
         """
         options = []
-        for option in self.base_product.options:
+        for option in self.parent_product.options:
             if option.code in self.cleaned_data:
                 options.append({
                     'option': option,

oscar/apps/basket/middleware.py

@@ -70,11 +70,12 @@ class BasketMiddleware(object):
                 and request.basket._wrapped is empty):
             return response
 
+        cookie_key = self.get_cookie_key(request)
         # Check if we need to set a cookie. If the cookies is already available
         # but is set in the cookies_to_delete list then we need to re-set it.
         has_basket_cookie = (
-            settings.OSCAR_BASKET_COOKIE_OPEN in request.COOKIES
-            and settings.OSCAR_BASKET_COOKIE_OPEN not in cookies_to_delete)
+            cookie_key in request.COOKIES
+            and cookie_key not in cookies_to_delete)
 
         # If a basket has had products added to it, but the user is anonymous
         # then we need to assign it to a cookie
@@ -82,10 +83,19 @@ class BasketMiddleware(object):
                 and not has_basket_cookie):
             cookie = self.get_basket_hash(request.basket.id)
             response.set_cookie(
-                settings.OSCAR_BASKET_COOKIE_OPEN, cookie,
+                cookie_key, cookie,
                 max_age=settings.OSCAR_BASKET_COOKIE_LIFETIME, httponly=True)
         return response
 
+    def get_cookie_key(self, request):
+        """
+        Returns the cookie name to use for storing a cookie basket.
+
+        The method serves as a useful hook in multi-site scenarios where
+        different baskets might be needed.
+        """
+        return settings.OSCAR_BASKET_COOKIE_OPEN
+
     def process_template_response(self, request, response):
         if hasattr(response, 'context_data'):
             if response.context_data is None:
@@ -114,8 +124,8 @@ class BasketMiddleware(object):
             return request._basket_cache
 
         manager = Basket.open
-        cookie_basket = self.get_cookie_basket(
-            settings.OSCAR_BASKET_COOKIE_OPEN, request, manager)
+        cookie_key = self.get_cookie_key(request)
+        cookie_basket = self.get_cookie_basket(cookie_key, request, manager)
 
         if hasattr(request, 'user') and request.user.is_authenticated():
             # Signed-in user: if they have a cookie basket too, it means
@@ -137,8 +147,7 @@ class BasketMiddleware(object):
 
             if cookie_basket:
                 self.merge_baskets(basket, cookie_basket)
-                request.cookies_to_delete.append(
-                    settings.OSCAR_BASKET_COOKIE_OPEN)
+                request.cookies_to_delete.append(cookie_key)
 
         elif cookie_basket:
             # Anonymous user with a basket tied to the cookie

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

@@ -1,302 +1,32 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
-
-class Migration(SchemaMigration):
-    depends_on = (
-        ('catalogue', '0001_initial'),
-        ('voucher', '0001_initial'),
-        ('offer', '0001_initial'),
-    )
-
-    def forwards(self, orm):
-        
-        # Adding model 'Basket'
-        db.create_table('basket_basket', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('owner', self.gf('django.db.models.fields.related.ForeignKey')(related_name='baskets', null=True, to=orm[AUTH_USER_MODEL])),
-            ('status', self.gf('django.db.models.fields.CharField')(default='Open', max_length=128)),
-            ('date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
-            ('date_merged', self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True)),
-            ('date_submitted', self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True)),
-        ))
-        db.send_create_signal('basket', ['Basket'])
-
-        # Adding M2M table for field vouchers on 'Basket'
-        db.create_table('basket_basket_vouchers', (
-            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
-            ('basket', models.ForeignKey(orm['basket.basket'], null=False)),
-            ('voucher', models.ForeignKey(orm['voucher.voucher'], null=False))
-        ))
-        db.create_unique('basket_basket_vouchers', ['basket_id', 'voucher_id'])
-
-        # Adding model 'Line'
-        db.create_table('basket_line', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('basket', self.gf('django.db.models.fields.related.ForeignKey')(related_name='lines', to=orm['basket.Basket'])),
-            ('line_reference', self.gf('django.db.models.fields.SlugField')(max_length=128, db_index=True)),
-            ('product', self.gf('django.db.models.fields.related.ForeignKey')(related_name='basket_lines', to=orm['catalogue.Product'])),
-            ('quantity', self.gf('django.db.models.fields.PositiveIntegerField')(default=1)),
-            ('date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
-        ))
-        db.send_create_signal('basket', ['Line'])
-
-        # Adding unique constraint on 'Line', fields ['basket', 'line_reference']
-        db.create_unique('basket_line', ['basket_id', 'line_reference'])
-
-        # Adding model 'LineAttribute'
-        db.create_table('basket_lineattribute', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('line', self.gf('django.db.models.fields.related.ForeignKey')(related_name='attributes', to=orm['basket.Line'])),
-            ('option', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.Option'])),
-            ('value', self.gf('django.db.models.fields.CharField')(max_length=255)),
-        ))
-        db.send_create_signal('basket', ['LineAttribute'])
-
-
-    def backwards(self, orm):
-        
-        # Removing unique constraint on 'Line', fields ['basket', 'line_reference']
-        db.delete_unique('basket_line', ['basket_id', 'line_reference'])
-
-        # Deleting model 'Basket'
-        db.delete_table('basket_basket')
-
-        # Removing M2M table for field vouchers on 'Basket'
-        db.delete_table('basket_basket_vouchers')
-
-        # Deleting model 'Line'
-        db.delete_table('basket_line')
-
-        # Deleting model 'LineAttribute'
-        db.delete_table('basket_lineattribute')
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        AUTH_USER_MODEL: {
-            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'basket.basket': {
-            'Meta': {'object_name': 'Basket'},
-            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'date_merged': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'date_submitted': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'baskets'", 'null': 'True', 'to': "orm['{0}']".format(AUTH_USER_MODEL)}),
-            'status': ('django.db.models.fields.CharField', [], {'default': "'Open'", 'max_length': '128'}),
-            'vouchers': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['voucher.Voucher']", 'null': 'True', 'symmetrical': 'False'})
-        },
-        'basket.line': {
-            'Meta': {'unique_together': "(('basket', 'line_reference'),)", 'object_name': 'Line'},
-            'basket': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'lines'", 'to': "orm['basket.Basket']"}),
-            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'line_reference': ('django.db.models.fields.SlugField', [], {'max_length': '128', 'db_index': 'True'}),
-            'product': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'basket_lines'", 'to': "orm['catalogue.Product']"}),
-            'quantity': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1'})
-        },
-        'basket.lineattribute': {
-            'Meta': {'object_name': 'LineAttribute'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'line': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'attributes'", 'to': "orm['basket.Line']"}),
-            'option': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Option']"}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'catalogue.attributeentity': {
-            'Meta': {'object_name': 'AttributeEntity'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'slug': ('django.db.models.fields.SlugField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
-            'type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'entities'", 'to': "orm['catalogue.AttributeEntityType']"})
-        },
-        'catalogue.attributeentitytype': {
-            'Meta': {'object_name': 'AttributeEntityType'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'slug': ('django.db.models.fields.SlugField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'})
-        },
-        'catalogue.attributeoption': {
-            'Meta': {'object_name': 'AttributeOption'},
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'options'", 'to': "orm['catalogue.AttributeOptionGroup']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'option': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'catalogue.attributeoptiongroup': {
-            'Meta': {'object_name': 'AttributeOptionGroup'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'})
-        },
-        'catalogue.category': {
-            'Meta': {'ordering': "['name']", 'object_name': 'Category'},
-            'depth': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'full_name': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
-            'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
-            'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
-            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '1024', 'db_index': 'True'})
-        },
-        'catalogue.option': {
-            'Meta': {'object_name': 'Option'},
-            'code': ('django.db.models.fields.SlugField', [], {'max_length': '128', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'type': ('django.db.models.fields.CharField', [], {'default': "'Required'", 'max_length': '128'})
-        },
-        'catalogue.product': {
-            'Meta': {'ordering': "['-date_created']", 'object_name': 'Product'},
-            'attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.ProductAttribute']", 'through': "orm['catalogue.ProductAttributeValue']", 'symmetrical': 'False'}),
-            'categories': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.Category']", 'through': "orm['catalogue.ProductCategory']", 'symmetrical': 'False'}),
-            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'date_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'variants'", 'null': 'True', 'to': "orm['catalogue.Product']"}),
-            'product_class': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.ProductClass']", 'null': 'True'}),
-            'product_options': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.Option']", 'symmetrical': 'False', 'blank': 'True'}),
-            'recommended_products': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.Product']", 'symmetrical': 'False', 'through': "orm['catalogue.ProductRecommendation']", 'blank': 'True'}),
-            'related_products': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'relations'", 'blank': 'True', 'to': "orm['catalogue.Product']"}),
-            'score': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}),
-            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '255', 'db_index': 'True'}),
-            'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'upc': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'null': 'True', 'blank': 'True'})
-        },
-        'catalogue.productattribute': {
-            'Meta': {'ordering': "['code']", 'object_name': 'ProductAttribute'},
-            'code': ('django.db.models.fields.SlugField', [], {'max_length': '128', 'db_index': 'True'}),
-            'entity_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.AttributeEntityType']", 'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'option_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.AttributeOptionGroup']", 'null': 'True', 'blank': 'True'}),
-            'product_class': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'attributes'", 'null': 'True', 'to': "orm['catalogue.ProductClass']"}),
-            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'type': ('django.db.models.fields.CharField', [], {'default': "'text'", 'max_length': '20'})
-        },
-        'catalogue.productattributevalue': {
-            'Meta': {'object_name': 'ProductAttributeValue'},
-            'attribute': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.ProductAttribute']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'product': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Product']"}),
-            'value_boolean': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'value_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
-            'value_entity': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.AttributeEntity']", 'null': 'True', 'blank': 'True'}),
-            'value_float': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
-            'value_integer': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'value_option': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.AttributeOption']", 'null': 'True', 'blank': 'True'}),
-            'value_richtext': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'value_text': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
-        },
-        'catalogue.productcategory': {
-            'Meta': {'ordering': "['-is_canonical']", 'object_name': 'ProductCategory'},
-            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Category']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_canonical': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'product': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Product']"})
-        },
-        'catalogue.productclass': {
-            'Meta': {'ordering': "['name']", 'object_name': 'ProductClass'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'options': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.Option']", 'symmetrical': 'False', 'blank': 'True'}),
-            'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '128', 'db_index': 'True'})
-        },
-        'catalogue.productrecommendation': {
-            'Meta': {'object_name': 'ProductRecommendation'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'primary': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'primary_recommendations'", 'to': "orm['catalogue.Product']"}),
-            'ranking': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}),
-            'recommendation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Product']"})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'offer.benefit': {
-            'Meta': {'object_name': 'Benefit'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'max_affected_items': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'range': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['offer.Range']", 'null': 'True', 'blank': 'True'}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'value': ('oscar.models.fields.PositiveDecimalField', [], {'null': 'True', 'max_digits': '12', 'decimal_places': '2', 'blank': 'True'})
-        },
-        'offer.condition': {
-            'Meta': {'object_name': 'Condition'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'range': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['offer.Range']"}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'value': ('oscar.models.fields.PositiveDecimalField', [], {'max_digits': '12', 'decimal_places': '2'})
-        },
-        'offer.conditionaloffer': {
-            'Meta': {'ordering': "['-priority']", 'object_name': 'ConditionalOffer'},
-            'benefit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['offer.Benefit']"}),
-            'condition': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['offer.Condition']"}),
-            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'offer_type': ('django.db.models.fields.CharField', [], {'default': "'Site'", 'max_length': '128'}),
-            'priority': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'redirect_url': ('oscar.models.fields.ExtendedURLField', [], {'max_length': '200', 'blank': 'True'}),
-            'start_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
-            'total_discount': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '12', 'decimal_places': '2'})
-        },
-        'offer.range': {
-            'Meta': {'object_name': 'Range'},
-            'classes': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'classes'", 'blank': 'True', 'to': "orm['catalogue.ProductClass']"}),
-            'excluded_products': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'excludes'", 'blank': 'True', 'to': "orm['catalogue.Product']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'included_categories': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'includes'", 'blank': 'True', 'to': "orm['catalogue.Category']"}),
-            'included_products': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'includes'", 'blank': 'True', 'to': "orm['catalogue.Product']"}),
-            'includes_all_products': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'})
-        },
-        'voucher.voucher': {
-            'Meta': {'object_name': 'Voucher'},
-            'code': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128', 'db_index': 'True'}),
-            'date_created': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'end_date': ('django.db.models.fields.DateField', [], {}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'num_basket_additions': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
-            'num_orders': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
-            'offers': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'vouchers'", 'symmetrical': 'False', 'to': "orm['offer.ConditionalOffer']"}),
-            'start_date': ('django.db.models.fields.DateField', [], {}),
-            'total_discount': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '12', 'decimal_places': '2'}),
-            'usage': ('django.db.models.fields.CharField', [], {'default': "'Multi-use'", 'max_length': '128'})
-        }
-    }
-
-    complete_apps = ['basket']
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+from django.conf import settings
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Basket',
+            fields=[
+                ('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={
+                'verbose_name': 'Basket',
+                'verbose_name_plural': 'Baskets',
+                'abstract': False,
+            },
+            bases=(models.Model,),
+        ),
+    ]

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

@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('catalogue', '0001_initial'),
+        ('voucher', '0001_initial'),
+        ('basket', '0001_initial'),
+        ('partner', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='basket',
+            name='vouchers',
+            field=models.ManyToManyField(verbose_name='Vouchers', blank=True, to='voucher.Voucher', null=True),
+            preserve_default=True,
+        ),
+        migrations.CreateModel(
+            name='Line',
+            fields=[
+                ('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={
+                'verbose_name': 'Basket line',
+                'verbose_name_plural': 'Basket lines',
+                'abstract': False,
+            },
+            bases=(models.Model,),
+        ),
+        migrations.AlterUniqueTogether(
+            name='line',
+            unique_together=set([('basket', 'line_reference')]),
+        ),
+        migrations.CreateModel(
+            name='LineAttribute',
+            fields=[
+                ('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={
+                'verbose_name': 'Line attribute',
+                'verbose_name_plural': 'Line attributes',
+                'abstract': False,
+            },
+            bases=(models.Model,),
+        ),
+    ]

oscar/apps/basket/models.py

@@ -1,3 +1,4 @@
+from oscar.core.loading import is_model_registered
 from oscar.apps.basket.abstract_models import (
     AbstractBasket, AbstractLine, AbstractLineAttribute)
 
@@ -6,13 +7,16 @@ class InvalidBasketLineError(Exception):
     pass
 
 
-class Basket(AbstractBasket):
-    pass
+if not is_model_registered('basket', 'Basket'):
+    class Basket(AbstractBasket):
+        pass
 
 
-class Line(AbstractLine):
-    pass
+if not is_model_registered('basket', 'Line'):
+    class Line(AbstractLine):
+        pass
 
 
-class LineAttribute(AbstractLineAttribute):
-    pass
+if not is_model_registered('basket', 'LineAttribute'):
+    class LineAttribute(AbstractLineAttribute):
+        pass

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

@@ -0,0 +1,302 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
+
+class Migration(SchemaMigration):
+    depends_on = (
+        ('catalogue', '0001_initial'),
+        ('voucher', '0001_initial'),
+        ('offer', '0001_initial'),
+    )
+
+    def forwards(self, orm):
+        
+        # Adding model 'Basket'
+        db.create_table('basket_basket', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('owner', self.gf('django.db.models.fields.related.ForeignKey')(related_name='baskets', null=True, to=orm[AUTH_USER_MODEL])),
+            ('status', self.gf('django.db.models.fields.CharField')(default='Open', max_length=128)),
+            ('date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
+            ('date_merged', self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True)),
+            ('date_submitted', self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True)),
+        ))
+        db.send_create_signal('basket', ['Basket'])
+
+        # Adding M2M table for field vouchers on 'Basket'
+        db.create_table('basket_basket_vouchers', (
+            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+            ('basket', models.ForeignKey(orm['basket.basket'], null=False)),
+            ('voucher', models.ForeignKey(orm['voucher.voucher'], null=False))
+        ))
+        db.create_unique('basket_basket_vouchers', ['basket_id', 'voucher_id'])
+
+        # Adding model 'Line'
+        db.create_table('basket_line', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('basket', self.gf('django.db.models.fields.related.ForeignKey')(related_name='lines', to=orm['basket.Basket'])),
+            ('line_reference', self.gf('django.db.models.fields.SlugField')(max_length=128, db_index=True)),
+            ('product', self.gf('django.db.models.fields.related.ForeignKey')(related_name='basket_lines', to=orm['catalogue.Product'])),
+            ('quantity', self.gf('django.db.models.fields.PositiveIntegerField')(default=1)),
+            ('date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
+        ))
+        db.send_create_signal('basket', ['Line'])
+
+        # Adding unique constraint on 'Line', fields ['basket', 'line_reference']
+        db.create_unique('basket_line', ['basket_id', 'line_reference'])
+
+        # Adding model 'LineAttribute'
+        db.create_table('basket_lineattribute', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('line', self.gf('django.db.models.fields.related.ForeignKey')(related_name='attributes', to=orm['basket.Line'])),
+            ('option', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.Option'])),
+            ('value', self.gf('django.db.models.fields.CharField')(max_length=255)),
+        ))
+        db.send_create_signal('basket', ['LineAttribute'])
+
+
+    def backwards(self, orm):
+        
+        # Removing unique constraint on 'Line', fields ['basket', 'line_reference']
+        db.delete_unique('basket_line', ['basket_id', 'line_reference'])
+
+        # Deleting model 'Basket'
+        db.delete_table('basket_basket')
+
+        # Removing M2M table for field vouchers on 'Basket'
+        db.delete_table('basket_basket_vouchers')
+
+        # Deleting model 'Line'
+        db.delete_table('basket_line')
+
+        # Deleting model 'LineAttribute'
+        db.delete_table('basket_lineattribute')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        AUTH_USER_MODEL: {
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'basket.basket': {
+            'Meta': {'object_name': 'Basket'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'date_merged': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'date_submitted': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'baskets'", 'null': 'True', 'to': "orm['{0}']".format(AUTH_USER_MODEL)}),
+            'status': ('django.db.models.fields.CharField', [], {'default': "'Open'", 'max_length': '128'}),
+            'vouchers': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['voucher.Voucher']", 'null': 'True', 'symmetrical': 'False'})
+        },
+        'basket.line': {
+            'Meta': {'unique_together': "(('basket', 'line_reference'),)", 'object_name': 'Line'},
+            'basket': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'lines'", 'to': "orm['basket.Basket']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'line_reference': ('django.db.models.fields.SlugField', [], {'max_length': '128', 'db_index': 'True'}),
+            'product': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'basket_lines'", 'to': "orm['catalogue.Product']"}),
+            'quantity': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1'})
+        },
+        'basket.lineattribute': {
+            'Meta': {'object_name': 'LineAttribute'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'line': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'attributes'", 'to': "orm['basket.Line']"}),
+            'option': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Option']"}),
+            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'catalogue.attributeentity': {
+            'Meta': {'object_name': 'AttributeEntity'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
+            'type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'entities'", 'to': "orm['catalogue.AttributeEntityType']"})
+        },
+        'catalogue.attributeentitytype': {
+            'Meta': {'object_name': 'AttributeEntityType'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'})
+        },
+        'catalogue.attributeoption': {
+            'Meta': {'object_name': 'AttributeOption'},
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'options'", 'to': "orm['catalogue.AttributeOptionGroup']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'option': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'catalogue.attributeoptiongroup': {
+            'Meta': {'object_name': 'AttributeOptionGroup'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'})
+        },
+        'catalogue.category': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Category'},
+            'depth': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'full_name': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '1024', 'db_index': 'True'})
+        },
+        'catalogue.option': {
+            'Meta': {'object_name': 'Option'},
+            'code': ('django.db.models.fields.SlugField', [], {'max_length': '128', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "'Required'", 'max_length': '128'})
+        },
+        'catalogue.product': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'Product'},
+            'attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.ProductAttribute']", 'through': "orm['catalogue.ProductAttributeValue']", 'symmetrical': 'False'}),
+            'categories': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.Category']", 'through': "orm['catalogue.ProductCategory']", 'symmetrical': 'False'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'date_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'variants'", 'null': 'True', 'to': "orm['catalogue.Product']"}),
+            'product_class': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.ProductClass']", 'null': 'True'}),
+            'product_options': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.Option']", 'symmetrical': 'False', 'blank': 'True'}),
+            'recommended_products': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.Product']", 'symmetrical': 'False', 'through': "orm['catalogue.ProductRecommendation']", 'blank': 'True'}),
+            'related_products': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'relations'", 'blank': 'True', 'to': "orm['catalogue.Product']"}),
+            'score': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '255', 'db_index': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'upc': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'null': 'True', 'blank': 'True'})
+        },
+        'catalogue.productattribute': {
+            'Meta': {'ordering': "['code']", 'object_name': 'ProductAttribute'},
+            'code': ('django.db.models.fields.SlugField', [], {'max_length': '128', 'db_index': 'True'}),
+            'entity_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.AttributeEntityType']", 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'option_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.AttributeOptionGroup']", 'null': 'True', 'blank': 'True'}),
+            'product_class': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'attributes'", 'null': 'True', 'to': "orm['catalogue.ProductClass']"}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "'text'", 'max_length': '20'})
+        },
+        'catalogue.productattributevalue': {
+            'Meta': {'object_name': 'ProductAttributeValue'},
+            'attribute': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.ProductAttribute']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'product': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Product']"}),
+            'value_boolean': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'value_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'value_entity': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.AttributeEntity']", 'null': 'True', 'blank': 'True'}),
+            'value_float': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'value_integer': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'value_option': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.AttributeOption']", 'null': 'True', 'blank': 'True'}),
+            'value_richtext': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'value_text': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
+        },
+        'catalogue.productcategory': {
+            'Meta': {'ordering': "['-is_canonical']", 'object_name': 'ProductCategory'},
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Category']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_canonical': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
+            'product': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Product']"})
+        },
+        'catalogue.productclass': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ProductClass'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'options': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.Option']", 'symmetrical': 'False', 'blank': 'True'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '128', 'db_index': 'True'})
+        },
+        'catalogue.productrecommendation': {
+            'Meta': {'object_name': 'ProductRecommendation'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'primary': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'primary_recommendations'", 'to': "orm['catalogue.Product']"}),
+            'ranking': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}),
+            'recommendation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Product']"})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'offer.benefit': {
+            'Meta': {'object_name': 'Benefit'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'max_affected_items': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'range': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['offer.Range']", 'null': 'True', 'blank': 'True'}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'value': ('oscar.models.fields.PositiveDecimalField', [], {'null': 'True', 'max_digits': '12', 'decimal_places': '2', 'blank': 'True'})
+        },
+        'offer.condition': {
+            'Meta': {'object_name': 'Condition'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'range': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['offer.Range']"}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'value': ('oscar.models.fields.PositiveDecimalField', [], {'max_digits': '12', 'decimal_places': '2'})
+        },
+        'offer.conditionaloffer': {
+            'Meta': {'ordering': "['-priority']", 'object_name': 'ConditionalOffer'},
+            'benefit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['offer.Benefit']"}),
+            'condition': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['offer.Condition']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'offer_type': ('django.db.models.fields.CharField', [], {'default': "'Site'", 'max_length': '128'}),
+            'priority': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'redirect_url': ('oscar.models.fields.ExtendedURLField', [], {'max_length': '200', 'blank': 'True'}),
+            'start_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'total_discount': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '12', 'decimal_places': '2'})
+        },
+        'offer.range': {
+            'Meta': {'object_name': 'Range'},
+            'classes': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'classes'", 'blank': 'True', 'to': "orm['catalogue.ProductClass']"}),
+            'excluded_products': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'excludes'", 'blank': 'True', 'to': "orm['catalogue.Product']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'included_categories': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'includes'", 'blank': 'True', 'to': "orm['catalogue.Category']"}),
+            'included_products': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'includes'", 'blank': 'True', 'to': "orm['catalogue.Product']"}),
+            'includes_all_products': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'})
+        },
+        'voucher.voucher': {
+            'Meta': {'object_name': 'Voucher'},
+            'code': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128', 'db_index': 'True'}),
+            'date_created': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'end_date': ('django.db.models.fields.DateField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'num_basket_additions': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'num_orders': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'offers': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'vouchers'", 'symmetrical': 'False', 'to': "orm['offer.ConditionalOffer']"}),
+            'start_date': ('django.db.models.fields.DateField', [], {}),
+            'total_discount': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '12', 'decimal_places': '2'}),
+            'usage': ('django.db.models.fields.CharField', [], {'default': "'Multi-use'", 'max_length': '128'})
+        }
+    }
+
+    complete_apps = ['basket']

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/__init__.py

@@ -0,0 +1 @@
+default_app_config = 'oscar.apps.catalogue.config.CatalogueConfig'

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.
@@ -61,14 +63,20 @@ class AbstractProductClass(models.Model):
 
     class Meta:
         abstract = True
+        app_label = 'catalogue'
         ordering = ['name']
-        verbose_name = _("Product Class")
-        verbose_name_plural = _("Product Classes")
+        verbose_name = _("Product class")
+        verbose_name_plural = _("Product classes")
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
+    @property
+    def has_attributes(self):
+        return self.attributes.exists()
+
 
+@python_2_unicode_compatible
 class AbstractCategory(MP_Node):
     """
     A product category. Merely used for navigational purposes; has no
@@ -88,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):
@@ -172,6 +180,7 @@ class AbstractCategory(MP_Node):
 
     class Meta:
         abstract = True
+        app_label = 'catalogue'
         ordering = ['full_name']
         verbose_name = _('Category')
         verbose_name_plural = _('Categories')
@@ -183,6 +192,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.
@@ -193,15 +203,17 @@ class AbstractProductCategory(models.Model):
 
     class Meta:
         abstract = True
+        app_label = 'catalogue'
         ordering = ['product', 'category']
-        verbose_name = _('Product Category')
-        verbose_name_plural = _('Product Categories')
         unique_together = ('product', 'category')
+        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
@@ -243,7 +255,8 @@ class AbstractProduct(models.Model):
                     " this product)."))
 
     # Title is mandatory for canonical products but optional for child products
-    title = models.CharField(_('Product title'), max_length=255, blank=True)
+    title = models.CharField(pgettext_lazy(u'Product title', u'Title'),
+                             max_length=255, blank=True)
     slug = models.SlugField(_('Slug'), max_length=255, unique=False)
     description = models.TextField(_('Description'), blank=True)
 
@@ -251,7 +264,7 @@ class AbstractProduct(models.Model):
     #: None for child products, they inherit their parent's product class
     product_class = models.ForeignKey(
         'catalogue.ProductClass', null=True, on_delete=models.PROTECT,
-        verbose_name=_('Product Type'), related_name="products",
+        verbose_name=_('Product type'), related_name="products",
         help_text=_("Choose what type of product this is"))
     attributes = models.ManyToManyField(
         'catalogue.ProductAttribute',
@@ -289,6 +302,8 @@ class AbstractProduct(models.Model):
     #: Determines if a product may be used in an offer. It is illegal to
     #: discount some types of product (e.g. ebooks) and this field helps
     #: merchants from avoiding discounting such products
+    #: Note that this flag is ignored for child products; they inherit from
+    #: the parent product.
     is_discountable = models.BooleanField(
         _("Is discountable?"), default=True, help_text=_(
             "This flag indicates if this product can be used in an offer "
@@ -299,6 +314,7 @@ class AbstractProduct(models.Model):
 
     class Meta:
         abstract = True
+        app_label = 'catalogue'
         ordering = ['-date_created']
         verbose_name = _('Product')
         verbose_name_plural = _('Products')
@@ -307,7 +323,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()
@@ -320,7 +336,30 @@ class AbstractProduct(models.Model):
                        kwargs={'product_slug': self.slug, 'pk': self.id})
 
     def clean(self):
-        # call clean method for product structure
+        """
+        Validate a product. Those are the rules:
+
+        +---------------+-------------+--------------+--------------+
+        |               | stand alone | parent       | child        |
+        +---------------+-------------+--------------+--------------+
+        | title         | required    | required     | optional     |
+        +---------------+-------------+--------------+--------------+
+        | product class | required    | required     | must be None |
+        +---------------+-------------+--------------+--------------+
+        | parent        | forbidden   | forbidden    | required     |
+        +---------------+-------------+--------------+--------------+
+        | stockrecords  | 0 or more   | forbidden    | required     |
+        +---------------+-------------+--------------+--------------+
+        | categories    | 1 or more   | 1 or more    | forbidden    |
+        +---------------+-------------+--------------+--------------+
+        | attributes    | optional    | optional     | optional     |
+        +---------------+-------------+--------------+--------------+
+        | rec. products | optional    | optional     | unsupported  |
+        +---------------+-------------+--------------+--------------+
+
+        Because the validation logic is quite complex, validation is delegated
+        to the sub method appropriate for the product's structure.
+        """
         getattr(self, '_clean_%s' % self.structure)()
         if not self.is_parent:
             self.attr.validate_attributes()
@@ -345,6 +384,9 @@ class AbstractProduct(models.Model):
         if self.parent_id and not self.parent.is_parent:
             raise ValidationError(
                 _("You can only assign child products to parent products."))
+        if self.product_class:
+            raise ValidationError(
+                _("A child product can't have a product class."))
 
     def _clean_parent(self):
         """
@@ -375,6 +417,23 @@ class AbstractProduct(models.Model):
     def is_child(self):
         return self.structure == self.CHILD
 
+    def can_be_parent(self, give_reason=False):
+        """
+        Helps decide if a the product can be turned into a parent product.
+        """
+        reason = None
+        if self.is_child:
+            reason = _('The specified parent product is a child product.')
+        if self.has_stockrecords:
+            reason = _(
+                "One can't add a child product to a product with stock"
+                " records.")
+        is_valid = reason is None
+        if give_reason:
+            return is_valid, reason
+        else:
+            return is_valid
+
     @property
     def options(self):
         pclass = self.get_product_class()
@@ -409,33 +468,33 @@ class AbstractProduct(models.Model):
         return ", ".join(pairs)
 
     @property
-    def min_variant_price_incl_tax(self):
+    def min_child_price_incl_tax(self):
         """
-        Return minimum variant price including tax
+        Return minimum child product price including tax
         """
-        return self._min_variant_price('price_incl_tax')
+        return self._min_child_price('price_incl_tax')
 
     @property
-    def min_variant_price_excl_tax(self):
+    def min_child_price_excl_tax(self):
         """
-        Return minimum variant price excluding tax
+        Return minimum child product price excluding tax
         """
-        return self._min_variant_price('price_excl_tax')
+        return self._min_child_price('price_excl_tax')
 
-    def _min_variant_price(self, property):
+    def _min_child_price(self, property):
         """
-        Return minimum variant price
+        Return minimum child product price
         """
         prices = []
-        for variant in self.variants.all():
-            if variant.has_stockrecords:
-                prices.append(getattr(variant.stockrecord, property))
+        for child in self.children.all():
+            if child.has_stockrecords:
+                prices.append(getattr(child.stockrecord, property))
         if not prices:
             return None
         prices.sort()
         return prices[0]
 
-    # Deprecated properties
+    # The properties below are based on deprecated naming conventions
 
     @property
     @deprecated
@@ -457,16 +516,33 @@ class AbstractProduct(models.Model):
     @deprecated
     def is_group(self):
         """
-        Test if this is a top level product and has more than 0 variants
+        Test if this is a parent product
         """
         return self.is_parent
 
     @property
+    @deprecated
     def is_variant(self):
         """Return True if a product is not a top level product"""
         return self.is_child
 
-    # Wrappers
+    @property
+    @deprecated
+    def min_variant_price_incl_tax(self):
+        """
+        Return minimum variant price including tax
+        """
+        return self._min_child_price('price_incl_tax')
+
+    @property
+    @deprecated
+    def min_variant_price_excl_tax(self):
+        """
+        Return minimum variant price excluding tax
+        """
+        return self._min_child_price('price_excl_tax')
+
+    # Wrappers for child products
 
     def get_title(self):
         """
@@ -480,15 +556,34 @@ class AbstractProduct(models.Model):
 
     def get_product_class(self):
         """
-        Return a product's item class
+        Return a product's item class. Child products inherit their parent's.
         """
-        if self.product_class_id or self.product_class:
-            return self.product_class
-        if self.parent and self.parent.product_class:
+        if self.is_child:
             return self.parent.product_class
-        return None
+        else:
+            return self.product_class
     get_product_class.short_description = _("Product class")
 
+    def get_is_discountable(self):
+        """
+        At the moment, is_discountable can't be set individually for child
+        products; they inherit it from their parent.
+        """
+        if self.is_child:
+            return self.parent.is_discountable
+        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):
@@ -589,10 +684,11 @@ class AbstractProductRecommendation(models.Model):
 
     class Meta:
         abstract = True
-        verbose_name = _('Product Recommendation')
-        verbose_name_plural = _('Product Recomendations')
+        app_label = 'catalogue'
         ordering = ['primary', '-ranking']
         unique_together = ('primary', 'recommendation')
+        verbose_name = _('Product recommendation')
+        verbose_name_plural = _('Product recomendations')
 
 
 class ProductAttributesContainer(object):
@@ -614,7 +710,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
@@ -661,6 +757,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
@@ -712,9 +809,10 @@ class AbstractProductAttribute(models.Model):
 
     class Meta:
         abstract = True
+        app_label = 'catalogue'
         ordering = ['code']
-        verbose_name = _('Product Attribute')
-        verbose_name_plural = _('Product Attributes')
+        verbose_name = _('Product attribute')
+        verbose_name_plural = _('Product attributes')
 
     @property
     def is_option(self):
@@ -724,7 +822,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):
@@ -815,6 +913,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
@@ -866,11 +965,12 @@ class AbstractProductAttributeValue(models.Model):
 
     class Meta:
         abstract = True
-        verbose_name = _('Product Attribute Value')
-        verbose_name_plural = _('Product Attribute Values')
+        app_label = 'catalogue'
         unique_together = ('attribute', 'product')
+        verbose_name = _('Product attribute value')
+        verbose_name_plural = _('Product attribute values')
 
-    def __unicode__(self):
+    def __str__(self):
         return self.summary()
 
     def summary(self):
@@ -900,7 +1000,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):
@@ -917,6 +1017,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
@@ -926,13 +1027,14 @@ class AbstractAttributeOptionGroup(models.Model):
     """
     name = models.CharField(_('Name'), max_length=128)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
     class Meta:
         abstract = True
-        verbose_name = _('Attribute Option Group')
-        verbose_name_plural = _('Attribute Option Groups')
+        app_label = 'catalogue'
+        verbose_name = _('Attribute option group')
+        verbose_name_plural = _('Attribute option groups')
 
     @property
     def option_summary(self):
@@ -940,6 +1042,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
@@ -950,15 +1053,17 @@ 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:
         abstract = True
-        verbose_name = _('Attribute Option')
-        verbose_name_plural = _('Attribute Options')
+        app_label = 'catalogue'
+        verbose_name = _('Attribute option')
+        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
@@ -985,10 +1090,11 @@ class AbstractOption(models.Model):
 
     class Meta:
         abstract = True
+        app_label = 'catalogue'
         verbose_name = _("Option")
         verbose_name_plural = _("Options")
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
     @property
@@ -1034,6 +1140,7 @@ class MissingProductImage(object):
                                            settings.MEDIA_ROOT))
 
 
+@python_2_unicode_compatible
 class AbstractProductImage(models.Model):
     """
     An image of a product
@@ -1053,14 +1160,15 @@ class AbstractProductImage(models.Model):
 
     class Meta:
         abstract = True
-        unique_together = ("product", "display_order")
+        app_label = 'catalogue'
         # Any custom models should ensure that this ordering is unchanged, or
         # your query count will explode. See AbstractProduct.primary_image.
         ordering = ["display_order"]
-        verbose_name = _('Product Image')
-        verbose_name_plural = _('Product Images')
+        unique_together = ("product", "display_order")
+        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):
@@ -1068,3 +1176,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/config.py

@@ -0,0 +1,11 @@
+from django.apps import AppConfig
+from django.utils.translation import ugettext_lazy as _
+
+
+class CatalogueConfig(AppConfig):
+    label = 'catalogue'
+    name = 'oscar.apps.catalogue'
+    verbose_name = _('Catalogue')
+
+    def ready(self):
+        from . import receivers  # noqa

oscar/apps/catalogue/managers.py

@@ -40,8 +40,6 @@ class ProductManager(models.Manager):
     def base_queryset(self):
         return self.get_queryset().base_queryset()
 
-    get_query_set = get_queryset  # Django 1.5 compatibility fix
-
 
 class BrowsableProductManager(ProductManager):
     """
@@ -52,5 +50,3 @@ class BrowsableProductManager(ProductManager):
 
     def get_queryset(self):
         return super(BrowsableProductManager, self).get_queryset().browsable()
-
-    get_query_set = get_queryset  # Django 1.5 compatibility fix

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

@@ -1,403 +1,291 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-
-        # Adding model 'ProductRecommendation'
-        db.create_table('catalogue_productrecommendation', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('primary', self.gf('django.db.models.fields.related.ForeignKey')(related_name='primary_recommendations', to=orm['catalogue.Product'])),
-            ('recommendation', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.Product'])),
-            ('ranking', self.gf('django.db.models.fields.PositiveSmallIntegerField')(default=0)),
-        ))
-        db.send_create_signal('catalogue', ['ProductRecommendation'])
-
-        # Adding model 'ProductClass'
-        db.create_table('catalogue_productclass', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=128)),
-            ('slug', self.gf('django.db.models.fields.SlugField')(unique=True, max_length=128, db_index=True)),
-        ))
-        db.send_create_signal('catalogue', ['ProductClass'])
-
-        # Adding M2M table for field options on 'ProductClass'
-        db.create_table('catalogue_productclass_options', (
-            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
-            ('productclass', models.ForeignKey(orm['catalogue.productclass'], null=False)),
-            ('option', models.ForeignKey(orm['catalogue.option'], null=False))
-        ))
-        db.create_unique('catalogue_productclass_options', ['productclass_id', 'option_id'])
-
-        # Adding model 'Category'
-        db.create_table('catalogue_category', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('path', self.gf('django.db.models.fields.CharField')(unique=True, max_length=255)),
-            ('depth', self.gf('django.db.models.fields.PositiveIntegerField')()),
-            ('numchild', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)),
-            ('slug',
-             self.gf('django.db.models.fields.SlugField')(max_length=255, db_index=True)),
-            ('full_name',
-             self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)),
-        ))
-        db.send_create_signal('catalogue', ['Category'])
-
-        # Adding model 'ProductCategory'
-        db.create_table('catalogue_productcategory', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('product', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.Product'])),
-            ('category', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.Category'])),
-            ('is_canonical', self.gf('django.db.models.fields.BooleanField')(default=False, db_index=True)),
-        ))
-        db.send_create_signal('catalogue', ['ProductCategory'])
-
-        # Adding model 'Product'
-        db.create_table('catalogue_product', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('upc', self.gf('django.db.models.fields.CharField')(db_index=True, max_length=64, null=True, blank=True)),
-            ('parent', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='variants', null=True, to=orm['catalogue.Product'])),
-            ('title', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
-            ('slug', self.gf('django.db.models.fields.SlugField')(max_length=255, db_index=True)),
-            ('description', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
-            ('product_class', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.ProductClass'], null=True)),
-            ('score', self.gf('django.db.models.fields.FloatField')(default=0.0, db_index=True)),
-            ('date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
-            ('date_updated', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, db_index=True, blank=True)),
-        ))
-        db.send_create_signal('catalogue', ['Product'])
-
-        # Adding M2M table for field product_options on 'Product'
-        db.create_table('catalogue_product_product_options', (
-            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
-            ('product', models.ForeignKey(orm['catalogue.product'], null=False)),
-            ('option', models.ForeignKey(orm['catalogue.option'], null=False))
-        ))
-        db.create_unique('catalogue_product_product_options', ['product_id', 'option_id'])
-
-        # Adding M2M table for field related_products on 'Product'
-        db.create_table('catalogue_product_related_products', (
-            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
-            ('from_product', models.ForeignKey(orm['catalogue.product'], null=False)),
-            ('to_product', models.ForeignKey(orm['catalogue.product'], null=False))
-        ))
-        db.create_unique('catalogue_product_related_products', ['from_product_id', 'to_product_id'])
-
-        # Adding model 'ContributorRole'
-        db.create_table('catalogue_contributorrole', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=50)),
-            ('name_plural', self.gf('django.db.models.fields.CharField')(max_length=50)),
-            ('slug', self.gf('django.db.models.fields.SlugField')(max_length=50, db_index=True)),
-        ))
-        db.send_create_signal('catalogue', ['ContributorRole'])
-
-        # Adding model 'Contributor'
-        db.create_table('catalogue_contributor', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=255)),
-            ('slug', self.gf('django.db.models.fields.SlugField')(max_length=255, db_index=True)),
-        ))
-        db.send_create_signal('catalogue', ['Contributor'])
-
-        # Adding model 'ProductContributor'
-        db.create_table('catalogue_productcontributor', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('product', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.Product'])),
-            ('contributor', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.Contributor'])),
-            ('role', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.ContributorRole'])),
-        ))
-        db.send_create_signal('catalogue', ['ProductContributor'])
-
-        # Adding model 'ProductAttribute'
-        db.create_table('catalogue_productattribute', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('product_class', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='attributes', null=True, to=orm['catalogue.ProductClass'])),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=128)),
-            ('code', self.gf('django.db.models.fields.SlugField')(max_length=128, db_index=True)),
-            ('type', self.gf('django.db.models.fields.CharField')(default='text', max_length=20)),
-            ('option_group', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.AttributeOptionGroup'], null=True, blank=True)),
-            ('entity_type', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.AttributeEntityType'], null=True, blank=True)),
-            ('required', self.gf('django.db.models.fields.BooleanField')(default=False)),
-        ))
-        db.send_create_signal('catalogue', ['ProductAttribute'])
-
-        # Adding model 'ProductAttributeValue'
-        db.create_table('catalogue_productattributevalue', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('attribute', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.ProductAttribute'])),
-            ('product', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.Product'])),
-            ('value_text', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
-            ('value_integer', self.gf('django.db.models.fields.IntegerField')(null=True, blank=True)),
-            ('value_boolean', self.gf('django.db.models.fields.BooleanField')(default=False)),
-            ('value_float', self.gf('django.db.models.fields.FloatField')(null=True, blank=True)),
-            ('value_richtext', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
-            ('value_date', self.gf('django.db.models.fields.DateField')(null=True, blank=True)),
-            ('value_option', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.AttributeOption'], null=True, blank=True)),
-            ('value_entity', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.AttributeEntity'], null=True, blank=True)),
-        ))
-        db.send_create_signal('catalogue', ['ProductAttributeValue'])
-
-        # Adding model 'AttributeOptionGroup'
-        db.create_table('catalogue_attributeoptiongroup', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=128)),
-        ))
-        db.send_create_signal('catalogue', ['AttributeOptionGroup'])
-
-        # Adding model 'AttributeOption'
-        db.create_table('catalogue_attributeoption', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('group', self.gf('django.db.models.fields.related.ForeignKey')(related_name='options', to=orm['catalogue.AttributeOptionGroup'])),
-            ('option', self.gf('django.db.models.fields.CharField')(max_length=255)),
-        ))
-        db.send_create_signal('catalogue', ['AttributeOption'])
-
-        # Adding model 'AttributeEntity'
-        db.create_table('catalogue_attributeentity', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=255)),
-            ('slug', self.gf('django.db.models.fields.SlugField')(db_index=True, max_length=255, blank=True)),
-            ('type', self.gf('django.db.models.fields.related.ForeignKey')(related_name='entities', to=orm['catalogue.AttributeEntityType'])),
-        ))
-        db.send_create_signal('catalogue', ['AttributeEntity'])
-
-        # Adding model 'AttributeEntityType'
-        db.create_table('catalogue_attributeentitytype', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=255)),
-            ('slug', self.gf('django.db.models.fields.SlugField')(db_index=True, max_length=255, blank=True)),
-        ))
-        db.send_create_signal('catalogue', ['AttributeEntityType'])
-
-        # Adding model 'Option'
-        db.create_table('catalogue_option', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=128)),
-            ('code', self.gf('django.db.models.fields.SlugField')(max_length=128, db_index=True)),
-            ('type', self.gf('django.db.models.fields.CharField')(default='Required', max_length=128)),
-        ))
-        db.send_create_signal('catalogue', ['Option'])
-
-        # Adding model 'ProductImage'
-        db.create_table('catalogue_productimage', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('product', self.gf('django.db.models.fields.related.ForeignKey')(related_name='images', to=orm['catalogue.Product'])),
-            ('original', self.gf('django.db.models.fields.files.ImageField')(max_length=100)),
-            ('caption', self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True)),
-            ('display_order', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
-            ('date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
-        ))
-        db.send_create_signal('catalogue', ['ProductImage'])
-
-        # Adding unique constraint on 'ProductImage', fields ['product', 'display_order']
-        db.create_unique('catalogue_productimage', ['product_id', 'display_order'])
-
-
-    def backwards(self, orm):
-
-        # Removing unique constraint on 'ProductImage', fields ['product', 'display_order']
-        db.delete_unique('catalogue_productimage', ['product_id', 'display_order'])
-
-        # Deleting model 'ProductRecommendation'
-        db.delete_table('catalogue_productrecommendation')
-
-        # Deleting model 'ProductClass'
-        db.delete_table('catalogue_productclass')
-
-        # Removing M2M table for field options on 'ProductClass'
-        db.delete_table('catalogue_productclass_options')
-
-        # Deleting model 'Category'
-        db.delete_table('catalogue_category')
-
-        # Deleting model 'ProductCategory'
-        db.delete_table('catalogue_productcategory')
-
-        # Deleting model 'Product'
-        db.delete_table('catalogue_product')
-
-        # Removing M2M table for field product_options on 'Product'
-        db.delete_table('catalogue_product_product_options')
-
-        # Removing M2M table for field related_products on 'Product'
-        db.delete_table('catalogue_product_related_products')
-
-        # Deleting model 'ContributorRole'
-        db.delete_table('catalogue_contributorrole')
-
-        # Deleting model 'Contributor'
-        db.delete_table('catalogue_contributor')
-
-        # Deleting model 'ProductContributor'
-        db.delete_table('catalogue_productcontributor')
-
-        # Deleting model 'ProductAttribute'
-        db.delete_table('catalogue_productattribute')
-
-        # Deleting model 'ProductAttributeValue'
-        db.delete_table('catalogue_productattributevalue')
-
-        # Deleting model 'AttributeOptionGroup'
-        db.delete_table('catalogue_attributeoptiongroup')
-
-        # Deleting model 'AttributeOption'
-        db.delete_table('catalogue_attributeoption')
-
-        # Deleting model 'AttributeEntity'
-        db.delete_table('catalogue_attributeentity')
-
-        # Deleting model 'AttributeEntityType'
-        db.delete_table('catalogue_attributeentitytype')
-
-        # Deleting model 'Option'
-        db.delete_table('catalogue_option')
-
-        # Deleting model 'ProductImage'
-        db.delete_table('catalogue_productimage')
-
-
-    models = {
-        'catalogue.attributeentity': {
-            'Meta': {'object_name': 'AttributeEntity'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'slug': ('django.db.models.fields.SlugField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
-            'type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'entities'", 'to': "orm['catalogue.AttributeEntityType']"})
-        },
-        'catalogue.attributeentitytype': {
-            'Meta': {'object_name': 'AttributeEntityType'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'slug': ('django.db.models.fields.SlugField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'})
-        },
-        'catalogue.attributeoption': {
-            'Meta': {'object_name': 'AttributeOption'},
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'options'", 'to': "orm['catalogue.AttributeOptionGroup']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'option': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'catalogue.attributeoptiongroup': {
-            'Meta': {'object_name': 'AttributeOptionGroup'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'})
-        },
-        'catalogue.category': {
-            'Meta': {'ordering': "['name']", 'object_name': 'Category'},
-            'depth': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'full_name': ('django.db.models.fields.CharField', [],
-                          {'max_length': '255', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
-            'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
-            'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
-            'slug': ('django.db.models.fields.SlugField', [], {'max_length':
-                                                               '255', 'db_index': 'True'})
-        },
-        'catalogue.contributor': {
-            'Meta': {'object_name': 'Contributor'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '255', 'db_index': 'True'})
-        },
-        'catalogue.contributorrole': {
-            'Meta': {'object_name': 'ContributorRole'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
-            'name_plural': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
-            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'db_index': 'True'})
-        },
-        'catalogue.option': {
-            'Meta': {'object_name': 'Option'},
-            'code': ('django.db.models.fields.SlugField', [], {'max_length': '128', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'type': ('django.db.models.fields.CharField', [], {'default': "'Required'", 'max_length': '128'})
-        },
-        'catalogue.product': {
-            'Meta': {'ordering': "['-date_created']", 'object_name': 'Product'},
-            'attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.ProductAttribute']", 'through': "orm['catalogue.ProductAttributeValue']", 'symmetrical': 'False'}),
-            'categories': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.Category']", 'through': "orm['catalogue.ProductCategory']", 'symmetrical': 'False'}),
-            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'date_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'variants'", 'null': 'True', 'to': "orm['catalogue.Product']"}),
-            'product_class': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.ProductClass']", 'null': 'True'}),
-            'product_options': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.Option']", 'symmetrical': 'False', 'blank': 'True'}),
-            'recommended_products': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.Product']", 'symmetrical': 'False', 'through': "orm['catalogue.ProductRecommendation']", 'blank': 'True'}),
-            'related_products': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'relations'", 'blank': 'True', 'to': "orm['catalogue.Product']"}),
-            'score': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}),
-            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '255', 'db_index': 'True'}),
-            'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'upc': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'null': 'True', 'blank': 'True'})
-        },
-        'catalogue.productattribute': {
-            'Meta': {'ordering': "['code']", 'object_name': 'ProductAttribute'},
-            'code': ('django.db.models.fields.SlugField', [], {'max_length': '128', 'db_index': 'True'}),
-            'entity_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.AttributeEntityType']", 'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'option_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.AttributeOptionGroup']", 'null': 'True', 'blank': 'True'}),
-            'product_class': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'attributes'", 'null': 'True', 'to': "orm['catalogue.ProductClass']"}),
-            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'type': ('django.db.models.fields.CharField', [], {'default': "'text'", 'max_length': '20'})
-        },
-        'catalogue.productattributevalue': {
-            'Meta': {'object_name': 'ProductAttributeValue'},
-            'attribute': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.ProductAttribute']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'product': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Product']"}),
-            'value_boolean': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'value_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
-            'value_entity': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.AttributeEntity']", 'null': 'True', 'blank': 'True'}),
-            'value_float': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
-            'value_integer': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'value_option': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.AttributeOption']", 'null': 'True', 'blank': 'True'}),
-            'value_richtext': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'value_text': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
-        },
-        'catalogue.productcategory': {
-            'Meta': {'ordering': "['-is_canonical']", 'object_name': 'ProductCategory'},
-            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Category']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_canonical': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'product': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Product']"})
-        },
-        'catalogue.productclass': {
-            'Meta': {'ordering': "['name']", 'object_name': 'ProductClass'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'options': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.Option']", 'symmetrical': 'False', 'blank': 'True'}),
-            'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '128', 'db_index': 'True'})
-        },
-        'catalogue.productcontributor': {
-            'Meta': {'object_name': 'ProductContributor'},
-            'contributor': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Contributor']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'product': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Product']"}),
-            'role': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.ContributorRole']"})
-        },
-        'catalogue.productimage': {
-            'Meta': {'ordering': "['display_order']", 'unique_together': "(('product', 'display_order'),)", 'object_name': 'ProductImage'},
-            'caption': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'display_order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'original': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),
-            'product': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'images'", 'to': "orm['catalogue.Product']"})
-        },
-        'catalogue.productrecommendation': {
-            'Meta': {'object_name': 'ProductRecommendation'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'primary': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'primary_recommendations'", 'to': "orm['catalogue.Product']"}),
-            'ranking': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}),
-            'recommendation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Product']"})
-        }
-    }
-
-    complete_apps = ['catalogue']
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import oscar.models.fields
+import django.core.validators
+import django.db.models.deletion
+import oscar.models.fields.autoslugfield
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contenttypes', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='AttributeOption',
+            fields=[
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('option', models.CharField(verbose_name='Option', max_length=255)),
+            ],
+            options={
+                'verbose_name': 'Attribute option',
+                'verbose_name_plural': 'Attribute options',
+                'abstract': False,
+            },
+            bases=(models.Model,),
+        ),
+        migrations.CreateModel(
+            name='AttributeOptionGroup',
+            fields=[
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('name', models.CharField(verbose_name='Name', max_length=128)),
+            ],
+            options={
+                'verbose_name': 'Attribute option group',
+                'verbose_name_plural': 'Attribute option groups',
+                'abstract': False,
+            },
+            bases=(models.Model,),
+        ),
+        migrations.AddField(
+            model_name='attributeoption',
+            name='group',
+            field=models.ForeignKey(verbose_name='Group', to='catalogue.AttributeOptionGroup'),
+            preserve_default=True,
+        ),
+        migrations.CreateModel(
+            name='Category',
+            fields=[
+                ('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(verbose_name='Name', db_index=True, max_length=255)),
+                ('description', models.TextField(verbose_name='Description', blank=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={
+                'verbose_name': 'Category',
+                'verbose_name_plural': 'Categories',
+                'ordering': ['full_name'],
+                'abstract': False,
+            },
+            bases=(models.Model,),
+        ),
+        migrations.CreateModel(
+            name='Option',
+            fields=[
+                ('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={
+                'verbose_name': 'Option',
+                'verbose_name_plural': 'Options',
+                'abstract': False,
+            },
+            bases=(models.Model,),
+        ),
+        migrations.CreateModel(
+            name='Product',
+            fields=[
+                ('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(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={
+                'verbose_name': 'Product',
+                'verbose_name_plural': 'Products',
+                'ordering': ['-date_created'],
+                'abstract': False,
+            },
+            bases=(models.Model,),
+        ),
+        migrations.CreateModel(
+            name='ProductAttribute',
+            fields=[
+                ('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={
+                'verbose_name': 'Product attribute',
+                'verbose_name_plural': 'Product attributes',
+                'ordering': ['code'],
+                'abstract': False,
+            },
+            bases=(models.Model,),
+        ),
+        migrations.CreateModel(
+            name='ProductAttributeValue',
+            fields=[
+                ('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(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(editable=False, blank=True, to='contenttypes.ContentType', null=True)),
+            ],
+            options={
+                '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(verbose_name='Attributes', through='catalogue.ProductAttributeValue', to='catalogue.ProductAttribute'),
+            preserve_default=True,
+        ),
+        migrations.AddField(
+            model_name='productattributevalue',
+            name='product',
+            field=models.ForeignKey(verbose_name='Product', to='catalogue.Product'),
+            preserve_default=True,
+        ),
+        migrations.AddField(
+            model_name='productattributevalue',
+            name='value_option',
+            field=models.ForeignKey(verbose_name='Value Option', blank=True, to='catalogue.AttributeOption', null=True),
+            preserve_default=True,
+        ),
+        migrations.AlterUniqueTogether(
+            name='productattributevalue',
+            unique_together=set([('attribute', 'product')]),
+        ),
+        migrations.CreateModel(
+            name='ProductCategory',
+            fields=[
+                ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)),
+                ('category', models.ForeignKey(verbose_name='Category', to='catalogue.Category')),
+            ],
+            options={
+                '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(verbose_name='Categories', through='catalogue.ProductCategory', to='catalogue.Category'),
+            preserve_default=True,
+        ),
+        migrations.AddField(
+            model_name='productcategory',
+            name='product',
+            field=models.ForeignKey(verbose_name='Product', to='catalogue.Product'),
+            preserve_default=True,
+        ),
+        migrations.AlterUniqueTogether(
+            name='productcategory',
+            unique_together=set([('product', 'category')]),
+        ),
+        migrations.CreateModel(
+            name='ProductClass',
+            fields=[
+                ('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={
+                'verbose_name': 'Product class',
+                'verbose_name_plural': 'Product classes',
+                'ordering': ['name'],
+                'abstract': False,
+            },
+            bases=(models.Model,),
+        ),
+        migrations.AddField(
+            model_name='productattribute',
+            name='product_class',
+            field=models.ForeignKey(verbose_name='Product Type', blank=True, to='catalogue.ProductClass', null=True),
+            preserve_default=True,
+        ),
+        migrations.AddField(
+            model_name='product',
+            name='product_class',
+            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(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={
+                'verbose_name': 'Product image',
+                'verbose_name_plural': 'Product images',
+                'ordering': ['display_order'],
+                'abstract': False,
+            },
+            bases=(models.Model,),
+        ),
+        migrations.AlterUniqueTogether(
+            name='productimage',
+            unique_together=set([('product', 'display_order')]),
+        ),
+        migrations.CreateModel(
+            name='ProductRecommendation',
+            fields=[
+                ('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={
+                '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(verbose_name='Recommended Products', through='catalogue.ProductRecommendation', blank=True, to='catalogue.Product'),
+            preserve_default=True,
+        ),
+        migrations.AddField(
+            model_name='productrecommendation',
+            name='primary',
+            field=models.ForeignKey(verbose_name='Primary Product', to='catalogue.Product'),
+            preserve_default=True,
+        ),
+        migrations.AddField(
+            model_name='productrecommendation',
+            name='recommendation',
+            field=models.ForeignKey(verbose_name='Recommended Product', to='catalogue.Product'),
+            preserve_default=True,
+        ),
+        migrations.AlterUniqueTogether(
+            name='productrecommendation',
+            unique_together=set([('primary', 'recommendation')]),
+        ),
+    ]

oscar/apps/catalogue/models.py

@@ -1,51 +1,66 @@
+import django
+
 """
 Vanilla product models
 """
+from oscar.core.loading import is_model_registered
 from oscar.apps.catalogue.abstract_models import *  # noqa
 
 
-class ProductClass(AbstractProductClass):
-    pass
+if not is_model_registered('catalogue', 'ProductClass'):
+    class ProductClass(AbstractProductClass):
+        pass
 
 
-class Category(AbstractCategory):
-    pass
+if not is_model_registered('catalogue', 'Category'):
+    class Category(AbstractCategory):
+        pass
 
 
-class ProductCategory(AbstractProductCategory):
-    pass
+if not is_model_registered('catalogue', 'ProductCategory'):
+    class ProductCategory(AbstractProductCategory):
+        pass
 
 
-class Product(AbstractProduct):
-    pass
+if not is_model_registered('catalogue', 'Product'):
+    class Product(AbstractProduct):
+        pass
 
 
-class ProductRecommendation(AbstractProductRecommendation):
-    pass
+if not is_model_registered('catalogue', 'ProductRecommendation'):
+    class ProductRecommendation(AbstractProductRecommendation):
+        pass
 
 
-class ProductAttribute(AbstractProductAttribute):
-    pass
+if not is_model_registered('catalogue', 'ProductAttribute'):
+    class ProductAttribute(AbstractProductAttribute):
+        pass
 
 
-class ProductAttributeValue(AbstractProductAttributeValue):
-    pass
+if not is_model_registered('catalogue', 'ProductAttributeValue'):
+    class ProductAttributeValue(AbstractProductAttributeValue):
+        pass
 
 
-class AttributeOptionGroup(AbstractAttributeOptionGroup):
-    pass
+if not is_model_registered('catalogue', 'AttributeOptionGroup'):
+    class AttributeOptionGroup(AbstractAttributeOptionGroup):
+        pass
 
 
-class AttributeOption(AbstractAttributeOption):
-    pass
+if not is_model_registered('catalogue', 'AttributeOption'):
+    class AttributeOption(AbstractAttributeOption):
+        pass
 
 
-class Option(AbstractOption):
-    pass
+if not is_model_registered('catalogue', 'Option'):
+    class Option(AbstractOption):
+        pass
 
 
-class ProductImage(AbstractProductImage):
-    pass
+if not is_model_registered('catalogue', 'ProductImage'):
+    class ProductImage(AbstractProductImage):
+        pass
 
 
-from .receivers import *  # noqa
+if django.VERSION < (1, 7):
+    from . import receivers  # noqa

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")),
@@ -69,6 +71,7 @@ class AbstractProductReview(models.Model):
 
     class Meta:
         abstract = True
+        app_label = 'reviews'
         ordering = ['-delta_votes', 'id']
         unique_together = (('product', 'user'),)
         verbose_name = _('Product review')
@@ -82,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):
@@ -165,7 +168,7 @@ class AbstractProductReview(models.Model):
         review
         """
         if not user.is_authenticated():
-            return False, u"Only signed in users can vote"
+            return False, _(u"Only signed in users can vote")
         vote = self.votes.model(review=self, user=user, delta=1)
         try:
             vote.full_clean()
@@ -174,6 +177,7 @@ class AbstractProductReview(models.Model):
         return True, ""
 
 
+@python_2_unicode_compatible
 class AbstractVote(models.Model):
     """
     Records user ratings as yes/no vote.
@@ -193,12 +197,13 @@ class AbstractVote(models.Model):
 
     class Meta:
         abstract = True
+        app_label = 'reviews'
         ordering = ['-date_created']
         unique_together = (('user', 'review'),)
         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/app.py

@@ -1,4 +1,5 @@
 from django.conf.urls import url
+from django.contrib.auth.decorators import login_required
 
 from oscar.core.application import Application
 from oscar.core.loading import get_class
@@ -17,8 +18,10 @@ class ProductReviewsApplication(Application):
         urls = [
             url(r'^(?P<pk>\d+)/$', self.detail_view.as_view(),
                 name='reviews-detail'),
-            url(r'^add/$', self.create_view.as_view(), name='reviews-add'),
-            url(r'^(?P<pk>\d+)/vote/$', self.vote_view.as_view(),
+            url(r'^add/$', self.create_view.as_view(),
+                name='reviews-add'),
+            url(r'^(?P<pk>\d+)/vote/$',
+                login_required(self.vote_view.as_view()),
                 name='reviews-vote'),
             url(r'^$', self.list_view.as_view(), name='reviews-list'),
         ]

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

@@ -1,237 +1,68 @@
 # -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
+from __future__ import unicode_literals
 
-from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
+from django.db import models, migrations
+import oscar.core.validators
+import django.db.models.deletion
+from django.conf import settings
 
 
-class Migration(SchemaMigration):
+class Migration(migrations.Migration):
 
-    def forwards(self, orm):
-        # Adding model 'ProductReview'
-        db.create_table(u'reviews_productreview', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('product', self.gf('django.db.models.fields.related.ForeignKey')(related_name='reviews', null=True, on_delete=models.SET_NULL, to=orm['catalogue.Product'])),
-            ('score', self.gf('django.db.models.fields.SmallIntegerField')()),
-            ('title', self.gf('django.db.models.fields.CharField')(max_length=255)),
-            ('body', self.gf('django.db.models.fields.TextField')()),
-            ('user', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='reviews', null=True, to=orm[AUTH_USER_MODEL])),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
-            ('email', self.gf('django.db.models.fields.EmailField')(max_length=75, null=True, blank=True)),
-            ('homepage', self.gf('django.db.models.fields.URLField')(max_length=200, null=True, blank=True)),
-            ('status', self.gf('django.db.models.fields.SmallIntegerField')(default=1)),
-            ('total_votes', self.gf('django.db.models.fields.IntegerField')(default=0)),
-            ('delta_votes', self.gf('django.db.models.fields.IntegerField')(default=0, db_index=True)),
-            ('date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
-        ))
-        db.send_create_signal(u'reviews', ['ProductReview'])
+    dependencies = [
+        ('catalogue', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
 
-        # Adding unique constraint on 'ProductReview', fields ['product', 'user']
-        db.create_unique(u'reviews_productreview', ['product_id', 'user_id'])
-
-        # Adding model 'Vote'
-        db.create_table(u'reviews_vote', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('review', self.gf('django.db.models.fields.related.ForeignKey')(related_name='votes', to=orm['reviews.ProductReview'])),
-            ('user', self.gf('django.db.models.fields.related.ForeignKey')(related_name='review_votes', to=orm[AUTH_USER_MODEL])),
-            ('delta', self.gf('django.db.models.fields.SmallIntegerField')()),
-            ('date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
-        ))
-        db.send_create_signal(u'reviews', ['Vote'])
-
-        # Adding unique constraint on 'Vote', fields ['user', 'review']
-        db.create_unique(u'reviews_vote', ['user_id', 'review_id'])
-
-
-    def backwards(self, orm):
-        # Removing unique constraint on 'Vote', fields ['user', 'review']
-        db.delete_unique(u'reviews_vote', ['user_id', 'review_id'])
-
-        # Removing unique constraint on 'ProductReview', fields ['product', 'user']
-        db.delete_unique(u'reviews_productreview', ['product_id', 'user_id'])
-
-        # Deleting model 'ProductReview'
-        db.delete_table(u'reviews_productreview')
-
-        # Deleting model 'Vote'
-        db.delete_table(u'reviews_vote')
-
-
-    models = {
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        AUTH_USER_MODEL: {
-            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        u'catalogue.attributeentity': {
-            'Meta': {'object_name': 'AttributeEntity'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '255', 'blank': 'True'}),
-            'type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'entities'", 'to': u"orm['catalogue.AttributeEntityType']"})
-        },
-        u'catalogue.attributeentitytype': {
-            'Meta': {'object_name': 'AttributeEntityType'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '255', 'blank': 'True'})
-        },
-        u'catalogue.attributeoption': {
-            'Meta': {'object_name': 'AttributeOption'},
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'options'", 'to': u"orm['catalogue.AttributeOptionGroup']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'option': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        u'catalogue.attributeoptiongroup': {
-            'Meta': {'object_name': 'AttributeOptionGroup'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'})
-        },
-        u'catalogue.category': {
-            'Meta': {'ordering': "['full_name']", 'object_name': 'Category'},
-            'depth': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'full_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
-            'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
-            'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
-            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '255'})
-        },
-        u'catalogue.option': {
-            'Meta': {'object_name': 'Option'},
-            'code': ('oscar.models.fields.autoslugfield.AutoSlugField', [], {'allow_duplicates': 'False', 'max_length': '128', 'separator': "u'-'", 'blank': 'True', 'unique': 'True', 'populate_from': "'name'", 'overwrite': 'False'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'type': ('django.db.models.fields.CharField', [], {'default': "'Required'", 'max_length': '128'})
-        },
-        u'catalogue.product': {
-            'Meta': {'ordering': "['-date_created']", 'object_name': 'Product'},
-            'attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['catalogue.ProductAttribute']", 'through': u"orm['catalogue.ProductAttributeValue']", 'symmetrical': 'False'}),
-            'categories': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['catalogue.Category']", 'through': u"orm['catalogue.ProductCategory']", 'symmetrical': 'False'}),
-            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'date_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_discountable': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'variants'", 'null': 'True', 'to': u"orm['catalogue.Product']"}),
-            'product_class': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'products'", 'null': 'True', 'on_delete': 'models.PROTECT', 'to': u"orm['catalogue.ProductClass']"}),
-            'product_options': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['catalogue.Option']", 'symmetrical': 'False', 'blank': 'True'}),
-            'rating': ('django.db.models.fields.FloatField', [], {'null': 'True'}),
-            'recommended_products': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['catalogue.Product']", 'symmetrical': 'False', 'through': u"orm['catalogue.ProductRecommendation']", 'blank': 'True'}),
-            'related_products': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'relations'", 'blank': 'True', 'to': u"orm['catalogue.Product']"}),
-            'score': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}),
-            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '255'}),
-            'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'upc': ('oscar.models.fields.NullCharField', [], {'max_length': '64', 'unique': 'True', 'null': 'True', 'blank': 'True'})
-        },
-        u'catalogue.productattribute': {
-            'Meta': {'ordering': "['code']", 'object_name': 'ProductAttribute'},
-            'code': ('django.db.models.fields.SlugField', [], {'max_length': '128'}),
-            'entity_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.AttributeEntityType']", 'null': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'option_group': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.AttributeOptionGroup']", 'null': 'True', 'blank': 'True'}),
-            'product_class': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'attributes'", 'null': 'True', 'to': u"orm['catalogue.ProductClass']"}),
-            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'type': ('django.db.models.fields.CharField', [], {'default': "'text'", 'max_length': '20'})
-        },
-        u'catalogue.productattributevalue': {
-            'Meta': {'object_name': 'ProductAttributeValue'},
-            'attribute': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.ProductAttribute']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'product': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'attribute_values'", 'to': u"orm['catalogue.Product']"}),
-            'value_boolean': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
-            'value_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
-            'value_entity': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.AttributeEntity']", 'null': 'True', 'blank': 'True'}),
-            'value_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'value_float': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
-            'value_image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'value_integer': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'value_option': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.AttributeOption']", 'null': 'True', 'blank': 'True'}),
-            'value_richtext': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'value_text': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
-        },
-        u'catalogue.productcategory': {
-            'Meta': {'ordering': "['product', 'category']", 'object_name': 'ProductCategory'},
-            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.Category']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'product': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.Product']"})
-        },
-        u'catalogue.productclass': {
-            'Meta': {'ordering': "['name']", 'object_name': 'ProductClass'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'options': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['catalogue.Option']", 'symmetrical': 'False', 'blank': 'True'}),
-            'requires_shipping': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'slug': ('oscar.models.fields.autoslugfield.AutoSlugField', [], {'allow_duplicates': 'False', 'max_length': '128', 'separator': "u'-'", 'blank': 'True', 'unique': 'True', 'populate_from': "'name'", 'overwrite': 'False'}),
-            'track_stock': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
-        },
-        u'catalogue.productrecommendation': {
-            'Meta': {'object_name': 'ProductRecommendation'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'primary': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'primary_recommendations'", 'to': u"orm['catalogue.Product']"}),
-            'ranking': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}),
-            'recommendation': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.Product']"})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        u'reviews.productreview': {
-            'Meta': {'ordering': "['-delta_votes', 'id']", 'unique_together': "(('product', 'user'),)", 'object_name': 'ProductReview'},
-            'body': ('django.db.models.fields.TextField', [], {}),
-            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'delta_votes': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'product': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'reviews'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['catalogue.Product']"}),
-            'score': ('django.db.models.fields.SmallIntegerField', [], {}),
-            'status': ('django.db.models.fields.SmallIntegerField', [], {'default': '1'}),
-            'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'total_votes': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'reviews'", 'null': 'True', 'to': u"orm['{0}']".format(AUTH_USER_MODEL)})
-        },
-        u'reviews.vote': {
-            'Meta': {'ordering': "['-date_created']", 'unique_together': "(('user', 'review'),)", 'object_name': 'Vote'},
-            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'delta': ('django.db.models.fields.SmallIntegerField', [], {}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'review': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'votes'", 'to': u"orm['reviews.ProductReview']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'review_votes'", 'to': u"orm['{0}']".format(AUTH_USER_MODEL)})
-        }
-    }
-
-    complete_apps = ['reviews']
+    operations = [
+        migrations.CreateModel(
+            name='ProductReview',
+            fields=[
+                ('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(verbose_name='Title', validators=[oscar.core.validators.non_whitespace], max_length=255)),
+                ('body', models.TextField(verbose_name='Body')),
+                ('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(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(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={
+                '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([('product', 'user')]),
+        ),
+        migrations.CreateModel(
+            name='Vote',
+            fields=[
+                ('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={
+                'verbose_name': 'Vote',
+                'verbose_name_plural': 'Votes',
+                'ordering': ['-date_created'],
+                'abstract': False,
+            },
+            bases=(models.Model,),
+        ),
+        migrations.AlterUniqueTogether(
+            name='vote',
+            unique_together=set([('user', 'review')]),
+        ),
+    ]

oscar/apps/catalogue/reviews/models.py

@@ -1,10 +1,13 @@
+from oscar.core.loading import is_model_registered
 from oscar.apps.catalogue.reviews.abstract_models import \
     AbstractProductReview, AbstractVote
 
 
-class ProductReview(AbstractProductReview):
-    pass
+if not is_model_registered('reviews', 'ProductReview'):
+    class ProductReview(AbstractProductReview):
+        pass
 
 
-class Vote(AbstractVote):
-    pass
+if not is_model_registered('reviews', 'Vote'):
+    class Vote(AbstractVote):
+        pass

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

@@ -0,0 +1,237 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding model 'ProductReview'
+        db.create_table(u'reviews_productreview', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('product', self.gf('django.db.models.fields.related.ForeignKey')(related_name='reviews', null=True, on_delete=models.SET_NULL, to=orm['catalogue.Product'])),
+            ('score', self.gf('django.db.models.fields.SmallIntegerField')()),
+            ('title', self.gf('django.db.models.fields.CharField')(max_length=255)),
+            ('body', self.gf('django.db.models.fields.TextField')()),
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='reviews', null=True, to=orm[AUTH_USER_MODEL])),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
+            ('email', self.gf('django.db.models.fields.EmailField')(max_length=75, null=True, blank=True)),
+            ('homepage', self.gf('django.db.models.fields.URLField')(max_length=200, null=True, blank=True)),
+            ('status', self.gf('django.db.models.fields.SmallIntegerField')(default=1)),
+            ('total_votes', self.gf('django.db.models.fields.IntegerField')(default=0)),
+            ('delta_votes', self.gf('django.db.models.fields.IntegerField')(default=0, db_index=True)),
+            ('date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
+        ))
+        db.send_create_signal(u'reviews', ['ProductReview'])
+
+        # Adding unique constraint on 'ProductReview', fields ['product', 'user']
+        db.create_unique(u'reviews_productreview', ['product_id', 'user_id'])
+
+        # Adding model 'Vote'
+        db.create_table(u'reviews_vote', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('review', self.gf('django.db.models.fields.related.ForeignKey')(related_name='votes', to=orm['reviews.ProductReview'])),
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(related_name='review_votes', to=orm[AUTH_USER_MODEL])),
+            ('delta', self.gf('django.db.models.fields.SmallIntegerField')()),
+            ('date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
+        ))
+        db.send_create_signal(u'reviews', ['Vote'])
+
+        # Adding unique constraint on 'Vote', fields ['user', 'review']
+        db.create_unique(u'reviews_vote', ['user_id', 'review_id'])
+
+
+    def backwards(self, orm):
+        # Removing unique constraint on 'Vote', fields ['user', 'review']
+        db.delete_unique(u'reviews_vote', ['user_id', 'review_id'])
+
+        # Removing unique constraint on 'ProductReview', fields ['product', 'user']
+        db.delete_unique(u'reviews_productreview', ['product_id', 'user_id'])
+
+        # Deleting model 'ProductReview'
+        db.delete_table(u'reviews_productreview')
+
+        # Deleting model 'Vote'
+        db.delete_table(u'reviews_vote')
+
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        AUTH_USER_MODEL: {
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'catalogue.attributeentity': {
+            'Meta': {'object_name': 'AttributeEntity'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '255', 'blank': 'True'}),
+            'type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'entities'", 'to': u"orm['catalogue.AttributeEntityType']"})
+        },
+        u'catalogue.attributeentitytype': {
+            'Meta': {'object_name': 'AttributeEntityType'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '255', 'blank': 'True'})
+        },
+        u'catalogue.attributeoption': {
+            'Meta': {'object_name': 'AttributeOption'},
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'options'", 'to': u"orm['catalogue.AttributeOptionGroup']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'option': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        u'catalogue.attributeoptiongroup': {
+            'Meta': {'object_name': 'AttributeOptionGroup'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'})
+        },
+        u'catalogue.category': {
+            'Meta': {'ordering': "['full_name']", 'object_name': 'Category'},
+            'depth': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'full_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '255'})
+        },
+        u'catalogue.option': {
+            'Meta': {'object_name': 'Option'},
+            'code': ('oscar.models.fields.autoslugfield.AutoSlugField', [], {'allow_duplicates': 'False', 'max_length': '128', 'separator': "u'-'", 'blank': 'True', 'unique': 'True', 'populate_from': "'name'", 'overwrite': 'False'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "'Required'", 'max_length': '128'})
+        },
+        u'catalogue.product': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'Product'},
+            'attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['catalogue.ProductAttribute']", 'through': u"orm['catalogue.ProductAttributeValue']", 'symmetrical': 'False'}),
+            'categories': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['catalogue.Category']", 'through': u"orm['catalogue.ProductCategory']", 'symmetrical': 'False'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'date_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_discountable': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'variants'", 'null': 'True', 'to': u"orm['catalogue.Product']"}),
+            'product_class': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'products'", 'null': 'True', 'on_delete': 'models.PROTECT', 'to': u"orm['catalogue.ProductClass']"}),
+            'product_options': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['catalogue.Option']", 'symmetrical': 'False', 'blank': 'True'}),
+            'rating': ('django.db.models.fields.FloatField', [], {'null': 'True'}),
+            'recommended_products': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['catalogue.Product']", 'symmetrical': 'False', 'through': u"orm['catalogue.ProductRecommendation']", 'blank': 'True'}),
+            'related_products': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'relations'", 'blank': 'True', 'to': u"orm['catalogue.Product']"}),
+            'score': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '255'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'upc': ('oscar.models.fields.NullCharField', [], {'max_length': '64', 'unique': 'True', 'null': 'True', 'blank': 'True'})
+        },
+        u'catalogue.productattribute': {
+            'Meta': {'ordering': "['code']", 'object_name': 'ProductAttribute'},
+            'code': ('django.db.models.fields.SlugField', [], {'max_length': '128'}),
+            'entity_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.AttributeEntityType']", 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'option_group': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.AttributeOptionGroup']", 'null': 'True', 'blank': 'True'}),
+            'product_class': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'attributes'", 'null': 'True', 'to': u"orm['catalogue.ProductClass']"}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "'text'", 'max_length': '20'})
+        },
+        u'catalogue.productattributevalue': {
+            'Meta': {'object_name': 'ProductAttributeValue'},
+            'attribute': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.ProductAttribute']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'product': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'attribute_values'", 'to': u"orm['catalogue.Product']"}),
+            'value_boolean': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'value_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'value_entity': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.AttributeEntity']", 'null': 'True', 'blank': 'True'}),
+            'value_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'value_float': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'value_image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'value_integer': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'value_option': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.AttributeOption']", 'null': 'True', 'blank': 'True'}),
+            'value_richtext': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'value_text': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
+        },
+        u'catalogue.productcategory': {
+            'Meta': {'ordering': "['product', 'category']", 'object_name': 'ProductCategory'},
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.Category']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'product': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.Product']"})
+        },
+        u'catalogue.productclass': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ProductClass'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'options': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['catalogue.Option']", 'symmetrical': 'False', 'blank': 'True'}),
+            'requires_shipping': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'slug': ('oscar.models.fields.autoslugfield.AutoSlugField', [], {'allow_duplicates': 'False', 'max_length': '128', 'separator': "u'-'", 'blank': 'True', 'unique': 'True', 'populate_from': "'name'", 'overwrite': 'False'}),
+            'track_stock': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
+        },
+        u'catalogue.productrecommendation': {
+            'Meta': {'object_name': 'ProductRecommendation'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'primary': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'primary_recommendations'", 'to': u"orm['catalogue.Product']"}),
+            'ranking': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}),
+            'recommendation': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.Product']"})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'reviews.productreview': {
+            'Meta': {'ordering': "['-delta_votes', 'id']", 'unique_together': "(('product', 'user'),)", 'object_name': 'ProductReview'},
+            'body': ('django.db.models.fields.TextField', [], {}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'delta_votes': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'product': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'reviews'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['catalogue.Product']"}),
+            'score': ('django.db.models.fields.SmallIntegerField', [], {}),
+            'status': ('django.db.models.fields.SmallIntegerField', [], {'default': '1'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'total_votes': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'reviews'", 'null': 'True', 'to': u"orm['{0}']".format(AUTH_USER_MODEL)})
+        },
+        u'reviews.vote': {
+            'Meta': {'ordering': "['-date_created']", 'unique_together': "(('user', 'review'),)", 'object_name': 'Vote'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'delta': ('django.db.models.fields.SmallIntegerField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'review': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'votes'", 'to': u"orm['reviews.ProductReview']"}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'review_votes'", 'to': u"orm['{0}']".format(AUTH_USER_MODEL)})
+        }
+    }
+
+    complete_apps = ['reviews']

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/catalogue/south_migrations/0001_initial.py

@@ -0,0 +1,403 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Adding model 'ProductRecommendation'
+        db.create_table('catalogue_productrecommendation', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('primary', self.gf('django.db.models.fields.related.ForeignKey')(related_name='primary_recommendations', to=orm['catalogue.Product'])),
+            ('recommendation', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.Product'])),
+            ('ranking', self.gf('django.db.models.fields.PositiveSmallIntegerField')(default=0)),
+        ))
+        db.send_create_signal('catalogue', ['ProductRecommendation'])
+
+        # Adding model 'ProductClass'
+        db.create_table('catalogue_productclass', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=128)),
+            ('slug', self.gf('django.db.models.fields.SlugField')(unique=True, max_length=128, db_index=True)),
+        ))
+        db.send_create_signal('catalogue', ['ProductClass'])
+
+        # Adding M2M table for field options on 'ProductClass'
+        db.create_table('catalogue_productclass_options', (
+            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+            ('productclass', models.ForeignKey(orm['catalogue.productclass'], null=False)),
+            ('option', models.ForeignKey(orm['catalogue.option'], null=False))
+        ))
+        db.create_unique('catalogue_productclass_options', ['productclass_id', 'option_id'])
+
+        # Adding model 'Category'
+        db.create_table('catalogue_category', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('path', self.gf('django.db.models.fields.CharField')(unique=True, max_length=255)),
+            ('depth', self.gf('django.db.models.fields.PositiveIntegerField')()),
+            ('numchild', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)),
+            ('slug',
+             self.gf('django.db.models.fields.SlugField')(max_length=255, db_index=True)),
+            ('full_name',
+             self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)),
+        ))
+        db.send_create_signal('catalogue', ['Category'])
+
+        # Adding model 'ProductCategory'
+        db.create_table('catalogue_productcategory', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('product', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.Product'])),
+            ('category', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.Category'])),
+            ('is_canonical', self.gf('django.db.models.fields.BooleanField')(default=False, db_index=True)),
+        ))
+        db.send_create_signal('catalogue', ['ProductCategory'])
+
+        # Adding model 'Product'
+        db.create_table('catalogue_product', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('upc', self.gf('django.db.models.fields.CharField')(db_index=True, max_length=64, null=True, blank=True)),
+            ('parent', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='variants', null=True, to=orm['catalogue.Product'])),
+            ('title', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
+            ('slug', self.gf('django.db.models.fields.SlugField')(max_length=255, db_index=True)),
+            ('description', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
+            ('product_class', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.ProductClass'], null=True)),
+            ('score', self.gf('django.db.models.fields.FloatField')(default=0.0, db_index=True)),
+            ('date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
+            ('date_updated', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, db_index=True, blank=True)),
+        ))
+        db.send_create_signal('catalogue', ['Product'])
+
+        # Adding M2M table for field product_options on 'Product'
+        db.create_table('catalogue_product_product_options', (
+            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+            ('product', models.ForeignKey(orm['catalogue.product'], null=False)),
+            ('option', models.ForeignKey(orm['catalogue.option'], null=False))
+        ))
+        db.create_unique('catalogue_product_product_options', ['product_id', 'option_id'])
+
+        # Adding M2M table for field related_products on 'Product'
+        db.create_table('catalogue_product_related_products', (
+            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+            ('from_product', models.ForeignKey(orm['catalogue.product'], null=False)),
+            ('to_product', models.ForeignKey(orm['catalogue.product'], null=False))
+        ))
+        db.create_unique('catalogue_product_related_products', ['from_product_id', 'to_product_id'])
+
+        # Adding model 'ContributorRole'
+        db.create_table('catalogue_contributorrole', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=50)),
+            ('name_plural', self.gf('django.db.models.fields.CharField')(max_length=50)),
+            ('slug', self.gf('django.db.models.fields.SlugField')(max_length=50, db_index=True)),
+        ))
+        db.send_create_signal('catalogue', ['ContributorRole'])
+
+        # Adding model 'Contributor'
+        db.create_table('catalogue_contributor', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=255)),
+            ('slug', self.gf('django.db.models.fields.SlugField')(max_length=255, db_index=True)),
+        ))
+        db.send_create_signal('catalogue', ['Contributor'])
+
+        # Adding model 'ProductContributor'
+        db.create_table('catalogue_productcontributor', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('product', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.Product'])),
+            ('contributor', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.Contributor'])),
+            ('role', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.ContributorRole'])),
+        ))
+        db.send_create_signal('catalogue', ['ProductContributor'])
+
+        # Adding model 'ProductAttribute'
+        db.create_table('catalogue_productattribute', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('product_class', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='attributes', null=True, to=orm['catalogue.ProductClass'])),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=128)),
+            ('code', self.gf('django.db.models.fields.SlugField')(max_length=128, db_index=True)),
+            ('type', self.gf('django.db.models.fields.CharField')(default='text', max_length=20)),
+            ('option_group', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.AttributeOptionGroup'], null=True, blank=True)),
+            ('entity_type', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.AttributeEntityType'], null=True, blank=True)),
+            ('required', self.gf('django.db.models.fields.BooleanField')(default=False)),
+        ))
+        db.send_create_signal('catalogue', ['ProductAttribute'])
+
+        # Adding model 'ProductAttributeValue'
+        db.create_table('catalogue_productattributevalue', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('attribute', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.ProductAttribute'])),
+            ('product', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.Product'])),
+            ('value_text', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
+            ('value_integer', self.gf('django.db.models.fields.IntegerField')(null=True, blank=True)),
+            ('value_boolean', self.gf('django.db.models.fields.BooleanField')(default=False)),
+            ('value_float', self.gf('django.db.models.fields.FloatField')(null=True, blank=True)),
+            ('value_richtext', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
+            ('value_date', self.gf('django.db.models.fields.DateField')(null=True, blank=True)),
+            ('value_option', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.AttributeOption'], null=True, blank=True)),
+            ('value_entity', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.AttributeEntity'], null=True, blank=True)),
+        ))
+        db.send_create_signal('catalogue', ['ProductAttributeValue'])
+
+        # Adding model 'AttributeOptionGroup'
+        db.create_table('catalogue_attributeoptiongroup', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=128)),
+        ))
+        db.send_create_signal('catalogue', ['AttributeOptionGroup'])
+
+        # Adding model 'AttributeOption'
+        db.create_table('catalogue_attributeoption', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('group', self.gf('django.db.models.fields.related.ForeignKey')(related_name='options', to=orm['catalogue.AttributeOptionGroup'])),
+            ('option', self.gf('django.db.models.fields.CharField')(max_length=255)),
+        ))
+        db.send_create_signal('catalogue', ['AttributeOption'])
+
+        # Adding model 'AttributeEntity'
+        db.create_table('catalogue_attributeentity', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=255)),
+            ('slug', self.gf('django.db.models.fields.SlugField')(db_index=True, max_length=255, blank=True)),
+            ('type', self.gf('django.db.models.fields.related.ForeignKey')(related_name='entities', to=orm['catalogue.AttributeEntityType'])),
+        ))
+        db.send_create_signal('catalogue', ['AttributeEntity'])
+
+        # Adding model 'AttributeEntityType'
+        db.create_table('catalogue_attributeentitytype', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=255)),
+            ('slug', self.gf('django.db.models.fields.SlugField')(db_index=True, max_length=255, blank=True)),
+        ))
+        db.send_create_signal('catalogue', ['AttributeEntityType'])
+
+        # Adding model 'Option'
+        db.create_table('catalogue_option', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=128)),
+            ('code', self.gf('django.db.models.fields.SlugField')(max_length=128, db_index=True)),
+            ('type', self.gf('django.db.models.fields.CharField')(default='Required', max_length=128)),
+        ))
+        db.send_create_signal('catalogue', ['Option'])
+
+        # Adding model 'ProductImage'
+        db.create_table('catalogue_productimage', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('product', self.gf('django.db.models.fields.related.ForeignKey')(related_name='images', to=orm['catalogue.Product'])),
+            ('original', self.gf('django.db.models.fields.files.ImageField')(max_length=100)),
+            ('caption', self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True)),
+            ('display_order', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
+            ('date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
+        ))
+        db.send_create_signal('catalogue', ['ProductImage'])
+
+        # Adding unique constraint on 'ProductImage', fields ['product', 'display_order']
+        db.create_unique('catalogue_productimage', ['product_id', 'display_order'])
+
+
+    def backwards(self, orm):
+
+        # Removing unique constraint on 'ProductImage', fields ['product', 'display_order']
+        db.delete_unique('catalogue_productimage', ['product_id', 'display_order'])
+
+        # Deleting model 'ProductRecommendation'
+        db.delete_table('catalogue_productrecommendation')
+
+        # Deleting model 'ProductClass'
+        db.delete_table('catalogue_productclass')
+
+        # Removing M2M table for field options on 'ProductClass'
+        db.delete_table('catalogue_productclass_options')
+
+        # Deleting model 'Category'
+        db.delete_table('catalogue_category')
+
+        # Deleting model 'ProductCategory'
+        db.delete_table('catalogue_productcategory')
+
+        # Deleting model 'Product'
+        db.delete_table('catalogue_product')
+
+        # Removing M2M table for field product_options on 'Product'
+        db.delete_table('catalogue_product_product_options')
+
+        # Removing M2M table for field related_products on 'Product'
+        db.delete_table('catalogue_product_related_products')
+
+        # Deleting model 'ContributorRole'
+        db.delete_table('catalogue_contributorrole')
+
+        # Deleting model 'Contributor'
+        db.delete_table('catalogue_contributor')
+
+        # Deleting model 'ProductContributor'
+        db.delete_table('catalogue_productcontributor')
+
+        # Deleting model 'ProductAttribute'
+        db.delete_table('catalogue_productattribute')
+
+        # Deleting model 'ProductAttributeValue'
+        db.delete_table('catalogue_productattributevalue')
+
+        # Deleting model 'AttributeOptionGroup'
+        db.delete_table('catalogue_attributeoptiongroup')
+
+        # Deleting model 'AttributeOption'
+        db.delete_table('catalogue_attributeoption')
+
+        # Deleting model 'AttributeEntity'
+        db.delete_table('catalogue_attributeentity')
+
+        # Deleting model 'AttributeEntityType'
+        db.delete_table('catalogue_attributeentitytype')
+
+        # Deleting model 'Option'
+        db.delete_table('catalogue_option')
+
+        # Deleting model 'ProductImage'
+        db.delete_table('catalogue_productimage')
+
+
+    models = {
+        'catalogue.attributeentity': {
+            'Meta': {'object_name': 'AttributeEntity'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
+            'type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'entities'", 'to': "orm['catalogue.AttributeEntityType']"})
+        },
+        'catalogue.attributeentitytype': {
+            'Meta': {'object_name': 'AttributeEntityType'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'})
+        },
+        'catalogue.attributeoption': {
+            'Meta': {'object_name': 'AttributeOption'},
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'options'", 'to': "orm['catalogue.AttributeOptionGroup']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'option': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'catalogue.attributeoptiongroup': {
+            'Meta': {'object_name': 'AttributeOptionGroup'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'})
+        },
+        'catalogue.category': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Category'},
+            'depth': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'full_name': ('django.db.models.fields.CharField', [],
+                          {'max_length': '255', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length':
+                                                               '255', 'db_index': 'True'})
+        },
+        'catalogue.contributor': {
+            'Meta': {'object_name': 'Contributor'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '255', 'db_index': 'True'})
+        },
+        'catalogue.contributorrole': {
+            'Meta': {'object_name': 'ContributorRole'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'name_plural': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'db_index': 'True'})
+        },
+        'catalogue.option': {
+            'Meta': {'object_name': 'Option'},
+            'code': ('django.db.models.fields.SlugField', [], {'max_length': '128', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "'Required'", 'max_length': '128'})
+        },
+        'catalogue.product': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'Product'},
+            'attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.ProductAttribute']", 'through': "orm['catalogue.ProductAttributeValue']", 'symmetrical': 'False'}),
+            'categories': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.Category']", 'through': "orm['catalogue.ProductCategory']", 'symmetrical': 'False'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'date_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'variants'", 'null': 'True', 'to': "orm['catalogue.Product']"}),
+            'product_class': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.ProductClass']", 'null': 'True'}),
+            'product_options': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.Option']", 'symmetrical': 'False', 'blank': 'True'}),
+            'recommended_products': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.Product']", 'symmetrical': 'False', 'through': "orm['catalogue.ProductRecommendation']", 'blank': 'True'}),
+            'related_products': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'relations'", 'blank': 'True', 'to': "orm['catalogue.Product']"}),
+            'score': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '255', 'db_index': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'upc': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'null': 'True', 'blank': 'True'})
+        },
+        'catalogue.productattribute': {
+            'Meta': {'ordering': "['code']", 'object_name': 'ProductAttribute'},
+            'code': ('django.db.models.fields.SlugField', [], {'max_length': '128', 'db_index': 'True'}),
+            'entity_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.AttributeEntityType']", 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'option_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.AttributeOptionGroup']", 'null': 'True', 'blank': 'True'}),
+            'product_class': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'attributes'", 'null': 'True', 'to': "orm['catalogue.ProductClass']"}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "'text'", 'max_length': '20'})
+        },
+        'catalogue.productattributevalue': {
+            'Meta': {'object_name': 'ProductAttributeValue'},
+            'attribute': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.ProductAttribute']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'product': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Product']"}),
+            'value_boolean': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'value_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'value_entity': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.AttributeEntity']", 'null': 'True', 'blank': 'True'}),
+            'value_float': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'value_integer': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'value_option': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.AttributeOption']", 'null': 'True', 'blank': 'True'}),
+            'value_richtext': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'value_text': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
+        },
+        'catalogue.productcategory': {
+            'Meta': {'ordering': "['-is_canonical']", 'object_name': 'ProductCategory'},
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Category']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_canonical': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
+            'product': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Product']"})
+        },
+        'catalogue.productclass': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ProductClass'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'options': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.Option']", 'symmetrical': 'False', 'blank': 'True'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '128', 'db_index': 'True'})
+        },
+        'catalogue.productcontributor': {
+            'Meta': {'object_name': 'ProductContributor'},
+            'contributor': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Contributor']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'product': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Product']"}),
+            'role': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.ContributorRole']"})
+        },
+        'catalogue.productimage': {
+            'Meta': {'ordering': "['display_order']", 'unique_together': "(('product', 'display_order'),)", 'object_name': 'ProductImage'},
+            'caption': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'display_order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'original': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),
+            'product': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'images'", 'to': "orm['catalogue.Product']"})
+        },
+        'catalogue.productrecommendation': {
+            'Meta': {'object_name': 'ProductRecommendation'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'primary': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'primary_recommendations'", 'to': "orm['catalogue.Product']"}),
+            'ranking': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}),
+            'recommendation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Product']"})
+        }
+    }
+
+    complete_apps = ['catalogue']

oscar/apps/catalogue/views.py

@@ -23,8 +23,13 @@ class ProductDetailView(DetailView):
     model = Product
     view_signal = product_viewed
     template_folder = "catalogue"
+
+    # Whether to redirect to the URL with the right path
     enforce_paths = True
 
+    # Whether to redirect child products to their parent's URL
+    enforce_parent = True
+
     def get(self, request, **kwargs):
         """
         Ensures that the correct URL is used before rendering a response
@@ -47,22 +52,20 @@ class ProductDetailView(DetailView):
             return super(ProductDetailView, self).get_object(queryset)
 
     def redirect_if_necessary(self, current_path, product):
-        if self.enforce_paths:
-            if product.is_child:
-                return HttpResponsePermanentRedirect(
-                    product.parent.get_absolute_url())
+        if self.enforce_parent and product.is_child:
+            return HttpResponsePermanentRedirect(
+                product.parent.get_absolute_url())
 
+        if self.enforce_paths:
             expected_path = product.get_absolute_url()
             if expected_path != urlquote(current_path):
                 return HttpResponsePermanentRedirect(expected_path)
 
     def get_context_data(self, **kwargs):
         ctx = super(ProductDetailView, self).get_context_data(**kwargs)
-        reviews = self.get_reviews()
-        ctx['reviews'] = reviews
+        ctx['reviews'] = self.get_reviews()
         ctx['alert_form'] = self.get_alert_form()
         ctx['has_active_alert'] = self.get_alert_status()
-
         return ctx
 
     def get_alert_status(self):

oscar/apps/checkout/__init__.py

@@ -0,0 +1 @@
+default_app_config = 'oscar.apps.checkout.config.CheckoutConfig'