vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

NOTE: The plans page is still broken

Browse source 
- Change the subscribe method to allow for subscribing to the free plan, even when an org
- Change the frontend to no longer have different plan groups
- Change the frontend to display the proper plans (i.e. hide the deprecated plans unless it is the current plan, etc)
This commit is contained in:
Joseph Schorr 2013-12-19 21:51:46 -05:00
parent e3504b91de
commit 3f062ee602
4 changed files with 91 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

19
static/js/controllers.js
View file

@ -22,7 +22,7 @@ function PlansCtrl($scope, $location, UserService, PlanService) {
// Load the list of plans.
PlanService.getPlans(function(plans) {
$scope.plans = plans;
});
}, /* include the personal plan */ true);
// Monitor any user changes and place the current user into the scope.
UserService.updateUserIn($scope);
@ -621,7 +621,7 @@ function UserAdminCtrl($scope, $timeout, $location, Restangular, PlanService, Us
});
PlanService.getPlans(function(plans) {
$scope.orgPlans = plans.business;
$scope.orgPlans = plans;
});
$scope.convertStep = 1;
@ -1074,17 +1074,12 @@ function OrgAdminCtrl($rootScope, $scope, Restangular, $routeParams, UserService
// Load the list of plans.
PlanService.getPlans(function(plans) {
$scope.plans = plans.business;
$scope.plans = plans;
$scope.plan_map = {};
var addPlans = function(plans) {
for (var i = 0; i < plans.length; ++i) {
$scope.plan_map[plans[i].stripeId] = plans[i];
}
};
addPlans(plans.user);
addPlans(plans.business);
for (var i = 0; i < plans.length; ++i) {
$scope.plan_map[plans[i].stripeId] = plans[i];
}
});
$scope.orgname = orgname;
@ -1230,7 +1225,7 @@ function NewOrgCtrl($scope, $routeParams, $timeout, $location, UserService, Plan
// Load the list of plans.
PlanService.getPlans(function(plans) {
$scope.plans = plans.business;
$scope.plans = plans;
$scope.currentPlan = null;
if (requested) {
PlanService.getPlan(requested, function(plan) {