From 685134d8bbc14094c2a9e3e6424511059b3e1ffd Mon Sep 17 00:00:00 2001
From: Albert Santoni <albert.santoni@sourcefabric.org>
Date: Thu, 5 Nov 2015 12:45:09 -0500
Subject: [PATCH] Better trial suspension notice

---
 airtime_mvc/application/common/Billing.php               | 3 ++-
 .../application/controllers/BillingController.php        | 6 ++++++
 airtime_mvc/application/layouts/scripts/layout.phtml     | 6 ++++--
 .../views/scripts/partialviews/suspendedtrial.phtml      | 9 +++++++++
 4 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 airtime_mvc/application/views/scripts/partialviews/suspendedtrial.phtml

diff --git a/airtime_mvc/application/common/Billing.php b/airtime_mvc/application/common/Billing.php
index 2dbfafa9a..6bbbdcda5 100644
--- a/airtime_mvc/application/common/Billing.php
+++ b/airtime_mvc/application/common/Billing.php
@@ -126,7 +126,8 @@ class Billing
             }
             else
             {
-                if ($product["status"] === "Active") {
+                if ($product["status"] === "Active" ||
+                    $product["status"] === "Suspended") {
                     $airtimeProduct = $product;
                     $subdomain = '';
 
diff --git a/airtime_mvc/application/controllers/BillingController.php b/airtime_mvc/application/controllers/BillingController.php
index bf508036b..bf4aafb1d 100644
--- a/airtime_mvc/application/controllers/BillingController.php
+++ b/airtime_mvc/application/controllers/BillingController.php
@@ -21,6 +21,12 @@ class BillingController extends Zend_Controller_Action {
 
     public function upgradeAction()
     {
+        //If you're not on a trial and you're suspended, we don't let you access the plans page and redirect you to the invoices
+        //page to force you to pay your bills first.
+        $isTrial = (Application_Model_Preference::GetPlanLevel() == 'trial');
+        if (!$isTrial && (Application_Model_Preference::getProvisioningStatus() == PROVISIONING_STATUS_SUSPENDED)) {
+            $this->_redirect('billing/invoices');
+        }
 
         Zend_Layout::getMvcInstance()->assign('parent_page', 'Billing');
 
diff --git a/airtime_mvc/application/layouts/scripts/layout.phtml b/airtime_mvc/application/layouts/scripts/layout.phtml
index ec2c64088..f0916e19a 100644
--- a/airtime_mvc/application/layouts/scripts/layout.phtml
+++ b/airtime_mvc/application/layouts/scripts/layout.phtml
@@ -22,8 +22,10 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
 <?php echo $this->partial('partialviews/trialBox.phtml', array("is_trial"=>$this->isTrial(), "trial_remain"=> $this->trialRemaining())) ?>
 
     <div id="Panel" class="sticky">
-    <?php if($this->suspended) : ?>
-        <?php echo $this->partial('partialviews/suspended.phtml'); ?>
+    <?php if ($this->suspended && $this->isTrial()) : ?>
+        <?php echo $this->partial('partialviews/suspendedtrial.phtml'); ?>
+    <?php elseif ($this->suspended && !$this->isTrial()) : ?>
+        <?php echo $this->partial('partialviews/trial.phtml'); ?>
     <?php else : ?>
 
     <?php echo $this->versionNotify();
diff --git a/airtime_mvc/application/views/scripts/partialviews/suspendedtrial.phtml b/airtime_mvc/application/views/scripts/partialviews/suspendedtrial.phtml
new file mode 100644
index 000000000..bafce3743
--- /dev/null
+++ b/airtime_mvc/application/views/scripts/partialviews/suspendedtrial.phtml
@@ -0,0 +1,9 @@
+<div class="suspension_notice">
+    <H2>Station Suspended</H2>
+    <p>
+        <?php echo(_pro(sprintf('Your free trial is now over. To restore your station, <a href="%s">please upgrade your plan now</a>.', '/billing/upgrade'))); ?>
+    </p>
+    <p>
+        <?php echo(_pro(sprintf('Your station will be <b>removed</b> within 7 days if you do not upgrade. If you believe this suspension was in error, <a href="%s">please contact support</a>.', 'https://sourcefabricberlin.zendesk.com/anonymous_requests/new'))); ?>
+    </p>
+</div>
\ No newline at end of file