From 83e14c17850e30a786158534528e8cfcdc4359d4 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 28 Aug 2019 21:12:23 +0200 Subject: [PATCH 1/2] some stuff --- rowers/middleware.py | 6 ++++++ rowers/models.py | 12 +++++++++++- rowers/tests/testdata/testdata.csv.gz | Bin 12660 -> 12683 bytes 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/rowers/middleware.py b/rowers/middleware.py index c1b968f2..3b58f0c8 100644 --- a/rowers/middleware.py +++ b/rowers/middleware.py @@ -136,6 +136,12 @@ class RowerPlanMiddleWare(object): paymentprocessor='braintree') r.paidplan = basicplans[0] r.save() + # remove from Free Coach groups + for group in r.coachinggroups.all(): + coach = rower.objects.get(mycoachgroup=group) + if coach.rowerplan == 'freecoach': + r.coachinggroups.remove(group) + # send email job = myqueue(queue, handle_sendemail_expired, diff --git a/rowers/models.py b/rowers/models.py index ec2f772e..f9d2ae9f 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -878,7 +878,17 @@ class Rower(models.Model): def clean_email(self): return self.user.email.lower() - + def save(self, *args, **kwargs): + try: + for group in self.coachinggroups.all(): + coach = Rower.objects.get(mycoachgroup=group) + if coach.rowerplan == 'freecoach': + self.coachinggroups.remove(group) + except ValueError: + pass + + super(Rower, self).save(*args, **kwargs) + class DeactivateUserForm(forms.ModelForm): class Meta: model = User diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz index 4f7fc75abea6a815151eb3a60c257ec2d7767616..9941ccb444e906701f738010a5e1dc1051028b01 100644 GIT binary patch literal 12683 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 F003=~`~(01 literal 12660 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 From a22283bb202ee5dad6a81d06daab8132c45dccf9 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 28 Aug 2019 21:21:55 +0200 Subject: [PATCH 2/2] added explanation on team page --- rowers/middleware.py | 4 ---- rowers/templates/team.html | 8 ++++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/rowers/middleware.py b/rowers/middleware.py index 3b58f0c8..7b9abb86 100644 --- a/rowers/middleware.py +++ b/rowers/middleware.py @@ -137,10 +137,6 @@ class RowerPlanMiddleWare(object): r.paidplan = basicplans[0] r.save() # remove from Free Coach groups - for group in r.coachinggroups.all(): - coach = rower.objects.get(mycoachgroup=group) - if coach.rowerplan == 'freecoach': - r.coachinggroups.remove(group) # send email job = myqueue(queue, diff --git a/rowers/templates/team.html b/rowers/templates/team.html index 59c0fc34..81873dee 100644 --- a/rowers/templates/team.html +++ b/rowers/templates/team.html @@ -54,6 +54,14 @@ {% if team.manager == user %}

Use the form to add a new user. You can either select a user from the list of your existing club members who are not on this team yet, or you can type the user's email address, which also works for users who have not registered to the site yet.

+ {% if team.manager.rower.rowerplan == 'freecoach' %} +

+ As a Free Coach user, your team members can only be users on a paid + plan. You can also upgrade to a + Paid Coach Plan + which allows you to coach users on a free Rower Plan. +

+ {% endif %} {% if inviteform.errors %}

Please correct the error{{ inviteform.errors|pluralize }} below.