Added some basic price/tax calculation methods to the core stock record.

This seems to be a simpler and better place for the price calculation at
the moment.  We could introduce a calculator object at some point to
separate the responsibilities.

oscar/product/abstract_models.py

@@ -6,6 +6,7 @@ import re
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
+from oscar.services import get_price_calculator
 
 def _convert_to_underscores(str):
     """

oscar/product/models.py

@@ -8,7 +8,7 @@ class ItemClass(AbstractItemClass):
 
 class Item(AbstractItem):
     pass
-
+    
 class AttributeType(AbstractAttributeType):
     pass
 

oscar/product/templates/item.html

@@ -15,7 +15,13 @@
         <th>Product class</th><td>{{item.product_class.name}}</td>
     </tr>
     <tr>
-        <th>Price (excl. tax)</th><td>{{item.stockrecord.price_excl_tax}}</td>
+        <th>Price (excl. tax)</th><td>{{item.stockrecord.get_price_incl_tax}}</td>
+    </tr>
+    <tr>
+        <th>Price (incl. tax)</th><td>{{item.stockrecord.get_price_excl_tax}}</td>
+    </tr>
+    <tr>
+        <th>RRP</th><td>{{item.stockrecord.price_excl_tax}}</td>
     </tr>
     <tr>
         <th>Number in stock</th>

oscar/product/tests.py

@@ -17,7 +17,6 @@ class TopLevelItemTests(ItemTests):
     
     def test_top_level_products_must_have_titles(self):
         self.assertRaises(ValidationError, Item.objects.create, item_class=self.item_class)
-  
         
 class VariantItemTests(ItemTests):
     

oscar/stock/abstract_models.py

@@ -34,16 +34,30 @@ 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='GBP')
+    # This is the base price for calculations
     price_excl_tax = models.DecimalField(decimal_places=2, max_digits=12)
-    price_retail_excl_tax = models.DecimalField(decimal_places=2, max_digits=12)
     
     # Stock level information
-    num_in_stock = models.IntegerField()
+    num_in_stock = models.IntegerField(default=0)
     num_allocated = models.IntegerField(default=0)
     
     class Meta:
         abstract = True
         
+    # Price retrieval methods - these default to no tax being applicable
+    # These are intended to be overridden.    
+    def get_price_incl_tax(self):
+        return self.get_price_excl_tax()
+    
+    def get_price_excl_tax(self):
+        return self.price_excl_tax
+    
+    def get_price_tax(self):
+        return 0
+    
+    def get_rrp(self):
+        return self.get_price_incl_tax()    
+        
     def __unicode__(self):
         if self.partner_reference:
             return "%s (%s): %s" % (self.partner.name, self.partner_reference, self.product.title)

oscar/stock/tests.py

@@ -0,0 +1,27 @@
+import unittest
+from decimal import Decimal as D
+
+from django.test import TestCase
+from django.core.exceptions import ValidationError
+
+from oscar.product.models import Item, ItemClass
+from oscar.stock.models import Partner, StockRecord
+
+
+class StockRecordTests(unittest.TestCase):
+
+    def setUp(self):
+        item_class = ItemClass.objects.create(name='Dummy item class')
+        p = Item.objects.create(title="Dummy product", item_class=item_class)
+        partner = Partner.objects.create(name='Dummy partner')
+        self.record = StockRecord.objects.create(product=p, partner_reference='dummy_ref_123', partner=partner,
+                                                 price_excl_tax=D('10.00'))
+   
+    def test_get_price_incl_tax_defaults_to_no_tax(self):
+        self.assertEquals(D('10.00'), self.record.get_price_incl_tax())
+        
+    def test_get_price_excl_tax_returns_correct_value(self):
+        self.assertEquals(D('10.00'), self.record.get_price_excl_tax())
+        
+    def test_get_rrp_defaults_to_no_tax_price(self):
+        self.assertEquals(D('10.00'), self.record.get_rrp())

oscar/tests.py

@@ -5,6 +5,7 @@ from django.test import TestCase
 from oscar.basket.tests import *
 from oscar.order.tests import *
 from oscar.product.tests import *
+from oscar.stock.tests import *
 
 from oscar.services import import_module, AppNotFoundError