Updated models so syncdb will run but everything still imcomplete

IDEAS

@@ -0,0 +1 @@
+Record ideas about the project here...

README.md

@@ -0,0 +1,12 @@
+# Oscar - Ecommerce on Django
+
+Named after Oscar Peterson (http://en.wikipedia.org/wiki/Oscar_Peterson), oscar is a Django implementation
+of Taoshop (a product from Tangent Labs).  It's fairly experimental at the moment.
+
+## Installation
+Do the following from your workspace folder:
+    mkdir oscar
+	cd oscar
+    mkvirtualenv --no-site-packages oscar
+After download your fork, install all dependencies:
+	pip install -r requirements.txt

basket/models.py

@@ -1,6 +1,32 @@
+from django.contrib.auth.models import User
 from django.db import models
+from django.utils.translation import ugettext as _
 
 
 class Basket(models.Model):
-    owner = models.ForeignKey('auth.User')
-    status = models.CharField(max_length)
+    """
+    Main basket object
+    """
+    OPEN, MERGED, SUBMITTED = ("Open", "Merged", "Submitted")
+    STATUS_CHOICES = (
+        (OPEN, _("Open - currently active")),
+        (APPROVED, _("Merged - superceded by another basket")),
+        (REJECTED, _("Submitted - has been ordered at the checkout")),
+    )
+    
+    owner = models.ForeignKey(User, related_name='baskets')
+    status = models.CharField(default=OPEN, choices=STATUS_CHOICES)
+    created_date = models.DateTimeField(auto_now_add=True)
+    
+    
+class Line(models.Model):
+    basket = models.ForeignKey('basket.Basket', related_name='lines')
+    product = models.ForeignKey('product.Item')
+    vouchers = models.ManyToManyField('offer.Voucher')
+    
+    
+class LineAttribute(models.Model):
+    line = models.ForeignKey('basket.Line', related_name='attributes')
+    type = models.CharField(max_length=128)
+    value = models.CharField(max_length=255)    
+    

offer/models.py

@@ -1,3 +1,9 @@
+from django.contrib.auth.models import User
 from django.db import models
+from django.utils.translation import ugettext as _
 
-# Create your models here.
+class Voucher(models.Model):
+    code = models.CharField(max_length=128)
+    start_date = models.DateField()
+    end_date = models.DateField()
+    created_date = models.DateTimeField(auto_now_add=True)

order/models.py

@@ -1,11 +1,12 @@
 from django.db import models
-from django.contrib.auth import User
+from django.contrib.auth.models import User
 
 class Order(models.Model):
     """
     An order
     """
     customer = models.ForeignKey(User, related_name='orders')
+    total_incl_tax = models.FloatField()
     
     
     def __unicode__(self):
@@ -15,16 +16,16 @@ class Order(models.Model):
         return description
 
     
-class Batch(models.Model):
-    order = models.ForeignKey('order.Order')
-    partner = models.CharField(max_length=255)
-    delivery_method = models.CharField(max_length=128)
-    # Not all batches are actually delivered (such as downloads)
-    delivery_address = models.ForeignKey('order.Address', null=True, blank=True)
-    # Whether the batch should be dispatched in one go, or as they become available
-    dispatch_option = models.CharField(max_length=128, null=True, blank=True)
-
-
-class BatchLine(models.Model):
-    batch = models.ForeignKey('order.Batch')
+#class Batch(models.Model):
+#    order = models.ForeignKey('order.Order')
+#    partner = models.CharField(max_length=255)
+#    delivery_method = models.CharField(max_length=128)
+#    # Not all batches are actually delivered (such as downloads)
+#    delivery_address = models.ForeignKey('order.Address', null=True, blank=True)
+#    # Whether the batch should be dispatched in one go, or as they become available
+#    dispatch_option = models.CharField(max_length=128, null=True, blank=True)
+#
+#
+#class BatchLine(models.Model):
+#    batch = models.ForeignKey('order.Batch')
     

payment/models.py

@@ -1,4 +1,6 @@
+from django.contrib.auth.models import User
 from django.db import models
+from django.utils.translation import ugettext as _
 
 
 class Source(models.Model):
@@ -25,7 +27,7 @@ class Source(models.Model):
     
 class Transaction(models.Model):
     """
-    A transaction for payment sources which need a secondary 'transaction' to take the money
+    A transaction for payment sources which need a secondary 'transaction' to actually take the money
     
     This applies mainly to credit card sources which can be a pre-auth for the money.  A 'complete'
     needs to be run later to debit the money from the account.

product/models.py

@@ -1,9 +1,11 @@
 from django.db import models
 
 class Item(models.Model):
+    title = models.CharField(max_length=255)
     pass
 
-class Stock(models.Model):
+
+class StockRecord(models.Model):
     product = models.ForeignKey('product.Item')
     price_excl_tax = models.FloatField()
     tax = models.FloatField()

requirements.txt

@@ -1,6 +1,7 @@
 Django==1.2.3
 MySQL-python==1.2.3
 South==0.7.3
+django-extensions==0.5
+ipython==0.10.1
 wsgiref==0.1.2
 yolk==0.4.1
-django_extensions==0.5

settings.py

@@ -89,8 +89,15 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.sites',
     'django.contrib.messages',
-    # Uncomment the next line to enable the admin:
-    # 'django.contrib.admin',
-    # Uncomment the next line to enable admin documentation:
-    # 'django.contrib.admindocs',
+    'django.contrib.admin',
+    'django_extensions',
+    'south',
+    'payment',
+    'order',
 )
+
+# Local overrides
+try:
+    from local_settings import *
+except ImportError:
+    pass