Merge master

Author: mmolina

README.md

@@ -26,15 +26,8 @@ The API can be enabled in the Zendesk settings page in the Magento admin panel.
 
 ### Single Sign-on (SSO)
 
-* Admins & Agents
-
-  Remote login URL: http://your_site_base_url/admin/zendesk/authenticate
-  Remote logout URL: http://your_site_base_url/admin/zendesk/logout
-
-* End-user
-
-  Remote login URL: http://your_site_base_url/zendesk/sso/login
-  Remote logout URL: http://your_site_base_url/zendesk/sso/logout
+  **Remote login URL** http://your_site_base_url/zendesk/sso/login
+  **Remote logout URL** http://your_site_base_url/zendesk/sso/logout
 
 ### Responses
 

src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Customer.php

@@ -20,6 +20,7 @@ class Zendesk_Zendesk_Block_Adminhtml_Create_Customer extends Mage_Adminhtml_Blo
 
     public function __construct()
     {
+        $this->_controller = false;
         parent::__construct();
         $this->setId('zendesk_create_customer_search');
     }
@@ -29,7 +30,7 @@ public function getHeaderText()
         return Mage::helper('zendesk')->__('Please Select User to Add');
     }
 
-    public function getButtonsHtml()
+    public function getButtonsHtml($area = null)
     {
         $addButtonData = array(
             'label' => Mage::helper('zendesk')->__('Select User'),

src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Edit.php

@@ -19,6 +19,7 @@ class Zendesk_Zendesk_Block_Adminhtml_Create_Edit extends Mage_Adminhtml_Block_W
 {
     protected function _construct()
     {
+        $this->_controller = false;
         parent::_construct(); 
     }
 

src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Edit/Form.php

@@ -116,8 +116,11 @@ protected function _prepareForm()
             'title'    => Mage::helper('zendesk')->__('Description'),
             'required' => true
         ));
+        
+        if (Mage::registry('zendesk_create_data')) {
+            $form->setValues(Mage::registry('zendesk_create_data'));
+        }
 
-        $form->setValues(Mage::registry('zendesk_create_data'));
         $form->setUseContainer(true);
         $form->setMethod('post');
         $this->setForm($form);

src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Order.php

@@ -20,6 +20,7 @@ class Zendesk_Zendesk_Block_Adminhtml_Create_Order extends Mage_Adminhtml_Block_
 
     public function __construct()
     {
+        $this->_controller = false;
         parent::__construct();
         $this->setId('zendesk_create_order_search');
     }
@@ -29,7 +30,7 @@ public function getHeaderText()
         return Mage::helper('zendesk')->__('Please Select Order to Add');
     }
 
