Merge in master with migrations

apps/kassa/migrations/0004_auto_20150825_1130.py

@@ -14,6 +14,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='kassaevent',
             name='event',
-            field=models.CharField(max_length=255, choices=[('new_card_membership', 'Added new card membership (no user yet)'), ('sms_card_notify', 'Notified phone number about activation'), ('update_card', 'Updated user card number'), ('add_or_renew', 'Added or renewed user membership'), ('renew_only', 'Renewed user membership')]),
+            field=models.CharField(max_length=255, choices=[('new_card_membership', 'Added new card membership (no user yet)'), ('sms_card_notify', 'Notified phone number about activation'), ('update_card', 'Updated user card number'), ('add_or_renew', 'Added or renewed membership user membership'), ('refund', 'Refunded membership')]),
         ),
     ]

apps/kassa/migrations/0005_auto_20150829_1525.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('kassa', '0004_auto_20150825_1130'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='kassaevent',
+            name='event',
+            field=models.CharField(max_length=255, choices=[('new_card_membership', 'Added new card membership (no user yet)'), ('sms_card_notify', 'Notified phone number about activation'), ('update_card', 'Updated user card number'), ('add_or_renew', 'Added or renewed user membership'), ('renew_only', 'Renewed user membership'), ('refund', 'Refunded membership')]),
+        ),
+    ]

apps/kassa/models.py

@@ -4,17 +4,19 @@ from django.utils.translation import ugettext_lazy as _
 
 
 class KassaEvent(models.Model):
+    ADD_OR_RENEW = 'add_or_renew'
     NEW_CARD_MEMBERSHIP = 'new_card_membership'
+    REFUND = 'refund'
+    RENEW_ONLY = 'renew_only'
     SMS_CARD_NOTIFY = 'sms_card_notify'
     UPDATE_CARD = 'update_card'
-    ADD_OR_RENEW = 'add_or_renew'
-    RENEW_ONLY = 'renew_only'
     EVENT_CHOICES = (
+        (ADD_OR_RENEW, _('Added or renewed user membership')),
         (NEW_CARD_MEMBERSHIP, _('Added new card membership (no user yet)')),
+        (REFUND, _('Refunded membership')),
+        (RENEW_ONLY, _('Renewed user membership')),
         (SMS_CARD_NOTIFY, _('Notified phone number about activation')),
         (UPDATE_CARD, _('Updated user card number')),
-        (ADD_OR_RENEW, _('Added or renewed user membership')),
-        (RENEW_ONLY, _('Renewed user membership')),
     )
     event = models.CharField(max_length=255, choices=EVENT_CHOICES)
     card_number = models.IntegerField(null=True, blank=True)