diff --git a/rowers/teams.py b/rowers/teams.py index b6a7bfc2..f0fa0e0b 100644 --- a/rowers/teams.py +++ b/rowers/teams.py @@ -64,7 +64,7 @@ def create_team(name,manager,private='open',notes='',viewing='allmembers'): if manager.rower.rowerplan == 'basic': if manager.rower.protrialexpires < timezone.now().date() and manager.rower.plantrialexpires < timezone.now().date(): return (0,'You need to upgrade to a paid plan to establish a team') - elif manager.rower.rowerplan != 'coach': + if manager.rower.rowerplan != 'coach': ts = Team.objects.filter(manager=manager) if len(ts)>=1: return (0,'You need to upgrade to the Coach plan to have more than one team') diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz index a3190522..796c938a 100644 Binary files a/rowers/tests/testdata/testdata.csv.gz and b/rowers/tests/testdata/testdata.csv.gz differ diff --git a/rowers/views/userviews.py b/rowers/views/userviews.py index c69b0957..45bf65b4 100644 --- a/rowers/views/userviews.py +++ b/rowers/views/userviews.py @@ -4,7 +4,7 @@ from statements import * def start_trial_view(request): r = getrower(request.user) - if r.protrialexpires is not None: + if r.protrialexpires > datetime.date(1970,1,1): messages.error(request,'You do not qualify for a trial') url = '/rowers/paidplans' return HttpResponseRedirect(url) @@ -31,7 +31,7 @@ def start_trial_view(request): def start_plantrial_view(request): r = getrower(request.user) - if r.plantrialexpires is not None: + if r.plantrialexpires > datetime.date(1970,1,1): messages.error(request,'You do not qualify for a trial') url = '/rowers/paidplans' return HttpResponseRedirect(url)