Remove the `US` demo site from the repository.

This might be resurrected in a separate repository in the future.

Makefile

@@ -52,19 +52,6 @@ build_demo:
 
 demo: install build_demo
 
-us_site: install
-	# Install additional requirements
-	pip install -r requirements_us.txt
-	# Create database
-	sites/us/manage.py reset_db --router=default --noinput
-	sites/us/manage.py migrate
-	# Import some fixtures
-	sites/us/manage.py oscar_populate_countries
-	sites/us/manage.py loaddata sites/us/fixtures/*.json
-	sites/us/manage.py loaddata sites/_fixtures/auth.json sites/_fixtures/ranges.json 
-	# Create catalogue (using a fixture from the demo site)
-	sites/us/manage.py create_demo_products --class=Books sites/demo/fixtures/books.csv
-
 docs:
 	cd docs && make html
 

docs/source/howto/how_to_handle_us_taxes.rst

@@ -75,8 +75,3 @@ An example implementation of the ``tax.py`` module is:
         def calculate_tax(price, rate):
             tax = price * rate
             return tax.quantize(D('0.01'))
-
-.. tip::
-
-   Oscar's repository contains a sample Oscar site customised for the US.  See
-   :ref:`us_site` for more information.

docs/source/internals/sandbox.rst

@@ -2,9 +2,8 @@
 Sample Oscar projects
 =====================
 
-Oscar ships with three sample projects: a 'sandbox' site, which is a vanilla
-install of Oscar using the default templates and styles, a sample US site which
-customises Oscar to use US style taxes, and a fully featured
+Oscar ships with two sample projects: a 'sandbox' site, which is a vanilla
+install of Oscar using the default templates and styles and a fully featured
 'demo' site which demonstrates how Oscar can be re-skinned and customised to
 model a domain.
 
@@ -90,26 +89,6 @@ at: http://localhost:8000.  A sample superuser is installed with credentials::
 
 .. _us_site:
 
-The US site
------------
-
-The US site is a relatively simple Oscar that makes a few key customisations in
-order to mimic how sites in the US work. Specifically, it:
-
-- Overrides the partner app to supply a new strategy selector which ensures all
-  prices are returned without taxes.
-
-- Overrides the checkout app in order to apply taxes to submissions once the
-  shipping address is known.
-
-To browse the US site locally run:
-
-.. code-block:: bash
-
-   (oscar) $ make us_site
-   (oscar) $ sites/us/manage.py runserver
-
-and the US site will be browsable at http://localhost:8000
 
 The demo site
 -------------

requirements_us.txt

@@ -1 +0,0 @@
-django-localflavor==1.0

sites/us/README.rst

@@ -1,6 +0,0 @@
-=======
-US site
-=======
-
-This is a simple Oscar site configured to sell products in USD with taxes only
-calculated during checkout.

sites/us/apps/checkout/forms.py

@@ -1,14 +0,0 @@
-from django.utils.translation import ugettext_lazy as _
-from localflavor.us import forms as us_forms
-
-from oscar.apps.checkout import forms as checkout_forms
-
-
-class ShippingAddressForm(checkout_forms.ShippingAddressForm):
-    state = us_forms.USStateField(label="State", widget=us_forms.USStateSelect)
-
-    def __init__(self, *args, **kwargs):
-        super(ShippingAddressForm, self).__init__(*args, **kwargs)
-        self.fields['postcode'].label = _("Zip code")
-        self.fields['state'].help_text = _(
-            "Only orders going to New Jersey are liable for Sales tax")

sites/us/apps/checkout/session.py

@@ -1,29 +0,0 @@
-from oscar.apps.checkout import session
-from apps import tax
-
-
-# Override the session mixin (which every checkout view uses) so we can apply
-# takes when the shipping address is known.
-class CheckoutSessionMixin(session.CheckoutSessionMixin):
-
-    def build_submission(self, **kwargs):
-        submission = super(CheckoutSessionMixin, self).build_submission(
-            **kwargs)
-
-        if submission['shipping_address'] and submission['shipping_method']:
-            tax.apply_to(submission)
-
-            # Recalculate order total to ensure we have a tax-inclusive total
-            submission['order_total'] = self.get_order_totals(
-                submission['basket'], submission['shipping_charge'])
-
-        return submission
-
-    def get_context_data(self, **kwargs):
-        ctx = super(CheckoutSessionMixin, self).get_context_data(**kwargs)
-
-        # Oscar's checkout templates look for this variable which specifies to
-        # break out the tax totals into a separate subtotal.
-        ctx['show_tax_separately'] = True
-
-        return ctx

sites/us/apps/checkout/views.py

@@ -1 +0,0 @@
-

sites/us/apps/partner/migrations/0001_initial.py

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

sites/us/apps/partner/migrations/0002_auto_20141007_2032.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-import oscar.core.utils
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('partner', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='stockrecord',
-            name='price_currency',
-            field=models.CharField(default=oscar.core.utils.get_default_currency, max_length=12, verbose_name='Currency'),
-        ),
-    ]

sites/us/apps/partner/models.py

@@ -1 +0,0 @@
-from oscar.apps.partner.models import *

sites/us/apps/partner/strategy.py

@@ -1,7 +0,0 @@
-from oscar.apps.partner import strategy
-
-
-class Selector(object):
-
-    def strategy(self, request=None, user=None, **kwargs):
-        return strategy.US(request)

sites/us/apps/shipping/admin.py

@@ -1 +0,0 @@
-from oscar.apps.shipping.admin import *  # noqa

sites/us/apps/shipping/migrations/0001_initial.py

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

sites/us/apps/shipping/models.py

@@ -1 +0,0 @@
-from oscar.apps.shipping.models import *

sites/us/apps/shipping/repository.py

@@ -1,28 +0,0 @@
-from decimal import Decimal as D
-
-from oscar.apps.shipping import repository, methods, models
-
-
-class Standard(methods.FixedPrice):
-    code = "standard"
-    name = "Standard"
-    charge_excl_tax = D('10.00')
-
-
-class Express(methods.FixedPrice):
-    code = "express"
-    name = "Express"
-    charge_excl_tax = D('20.00')
-
-
-class Repository(repository.Repository):
-
-    def get_available_shipping_methods(
-            self, basket, shipping_addr=None, **kwargs):
-        methods = [Standard(), Express()]
-        if shipping_addr:
-            item_methods = models.OrderAndItemCharges.objects.filter(
-                countries=shipping_addr.country)
-            methods.extend(list(item_methods))
-
-        return methods

sites/us/apps/tax.py

@@ -1,36 +0,0 @@
-from decimal import Decimal as D
-
-
-# State tax rates
-STATE_TAX_RATES = {
-    'NJ': D('0.07')
-}
-ZERO = D('0.00')
-
-
-def apply_to(submission):
-    """
-    Calculate and apply taxes to a submission
-    """
-    # This is a dummy tax function which only applies taxes for addresses in
-    # New Jersey and New York. In reality, you'll probably want to use a tax
-    # service like Avalara to look up the taxes for a given submission.
-    shipping_address = submission['shipping_address']
-    rate = STATE_TAX_RATES.get(
-        shipping_address.state, ZERO)
-    for line in submission['basket'].all_lines():
-        line_tax = calculate_tax(
-            line.line_price_excl_tax_incl_discounts, rate)
-        # We need to split the line tax down into a unit tax amount.
-        unit_tax = (line_tax / line.quantity).quantize(D('0.01'))
-        line.purchase_info.price.tax = unit_tax
-
-    shipping_charge = submission['shipping_charge']
-    if shipping_charge is not None:
-        shipping_charge.tax = calculate_tax(
-            shipping_charge.excl_tax, rate)
-
-
-def calculate_tax(price, rate):
-    tax = price * rate
-    return tax.quantize(D('0.01'))

sites/us/fixtures/product-attributes.json

@@ -1,86 +0,0 @@
-[
-    {
-        "pk": 1,
-        "model": "catalogue.productattribute",
-        "fields": {
-            "code": "author",
-            "product_class": 1,
-            "option_group": null,
-            "required": false,
-            "type": "text",
-            "name": "Author"
-        }
-    },
-    {
-        "pk": 2, 
-        "model": "catalogue.productattribute", 
-        "fields": {
-            "code": "binding", 
-            "product_class": 1, 
-            "option_group": null,
-            "required": false, 
-            "type": "text", 
-            "name": "Binding"
-        }
-    }, 
-    {
-        "pk": 3, 
-        "model": "catalogue.productattribute", 
-        "fields": {
-            "code": "language", 
-            "product_class": 1, 
-            "option_group": null,
-            "required": false, 
-            "type": "text", 
-            "name": "Language"
-        }
-    }, 
-    {
-        "pk": 4, 
-        "model": "catalogue.productattribute", 
-        "fields": {
-            "code": "number_of_pages", 
-            "product_class": 1, 
-            "option_group": null,
-            "required": false, 
-            "type": "integer", 
-            "name": "Number of pages"
-        }
-    }, 
-    {
-        "pk": 5,
-        "model": "catalogue.productattribute",
-        "fields": {
-            "code": "publication_date",
-            "product_class": 1,
-            "option_group": null,
-            "required": false,
-            "type": "date",
-            "name": "Publication Date"
-        }
-    },
-    {
-        "pk": 6, 
-        "model": "catalogue.productattribute", 
-        "fields": {
-            "code": "publisher", 
-            "product_class": 1, 
-            "option_group": null,
-            "required": false, 
-            "type": "text", 
-            "name": "Publisher"
-        }
-    }, 
-    {
-        "pk": 7,
-        "model": "catalogue.productattribute",
-        "fields": {
-            "code": "weight",
-            "product_class": 1,
-            "option_group": null,
-            "required": false,
-            "type": "integer",
-            "name": "Weight"
-        }
-    }
-]

sites/us/fixtures/product-classes.json

@@ -1,13 +0,0 @@
-[
-    {
-        "pk": 1, 
-        "model": "catalogue.productclass", 
-        "fields": {
-            "track_stock": true, 
-            "options": [], 
-            "requires_shipping": true, 
-            "name": "Books", 
-            "slug": "books"
-        }
-    } 
-]

sites/us/manage.py

@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-import os
-import sys
-
-if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
-
-    from django.core.management import execute_from_command_line
-
-    execute_from_command_line(sys.argv)

sites/us/settings.py

@@ -1,365 +0,0 @@
-import os
-
-# Path helper
-location = lambda x: os.path.join(
-    os.path.dirname(os.path.realpath(__file__)), x)
-
-USE_TZ = True
-
-DEBUG = True
-TEMPLATE_DEBUG = True
-SQL_DEBUG = True
-
-EMAIL_SUBJECT_PREFIX = '[Oscar US sandbox] '
-EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
-
-# Use a Sqlite database by default
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': location('db.sqlite'),
-        'USER': '',
-        'PASSWORD': '',
-        'HOST': '',
-        'PORT': '',
-        'ATOMIC_REQUESTS': True
-    }
-}
-
-CACHES = {
-    'default': {
-        'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
-    }
-}
-
-
-# Local time zone for this installation. Choices can be found here:
-# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
-# although not all choices may be available on all operating systems.
-# On Unix systems, a value of None will cause Django to use the same
-# timezone as the operating system.
-# If running in a Windows environment this must be set to the same as your
-# system time zone.
-TIME_ZONE = 'Europe/London'
-
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'en-gb'
-
-# Includes all languages that have >50% coverage in Transifex
-# Taken from Django's default setting for LANGUAGES
-gettext_noop = lambda s: s
-LANGUAGES = (
-    ('en-us', gettext_noop('American English')),
-)
-
-SITE_ID = 1
-
-# If you set this to False, Django will make some optimizations so as not
-# to load the internationalization machinery.
-USE_I18N = True
-
-# If you set this to False, Django will not format dates, numbers and
-# calendars according to the current locale
-USE_L10N = True
-
-# Absolute path to the directory that holds media.
-# Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = location("public/media")
-
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash if there is a path component (optional in other cases).
-# Examples: "http://media.lawrence.com", "http://example.com/media/"
-MEDIA_URL = '/media/'
-
-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
-# trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
-#ADMIN_MEDIA_PREFIX = '/media/admin/'
-
-STATIC_URL = '/static/'
-STATIC_ROOT = location('public/static')
-STATICFILES_DIRS = (
-    location('static/'),
-)
-STATICFILES_FINDERS = (
-    'django.contrib.staticfiles.finders.FileSystemFinder',
-    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-)
-
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = '$)a6n&o80u!6y5t-+jrd3)3!%vh&shg$wqpjpxc!ar&p#!)n1a'
-
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader',
-    'django.template.loaders.app_directories.Loader',
-    # needed by django-treebeard for admin (and potentially other libs)
-    'django.template.loaders.eggs.Loader',
-)
-
-TEMPLATE_CONTEXT_PROCESSORS = (
-    "django.contrib.auth.context_processors.auth",
-    "django.core.context_processors.request",
-    "django.core.context_processors.debug",
-    "django.core.context_processors.i18n",
-    "django.core.context_processors.media",
-    "django.core.context_processors.static",
-    "django.contrib.messages.context_processors.messages",
-    # Oscar specific
-    'oscar.apps.search.context_processors.search_form',
-    'oscar.apps.promotions.context_processors.promotions',
-    'oscar.apps.checkout.context_processors.checkout',
-    'oscar.core.context_processors.metadata',
-    'oscar.apps.customer.notifications.context_processors.notifications',
-)
-
-MIDDLEWARE_CLASSES = (
-    'debug_toolbar.middleware.DebugToolbarMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',
-    # Allow languages to be selected
-    'django.middleware.locale.LocaleMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    # Ensure a valid basket is added to the request instance for every request
-    'oscar.apps.basket.middleware.BasketMiddleware',
-    # Enable the ProfileMiddleware, then add ?cprofile to any
-    # URL path to print out profile details
-    # 'oscar.profiling.middleware.ProfileMiddleware',
-)
-
-ROOT_URLCONF = 'urls'
-
-# Add another path to Oscar's templates.  This allows templates to be
-# customised easily.
-from oscar import OSCAR_MAIN_TEMPLATE_DIR
-TEMPLATE_DIRS = (
-    location('templates'),
-    OSCAR_MAIN_TEMPLATE_DIR,
-)
-
-# A sample logging configuration. The only tangible logging
-# performed by this configuration is to send an email to
-# the site admins on every HTTP 500 error.
-# See http://docs.djangoproject.com/en/dev/topics/logging for
-# more details on how to customize your logging configuration.
-LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': True,
-    'formatters': {
-        'verbose': {
-            'format': '%(levelname)s %(asctime)s %(module)s %(message)s',
-        },
-        'simple': {
-            'format': '[%(asctime)s] %(message)s'
-        },
-    },
-    'filters': {
-        'require_debug_false': {
-            '()': 'django.utils.log.RequireDebugFalse'
-        }
-    },
-    'handlers': {
-        'null': {
-            'level': 'DEBUG',
-            'class': 'logging.NullHandler',
-        },
-        'console': {
-            'level': 'DEBUG',
-            'class': 'logging.StreamHandler',
-            'formatter': 'verbose'
-        },
-        'checkout_file': {
-            'level': 'INFO',
-            'class': 'oscar.core.logging.handlers.EnvFileHandler',
-            'filename': 'checkout.log',
-            'formatter': 'verbose'
-        },
-        'gateway_file': {
-            'level': 'INFO',
-            'class': 'oscar.core.logging.handlers.EnvFileHandler',
-            'filename': 'gateway.log',
-            'formatter': 'simple'
-        },
-        'error_file': {
-            'level': 'INFO',
-            'class': 'oscar.core.logging.handlers.EnvFileHandler',
-            'filename': 'errors.log',
-            'formatter': 'verbose'
-        },
-        'sorl_file': {
-            'level': 'INFO',
-            'class': 'oscar.core.logging.handlers.EnvFileHandler',
-            'filename': 'sorl.log',
-            'formatter': 'verbose'
-        },
-        'mail_admins': {
-            'level': 'ERROR',
-            'class': 'django.utils.log.AdminEmailHandler',
-            'filters': ['require_debug_false'],
-        },
-    },
-    'loggers': {
-        # Django loggers
-        'django': {
-            'handlers': ['null'],
-            'propagate': True,
-            'level': 'INFO',
-        },
-        'django.request': {
-            'handlers': ['mail_admins', 'error_file'],
-            'level': 'ERROR',
-            'propagate': False,
-        },
-        'django.db.backends': {
-            'handlers': ['null'],
-            'propagate': False,
-            'level': 'DEBUG',
-        },
-        # Oscar core loggers
-        'oscar.checkout': {
-            'handlers': ['console', 'checkout_file'],
-            'propagate': False,
-            'level': 'INFO',
-        },
-        'oscar.catalogue.import': {
-            'handlers': ['console'],
-            'propagate': False,
-            'level': 'INFO',
-        },
-        'oscar.alerts': {
-            'handlers': ['null'],
-            'propagate': False,
-            'level': 'INFO',
-        },
-        # Sandbox logging
-        'gateway': {
-            'handlers': ['gateway_file'],
-            'propagate': True,
-            'level': 'INFO',
-        },
-        # Third party
-        'sorl.thumbnail': {
-            'handlers': ['sorl_file'],
-            'propagate': True,
-            'level': 'INFO',
-        },
-        # Suppress output of this debug toolbar panel
-        'template_timings_panel': {
-            'handlers': ['null'],
-            'level': 'DEBUG',
-            'propagate': False,
-        }
-    }
-}
-
-
-INSTALLED_APPS = [
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.sites',
-    'django.contrib.messages',
-    'django.contrib.admin',
-    'django.contrib.flatpages',
-    'django.contrib.staticfiles',
-    'django.contrib.sitemaps',
-    'django_extensions',
-    # Debug toolbar + extensions
-    'debug_toolbar',
-    'template_timings_panel',
-    'widget_tweaks',
-]
-from oscar import get_core_apps
-INSTALLED_APPS = INSTALLED_APPS + get_core_apps(
-    ['apps.partner', 'apps.checkout', 'apps.shipping'])
-
-# Add Oscar's custom auth backend so users can sign in using their email
-# address.
-AUTHENTICATION_BACKENDS = (
-    'oscar.apps.customer.auth_backends.EmailBackend',
-    'django.contrib.auth.backends.ModelBackend',
-)
-
-LOGIN_REDIRECT_URL = '/'
-APPEND_SLASH = True
-
-# Haystack settings
-HAYSTACK_CONNECTIONS = {
-    'default': {
-        'ENGINE': 'haystack.backends.whoosh_backend.WhooshEngine',
-        'PATH': location('whoosh_index'),
-    },
-}
-
-# =============
-# Debug Toolbar
-# =============
-
-# Implicit setup can often lead to problems with circular imports, so we
-# explicitly wire up the toolbar
-DEBUG_TOOLBAR_PATCH_SETTINGS = False
-DEBUG_TOOLBAR_PANELS = [
-    'debug_toolbar.panels.versions.VersionsPanel',
-    'debug_toolbar.panels.timer.TimerPanel',
-    'debug_toolbar.panels.settings.SettingsPanel',
-    'debug_toolbar.panels.headers.HeadersPanel',
-    'debug_toolbar.panels.request.RequestPanel',
-    'debug_toolbar.panels.sql.SQLPanel',
-    'debug_toolbar.panels.staticfiles.StaticFilesPanel',
-    'debug_toolbar.panels.templates.TemplatesPanel',
-    'template_timings_panel.panels.TemplateTimings.TemplateTimings',
-    'debug_toolbar.panels.cache.CachePanel',
-    'debug_toolbar.panels.signals.SignalsPanel',
-    'debug_toolbar.panels.logging.LoggingPanel',
-    'debug_toolbar.panels.redirects.RedirectsPanel',
-]
-INTERNAL_IPS = ['127.0.0.1', '::1']
-
-# ==============
-# Oscar settings
-# ==============
-
-from oscar.defaults import *  # noqa
-
-# Meta
-# ====
-
-OSCAR_SHOP_TAGLINE = 'US Sandbox'
-OSCAR_DEFAULT_CURRENCY = 'USD'
-OSCAR_ALLOW_ANON_CHECKOUT = True
-
-# LESS/CSS
-# ========
-
-# We default to using CSS files, rather than the LESS files that generate them.
-# If you want to develop Oscar's CSS, then set USE_LESS=True to enable the
-# on-the-fly less processor.
-USE_LESS = False
-
-# Logging
-# =======
-
-LOG_ROOT = location('logs')
-# Ensure log root exists
-if not os.path.exists(LOG_ROOT):
-    os.mkdir(LOG_ROOT)
-
-# Sorl
-# ====
-
-THUMBNAIL_DEBUG = True
-THUMBNAIL_KEY_PREFIX = 'oscar-us-sandbox'
-
-SESSION_SERIALIZER = 'django.contrib.sessions.serializers.JSONSerializer'
-
-TEST_RUNNER = 'django.test.runner.DiscoverRunner'
-
-# Try and import local settings which can be used to override any of the above.
-try:
-    from settings_local import *  # noqa
-except ImportError:
-    pass

sites/us/urls.py

@@ -1,31 +0,0 @@
-from django.conf.urls import include, url
-from django.conf import settings
-from django.conf.urls.i18n import i18n_patterns
-from django.contrib import admin
-from django.conf.urls.static import static
-
-from oscar.app import application
-
-
-admin.autodiscover()
-
-urlpatterns = [
-    # Include admin as convenience. It's unsupported and only included
-    # for developers.
-    url(r'^admin/', include(admin.site.urls)),
-    # i18n URLS need to live outside of i18n_patterns scope of Oscar.
-    url(r'^i18n/', include('django.conf.urls.i18n')),
-]
-
-# Prefix Oscar URLs with language codes
-urlpatterns += i18n_patterns('', url(r'', include(application.urls)))
-
-if settings.DEBUG:
-    import debug_toolbar
-
-    # Server statics and uploaded media
-    urlpatterns += static(settings.MEDIA_URL,
-                          document_root=settings.MEDIA_ROOT)
-    urlpatterns += [
-        url(r'^__debug__/', include(debug_toolbar.urls)),
-    ]