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

Merge branch 'master' of ssh://bitbucket.org/yackob03/quay

Browse source
This commit is contained in:
yackob03 2013-11-14 14:54:03 -05:00
commit 82805cb7aa
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
static/js/controllers.js
View file

@ -1188,9 +1188,15 @@ function OrgAdminCtrl($rootScope, $scope, Restangular, $routeParams, UserService
PlanService.getPlans(function(plans) { PlanService.getPlans(function(plans) {
$scope.plans = plans.business; $scope.plans = plans.business;
$scope.plan_map = {}; $scope.plan_map = {};
for (var i = 0; i < plans.business.length; ++i) {
$scope.plan_map[plans.business[i].stripeId] = plans.business[i]; 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);
}); });
var orgname = $routeParams.orgname; var orgname = $routeParams.orgname;

4
static/partials/org-admin.html
View file

@ -52,7 +52,8 @@
<td> <td>
<span class="invoice-status"> <span class="invoice-status">
<span class="success" ng-show="invoice.paid">Paid - Thank you!</span> <span class="success" ng-show="invoice.paid">Paid - Thank you!</span>
<span class="danger" ng-show="!invoice.paid && invoice.attempted">Payment failed - Will retry soon</span> <span class="danger" ng-show="!invoice.paid && invoice.attempted && invoice.closed">Payment failed</span>
<span class="danger" ng-show="!invoice.paid && invoice.attempted && !invoice.closed">Payment failed - Will retry soon</span>
<span class="pending" ng-show="!invoice.paid && !invoice.attempted">Payment pending</span> <span class="pending" ng-show="!invoice.paid && !invoice.attempted">Payment pending</span>
</span> </span>
</td> </td>
@ -69,7 +70,6 @@
<dt>Plan</dt> <dt>Plan</dt>
<dd> <dd>
<span>{{ plan_map[invoice.plan].title }}</span> <span>{{ plan_map[invoice.plan].title }}</span>
<span>{{ plan_map[invoice.plan].price / 100 }}</span>
</dd> </dd>
</dl> </dl>
</td> </td>