Added migration to add new settings, also fixed oddities with functional defaults in migrations

pacmanager/core/migrations/0001_initial.py

@@ -32,7 +32,7 @@ class Migration(SchemaMigration):
             ('contact', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='corporations', null=True, to=orm['auth.User'])),
             ('balance', self.gf('django.db.models.fields.DecimalField')(default=0, max_digits=25, decimal_places=2)),
             ('last_transaction', self.gf('django.db.models.fields.BigIntegerField')(default=0)),
-            ('payment_id', self.gf('django.db.models.fields.CharField')(default=UUID('2bd5462c-28d9-4fed-b0d1-e835c6954c57'), max_length=36)),
+            ('payment_id', self.gf('django.db.models.fields.CharField')(max_length=36)),
         ))
         db.send_create_signal('core', ['Corporation'])
 
@@ -158,7 +158,7 @@ class Migration(SchemaMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'last_transaction': ('django.db.models.fields.BigIntegerField', [], {'default': '0'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'payment_id': ('django.db.models.fields.CharField', [], {'default': "UUID('84a11b5a-467e-496e-96b4-ffdfc6bb5a2b')", 'max_length': '36'}),
+            'payment_id': ('django.db.models.fields.CharField', [], {'max_length': '36'}),
             'tax_rate': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'})
         },
         'core.key': {
@@ -197,4 +197,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['core']
+    complete_apps = ['core']

pacmanager/core/migrations/0002_add_new_config_options.py

@@ -0,0 +1,124 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import DataMigration
+from django.db import models
+
+class Migration(DataMigration):
+
+    conf = (
+        ('pac.tax_threshold', '200000000'),
+        ('pac.tax_rate', '10'),
+    )
+
+    def forwards(self, orm):
+        for key, val in self.conf:
+            orm.Setting.objects.get_or_create(key=key, value=val)
+
+    def backwards(self, orm):
+        for key, val in self.conf:
+            try:
+                obj = orm.Setting.objects.get(key=key)
+                obj.delete()
+            except orm.Setting.DoesNotExist:
+                pass
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.apicache': {
+            'Meta': {'object_name': 'APICache'},
+            'cache_until': ('django.db.models.fields.DateTimeField', [], {}),
+            'document': ('django.db.models.fields.TextField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '40'})
+        },
+        'core.character': {
+            'Meta': {'object_name': 'Character'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'core.corporation': {
+            'Meta': {'object_name': 'Corporation'},
+            'balance': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '25', 'decimal_places': '2'}),
+            'ceo': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['core.Character']"}),
+            'contact': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'corporations'", 'null': 'True', 'to': "orm['auth.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_transaction': ('django.db.models.fields.BigIntegerField', [], {'default': '0'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'payment_id': ('django.db.models.fields.CharField', [], {'max_length': '36'}),
+            'tax_rate': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'})
+        },
+        'core.key': {
+            'Meta': {'object_name': 'Key'},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'corporation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'keys'", 'to': "orm['core.Corporation']"}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'keyid': ('django.db.models.fields.BigIntegerField', [], {'primary_key': 'True'}),
+            'mask': ('django.db.models.fields.BigIntegerField', [], {}),
+            'update': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'vcode': ('django.db.models.fields.CharField', [], {'max_length': '64'})
+        },
+        'core.monthtotal': {
+            'Meta': {'ordering': "['-year', '-month']", 'object_name': 'MonthTotal'},
+            'charged': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'corporation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'totals'", 'to': "orm['core.Corporation']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'month': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'tax': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '25', 'decimal_places': '2'}),
+            'year': ('django.db.models.fields.PositiveIntegerField', [], {})
+        },
+        'core.setting': {
+            'Meta': {'object_name': 'Setting'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'value': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        'core.transaction': {
+            'Meta': {'ordering': "['-date']", 'object_name': 'Transaction'},
+            'comment': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'corporation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'transactions'", 'to': "orm['core.Corporation']"}),
+            'date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'type': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'value': ('django.db.models.fields.DecimalField', [], {'max_digits': '25', 'decimal_places': '2'})
+        }
+    }
+
+    complete_apps = ['core']
+    symmetrical = True

pacmanager/core/models.py

@@ -35,10 +35,15 @@ class Corporation(models.Model):
     balance = models.DecimalField('Current Balance', max_digits=25, decimal_places=2, default=0)
 
     last_transaction = models.BigIntegerField('Last Transaction ID', default=0)
-    payment_id = models.CharField('Payment ID', max_length=36, default=uuid4)
+    payment_id = models.CharField('Payment ID', max_length=36)
     
     objects = CorporationManager()
 
+    def save(self, *args, **kwargs):
+        if self.payment_id is None or self.payment_id == '':
+            self.payment_id = str(uuid4())
+        return super(Corporation, self).save(*args, **kwargs)
+
     def __unicode__(self):
         if self.name: 
             return u'%s' % self.name