Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-28 12:45:45 +01:00
Code Issues Projects Releases Wiki Activity

cancellation notices

Browse Source
This commit is contained in:
Kyle Spearrin 2017-07-25 15:53:17 -04:00
parent bbd8a1265b
commit 6b1eb5a479
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@
</section> </section>
<section class="content"> <section class="content">
<div class="callout callout-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> <h4><i class="fa fa-warning"></i> Canceled</h4>
The subscription to this organization has been canceled. The subscription to this organization has been canceled.
</div> </div>
<div class="callout callout-warning" ng-if="subscription && subscription.markedForCancel"> <div class="callout callout-warning" ng-if="subscription && subscription.markedForCancel">
@ -36,7 +36,10 @@
<div class="col-sm-6"> <div class="col-sm-6">
<dl> <dl>
<dt>Status</dt> <dt>Status</dt>
<dd style="text-transform: capitalize;">{{(subscription && subscription.status) || '-'}}</dd> <dd>
<span style="text-transform: capitalize;">{{(subscription && subscription.status) || '-'}}</span>
<span ng-if="subscription.markedForCancel">- marked for cancellation</span>
</dd>
<dt>Next Charge</dt> <dt>Next Charge</dt>
<dd>{{nextInvoice ? ((nextInvoice.date | date: format: mediumDate) + ', ' + (nextInvoice.amount | currency:'$')) : '-'}}</dd> <dd>{{nextInvoice ? ((nextInvoice.date | date: format: mediumDate) + ', ' + (nextInvoice.amount | currency:'$')) : '-'}}</dd>
</dl> </dl>

19
src/app/settings/views/settingsBilling.html
View File

@ -2,6 +2,20 @@
<h1>Billing <small>manage your membership</small></h1> <h1>Billing <small>manage your membership</small></h1>
</section> </section>
<section class="content"> <section class="content">
<div class="callout callout-warning" ng-if="subscription && subscription.cancelled">
<h4><i class="fa fa-warning"></i> Canceled</h4>
The premium membership subscription has been canceled.
</div>
<div class="callout callout-warning" ng-if="subscription && subscription.markedForCancel">
<h4><i class="fa fa-warning"></i> Pending Cancellation</h4>
<p>
The premium membership 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
</button>
</div>
<div class="box box-default"> <div class="box box-default">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">Premium Membership</h3> <h3 class="box-title">Premium Membership</h3>
@ -11,7 +25,10 @@
<div class="col-md-5"> <div class="col-md-5">
<dl> <dl>
<dt>Status</dt> <dt>Status</dt>
<dd style="text-transform: capitalize;">{{(subscription && subscription.status) || '-'}}</dd> <dd>
<span style="text-transform: capitalize;">{{(subscription && subscription.status) || '-'}}</span>
<span ng-if="subscription.markedForCancel">- marked for cancellation</span>
</dd>
<dt>Next Charge</dt> <dt>Next Charge</dt>
<dd>{{nextInvoice ? ((nextInvoice.date | date: format: mediumDate) + ', ' + (nextInvoice.amount | currency:'$')) : '-'}}</dd> <dd>{{nextInvoice ? ((nextInvoice.date | date: format: mediumDate) + ', ' + (nextInvoice.amount | currency:'$')) : '-'}}</dd>
</dl> </dl>