%(count)s"
@@ -5783,15 +5829,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: warehouse/templates/manage/project/settings.html:252
+#: warehouse/templates/manage/project/settings.html:259
msgid "Irreversibly delete the project"
msgstr ""
-#: warehouse/templates/manage/project/settings.html:256
+#: warehouse/templates/manage/project/settings.html:263
msgid "Make the project name available to any other PyPI user"
msgstr ""
-#: warehouse/templates/manage/project/settings.html:258
+#: warehouse/templates/manage/project/settings.html:265
msgid ""
"This user will be able to make new releases under this project name, so "
"long as the distribution filenames do not match filenames from a "
diff --git a/warehouse/manage/views/organizations.py b/warehouse/manage/views/organizations.py
index 7e0c4eceb925..5b0afc29dd24 100644
--- a/warehouse/manage/views/organizations.py
+++ b/warehouse/manage/views/organizations.py
@@ -341,6 +341,14 @@ def save_organization(self):
previous_organization_description=previous_organization_description,
previous_organization_orgtype=previous_organization_orgtype,
)
+ if self.organization.customer is not None:
+ self.billing_service.update_customer(
+ self.organization.customer.customer_id,
+ self.organization.customer_name(
+ self.request.registry.settings["site.name"]
+ ),
+ self.organization.description,
+ )
self.request.session.flash("Organization details updated", queue="success")
@@ -485,10 +493,8 @@ def __init__(self, organization, request):
def customer_id(self):
if self.organization.customer is None:
customer = self.billing_service.create_customer(
- name=(
+ name=self.organization.customer_name(
self.request.registry.settings["site.name"]
- + " Organization - "
- + self.organization.name
),
description=self.organization.description,
)
diff --git a/warehouse/mock/billing.py b/warehouse/mock/billing.py
index 9f7ce8c5873e..6108847a0477 100644
--- a/warehouse/mock/billing.py
+++ b/warehouse/mock/billing.py
@@ -18,7 +18,6 @@
from pyramid.httpexceptions import HTTPNotFound, HTTPSeeOther
from pyramid.view import view_config, view_defaults
-from warehouse.admin.flags import AdminFlagValue
from warehouse.api.billing import handle_billing_webhook_event
from warehouse.organizations.models import Organization
from warehouse.subscriptions.interfaces import IBillingService
@@ -36,9 +35,9 @@
class MockBillingViews:
def __init__(self, organization, request):
billing_service = request.find_service(IBillingService, context=None)
- if request.flags.enabled(
- AdminFlagValue.DISABLE_ORGANIZATIONS
- ) or not isinstance(billing_service, MockStripeBillingService):
+ if not request.organization_access or not isinstance(
+ billing_service, MockStripeBillingService
+ ):
raise HTTPNotFound
self.organization = organization
self.request = request
diff --git a/warehouse/organizations/models.py b/warehouse/organizations/models.py
index 521ca16e02e0..a83bbfeb20e4 100644
--- a/warehouse/organizations/models.py
+++ b/warehouse/organizations/models.py
@@ -417,6 +417,9 @@ def active_subscription(self):
else:
return None
+ def customer_name(self, site_name="PyPI"):
+ return f"{site_name} Organization - {self.display_name} ({self.name})"
+
class OrganizationNameCatalog(db.Model):
diff --git a/warehouse/subscriptions/interfaces.py b/warehouse/subscriptions/interfaces.py
index 10f7be48d0a0..2ff6c551b7a4 100644
--- a/warehouse/subscriptions/interfaces.py
+++ b/warehouse/subscriptions/interfaces.py
@@ -34,6 +34,11 @@ def create_customer(name, description):
Create the Customer resource via Billing API with the given name and description
"""
+ def update_customer(customer_id, name, description):
+ """
+ Update a Customer resource via Billing API with the given name and description
+ """
+
def create_checkout_session(customer_id, price_ids, success_url, cancel_url):
"""
# Create new Checkout Session for the order
diff --git a/warehouse/subscriptions/services.py b/warehouse/subscriptions/services.py
index bf9586bf2490..5253b1e9619c 100644
--- a/warehouse/subscriptions/services.py
+++ b/warehouse/subscriptions/services.py
@@ -78,6 +78,13 @@ def create_customer(self, name, description):
description=description,
)
+ def update_customer(self, customer_id, name, description):
+ return self.api.Customer.modify(
+ customer_id,
+ name=name,
+ description=description,
+ )
+
def create_checkout_session(self, customer_id, price_ids, success_url, cancel_url):
"""
# Create new Checkout Session for the order
diff --git a/warehouse/templates/manage/organization/settings.html b/warehouse/templates/manage/organization/settings.html
index 60742e83d1e4..d383b2c7277b 100644
--- a/warehouse/templates/manage/organization/settings.html
+++ b/warehouse/templates/manage/organization/settings.html
@@ -225,20 +225,21 @@ {% trans %}Cannot delete organization{% endtrans %}
{% pluralize %}
Your organization currently owns {{ count }} projects.
{% endtrans %}
- {% trans count=active_projects|length %}
- You must transfer ownership or delete this project before you can delete your organization.
- {% pluralize %}
- You must transfer ownership or delete these projects before you can delete your organization.
- {% endtrans %}
+ {% trans %}For each project, you must either:{% endtrans %}
+
+ - {% trans %}Transfer ownership and remove the project from your organization{% endtrans %}
+ - {% trans %}Delete the project{% endtrans %}
+
+ {% trans %}Before you can delete your organization.{% endtrans %}
{% for project in active_projects %}
-
{{ project.name }} -
- {% trans transfer_href=request.route_path('manage.project.roles', project_name=project.name), delete_href=request.route_path('manage.project.settings', project_name=project.name) %}
- transfer ownership
- or
- delete project
+ {% trans transfer_href=request.route_path('manage.project.roles', project_name=project.name), remove_delete_href=request.route_path('manage.project.settings', project_name=project.name) %}
+ transfer ownership and remove project
+ or
+ delete project
{% endtrans %}
{% endfor %}
@@ -249,6 +250,21 @@ {% trans %}Proceed with caution!{% endtrans %}
{% trans %}Warning{% endtrans %}
{% trans %}You will not be able to recover your organization after you delete it.{% endtrans %}
+ {% if organization %}
+ {% if organization.subscriptions %}
+
+ {% trans %}Warning{% endtrans %}
+ {% if organization.active_subscription %}
+ {% trans %}Your subscription will be cancelled, and you will lose access to the billing portal.{% endtrans %}
+ {% else %}
+ {% trans %}You will lose access to the billing portal.{% endtrans %}
+ {% endif %}
+ {% trans billing_href=request.route_path('manage.organization.subscription', organization_name=organization.normalized_name, _query={'next': request.current_route_path(organization_name=organization.normalized_name)})%}
+ Please ensure you have retrieved all invoices from your billing portal before proceeding.
+ {% endtrans %}
+
+ {% endif %}
+ {% endif %}
{{ confirm_button(gettext("Delete organization"), gettext("Organization Name"), "organization_name", organization.name) }}
{% endif %}
diff --git a/warehouse/templates/manage/project/settings.html b/warehouse/templates/manage/project/settings.html
index 98403161f51d..00b57edde66c 100644
--- a/warehouse/templates/manage/project/settings.html
+++ b/warehouse/templates/manage/project/settings.html
@@ -183,6 +183,13 @@
-
{% trans organization_name=project.organization.name %}Revoke project permissions for teams in the '{{ organization_name }}' organization.{% endtrans %}
+ {% else %}
+ -
+ {% trans %}Revoke your direct Owner role on the project.{% endtrans %}
+
+ -
+ {% trans %}You will retain Owner permissions on the project through your organization role.{% endtrans %}
+
{% endif %}
-
{% if project.organization %}
@@ -196,7 +203,7 @@
- {% trans %}Individual owners and maintainers of the project will retain their project permissions.{% endtrans %}
+ {% trans %}All other individual owners and maintainers of the project will retain their project permissions.{% endtrans %}
{% set action = request.route_path('manage.project.transfer_organization_project', project_name=project.normalized_name) %}
{% set extra_fields %}