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

Show the billing options in the user and org views

Browse source
This commit is contained in:
Joseph Schorr 2015-05-07 16:43:45 -04:00
parent 7ea02c186a
commit 2105ad90a0
4 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
static/directives/billing-options.html
View file

@ -1,11 +1,11 @@
<div class="billing-options-element"> <div class="billing-options-element">
<!-- Credit Card --> <!-- Credit Card -->
<div class="panel"> <div style="margin-bottom: 20px">
<div class="panel-title"> <div class="panel-title">
Credit Card Credit Card
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div class="quay-spinner" ng-show="!currentCard || changingCard"></div> <div class="cor-loader-inline" ng-show="!currentCard || changingCard"></div>
<div class="current-card" ng-show="currentCard && !changingCard"> <div class="current-card" ng-show="currentCard && !changingCard">
<div class="alert alert-warning" ng-if="currentCard.last4 && isExpiringSoon(currentCard)"> <div class="alert alert-warning" ng-if="currentCard.last4 && isExpiringSoon(currentCard)">
Your current credit card is expiring soon! Your current credit card is expiring soon!
@ -29,10 +29,10 @@
</div> </div>
<!-- Options --> <!-- Options -->
<div class="panel"> <div style="margin-bottom: 20px">
<div class="panel-title"> <div class="panel-title">
Billing Options Billing Options
<div class="quay-spinner" ng-show="working"></div> <div class="cor-loader-inline" ng-show="working"></div>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div class="settings-option"> <div class="settings-option">

4
static/js/directives/ui/plan-manager.js
View file

@ -11,6 +11,9 @@ angular.module('quay').directive('planManager', function () {
scope: { scope: {
'user': '=user', 'user': '=user',
'organization': '=organization', 'organization': '=organization',
'hasSubscription': '=hasSubscription',
'readyForPlan': '&readyForPlan', 'readyForPlan': '&readyForPlan',
'planChanged': '&planChanged' 'planChanged': '&planChanged'
}, },
@ -68,6 +71,7 @@ angular.module('quay').directive('planManager', function () {
$scope.planChanging = false; $scope.planChanging = false;
$scope.planLoading = false; $scope.planLoading = false;
$scope.hasSubscription = subscribedPlan.stripeId != PlanService.getFreePlan();
}); });
}; };

5
static/partials/org-view.html
View file

@ -110,7 +110,10 @@
<div id="usage" class="tab-pane" quay-require="['BILLING']"> <div id="usage" class="tab-pane" quay-require="['BILLING']">
<h3>Plan Usage and Billing</h3> <h3>Plan Usage and Billing</h3>
<div ng-if="isAdmin"> <div ng-if="isAdmin">
<div class="plan-manager" organization="organization.name"></div> <div class="plan-manager" organization="organization.name"
has-subscription="hasSubscription"></div>
<hr ng-show="hasSubscription">
<div class="billing-options" organization="organization" ng-show="hasSubscription"></div>
</div> </div>
</div> </div>

4
static/partials/user-view.html
View file

@ -82,7 +82,9 @@
<!-- Plan and Usage --> <!-- Plan and Usage -->
<div id="usage" class="tab-pane" quay-require="['BILLING']"> <div id="usage" class="tab-pane" quay-require="['BILLING']">
<h3>Plan Usage and Billing</h3> <h3>Plan Usage and Billing</h3>
<div class="plan-manager" user="viewuser"></div> <div class="plan-manager" user="viewuser" has-subscription="hasSubscription"></div>
<hr ng-show="hasSubscription">
<div class="billing-options" user="viewuser" ng-show="hasSubscription"></div>
</div> </div>
<!-- Billing Invoices --> <!-- Billing Invoices -->