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

Conflicts:
	oscar/product/signals.py
	oscar/templates/product/item.html
	oscar/tests.py

.gitignore

@@ -12,3 +12,4 @@ docs/build/*
 *.*~
 examples/.coverage
 assets/*
+examples/defaultshop/assets/*

FEATURES.rst

@@ -1,33 +1,3 @@
-========
-Features
-========
-
-Below is a list of required features for oscar, together with a brief spec for
-what they should implement.  If you're looking for something to do, please have a
-go at one of the below.
-
-
-Reviews and voting
-------------------
-
-Create a new ``oscar.reviews`` app which provides reviews and voting functionality. 
-
-* Only signed in users can review
-* Each product can have reviews attached to it.  Each review has a title, a body and a score from 1-5.
-* Reviews must be approved before they are live
-* The product page should have a review form on it, any errors in the submission will be shown on the same product page
-* The product page will show the most recent 5 reviews with a link to browse all reviews for that product.
-* The URL for browsing a products offers should be the normal product URL with /reviews appended at the end
-* The product page should show the average score based on the reviews 
-* The review browsing page should allow reviews to be sorted by score, or recency.
-* Each review should have a permalink, ie it has its own page.
-* Each reviews can be voted up or down by other users
-* Only signed in users can vote
-* A user can only vote once on each product once
-
-It might be possible to use the Django comments framework for this.
-
-
 Countdowns
 ----------
 
@@ -53,43 +23,7 @@ and control the order of them.
 * The order of the products within the block should be controllable
 
 
-Wishlists
----------
-
-Create a new ``oscar.wishlist`` app similar to the basket app. 
-
-* A wishlist is simply a list of products
-* Wishlist products do not have quantities
-* Only signed in users can have wishlists
-* A user can only have one wishlist (for now)
-* A wishlist can either be public or private
-* A user can add a product to their wishlist from a product page - after adding they are redirected
-  to their wishlist management page but with a link back to the page they just came from.
-* The wishlist management should have URL /wishlist
-* On the wishlist management page:
-  - you can add the item to your normal basket or remove it from your wishlist 
-  - you can make your list public or private
-  - you can empty your whole wishlist
-  
-The view functions for this app should be v similar to the basket ones.  Also have a look at Amazons for
-guidance.
-
-
-CurrencyField
--------------
-
-Lots of models have a currency field but the field attributes are duplicated each time.  This could be
-simplified if we had a currency field class.  
-
-* This should set the correct decimal settings and support a default value
-
-
-Extended URL field
-------------------
 
-Pods, banners and merchandising blocks need to link to either an external URL or an internal
-one (eg /fiction-books/).  The current URLField only supports external ones.  Write a new type 
-of field class that allows internal URLs too. 
 
 
   

README.md → README.rst

@@ -1,4 +1,5 @@
-# Django-Oscar - Flexible e-commerce on Django
+Django-Oscar - Flexible e-commerce on Django
+============================================
 
 django-oscar is a flexible ecommerce platform, designed to build domain-driven
 ecommerce sites to be constructed.  It is not supposed to be a framework that can
@@ -10,5 +11,5 @@ However, a small amount of work up front in determine the right models for your
 shop can really pay off in terms of building a high-quality application that
 is a pleasure to work with and maintain.
 
-See the *.rst files within `docs/source` for documentation or visit
-[http://readthedocs.org/docs/django-oscar/en/](http://readthedocs.org/docs/django-oscar/en/)
+See the ``*.rst`` files within ``docs/source`` for documentation or visit
+http://django-oscar.readthedocs.org/en/latest/

docs/source/components.rst

@@ -12,3 +12,4 @@ Contents:
    components/checkout
    components/shipping
    components/analytics
+   components/promotions

docs/source/components/promotions.rst

@@ -0,0 +1,15 @@
+==========
+Promotions
+==========
+
+Promotions are small blocks of content that can link through to other parts of this site.  
+Examples include:
+
+* A banner image shown on at the top of the homepage that links through to a new offer page
+* A "pod" image shown in the right-hand sidebar of a page, linking through to newly merchandised
+  page.
+* A biography of an author (featuring an image and a block of HTML) shown at the top of the search
+  results page when the search query includes the author's surname.
+
+These are modelled using a base "promotion" model, which contains the image fieids and the link
+destination, and two "linking" models which link promotions to either a page URL, or a particular keyword.

docs/source/contributing/installation.rst

@@ -16,7 +16,8 @@ Reload bash with the following command::
 
     ~/.bashrc
 
-Do the following from your workspace folder:
+Do the following from your workspace folder::
+
     mkdir oscar
     cd oscar
     mkvirtualenv --no-site-packages oscar
@@ -24,10 +25,7 @@ Do the following from your workspace folder:
     
 After checking out your fork, install the latest version of Django into your virtualenv (currenty a beta of 1.3)::
 
-    wget http://www.djangoproject.com/download/1.3-beta-1/tarball/
-    pip install Django-1.3-beta-1.tar.gz
-
-Clone this repository to get the latest version of Oscar
+    pip install django
 
 Install all packages from the requirements file (optional)::
 
@@ -40,10 +38,6 @@ Install oscar in development mode within your virtual env::
 
     python setup.py develop
 
-Optionally, install all packages from the requirements file::
-
-    pip install -r requirements.txt
-
 Note: In case of gcc crashing and complaining in-between installation process,
 make sure you have appropriate -devel packages installed (ie. mysql-devel) in
 your system.

docs/source/getting_started/installation.rst

@@ -19,7 +19,7 @@ Install oscar and its dependencies::
     
     pip install -e git+git://github.com/codeinthehole/django-oscar.git#egg=django-oscar
     
-This will install Django and a few other packages.  Now create the project    
+This will install Django and a few other packages.  Now create the project::
     
     cd /path/to/my/workspace
     django-admin.py startproject $PROJECTNAME
@@ -69,7 +69,7 @@ Configure urls
 
 Oscar comes with a number of urls and views out of the box.  These are
 recommendations rather than a requirement but you easily use them in your
-e-commerce site by adding the oscar urls to your projects local ``urls.py``
+e-commerce site by adding the oscar urls to your projects local ``urls.py``::
 
     (r'^', include('oscar.urls')),
 

docs/source/index.rst

@@ -16,7 +16,7 @@ a much better representation of the domain at hand.
 It is developed by Tangent Labs, a London-based digital agency, and is based on
 their existing Taoshop PHP platform which currently powers several large-scale ecommerce sites.  
 
-It is still in early development, but a stable release is planned for April 2011.
+It is still in early development, but a stable release is planned for early summer 2011.
 
 The source is on Github: https://github.com/codeinthehole/django-oscar
 

examples/defaultshop/settings.py

@@ -6,8 +6,8 @@ PROJECT_DIR = os.path.dirname(__file__)
 location = lambda x: os.path.join(os.path.dirname(os.path.realpath(__file__)), x)
 
 DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-SQL_DEBUG = DEBUG
+TEMPLATE_DEBUG = True
+SQL_DEBUG = True
 
 ADMINS = (
     # ('Your Name', 'your_email@domain.com'),
@@ -82,7 +82,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     "django.core.context_processors.static",
     "django.contrib.messages.context_processors.messages",
     # Oscar specific
-    'oscar.marketing.context_processors.marketing',
+    'oscar.promotions.context_processors.promotions',
 ) 
 
 MIDDLEWARE_CLASSES = (
@@ -144,6 +144,7 @@ INSTALLED_APPS = (
     # Apps from oscar
     'oscar',
     'oscar.analytics',
+    'oscar.discount',
     'oscar.order',
     'oscar.checkout',
     'oscar.shipping',
@@ -156,7 +157,8 @@ INSTALLED_APPS = (
     'oscar.stock',
     'oscar.image',
     'oscar.customer',
-    'oscar.marketing',
+    'oscar.promotions',
+    'oscar.reports',
 )
 
 LOGIN_REDIRECT_URL = '/shop/accounts/profile/'

examples/recreate_project_tables.sh

@@ -14,7 +14,7 @@ then
 fi
 echo "Recreating all tables in $PROJECT_FOLDER"
 echo "Dropping tables"
-$MANAGE_COMMAND sqlclear marketing analytics payment offer shipping order basket stock image address product | \
+$MANAGE_COMMAND sqlclear promotions analytics payment offer shipping order basket stock image address product | \
 	awk 'BEGIN {print "set foreign_key_checks=0;"} {print $0}' | \
     $MANAGE_COMMAND dbshell && \
     $MANAGE_COMMAND syncdb

examples/run_tests.sh

@@ -13,6 +13,6 @@ then
 	printf "$MANAGE_COMMAND cannot be found\n"
 fi
 echo "Running all tests in $PROJECT_FOLDER"
-time coverage run $MANAGE_COMMAND test oscar --settings=test_settings -v 1 --failfast | \
+time $MANAGE_COMMAND test oscar --settings=test_settings -v 1 --failfast | \
 	grep -v "^\(Installing\|Creating\)"
 

oscar/address/abstract_models.py

@@ -121,7 +121,7 @@ class AbstractShippingAddress(AbstractAddress):
     it should be read-only after that. 
     """
     phone_number = models.CharField(max_length=32, blank=True, null=True)
-    notes = models.TextField(blank=True, null=True) 
+    notes = models.TextField(blank=True, null=True, help_text="""Shipping notes""")
     
     class Meta:
         abstract = True
@@ -140,10 +140,14 @@ class AbstractUserAddress(AbstractShippingAddress):
     """
     user = models.ForeignKey('auth.User', related_name='addresses')
     
+    # Customers can set which is their default billing address
+    default_for_billing = models.BooleanField(default=False)
+    
     # We keep track of the number of times an address has been used
     # as a shipping address so we can show the most popular ones 
     # first at the checkout.
     num_orders = models.PositiveIntegerField(default=0)
+    
     # A hash is kept to try and avoid duplicate addresses being added
     # to the address book.
     hash = models.CharField(max_length=255, db_index=True)

oscar/analytics/abstract_models.py

@@ -14,14 +14,22 @@ class AbstractProductRecord(models.Model):
     """
     
     product = models.OneToOneField('product.Item')
+    
+    # Data used for generating a score
     num_views = models.PositiveIntegerField(default=0)
     num_basket_additions = models.PositiveIntegerField(default=0)
     num_purchases = models.PositiveIntegerField(default=0, db_index=True)
     
+    # Product score - used within search
+    score = models.DecimalField(decimal_places=2, max_digits=12, default=Decimal('0.00'))
+    
     class Meta:
         abstract = True
         ordering = ['-num_purchases']
         
+    def __unicode__(self):
+        return u"Record for '%s'" % self.product
+        
 
 class AbstractUserRecord(models.Model):
     u"""
@@ -44,4 +52,33 @@ class AbstractUserRecord(models.Model):
     class Meta:
         abstract = True
         
+        
+class AbstractUserProductView(models.Model):
+    
+     user = models.ForeignKey('auth.User')
+     product = models.ForeignKey('product.Item')
+     date_created = models.DateTimeField(auto_now_add=True)
+     
+     class Meta:
+         abstract = True
+         
+     def __unicode__(self):
+         return u"%s viewed '%s'" % (self.user, self.product)
+             
+
+class AbstractUserSearch(models.Model):
+    
+     user = models.ForeignKey('auth.User')
+     query = models.CharField(_("Search term"), max_length=255, db_index=True)
+     date_created = models.DateTimeField(auto_now_add=True)
+     
+     class Meta:
+         abstract = True
+         verbose_name_plural = "User search queries"
+         
+     def __unicode__(self):
+         return u"%s searched for '%s'" % (self.user, self.query)
+     
+         
+
     

oscar/analytics/admin.py

@@ -0,0 +1,19 @@
+from django.contrib import admin
+
+from oscar.services import import_module
+models = import_module('analytics.models', ['ProductRecord', 'UserRecord', 'UserSearch', 
+                                            'UserProductView'])
+
+class ProductRecordAdmin(admin.ModelAdmin):
+    list_display = ('product', 'num_views', 'num_basket_additions', 'num_purchases')
+    
+class UserProductViewAdmin(admin.ModelAdmin):
+    list_display = ('user', 'product', 'date_created')
+
+class UserRecordAdmin(admin.ModelAdmin):
+    list_display = ('user', 'num_product_views', 'num_basket_additions', 'num_orders', 'total_spent', 'date_last_order')
+
+admin.site.register(models.ProductRecord, ProductRecordAdmin)
+admin.site.register(models.UserRecord, UserRecordAdmin)
+admin.site.register(models.UserSearch)
+admin.site.register(models.UserProductView, UserProductViewAdmin)

oscar/analytics/models.py

@@ -1,9 +1,10 @@
 from django.dispatch import receiver
 
-from oscar.analytics.abstract_models import AbstractProductRecord, AbstractUserRecord
+from oscar.analytics.abstract_models import (AbstractProductRecord, AbstractUserRecord,
+                                             AbstractUserProductView, AbstractUserSearch)
 from oscar.services import import_module
 
-product_signals = import_module('product.signals', ['product_viewed'])
+product_signals = import_module('product.signals', ['product_viewed', 'product_search'])
 basket_signals = import_module('basket.signals', ['basket_addition'])
 order_signals = import_module('order.signals', ['order_placed'])
 
@@ -13,6 +14,12 @@ class ProductRecord(AbstractProductRecord):
 class UserRecord(AbstractUserRecord):
     pass
 
+class UserProductView(AbstractUserProductView):
+    pass
+
+class UserSearch(AbstractUserSearch):
+    pass
+
 # Helpers
 
 def _record_product_view(product):
@@ -22,10 +29,14 @@ def _record_product_view(product):
     
 def _record_user_product_view(user, product):
     if user.is_authenticated():
+        # Update user record
         record,_ = UserRecord.objects.get_or_create(user=user)
         record.num_product_views += 1
         record.save()
         
+        # Add user product view record
+        UserProductView.objects.create(product=product, user=user)
+        
 def _record_basket_addition(product):
     record,_ = ProductRecord.objects.get_or_create(product=product)
     record.num_basket_additions += 1
@@ -53,6 +64,10 @@ def _record_user_order(user, order):
         record.date_last_order = order.date_placed
         record.save()
 
+def _record_user_product_search(user, query):
+    if user.is_authenticated():
+        UserSearch._default_manager.create(user=user, query=query)
+
 # Receivers
 
 @receiver(product_signals.product_viewed)
@@ -60,6 +75,10 @@ def receive_product_view(sender, product, user, **kwargs):
     _record_product_view(product)
     _record_user_product_view(user, product)
     
+@receiver(product_signals.product_search)
+def receive_product_search(sender, query, user, **kwargs):
+    _record_user_product_search(user, query)
+    
 @receiver(basket_signals.basket_addition)
 def receive_basket_addition(sender, product, user, **kwargs):
     _record_basket_addition(product)

oscar/analytics/reports.py

@@ -0,0 +1,66 @@
+import csv
+
+from oscar.services import import_module
+report_classes = import_module('reports.reports', ['ReportGenerator'])
+analytics_models = import_module('analytics.models', ['ProductRecord', 'UserRecord'])
+
+
+class ProductReportGenerator(report_classes.ReportGenerator):
+    
+    filename_template = 'product-analytics.csv'
+    code = 'product_analytics'
+    description = 'Product analytics'
+    
+    def generate(self, response):
+        writer = csv.writer(response)
+        header_row = ['Product',
+                      'Views',
+                      'Basket additions',
+                      'Purchases',]
+        writer.writerow(header_row)
+        
+        records = analytics_models.ProductRecord._default_manager.all()
+        for record in records:
+            row = [record.product, record.num_views, record.num_basket_additions, record.num_purchases]
+            writer.writerow(row)
+            
+    def is_available_to(self, user):
+        return user.is_staff
+    
+    def filename(self):
+        return self.filename_template
+    
+
+class UserReportGenerator(report_classes.ReportGenerator):
+    
+    filename_template = 'user-analytics.csv'
+    code = 'user_analytics'
+    description = 'User analytics'
+    
+    def generate(self, response):
+        writer = csv.writer(response)
+        header_row = ['Username',
+                      'Name',
+                      'Date registered',
+                      'Product views',
+                      'Basket additions',
+                      'Orders',
+                      'Order lines',
+                      'Order items',
+                      'Total spent',
+                      'Date of last order',
+                      ]
+        writer.writerow(header_row)
+        
+        records = analytics_models.UserRecord._default_manager.select_related().all()
+        for record in records:
+            row = [record.user.username, record.user.get_full_name(), record.user.date_joined, 
+                   record.num_product_views, record.num_basket_additions, record.num_orders,
+                   record.num_order_lines, record.num_order_items, record.total_spent, record.date_last_order]
+            writer.writerow(row)
+            
+    def is_available_to(self, user):
+        return user.is_staff
+    
+    def filename(self):
+        return self.filename_template

oscar/basket/abstract_models.py

@@ -170,6 +170,17 @@ class AbstractBasket(models.Model):
         u"""Return number of items"""
         return reduce(lambda num,line: num+line.quantity, self.all_lines(), 0)
     
+    @property
+    def time_before_submit(self):
+        if not self.date_submitted:
+            return None
+        return self.date_submitted - self.date_created
+    
+    @property
+    def time_since_creation(self, test_datetime=None):
+        if not test_datetime:
+            test_datetime = datetime.datetime.now()
+        return test_datetime - self.date_created
     
 class AbstractLine(models.Model):
     u"""A line of a basket (product and a quantity)"""

oscar/basket/models.py

@@ -3,7 +3,8 @@ from exceptions import Exception
 from django.core.signals import request_finished
 from django.dispatch import receiver
 
-from oscar.basket.abstract_models import AbstractBasket, AbstractLine, AbstractLineAttribute
+from oscar.basket.abstract_models import (AbstractBasket, AbstractLine, AbstractLineAttribute,
+                                          OPEN, MERGED, SAVED, SUBMITTED)
 
 
 class InvalidBasketLineError(Exception):

oscar/basket/reports.py

@@ -0,0 +1,58 @@
+import csv
+
+from oscar.services import import_module
+report_classes = import_module('reports.reports', ['ReportGenerator'])
+basket_models = import_module('basket.models', ['Basket', 'OPEN', 'SUBMITTED'])
+
+
+class OpenBasketReportGenerator(report_classes.ReportGenerator):
+    
+    filename_template = 'open-baskets-%s-%s.csv'
+    code = 'open_baskets'
+    description = 'Open baskets'
+    
+    def generate(self, response):
+        writer = csv.writer(response)
+        header_row = ['User ID',
+                      'User',
+                      'Basket status',
+                      'Num lines',
+                      'Num items',
+                      'Value',
+                      'Date of creation',
+                      'Time since creation',
+                     ]
+        writer.writerow(header_row)
+        
+        baskets = basket_models.Basket._default_manager.filter(status=basket_models.OPEN)
+        for basket in baskets:
+            row = [basket.owner_id, basket.owner, basket.status, basket.num_lines,
+                   basket.num_items, basket.total_incl_tax, 
+                   basket.date_created, basket.time_since_creation]
+            writer.writerow(row)
+
+
+class SubmittedBasketReportGenerator(report_classes.ReportGenerator):
+    
+    filename_template = 'submitted_baskets-%s-%s.csv'
+    code = 'submitted_baskets'
+    description = 'Submitted baskets'
+    
+    def generate(self, response):
+        writer = csv.writer(response)
+        header_row = ['User ID',
+                      'User',
+                      'Basket status',
+                      'Num lines',
+                      'Num items',
+                      'Value',
+                      'Time between creation and submission',
+                     ]
+        writer.writerow(header_row)
+        
+        baskets = basket_models.Basket._default_manager.filter(status=basket_models.SUBMITTED)
+        for basket in baskets:
+            row = [basket.owner_id, basket.owner, basket.status, basket.num_lines,
+                   basket.num_items, basket.total_incl_tax, 
+                   basket.date_created, basket.time_before_submit]
+            writer.writerow(row)

oscar/discount/abstract_models.py

@@ -0,0 +1,82 @@
+from decimal import Decimal, ROUND_UP
+
+from django.db import models
+from django.utils.translation import ugettext as _
+
+ABSOLUTE_DISCOUNT, PERCENTAGE_DISCOUNT, FINAL_PRICE = "Absolute", "Percentage", "Final price"
+
+class AbstractDiscountOffer(models.Model):
+    u"""
+    A fixed-discount offer (eg get 10% off all fiction books)
+    """
+    name = models.CharField(max_length=128)
+    description = models.TextField(blank=True, null=True)
+    
+    start_date = models.DateField()
+    end_date = models.DateField()
+    
+    products = models.ManyToManyField('product.Item')
+    TYPE_CHOICES = (
+        (ABSOLUTE_DISCOUNT, _("An absolute amount of discount off the site price")),
+        (PERCENTAGE_DISCOUNT, _("A percentage discount off the site price")),
+        (FINAL_PRICE, _("Sets the site price")),
+    )
+    discount_type = models.CharField(_("Discount type"), max_length=128, choices=TYPE_CHOICES, default=PERCENTAGE_DISCOUNT)
+    discount_value = models.DecimalField(decimal_places=2, max_digits=12, 
+        help_text="""For percentage values, enter integers less than 100 (eg '25' for a 25% discount)""")
+    
+    date_created = models.DateTimeField(auto_now_add=True)
+
+    class Meta:
+        ordering = ['-date_created']
+        abstract = True
+        
+    def __unicode__(self):
+        return self.name    
+        
+    def is_active(self, test_date=None):
+        u"""
+        Tests whether this offer is currently active or not.
+        """
+        if not test_date:
+            test_date = datetime.date.today()
+        return self.start_date <= test_date and test_date < self.end_date
+
+    def num_products(self):
+        return self.products.count()
+
+    def apply(self):
+        u"""
+        Applies this offer to its linked products.
+        
+        The default behaviour of this method is to always
+        apply this offer, even if it makes the product more expensive.
+        This behaviour can of course customised by subclassing.
+        """
+        for product in self.products.all():
+            self._apply_discount_to_product(product)
+            
+    def _apply_discount_to_product(self, product):
+        u"""
+        Applies this offer to an individual product
+        """
+        if product.has_stockrecord:
+            discount_price = self._get_discount_price(product)
+            product.stockrecord.set_discount_price(discount_price)
+    
+    def _get_discount_price(self, product):
+        u"""
+        Returns the discounted price
+        """
+        current_price = product.stockrecord.price_excl_tax
+        if self.discount_type == ABSOLUTE_DISCOUNT:
+            price = max(Decimal('0.00'), current_price - self.discount_value)
+        elif self.discount_type == PERCENTAGE_DISCOUNT:
+            price = current_price * (1 - self.discount_value/100)
+        else:
+            price = self.discount_value
+        return price.quantize(Decimal('.01'))
+                
+
+        
+        

oscar/discount/admin.py

@@ -0,0 +1,10 @@
+from django.contrib import admin
+
+from oscar.services import import_module
+models = import_module('discount.models', ['DiscountOffer'])
+
+class DiscountOfferAdmin(admin.ModelAdmin):
+    list_display = ('name', 'discount_type', 'discount_value', 'num_products')
+    list_filter = ('discount_type',)
+
+admin.site.register(models.DiscountOffer, DiscountOfferAdmin)

oscar/discount/models.py

@@ -0,0 +1,6 @@
+from oscar.discount.abstract_models import (AbstractDiscountOffer, PERCENTAGE_DISCOUNT, 
+                                            ABSOLUTE_DISCOUNT, FINAL_PRICE)
+
+class DiscountOffer(AbstractDiscountOffer):
+    pass
+

oscar/discount/tests.py

@@ -0,0 +1,53 @@
+from decimal import Decimal as D
+import datetime
+
+from django.utils import unittest
+
+from oscar.utils import create_product
+from oscar.discount.models import DiscountOffer, PERCENTAGE_DISCOUNT, ABSOLUTE_DISCOUNT, FINAL_PRICE 
+
+
+class PercentageDiscountOfferTest(unittest.TestCase):
+    
+    def setUp(self):
+        self.offer = DiscountOffer(discount_type=PERCENTAGE_DISCOUNT,
+                                   discount_value=D('25.00'))
+    
+    def test_simple_discounted_price(self):
+        product = create_product(D('100.00'))
+        self.assertEquals(D('75.00'), self.offer._get_discount_price(product))
+        
+    def test_rounded_discounted_price(self):
+        product = create_product(D('99.99'))
+        self.assertEquals(D('74.99'), self.offer._get_discount_price(product))
+
+        
+class AbsoluteDiscountOfferTest(unittest.TestCase):
+    
+    def setUp(self):
+        self.offer = DiscountOffer(discount_type=ABSOLUTE_DISCOUNT,
+                                   discount_value=D('25.00'))
+    
+    def test_simple_discounted_price(self):
+        product = create_product(D('100.00'))
+        self.assertEquals(D('75.00'), self.offer._get_discount_price(product))
+        
+    def test_discount_larger_than_price_sets_price_to_zero(self):
+        product = create_product(D('20.00'))
+        self.assertEquals(D('0.00'), self.offer._get_discount_price(product))
+        
+    
+class FixedPriceDiscountOfferTest(unittest.TestCase):
+    
+    def setUp(self):
+        self.offer = DiscountOffer(discount_type=FINAL_PRICE,
+                                   discount_value=D('25.00'))
+    
+    def test_simple_discounted_price(self):
+        product = create_product(D('100.00'))
+        self.assertEquals(D('25.00'), self.offer._get_discount_price(product))
+        
+    def test_discounted_price_when_original_is_cheaper(self):
+        product = create_product(D('20.00'))
+        self.assertEquals(D('25.00'), self.offer._get_discount_price(product))    
+   

oscar/marketing/abstract_models.py

@@ -1,80 +0,0 @@
-from django.db import models
-from django.conf import settings
-from django.utils.translation import ugettext as _
-
-try:
-    BANNER_FOLDER = settings.OSCAR_BANNER_FOLDER
-except AttributeError: 
-    BANNER_FOLDER = 'images/banners/'
-    
-try:
-    POD_FOLDER = settings.OSCAR_POD_FOLDER
-except AttributeError: 
-    POD_FOLDER = 'images/pods/'
-
-LEFT, RIGHT = ('Left', 'Right')
-
-
-class AbstractBanner(models.Model):
-    u"""
-    A banner image linked to a particular page.
-    """
-    name = models.CharField(_("Name"), max_length=128)
-    page_url = models.CharField(_('URL'), max_length=128, db_index=True)
-    display_order = models.PositiveIntegerField(default=0)
-    link_url = models.URLField(blank=True, null=True, help_text="""This is 
-        where the banner links to""")
-    image = models.ImageField(upload_to=BANNER_FOLDER)
-    date_created = models.DateTimeField(auto_now_add=True)
-    
-    class Meta:
-        abstract = True
-        ordering = ['page_url', 'display_order']
-        get_latest_by = "date_created"
-        
-    def __unicode__(self):
-        return "%s (%s)" % (self.name, self.page_url)   
-        
-    def save(self, *args, **kwargs):
-        super(AbstractBanner, self).save(*args, **kwargs)
-        
-    @property    
-    def has_link(self):
-        return self.link_url != None    
-    
-    
-class AbstractPod(models.Model):
-    u"""
-    A pod image linked to a particular page.
-    """
-    POSITION_CHOICES = (
-        (LEFT, _("Left of page")),
-        (RIGHT, _("Right of page")),
-    )
-    
-    name = models.CharField(_("Name"), max_length=128)
-    page_url = models.CharField(_('URL'), max_length=128, db_index=True)
-    page_position = models.CharField(_("Position"), max_length=128, choices=POSITION_CHOICES)
-    display_order = models.PositiveIntegerField(default=0)
-    link_url = models.URLField(blank=True, null=True, help_text="""This is 
-        where the pod links to""")
-    image = models.ImageField(upload_to=POD_FOLDER)
-    date_created = models.DateTimeField(auto_now_add=True)
-    
-    class Meta:
-        abstract = True
-        ordering = ["page_url", "page_position", 'display_order']
-        get_latest_by = "date_created"
-        
-    def __unicode__(self):
-        return "%s (%s)" % (self.name, self.page_url)   
-        
-    def save(self, *args, **kwargs):
-        super(AbstractPod, self).save(*args, **kwargs)
-        
-    @property    
-    def has_link(self):
-        return self.link_url != None 
-
-        
-    

oscar/marketing/admin.py

@@ -1,13 +0,0 @@
-from django.contrib import admin
-
-from oscar.services import import_module
-models = import_module('marketing.models', ['Banner', 'Pod'])
-
-class BannerAdmin(admin.ModelAdmin):
-    list_display = ['page_url', 'name']
-
-class PodAdmin(admin.ModelAdmin):
-    list_display = ['page_url', 'page_position', 'name']
-
-admin.site.register(models.Banner, BannerAdmin)
-admin.site.register(models.Pod, PodAdmin)

oscar/marketing/context_processors.py

@@ -1,34 +0,0 @@
-from django.core.exceptions import ObjectDoesNotExist
-
-from oscar.services import import_module
-
-marketing_models = import_module('marketing.models', ['Banner', 'Pod'])
-
-
-def marketing(request):
-    u"""
-    For adding bindings for banners and pods to the template
-    context.
-    """
-    bindings = {
-        'url_path': request.path
-    }
-    
-    # Look for a banner
-    try:
-        banner = marketing_models.Banner._default_manager.get(page_url=request.path)
-        bindings['banner'] = banner
-    except ObjectDoesNotExist:
-        pass
-    
-    # Looks for pods
-    try:
-        pods = marketing_models.Pod._default_manager.filter(page_url=request.path)
-        bindings['pods'] = pods
-    except ObjectDoesNotExist:
-        pass
-
-    return bindings
-
-        
-    

oscar/marketing/models.py

@@ -1,10 +0,0 @@
-"""
-Vanilla marketing models
-"""
-from oscar.marketing.abstract_models import AbstractBanner, AbstractPod
-
-class Banner(AbstractBanner):
-    pass
-
-class Pod(AbstractPod):
-    pass

oscar/order/abstract_models.py

@@ -31,7 +31,9 @@ class AbstractOrder(models.Model):
     # is not mandatory.
     shipping_address = models.ForeignKey('order.ShippingAddress', null=True, blank=True)
     shipping_method = models.CharField(_("Shipping method"), max_length=128, null=True, blank=True)
-    date_placed = models.DateTimeField(auto_now_add=True)
+    
+    # Index added to this field for reporting
+    date_placed = models.DateTimeField(auto_now_add=True, db_index=True)
     
     @property
     def basket_total_incl_tax(self):
@@ -94,6 +96,9 @@ class AbstractOrder(models.Model):
     class Meta:
         abstract = True
         ordering = ['-date_placed',]
+        permissions = (
+            ("can_view", "Can view orders (eg for reporting)"),
+        )
     
     def __unicode__(self):
         return u"#%s" % (self.number,)
@@ -178,6 +183,10 @@ class AbstractLine(models.Model):
         help_text=_("This is the item number that the partner uses within their system"))
     partner_line_notes = models.TextField(blank=True, null=True)
     
+    # Estimated dispatch date - should be set at order time
+    est_dispatch_date = models.DateField(blank=True, null=True)
+    
+    
     @property
     def description(self):
         u"""

oscar/order/reports.py

@@ -0,0 +1,30 @@
+import csv
+
+from oscar.services import import_module
+report_classes = import_module('reports.reports', ['ReportGenerator'])
+order_models = import_module('order.models', ['Order'])
+
+
+class OrderReportGenerator(report_classes.ReportGenerator):
+    
+    filename_template = 'orders-%s-to-%s.csv'
+    code = 'order_report'
+    description = "Orders placed"
+    
+    def generate(self, response):
+        orders = order_models.Order._default_manager.filter(
+            date_placed__gte=self.start_date
+        ).filter(date_placed__lt=self.end_date)
+        
+        writer = csv.writer(response)
+        header_row = ['Order number',
+                      'User',
+                      'Total incl. tax',
+                      'Date placed',]
+        writer.writerow(header_row)
+        for order in orders:
+            row = [order.number, order.user, order.total_incl_tax, order.date_placed]
+            writer.writerow(row)
+            
+    def is_available_to(self, user):
+        return user.is_staff and user.has_perm('order.can_view')

oscar/order/utils.py

@@ -82,6 +82,7 @@ class OrderCreator(object):
                                       line_price_incl_tax=basket_line.line_price_incl_tax_and_discounts)
         if basket_line.product.has_stockrecord:
             order_line.partner_reference = basket_line.product.stockrecord.partner_reference
+            order_line.dispatch_date = basket_line.product.stockrecord.dispatch_date
         order_line.save()
         self._create_line_price_models(order, order_line, basket_line)
         self._create_line_attributes(order, order_line, basket_line)

oscar/product/abstract_models.py

@@ -58,19 +58,33 @@ class AbstractItem(models.Model):
     upc = models.CharField(_("UPC"), max_length=64, blank=True, null=True,
         help_text="""Universal Product Code (UPC) is an identifier for a product which is 
                      not specific to a particular supplier.  Eg an ISBN for a book.""")
+    
     # No canonical product should have a stock record as they cannot be bought.
     parent = models.ForeignKey('self', null=True, blank=True, related_name='variants',
         help_text="""Only choose a parent product if this is a 'variant' of a canonical product.  For example 
                      if this is a size 4 of a particular t-shirt.  Leave blank if this is a CANONICAL PRODUCT (ie 
                      there is only one version of this product).""")
+    
     # Title is mandatory for canonical products but optional for child products
     title = models.CharField(_('Title'), max_length=255, blank=True, null=True)
     slug = models.SlugField(max_length=255, unique=False)
     description = models.TextField(_('Description'), blank=True, null=True)
     item_class = models.ForeignKey('product.ItemClass', verbose_name=_('item class'), null=True,
         help_text="""Choose what type of product this is""")
-    attribute_types = models.ManyToManyField('product.AttributeType', through='ItemAttributeValue')
-    item_options = models.ManyToManyField('product.Option', blank=True)
+    attribute_types = models.ManyToManyField('product.AttributeType', through='ItemAttributeValue',
+        help_text="""An attribute type is something that this product MUST have, such as a size""")
+    item_options = models.ManyToManyField('product.Option', blank=True, 
+        help_text="""Options are values that can be associated with a item when it is added to 
+                     a customer's basket.  This could be something like a personalised message to be
+                     printed on a T-shirt.<br/>""")
+    
+    related_items = models.ManyToManyField('product.Item', related_name='relations', blank=True, help_text="""Related 
+        items are things like different formats of the same book.  Grouping them together allows
+        better linking betwen products on the site.<br/>""")
+    
+    # Recommended products
+    recommended_items = models.ManyToManyField('product.Item', through='ProductRecommendation', blank=True)
+    
     date_created = models.DateTimeField(auto_now_add=True)
     date_updated = models.DateTimeField(auto_now=True, null=True, default=None)
 
@@ -158,12 +172,13 @@ class AbstractItem(models.Model):
             return "%s (%s)" % (self.get_title(), self.attribute_summary())
         return self.get_title()
     
+    @models.permalink
     def get_absolute_url(self):
         u"""Return a product's absolute url"""
-        args = {'item_class_slug': self.get_item_class().slug, 
-                'item_slug': self.slug,
-                'item_id': self.id}
-        return reverse('oscar-product-item', kwargs=args)
+        return ('oscar-product-item', (), {
+            'item_class_slug': self.get_item_class().slug, 
+            'item_slug': self.slug,
+            'item_id': self.id})
     
     def save(self, *args, **kwargs):
         if self.is_top_level and not self.title:
@@ -174,6 +189,15 @@ class AbstractItem(models.Model):
         super(AbstractItem, self).save(*args, **kwargs)
 
 
+class ProductRecommendation(models.Model):
+    u"""
+    'Through' model for product recommendations
+    """
+    primary = models.ForeignKey('product.Item', related_name='primary_recommendations')
+    recommendation = models.ForeignKey('product.Item')
+    ranking = models.PositiveSmallIntegerField(default=0)
+
+
 class AbstractAttributeType(models.Model):
     u"""Defines an attribute. (Eg. size)"""
     name = models.CharField(_('name'), max_length=128)
@@ -227,8 +251,12 @@ class AbstractItemAttributeValue(models.Model):
 class AbstractOption(models.Model):
     u"""
     An option that can be selected for a particular item when the product
-    is added to the basket.  Eg a message for a SMS message.  This is not
-    the same as an attribute as options do not have a fixed value for 
+    is added to the basket.  
+    
+    Eg a list ID for an SMS message send, or a personalised message to 
+    print on a T-shirt.  
+    
+    This is not the same as an attribute as options do not have a fixed value for 
     a particular item - options, they need to be specified by the customer.
     """
     name = models.CharField(_('name'), max_length=128)
@@ -251,4 +279,6 @@ class AbstractOption(models.Model):
         if not self.code:
             self.code = _convert_to_underscores(self.name)
         super(AbstractOption, self).save(*args, **kwargs)
+    
+
     

oscar/product/admin.py

@@ -2,24 +2,31 @@ from django.contrib import admin
 
 from oscar.services import import_module
 product_models = import_module('product.models', ['Item', 'ItemClass', 'AttributeType', 
-                                                  'ItemAttributeValue', 'Option'])
+                                                  'ItemAttributeValue', 'Option', 'ProductRecommendation'])
 
 class AttributeInline(admin.TabularInline):
     model = product_models.ItemAttributeValue
 
+class ProductRecommendationInline(admin.TabularInline):
+    model = product_models.ProductRecommendation
+    fk_name = 'primary'
+
 class ItemClassAdmin(admin.ModelAdmin):
     prepopulated_fields = {"slug": ("name",)}
     
 class ItemAdmin(admin.ModelAdmin):
     list_display = ('get_title', 'upc', 'get_item_class', 'is_top_level', 'is_group', 'is_variant', 'attribute_summary', 'date_created')
     prepopulated_fields = {"slug": ("title",)}
-    inlines = [AttributeInline]
+    inlines = [AttributeInline, ProductRecommendationInline]
     
 class AttributeTypeAdmin(admin.ModelAdmin):
     prepopulated_fields = {"code": ("name",)}
+    
+class OptionAdmin(admin.ModelAdmin):
+    prepopulated_fields = {"code": ("name",)}
 
 admin.site.register(product_models.ItemClass, ItemClassAdmin)
 admin.site.register(product_models.Item, ItemAdmin)
 admin.site.register(product_models.AttributeType, AttributeTypeAdmin)
 admin.site.register(product_models.ItemAttributeValue)
-admin.site.register(product_models.Option)
+admin.site.register(product_models.Option, OptionAdmin)

oscar/product/signals.py

@@ -1,3 +1,4 @@
 import django.dispatch
 
-product_viewed = django.dispatch.Signal(providing_args=["product", "user", "request", "response"])
+product_viewed = django.dispatch.Signal(providing_args=["product", "user", "request", "response"])
+product_search = django.dispatch.Signal(providing_args=["query", '"user'])

oscar/product/views.py

@@ -9,7 +9,7 @@ from django.views.generic import ListView, DetailView
 from oscar.services import import_module
 
 product_models = import_module('product.models', ['Item', 'ItemClass'])
-product_signals = import_module('product.signals', ['product_viewed'])
+product_signals = import_module('product.signals', ['product_viewed', 'product_search'])
 basket_forms = import_module('basket.forms', ['FormFactory'])
 history_helpers = import_module('customer.history_helpers', ['receive_product_view'])
 
@@ -80,6 +80,9 @@ class ProductListView(ListView):
         u"""Return a set of prodcuts"""
         q = self.get_search_query()
         if q:
+            # Send signal to record the view of this product
+            product_signals.product_search.send(sender=self, query=q, user=self.request.user)
+            
             return product_models.Item.browsable.filter(title__icontains=q)
         else:
             return product_models.Item.browsable.all()

oscar/promotions/abstract_models.py

@@ -0,0 +1,129 @@
+from django.db import models
+from django.conf import settings
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+
+BANNER_FOLDER = getattr(settings, 'OSCAR_BANNER_FOLDER', 'images/promotions/banners')
+POD_FOLDER = getattr(settings, 'OSCAR_POD_FOLDER', 'images/promotions/pods')
+
+BANNER, LEFT_POD, RIGHT_POD = ('Banner', 'Left pod', 'Right pod')
+POSITION_CHOICES = (
+    (BANNER, _("Banner")),
+    (LEFT_POD, _("Pod on left-hand side of page")),
+    (RIGHT_POD, _("Pod on right-hand side of page")),
+)
+
+class AbstractPromotion(models.Model):
+    u"""
+    A promotion model.
+
+    This is effectively a link for directing users to different parts of the site.
+    It can have two images associated with it.
+
+    """
+    name = models.CharField(_("Name"), max_length=128)
+    link_url = models.URLField(blank=True, null=True, help_text="""This is 
+        where this promotion links to""")
+
+    # Three ways of supplying the content
+    banner_image = models.ImageField(upload_to=BANNER_FOLDER, blank=True, null=True)
+    pod_image = models.ImageField(upload_to=BANNER_FOLDER, blank=True, null=True)
+    raw_html = models.TextField(blank=True, null=True)
+
+    date_created = models.DateTimeField(auto_now_add=True)
+
+    _proxy_link_url = None
+
+    class Meta:
+        abstract = True
+        ordering = ['date_created']
+        get_latest_by = "date_created"
+        
+    def __unicode__(self):
+        if not self.link_url:
+            return self.name
+        return "%s (%s)" % (self.name, self.link_url)   
+        
+    def save(self, *args, **kwargs):
+        # @todo check that at least one of the three content fields is set
+        super(AbstractPromotion, self).save(*args, **kwargs)
+    
+    def set_proxy_link(self, url):
+        self._proxy_link_url = url    
+        
+    @property    
+    def has_link(self):
+        return self.link_url != None    
+
+    def get_banner_html(self):
+        return self._get_html('banner_image')
+
+    def get_pod_html(self):
+        return self._get_html('pod_image')
+
+    def get_raw_html(self):
+        return self.raw_html
+
+    def _get_html(self, image_field):
+        if self.raw_html:
+            return self.raw_html
+        try:
+            image = getattr(self, image_field)
+            if self.link_url and self._proxy_link_url:
+                return '<a href="%s"><img src="%s" alt="%s" /></a>' % (self._proxy_link_url, image.url, self.name)
+            return '<img src="%s" alt="%s" />' % (image.url, self.name)
+        except AttributeError:
+            return ''
+
+
+class LinkedPromotion(models.Model):
+
+    promotion = models.ForeignKey('promotions.Promotion')
+    position = models.CharField(_("Position"), max_length=100, help_text="Position on page", choices=POSITION_CHOICES)
+    display_order = models.PositiveIntegerField(default=0)
+    clicks = models.PositiveIntegerField(default=0)
+    date_created = models.DateTimeField(auto_now_add=True)
+
+    class Meta:
+        abstract = True
+        ordering = ['-clicks']
+
+    def record_click(self):
+        self.clicks += 1
+        self.save()
+
+
+class AbstractPagePromotion(LinkedPromotion):
+    u"""
+    A promotion embedded on a particular page.
+    """
+    page_url = models.CharField(_('URL'), max_length=128, db_index=True)
+
+    class Meta:
+        abstract = True
+
+    def __unicode__(self):
+        return u"%s on %s" % (self.promotion, self.page_url)
+    
+    def get_link(self):
+        return reverse('oscar-page-promotion-click', kwargs={'page_promotion_id': self.id})
+        
+    
+class AbstractKeywordPromotion(LinkedPromotion):
+    u"""
+    A promotion linked to a specific keyword.
+
+    This can be used on a search results page to show promotions
+    linked to a particular keyword.
+    """
+
+    keyword = models.CharField(_("Keyword"), max_length=200)
+
+    class Meta:
+        abstract = True
+
+    def get_link(self):
+        return reverse('oscar-keyword-promotion-click', kwargs={'keyword_promotion_id': self.id})
+
+    
+

oscar/promotions/admin.py

@@ -0,0 +1,19 @@
+from django.contrib import admin
+
+from oscar.services import import_module
+models = import_module('promotions.models', ['Promotion', 'PagePromotion', 'KeywordPromotion'])
+
+class PromotionAdmin(admin.ModelAdmin):
+    pass
+
+class PagePromotionAdmin(admin.ModelAdmin):
+    list_display = ['page_url', 'position', 'clicks']
+    readonly_fields = ['clicks']
+
+class KeywordPromotionAdmin(admin.ModelAdmin):
+    list_display = ['keyword', 'position', 'clicks']
+    readonly_fields = ['clicks']
+
+admin.site.register(models.Promotion, PromotionAdmin)
+admin.site.register(models.PagePromotion, PagePromotionAdmin)
+admin.site.register(models.KeywordPromotion, KeywordPromotionAdmin)

oscar/promotions/context_processors.py

@@ -0,0 +1,46 @@
+from itertools import chain
+
+from django.core.exceptions import ObjectDoesNotExist
+
+from oscar.promotions.abstract_models import BANNER, LEFT_POD, RIGHT_POD
+from oscar.services import import_module
+
+promotion_models = import_module('promotions.models', ['PagePromotion', 'KeywordPromotion'])
+
+
+def promotions(request):
+    u"""
+    For adding bindings for banners and pods to the template
+    context.
+    """
+    bindings = {
+        'url_path': request.path
+    }
+    promotions = promotion_models.PagePromotion._default_manager.select_related().filter(page_url=request.path)
+
+    if 'q' in request.GET:
+        keyword_promotions = promotion_models.KeywordPromotion._default_manager.select_related().filter(keyword=request.GET['q'])
+        if keyword_promotions.count() > 0:
+            promotions = list(chain(promotions, keyword_promotions))
+
+    bindings['banners'], bindings['left_pods'], bindings['right_pods'] = _split_by_position(promotions)
+
+    return bindings
+
+def _split_by_position(linked_promotions):
+    # We split the queries into 3 sets based on the position field
+    banners, left_pods, right_pods = [], [], []
+    for linked_promotion in linked_promotions:
+        promotion = linked_promotion.promotion
+        if linked_promotion.position == BANNER:
+            banners.append(promotion)
+        elif linked_promotion.position == LEFT_POD:
+            left_pods.append(promotion)
+        elif linked_promotion.position == RIGHT_POD:
+            right_pods.append(promotion)
+        promotion.set_proxy_link(linked_promotion.get_link())    
+    return banners, left_pods, right_pods        
+
+
+        
+    

oscar/promotions/models.py

@@ -0,0 +1,16 @@
+"""
+Vanilla promotion models
+"""
+from oscar.promotions.abstract_models import AbstractPromotion, AbstractPagePromotion, AbstractKeywordPromotion
+
+
+class Promotion(AbstractPromotion):
+    pass
+
+
+class PagePromotion(AbstractPagePromotion):
+    pass
+
+
+class KeywordPromotion(AbstractKeywordPromotion):
+    pass

oscar/promotions/tests.py

@@ -0,0 +1,22 @@
+from django.utils import unittest
+
+from oscar.promotions.models import * 
+
+
+class PromotionTest(unittest.TestCase):
+
+    def test_promotion_cannot_be_saved_without_content(self):
+        pass
+
+
+class PagePromotionTest(unittest.TestCase):
+    
+    def setUp(self):
+        pass
+    
+    def test_click_is_recorded(self):
+        promotion = Promotion.objects.create(name="Dummy promotion")
+        promotion.record_click()
+        self.assertTrue(1, promotion.clicks)
+
+

oscar/promotions/urls.py

@@ -0,0 +1,6 @@
+from django.conf.urls.defaults import *
+
+urlpatterns = patterns('oscar.promotions.views',
+    url(r'page-redirect/(?P<page_promotion_id>\d+)/$', 'page_promotion_click', name='oscar-page-promotion-click'),
+    url(r'keyword-redirect/(?P<keyword_promotion_id>\d+)/$', 'keyword_promotion_click', name='oscar-keyword-promotion-click'),
+)

oscar/promotions/views.py

@@ -0,0 +1,24 @@
+from django.http import HttpResponseRedirect, Http404
+from django.shortcuts import get_object_or_404
+
+from oscar.services import import_module
+
+promotions_models = import_module('promotions.models', ['PagePromotion', 'KeywordPromotion'])
+
+
+def page_promotion_click(request, page_promotion_id):
+    u"""Records a click-through on a promotion"""
+    page_prom = get_object_or_404(promotions_models.PagePromotion, id=page_promotion_id)
+    if page_prom.promotion.has_link:
+        page_prom.record_click()
+        return HttpResponseRedirect(page_prom.promotion.link_url)
+    return Http404()
+    
+def keyword_promotion_click(request, keyword_promotion_id):
+    u"""Records a click-through on a promotion"""
+    keyword_prom = get_object_or_404(promotions_models.KeywordPromotion, id=keyword_promotion_id)
+    if keyword_prom.promotion.has_link:
+        keyword_prom.record_click()
+        return HttpResponseRedirect(keyword_prom.promotion.link_url)
+    return Http404()
+

oscar/reports/forms.py

@@ -0,0 +1,23 @@
+from datetime import date, datetime
+
+from django import forms
+
+from oscar.services import import_module
+report_utils = import_module('reports.utils', ['GeneratorRepository'])
+
+class ReportForm(forms.Form):
+    
+    generators = report_utils.GeneratorRepository().get_report_generators()
+    
+    type_choices = []
+    for generator in generators:
+        type_choices.append((generator.code, generator.description))
+    report_type = forms.ChoiceField(widget=forms.Select(), choices=type_choices)
+    start_date = forms.DateField(widget=forms.widgets.DateInput(format="%d/%m/%Y"))
+    end_date = forms.DateField(widget=forms.widgets.DateInput(format="%d/%m/%Y"))
+    
+    def clean(self):
+        if 'start_date' in self.cleaned_data and 'end_date' in self.cleaned_data and self.cleaned_data['start_date'] > self.cleaned_data['end_date']:
+            raise forms.ValidationError("Your start date must be before your end date")
+        return self.cleaned_data
+   

oscar/reports/reports.py

@@ -0,0 +1,30 @@
+class ReportGenerator(object):
+    u"""
+    Top-level class that needs to be subclassed to provide a 
+    report generator.
+    """
+    
+    filename_template = 'report-%s-to-%s.csv'
+    mimetype = 'text/csv'
+    code = ''
+    description = '<insert report description>'
+    
+    def __init__(self, **kwargs):
+        if 'start_date' in kwargs and 'end_date' in kwargs:
+            self.start_date = kwargs['start_date']
+            self.end_date = kwargs['end_date']
+    
+    def generate(self, response):
+        pass
+ 
+    def filename(self):
+        u"""
+        Returns the filename for this report
+        """
+        return self.filename_template % (self.start_date, self.end_date)
+    
+    def is_available_to(self, user):
+        u"""
+        Checks whether this report is available to this user
+        """
+        return user.is_staff

oscar/reports/urls.py

@@ -0,0 +1,5 @@
+from django.conf.urls.defaults import *
+
+urlpatterns = patterns('oscar.reports.views',
+    url(r'^$', 'dashboard', name='oscar-report-dashboard'),
+)

oscar/reports/utils.py

@@ -0,0 +1,24 @@
+from oscar.services import import_module
+order_reports = import_module('order.reports', ['OrderReportGenerator'])
+analytics_reports = import_module('analytics.reports', ['ProductReportGenerator', 'UserReportGenerator'])
+basket_reports = import_module('basket.reports', ['OpenBasketReportGenerator', 'SubmittedBasketReportGenerator'])     
+
+
+class GeneratorRepository(object):
+    
+    generators = [order_reports.OrderReportGenerator,
+                  analytics_reports.ProductReportGenerator,
+                  analytics_reports.UserReportGenerator,
+                  basket_reports.OpenBasketReportGenerator,
+                  basket_reports.SubmittedBasketReportGenerator,]
+
+    def get_report_generators(self):
+        return self.generators
+    
+    def get_generator(self, code):
+        for generator in self.generators:
+            if generator.code == code:
+                return generator
+        return None
+    
+    

oscar/reports/views.py

@@ -0,0 +1,33 @@
+from django.http import HttpResponse, HttpResponseForbidden, Http404
+from django.shortcuts import render
+
+from oscar.services import import_module
+report_forms = import_module('reports.forms', ['ReportForm'])
+report_utils = import_module('reports.utils', ['GeneratorRepository'])
+
+def dashboard(request):
+    if 'report_type' in request.GET:
+        form = report_forms.ReportForm(request.GET)
+        if form.is_valid():
+            generator = _get_generator(form)
+            if not generator.is_available_to(request.user):
+                return HttpResponseForbidden("You do not have access to this report")
+            
+            response = HttpResponse(mimetype=generator.mimetype)
+            response['Content-Disposition'] = 'attachment; filename=%s' % generator.filename()
+            generator.generate(response)
+            return response
+    else:
+        form = report_forms.ReportForm()
+    return render(request, 'reports/dashboard.html', locals())
+
+
+def _get_generator(form):
+    code = form.cleaned_data['report_type']
+
+    repo = report_utils.GeneratorRepository()
+    generator_cls = repo.get_generator(code)
+    if not generator_cls:
+        raise Http404
+    return generator_cls(start_date=form.cleaned_data['start_date'], 
+                         end_date=form.cleaned_data['end_date'])

oscar/shipping/abstract_models.py

@@ -27,6 +27,9 @@ class AbstractOrderAndItemLevelChargeMethod(models.Model, ShippingMethod):
     price_per_order = models.DecimalField(decimal_places=2, max_digits=12, default=Decimal('0.00'))
     price_per_item = models.DecimalField(decimal_places=2, max_digits=12, default=Decimal('0.00'))
     
+    # If basket value is above this threshold, then shipping is free
+    free_shipping_threshold = models.DecimalField(decimal_places=2, max_digits=12, null=True)
+    
     _basket = None
     
     def save(self, *args, **kwargs):
@@ -47,6 +50,9 @@ class AbstractOrderAndItemLevelChargeMethod(models.Model, ShippingMethod):
         u"""
         Return basket total including tax
         """
+        if self.free_shipping_threshold != None and self._basket.total_incl_tax >= self.free_shipping_threshold:
+            return Decimal('0.00')
+        
         charge = self.price_per_order
         for line in self._basket.lines.all():
             charge += line.quantity * self.price_per_item

oscar/shipping/tests.py

@@ -51,3 +51,40 @@ class OrderAndItemLevelChargeMethodTest(unittest.TestCase):
         p = create_product()
         self.basket.add_product(p, 7)
         self.assertEquals(D('5.00') + 7*D('1.00'), self.method.basket_charge_incl_tax())
+
+class ZeroFreeShippingThresholdTest(unittest.TestCase):
+    
+    def setUp(self):
+        self.method = OrderAndItemLevelChargeMethod(price_per_order=D('10.00'), free_shipping_threshold=D('0.00'))
+        self.basket = Basket.objects.create()
+        self.method.set_basket(self.basket)
+    
+    def test_free_shipping_with_empty_basket(self):
+        self.assertEquals(D('0.00'), self.method.basket_charge_incl_tax())
+        
+    def test_free_shipping_with_nonempty_basket(self):
+        p = create_product(D('5.00'))
+        self.basket.add_product(p)
+        self.assertEquals(D('0.00'), self.method.basket_charge_incl_tax())
+
+class NonZeroFreeShippingThresholdTest(unittest.TestCase):
+    
+    def setUp(self):
+        self.method = OrderAndItemLevelChargeMethod(price_per_order=D('10.00'), free_shipping_threshold=D('20.00'))
+        self.basket = Basket.objects.create()
+        self.method.set_basket(self.basket)
+        
+    def test_basket_below_threshold(self):
+        p = create_product(D('5.00'))
+        self.basket.add_product(p)
+        self.assertEquals(D('10.00'), self.method.basket_charge_incl_tax())
+        
+    def test_basket_on_threshold(self):
+        p = create_product(D('5.00'))
+        self.basket.add_product(p, 4)
+        self.assertEquals(D('0.00'), self.method.basket_charge_incl_tax())
+        
+    def test_basket_above_threshold(self):
+        p = create_product(D('5.00'))
+        self.basket.add_product(p, 8)
+        self.assertEquals(D('0.00'), self.method.basket_charge_incl_tax())

oscar/stock/abstract_models.py

@@ -1,6 +1,5 @@
-"""
-Models for the stock and fulfillment components of an project
-"""
+import datetime
+
 from django.conf import settings
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
@@ -34,7 +33,10 @@ class AbstractStockRecord(models.Model):
     # We deliberately don't store tax information to allow each project
     # to subclass this model and put its own fields for convey tax.
     price_currency = models.CharField(max_length=12, default=settings.OSCAR_DEFAULT_CURRENCY)
-    # This is the base price for calculations
+    
+    # This is the base price for calculations - tax should be applied 
+    # by the appropriate method.  We don't store it here as its calculation is 
+    # highly domain-specific.
     price_excl_tax = models.DecimalField(decimal_places=2, max_digits=12)
     
     # Cost price is optional as not all partner supply it
@@ -54,6 +56,17 @@ class AbstractStockRecord(models.Model):
         self.num_allocated += delta
         self.save()
         
+    def set_discount_price(self, price):
+        u"""
+        A setter method for setting a new price.  
+        
+        This is called from within the "discount" app, which is responsible
+        for applying fixed-discount offers to products.  We use a setter method
+        so that this behaviour can be customised in projects.
+        """
+        self.price_excl_tax = price
+        self.save()
+        
     # Price retrieval methods - these default to no tax being applicable
     # These are intended to be overridden.   
     
@@ -64,6 +77,17 @@ class AbstractStockRecord(models.Model):
             return _("In stock (%d available)" % self.num_in_stock)
         return _("Out of stock")
     
+    @property
+    def dispatch_date(self):
+        u"""
+        Returns the estimated dispatch date for a line
+        """
+        if self.num_in_stock:
+            # Assume next day for in-stock items
+            return datetime.date.today() + datetime.timedelta(days=1)
+        # Assume one week for out-of-stock items
+        return datetime.date.today() + datetime.timedelta(days=7)
+    
     @property 
     def price_incl_tax(self):
         u"""Return a product's price including tax"""
@@ -72,7 +96,6 @@ class AbstractStockRecord(models.Model):
     @property 
     def price_tax(self):
         u"""Return a product's tax value"""
-        #TODO?
         return 0
         
     def __unicode__(self):

oscar/stock/admin.py

@@ -4,7 +4,8 @@ from oscar.services import import_module
 models = import_module('stock.models', ['Partner', 'StockRecord'])
 
 class StockRecordAdmin(admin.ModelAdmin):
-    pass
+    list_display = ('product', 'partner', 'partner_reference', 'price_excl_tax', 'cost_price', 'num_in_stock')
+    list_filter = ('partner',)
     
 admin.site.register(models.Partner)
 admin.site.register(models.StockRecord, StockRecordAdmin)

oscar/templates/basket/summary.html

@@ -10,7 +10,7 @@
 {% block content %}
 
 {% if basket.is_empty %}
-Your basket is currently empty - go and <a href="/shop/product/">buy something</a>!
+Your basket is currently empty - go and <a href="{% url oscar-products %}">buy something</a>!
 {% else %}
 
 <h3>To buy now</h3>

oscar/templates/checkout/thank_you.html

@@ -15,15 +15,15 @@
 <table>
     <tr>
         <th>Product</th>
-        <th>Availability</th>
+        <th>Estimated dispatch date</th>
         <th>Quantity</th>
         <th>Line price excl tax</th>
         <th>Line price incl tax</th>
     </tr>
-    {% for batch in order.lines.all %}
+    {% for line in order.lines.all %}
     <tr>
         <td><a href="{{ line.product.get_absolute_url }}">{{ line.description }}</a></td>
-        <td>{{ line.product.stockrecord.availability }}</td>
+        <td>{{ line.est_dispatch_date }}</td>
         <td>{{ line.quantity }}</td>
         <td>{{ line.line_price_excl_tax|currency }}</td>
         <td>{{ line.line_price_incl_tax|currency }}</td>
@@ -44,6 +44,6 @@
         <td>{{ order.total_incl_tax|currency }}</td>
     </tr>
 </table>
-
+ 
 {% endblock content %}
 

oscar/templates/layout.html

@@ -17,24 +17,11 @@
             <a href="">Login</a>
             {% endif %}
             
-            {% if banner %}
-                {% if banner.has_link %}
-                    <a href="{{ banner.link_url }}" title="{{ banner.name }}"><img src="{{ banner.image.url }}" alt="{{ banner.name }}" /></a>
-                {% else %}
-                    <img src="{{ banner.image.url }}" alt="{{ banner.name }}" />
-                {% endif %}
-            {% endif %}
-            
-            {% if pods %}
-                {% for pod in pods %}
-                    {% if pod.has_link %}
-                        <a href="{{ pod.link_url }}" title="{{ pod.name }}"><img src="{{ pod.image.url }}" alt="{{ pod.name }}" /></a>
-                    {% else %}
-                        <img src="{{ pod.image.url }}" alt="{{ pod.name }}" />
-                    {% endif %}
-                {% endfor %}
-            {% endif %}
-            <a href="/admin/marketing/pod/add/?page_url={{ url_path }}" >Add a pod to this page</a>
+            {% for banner in banners %}
+                {{ banner.get_banner_html|safe }}
+            {% endfor %}
+
+            <a href="/admin/promotions/pagepromotion/add/?page_url={{ url_path }}" >Add a promotion to this page</a>
             
             {% block header %}
             {% endblock %}

oscar/templates/layout_admin.html

@@ -0,0 +1,14 @@
+{% extends "base.html" %}
+
+{% block layout %}
+    <div id="container">
+        <div id="header">
+            <h1>Oscar // Flexible e-commerce for Django</h1>
+            {% block header %}{% endblock header %}
+        </div>
+        <div id="content">
+            {% block content %}{% endblock %}
+        </div>
+        <div id="footer">{% block footer %}{% endblock %}</div>
+    </div>
+{% endblock %}

oscar/templates/product/item.html

@@ -16,7 +16,6 @@
     {% endfor %}
 </div>
 
-
 <table>
     <caption>Product details</caption>
     <tr>
@@ -61,5 +60,27 @@
 
 {% recently_viewed_products %}
 
+{% if item.related_items.count %}
+<div class="products">
+    <h4>Related items</h4>
+    <ul>
+    {% for product in item.related_items.all %}
+        <li><a href="{{ product.get_absolute_url }}">{{ product.get_title }}</a>
+    {% endfor %}
+    </ul>
+</div>
+{% endif %}
+
+{% if item.recommended_items.count %}
+<div class="products">
+    <h4>Recommended items</h4>
+    <ul>
+    {% for product in item.recommended_items.all %}
+        <li><a href="{{ product.get_absolute_url }}">{{ product.get_title }}</a>
+    {% endfor %}
+    </ul>
+</div>
+{% endif %}
+
 {% endblock content %}
 

oscar/templates/reports/dashboard.html

@@ -0,0 +1,19 @@
+{% extends "layout_admin.html" %}
+
+{% load currency_filters %}
+
+{% block header %}
+<h2>Reporting dashboard</h2>
+{% endblock header %}
+
+
+{% block content %}
+
+<form method="GET" action="{% url oscar-report-dashboard %}">
+
+    {{ form.as_p }} 
+    <input type="submit" value="Generate report" />
+</form>
+
+{% endblock content %}
+

oscar/templatetags/currency_filters.py

@@ -14,4 +14,7 @@ def currency(value):
     except AttributeError:
         locale.setlocale(locale.LC_ALL, '')
     loc = locale.localeconv()
-    return locale.currency(value, loc['currency_symbol'], grouping=True)
+    try:
+        return locale.currency(value, loc['currency_symbol'], grouping=True)
+    except TypeError:
+        return ''

oscar/tests.py

@@ -12,6 +12,7 @@ from oscar.payment.tests import *
 from oscar.offer.tests import *
 from oscar.shipping.tests import *
 from oscar.customer.tests import *
+from oscar.discount.tests import *
 
 from oscar.services import import_module, AppNotFoundError
 

oscar/urls.py

@@ -9,6 +9,8 @@ urlpatterns = patterns('',
     (r'checkout/', include('oscar.checkout.urls')),
     (r'order-management/', include('oscar.order_management.urls')),
     (r'accounts/', include('oscar.customer.urls')),
+    (r'promotions/', include('oscar.promotions.urls')),
+    (r'reports/', include('oscar.reports.urls')),
     (r'^$', home),     
 )
 

setup.py

@@ -2,8 +2,8 @@ from setuptools import setup
 
 setup(name='django-oscar',
       version='0.1.0',
-      url='https://github.com/codeinthehole/django-oscar',
-      description="A flexible ecommerce application for Django",
+      url='https://github.com/tangentlabs/django-oscar',
+      description="Domain-driven ecommerce for Django",
       author="David Winterbottom",
       author_email="david.winterbottom@tangentlabs.co.uk",
       package_dir={'': '.'},