From f482fc2a736e8fe3503cc7c1de87a0a3397bfd1f Mon Sep 17 00:00:00 2001
From: Mateusz Mandera <mateusz.mandera@zulip.com>
Date: Mon, 13 Feb 2023 20:49:56 +0100
Subject: [PATCH] billing: Add hint about support on the sponsorship pending
 page.

This just replaces the billing/upgrade with the statement that
"Your organization has requested sponsored or discounted hosting.", so
it should include an obvious contact in case the customer wants to amend
something or just bump a request that may have gotten missed.
---
 corporate/tests/test_stripe.py   | 20 ++++++++++++++++++++
 templates/corporate/billing.html |  5 +++++
 2 files changed, 25 insertions(+)

diff --git a/corporate/tests/test_stripe.py b/corporate/tests/test_stripe.py
index e70c3a6f44..13ce88f06a 100644
--- a/corporate/tests/test_stripe.py
+++ b/corporate/tests/test_stripe.py
@@ -2293,6 +2293,20 @@ class StripeTest(StripeTestCase):
         self.assert_in_success_response(
             ["Your organization has requested sponsored or discounted hosting."], response
         )
+        self.assert_in_success_response(
+            [
+                'Please <a href="mailto:support@zulip.com">contact Zulip support</a> if you have any questions or concerns.'
+            ],
+            response,
+        )
+        # Ensure that the other "contact support" footer is not displayed, since that would be
+        # duplicate.
+        self.assert_not_in_success_response(
+            [
+                'Contact <a href="mailto:support@zulip.com">support@zulip.com</a> for billing history.'
+            ],
+            response,
+        )
 
         self.login_user(self.example_user("othello"))
         response = self.client_get("/billing/")
@@ -2309,6 +2323,12 @@ class StripeTest(StripeTestCase):
             ["Your organization is fully sponsored and is on the <b>Zulip Cloud Standard</b>"],
             response,
         )
+        self.assert_in_success_response(
+            [
+                'Contact <a href="mailto:support@zulip.com">support@zulip.com</a> for billing history.'
+            ],
+            response,
+        )
 
     def test_redirect_for_billing_home(self) -> None:
         user = self.example_user("iago")
diff --git a/templates/corporate/billing.html b/templates/corporate/billing.html
index 2cc37c1d26..7909af7232 100644
--- a/templates/corporate/billing.html
+++ b/templates/corporate/billing.html
@@ -194,6 +194,8 @@
                 <div class="tab-content">
                     {% if sponsorship_pending %}
                     <h3>Your organization has requested sponsored or discounted hosting.</h3>
+                    <br />
+                    Please <a href="mailto:support@zulip.com">contact Zulip support</a> if you have any questions or concerns.
                     {% elif is_sponsored %}
                     <center>
                         <p>
@@ -214,11 +216,14 @@
                     </center>
                     {% endif %}
                 </div>
+                {% if not sponsorship_pending %}
+                {# In the other case, we're displaying a different message about contacting support. #}
                 <div class="support-link">
                     <p>
                         Contact <a href="mailto:support@zulip.com">support@zulip.com</a> for billing history.
                     </p>
                 </div>
+                {% endif %}
                 {% else %}
                 <p>
                     You must be an organization owner or a billing administrator to view this page.