Browse Source

Rename field name for order of shipping events

master
David Winterbottom 15 years ago
parent
commit
2ba277cfaa

+ 4
- 8
oscar/order/abstract_models.py View File

@@ -250,12 +250,11 @@ class AbstractPaymentEvent(models.Model):
250 250
 
251 251
 class AbstractPaymentEventType(models.Model):
252 252
     u"""Payment events are things like 'Paid', 'Failed', 'Refunded'"""
253
-    # Code is used in forms
254
-    code = models.CharField(max_length=128)
255 253
     # Name is the friendly description of an event
256 254
     name = models.CharField(max_length=255)
255
+    code = models.SlugField(max_length=128)
257 256
     # The normal order in which these shipping events take place
258
-    order = models.PositiveIntegerField(default=0)
257
+    sequence_number = models.PositiveIntegerField(default=0)
259 258
     
260 259
     def save(self, *args, **kwargs):
261 260
         if not self.code:
@@ -265,7 +264,7 @@ class AbstractPaymentEventType(models.Model):
265 264
     class Meta:
266 265
         abstract = True
267 266
         verbose_name_plural = _("Payment event types")
268
-        ordering = ('order',)
267
+        ordering = ('sequence_number',)
269 268
         
270 269
     def __unicode__(self):
271 270
         return self.name
@@ -296,9 +295,6 @@ class AbstractShippingEvent(models.Model):
296 295
     def num_affected_lines(self):
297 296
         return self.lines.count()
298 297
 
299
-    def save(self, *args, **kwargs):
300
-        prior_events = AbstractShippingEvent.objects.filter()
301
-        super(AbstractShippingEvent, self).save(*args, **kwargs)
302 298
 
303 299
 class ShippingEventQuantity(models.Model):
304 300
     u"""A "through" model linking lines to shipping events"""
@@ -309,7 +305,7 @@ class ShippingEventQuantity(models.Model):
309 305
     def _check_previous_events_are_complete(self):
310 306
         u"""Checks whether previous shipping events have passed"""
311 307
         previous_events = ShippingEventQuantity.objects.filter(line=self.line, 
312
-                                                               event__event_type__order__lt=self.event.event_type.order)
308
+                                                               event__event_type__sequence_number__lt=self.event.event_type.sequence_number)
313 309
         self.quantity = int(self.quantity)
314 310
         for event_quantities in previous_events:
315 311
             if event_quantities.quantity < self.quantity:

+ 7
- 7
oscar/order/fixtures/initial_data.json View File

@@ -6,7 +6,7 @@
6 6
             "is_required": true, 
7 7
             "code": "order_placed", 
8 8
             "name": "Order placed", 
9
-            "order": 0
9
+            "sequence_number": 0
10 10
         }
11 11
     }, 
12 12
     {
@@ -16,7 +16,7 @@
16 16
             "is_required": true, 
17 17
             "code": "dispatched", 
18 18
             "name": "Dispatched", 
19
-            "order": 1
19
+            "sequence_number": 1
20 20
         }
21 21
     }, 
22 22
     {
@@ -26,7 +26,7 @@
26 26
             "is_required": false, 
27 27
             "code": "returned", 
28 28
             "name": "Returned", 
29
-            "order": 4
29
+            "sequence_number": 4
30 30
         }
31 31
     }, 
32 32
     {
@@ -36,7 +36,7 @@
36 36
             "is_required": false, 
37 37
             "code": "cancelled", 
38 38
             "name": "Cancelled", 
39
-            "order": 10
39
+            "sequence_number": 10
40 40
         }
41 41
     }, 
42 42
     {
@@ -45,7 +45,7 @@
45 45
         "fields": {
46 46
             "code": "paid-for", 
47 47
             "name": "Paid for", 
48
-            "order": 0
48
+            "sequence_number": 0
49 49
         }
50 50
     }, 
51 51
     {
@@ -54,7 +54,7 @@
54 54
         "fields": {
55 55
             "code": "payment-failed", 
56 56
             "name": "Payment failed", 
57
-            "order": 1
57
+            "sequence_number": 1
58 58
         }
59 59
     }, 
60 60
     {
@@ -63,7 +63,7 @@
63 63
         "fields": {
64 64
             "code": "refunded", 
65 65
             "name": "Refunded", 
66
-            "order": 2
66
+            "sequence_number": 2
67 67
         }
68 68
     }
69 69
 ]

+ 7
- 7
oscar/order/fixtures/sample-order.json View File

@@ -102,7 +102,7 @@
102 102
         "fields": {
103 103
             "code": "order_placed", 
104 104
             "name": "Order placed", 
105
-            "order": 0
105
+            "sequence_number": 0
106 106
         }
107 107
     }, 
108 108
     {
@@ -111,7 +111,7 @@
111 111
         "fields": {
112 112
             "code": "dispatched", 
113 113
             "name": "Dispatched", 
114
-            "order": 1
114
+            "sequence_number": 1
115 115
         }
116 116
     }, 
117 117
     {
@@ -120,7 +120,7 @@
120 120
         "fields": {
121 121
             "code": "returned", 
122 122
             "name": "Returned", 
123
-            "order": 4
123
+            "sequence_number": 4
124 124
         }
125 125
     }, 
126 126
     {
@@ -129,7 +129,7 @@
129 129
         "fields": {
130 130
             "code": "cancelled", 
131 131
             "name": "Cancelled", 
132
-            "order": 10
132
+            "sequence_number": 10
133 133
         }
134 134
     }, 
135 135
     {
@@ -138,7 +138,7 @@
138 138
         "fields": {
139 139
             "code": "paid-for", 
140 140
             "name": "Paid for", 
141
-            "order": 0
141
+            "sequence_number": 0
142 142
         }
143 143
     }, 
144 144
     {
@@ -147,7 +147,7 @@
147 147
         "fields": {
148 148
             "code": "payment-failed", 
149 149
             "name": "Payment failed", 
150
-            "order": 1
150
+            "sequence_number": 1
151 151
         }
152 152
     }, 
153 153
     {
@@ -156,7 +156,7 @@
156 156
         "fields": {
157 157
             "code": "refunded", 
158 158
             "name": "Refunded", 
159
-            "order": 2
159
+            "sequence_number": 2
160 160
         }
161 161
     }, 
162 162
     {

+ 0
- 5
oscar/order/tests.py View File

@@ -87,11 +87,6 @@ class BatchLineTest(TestCase):
87 87
         with self.assertRaises(ValueError):
88 88
             # Total quantity is too high
89 89
             self.event(type, 2)
90
-            
91
-    def test_required_shipping_events_must_take_place_before_later_ones(self):
92
-        with self.assertRaises(ValueError):
93
-            type = ShippingEventType.objects.get(code='dispatched')
94
-            self.event(type, self.line.quantity)
95 90
         
96 91
         
97 92
 class ShippingEventQuantityTest(TestCase):

Loading…
Cancel
Save