github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-01-27 10:03:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8261 from overleaf/tm-show-correct-price-in-change-plans-list

Browse source 
Show correct prices in change plans list on subscription dashboard

GitOrigin-RevId: 194b516bae92564d33f50e1c0035d21b2ba246a9
This commit is contained in:
Thomas 2022-06-03 12:13:03 +02:00 committed by Copybot
parent b12c108522
commit 11fddee8e4
2 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.js
View file

@ -272,6 +272,11 @@ function buildUsersSubscriptionViewModel(user, callback) {
pendingSubscriptionTax, pendingSubscriptionTax,
recurlySubscription.currency recurlySubscription.currency
) )
personalSubscription.recurly.currentPlanDisplayPrice =
SubscriptionFormatters.formatPrice(
recurlySubscription.unit_amount_in_cents + addOnPrice + tax,
recurlySubscription.currency
)
const pendingTotalLicenses = const pendingTotalLicenses =
(pendingPlan.membersLimit || 0) + pendingAdditionalLicenses (pendingPlan.membersLimit || 0) + pendingAdditionalLicenses
personalSubscription.recurly.pendingAdditionalLicenses = personalSubscription.recurly.pendingAdditionalLicenses =

24
services/web/frontend/js/main/subscription-dashboard.js
View file

@ -210,6 +210,10 @@ App.controller(
function ($scope, $modal, RecurlyPricing) { function ($scope, $modal, RecurlyPricing) {
if (!ensureRecurlyIsSetup()) return if (!ensureRecurlyIsSetup()) return
function stripCentsIfZero(displayPrice) {
return displayPrice ? displayPrice.replace(/\.00$/, '') : '...'
}
$scope.changePlan = () => $scope.changePlan = () =>
$modal.open({ $modal.open({
templateUrl: 'confirmChangePlanModalTemplate', templateUrl: 'confirmChangePlanModalTemplate',
@ -239,6 +243,26 @@ App.controller(
const planCode = plan.planCode const planCode = plan.planCode
const subscription = getMeta('ol-subscription') const subscription = getMeta('ol-subscription')
const { currency, taxRate } = subscription.recurly const { currency, taxRate } = subscription.recurly
if (subscription.recurly.displayPrice) {
if (subscription.pendingPlan?.planCode === planCode) {
$scope.displayPrice = stripCentsIfZero(
subscription.recurly.displayPrice
)
return
}
if (subscription.planCode === planCode) {
if (subscription.pendingPlan) {
$scope.displayPrice = stripCentsIfZero(
subscription.recurly.currentPlanDisplayPrice
)
} else {
$scope.displayPrice = stripCentsIfZero(
subscription.recurly.displayPrice
)
}
return
}
}
$scope.displayPrice = '...' // Placeholder while we talk to recurly $scope.displayPrice = '...' // Placeholder while we talk to recurly
RecurlyPricing.loadDisplayPriceWithTax(planCode, currency, taxRate).then( RecurlyPricing.loadDisplayPriceWithTax(planCode, currency, taxRate).then(
recurlyPrice => { recurlyPrice => {