Merge branch 'dropapp-command'

oscar/management/commands/dropapp.py

+from django.core.management.base import BaseCommand, CommandError
+from django.core.management.commands.sqlclear import Command as SqlClearCommand
+
+class Command(BaseCommand):
+    args = '<app_name app_name ...>'
+    help = 'Drops the db tables for the given apps'
+
+    def handle(self, *args, **kwargs):
+        com = SqlClearCommand()
+        self.stdout.write("SET FOREIGN_KEY_CHECKS=0;\n")
+        for app_name in args:
+            self.stdout.write(com.handle(app_name))

oscar/offer/models.py

 from django.db import models
 from django.utils.translation import ugettext as _
 
+
 class ConditionalOffer(models.Model):
     name = models.CharField(max_length=128)
     description = models.TextField(blank=True)
     priority = models.IntegerField()
     created_date = models.DateTimeField(auto_now_add=True)
 
+
 class Condition(models.Model):
     COUNT, VALUE = ("Count", "Value")
     TYPE_CHOICES = (
     type = models.CharField(max_length=128, choices=TYPE_CHOICES)
     value = models.FloatField()
 
+
 class Benefit(models.Model):
     PERCENTAGE, FIXED = ("Percentage", "Absolute")
     TYPE_CHOICES = (
     type = models.CharField(max_length=128, choices=TYPE_CHOICES)
     value = models.FloatField()
 
+
 class Range(models.Model):
     name = models.CharField(max_length=128)
+    includes_all_products = models.BooleanField(default=False)
+    included_products = models.ManyToManyField('product.Item', related_name='includes')
+    excluded_products = models.ManyToManyField('product.Item', related_name='excludes')
+
 
 class Voucher(models.Model):
     """

oscar/product/models.py

 
 class AttributeType(models.Model):
     """Defines a product attribute type"""
-    name = models.CharField(max_length = 128)
+    name=models.CharField(max_length=128)
 
     def __unicode__(self):
         return self.name
 
 class Type(models.Model):
     """Defines a product type"""
-    name = models.CharField(max_length = 128)
-    attribute_types = models.ManyToManyField('product.AttributeType', through = 'product.AttributeTypeMembership')
+    name=models.CharField(max_length=128)
+    attribute_types=models.ManyToManyField('product.AttributeType', through='product.AttributeTypeMembership')
 
     def __unicode__(self):
         return self.name
 
 
 class AttributeTypeMembership(models.Model):
-    RELATIONSHIP_CHOICES = (
+    RELATIONSHIP_CHOICES=(
         ('optional', 'optional'),
         ('required', 'required'),
         ('required_basket', 'required for purchase'),
     )
-    type = models.ForeignKey('product.Type')
-    attribute_type = models.ForeignKey('product.AttributeType')
-    relation_type = models.CharField(max_length = 16, choices = RELATIONSHIP_CHOICES, default = 'optional')
+    type=models.ForeignKey('product.Type')
+    # Some attributes like clothes sizes need to be displayed in a set order (eg: S,M,L,XL)
+    display_order=models.IntegerField(default=0)
+    attribute_type=models.ForeignKey('product.AttributeType')
+    relation_type=models.CharField(max_length=16, choices=RELATIONSHIP_CHOICES, default='optional')
     
     def __unicode__(self):
         return "%s -> %s (%s)" % (self.type.name, self.attribute_type.name, self.relation_type)
 
 class Item(models.Model):
     """The base product object"""
-    name = models.CharField(max_length = 128)
-    partner_id = models.CharField(max_length = 32)
-    type = models.ForeignKey('product.Type')
-    date_available = models.DateField()
-    date_created = models.DateTimeField()
+    name=models.CharField(max_length=128)
+    partner_id=models.CharField(max_length=32)
+    type=models.ForeignKey('product.Type')
+    date_available=models.DateField()
+    date_created=models.DateTimeField()
 
     def __unicode__(self):
         return self.name
         Returns:
             A boolean if the product is valid
         """
-        required_attribute_names = []
-        for attribute_type in self.type.attribute_types.filter(attributetypemembership__relation_type = 'required'):
+        required_attribute_names=[]
+        for attribute_type in self.type.attribute_types.filter(attributetypemembership__relation_type='required'):
             required_attribute_names.append(attribute_type.name)
 
         for attribute in self.attribute_set.all():
 
 class Attribute(models.Model):
     """An individual product attribute"""
-    attribute_type = models.ForeignKey('product.AttributeType')
-    product = models.ForeignKey('product.Item')
-    value = models.CharField(max_length = 256)
+    attribute_type=models.ForeignKey('product.AttributeType')
+    product=models.ForeignKey('product.Item')
+    value=models.CharField(max_length=256)
 
 
 class StockRecord(models.Model):
     """A stock keeping record"""
-    product = models.ForeignKey('product.Item')
-    price_excl_tax = models.FloatField()
-    tax = models.FloatField()
+    product=models.ForeignKey('product.Item')
+    price_excl_tax=models.FloatField()
+    tax=models.FloatField()

settings.py

     'django.contrib.admin',
     'django_extensions',
     'south',
+    'oscar',
     'oscar.payment',
     'oscar.order',
     'oscar.product',