some fixes and more user friendly form to buy instantplan

rowers/views/paymentviews.py

@@ -109,7 +109,7 @@ def buy_trainingplan_view(request,id=0):
 
     if request.method == 'POST':
         billingaddressform = RowerBillingAddressForm(instance=r)
-        form = TrainingPlanForm(request.POST,user=request.user)
+        form = InstantPlanSelectForm(request.POST)
         if billingaddressform.is_valid():
             cd = billingaddressform.cleaned_data
             for attr, value in cd.items():
@@ -121,8 +121,10 @@ def buy_trainingplan_view(request,id=0):
             cd = form.cleaned_data
 
             enddate = cd['enddate']
+            startdate = cd['startdate']
             notes = cd['notes']
-            status = cd['status']
+            datechoice = form.cleaned_data['datechoice']
+            status = True
 
             # get target and set enddate
             try:
@@ -138,8 +140,12 @@ def buy_trainingplan_view(request,id=0):
                 except KeyError:
                     target = None
 
-            if target:
+            if target and datechoice == 'target':
                 enddate = target.date
+            elif datechoice == 'startdate':
+                enddate = startdate+datetime.timedelta(days=plan.duration)
+            else:
+                startdate = enddate-datetime.timedelta(days=plan.duration)
 
             pars = {
                 'name':cd['name'],
@@ -154,7 +160,7 @@ def buy_trainingplan_view(request,id=0):
             return HttpResponseRedirect(url)
 
     else:
-        form = TrainingPlanForm(user=request.user)
+        form = InstantPlanForm()
         billingaddressform = RowerBillingAddressForm(instance=r)
 
     return render(request,
@@ -243,9 +249,12 @@ def purchase_checkouts_view(request):
             url = reverse("purchase_checkouts_view")
             return HttpResponseRedirect(url)
 
-    url = reverse('rower_view_instantplan',kwargs={
-        'id':plan.uuid,
-    })
+    url = reverse('rower_select_instantplan')
+    if 'plan' in request.POST:
+        plan = plan = InstantPlan.objects.get(id=request.POST['plan'])
+        url = reverse('rower_view_instantplan',kwargs={
+            'id':plan.uuid,
+            })
     return HttpResponseRedirect(url)
 
 @user_passes_test(can_plan,login_url="/rowers/paidplans",