From 3d07260a9dbf8aff396ac81cdd0efb8b46006a51 Mon Sep 17 00:00:00 2001
From: Albert Santoni <albert.santoni@sourcefabric.org>
Date: Thu, 17 Sep 2015 15:17:18 -0400
Subject: [PATCH 1/5] Small VAT checker bugfix

---
 airtime_mvc/application/views/scripts/billing/upgrade.phtml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/airtime_mvc/application/views/scripts/billing/upgrade.phtml b/airtime_mvc/application/views/scripts/billing/upgrade.phtml
index 1843fcbbe..1a28873ec 100644
--- a/airtime_mvc/application/views/scripts/billing/upgrade.phtml
+++ b/airtime_mvc/application/views/scripts/billing/upgrade.phtml
@@ -28,6 +28,10 @@ function validatePlan()
 
 function validateVATNumber()
 {
+    if ($(vatFieldId).val() == '') {
+        return;
+    }
+    
 	$.post("/billing/vat-validator", { "vatnumber" : $(vatFieldId).val(), "country" : $("#country").val() })
 		.success(function(data, textStatus, jqXHR) {
     	if (data["result"]) {

From 8308ce9cacd7e7bed2bc9a250d17e3c02653a6c5 Mon Sep 17 00:00:00 2001
From: Albert Santoni <albert.santoni@sourcefabric.org>
Date: Thu, 17 Sep 2015 15:38:00 -0400
Subject: [PATCH 2/5] October promo banner

---
 .../views/scripts/billing/upgrade.phtml       |  4 ++++
 airtime_mvc/public/css/billing.css            | 22 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/airtime_mvc/application/views/scripts/billing/upgrade.phtml b/airtime_mvc/application/views/scripts/billing/upgrade.phtml
index 1a28873ec..3a9d47df6 100644
--- a/airtime_mvc/application/views/scripts/billing/upgrade.phtml
+++ b/airtime_mvc/application/views/scripts/billing/upgrade.phtml
@@ -264,6 +264,10 @@ echo($currentProduct["name"]);
 //echo Application_Model_Preference::GetPlanLevel();
 ?>
 </p>
+    <div class="educational-discount">
+        <h4>Are you a student or educator?</h4>
+        <p>Sign up on an annual plan before the end of October to receive a 45% educational discount. Find out more.</p>
+    </div>
 
 <h3>Choose a plan:</h3>
  <form id="<?php echo $form->getId(); ?>" method="<?php echo $form->getMethod() ?>" action="<?php echo
diff --git a/airtime_mvc/public/css/billing.css b/airtime_mvc/public/css/billing.css
index 8e3cad43c..84aa6d9e6 100644
--- a/airtime_mvc/public/css/billing.css
+++ b/airtime_mvc/public/css/billing.css
@@ -238,3 +238,25 @@
 	margin-top:10px;
 	background: url('images/august_aweomse_promo_banner.png') no-repeat;
 }
+
+.billing-panel .educational-discount {
+	border: 1px solid #306999;
+	border-radius: 3px;
+	margin-top: 10px;
+	margin-bottom: 10px;
+	box-sizing: border-box;
+	padding: 16px;
+	background-color: #b8d9f4;
+	color: #234f5d;
+
+}
+.billing-panel .educational-discount h4 {
+	color: #1e415d;
+	font-weight: bold;
+	margin: 0px;
+	padding: 0px;
+	margin-bottom: 5px;
+}
+.billing-panel .educational-discount p {
+	margin: 0px;
+}
\ No newline at end of file

From 2cad7c18489588c9bc3fc76641f7edab0dab1cc0 Mon Sep 17 00:00:00 2001
From: Albert Santoni <albert.santoni@sourcefabric.org>
Date: Fri, 18 Sep 2015 13:59:55 -0400
Subject: [PATCH 3/5] Added educational pricing page link

---
 airtime_mvc/application/views/scripts/billing/upgrade.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airtime_mvc/application/views/scripts/billing/upgrade.phtml b/airtime_mvc/application/views/scripts/billing/upgrade.phtml
index 3a9d47df6..8f387de44 100644
--- a/airtime_mvc/application/views/scripts/billing/upgrade.phtml
+++ b/airtime_mvc/application/views/scripts/billing/upgrade.phtml
@@ -266,7 +266,7 @@ echo($currentProduct["name"]);
 </p>
     <div class="educational-discount">
         <h4>Are you a student or educator?</h4>
-        <p>Sign up on an annual plan before the end of October to receive a 45% educational discount. Find out more.</p>
+        <p>Sign up on an annual plan before the end of October to receive a 45% educational discount. <a href="https://www.airtime.pro/educational-discount">Find out more</a>.</p>
     </div>
 
 <h3>Choose a plan:</h3>

From a8100104482cae93d0eb16ad7080146124ea32e9 Mon Sep 17 00:00:00 2001
From: Albert Santoni <albert.santoni@sourcefabric.org>
Date: Fri, 18 Sep 2015 14:01:30 -0400
Subject: [PATCH 4/5] Dropped percentage from educational discount

---
 airtime_mvc/application/views/scripts/billing/upgrade.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airtime_mvc/application/views/scripts/billing/upgrade.phtml b/airtime_mvc/application/views/scripts/billing/upgrade.phtml
index 8f387de44..b2315ccf4 100644
--- a/airtime_mvc/application/views/scripts/billing/upgrade.phtml
+++ b/airtime_mvc/application/views/scripts/billing/upgrade.phtml
@@ -266,7 +266,7 @@ echo($currentProduct["name"]);
 </p>
     <div class="educational-discount">
         <h4>Are you a student or educator?</h4>
-        <p>Sign up on an annual plan before the end of October to receive a 45% educational discount. <a href="https://www.airtime.pro/educational-discount">Find out more</a>.</p>
+        <p>Sign up on an annual plan before the end of October to receive a special educational discount. <a href="https://www.airtime.pro/educational-discount">Find out more</a>.</p>
     </div>
 
 <h3>Choose a plan:</h3>

From 2a79424a640f5e7c96a2eb7703cc37a5b2c10168 Mon Sep 17 00:00:00 2001
From: Albert Santoni <albert.santoni@sourcefabric.org>
Date: Mon, 21 Sep 2015 18:00:04 -0400
Subject: [PATCH 5/5] Increase the CSRF token timeout

---
 airtime_mvc/application/Bootstrap.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php
index abc9ad99b..97719079a 100644
--- a/airtime_mvc/application/Bootstrap.php
+++ b/airtime_mvc/application/Bootstrap.php
@@ -103,10 +103,10 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
         $csrf_namespace = new Zend_Session_Namespace('csrf_namespace');
         // Check if the token exists
         if (!$csrf_namespace->authtoken) {
-            // If we don't have a token, regenerate it and set a 2 hour timeout
+            // If we don't have a token, regenerate it and set a 1 week timeout
             // Should we log the user out here if the token is expired?
             $csrf_namespace->authtoken = sha1(uniqid(rand(), 1));
-            $csrf_namespace->setExpirationSeconds(2 * 60 * 60);
+            $csrf_namespace->setExpirationSeconds(168 * 60 * 60);
         }
 
         //Here we are closing the session for writing because otherwise no requests