Migrate and improve subscriptions

subscription/migrations/0002_auto_20160814_1634.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('subscription', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='subscription',
+            name='payment_method',
+            field=models.CharField(verbose_name='payment method', max_length=255, choices=[('CHECK', 'Check'), ('CARD', 'Credit card'), ('CASH', 'Cash'), ('EBOUTIC', 'Eboutic'), ('OTHER', 'Other')]),
+        ),
+        migrations.AlterField(
+            model_name='subscription',
+            name='subscription_type',
+            field=models.CharField(verbose_name='subscription type', max_length=255, choices=[('amicale/doceo', 'Amicale/DOCEO member'), ('assidu', 'Assidu member'), ('crous', 'CROUS member'), ('cursus-alternant', 'Branch cursus'), ('cursus-branche', 'Branch cursus'), ('cursus-tronc-commun', 'Common core cursus'), ('deux-semestres', 'Two semesters'), ('membre-honoraire', 'Honorary member'), ('reseau-ut', 'UT network member'), ('sbarro/esta', 'Sbarro/ESTA member'), ('un-semestre', 'One semester')]),
+        ),
+    ]

subscription/models.py

@@ -53,7 +53,8 @@ class Subscription(models.Model):
         super(Subscription, self).save()
         from counter.models import Customer
         if not Customer.objects.filter(user=self.member).exists():
-            Customer(user=self.member, account_id=Customer.generate_account_id(self.id), amount=0).save()
+            last_id = Customer.objects.count() + 5195 # Number to keep a continuity with the old site
+            Customer(user=self.member, account_id=Customer.generate_account_id(last_id+1), amount=0).save()
         self.member.make_home()
 
     def get_absolute_url(self):

subscription/templates/subscription/subscription.jinja

@@ -6,9 +6,41 @@
 
 {% block content %}
 <h3>{% trans %}New subscription{% endtrans %}</h3>
-<form action="" method="post">
+<div id="user_info"></div>
+<form action="" method="post" id="subscription_form">
     {% csrf_token %}
-    {{ form.as_p() }}
+    <p>{{ form.member.errors }}<label for="{{ form.member.name }}">{{ form.member.label }}</label> {{ form.member }}</p>
+    <div id="new_member">
+        <p>{{ form.last_name.errors }}<label for="{{ form.last_name.name }}">{{ form.last_name.label }}</label> {{ form.last_name }}</p>
+        <p>{{ form.first_name.errors }}<label for="{{ form.first_name.name }}">{{ form.first_name.label }}</label> {{ form.first_name }}</p>
+        <p>{{ form.email.errors }}<label for="{{ form.email.name }}">{{ form.email.label }}</label> {{ form.email }}</p>
+    </div>
+    <p>{{ form.subscription_type.errors }}<label for="{{ form.subscription_type.name }}">{{ form.subscription_type.label }}</label> {{ form.subscription_type }}</p>
+    <p>{{ form.payment_method.errors }}<label for="{{ form.payment_method.name }}">{{ form.payment_method.label }}</label> {{
+    form.payment_method }}</p>
+    <p>{{ form.location.errors }}<label for="{{ form.location.name }}">{{ form.location.label }}</label> {{ form.location }}</p>
     <p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
 </form>
 {% endblock %}
+
+{% block script %}
+    {{ super() }}
+<script type="text/javascript" charset="utf-8">
+$( function() {
+    select = $("#subscription_form select[name=member]");
+    member_block = $("#subscription_form #new_member");
+    user_info = $("#user_info");
+    function display_new_member() {
+        if (select.val()) {
+            member_block.hide();
+            user_info.load("/user/"+select.val()+"/mini");
+        } else {
+            member_block.show();
+            user_info.empty();
+        }
+    }
+    select.on("change", display_new_member);
+    display_new_member();
+} );
+</script>
+{% endblock %}

subscription/views.py

@@ -63,8 +63,8 @@ class NewSubscription(CanEditMixin, CreateView):
 
     def get_initial(self):
         if 'member' in self.request.GET.keys():
-            return {'member': self.request.GET['member']}
-        return {}
+            return {'member': self.request.GET['member'], 'subscription_type': 'deux-semestres'}
+        return {'subscription_type': 'deux-semestres'}
 
     def form_valid(self, form):
         form.instance.subscription_start = Subscription.compute_start(