Browse Source

Fix migrations and style issues

master
Maik Hoepfel 12 years ago
parent
commit
9b3ee30cf7

+ 6
- 4
oscar/apps/dashboard/vouchers/forms.py View File

1
 from django import forms
1
 from django import forms
2
-from oscar.core.loading import get_model
3
 from django.utils.translation import ugettext_lazy as _
2
 from django.utils.translation import ugettext_lazy as _
4
 
3
 
4
+from oscar.core.loading import get_model
5
+from oscar.forms import widgets
6
+
5
 Voucher = get_model('voucher', 'Voucher')
7
 Voucher = get_model('voucher', 'Voucher')
6
 Benefit = get_model('offer', 'Benefit')
8
 Benefit = get_model('offer', 'Benefit')
7
 Range = get_model('offer', 'Range')
9
 Range = get_model('offer', 'Range')
29
     type_choices = (
31
     type_choices = (
30
         (Benefit.PERCENTAGE, _('Percentage off of products in range')),
32
         (Benefit.PERCENTAGE, _('Percentage off of products in range')),
31
         (Benefit.FIXED, _('Fixed amount off of products in range')),
33
         (Benefit.FIXED, _('Fixed amount off of products in range')),
32
-        (Benefit.SHIPPING_PERCENTAGE, 
33
-                _("Discount is a percentage off of the shipping cost")),
34
+        (Benefit.SHIPPING_PERCENTAGE,
35
+         _("Discount is a percentage off of the shipping cost")),
34
         (Benefit.SHIPPING_ABSOLUTE,
36
         (Benefit.SHIPPING_ABSOLUTE,
35
-                _("Discount is a fixed amount of the shipping cost")),
37
+         _("Discount is a fixed amount of the shipping cost")),
36
         (Benefit.SHIPPING_FIXED_PRICE, _("Get shipping for a fixed price")),
38
         (Benefit.SHIPPING_FIXED_PRICE, _("Get shipping for a fixed price")),
37
     )
39
     )
38
     benefit_type = forms.ChoiceField(
40
     benefit_type = forms.ChoiceField(

+ 2
- 2
oscar/apps/voucher/abstract_models.py View File

61
         return self.name
61
         return self.name
62
 
62
 
63
     def clean(self):
63
     def clean(self):
64
-        if (self.start_datetime and self.end_datetime and
65
-            self.start_datetime > self.end_datetime):
64
+        if all([self.start_datetime, self.end_datetime,
65
+                self.start_datetime > self.end_datetime]):
66
             raise exceptions.ValidationError(
66
             raise exceptions.ValidationError(
67
                 _('End date should be later than start date'))
67
                 _('End date should be later than start date'))
68
 
68
 

+ 2
- 1
oscar/apps/voucher/admin.py View File

11
     readonly_fields = ('num_basket_additions', 'num_orders', 'total_discount')
11
     readonly_fields = ('num_basket_additions', 'num_orders', 'total_discount')
12
     fieldsets = (
12
     fieldsets = (
13
         (None, {
13
         (None, {
14
-            'fields': ('name', 'code', 'usage', 'start_datetime', 'end_datetime')}),
14
+            'fields': ('name', 'code', 'usage', 'start_datetime',
15
+                       'end_datetime')}),
15
         ('Benefit', {
16
         ('Benefit', {
16
             'fields': ('offers',)}),
17
             'fields': ('offers',)}),
17
         ('Usage', {
18
         ('Usage', {

+ 6
- 4
oscar/apps/voucher/migrations/0002_auto__chg_field_voucher_end_date__chg_field_voucher_start_date.py View File

5
 from django.db import models
5
 from django.db import models
6
 from django.utils import timezone
6
 from django.utils import timezone
7
 
7
 
8
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
9
+
8
 
10
 
9
 class Migration(SchemaMigration):
11
 class Migration(SchemaMigration):
10
     no_dry_run = True
12
     no_dry_run = True
68
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
70
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
69
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
71
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
70
         },
72
         },
71
-        u'auth.user': {
72
-            'Meta': {'object_name': 'User'},
73
+    AUTH_USER_MODEL: {
74
+        'Meta': {'object_name': AUTH_USER_MODEL_NAME},
73
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
75
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
74
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
76
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
75
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
77
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
292
             'status': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
294
             'status': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
293
             'total_excl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
295
             'total_excl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
294
             'total_incl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
296
             'total_incl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
295
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': u"orm['auth.User']"})
297
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': u"orm['{0}']".format(AUTH_USER_MODEL)})
296
         },
298
         },
297
         u'order.shippingaddress': {
299
         u'order.shippingaddress': {
298
             'Meta': {'object_name': 'ShippingAddress'},
300
             'Meta': {'object_name': 'ShippingAddress'},
338
             'date_created': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
340
             'date_created': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
339
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
341
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
340
             'order': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['order.Order']"}),
342
             'order': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['order.Order']"}),
341
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}),
343
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['{0}']".format(AUTH_USER_MODEL), 'null': 'True', 'blank': 'True'}),
342
             'voucher': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'applications'", 'to': u"orm['voucher.Voucher']"})
344
             'voucher': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'applications'", 'to': u"orm['voucher.Voucher']"})
343
         }
345
         }
344
     }
346
     }

+ 6
- 4
oscar/apps/voucher/migrations/0003_auto__del_field_voucher_end_date__del_field_voucher_start_date__add_fi.py View File

4
 from south.v2 import SchemaMigration
4
 from south.v2 import SchemaMigration
5
 from django.db import models
5
 from django.db import models
6
 
6
 
7
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
8
+
7
 
9
 
8
 class Migration(SchemaMigration):
10
 class Migration(SchemaMigration):
9
     no_dry_run = True
11
     no_dry_run = True
60
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
62
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
61
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
63
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
62
         },
64
         },
63
-        u'auth.user': {
64
-            'Meta': {'object_name': 'User'},
65
+        AUTH_USER_MODEL: {
66
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
65
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
67
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
66
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
68
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
67
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
69
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
284
             'status': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
286
             'status': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
285
             'total_excl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
287
             'total_excl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
286
             'total_incl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
288
             'total_incl_tax': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}),
287
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': u"orm['auth.User']"})
289
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'orders'", 'null': 'True', 'to': u"orm['{0}']".format(AUTH_USER_MODEL)})
288
         },
290
         },
289
         u'order.shippingaddress': {
291
         u'order.shippingaddress': {
290
             'Meta': {'object_name': 'ShippingAddress'},
292
             'Meta': {'object_name': 'ShippingAddress'},
328
             'date_created': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
330
             'date_created': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
329
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
331
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
330
             'order': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['order.Order']"}),
332
             'order': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['order.Order']"}),
331
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}),
333
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['{0}']".format(AUTH_USER_MODEL), 'null': 'True', 'blank': 'True'}),
332
             'voucher': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'applications'", 'to': u"orm['voucher.Voucher']"})
334
             'voucher': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'applications'", 'to': u"orm['voucher.Voucher']"})
333
         }
335
         }
334
     }
336
     }

Loading…
Cancel
Save