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

Merge branch 'develop' into feature/basicpro

Browse Source
This commit is contained in:
Sander Roosendaal
2024-12-30 15:49:05 +01:00
parent 8a2485d3b2 39c3ba410e
commit 9c7f06684e
2 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rowers/.#urls.py Symbolic link
View File

@@ -0,0 +1 @@
sander@rowsandall-2.17364:1733469196

17
rowers/views/paymentviews.py
View File

@@ -268,14 +268,6 @@ def purchase_checkouts_view(request):
}) })
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
if r.rowerplan == 'freecoach': # pragma: no cover
messages.error(
request, 'You cannot purchase this training plan as a free coach member')
url = reverse('rower_view_instantplan', kwargs={
'id': plan.uuid,
})
return HttpResponseRedirect(url)
form = TrainingPlanBillingForm(request.POST) form = TrainingPlanBillingForm(request.POST)
if form.is_valid(): if form.is_valid():
@@ -868,8 +860,6 @@ def useractivate(request, uidb64, token): # pragma: no cover
d = {'first_name': user.first_name} d = {'first_name': user.first_name}
template = 'registeremail.html' template = 'registeremail.html'
if user.rower.rowerplan == 'freecoach':
template = 'coachregisteremail.html'
send_template_email(from_address, [fullemail], send_template_email(from_address, [fullemail],
subject, template, d) subject, template, d)
@@ -879,9 +869,6 @@ def useractivate(request, uidb64, token): # pragma: no cover
message2 += fullemail + "\n" message2 += fullemail + "\n"
message2 += "User name: "+user.username message2 += "User name: "+user.username
if user.rower.rowerplan == 'freecoach':
subject2 = "New Free Coach User"
send_mail(subject2, message2, send_mail(subject2, message2,
'Rowsandall Server <info@rowsandall.com>', 'Rowsandall Server <info@rowsandall.com>',
['roosendaalsander@gmail.com']) ['roosendaalsander@gmail.com'])
@@ -890,8 +877,6 @@ def useractivate(request, uidb64, token): # pragma: no cover
request, 'Thank you for your email confirmation. You are now signed in to your account.') request, 'Thank you for your email confirmation. You are now signed in to your account.')
login(request, user, backend='django.contrib.auth.backends.ModelBackend') login(request, user, backend='django.contrib.auth.backends.ModelBackend')
url = reverse('workouts_view') url = reverse('workouts_view')
# if user.rower.rowerplan == 'freecoach':
# url+='?next=/rowers/me/teams'
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
else: else:
return render(request, return render(request,
@@ -1025,7 +1010,7 @@ def freecoach_register_view(request): # pragma: no cover
therower = Rower(user=theuser, sex=sex, birthdate=birthdate, therower = Rower(user=theuser, sex=sex, birthdate=birthdate,
weightcategory=weightcategory, weightcategory=weightcategory,
adaptiveclass=adaptiveclass, adaptiveclass=adaptiveclass,
rowerplan='freecoach', clubsize=10) rowerplan='basic', clubsize=10)
therower.save() therower.save()