From ee3ad9e7c358289fe73ae1424d3adfd72f84609b Mon Sep 17 00:00:00 2001
From: Joseph Schorr <jschorr@gmail.com>
Date: Fri, 22 Aug 2014 19:48:58 -0400
Subject: [PATCH] Enable invoice views on all plans
---
static/js/controllers.js | 1 -
static/partials/plans.html | 18 +++++++++---------
static/partials/user-admin.html | 2 +-
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/static/js/controllers.js b/static/js/controllers.js
index f20ff8562..41e1443ea 100644
--- a/static/js/controllers.js
+++ b/static/js/controllers.js
@@ -1691,7 +1691,6 @@ function UserAdminCtrl($scope, $timeout, $location, ApiService, PlanService, Use
};
$scope.loadInvoices = function() {
- if (!$scope.hasPaidBusinessPlan) { return; }
$scope.invoicesShown++;
};
diff --git a/static/partials/plans.html b/static/partials/plans.html
index 2265f8155..18c7deebb 100644
--- a/static/partials/plans.html
+++ b/static/partials/plans.html
@@ -34,6 +34,13 @@
</span>
<i class="fa fa-upload visible-lg"></i>
</div>
+ <div class="feature">
+ <span class="context-tooltip" bs-tooltip="tooltip.title" data-container="body" data-placement="right"
+ data-title="Administrators can view and download the full invoice history for their organization">
+ Invoice History
+ </span>
+ <i class="fa fa-calendar visible-lg"></i>
+ </div>
<div class="feature">
<span class="context-tooltip" bs-tooltip="tooltip.title" data-container="body" data-placement="right"
data-title="Grant subsets of users in an organization their own permissions, either on a global basis or a per-repository basis">
@@ -48,13 +55,6 @@
</span>
<i class="fa fa-bar-chart-o visible-lg"></i>
</div>
- <div class="feature">
- <span class="context-tooltip" bs-tooltip="tooltip.title" data-container="body" data-placement="right"
- data-title="Administrators can view and download the full invoice history for their organization">
- Invoice History
- </span>
- <i class="fa fa-calendar visible-lg"></i>
- </div>
<div class="feature">
<span class="context-tooltip" bs-tooltip="tooltip.title" data-container="body" data-placement="right"
data-title="All plans have a free trial">
@@ -81,7 +81,7 @@
<div class="feature present"></div>
<div class="feature present"></div>
<div class="feature present"></div>
- <div class="feature" ng-class="plan.bus_features ? 'present' : ''"></div>
+ <div class="feature present"></div>
<div class="feature" ng-class="plan.bus_features ? 'present' : ''"></div>
<div class="feature" ng-class="plan.bus_features ? 'present' : ''"></div>
<div class="feature present"></div>
@@ -93,9 +93,9 @@
<div class="feature present">SSL Encryption</div>
<div class="feature present">Robot accounts</div>
<div class="feature present">Dockerfile Build</div>
+ <div class="feature present">Invoice History</div>
<div class="feature" ng-class="plan.bus_features ? 'present' : 'notpresent'">Teams</div>
<div class="feature" ng-class="plan.bus_features ? 'present' : 'notpresent'">Logging</div>
- <div class="feature" ng-class="plan.bus_features ? 'present' : 'notpresent'">Invoice History</div>
<div class="feature present">Free Trial</div>
</div>
diff --git a/static/partials/user-admin.html b/static/partials/user-admin.html
index 783c5f87a..1b2ad7fd1 100644
--- a/static/partials/user-admin.html
+++ b/static/partials/user-admin.html
@@ -25,7 +25,7 @@
<li ng-show="hasPaidPlan" quay-require="['BILLING']">
<a href="javascript:void(0)" data-toggle="tab" data-target="#billingoptions">Billing Options</a>
</li>
- <li ng-show="hasPaidBusinessPlan" quay-require="['BILLING']">
+ <li ng-show="hasPaidPlan" quay-require="['BILLING']">
<a href="javascript:void(0)" data-toggle="tab" data-target="#billing" ng-click="loadInvoices()">Billing History</a>
</li>