bitwarden/web
1
0
Fork 0
mirror of https://github.com/bitwarden/web synced 2025-12-16 16:23:31 +00:00
Code Issues Releases Wiki Activity

rename to reinstate

Browse Source
This commit is contained in:
Kyle Spearrin
2017-04-10 18:31:01 -04:00
parent 80ca89b3f6
commit 58df3e692b
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/organization/organizationBillingController.js
View File

@@ -59,12 +59,12 @@
}); });
}; };
$scope.uncancel = function () { $scope.reinstate = function () {
if (!confirm('Are you sure you want to remove the cancellation request?')) { if (!confirm('Are you sure you want to remove the cancellation request and reinstate this organization?')) {
return; return;
} }
apiService.organizations.putUncancel({ id: $state.params.orgId }, {}) apiService.organizations.putReinstate({ id: $state.params.orgId }, {})
.$promise.then(function (response) { .$promise.then(function (response) {
toastr.success('Organization cancellation request has been removed.'); toastr.success('Organization cancellation request has been removed.');
load(); load();

18
src/app/organization/views/organizationBilling.html
View File

@@ -10,11 +10,19 @@
<h3 class="box-title">Plan</h3> <h3 class="box-title">Plan</h3>
</div> </div>
<div class="box-body"> <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. The subscription to this organization has been canceled.
</div> </div>
<div class="alert alert-warning" ng-if="subscription && subscription.markedForCancel"> <div class="callout callout-warning" ng-if="subscription && subscription.markedForCancel">
The subscription to this organization has been marked for cancellation at the end of the current billing period. <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>
<div class="row"> <div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
@@ -64,9 +72,9 @@
ng-if="!noSubscription && !subscription.cancelled && !subscription.markedForCancel"> ng-if="!noSubscription && !subscription.cancelled && !subscription.markedForCancel">
Cancel Plan Cancel Plan
</button> </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"> ng-if="!noSubscription && subscription.markedForCancel">
Uncancel Plan Reinstate Plan
</button> </button>
</div> </div>
</div> </div>

2
src/app/services/apiService.js
View File

@@ -43,7 +43,7 @@
putSeat: { url: _apiUri + '/organizations/:id/seat', method: 'POST', params: { id: '@id' } }, putSeat: { url: _apiUri + '/organizations/:id/seat', method: 'POST', params: { id: '@id' } },
putUpgrade: { url: _apiUri + '/organizations/:id/upgrade', 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' } }, 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' } } del: { url: _apiUri + '/organizations/:id/delete', method: 'POST', params: { id: '@id' } }
}); });