From 4a772ed409bd9ddd98e43db21854efb9b3e1a67c Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 4 Nov 2021 16:30:45 +0100 Subject: [PATCH] changes in plan and payment around instant plans --- rowers/forms.py | 4 ++-- rowers/views/paymentviews.py | 2 ++ rowers/views/planviews.py | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/rowers/forms.py b/rowers/forms.py index db7daea4..ce63eb52 100644 --- a/rowers/forms.py +++ b/rowers/forms.py @@ -108,7 +108,7 @@ class InstantPlanSelectForm(forms.Form): datechoice = forms.ChoiceField(choices=datechoices,initial='enddate',label='Plan by target, start or end date', widget=forms.RadioSelect) notes = forms.CharField(required=False, - max_length=200,label='Course Notes', + max_length=200,label='Plan Notes', widget=forms.Textarea) def __init__(self, *args, **kwargs): @@ -184,7 +184,7 @@ class TrainingPlanBillingForm(forms.Form): paymenttype = forms.CharField(max_length=255,required=True) enddate = forms.DateField(widget=forms.HiddenInput) name = forms.CharField(max_length=255,required=False) - notes = forms.CharField(max_length=255,required=True) + notes = forms.CharField(max_length=255,required=False) status = forms.CharField(max_length=255,required=True) tac= forms.BooleanField(required=True,initial=False) diff --git a/rowers/views/paymentviews.py b/rowers/views/paymentviews.py index 998f6e6e..c93fbceb 100644 --- a/rowers/views/paymentviews.py +++ b/rowers/views/paymentviews.py @@ -249,6 +249,8 @@ def purchase_checkouts_view(request): messages.error(request,"There was an error in the payment form") url = reverse("purchase_checkouts_view") return HttpResponseRedirect(url) + else: + messages.error(request,"There was an error in the payment form") url = reverse('rower_select_instantplan') # pragma: no cover if 'plan' in request.POST: # pragma: no cover diff --git a/rowers/views/planviews.py b/rowers/views/planviews.py index 5f069603..a9e3a145 100644 --- a/rowers/views/planviews.py +++ b/rowers/views/planviews.py @@ -2670,6 +2670,8 @@ def rower_view_instantplan(request,id='',userid=0): create_sessions_from_json(plansteps,r,startdate,r.user) + messages.info(request,'Your Sessions have been added') + url = reverse('plannedsessions_view') timeperiod = startdate.strftime('%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d') url = url+'?when='+timeperiod @@ -2745,7 +2747,7 @@ def add_instantplan_view(request): if not request.user.is_staff: # pragma: no cover raise PermissionDenied("Not Allowed") - r = getrequestrower(request) + r = request.user.rower if request.method == 'POST': # pragma: no cover form = InstantPlanForm(request.POST,request.FILES)