From 5d0ea2d01540e3aeb0618be28d2866c882925db6 Mon Sep 17 00:00:00 2001
From: drigato <denise.rigato@sourcefabric.org>
Date: Fri, 20 Jun 2014 17:25:05 -0400
Subject: [PATCH] Add billing section to main menu

---
 airtime_mvc/application/configs/ACL.php       |  2 +-
 .../application/configs/navigation.php        | 28 +++++++++++++++++++
 .../application/layouts/scripts/layout.phtml  |  2 +-
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/application/configs/ACL.php b/airtime_mvc/application/configs/ACL.php
index fe0c5b425..ff65a9192 100644
--- a/airtime_mvc/application/configs/ACL.php
+++ b/airtime_mvc/application/configs/ACL.php
@@ -59,7 +59,7 @@ $ccAcl->allow('G', 'index')
       ->allow('A', 'user')
       ->allow('A', 'systemstatus')
       ->allow('A', 'preference')
-      ->allow('A', 'billing');
+      ->allow('S', 'billing');
       
 
 $aclPlugin = new Zend_Controller_Plugin_Acl($ccAcl);
diff --git a/airtime_mvc/application/configs/navigation.php b/airtime_mvc/application/configs/navigation.php
index f3149f146..87314135a 100644
--- a/airtime_mvc/application/configs/navigation.php
+++ b/airtime_mvc/application/configs/navigation.php
@@ -134,6 +134,34 @@ $pages = array(
                 'resource'   =>    'dashboard'
             )
         )
+    ),
+    array(
+        'label' => _('Billing'),
+        'uri' => '#',
+        'resource' => 'billing',
+        'pages' => array(
+            array(
+                'label' => _('Account Details'),
+                'module' => 'default',
+                'controller' => 'billing',
+                'action' => 'client',
+                'resource' => 'billing'
+            ),
+            array(
+                'label' => _('Account Plans'),
+                'module' => 'default',
+                'controller' => 'billing',
+                'action' => 'upgrade',
+                'resource' => 'billing'
+            ),
+            array(
+                'label' => _('View Invocices'),
+                'module' => 'default',
+                'controller' => 'billing',
+                'action' => 'invoices',
+                'resource' => 'billing'
+            )
+        )
     )
 );
 
diff --git a/airtime_mvc/application/layouts/scripts/layout.phtml b/airtime_mvc/application/layouts/scripts/layout.phtml
index 6fef87157..ce67531c1 100644
--- a/airtime_mvc/application/layouts/scripts/layout.phtml
+++ b/airtime_mvc/application/layouts/scripts/layout.phtml
@@ -24,7 +24,7 @@
     <div class="personal-block solo">
         <ul>
           <li>
-            <span class="trial-box-button"><a title="Billing" href=<?php echo $baseUrl . 'billing/upgrade'?>>Upgrade</a></span>&nbsp;
+            <!-- <span class="trial-box-button"><a title="Billing" href=<?php echo $baseUrl . 'billing/upgrade'?>>Upgrade</a></span>&nbsp;-->
             <a id="current-user" href=<?php echo $baseUrl . "User/edit-user"?>><span class="name"><?php echo $this->escape($this->loggedInAs()); ?></span></a>
              | <a href=<?php echo $baseUrl . "Login/logout"?>><?php echo _("Logout")?></a>
           </li>