paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-06 06:53:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

billing: Update class and id attributes to use "complimentary-access".

Browse Source 
The "cancel-legacy-server-upgrade-button" class attribute was not
being used in CSS rules or frontend biling code, so these changes
remove it instead of renaming it.
This commit is contained in:
Lauryn Menard
2024-12-12 19:11:39 +01:00
committed by Tim Abbott
parent f63e5c9242
commit 23bd4a99f8
3 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
templates/corporate/billing/billing.html
View File

@@ -61,8 +61,8 @@
</div> </div>
</div> </div>
{% if complimentary_access_plan %} {% if complimentary_access_plan %}
<div class="input-box billing-page-field" id="legacy-server-push-notification-notice-wrapper"> <div class="input-box billing-page-field" id="complimentary-access-end-notice-wrapper">
<div id="legacy-server-push-notification-notice" class="not-editable-realm-field"> <div id="complimentary-access-end-notice" class="not-editable-realm-field">
<i>Your complimentary access to Zulip Basic ends on {{ complimentary_access_plan_end_date }}.</i> <i>Your complimentary access to Zulip Basic ends on {{ complimentary_access_plan_end_date }}.</i>
</div> </div>
</div> </div>
@@ -353,8 +353,8 @@
</button> </button>
</div> </div>
{% elif complimentary_access_plan %} {% elif complimentary_access_plan %}
<div class="plan-toggle-action input-box billing-page-field" id="cancel-legacy-server-upgrade"> <div class="plan-toggle-action input-box billing-page-field" id="cancel-complimentary-access-upgrade">
<button class="cancel-legacy-server-upgrade-button plan-toggle-action-button"> <button class="plan-toggle-action-button">
<span class="billing-button-text">Cancel upgrade</span> <span class="billing-button-text">Cancel upgrade</span>
<object class="loader billing-button-loader" type="image/svg+xml" data="{{ static('images/loading/loader-white.svg') }}"></object> <object class="loader billing-button-loader" type="image/svg+xml" data="{{ static('images/loading/loader-white.svg') }}"></object>
</button> </button>
@@ -560,7 +560,7 @@
</div> </div>
</div> </div>
</div> </div>
<div id="confirm-cancel-legacy-server-upgrade-modal" class="micromodal" aria-hidden="true"> <div id="confirm-cancel-complimentary-access-upgrade-modal" class="micromodal" aria-hidden="true">
<div class="modal__overlay" tabindex="-1"> <div class="modal__overlay" tabindex="-1">
<div class="modal__container" role="dialog" aria-modal="true" aria-labelledby="dialog_title"> <div class="modal__container" role="dialog" aria-modal="true" aria-labelledby="dialog_title">
<header class="modal__header"> <header class="modal__header">

37
web/src/billing/billing.ts
View File

@@ -225,26 +225,29 @@ export function initialize(): void {
portico_modals.open($modal.attr("id")!); portico_modals.open($modal.attr("id")!);
}); });
$("#cancel-legacy-server-upgrade").on("click", (e) => { $("#cancel-complimentary-access-upgrade").on("click", (e) => {
e.preventDefault(); e.preventDefault();
portico_modals.open("confirm-cancel-legacy-server-upgrade-modal"); portico_modals.open("confirm-cancel-complimentary-access-upgrade-modal");
}); });
$("#confirm-cancel-legacy-server-upgrade-modal .dialog_submit_button").on("click", (e) => { $("#confirm-cancel-complimentary-access-upgrade-modal .dialog_submit_button").on(
helpers.create_ajax_request( "click",
`/json${billing_base_url}/billing/plan`, (e) => {
"planchange", helpers.create_ajax_request(
[], `/json${billing_base_url}/billing/plan`,
"PATCH", "planchange",
() => { [],
window.location.replace( "PATCH",
`${billing_base_url}/upgrade/?success_message=` + () => {
encodeURIComponent("Your plan is no longer scheduled for an upgrade."), window.location.replace(
); `${billing_base_url}/upgrade/?success_message=` +
}, encodeURIComponent("Your plan is no longer scheduled for an upgrade."),
); );
e.preventDefault(); },
}); );
e.preventDefault();
},
);
$("#confirm-licenses-modal-increase, #confirm-licenses-modal-decrease").on( $("#confirm-licenses-modal-increase, #confirm-licenses-modal-decrease").on(
"click", "click",

4
web/styles/portico/billing.css
View File

@@ -551,7 +551,7 @@ input[name="licenses"] {
#server-login-page-details #server-login-form-title, #server-login-page-details #server-login-form-title,
#billing-page-details .stripe-customer-billing-portal, #billing-page-details .stripe-customer-billing-portal,
#billing-page-details #legacy-server-push-notification-notice, #billing-page-details #complimentary-access-end-notice,
#billing-page-details .next-payment-info { #billing-page-details .next-payment-info {
width: 450px; width: 450px;
padding-top: 0; padding-top: 0;
@@ -724,7 +724,7 @@ input[name="licenses"] {
#remote-billing-confirm-login-button, #remote-billing-confirm-login-button,
#remote-billing-confirm-email-button, #remote-billing-confirm-email-button,
#billing-page-details #legacy-server-push-notification-notice-wrapper { #billing-page-details #complimentary-access-end-notice-wrapper {
margin-top: 10px; margin-top: 10px;
} }