Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

support: Add option to upgrade an org to Plus plan on /activity/support. 

This is so that we don't need ops to run the
manage.py switch_realm_from_standard_to_plus_plan command on the server
to handle these upgrades.
This commit is contained in:
Mateusz Mandera 2023-04-11 00:29:38 +02:00 committed by Tim Abbott
parent 1a15449e16
commit 24d9d3d90c
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
analytics/tests/test_support_views.py
View File

@ -667,6 +667,17 @@ class TestSupportEndpoint(ZulipTestCase):
["zulip downgraded and voided 1 open invoices"], result ["zulip downgraded and voided 1 open invoices"], result
) )
with mock.patch("analytics.views.support.switch_realm_from_standard_to_plus_plan") as m:
result = self.client_post(
"/activity/support",
{
"realm_id": f"{iago.realm_id}",
"modify_plan": "upgrade_to_plus",
},
)
m.assert_called_once_with(get_realm("zulip"))
self.assert_in_success_response(["zulip upgraded to Plus"], result)
def test_scrub_realm(self) -> None: def test_scrub_realm(self) -> None:
cordelia = self.example_user("cordelia") cordelia = self.example_user("cordelia")
lear_realm = get_realm("lear") lear_realm = get_realm("lear")

5
analytics/views/support.py
View File

@ -54,6 +54,7 @@ if settings.BILLING_ENABLED:
get_discount_for_realm, get_discount_for_realm,
get_latest_seat_count, get_latest_seat_count,
make_end_of_cycle_updates_if_needed, make_end_of_cycle_updates_if_needed,
switch_realm_from_standard_to_plus_plan,
update_billing_method_of_current_plan, update_billing_method_of_current_plan,
update_sponsorship_status, update_sponsorship_status,
void_all_open_invoices, void_all_open_invoices,
@ -125,6 +126,7 @@ VALID_MODIFY_PLAN_METHODS = [
"downgrade_at_billing_cycle_end", "downgrade_at_billing_cycle_end",
"downgrade_now_without_additional_licenses", "downgrade_now_without_additional_licenses",
"downgrade_now_void_open_invoices", "downgrade_now_void_open_invoices",
"upgrade_to_plus",
] ]
VALID_STATUS_VALUES = [ VALID_STATUS_VALUES = [
@ -268,6 +270,9 @@ def support(
context[ context[
"success_message" "success_message"
] = f"{realm.string_id} downgraded and voided {voided_invoices_count} open invoices" ] = f"{realm.string_id} downgraded and voided {voided_invoices_count} open invoices"
elif modify_plan == "upgrade_to_plus":
switch_realm_from_standard_to_plus_plan(realm)
context["success_message"] = f"{realm.string_id} upgraded to Plus"
elif scrub_realm: elif scrub_realm:
do_scrub_realm(realm, acting_user=acting_user) do_scrub_realm(realm, acting_user=acting_user)
context["success_message"] = f"{realm.string_id} scrubbed." context["success_message"] = f"{realm.string_id} scrubbed."

1
templates/analytics/realm_details.html
View File

@ -145,6 +145,7 @@
<option value="downgrade_at_billing_cycle_end">Downgrade at the end of current billing cycle</option> <option value="downgrade_at_billing_cycle_end">Downgrade at the end of current billing cycle</option>
<option value="downgrade_now_without_additional_licenses">Downgrade now without creating additional invoices</option> <option value="downgrade_now_without_additional_licenses">Downgrade now without creating additional invoices</option>
<option value="downgrade_now_void_open_invoices">Downgrade now and void open invoices</option> <option value="downgrade_now_void_open_invoices">Downgrade now and void open invoices</option>
<option value="upgrade_to_plus">Upgrade to the Plus plan</option>
</select> </select>
<button type="submit" class="btn btn-default support-submit-button">Modify</button> <button type="submit" class="btn btn-default support-submit-button">Modify</button>
</form> </form>