Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'saas' into saas-dev

Browse source 
Conflicts:
	airtime_mvc/public/css/billing.css
This commit is contained in:
Albert Santoni 2015-09-21 18:01:56 -04:00
commit 479153df17
3 changed files with 32 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/Bootstrap.php
View file

@ -113,10 +113,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

8
airtime_mvc/application/views/scripts/billing/upgrade.phtml
View file

@ -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"]) {
@ -261,6 +265,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 special educational discount. <a href="https://www.airtime.pro/educational-discount">Find out more</a>.</p>
</div>
<h3><?php echo(_pro('Choose a plan: ')); ?></h3>
<form id="<?php echo $form->getId(); ?>" method="<?php echo $form->getMethod() ?>" action="<?php echo