From 6b1eb5a47921c42a21bbdc827ee3a0c0fe08d3d9 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 25 Jul 2017 15:53:17 -0400
Subject: [PATCH] cancellation notices

---
 .../views/organizationBilling.html            |  7 +++++--
 src/app/settings/views/settingsBilling.html   | 19 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/app/organization/views/organizationBilling.html b/src/app/organization/views/organizationBilling.html
index 14c6ebe277..5030eeb60e 100644
--- a/src/app/organization/views/organizationBilling.html
+++ b/src/app/organization/views/organizationBilling.html
@@ -6,7 +6,7 @@
 </section>
 <section class="content">
     <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.
     </div>
     <div class="callout callout-warning" ng-if="subscription && subscription.markedForCancel">
@@ -36,7 +36,10 @@
                 <div class="col-sm-6">
                     <dl>
                         <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>
                         <dd>{{nextInvoice ? ((nextInvoice.date | date: format: mediumDate) + ', ' + (nextInvoice.amount | currency:'$')) : '-'}}</dd>
                     </dl>
diff --git a/src/app/settings/views/settingsBilling.html b/src/app/settings/views/settingsBilling.html
index 1a9cc55518..68e694edb0 100644
--- a/src/app/settings/views/settingsBilling.html
+++ b/src/app/settings/views/settingsBilling.html
@@ -2,6 +2,20 @@
     <h1>Billing <small>manage your membership</small></h1>
 </section>
 <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-header with-border">
             <h3 class="box-title">Premium Membership</h3>
@@ -11,7 +25,10 @@
                 <div class="col-md-5">
                     <dl>
                         <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>
                         <dd>{{nextInvoice ? ((nextInvoice.date | date: format: mediumDate) + ', ' + (nextInvoice.amount | currency:'$')) : '-'}}</dd>
                     </dl>