diff --git a/src/app/organization/organizationBillingController.js b/src/app/organization/organizationBillingController.js
index 1074272279..c8d47c6891 100644
--- a/src/app/organization/organizationBillingController.js
+++ b/src/app/organization/organizationBillingController.js
@@ -15,7 +15,7 @@
$scope.plan = {
name: org.Plan,
type: org.PlanType,
- maxUsers: org.MaxUsers
+ seats: org.Seats
};
$scope.subscription = {
diff --git a/src/app/organization/views/organizationBilling.html b/src/app/organization/views/organizationBilling.html
index 9f81765853..512a90999c 100644
--- a/src/app/organization/views/organizationBilling.html
+++ b/src/app/organization/views/organizationBilling.html
@@ -15,8 +15,8 @@
- Name
- {{plan.name || '-'}}
- - Maximum Users
- - {{plan.maxUsers || '-'}}
+ - Total Seats
+ - {{plan.seats || '-'}}
diff --git a/src/app/settings/settingsCreateOrganizationController.js b/src/app/settings/settingsCreateOrganizationController.js
index c1c82eed9c..6653ee5c19 100644
--- a/src/app/settings/settingsCreateOrganizationController.js
+++ b/src/app/settings/settingsCreateOrganizationController.js
@@ -6,48 +6,51 @@
$scope.plans = {
free: {
basePrice: 0,
- noAdditionalUsers: true,
+ noAdditionalSeats: true,
noPayment: true
},
personal: {
basePrice: 1,
annualBasePrice: 12,
- baseUsers: 5,
- userPrice: 1,
- annualUserPrice: 12,
- maxAdditionalUsers: 5
+ baseSeats: 5,
+ seatPrice: 1,
+ annualSeatPrice: 12,
+ maxAdditionalSeats: 5,
+ annualPlanType: 'personalAnnually'
},
teams: {
basePrice: 5,
annualBasePrice: 60,
monthlyBasePrice: 8,
- baseUsers: 5,
- userPrice: 2,
- annualUserPrice: 24,
- monthlyUserPrice: 2.5
+ baseSeats: 5,
+ seatPrice: 2,
+ annualSeatPrice: 24,
+ monthlySeatPrice: 2.5,
+ monthPlanType: 'teamsMonthly',
+ annualPlanType: 'teamsAnnually'
}
};
$scope.model = {
plan: 'free',
- additionalUsers: 0,
+ additionalSeats: 0,
interval: 'year',
ownedBusiness: false
};
$scope.totalPrice = function () {
if ($scope.model.interval === 'month') {
- return ($scope.model.additionalUsers || 0) * $scope.plans[$scope.model.plan].monthlyUserPrice +
+ return ($scope.model.additionalSeats || 0) * $scope.plans[$scope.model.plan].monthlySeatPrice +
$scope.plans[$scope.model.plan].monthlyBasePrice;
}
else {
- return ($scope.model.additionalUsers || 0) * $scope.plans[$scope.model.plan].annualUserPrice +
+ return ($scope.model.additionalSeats || 0) * $scope.plans[$scope.model.plan].annualSeatPrice +
$scope.plans[$scope.model.plan].annualBasePrice;
}
};
$scope.changedPlan = function () {
- if ($scope.model.plan !== 'teams') {
+ if ($scope.plans[$scope.model.plan].hasOwnProperty('monthPlanType')) {
$scope.model.interval = 'year';
}
};
@@ -75,13 +78,13 @@
$scope.submitPromise = stripe.card.createToken(model.card).then(function (response) {
var paidRequest = {
name: model.name,
- planType: model.plan,
+ planType: model.interval === 'month' ? $scope.plans[model.plan].monthPlanType :
+ $scope.plans[model.plan].annualPlanType,
key: shareKey,
paymentToken: response.id,
- additionalUsers: model.additionalUsers,
+ additionalSeats: model.additionalSeats,
billingEmail: model.billingEmail,
- businessName: model.ownedBusiness ? model.businessName : null,
- monthly: model.interval === 'month'
+ businessName: model.ownedBusiness ? model.businessName : null
};
return apiService.organizations.post(paidRequest).$promise;
diff --git a/src/app/settings/views/settingsCreateOrganization.html b/src/app/settings/views/settingsCreateOrganization.html
index 4c1c2f1c45..c85a6b9ccb 100644
--- a/src/app/settings/views/settingsCreateOrganization.html
+++ b/src/app/settings/views/settingsCreateOrganization.html
@@ -78,8 +78,8 @@
- Priority customer support
- 7 day free trial, cancel anytime
- {{plans.personal.basePrice | currency:'$'}} /month for {{plans.personal.baseUsers}} users,
- additional users {{plans.personal.userPrice | currency:'$'}} /month
+ {{plans.personal.basePrice | currency:'$'}} /month for {{plans.personal.baseSeats}} users,
+ additional users {{plans.personal.seatPrice | currency:'$'}} /month
@@ -93,8 +93,8 @@
- Priority customer support
- 7 day free trial, cancel anytime
- {{plans.teams.basePrice | currency:'$'}} /month for {{plans.teams.baseUsers}} users,
- additional users {{plans.teams.userPrice | currency:'$'}} /month
+ {{plans.teams.basePrice | currency:'$'}} /month for {{plans.teams.baseSeats}} users,
+ additional users {{plans.teams.seatPrice | currency:'$'}} /month
@@ -105,25 +105,25 @@
-
+
- Your plan comes with {{plans[model.plan].baseUsers}} users. You can add additional users
-
- (up to {{plans[model.plan].maxAdditionalUsers}} more)
+ Your plan comes with {{plans[model.plan].baseSeats}} users (seats). You can add additional users
+
+ (up to {{plans[model.plan].maxAdditionalSeats}} more)
- for {{plans[model.plan].userPrice | currency:'$'}} per user /month.
+ for {{plans[model.plan].seatPrice | currency:'$'}} per user /month.
@@ -145,8 +145,8 @@
Additional users:
- {{model.additionalUsers || 0}} ×{{plans[model.plan].userPrice | currency:"$":2}}
- ×12 mo. = {{(model.additionalUsers * plans[model.plan].annualUserPrice) | currency:"$":2}} /year
+ {{model.additionalSeats || 0}} ×{{plans[model.plan].seatPrice | currency:"$":2}}
+ ×12 mo. = {{(model.additionalSeats * plans[model.plan].annualSeatPrice) | currency:"$":2}} /year
@@ -160,8 +160,8 @@
Additional users:
- {{model.additionalUsers || 0}} ×{{plans[model.plan].monthlyUserPrice | currency:"$":2}} =
- {{(model.additionalUsers * plans[model.plan].monthlyUserPrice) | currency:"$":2}} /month
+ {{model.additionalSeats || 0}} ×{{plans[model.plan].monthlySeatPrice | currency:"$":2}} =
+ {{(model.additionalSeats * plans[model.plan].monthlySeatPrice) | currency:"$":2}} /month