github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

Show prices including VAT in the upgrade to group subscription modal (#5463)

Browse source 
* Add VAT calculation (with details) to the group upgrade modal

* Move 'per year' to seperate line to prevent text overflow

* Rename taxAmmount to taxAmount

GitOrigin-RevId: 37b7d471a704192d9cc4b96765f7449e747b2add
This commit is contained in:
Thomas 2021-10-28 15:00:22 +02:00 committed by Copybot
parent e7c1d47ab6
commit ffdafb9700
2 changed files with 36 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
services/web/app/views/subscriptions/_modal_group_upgrade.pug
View file

@ -6,8 +6,9 @@ script(type="text/ng-template", id="groupPlanModalUpgradeTemplate")
.row
.col-md-6.text-center
.circle.circle-lg
| {{ displayPrice }}
span.small / year
| {{ displayPrice.total }}
br
span.small per year
br
span.circle-subtext For {{ selected.size }} users
ul.list-unstyled
@ -46,6 +47,9 @@ script(type="text/ng-template", id="groupPlanModalUpgradeTemplate")
| Save an additional 40% on groups of 10 or more with our educational discount
.modal-footer
.text-center
p(ng-show="displayPrice.includesTax") Total:
strong {{ displayPrice.total }}
| ({{displayPrice.subtotal}} + {{displayPrice.tax}} tax) per year
p
strong Your new subscription will be billed immediately to your current payment method.
hr.thin

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

@ -76,15 +76,20 @@ App.factory('RecurlyPricing', function ($q, MultiCurrencyPricing) {
.currency(currency)
.done(function (price) {
const totalPriceExTax = parseFloat(price.next.total)
let taxAmmount = totalPriceExTax * taxRate
if (isNaN(taxAmmount)) {
taxAmmount = 0
let taxAmount = totalPriceExTax * taxRate
if (isNaN(taxAmount)) {
taxAmount = 0
}
let total = totalPriceExTax + taxAmmount
let total = totalPriceExTax + taxAmount
if (total % 1 !== 0) {
total = total.toFixed(2)
}
resolve(`${currencySymbol}${total}`)
resolve({
total: `${currencySymbol}${total}`,
subtotal: `${currencySymbol}${totalPriceExTax.toFixed(2)}`,
tax: `${currencySymbol}${taxAmount.toFixed(2)}`,
includesTax: taxAmount !== 0,
})
})
})
},
@ -117,7 +122,7 @@ App.controller('ChangePlanToGroupFormController', function ($scope, $modal) {
App.controller(
'GroupPlansModalUpgradeController',
function ($scope, $modal, $location, $http) {
function ($scope, $modal, $location, $http, RecurlyPricing) {
$scope.options = {
plan_codes: [
{
@ -174,10 +179,24 @@ App.controller(
}
$scope.recalculatePrice = function () {
const subscription = getMeta('ol-subscription')
const { taxRate } = subscription.recurly
const { usage, plan_code, currency, size } = $scope.selected
const price = $scope.prices[usage][plan_code][currency][size]
const placeholder = { total: '...' }
if (taxRate === 0) {
const basePrice = $scope.prices[usage][plan_code][currency][size]
const currencySymbol = $scope.options.currencySymbols[currency]
$scope.displayPrice = `${currencySymbol}${price}`
placeholder.total = `${currencySymbol}${basePrice}`
}
$scope.displayPrice = placeholder // Placeholder while we talk to recurly
const recurlyPlanCode = `group_${plan_code}_${size}_${usage}`
RecurlyPricing.loadDisplayPriceWithTax(
recurlyPlanCode,
currency,
taxRate
).then(price => {
$scope.displayPrice = price
})
}
$scope.$watch('selected', $scope.recalculatePrice, true)
@ -234,7 +253,7 @@ App.controller(
$scope.price = '...' // Placeholder while we talk to recurly
RecurlyPricing.loadDisplayPriceWithTax(planCode, currency, taxRate).then(
price => {
$scope.price = price
$scope.price = price.total
}
)
})
@ -380,7 +399,7 @@ App.controller(
$scope.studentPrice = '...' // Placeholder while we talk to recurly
RecurlyPricing.loadDisplayPriceWithTax('student', currency, taxRate).then(
price => {
$scope.studentPrice = price
$scope.studentPrice = price.total
}
)