# HG changeset patch
# User Amit Sethi
# Date 1290016509 -19800
# Node ID 29ecd3dd65655f8519595ba68e3ed72d10889ae8
# Parent  62f1cb02cb88c230a7eba13919315aaf98d7816a
Merging heads

diff -r 62f1cb02cb88 -r 29ecd3dd6565 project/scipycon/base/models.py
--- a/project/scipycon/base/models.py	Wed Nov 03 00:58:47 2010 +0530
+++ b/project/scipycon/base/models.py	Wed Nov 17 23:25:09 2010 +0530
@@ -75,3 +75,7 @@
 
     class Meta:
         abstract = True
+
+
+class Paid(models.Model):
+    event_start = models.DateTimeField(blank=True, null=True)
diff -r 62f1cb02cb88 -r 29ecd3dd6565 project/scipycon/registration/models.py
--- a/project/scipycon/registration/models.py	Wed Nov 03 00:58:47 2010 +0530
+++ b/project/scipycon/registration/models.py	Wed Nov 17 23:25:09 2010 +0530
@@ -78,3 +78,8 @@
         return 'Registration for user: <%s %s> %s' % (
             self.registrant.first_name,
             self.registrant.last_name, self.registrant.email)
+
+
+class Payment(base_models.ScopedBase):
+    """ Defines Payment Details of Users """
+    pass
diff -r 62f1cb02cb88 -r 29ecd3dd6565 project/scipycon/registration/views.py
--- a/project/scipycon/registration/views.py	Wed Nov 03 00:58:47 2010 +0530
+++ b/project/scipycon/registration/views.py	Wed Nov 17 23:25:09 2010 +0530
@@ -227,7 +227,7 @@
 
             wifi = wifi_form.save(registrant, scope_entity)
 
-            send_confirmation(registrant, scope_entity,password=passwd)
+            # send_confirmation(registrant, scope_entity,password=passwd)
 
             redirect_to = reverse('scipycon_registrations',
                                   kwargs={'scope': scope})
@@ -274,4 +274,4 @@
          'conf_num': conf_num, 
          'tut_num': tut_num,
          'sprint_num': sprint_num,
-         }))
\ No newline at end of file
+         }))
diff -r 62f1cb02cb88 -r 29ecd3dd6565 project/settings.py
--- a/project/settings.py	Wed Nov 03 00:58:47 2010 +0530
+++ b/project/settings.py	Wed Nov 17 23:25:09 2010 +0530
@@ -7,6 +7,7 @@
 
 MANAGERS = ADMINS
 
+DEBUG=False
 DATABASE_HOST = ''
 DATABASE_PORT = ''
 
@@ -77,3 +78,29 @@
 CURRENT_SCOPE = 'scipyin/2010'
 
 LOGIN_URL = '/%s/login' % (CURRENT_SCOPE)
+
+DATABASE_ENGINE = 'sqlite3'
+DATABASE_NAME = 'scipycon.db'
+DATABASE_USER = ''
+DATABASE_PASSWORD = ''
+
+INSTALLED_APPS = (
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.comments',
+    'django.contrib.sessions',
+    'django.contrib.admin',
+    'django.contrib.sites',
+    'django.contrib.flatpages',
+    'django.contrib.markup',
+    'django.contrib.sitemaps',
+    'project.scipycon',
+    'project.scipycon.base',
+    'project.scipycon.proceedings',
+    'project.scipycon.registration',
+    'project.scipycon.user',
+    'project.scipycon.talk',
+    'tagging',
+    'robots',
+)
+