Merge branch 'master' of github.com:codeinthehole/django-oscar

Fixed conflict with date arg

Conflicts:
	oscar/product/models.py

oscar/offer/models.py

@@ -24,7 +24,18 @@ class Condition(models.Model):
     range = models.ForeignKey('offer.Range')
     type = models.CharField(max_length=128, choices=TYPE_CHOICES)
     value = models.FloatField()
-
+    
+    def is_satisfied(self, basket):
+        """
+        Determines whether a given basket meets this condition
+        """
+        if self.type == COUNT:
+            return self.range.filter_basket(basket).num_items >= self.value
+        elif self.type == VALUE:
+            return self.range.filter_basket(basket).value >= self.value
+        else:
+            return False
+        
 
 class Benefit(models.Model):
     PERCENTAGE, FIXED = ("Percentage", "Absolute")
@@ -35,13 +46,16 @@ class Benefit(models.Model):
     range = models.ForeignKey('offer.Range')
     type = models.CharField(max_length=128, choices=TYPE_CHOICES)
     value = models.FloatField()
+    
+    def apply(self, basket):
+        return basket
 
 
 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')
+    included_products = models.ManyToManyField('product.Item', related_name='includes', blank=True)
+    excluded_products = models.ManyToManyField('product.Item', related_name='excludes', blank=True)
 
 
 class Voucher(models.Model):

oscar/product/models.py

@@ -25,9 +25,9 @@ class AttributeTypeMembership(models.Model):
     )
     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')
+    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)
@@ -35,11 +35,11 @@ class AttributeTypeMembership(models.Model):
 
 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(auto_now_add=True)
 
     def __unicode__(self):
         return self.name