Added custom manager for baskets and template params for views

examples/defaultshop/README.md

@@ -0,0 +1,2 @@
+This is an example project that uses oscar with all its default settings.  
+Nothing is overridden or customised.

oscar/basket/abstract_models.py

@@ -5,6 +5,14 @@ from django.db import models
 from django.utils.translation import ugettext as _
 from django.core.exceptions import ObjectDoesNotExist
 
+# Basket statuses
+OPEN, MERGED, SUBMITTED = ("Open", "Merged", "Submitted")
+
+
+class OpenBasketManager(models.Manager):
+    def get_query_set(self):
+        return super(OpenBasketManager, self).get_query_set().filter(status=OPEN)
+
 
 class AbstractBasket(models.Model):
     """
@@ -12,7 +20,6 @@ class AbstractBasket(models.Model):
     """
     # Baskets can be anonymously owned (which are then merged
     owner = models.ForeignKey(User, related_name='baskets', null=True)
-    OPEN, MERGED, SUBMITTED = ("Open", "Merged", "Submitted")
     STATUS_CHOICES = (
         (OPEN, _("Open - currently active")),
         (MERGED, _("Merged - superceded by another basket")),
@@ -26,6 +33,9 @@ class AbstractBasket(models.Model):
     class Meta:
         abstract = True
     
+    # Custom manager for searching open baskets only
+    open = OpenBasketManager()
+    
     def is_empty(self):
         return self.get_num_lines() == 0
     

oscar/basket/views.py

@@ -28,7 +28,7 @@ def _get_user_basket(request):
             basket_hash = request.COOKIES[COOKIE_KEY_HASH]
             if basket_hash == _get_basket_hash(basket_id):
                 try:
-                    b = Basket.objects.get(pk=basket_id)
+                    b = Basket.open.get(pk=basket_id)
                 except Basket.DoesNotExist, e:
                     b = None
     return b    

oscar/product/abstract_models.py

@@ -1,10 +1,22 @@
 """
 Models of products
 """
+import re
+
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
 
+def _convert_to_underscores(str):
+    """
+    For converting a string in CamelCase or normal text with spaces
+    to the normal underscored variety
+    """
+    without_whitespace = re.sub('\s*', '', str)
+    s1 = re.sub('(.)([A-Z][a-z]+)', r'\1_\2', without_whitespace)
+    return re.sub('([a-z0-9])([A-Z])', r'\1_\2', s1).lower()
+
+
 class AbstractItemClass(models.Model):
     """
     Defines an item type (equivqlent to Taoshop's MediaType).
@@ -76,7 +88,9 @@ class AbstractItem(models.Model):
         ordering = ['-date_created']
 
     def __unicode__(self):
-        return self.title
+        if self.is_variant():
+            return "%s (%s)" % (self.get_title(), self.get_attribute_summary())
+        return self.get_title()
     
     def save(self, *args, **kwargs):
         if self.is_top_level() and not self.title:
@@ -89,16 +103,22 @@ class AbstractAttributeType(models.Model):
     """
     Defines an attribute. (Eg. size)
     """
-    type = models.CharField(_('type'), max_length=128)
+    code = models.CharField(_('code'), max_length=128)
+    name = models.CharField(_('name'), max_length=128)
     has_choices = models.BooleanField(default=False)
 
     class Meta:
         abstract = True
-        ordering = ['type']
+        ordering = ['code']
 
     def __unicode__(self):
         return self.type
 
+    def save(self, *args, **kwargs):
+        if not self.code:
+            self.code = _convert_to_underscores(self.name)
+        super(AbstractAttributeType, self).save(*args, **kwargs)
+        
 
 class AbstractAttributeValueOption(models.Model):
     """
@@ -121,7 +141,7 @@ class AbstractItemAttributeValue(models.Model):
     Eg: size = L
     """
     product = models.ForeignKey('product.Item', related_name='attributes')
-    attribute = models.ForeignKey('product.AttributeType')
+    type = models.ForeignKey('product.AttributeType')
     value = models.CharField(max_length=255)
     
     class Meta:

oscar/product/templates/item.html

@@ -23,10 +23,16 @@
     </tr>
     <tr>
         <th>Product type</th>
-        <td>{% if item.is_group %}Product group{% else %}Stand-alone{% endif %}
-        
+        <td>
+        {% if item.is_group %}Product group{% else %}{% if item.is_variant %}Variant{% else %}Stand-alone{% endif %}{% endif %}
         </td>
     </tr>
+    {% for attribute in item.attributes.all %}
+    <tr>
+        <th>{{ attribute.attribute.type }}</th>
+        <th>{{ attribute.value }}</th>
+    </tr>
+    {% endfor %}
 </table>
 
 <form action="/shop/basket/add-item/" method="post">

oscar/product/views.py

@@ -9,13 +9,15 @@ from django.core.urlresolvers import reverse
 from oscar.product.models import Item
 from oscar.basket.forms import AddToBasketForm
 
-def item(request, product_id):
+def item(request, product_id, template_file='item.html'):
     """ 
     Single product page
     """
     item = get_object_or_404(Item, pk=product_id)
+#    a = attributes = item.attributes.all()
+#    assert False
     form = AddToBasketForm({'product_id': product_id, 'quantity': 1})
-    return render_to_response('item.html', locals(), context_instance=RequestContext(request))
+    return render_to_response(template_file, locals(), context_instance=RequestContext(request))
 
-def all(request):
-    return render_to_response('browse-all.html', locals())
+def all(request, template_file='browse-all.html'):
+    return render_to_response(template_file, locals())