Adds form for subscription

creator/forms.py

@@ -101,7 +101,7 @@ def clean(self):
 
 class SubscriptionForm(DetailsForm):
     email = forms.EmailField(required=True)
-    first_send_date = forms.DateField(
+    first_send_date = forms.CharField(
         required=True,
         widget=forms.TextInput(attrs={
             'class': 'datepicker',

creator/management/commands/send_mails.py

@@ -58,7 +58,7 @@ def new_email(cls, subscription, pdf):
         
         Bye 
         """.format(first_name=subscription.first_name)
-        html_content = render_to_string('creator/email_subscription.html', {'context': subscription})
+        html_content = render_to_string('creator/subscription_email.html', {'context': subscription})
 
         from_email = "subscription@stundenzettel-creator.xyz"
         recipient_list = [subscription.email]
@@ -78,7 +78,7 @@ def new_email(cls, subscription, pdf):
     def generate_pdf(cls, subscription):
         details = forms.defaults
         details.update({
-            'name': subscription.name,
+            'surnname': subscription.surname,
             'first_name': subscription.first_name,
             'year': subscription.next_send_date.year,
             'month': subscription.next_send_date.month,

creator/migrations/0002_auto_20180430_0945.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.3 on 2018-04-30 07:45
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('creator', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='subscription',
+            old_name='name',
+            new_name='surname',
+        ),
+    ]

creator/static/creator/js/main.js

@@ -1,10 +1,11 @@
 $(document).ready(function(){
-    $(".datepicker").flatpickr({});
-    $(".daterangepicker").flatpickr({
+    let datepickerOptions = {
         altInput: true,
         altFormat: "F j",
-        dateFormat: "Y-m-d",
-        mode: "range"
-    });
+        dateFormat: "Y-m-d"
+    };
+    $(".datepicker").flatpickr(datepickerOptions);
+    datepickerOptions.mode = "range";
+    $(".daterangepicker").flatpickr(datepickerOptions);
     $(".collapsible").collapsible();
 });

creator/templates/creator/subscription_success.html

@@ -0,0 +1,14 @@
+{% extends "creator/base.html" %}
+
+{% block container %}
+    <h2>Success</h2>
+
+    <br/>
+
+    <div class="row">
+        <div class="col s 12 l9">
+            Your subscription has been processed. You will receive your first timesheet on {{ subscription.next_send_date }}
+        </div>
+    </div>
+{% endblock %}
+

creator/urls.py

@@ -1,9 +1,10 @@
 from django.conf.urls import url
 
-from creator.views import DetailsFormView, ResultPdfView, SubscriptionFormView
+from creator.views import DetailsFormView, ResultPdfView, SubscriptionFormView, SuccessView
 
 urlpatterns = [
     url(r'^$', DetailsFormView.as_view(), name='index'),
-    url(r'^result', ResultPdfView.as_view(), name='result'),
-    url(r'^subscribe', SubscriptionFormView.as_view(), name='subscribe'),
+    url(r'^result/', ResultPdfView.as_view(), name='result'),
+    url(r'^subscribe/', SubscriptionFormView.as_view(), name='subscribe'),
+    url(r'^success/', SuccessView.as_view(), name='success')
 ]

creator/views.py

@@ -3,6 +3,9 @@
 import random
 
 import numpy as np
+from django.shortcuts import get_object_or_404
+from django.views import View
+from django.views.generic import DetailView
 from django.views.generic.edit import FormView
 from easy_pdf.views import PDFTemplateView
 import holidays
@@ -148,19 +151,30 @@ class SubscriptionFormView(FormView):
     success_url = '/success/'
 
     def form_valid(self, form):
-        Subscription.objects.create(
-            email=form.email,
-            first_send_date=form.first_send_date,
-            next_send_date=form.first_send_date,
-            hours=form.hours,
-            unit_of_organisation=form.unit_of_organisation,
-            first_name=form.first_name,
-            surname=form.surname
+        subscription = Subscription.objects.create(
+            email=form.cleaned_data['email'],
+            first_send_date=form.cleaned_data['first_send_date'],
+            next_send_date=form.cleaned_data['first_send_date'],
+            hours=form.cleaned_data['hours'],
+            unit_of_organisation=form.cleaned_data['unit_of_organisation'],
+            first_name=form.cleaned_data['first_name'],
+            surname=form.cleaned_data['surname']
         )
 
+        self.request.session['subscription_id'] = subscription.pk
+
         return super().form_valid(form)
 
 
+class SuccessView(DetailView):
+    template_name = 'creator/subscription_success.html'
+
+    def get_object(self, queryset=None):
+        return get_object_or_404(
+            Subscription, pk=self.request.session['subscription_id']
+        )
+
+
 class ResultPdfView(PDFTemplateView):
     template_name = 'creator/timesheet.html'