Rename field name for order of shipping events

oscar/order/abstract_models.py

@@ -250,12 +250,11 @@ class AbstractPaymentEvent(models.Model):
 
 class AbstractPaymentEventType(models.Model):
     u"""Payment events are things like 'Paid', 'Failed', 'Refunded'"""
-    # Code is used in forms
-    code = models.CharField(max_length=128)
     # Name is the friendly description of an event
     name = models.CharField(max_length=255)
+    code = models.SlugField(max_length=128)
     # The normal order in which these shipping events take place
-    order = models.PositiveIntegerField(default=0)
+    sequence_number = models.PositiveIntegerField(default=0)
     
     def save(self, *args, **kwargs):
         if not self.code:
@@ -265,7 +264,7 @@ class AbstractPaymentEventType(models.Model):
     class Meta:
         abstract = True
         verbose_name_plural = _("Payment event types")
-        ordering = ('order',)
+        ordering = ('sequence_number',)
         
     def __unicode__(self):
         return self.name
@@ -296,9 +295,6 @@ class AbstractShippingEvent(models.Model):
     def num_affected_lines(self):
         return self.lines.count()
 
-    def save(self, *args, **kwargs):
-        prior_events = AbstractShippingEvent.objects.filter()
-        super(AbstractShippingEvent, self).save(*args, **kwargs)
 
 class ShippingEventQuantity(models.Model):
     u"""A "through" model linking lines to shipping events"""
@@ -309,7 +305,7 @@ class ShippingEventQuantity(models.Model):
     def _check_previous_events_are_complete(self):
         u"""Checks whether previous shipping events have passed"""
         previous_events = ShippingEventQuantity.objects.filter(line=self.line, 
-                                                               event__event_type__order__lt=self.event.event_type.order)
+                                                               event__event_type__sequence_number__lt=self.event.event_type.sequence_number)
         self.quantity = int(self.quantity)
         for event_quantities in previous_events:
             if event_quantities.quantity < self.quantity:

oscar/order/fixtures/initial_data.json

@@ -6,7 +6,7 @@
             "is_required": true, 
             "code": "order_placed", 
             "name": "Order placed", 
-            "order": 0
+            "sequence_number": 0
         }
     }, 
     {
@@ -16,7 +16,7 @@
             "is_required": true, 
             "code": "dispatched", 
             "name": "Dispatched", 
-            "order": 1
+            "sequence_number": 1
         }
     }, 
     {
@@ -26,7 +26,7 @@
             "is_required": false, 
             "code": "returned", 
             "name": "Returned", 
-            "order": 4
+            "sequence_number": 4
         }
     }, 
     {
@@ -36,7 +36,7 @@
             "is_required": false, 
             "code": "cancelled", 
             "name": "Cancelled", 
-            "order": 10
+            "sequence_number": 10
         }
     }, 
     {
@@ -45,7 +45,7 @@
         "fields": {
             "code": "paid-for", 
             "name": "Paid for", 
-            "order": 0
+            "sequence_number": 0
         }
     }, 
     {
@@ -54,7 +54,7 @@
         "fields": {
             "code": "payment-failed", 
             "name": "Payment failed", 
-            "order": 1
+            "sequence_number": 1
         }
     }, 
     {
@@ -63,7 +63,7 @@
         "fields": {
             "code": "refunded", 
             "name": "Refunded", 
-            "order": 2
+            "sequence_number": 2
         }
     }
 ]

oscar/order/fixtures/sample-order.json

@@ -102,7 +102,7 @@
         "fields": {
             "code": "order_placed", 
             "name": "Order placed", 
-            "order": 0
+            "sequence_number": 0
         }
     }, 
     {
@@ -111,7 +111,7 @@
         "fields": {
             "code": "dispatched", 
             "name": "Dispatched", 
-            "order": 1
+            "sequence_number": 1
         }
     }, 
     {
@@ -120,7 +120,7 @@
         "fields": {
             "code": "returned", 
             "name": "Returned", 
-            "order": 4
+            "sequence_number": 4
         }
     }, 
     {
@@ -129,7 +129,7 @@
         "fields": {
             "code": "cancelled", 
             "name": "Cancelled", 
-            "order": 10
+            "sequence_number": 10
         }
     }, 
     {
@@ -138,7 +138,7 @@
         "fields": {
             "code": "paid-for", 
             "name": "Paid for", 
-            "order": 0
+            "sequence_number": 0
         }
     }, 
     {
@@ -147,7 +147,7 @@
         "fields": {
             "code": "payment-failed", 
             "name": "Payment failed", 
-            "order": 1
+            "sequence_number": 1
         }
     }, 
     {
@@ -156,7 +156,7 @@
         "fields": {
             "code": "refunded", 
             "name": "Refunded", 
-            "order": 2
+            "sequence_number": 2
         }
     }, 
     {

oscar/order/tests.py

@@ -87,11 +87,6 @@ class BatchLineTest(TestCase):
         with self.assertRaises(ValueError):
             # Total quantity is too high
             self.event(type, 2)
-            
-    def test_required_shipping_events_must_take_place_before_later_ones(self):
-        with self.assertRaises(ValueError):
-            type = ShippingEventType.objects.get(code='dispatched')
-            self.event(type, self.line.quantity)
         
         
 class ShippingEventQuantityTest(TestCase):