Add new fields to payment form for accommodation.

4 files changed, 48 insertions, 109 deletions

diff --git a/project/scipycon/registration/migrations/0001_initial.py b/project/scipycon/registration/migrations/0001_initial.py
index 7cbd77e..0d6bc32 100644
--- a/project/scipycon/registration/migrations/0001_initial.py
+++ b/project/scipycon/registration/migrations/0001_initial.py
@@ -14,6 +14,7 @@ class Migration(SchemaMigration):
             ('scope', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['base.Event'])),
             ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
             ('wifi', self.gf('django.db.models.fields.CharField')(max_length=50)),
+            ('registration_id', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
         ))
         db.send_create_signal('registration', ['Wifi'])
 
@@ -52,6 +53,17 @@ class Migration(SchemaMigration):
         ))
         db.send_create_signal('registration', ['Registration'])
 
+        # Adding model 'Payment'
+        db.create_table('registration_payment', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('scope', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['base.Event'])),
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
+            ('confirmed', self.gf('django.db.models.fields.BooleanField')(default=False)),
+            ('type', self.gf('django.db.models.fields.CharField')(max_length=25, null=True, blank=True)),
+            ('details', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
+        ))
+        db.send_create_signal('registration', ['Payment'])
+
 
     def backwards(self, orm):
         
@@ -64,6 +76,9 @@ class Migration(SchemaMigration):
         # Deleting model 'Registration'
         db.delete_table('registration_registration')
 
+        # Deleting model 'Payment'
+        db.delete_table('registration_payment')
+
 
     models = {
         'auth.group': {
@@ -119,6 +134,15 @@ class Migration(SchemaMigration):
             'sex': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
             'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
+        'registration.payment': {
+            'Meta': {'object_name': 'Payment'},
+            'confirmed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'details': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'scope': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['base.Event']"}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
         'registration.registration': {
             'Meta': {'object_name': 'Registration'},
             'allow_contact': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
@@ -144,6 +168,7 @@ class Migration(SchemaMigration):
         'registration.wifi': {
             'Meta': {'object_name': 'Wifi'},
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'registration_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
             'scope': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['base.Event']"}),
             'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
             'wifi': ('django.db.models.fields.CharField', [], {'max_length': '50'})
diff --git a/project/scipycon/registration/migrations/0002_auto__add_field_wifi_registration_id.py b/project/scipycon/registration/migrations/0002_auto__add_field_wifi_registration_id.py
deleted file mode 100644
index b172c40..0000000
--- a/project/scipycon/registration/migrations/0002_auto__add_field_wifi_registration_id.py
+++ /dev/null
@@ -1,107 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Adding field 'Wifi.registration_id'
-        db.add_column('registration_wifi', 'registration_id', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True), keep_default=False)
-
-
-    def backwards(self, orm):
-        
-        # Deleting field 'Wifi.registration_id'
-        db.delete_column('registration_wifi', 'registration_id')
-
-
-    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'})
-        },
-        'base.event': {
-            'Meta': {'object_name': 'Event'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'scope': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'status': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'turn': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        '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'})
-        },
-        'registration.accommodation': {
-            'Meta': {'object_name': 'Accommodation'},
-            'accommodation_days': ('django.db.models.fields.IntegerField', [], {'default': '0', 'blank': 'True'}),
-            'accommodation_required': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'scope': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['base.Event']"}),
-            'sex': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
-        },
-        'registration.registration': {
-            'Meta': {'object_name': 'Registration'},
-            'allow_contact': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'city': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'conference': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'final_conference': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'final_sprint': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'final_tutorial': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_mod': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
-            'occupation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'organisation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'phone_num': ('django.db.models.fields.CharField', [], {'max_length': '14', 'blank': 'True'}),
-            'postcode': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'registrant': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
-            'scope': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['base.Event']"}),
-            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'db_index': 'True'}),
-            'sprint': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'submitted': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'tshirt': ('django.db.models.fields.CharField', [], {'max_length': '3'}),
-            'tutorial': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
-        },
-        'registration.wifi': {
-            'Meta': {'object_name': 'Wifi'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'registration_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'scope': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['base.Event']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
-            'wifi': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        }
-    }
-
-    complete_apps = ['registration']
diff --git a/project/scipycon/registration/models.py b/project/scipycon/registration/models.py
index 649145e..2f9908c 100644
--- a/project/scipycon/registration/models.py
+++ b/project/scipycon/registration/models.py
@@ -131,6 +131,9 @@ class Payment(base_models.ScopedBase):
 
     confirmed = models.BooleanField(
         default=False, blank=True)
+
+    acco_confirmed = models.BooleanField(
+        default=False, blank=True)
   
     type = models.CharField(max_length=25, choices=PAYMENT_MODE_CHOICES,
                             verbose_name="Type", blank=True, null=True)
diff --git a/project/templates/registration/manage_payments.html b/project/templates/registration/manage_payments.html
index 4f0be3b..a1c4571 100644
--- a/project/templates/registration/manage_payments.html
+++ b/project/templates/registration/manage_payments.html
@@ -12,7 +12,9 @@
     <table class="scipycon-default">
       <tr>
         <th>Full Name</th>
-        <th>Confirmed</th>
+        <th>Reg. Confirmed</th>
+        <th>Accommodation. Confirmed</th>
+        <th>Date of Payment</th>
         <th>Payment Mode</th>
         <th>Details</th>
       </tr>
@@ -33,12 +35,28 @@
           {{ field.errors }}
           <input id="user_id_{{ registrant.registrant.id }}"
           name="registrant_id_{{ registrant.registrant.id }}"
-          type="checkbox" name="paid"
+          type="checkbox" name="registration_confirmed"
           {% if registrant.registrant.payment_set.get.confirmed %}
           checked=checked
           {% endif %}
           /><br />
         </td>
+        <td>
+          {{ field.errors }}
+          <input id="user_id_{{ registrant.registrant.id }}"
+          name="registrant_id_{{ registrant.registrant.id }}"
+          type="checkbox" name="accommodation_confirmed"
+          {% if registrant.registrant.payment_set.get.acc_confirmed %}
+          checked=checked
+          {% endif %}
+          /><br />
+        </td>
+        <td>
+          {{ field.errors }}
+          <input id="user_id_{{ registrant.registrant.id }}"
+          name="registrant_id_{{ registrant.registrant.id }}"
+          type="text" name="date_of_payment"/><br />
+        </td>
         <td>{{ registrant.registrant.payment_set.get.type }}</td>
         <td>{{ registrant.registrant.payment_set.get.details }}</td>
       </tr>