Turn off all references and API calls to billing if the feature is disabled

endpoints/api/user.py

@@ -194,6 +194,7 @@ class User(ApiResource):
 
 @resource('/v1/user/private')
 @internal_only
+@show_if(features.BILLING)
 class PrivateRepositories(ApiResource):
   """ Operations dealing with the available count of private repositories. """
   @require_user_admin
@@ -249,8 +250,7 @@ class ConvertToOrganization(ApiResource):
       'description': 'Information required to convert a user to an organization.',
       'required': [
         'adminUser',
-        'adminPassword',
-        'plan',
+        'adminPassword'
       ],
       'properties': {
         'adminUser': {
@@ -263,7 +263,7 @@ class ConvertToOrganization(ApiResource):
         },
         'plan': {
           'type': 'string',
-          'description': 'The plan to which the organizatino should be subscribed',
+          'description': 'The plan to which the organization should be subscribed',
         },
       },
     },
@@ -290,8 +290,9 @@ class ConvertToOrganization(ApiResource):
                            message='The admin user credentials are not valid')
 
     # Subscribe the organization to the new plan.
-    plan = convert_data['plan']
-    subscribe(user, plan, None, True)  # Require business plans
+    if features.BILLING:
+      plan = convert_data.get('plan', 'free')
+      subscribe(user, plan, None, True)  # Require business plans
 
     # Convert the user to an organization.
     model.convert_user_to_organization(user, model.get_user(admin_username))