Added some sample shops where the models are customised and a new

product image app

TODO

@@ -1,4 +1,7 @@
 Fields to write:
 - Postcode field
 - Currency field
-- Country field for addresses
+- Country field for addresses
+
+Sample shop:
+- How to have the admin site reflect your local models

oscar/image/abstract_models.py

@@ -0,0 +1,27 @@
+"""
+Abstract models for the product images app
+"""
+
+from django.db import models
+from django.utils.translation import ugettext as _
+
+
+class AbstractImage(models.Model):
+    """
+    An image of a product  
+    """
+    product = models.ForeignKey('product.Item', related_name='images')
+    path = models.ImageField(upload_to='product-images/%Y/%m/')
+    # Use display_order to determine which is the "primary" image
+    display_order = models.PositiveIntegerField()
+    date_created = models.DateTimeField(auto_now_add=True)
+    
+    def is_primary(self):
+        return self.display_order == 0
+    
+    class Meta:
+        abstract = True
+
+    def __unicode__(self):
+        return "Image of '%s'" % self.product
+

oscar/image/admin.py

@@ -0,0 +1,4 @@
+from django.contrib import admin
+from oscar.image.models import *
+
+admin.site.register(Image)

oscar/image/models.py

@@ -0,0 +1,5 @@
+from oscar.image.abstract_models import AbstractImage
+
+class Image(AbstractImage):
+    pass
+

oscar/image/tests.py

@@ -0,0 +1,23 @@
+"""
+This file demonstrates two different styles of tests (one doctest and one
+unittest). These will both pass when you run "manage.py test".
+
+Replace these with more appropriate tests for your application.
+"""
+
+from django.test import TestCase
+
+class SimpleTest(TestCase):
+    def test_basic_addition(self):
+        """
+        Tests that 1 + 1 always equals 2.
+        """
+        self.failUnlessEqual(1 + 1, 2)
+
+__test__ = {"doctest": """
+Another way to test that 1 + 1 is equal to 2.
+
+>>> 1 + 1 == 2
+True
+"""}
+

oscar/image/views.py

@@ -0,0 +1 @@
+# Create your views here.

oscar/product/abstract_models.py

@@ -1,7 +1,7 @@
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
-class AbstractItemType(models.Model):
+class AbstractItemClass(models.Model):
     """
     Defines an item type (equivqlent to Taoshop's MediaType).
     """
@@ -29,7 +29,7 @@ class AbstractItem(models.Model):
     parent = models.ForeignKey('self', blank=True, null=True)
     title = models.CharField(_('name'), max_length=255)
     description = models.TextField(_('description'), blank=True, null=True)
-    item_type = models.ForeignKey('product.ItemType', verbose_name=_('item type'))
+    item_class = models.ForeignKey('product.ItemClass', verbose_name=_('item type'))
     attribute_types = models.ManyToManyField('product.AttributeType', through='ItemAttributeValue')
     date_created = models.DateTimeField(auto_now_add=True)
     date_updated = models.DateTimeField(auto_now=True)

oscar/product/models.py

@@ -9,7 +9,7 @@ class ItemType(AbstractItemType):
 class Item(AbstractItem):
     pass
 
-class AttributeType(AbstractAttributeType):
+class AttributeClass(AbstractAttributeType):
     pass
 
 class ItemAttributeValue(AbstractItemAttributeValue):

sampleapp/payment/admin.py

@@ -1,5 +0,0 @@
-from django.contrib import admin
-from sampleapp.payment.models import *
-
-admin.site.register(Source)
-admin.site.register(Transaction)

sampleapp/payment/models.py

@@ -1,8 +0,0 @@
-from django.db import models
-from oscar.payment.abstract_models import AbstractSource, AbstractTransaction
-
-class Source(AbstractSource):
-    num_transactions = models.IntegerField(default=0)
-
-class Transaction(AbstractTransaction):
-    pass

sampleshop_books/product/models.py

@@ -0,0 +1,23 @@
+"""
+Bookshop product models
+"""
+from django.db import models
+from oscar.product.abstract_models import *
+
+class ItemType(AbstractItemType):
+    pass
+
+class Item(AbstractItem):
+    format = models.CharField(max_length=128, default="Paperback")
+    isbn = models.CharField(max_length=13)
+    contributors = models.ManyToManyField('product.Contributor')
+    date_published = models.DateTimeField()
+
+class Contributor(models.Model):
+    name = models.CharField(max_length=255)
+
+class AttributeType(AbstractAttributeType):
+    pass
+
+class ItemAttributeValue(AbstractItemAttributeValue):
+    pass

sampleshop_clothing/product/models.py

@@ -0,0 +1,16 @@
+"""
+Clothes shop product models
+"""
+from oscar.product.abstract_models import *
+
+class ItemType(AbstractItemType):
+    pass
+
+class Item(AbstractItem):
+    label = models.CharField(max_length=32, default='Gucci') 
+
+class AttributeType(AbstractAttributeType):
+    pass
+
+class ItemAttributeValue(AbstractItemAttributeValue):
+    pass

settings.py

@@ -27,7 +27,7 @@ DATABASES = {
 # 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 = 'America/Chicago'
+TIME_ZONE = 'Europe/London'
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
@@ -92,17 +92,20 @@ INSTALLED_APPS = (
     'django.contrib.admin',
     'django_extensions',
     'south',
+    'test_extensions',
+    # Apps from oscar
     'oscar',
     'oscar.order',
-    'oscar.product',
+    #'oscar.product',
     'oscar.basket',
     'oscar.payment',
     'oscar.offer',
     'oscar.address',
     'oscar.stock',
+    'oscar.image',
     # To use an alternative app to one of oscar's core ones,
     # add it here (eg replace oscar.payment with sampleapp.payment)
-    'test_extensions',
+    'sampleshop_clothing.product'
 )
 
 # Local overrides

urls.py

@@ -1,7 +1,6 @@
 from django.conf.urls.defaults import *
-
-# Uncomment the next two lines to enable the admin:
 from django.contrib import admin
+
 admin.autodiscover()
 
 urlpatterns = patterns('',