From b451ba4418906ab4a98a2d044327d88728ea443c Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Mon, 30 Dec 2024 15:01:41 +0100
Subject: [PATCH 1/3] fx

---
 rowers/idoklad.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/rowers/idoklad.py b/rowers/idoklad.py
index 4156e12e..cb6f2593 100644
--- a/rowers/idoklad.py
+++ b/rowers/idoklad.py
@@ -59,10 +59,15 @@ def idoklad_token():
         response = requests.post('https://identity.idoklad.cz/server/connect/token', headers=headers, data=data)
 
         if response.status_code == 200:
-            token = response.json()
-            token['updated_at'] = timezone.now()
-            token = iDokladToken.objects.filter(id=1).update(**token)
-            return iDokladToken.objects.get(id=1)
+            token_json = response.json()
+            token = iDokladToken.objects.all().order_by('-updated_at')[0]
+            token.access_token = token_json['access_token']
+            token.id_token = token_json['id_token']
+            token.refresh_token = token_json['refresh_token']
+            token.expires_in = token_json['expires_in']
+            token.updated_at = timezone.now()
+            token.save()
+            return token
         else:
             return None
         

From 23c680b71706ef3b72117d2ccd2bdf2dbefbf9a4 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Mon, 30 Dec 2024 15:32:24 +0100
Subject: [PATCH 2/3] fix for idoklad

---
 rowers/tests/testdata/testdata.tcx.gz | Bin 3989 -> 3989 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 17d933a59d9236a8d55f230a76dcbd92afffd347..98b3260df55b52068c90763be40ff1f89ad1b594 100644
GIT binary patch
delta 15
WcmbO#KUJPhzMF$1W5q_cetrNX4+M??

delta 15
WcmbO#KUJPhzMF$XyLTg7KR*B>8U!`~


From 39c3ba410e6e0dc98b6ec127bd9804b6b31ab296 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Mon, 30 Dec 2024 15:48:35 +0100
Subject: [PATCH 3/3] removing free coach registration form

---
 rowers/.#urls.py             |  1 +
 rowers/views/paymentviews.py | 17 +----------------
 2 files changed, 2 insertions(+), 16 deletions(-)
 create mode 120000 rowers/.#urls.py

diff --git a/rowers/.#urls.py b/rowers/.#urls.py
new file mode 120000
index 00000000..5317f650
--- /dev/null
+++ b/rowers/.#urls.py
@@ -0,0 +1 @@
+sander@rowsandall-2.17364:1733469196
\ No newline at end of file
diff --git a/rowers/views/paymentviews.py b/rowers/views/paymentviews.py
index 49f40c0e..8fbad999 100644
--- a/rowers/views/paymentviews.py
+++ b/rowers/views/paymentviews.py
@@ -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()