sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

changes in plan and payment around instant plans

Browse Source
This commit is contained in:
Sander Roosendaal
2021-11-04 16:30:45 +01:00
parent 4a6bceae71
commit 4a772ed409
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/forms.py
View File

@@ -108,7 +108,7 @@ class InstantPlanSelectForm(forms.Form):
datechoice = forms.ChoiceField(choices=datechoices,initial='enddate',label='Plan by target, start or end date', datechoice = forms.ChoiceField(choices=datechoices,initial='enddate',label='Plan by target, start or end date',
widget=forms.RadioSelect) widget=forms.RadioSelect)
notes = forms.CharField(required=False, notes = forms.CharField(required=False,
max_length=200,label='Course Notes', max_length=200,label='Plan Notes',
widget=forms.Textarea) widget=forms.Textarea)
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
@@ -184,7 +184,7 @@ class TrainingPlanBillingForm(forms.Form):
paymenttype = forms.CharField(max_length=255,required=True) paymenttype = forms.CharField(max_length=255,required=True)
enddate = forms.DateField(widget=forms.HiddenInput) enddate = forms.DateField(widget=forms.HiddenInput)
name = forms.CharField(max_length=255,required=False) 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) status = forms.CharField(max_length=255,required=True)
tac= forms.BooleanField(required=True,initial=False) tac= forms.BooleanField(required=True,initial=False)

2
rowers/views/paymentviews.py
View File

@@ -249,6 +249,8 @@ def purchase_checkouts_view(request):
messages.error(request,"There was an error in the payment form") messages.error(request,"There was an error in the payment form")
url = reverse("purchase_checkouts_view") url = reverse("purchase_checkouts_view")
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
else:
messages.error(request,"There was an error in the payment form")
url = reverse('rower_select_instantplan') # pragma: no cover url = reverse('rower_select_instantplan') # pragma: no cover
if 'plan' in request.POST: # pragma: no cover if 'plan' in request.POST: # pragma: no cover

4
rowers/views/planviews.py
View File

@@ -2670,6 +2670,8 @@ def rower_view_instantplan(request,id='',userid=0):
create_sessions_from_json(plansteps,r,startdate,r.user) create_sessions_from_json(plansteps,r,startdate,r.user)
messages.info(request,'Your Sessions have been added')
url = reverse('plannedsessions_view') url = reverse('plannedsessions_view')
timeperiod = startdate.strftime('%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d') timeperiod = startdate.strftime('%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d')
url = url+'?when='+timeperiod url = url+'?when='+timeperiod
@@ -2745,7 +2747,7 @@ def add_instantplan_view(request):
if not request.user.is_staff: # pragma: no cover if not request.user.is_staff: # pragma: no cover
raise PermissionDenied("Not Allowed") raise PermissionDenied("Not Allowed")
r = getrequestrower(request) r = request.user.rower
if request.method == 'POST': # pragma: no cover if request.method == 'POST': # pragma: no cover
form = InstantPlanForm(request.POST,request.FILES) form = InstantPlanForm(request.POST,request.FILES)