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

Merge branch 'release/v22.7.6'

Browse Source
This commit is contained in:
Sander Roosendaal
2024-12-31 12:49:57 +01:00
parent e2b7073946 5130c14c39
commit 5036956d1b
2 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/views/importviews.py
View File

@@ -931,7 +931,7 @@ def intervals_webhook_view(request):
dologging("intervals_webhooks.log",request.body)
else:
dologging("intervals_webhooks.log","request.body")
dologging("intervals_webhooks.log",request.body)
data = json.loads(request.body)
try:
verificationtoken = data['secret']

17
rowers/views/paymentviews.py
View File

@@ -268,14 +268,6 @@ def purchase_checkouts_view(request):
})
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)
if form.is_valid():
@@ -868,8 +860,6 @@ def useractivate(request, uidb64, token): # pragma: no cover
d = {'first_name': user.first_name}
template = 'registeremail.html'
if user.rower.rowerplan == 'freecoach':
template = 'coachregisteremail.html'
send_template_email(from_address, [fullemail],
subject, template, d)
@@ -879,9 +869,6 @@ def useractivate(request, uidb64, token): # pragma: no cover
message2 += fullemail + "\n"
message2 += "User name: "+user.username
if user.rower.rowerplan == 'freecoach':
subject2 = "New Free Coach User"
send_mail(subject2, message2,
'Rowsandall Server <info@rowsandall.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.')
login(request, user, backend='django.contrib.auth.backends.ModelBackend')
url = reverse('workouts_view')
# if user.rower.rowerplan == 'freecoach':
# url+='?next=/rowers/me/teams'
return HttpResponseRedirect(url)
else:
return render(request,
@@ -1025,7 +1010,7 @@ def freecoach_register_view(request): # pragma: no cover
therower = Rower(user=theuser, sex=sex, birthdate=birthdate,
weightcategory=weightcategory,
adaptiveclass=adaptiveclass,
rowerplan='freecoach', clubsize=10)
rowerplan='basic', clubsize=10)
therower.save()