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

fix: Remove trial logic using moment-timezone in B2C Subs Programs (#34939)

Browse Source 
REV-4067
This commit is contained in:
Juliana Kang
2024-06-12 09:41:44 -04:00
committed by GitHub
parent 5a9c383414
commit 66fa388dea
1 changed files with 5 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,10 +19,6 @@ class ProgramSubscriptionModel extends Backbone.Model {
} = context;
const priceInUSD = subscription_prices?.find(({ currency }) => currency === 'USD');
const trialMoment = DateUtils.localizeTime(
DateUtils.stringToMoment(data.trial_end),
'UTC'
);
const subscriptionState = data.subscription_state?.toLowerCase() ?? '';
const subscriptionPrice = StringUtils.interpolate(
@@ -38,24 +34,15 @@ class ProgramSubscriptionModel extends Backbone.Model {
? urls.manage_subscription_url
: urls.buy_subscription_url;
const hasActiveTrial =
subscriptionState === 'active' && data.trial_end
? trialMoment.isAfter(moment.utc())
: false;
const hasActiveTrial = false;
const remainingDays = ProgramSubscriptionModel.getRemainingDays(
data.trial_end,
userPreferences
);
const remainingDays = 0;
const [currentPeriodEnd] = ProgramSubscriptionModel.formatDate(
data.current_period_end,
userPreferences
);
const [trialEndDate, trialEndTime] = ProgramSubscriptionModel.formatDate(
data.trial_end,
userPreferences
);
const [trialEndDate, trialEndTime] = ['', ''];
super(
{
@@ -79,7 +66,7 @@ class ProgramSubscriptionModel extends Backbone.Model {
}
const userTimezone = (
userPreferences.time_zone || moment.tz.guess() || 'UTC'
userPreferences.time_zone || moment?.tz?.guess?.() || 'UTC'
);
const userLanguage = userPreferences['pref-lang'] || 'en';
const context = {
@@ -90,37 +77,10 @@ class ProgramSubscriptionModel extends Backbone.Model {
};
const localDate = DateUtils.localize(context);
const localTime = DateUtils.localizeTime(
DateUtils.stringToMoment(date),
userTimezone
).format('HH:mm (z)');
const localTime = '';
return [localDate, localTime];
}
static getRemainingDays(trialEndDate, userPreferences) {
if (!trialEndDate) {
return 0;
}
const userTimezone = (
userPreferences.time_zone || moment.tz.guess() || 'UTC'
);
const trialEndTime = DateUtils.localizeTime(
DateUtils.stringToMoment(trialEndDate),
userTimezone
);
const currentTime = DateUtils.localizeTime(
moment.utc(),
userTimezone
);
return trialEndTime.diff(currentTime, 'days') < 1
? // 0 if trial end time is less than 24 hrs
0
: // else return actual difference in days
trialEndTime.startOf('day').diff(currentTime.startOf('day'), 'days');
}
}
export default ProgramSubscriptionModel;