Added order notes to the order admin

oscar/order/abstract_models.py

@@ -4,8 +4,6 @@ from django.template.defaultfilters import slugify
 from django.utils.translation import ugettext_lazy as _
 
 
-
-
 class AbstractOrder(models.Model):
     """
     An order
@@ -51,22 +49,38 @@ class AbstractOrder(models.Model):
         return u"#%s (amount: %.2f)" % (self.number, self.total_incl_tax)
 
 
-class AbstractOrderEvent(models.Model):
+class AbstractOrderNote(models.Model):
+    """
+    A note against an order.
+    """
+    order = models.ForeignKey('order.Order', related_name="notes")
+    user = models.ForeignKey('auth.User')
+    message = models.TextField()
+    date = models.DateTimeField(auto_now_add=True)
+    
+    class Meta:
+        abstract = True
+        
+    def __unicode__(self):
+        return u"'%s' (%s)" % (self.message[0:50], self.user)
+
+
+class AbstractCommunicationEvent(models.Model):
     """
-    An event that happens to the order (rather than to one of its lines)
+    An order-level event involving a communication to the customer, such
+    as an confirmation email being sent.
     """
     order = models.ForeignKey('order.Order', related_name="events")
-    type = models.ForeignKey('order.OrderEventType')
-    notes = models.TextField(_("Event notes"), blank=True, null=True)
+    type = models.ForeignKey('order.CommunicationEventType')
     date = models.DateTimeField(auto_now_add=True)
     
     class Meta:
         abstract = True
     
     
-class AbstractOrderEventType(models.Model):
+class AbstractCommunicationEventType(models.Model):
     """ 
-    Order events are things like 'Cancellation', 'NoteAdded', 'ConfirmationEmailSent'
+    Communication events are things like 'OrderConfirmationEmailSent'
     """
     # Code is used in forms
     code = models.CharField(max_length=128)
@@ -80,7 +94,7 @@ class AbstractOrderEventType(models.Model):
     
     class Meta:
         abstract = True
-        verbose_name_plural = _("Order event types")
+        verbose_name_plural = _("Communication event types")
         
     def __unicode__(self):
         return self.name    

oscar/order/admin.py

@@ -7,7 +7,7 @@ class BatchAdmin(admin.ModelAdmin):
 class BatchLineAdmin(admin.ModelAdmin):
     list_display = ('batch', 'product', 'quantity')
 
-class OrderEventTypeAdmin(admin.ModelAdmin):
+class CommunicationEventTypeAdmin(admin.ModelAdmin):
     exclude = ('code',)
 
 class ShippingEventTypeAdmin(admin.ModelAdmin):
@@ -15,10 +15,19 @@ class ShippingEventTypeAdmin(admin.ModelAdmin):
     
 class PaymentEventTypeAdmin(admin.ModelAdmin):
     exclude = ('code',)
+    
+class OrderNoteAdmin(admin.ModelAdmin):
+    exclude = ('user',)
+    
+    def save_model(self, request, obj, form, change):
+        if not change:
+            obj.user = request.user
+        obj.save()
 
 admin.site.register(Order)
-admin.site.register(OrderEvent)
-admin.site.register(OrderEventType, OrderEventTypeAdmin)
+admin.site.register(OrderNote, OrderNoteAdmin)
+admin.site.register(CommunicationEvent)
+admin.site.register(CommunicationEventType, CommunicationEventTypeAdmin)
 admin.site.register(BillingAddress)
 admin.site.register(Batch, BatchAdmin)
 admin.site.register(ShippingAddress)

oscar/order/models.py

@@ -9,10 +9,13 @@ from oscar.address.abstract_models import AbstractShippingAddress, AbstractBilli
 class Order(AbstractOrder):
     pass
 
-class OrderEvent(AbstractOrderEvent):
+class OrderNote(AbstractOrderNote):
     pass
 
-class OrderEventType(AbstractOrderEventType):
+class CommunicationEvent(AbstractCommunicationEvent):
+    pass
+
+class CommunicationEventType(AbstractCommunicationEventType):
     pass
 
 class Batch(AbstractBatch):

oscar/order_management/templates/order_management/order.html

@@ -7,6 +7,30 @@
 
 {% block content %}
 
+<h3>Shipping address</h3>
+<table>
+    <tr>
+        <th>Address</th>
+        <td>
+            {% for field in order.shipping_address.active_address_fields %}
+            {{ field }}<br/>
+            {% endfor %}
+        </td>
+    </tr>
+    {% if order.shipping_address.phone_number %}
+    <tr>
+        <th>Concact number</th>
+        <td>{{ shipping_address.phone_number }}</td>
+    </tr>
+    {% endif %}
+    {% if order.shipping_address.notes %}
+    <tr>
+        <th>Shipping notes</th>
+        <td>{{ shipping_address.notes }}</td>
+    </tr>
+    {% endif %} 
+</table>
+
 <h3>Order contents</h3>
 
 {% for batch in order.batches.all %}
@@ -65,7 +89,8 @@
     </tr>
 </table>
 
-<h4>Shipping events</h4>
+{% if order.shipping_events.count %}
+<h3>Shipping events</h3>
 <table>
 <tr>
     <th>Partner</th>
@@ -82,7 +107,33 @@
 </tr>
 {% endfor %}
 </table>
+{% endif %}
+
+<h3>Order notes</h3>
+
+{% if order.notes.count %}
+<table>
+<tr>
+    <th>Note</th>
+    <th>User</th>
+    <th>Date</th>
+</tr>
+{% for note in order.notes.all %}
+<tr>
+    <td>{{ note.message }}</td>
+    <td>{{ note.user }}</td>
+    <td>{{ note.date }}</td>
+</tr>
+{% endfor %}
+</table>
+{% endif %}
 
+<form method="post" action="{%url oscar-order-management-order order.number %}"/>
+    <input type="hidden" name="action" value="add_note" />
+    <label for="message">Message:</label>
+    <textarea id="message" name="message"></textarea>
+    <input type="submit" value="Add note" />
+</form>
 
 {% endblock content %}
 

oscar/order_management/views.py

@@ -8,7 +8,7 @@ from django.views.generic import ListView, DetailView
 from oscar.views import ModelView
 from oscar.services import import_module
 order_models = import_module('order.models', ['Order', 'BatchLine', 'ShippingEvent', 'ShippingEventQuantity', 
-                                              'ShippingEventType', 'PaymentEvent', 'PaymentEventType'])
+                                              'ShippingEventType', 'PaymentEvent', 'PaymentEventType', 'OrderNote'])
 
 
 class OrderListView(ListView):
@@ -58,4 +58,13 @@ class OrderView(ModelView):
         for line in lines.values():
             order_models.PaymentEvent.objects.create(order=order, line=line, 
                                                      quantity=line.quantity, event_type=event_type)
+            
+    def do_add_note(self, order):
+        """
+        Save a note against the order.
+        """
+        if self.request.user.is_authenticated():
+            note = order_models.OrderNote(order=order, message=self.request.POST['message'],
+                                          user=self.request.user)
+            note.save()