paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 14:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

upgrade: Set the default billing period to monthly.

Browse Source
This commit is contained in:
Vishnu KS
2020-04-17 14:47:28 +05:30
committed by Tim Abbott
parent f0c5b1a8d7
commit a9c1fa25d6
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend_tests/node_tests/billing_helpers.js
View File

@@ -97,7 +97,7 @@ run_test('create_ajax_request', () => {
assert.equal(data.signed_seat_count, '"{{ signed_seat_count }}"'); assert.equal(data.signed_seat_count, '"{{ signed_seat_count }}"');
assert.equal(data.salt, '"{{ salt }}"'); assert.equal(data.salt, '"{{ salt }}"');
assert.equal(data.billing_modality, '"charge_automatically"'); assert.equal(data.billing_modality, '"charge_automatically"');
assert.equal(data.schedule, '"annual"'); assert.equal(data.schedule, '"monthly"');
assert.equal(data.license_management, '"automatic"'); assert.equal(data.license_management, '"automatic"');
assert.equal(data.licenses, ''); assert.equal(data.licenses, '');

6
frontend_tests/node_tests/upgrade.js
View File

@@ -75,7 +75,7 @@ run_test("initialize", () => {
helpers.update_charged_amount = (prices, schedule) => { helpers.update_charged_amount = (prices, schedule) => {
assert.equal(prices.annual, 6400); assert.equal(prices.annual, 6400);
assert.equal(prices.monthly, 640); assert.equal(prices.monthly, 640);
assert.equal(schedule, "annual"); assert.equal(schedule, "monthly");
}; };
$('input[type=radio][name=license_management]:checked').val = () => { $('input[type=radio][name=license_management]:checked').val = () => {
@@ -149,8 +149,8 @@ run_test("autopay_form_fields", () => {
const schedule_options = document.querySelectorAll("#autopay-form input[type=radio][name=schedule]"); const schedule_options = document.querySelectorAll("#autopay-form input[type=radio][name=schedule]");
assert.equal(schedule_options.length, 2); assert.equal(schedule_options.length, 2);
assert.equal(schedule_options[0].value, "annual"); assert.equal(schedule_options[0].value, "monthly");
assert.equal(schedule_options[1].value, "monthly"); assert.equal(schedule_options[1].value, "annual");
assert(document.querySelector("#autopay-error")); assert(document.querySelector("#autopay-error"));
assert(document.querySelector("#autopay-loading")); assert(document.querySelector("#autopay-loading"));

16
templates/corporate/upgrade.html
View File

@@ -42,7 +42,14 @@
<div id="autopay-error" class="alert alert-danger"></div> <div id="autopay-error" class="alert alert-danger"></div>
<h3>{{ _("Payment schedule") }}</h3> <h3>{{ _("Payment schedule") }}</h3>
<label> <label>
<input type="radio" name="schedule" value="annual" checked /> <input type="radio" name="schedule" value="monthly" checked/>
<div class="box">
<div class="schedule-time">{{ _("Pay monthly") }}</div>
<div class="schedule-amount">$<span id="autopay_monthly_price"></span>/user/month</div>
</div>
</label>
<label>
<input type="radio" name="schedule" value="annual"/>
<div class="box"> <div class="box">
<div class="schedule-time annually">{{ _("Pay annually") }}</div> <div class="schedule-time annually">{{ _("Pay annually") }}</div>
<div class="schedule-amount"> <div class="schedule-amount">
@@ -53,13 +60,6 @@
</div> </div>
</div> </div>
</label> </label>
<label>
<input type="radio" name="schedule" value="monthly" />
<div class="box">
<div class="schedule-time">{{ _("Pay monthly") }}</div>
<div class="schedule-amount">$<span id="autopay_monthly_price"></span>/user/month</div>
</div>
</label>
</div> </div>
<div class="license-management"> <div class="license-management">