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

Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas

This commit is contained in:
Albert Santoni 2014-06-26 18:59:14 -04:00
parent d34c0d91cd 5745288113
commit 54590de6ee
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/controllers/BillingController.php
View File

@ -5,7 +5,7 @@ define('VAT_RATE', 19.00);
class BillingController extends Zend_Controller_Action { class BillingController extends Zend_Controller_Action {
public function init() public function init()
{ {
//Two of the actions in this controller return JSON because they're used for AJAX: //Two of the actions in this controller return JSON because they're used for AJAX:
$ajaxContext = $this->_helper->getHelper('AjaxContext'); $ajaxContext = $this->_helper->getHelper('AjaxContext');
$ajaxContext->addActionContext('vat-validator', 'json') $ajaxContext->addActionContext('vat-validator', 'json')

4
airtime_mvc/application/controllers/UserController.php
View File

@ -125,6 +125,10 @@ class UserController extends Zend_Controller_Action
public function editUserAction() public function editUserAction()
{ {
if (Application_Model_User::getCurrentUser()->isSuperAdmin()) {
$this->_redirect('billing/client');
}
$request = $this->getRequest(); $request = $this->getRequest();
$form = new Application_Form_EditUser(); $form = new Application_Form_EditUser();
if ($request->isPost()) { if ($request->isPost()) {