From 58df3e692bc4c1ae2cb86a6cbb49c542f77c86ba Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Mon, 10 Apr 2017 18:31:01 -0400
Subject: [PATCH] rename to reinstate

---
 .../organizationBillingController.js           |  6 +++---
 .../views/organizationBilling.html             | 18 +++++++++++++-----
 src/app/services/apiService.js                 |  2 +-
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/app/organization/organizationBillingController.js b/src/app/organization/organizationBillingController.js
index 69667b58..dfdef88f 100644
--- a/src/app/organization/organizationBillingController.js
+++ b/src/app/organization/organizationBillingController.js
@@ -59,12 +59,12 @@
                 });
         };
 
-        $scope.uncancel = function () {
-            if (!confirm('Are you sure you want to remove the cancellation request?')) {
+        $scope.reinstate = function () {
+            if (!confirm('Are you sure you want to remove the cancellation request and reinstate this organization?')) {
                 return;
             }
 
-            apiService.organizations.putUncancel({ id: $state.params.orgId }, {})
+            apiService.organizations.putReinstate({ id: $state.params.orgId }, {})
                 .$promise.then(function (response) {
                     toastr.success('Organization cancellation request has been removed.');
                     load();
diff --git a/src/app/organization/views/organizationBilling.html b/src/app/organization/views/organizationBilling.html
index f664cff9..eb79a299 100644
--- a/src/app/organization/views/organizationBilling.html
+++ b/src/app/organization/views/organizationBilling.html
@@ -10,11 +10,19 @@
             <h3 class="box-title">Plan</h3>
         </div>
         <div class="box-body">
-            <div class="alert alert-warning" ng-if="subscription && subscription.cancelled">
+            <div class="callout callout-warning" ng-if="subscription && subscription.cancelled">
+                <h4><i class="fa fa-warning"></i> Cancelled</h4>
                 The subscription to this organization has been canceled.
             </div>
-            <div class="alert alert-warning" ng-if="subscription && subscription.markedForCancel">
-                The subscription to this organization has been marked for cancellation at the end of the current billing period.
+            <div class="callout callout-warning" ng-if="subscription && subscription.markedForCancel">
+                <h4><i class="fa fa-warning"></i> Pending Cancellation</h4>
+                <p>
+                    The subscription to this organization has been marked for cancellation at the end of the
+                    current billing period.
+                </p>
+                <button type="button" class="btn btn-default btn-flat" ng-click="reinstate()">
+                    Reinstate Plan
+                </button>
             </div>
             <div class="row">
                 <div class="col-sm-6">
@@ -64,9 +72,9 @@
                     ng-if="!noSubscription && !subscription.cancelled && !subscription.markedForCancel">
                 Cancel Plan
             </button>
-            <button type="button" class="btn btn-default btn-flat" ng-click="uncancel()"
+            <button type="button" class="btn btn-default btn-flat" ng-click="reinstate()"
                     ng-if="!noSubscription && subscription.markedForCancel">
-                Uncancel Plan
+                Reinstate Plan
             </button>
         </div>
     </div>
diff --git a/src/app/services/apiService.js b/src/app/services/apiService.js
index 985ba372..c902b9fc 100644
--- a/src/app/services/apiService.js
+++ b/src/app/services/apiService.js
@@ -43,7 +43,7 @@
             putSeat: { url: _apiUri + '/organizations/:id/seat', method: 'POST', params: { id: '@id' } },
             putUpgrade: { url: _apiUri + '/organizations/:id/upgrade', method: 'POST', params: { id: '@id' } },
             putCancel: { url: _apiUri + '/organizations/:id/cancel', method: 'POST', params: { id: '@id' } },
-            putUncancel: { url: _apiUri + '/organizations/:id/uncancel', method: 'POST', params: { id: '@id' } },
+            putReinstate: { url: _apiUri + '/organizations/:id/reinstate', method: 'POST', params: { id: '@id' } },
             del: { url: _apiUri + '/organizations/:id/delete', method: 'POST', params: { id: '@id' } }
         });