Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PON-241: Copy changes on Program details page (#32352)

Browse Source 
* feat: update subscription info text in various states

* feat: update subscription trial ending alert
This commit is contained in:
Nawfal Ahmed
2023-06-05 17:46:11 +05:00
committed by GitHub
parent 249aabbc4f
commit c6934dda8c
5 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lms/static/js/learner_dashboard/models/program_subscription_model.js
View File

@@ -18,11 +18,9 @@ class ProgramSubscriptionModel extends Backbone.Model {
} = context;
const priceInUSD = subscription_prices?.find(({ currency }) => currency === 'USD');
const trialMoment = moment(
DateUtils.localizeTime(
DateUtils.stringToMoment(data.trial_end),
'UTC'
)
const trialMoment = DateUtils.localizeTime(
DateUtils.stringToMoment(data.trial_end),
'UTC'
);
const subscriptionState = data.subscription_state?.toLowerCase() ?? '';
@@ -44,7 +42,10 @@ class ProgramSubscriptionModel extends Backbone.Model {
? trialMoment.isAfter(moment.utc())
: false;
const remainingDays = trialMoment.diff(moment.utc(), 'days');
const remainingDays = ProgramSubscriptionModel.getRemainingDays(
data.trial_end,
userPreferences
);
const [currentPeriodEnd] = ProgramSubscriptionModel.formatDate(
data.current_period_end,
@@ -91,10 +92,29 @@ class ProgramSubscriptionModel extends Backbone.Model {
const localTime = DateUtils.localizeTime(
DateUtils.stringToMoment(date),
userTimezone
).format('HH:mm');
).format('HH:mm (z)');
return [localDate, localTime];
}
static getRemainingDays(trialEndDate, userPreferences) {
if (!trialEndDate) {
return 0;
}
const userTimezone = userPreferences.time_zone || 'UTC';
const trialEndTime = DateUtils.localizeTime(
DateUtils.stringToMoment(trialEndDate),
userTimezone
).startOf('day');
const currentTime = DateUtils.localizeTime(
moment.utc(),
userTimezone
).startOf('day');
return trialEndTime.diff(currentTime, 'days');
}
}
export default ProgramSubscriptionModel;

4
lms/static/js/learner_dashboard/spec/program_details_view_spec.js
View File

@@ -703,7 +703,7 @@ describe('Program Details View', () => {
testSubscriptionState(
'active',
'Manage my subscription',
'Active trial ends',
'Trial ends',
true,
);
});
@@ -720,7 +720,7 @@ describe('Program Details View', () => {
testSubscriptionState(
'inactive',
'Restart my subscription',
'Unlock verified access to all courses for $100/month USD. Cancel anytime.',
'$100/month USD subscription. Cancel anytime.',
);
});
});

8
lms/static/js/learner_dashboard/views/program_alert_list_view.js
View File

@@ -57,11 +57,15 @@ class ProgramAlertListView extends Backbone.View {
return alertList.concat(this.trialEndingAlerts.map(
({ title: programName, remainingDays, ...data }) => ({
title: StringUtils.interpolate(
ngettext('Subscription trial expires in {remainingDays} day', 'Subscription trial expires in {remainingDays} days', remainingDays),
remainingDays < 1
? gettext('Subscription trial expires in less than 24 hours')
: ngettext('Subscription trial expires in {remainingDays} day', 'Subscription trial expires in {remainingDays} days', remainingDays),
{ remainingDays }
),
message: StringUtils.interpolate(
ngettext('Your {programName} trial will expire in {remainingDays} day at {trialEndTime} on {trialEndDate} and the card on file will be charged {subscriptionPrice}.', 'Your {programName} trial will expire in {remainingDays} days at {trialEndTime} on {trialEndDate} and the card on file will be charged {subscriptionPrice}.', remainingDays),
remainingDays < 1
? gettext('Your {programName} trial will expire at {trialEndTime} on {trialEndDate} and the card on file will be charged {subscriptionPrice}.')
: ngettext('Your {programName} trial will expire in {remainingDays} day at {trialEndTime} on {trialEndDate} and the card on file will be charged {subscriptionPrice}.', 'Your {programName} trial will expire in {remainingDays} days at {trialEndTime} on {trialEndDate} and the card on file will be charged {subscriptionPrice}.', remainingDays),
{
programName,
remainingDays,

4
lms/templates/learner_dashboard/program_details_tab_view.underscore
View File

@@ -85,11 +85,11 @@
<%- StringUtils.interpolate(
(
hasActiveTrial
? gettext('Active trial ends {trialEndDate} at {trialEndTime}')
? gettext('Trial ends {trialEndDate} at {trialEndTime}')
: subscriptionState === 'active'
? gettext('Your next billing date is {currentPeriodEnd}')
: subscriptionState === 'inactive'
? gettext('Unlock verified access to all courses for {subscriptionPrice}. Cancel anytime.')
? gettext('{subscriptionPrice} subscription. Cancel anytime.')
: gettext('{subscriptionPrice} subscription after trial ends. Cancel anytime.')
),
{

4
lms/templates/learner_dashboard/program_details_view.underscore
View File

@@ -60,11 +60,11 @@
<%- StringUtils.interpolate(
(
hasActiveTrial
? gettext('Active trial ends {trialEndDate} at {trialEndTime}')
? gettext('Trial ends {trialEndDate} at {trialEndTime}')
: subscriptionState === 'active'
? gettext('Your next billing date is {currentPeriodEnd}')
: subscriptionState === 'inactive'
? gettext('Unlock verified access to all courses for {subscriptionPrice}. Cancel anytime.')
? gettext('{subscriptionPrice} subscription. Cancel anytime.')
: gettext('{subscriptionPrice} subscription after trial ends. Cancel anytime.')
),
{