changes to make plans work

rowers/views/paymentviews.py

@@ -95,6 +95,11 @@ def buy_trainingplan_view(request,id=0):
 
     r = request.user.rower
 
+    targets = TrainingTarget.objects.filter(
+        rowers=r,
+        date__gte=timezone.now(),
+    ).order_by("-date")
+
     plan = get_object_or_404(InstantPlan,pk=id)
 
     if r.paymentprocessor != 'braintree': # pragma: no cover
@@ -110,7 +115,7 @@ def buy_trainingplan_view(request,id=0):
 
     if request.method == 'POST':
         billingaddressform = RowerBillingAddressForm(instance=r)
-        form = InstantPlanSelectForm(request.POST)
+        form = InstantPlanSelectForm(request.POST,targets=targets)
         if billingaddressform.is_valid(): # pragma: no cover
             cd = billingaddressform.cleaned_data
             for attr, value in cd.items():
@@ -129,7 +134,8 @@ def buy_trainingplan_view(request,id=0):
 
             # get target and set enddate
             try:
-                target = cd['target']
+                targetid = cd['target']
+                target = TrainingTarget.objects.get(id=int(targetid))
             except KeyError:
                 try:
                     targetid = request.POST['target']