removed club size

rowers/admin.py

@@ -24,7 +24,7 @@ class RowerInline(admin.StackedInline):
         ('Billing Details',
          {'fields':('street_address','city','postal_code','country','paymentprocessor','customer_id')}),
         ('Rower Plan',
-         {'fields':('paidplan','rowerplan','paymenttype','planexpires','teamplanexpires','clubsize','protrialexpires','plantrialexpires',)}),
+         {'fields':('paidplan','rowerplan','paymenttype','planexpires','teamplanexpires','protrialexpires','plantrialexpires',)}),
         ('Rower Settings',
          {'fields':
           ('gdproptin','gdproptindate','weightcategory','sex','adaptiveclass','birthdate','getemailnotifications',
@@ -128,7 +128,7 @@ class IndoorVirtualRaceResultAdmin(admin.ModelAdmin):
     search_fields = ['race__name','username']
 
 class PaidPlanAdmin(admin.ModelAdmin):
-    list_display = ('name','shortname','price','paymenttype','paymentprocessor','clubsize','external_id')
+    list_display = ('name','shortname','price','paymenttype','paymentprocessor','external_id')
     
 admin.site.unregister(User)
 admin.site.register(User,UserAdmin)

rowers/forms.py

@@ -752,7 +752,7 @@ class PlanSelectForm(forms.Form):
             ).exclude(
                 shortname="basic"
             ).order_by(
-                "price","clubsize","shortname"
+                "price","shortname"
             )
         if rower and not includeall:
             try:
@@ -765,7 +765,7 @@ class PlanSelectForm(forms.Form):
                 ).exclude(
                     price__lte=amount
                 ).order_by(
-                    "price","clubsize","shortname"
+                    "price","shortname"
                 )
 
             

rowers/teams.py

@@ -156,22 +156,20 @@ def create_request(team,user):
     if r2 in Rower.objects.filter(team=team):
         return (0,'Already a member of that team')
 
-    if count_club_members(team.manager)+count_invites(team.manager) <= r.clubsize:
+    #    if count_club_members(team.manager)+count_invites(team.manager) <= r.clubsize:
-        codes = [i.code for i in TeamRequest.objects.all()]
+    codes = [i.code for i in TeamRequest.objects.all()]
+    code = uuid.uuid4().hex[:10].upper()
+    # prevent duplicates
+    while code in codes:
         code = uuid.uuid4().hex[:10].upper()
-        # prevent duplicates
-        while code in codes:
-            code = uuid.uuid4().hex[:10].upper()
 
-        u = User.objects.get(id=user)
+    u = User.objects.get(id=user)
-        rekwest = TeamRequest(team=team,user=u,code=code)
+    rekwest = TeamRequest(team=team,user=u,code=code)
-        rekwest.save()
+    rekwest.save()
     
-        send_request_email(rekwest)
+    send_request_email(rekwest)
         
-        return (rekwest.id,'The request was created')
+    return (rekwest.id,'The request was created')
-    else:
-        return (0,'That team has reached its maximum number of members')
     
     return (0,'Something went wrong in create_request')
     
@@ -198,21 +196,18 @@ def create_invite(team,manager,user=None,email=''):
         except Rower.MultipleObjectsReturned:
             return (0,'There is more than one user with that email address')
             
-    if count_club_members(team.manager)+count_invites(team.manager) <= r.clubsize:
+    #    if count_club_members(team.manager)+count_invites(team.manager) <= r.clubsize:
-        codes = [i.code for i in TeamInvite.objects.all()]
+    codes = [i.code for i in TeamInvite.objects.all()]
+    code = uuid.uuid4().hex[:10].upper()
+    # prevent duplicates
+    while code in codes:
         code = uuid.uuid4().hex[:10].upper()
-        # prevent duplicates
-        while code in codes:
-            code = uuid.uuid4().hex[:10].upper()
 
-        invite = TeamInvite(team=team,code=code,user=user,email=email)
+    invite = TeamInvite(team=team,code=code,user=user,email=email)
-        invite.save()
+    invite.save()
-        return (invite.id,'Invitation created')
+    return (invite.id,'Invitation created')
         
         
-    else:
-        return (0,'You are at your club size limit')
-
     return (0,'Nothing done')
 
 def revoke_request(user,id):

rowers/templates/paidplans.html

@@ -257,23 +257,10 @@
                 {% endif %}
               </button>
             </td>
-            {% elif rower and rower.rowerplan == 'coach' and rower.clubsize < 100 %}
-            <td>&nbsp;</td>
-            <td>&nbsp;</td>
-            <td>
-              <button style="width:100%">
-                {% if user|existing_customer %}
-                <a href="/rowers/upgrade/">UPGRADE NOW</a>
-                {% else %}
-                <a href="/rowers/billing/">BUY NOW</a>
-                {% endif %}
-              </button>
-            </td>
-            {% else %}
             <td colspan=3>
               &nbsp;
             </td>
-            {% endif %}
+	    {% endif %}
           </tr>
         </tbody>
       </table>

rowers/templates/rower_form.html

@@ -52,7 +52,7 @@
         {% endif %}
       </table>
       {% csrf_token %}
-      {% if rower.clubsize < 100 and rower.user == user %}
+      {% if rower.rowerplan != 'coach' and rower.user == user %}
       <p>
         <a href="/rowers/paidplans/">Upgrade</a>
       </p>

rowers/templates/teams.html

@@ -58,8 +58,6 @@
 
   <li >
     <h2>Teams I manage</h2>
-    <p>Number of members: {{ clubsize }}</p>
-    <p>Maximum club size: {{ max_clubsize }}</p>
     {% if myteams %}
     <table width="100%" class="listtable">
       <thead>

rowers/views/teamviews.py

@@ -172,8 +172,8 @@ def rower_teams_view(request,message='',successmessage=''):
     requests = TeamRequest.objects.filter(user=request.user)
     myrequests = TeamRequest.objects.filter(team__in=myteams)
     myinvites = TeamInvite.objects.filter(team__in=myteams)
-    clubsize = teams.count_invites(request.user)+teams.count_club_members(request.user)
+    #    clubsize = teams.count_invites(request.user)+teams.count_club_members(request.user)
-    max_clubsize = r.clubsize
+    #   max_clubsize = r.clubsize
 
     messages.info(request,successmessage)
     messages.error(request,message)
@@ -190,8 +190,6 @@ def rower_teams_view(request,message='',successmessage=''):
                       'teams':ts,
                       'active':'nav-teams',
                       'breadcrumbs':breadcrumbs,
-                      'clubsize':clubsize,
-                      'max_clubsize':max_clubsize,
                       'myteams':myteams,
                       'memberteams':memberteams,
                       'invites':invites,