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

fix

Browse Source
This commit is contained in:
Sander Roosendaal
2021-03-24 06:58:12 +01:00
parent a9091bfed7
commit 3f7d10f2bf
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/urls.py
View File

@@ -719,7 +719,7 @@ urlpatterns = [
re_path(r'^me/cancelsubscription/(?P<id>[\w\ ]+.*)/$',views.plan_tobasic_view,name='plan_tobasic_view'), re_path(r'^me/cancelsubscription/(?P<id>[\w\ ]+.*)/$',views.plan_tobasic_view,name='plan_tobasic_view'),
re_path(r'^checkouts/$',views.checkouts_view,name='checkouts'), re_path(r'^checkouts/$',views.checkouts_view,name='checkouts'),
re_path(r'^upgradecheckouts/$',views.upgrade_checkouts_view,name='upgrade_checkouts'), re_path(r'^upgradecheckouts/$',views.upgrade_checkouts_view,name='upgrade_checkouts'),
re_path(r'^upgradecheckouts/$',views.upgrade_checkouts_view,name='upgrade_checkouts'), re_path(r'^downgradecheckouts/$',views.downgrade_checkouts_view,name='downgrade_checkouts'),
re_path(r'^purchasecheckouts/$',views.purchase_checkouts_view,name='purchase_checkouts_view'), re_path(r'^purchasecheckouts/$',views.purchase_checkouts_view,name='purchase_checkouts_view'),
re_path(r'^planrequired/',views.planrequired_view,name='planrequired_view'), re_path(r'^planrequired/',views.planrequired_view,name='planrequired_view'),
re_path(r'^starttrial/$',views.start_trial_view,name='start_trial_view'), re_path(r'^starttrial/$',views.start_trial_view,name='start_trial_view'),

17
rowers/views/paymentviews.py
View File

@@ -84,7 +84,9 @@ def billing_view(request):
'planselectform':planselectform, 'planselectform':planselectform,
}) })
@login_required() @user_passes_test(can_plan,login_url="/rowers/paidplans",
message="This functionality requires a Coach or Self-Coach plan",
redirect_field_name=None)
def buy_trainingplan_view(request,id=0): def buy_trainingplan_view(request,id=0):
if not PAYMENT_PROCESSING_ON: if not PAYMENT_PROCESSING_ON:
url = reverse('promembership') url = reverse('promembership')
@@ -119,7 +121,6 @@ def buy_trainingplan_view(request,id=0):
cd = form.cleaned_data cd = form.cleaned_data
enddate = cd['enddate'] enddate = cd['enddate']
rowers = cd['rowers']
notes = cd['notes'] notes = cd['notes']
status = cd['status'] status = cd['status']
@@ -145,7 +146,7 @@ def buy_trainingplan_view(request,id=0):
'enddate':enddate, 'enddate':enddate,
'notes':notes, 'notes':notes,
'status':status, 'status':status,
'rower':rowers[0].id, 'rower':r.id,
} }
params = urllib.parse.urlencode(pars) params = urllib.parse.urlencode(pars)
url = reverse('confirm_trainingplan_purchase_view',kwargs={'id':plan.id}) url = reverse('confirm_trainingplan_purchase_view',kwargs={'id':plan.id})
@@ -165,7 +166,9 @@ def buy_trainingplan_view(request,id=0):
'form':form, 'form':form,
}) })
@login_required() @user_passes_test(can_plan,login_url="/rowers/paidplans",
message="This functionality requires a Coach or Self-Coach plan",
redirect_field_name=None)
def purchase_checkouts_view(request): def purchase_checkouts_view(request):
if not PAYMENT_PROCESSING_ON: if not PAYMENT_PROCESSING_ON:
url = reverse('promembership') url = reverse('promembership')
@@ -245,7 +248,9 @@ def purchase_checkouts_view(request):
}) })
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
@login_required() @user_passes_test(can_plan,login_url="/rowers/paidplans",
message="This functionality requires a Coach or Self-Coach plan",
redirect_field_name=None)
def confirm_trainingplan_purchase_view(request,id = 0): def confirm_trainingplan_purchase_view(request,id = 0):
if not PAYMENT_PROCESSING_ON: if not PAYMENT_PROCESSING_ON:
url = reverse('promembership') url = reverse('promembership')
@@ -359,6 +364,7 @@ def downgrade_view(request):
setattr(r, attr, value) setattr(r, attr, value)
r.save() r.save()
if planselectform.is_valid(): if planselectform.is_valid():
plan = planselectform.cleaned_data['plan'] plan = planselectform.cleaned_data['plan']
@@ -376,6 +382,7 @@ def downgrade_view(request):
kwargs={ kwargs={
'planid':plan.id 'planid':plan.id
}) })
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
else: else: