First pull request

orders/admin.py

@@ -1,3 +1,7 @@
 from django.contrib import admin
 
 # Register your models here.
+from orders.models import *
+
+
+admin.site.register([Order,OrderItem])

orders/forms.py

@@ -0,0 +1,16 @@
+__author__ = 'atmchugh'
+from django import forms
+from django.forms import Form, ModelForm, CharField,RadioSelect,CheckboxInput,Select,TextInput, HiddenInput, Textarea, SelectMultiple,DateTimeInput, DateTimeField, DateField, DateInput, ModelChoiceField,ModelMultipleChoiceField
+from models import *
+
+class OrderForm(ModelForm):
+    class Meta:
+        model = Order
+        exclude = ['',]
+
+
+class OrderItemForm(ModelForm):
+    class Meta:
+        model = OrderItem
+        exclude = ['',]
+        #exclude = ['order',]

orders/models.py

@@ -1,5 +1,5 @@
 from django.db import models
-
+from django.utils import timezone
 
 class Order(models.Model):
     FCM = 'FCM'
@@ -10,7 +10,9 @@ class Order(models.Model):
     )
     shipping_method = models.CharField(max_length=100, choices=SHIPPING_CHOICES)
     date_completed = models.DateTimeField()
-
+    def __unicode__(self):
+        arr=[str(self.id),self.shipping_method]
+        return ','.join(arr)
 
 class OrderItem(models.Model):
     XS = 'XS'
@@ -30,4 +32,6 @@ class OrderItem(models.Model):
     priority = {'XS': 0, 'S': 1, 'M': 2, 'L': 3, 'XL': 4, 'XXL': 5}
     order = models.ForeignKey(Order, related_name='items')
     product = models.CharField(max_length=100, choices=PRODUCT_CHOICES)
-    quantity = models.PositiveIntegerField(default=1)
+    quantity = models.PositiveIntegerField(default=1)
+    def pri(self):
+        return self.priority.get(self.product, None)