-    public function getButtonsHtml()
+    public function getButtonsHtml($area = null)
     {
         $addButtonData = array(
             'label' => Mage::helper('zendesk')->__('Select Order'),

src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Grids.php

@@ -34,6 +34,8 @@ protected function _prepareLayout() {
             return parent::_prepareLayout();
         }
 
+        Mage::helper('zendesk')->storeDependenciesInCachedRegistry();
+
         //check if module is setted up
         $configured     = (bool) Mage::getStoreConfig('zendesk/general/domain');
         $viewsIds       = Mage::getStoreConfig('zendesk/backend_features/show_views') ? Mage::helper('zendesk')->getChosenViews() : array(); 
@@ -57,24 +59,38 @@ protected function _prepareLayout() {
             $this->addTab('all-tickets', $all);
         }
 
-        if(count($viewsIds) AND $configured) {
-            try {
-                $allTicketView = Mage::getModel('zendesk/api_views')->active();
-                $ticketsCounts = Mage::getModel('zendesk/api_views')->countByIds($viewsIds);
+        try {
+            $allTicketView = Mage::getModel('zendesk/api_views')->active();
+            $ticketsCounts = Mage::getModel('zendesk/api_views')->countByIds($viewsIds);
 
-            } catch (Exception $ex) {
-                $allTicketView = array();
-            }
-                
+        } catch (Exception $ex) {
+            $allTicketView = array();
+        }
+
+        $viewFound = false;
+
+        if(count($viewsIds) && !empty($allTicketView) && $configured) {
+            // Loop through each view ID as per config
             foreach($viewsIds as $viewId) {
-                $view = array_shift(array_filter($allTicketView, function($view) use($viewId) {
-                    return $view['id'] === (int) $viewId;
-                }));
-                
-                $count = array_shift(array_filter($ticketsCounts['view_counts'], function($view) use($viewId) {
+                // Searches for the view's details by matching all views retrieved from the api to the current view id
+                $view = array_filter($allTicketView, function($ticketView) use($viewId) {
+                    return $ticketView['id'] === (int) $viewId;
+                });
+                // Return only the first value (usually returns just 1)
+                $view = array_shift($view);
+
+                // Don't display the tab if the view data was not retrieved
+                if (empty($view)) {
+                    continue;
+                }
+
+                $viewFound = true;
+
+                $count = array_filter($ticketsCounts['view_counts'], function($view) use($viewId) {
                     return $view['view_id'] === (int) $viewId;
-                }));
-                
+                });
+                $count = array_shift($count);
+
                 if($count['value']) {
                     $label = $view['title'] . ' (' . $count['value'] . ')';
                     $this->addTab($viewId, array(
@@ -92,11 +108,12 @@ protected function _prepareLayout() {
                     ));
                 }
             }
-        } else {
-            if ($this->getIsZendeskDashboard() AND !Mage::getStoreConfig('zendesk/backend_features/show_all')) {
-                $block = $this->getLayout()->createBlock('core/template', 'zendesk_dashboard_empty')->setTemplate('zendesk/dashboard/empty.phtml');
-                $this->getLayout()->getBlock('zendesk_dashboard')->append($block);
-            }
+        }
+
+        // Show the empty screen, if no views are activated or no views are selected, and show all is disabled
+        if (!$viewFound && $this->getIsZendeskDashboard() && !Mage::getStoreConfig('zendesk/backend_features/show_all')) {
+            $block = $this->getLayout()->createBlock('core/template', 'zendesk_dashboard_empty')->setTemplate('zendesk/dashboard/empty.phtml');
+            $this->getLayout()->getBlock('zendesk_dashboard')->append($block);
         }
 
         return parent::_prepareLayout();

src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/Email.php

@@ -19,7 +19,7 @@
 class Zendesk_Zendesk_Block_Adminhtml_Dashboard_Tab_Tickets_Grid_Renderer_Email extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract {
 
     public function render(Varien_Object $row) {
-        $users = Mage::registry('zendesk_users');
+        $users = Mage::registry('zendesk_users') ? Mage::registry('zendesk_users') : array();
         $value = (int) $row->getData($this->getColumn()->getIndex());
 
         $found = array_filter($users, function($user) use($value) {

src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/User.php

@@ -19,7 +19,7 @@
 class Zendesk_Zendesk_Block_Adminhtml_Dashboard_Tab_Tickets_Grid_Renderer_User extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract {
 
     public function render(Varien_Object $row) {
-        $users = Mage::registry('zendesk_users');
+        $users = Mage::registry('zendesk_users') ? Mage::registry('zendesk_users') : array();
         $value = (int) $row->getData($this->getColumn()->getIndex());
 
         $found = array_filter($users, function($user) use($value) {

src/app/code/community/Zendesk/Zendesk/Block/Customer/Tickets.php

@@ -24,7 +24,11 @@ public function __construct()
     }
 
     public function getSubmitAction() {
-        $url = Mage::helper('adminhtml')->getUrl('*/sso/login', array("return_url" => Mage::helper('core')->urlEncode("http://".Mage::getStoreConfig('zendesk/general/domain')."/requests/new")));
+        if (!$return_url = Mage::getStoreConfig('zendesk/sso_frontend/new')) {
+            $return_url = "http://".Mage::getStoreConfig('zendesk/general/domain')."/requests/new";
+        }
+        $url = Mage::helper('adminhtml')->getUrl('*/sso/login', array("return_url" => Mage::helper('core')->urlEncode($return_url)));
+
         return $url;
     }
 }

src/app/code/community/Zendesk/Zendesk/Helper/Data.php

@@ -120,7 +120,9 @@ public function getZendeskUnauthUrl()
     {
         $protocol = 'https://';
         $domain = $this->getZendeskDomain();
-        $route = '/access/unauthenticated';
+        //Zendesk will automatically redirect to login if user is not logged in
+        //previous URL followed to login page even if user has already logged in
+        $route = '/home';
 
         return $protocol . $domain . $route;
     }
@@ -279,7 +281,7 @@ public function getTicketUrl($row, $link = false)
 
         $subject = $row['subject'] ? $row['subject'] : $this->__('No Subject');
 
-        return '<a href="' . $url . '" target="_blank">' .  $subject. '</a>';
+        return '<a href="' . $url . '" target="_blank">' .  Mage::helper('core')->escapeHtml($subject) . '</a>';
     }
 
     public function getStatusMap()
@@ -368,4 +370,27 @@ public function getConnectionStatus() {
         }
     }
 
+    public function storeDependenciesInCachedRegistry() {
+        $cache = Mage::app()->getCache();
+
+        if (null == Mage::registry('zendesk_users')) {
+            if( $cache->load('zendesk_users') === false) {
+                $users = serialize( Mage::getModel('zendesk/api_users')->all() );
+                $cache->save($users, 'zendesk_users', array('zendesk', 'zendesk_users'), 300);
+            }
+
+            $users  = unserialize( $cache->load('zendesk_users') );
+            Mage::register('zendesk_users', $users);
+        }
+
+        if (null == Mage::registry('zendesk_groups')) {
+            if( $cache->load('zendesk_groups') === false) {
+                $groups = serialize( Mage::getModel('zendesk/api_groups')->all() );
+                $cache->save($groups, 'zendesk_groups', array('zendesk', 'zendesk_groups'), 1200);
+            }
+            
+            $groups = unserialize( $cache->load('zendesk_groups') );
+            Mage::register('zendesk_groups', $groups);
+        }
+    }
 }