From f31104fc5888678e573ccc92eb9c1dc16f8a6300 Mon Sep 17 00:00:00 2001 From: INBS22 Date: Thu, 22 Jan 2015 12:20:17 +0100 Subject: [PATCH 01/27] ModulesGarden changelog: Added: - Separate backend and frontend configuration - Separate zendesk API accounts - All tickets tab - Dashboard ticket statistics - User selection while ticket creating - Order selection while ticket creating - SSO authetification - Magento customer and finance data with Zendesk end-user profile synchronization Fixed: - Client loose all tickets if change email in magento - Ajax test connection - UI fixes - Tickets created from "Feedback Tab" or "Contact Us" do not show thread in module ticket list - Several language improvements --- .../Block/Adminhtml/Config/Buttons/Sync.php | 56 +++ .../Block/Adminhtml/Create/Customer.php | 64 +++ .../Block/Adminhtml/Create/Customer/Grid.php | 114 +++++ .../Create/Customer/Grid/Renderer/Action.php | 43 ++ .../Block/Adminhtml/Create/Edit/Form.php | 4 +- .../Zendesk/Block/Adminhtml/Create/Order.php | 64 +++ .../Block/Adminhtml/Create/Order/Grid.php | 153 +++++++ .../Create/Order/Grid/Renderer/Action.php | 43 ++ .../Zendesk/Block/Adminhtml/Dashboard.php | 5 + .../Block/Adminhtml/Dashboard/Grids.php | 38 +- .../Adminhtml/Dashboard/Tab/Tickets/Grid.php | 214 +++++++++ .../Tab/Tickets/Grid/Renderer/Action.php | 40 ++ .../Tab/Tickets/Grid/Renderer/Created.php | 41 ++ .../Tab/Tickets/Grid/Renderer/Email.php | 60 +++ .../Tab/Tickets/Grid/Renderer/Updated.php | 41 ++ .../Tab/Tickets/Grid/Renderer/User.php | 62 +++ .../Block/Adminhtml/Settings/Button.php | 42 ++ .../Zendesk/Block/Adminhtml/Settings/Edit.php | 48 ++ .../Block/Adminhtml/Settings/Edit/Form.php | 106 +++++ .../Widget/Form/Renderer/Fieldset.php | 24 + .../Zendesk/Block/Customer/Tickets.php | 4 + .../Zendesk/Zendesk/Block/Supporttab.php | 4 +- .../community/Zendesk/Zendesk/Helper/Data.php | 224 ++++++++++ .../Zendesk/Zendesk/Model/Api/Abstract.php | 89 ++-- .../Zendesk/Zendesk/Model/Api/Tickets.php | 112 ++++- .../Zendesk/Zendesk/Model/Api/Users.php | 47 ++ .../Zendesk/Zendesk/Model/Observer.php | 95 +++- .../Zendesk/Model/Resource/Settings.php | 49 ++ .../Model/Resource/Settings/Collection.php | 35 ++ .../Zendesk/Model/Resource/Tickets.php | 34 ++ .../Model/Resource/Tickets/Collection.php | 62 +++ .../Zendesk/Zendesk/Model/Settings.php | 54 +++ .../Zendesk/Zendesk/Model/Tickets.php | 35 ++ .../Adminhtml/ZendeskController.php | 417 +++++++++++++++++- .../Zendesk/controllers/ApiController.php | 12 +- .../Zendesk/controllers/IndexController.php | 12 +- .../community/Zendesk/Zendesk/etc/config.xml | 65 ++- .../community/Zendesk/Zendesk/etc/system.xml | 139 ++++-- .../zendesk_setup/mysql4-install-1.3.1.php | 39 ++ .../default/default/layout/zendesk.xml | 120 ++++- .../zendesk/config/button-signup.phtml | 2 +- .../template/zendesk/config/button-sync.phtml | 42 ++ .../zendesk/config/button-test-zendesk.phtml | 25 +- .../template/zendesk/create/customer.phtml | 55 +++ .../template/zendesk/create/order.phtml | 54 +++ .../template/zendesk/customer/tickets.phtml | 2 +- .../template/zendesk/dashboard/index.phtml | 98 +++- .../zendesk/dashboard/tabs/tickets.phtml | 74 ++++ .../zendesk/dashboard/tabs/view.phtml | 20 +- .../default/template/zendesk/left-menu.phtml | 4 +- .../template/zendesk/order/tickets.phtml | 2 +- .../template/zendesk/tickets/tickets.phtml | 74 ++++ .../zendesk/widget/form/container.phtml | 55 +++ .../widget/form/renderer/fieldset.phtml | 70 +++ .../frontend/base/default/layout/zendesk.xml | 6 +- .../template/zendesk/customer/tickets.phtml | 5 +- .../zendesk/customer/tickets/list.phtml | 2 +- src/app/locale/da_DA/Zendesk_Zendesk.csv | 2 +- src/app/locale/de_DE/Zendesk_Zendesk.csv | 2 +- src/app/locale/en_CA/Zendesk_Zendesk.csv | 2 +- src/app/locale/en_GB/Zendesk_Zendesk.csv | 2 +- src/app/locale/en_US/Zendesk_Zendesk.csv | 2 +- src/app/locale/en_US/Zendesk_Zendesk.yml | 2 +- src/app/locale/es_419/Zendesk_Zendesk.csv | 2 +- src/app/locale/es_ES/Zendesk_Zendesk.csv | 2 +- src/app/locale/fr_CA/Zendesk_Zendesk.csv | 2 +- src/app/locale/fr_FR/Zendesk_Zendesk.csv | 2 +- src/app/locale/it_IT/Zendesk_Zendesk.csv | 2 +- src/app/locale/ja_JA/Zendesk_Zendesk.csv | 2 +- src/app/locale/ja_JP/Zendesk_Zendesk.csv | 2 +- src/app/locale/ko_KO/Zendesk_Zendesk.csv | 2 +- src/app/locale/ko_KR/Zendesk_Zendesk.csv | 2 +- src/app/locale/nl_NL/Zendesk_Zendesk.csv | 2 +- src/app/locale/no_NO/Zendesk_Zendesk.csv | 2 +- src/app/locale/pt_BR/Zendesk_Zendesk.csv | 2 +- src/app/locale/pt_PT/Zendesk_Zendesk.csv | 2 +- src/app/locale/ru_RU/Zendesk_Zendesk.csv | 2 +- src/app/locale/sv_SV/Zendesk_Zendesk.csv | 2 +- src/app/locale/tr_TR/Zendesk_Zendesk.csv | 2 +- src/app/locale/uk_UK/Zendesk_Zendesk.csv | 2 +- src/app/locale/zh_TW/Zendesk_Zendesk.csv | 2 +- .../default/zendesk/js/jquery-1.11.1.min.js | 4 + .../zendesk/js/jquery-noconflict.min.js | 4 + .../default/default/zendesk/js/validation.js | 23 + .../default/default/zendesk/zendesk.css | 29 +- 85 files changed, 3401 insertions(+), 207 deletions(-) create mode 100644 src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Config/Buttons/Sync.php create mode 100644 src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Customer.php create mode 100644 src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Customer/Grid.php create mode 100644 src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Customer/Grid/Renderer/Action.php create mode 100644 src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Order.php create mode 100644 src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Order/Grid.php create mode 100644 src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Order/Grid/Renderer/Action.php create mode 100644 src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid.php create mode 100644 src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/Action.php create mode 100644 src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/Created.php create mode 100644 src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/Email.php create mode 100644 src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/Updated.php create mode 100644 src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/User.php create mode 100644 src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Settings/Button.php create mode 100644 src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Settings/Edit.php create mode 100644 src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Settings/Edit/Form.php create mode 100644 src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Widget/Form/Renderer/Fieldset.php create mode 100644 src/app/code/community/Zendesk/Zendesk/Model/Resource/Settings.php create mode 100644 src/app/code/community/Zendesk/Zendesk/Model/Resource/Settings/Collection.php create mode 100644 src/app/code/community/Zendesk/Zendesk/Model/Resource/Tickets.php create mode 100644 src/app/code/community/Zendesk/Zendesk/Model/Resource/Tickets/Collection.php create mode 100644 src/app/code/community/Zendesk/Zendesk/Model/Settings.php create mode 100644 src/app/code/community/Zendesk/Zendesk/Model/Tickets.php create mode 100644 src/app/code/community/Zendesk/Zendesk/sql/zendesk_setup/mysql4-install-1.3.1.php create mode 100644 src/app/design/adminhtml/default/default/template/zendesk/config/button-sync.phtml create mode 100644 src/app/design/adminhtml/default/default/template/zendesk/create/customer.phtml create mode 100644 src/app/design/adminhtml/default/default/template/zendesk/create/order.phtml create mode 100644 src/app/design/adminhtml/default/default/template/zendesk/dashboard/tabs/tickets.phtml create mode 100644 src/app/design/adminhtml/default/default/template/zendesk/tickets/tickets.phtml create mode 100644 src/app/design/adminhtml/default/default/template/zendesk/widget/form/container.phtml create mode 100644 src/app/design/adminhtml/default/default/template/zendesk/widget/form/renderer/fieldset.phtml create mode 100644 src/skin/adminhtml/default/default/zendesk/js/jquery-1.11.1.min.js create mode 100644 src/skin/adminhtml/default/default/zendesk/js/jquery-noconflict.min.js create mode 100644 src/skin/adminhtml/default/default/zendesk/js/validation.js diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Config/Buttons/Sync.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Config/Buttons/Sync.php new file mode 100644 index 00000000..314f9748 --- /dev/null +++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Config/Buttons/Sync.php @@ -0,0 +1,56 @@ +getTemplate()) { + $this->setTemplate('zendesk/config/button-sync.phtml'); + } + return $this; + } + + public function render(Varien_Data_Form_Element_Abstract $element) + { + $element->unsScope()->unsCanUseWebsiteValue()->unsCanUseDefaultValue(); + return parent::render($element); + } + + protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) + { + $originalData = $element->getOriginalData(); + $this->addData(array( + 'button_label' => Mage::helper('zendesk')->__($originalData['button_label']), + 'html_id' => $element->getHtmlId(), + 'url' => Mage::getSingleton('adminhtml/url')->getUrl('adminhtml/zendesk/sync') + )); + + return $this->_toHtml(); + } + + public function getTestUrl() + { + return Mage::getSingleton('adminhtml/url')->getUrl('adminhtml/zendesk/sync'); + } + + public function getAuthHeader() + { + return 'Token token="' . Mage::helper('zendesk')->getApiToken(false) . '"'; + } +} \ No newline at end of file diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Customer.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Customer.php new file mode 100644 index 00000000..42d55d45 --- /dev/null +++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Customer.php @@ -0,0 +1,64 @@ + + */ + +class Zendesk_Zendesk_Block_Adminhtml_Create_Customer extends Mage_Adminhtml_Block_Widget_Form_Container +{ + + public function __construct() + { + parent::__construct(); + $this->setId('zendesk_create_customer_search'); + } + + public function getHeaderText() + { + return Mage::helper('zendesk')->__('Please Select User to Add'); + } + + public function getButtonsHtml() + { + $addButtonData = array( + 'label' => Mage::helper('zendesk')->__('Select User'), + 'onclick' => 'showUsers()', + 'id' => 'show-users' + ); + return $this->getLayout()->createBlock('adminhtml/widget_button')->setData($addButtonData)->toHtml(); + } + + public function getHeaderCssClass() + { + return 'head-catalog-customer'; + } + +} diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Customer/Grid.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Customer/Grid.php new file mode 100644 index 00000000..cee4ce04 --- /dev/null +++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Customer/Grid.php @@ -0,0 +1,114 @@ + + */ +class Zendesk_Zendesk_Block_Adminhtml_Create_Customer_Grid extends Mage_Adminhtml_Block_Widget_Grid +{ + + public function __construct() + { + parent::__construct(); + $this->setId('zendesk_create_customer_search_grid'); + $this->setDefaultSort('entity_id'); + $this->setUseAjax(true); + if ($this->getRequest()->getParam('collapse')) { + $this->setIsCollapsed(true); + } + } + + /** + * Retrieve quote store object + * @return Mage_Core_Model_Store + */ + public function getStore() + { + return Mage::getSingleton('adminhtml/session_quote')->getStore(); + } + + /** + * Prepare collection to be displayed in the grid + * + * @return Mage_Adminhtml_Block_Sales_Order_Create_Search_Grid + */ + protected function _prepareCollection() + { + $collection = Mage::getModel('customer/customer')->getCollection() + ->addAttributeToSelect('firstname') + ->addAttributeToSelect('lastname') + ->addAttributeToSelect('email'); + + + $this->setCollection($collection); + return parent::_prepareCollection(); + } + + /** + * Prepare columns + * + * @return Mage_Adminhtml_Block_Sales_Order_Create_Search_Grid + */ + protected function _prepareColumns() + { + $this->addColumn('entity_id', array( + 'header' => Mage::helper('zendesk')->__('ID'), + 'sortable' => true, + 'width' => '60', + 'index' => 'entity_id' + )); + $this->addColumn('firstname', array( + 'header' => Mage::helper('zendesk')->__('Firstname'), + 'index' => 'firstname' + )); + $this->addColumn('lastname', array( + 'header' => Mage::helper('zendesk')->__('Lastname'), + 'index' => 'lastname' + )); + $this->addColumn('email', array( + 'header' => Mage::helper('zendesk')->__('Email'), + 'index' => 'email' + )); + $this->addColumn('action', array( + 'header' => Mage::helper('zendesk')->__('Action'), + 'renderer' => 'zendesk/adminhtml_create_customer_grid_renderer_action', + 'filter' => false, + 'sortable' => false + )); + + return parent::_prepareColumns(); + } + + public function getGridUrl() + { + return $this->getUrl('adminhtml/zendesk/loadBlock', array('block'=>'customer_grid', '_current' => true, 'collapse' => null)); + } + +} diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Customer/Grid/Renderer/Action.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Customer/Grid/Renderer/Action.php new file mode 100644 index 00000000..e532b47c --- /dev/null +++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Customer/Grid/Renderer/Action.php @@ -0,0 +1,43 @@ + + */ +class Zendesk_Zendesk_Block_Adminhtml_Create_Customer_Grid_Renderer_Action extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract +{ + public function render(Varien_Object $row) + { + if ($row->getId()) { + return ""; + } + } + +} diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Edit/Form.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Edit/Form.php index 52186a5c..1d81be93 100644 --- a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Edit/Form.php +++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Edit/Form.php @@ -105,8 +105,8 @@ protected function _prepareForm() $fieldset->addField('order', 'text', array( 'name' => 'order', - 'label' => Mage::helper('zendesk')->__('Order number'), - 'title' => Mage::helper('zendesk')->__('Order number'), + 'label' => Mage::helper('zendesk')->__('Order Number'), + 'title' => Mage::helper('zendesk')->__('Order Number'), 'required' => false )); diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Order.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Order.php new file mode 100644 index 00000000..9e2531bf --- /dev/null +++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Order.php @@ -0,0 +1,64 @@ + + */ + +class Zendesk_Zendesk_Block_Adminhtml_Create_Order extends Mage_Adminhtml_Block_Widget_Form_Container +{ + + public function __construct() + { + parent::__construct(); + $this->setId('zendesk_create_order_search'); + } + + public function getHeaderText() + { + return Mage::helper('zendesk')->__('Please Select Order to Add'); + } + + public function getButtonsHtml() + { + $addButtonData = array( + 'label' => Mage::helper('zendesk')->__('Select Order'), + 'onclick' => 'showOrders()', + 'id' => 'show-orders' + ); + return $this->getLayout()->createBlock('adminhtml/widget_button')->setData($addButtonData)->toHtml(); + } + + public function getHeaderCssClass() + { + return 'head-catalog-order'; + } + +} diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Order/Grid.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Order/Grid.php new file mode 100644 index 00000000..fc6cb260 --- /dev/null +++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Order/Grid.php @@ -0,0 +1,153 @@ + + */ +class Zendesk_Zendesk_Block_Adminhtml_Create_Order_Grid extends Mage_Adminhtml_Block_Widget_Grid +{ + + public function __construct() + { + parent::__construct(); + $this->setId('zendesk_create_order_search_grid'); + $this->setDefaultSort('entity_id'); + $this->setUseAjax(true); + if ($this->getRequest()->getParam('collapse')) { + $this->setIsCollapsed(true); + } + } + + /** + * Retrieve quote store object + * @return Mage_Core_Model_Store + */ + public function getStore() + { + return Mage::getSingleton('adminhtml/session_quote')->getStore(); + } + + /** + * Retrieve collection class + * + * @return string + */ + protected function _getCollectionClass() + { + return 'sales/order_grid_collection'; + } + + protected function _prepareCollection() + { + $collection = Mage::getResourceModel($this->_getCollectionClass()); + $this->setCollection($collection); + return parent::_prepareCollection(); + } + + /** + * Prepare columns + * + * @return Mage_Adminhtml_Block_Sales_Order_Create_Search_Grid + */ + protected function _prepareColumns() + { + $this->addColumn('real_order_id', array( + 'header'=> Mage::helper('sales')->__('Order #'), + 'width' => '80px', + 'type' => 'text', + 'index' => 'increment_id', + )); + + if (!Mage::app()->isSingleStoreMode()) { + $this->addColumn('store_id', array( + 'header' => Mage::helper('sales')->__('Purchased From (Store)'), + 'index' => 'store_id', + 'type' => 'store', + 'store_view'=> true, + 'display_deleted' => true, + )); + } + + $this->addColumn('created_at', array( + 'header' => Mage::helper('sales')->__('Purchased On'), + 'index' => 'created_at', + 'type' => 'datetime', + 'width' => '100px', + )); + + $this->addColumn('billing_name', array( + 'header' => Mage::helper('sales')->__('Bill to Name'), + 'index' => 'billing_name', + )); + + $this->addColumn('shipping_name', array( + 'header' => Mage::helper('sales')->__('Ship to Name'), + 'index' => 'shipping_name', + )); + + $this->addColumn('base_grand_total', array( + 'header' => Mage::helper('sales')->__('G.T. (Base)'), + 'index' => 'base_grand_total', + 'type' => 'currency', + 'currency' => 'base_currency_code', + )); + + $this->addColumn('grand_total', array( + 'header' => Mage::helper('sales')->__('G.T. (Purchased)'), + 'index' => 'grand_total', + 'type' => 'currency', + 'currency' => 'order_currency_code', + )); + + $this->addColumn('status', array( + 'header' => Mage::helper('sales')->__('Status'), + 'index' => 'status', + 'type' => 'options', + 'width' => '70px', + 'options' => Mage::getSingleton('sales/order_config')->getStatuses(), + )); + + $this->addColumn('action', array( + 'header' => Mage::helper('zendesk')->__('Action'), + 'renderer' => 'zendesk/adminhtml_create_order_grid_renderer_action', + 'filter' => false, + 'sortable' => false + )); + + return parent::_prepareColumns(); + } + + public function getGridUrl() + { + return $this->getUrl('adminhtml/zendesk/loadBlock', array('block'=>'order_grid', '_current' => true, 'collapse' => null)); + } + + +} diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Order/Grid/Renderer/Action.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Order/Grid/Renderer/Action.php new file mode 100644 index 00000000..6e73f62b --- /dev/null +++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Order/Grid/Renderer/Action.php @@ -0,0 +1,43 @@ + + */ +class Zendesk_Zendesk_Block_Adminhtml_Create_Order_Grid_Renderer_Action extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract +{ + public function render(Varien_Object $row) + { + if ($row->getId()) { + return ""; + } + } + +} diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard.php index f25c8909..d8fafde9 100644 --- a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard.php +++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard.php @@ -34,4 +34,9 @@ public function getIsZendeskDashboard() return false; } } + + public function getAuthHeader() + { + return 'Token token="' . Mage::helper('zendesk')->getApiToken(false) . '"'; + } } diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Grids.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Grids.php index f33d786d..18a18d3a 100644 --- a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Grids.php +++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Grids.php @@ -35,22 +35,50 @@ protected function _prepareLayout() $views = null; $first = true; + $configured = false; if(Mage::getStoreConfig('zendesk/features/show_views')) { $list = trim(trim(Mage::getStoreConfig('zendesk/features/show_views')), ','); $views = explode(',', $list); } - if($views && count($views)) { - foreach($views as $viewId) { - try { + //check if module is setted up + if( Mage::getStoreConfig('zendesk/general/domain') ) + $configured = true; + + if( Mage::getStoreConfig('zendesk/backend_features/show_all') && $configured ) + { + $tab = array( + 'content' => $this->getLayout()->createBlock('zendesk/adminhtml_dashboard_tab_tickets_grid')->toHtml() + ); + + Mage::registry('zendesk_tickets_count') ? $count = " (".Mage::registry('zendesk_tickets_count').")" : $count = ""; + $tab['label'] = $this->__("All") . $count; + + //Clear total tickets count + Mage::unregister('zendesk_tickets_count'); + + if( $first ) + { + $tab['active'] = true; + $first = false; + } + $this->addTab("all", $tab); + } + + if( $views && count($views) && $configured ) + { + foreach( $views as $viewId ) + { + try + { $view = Mage::getModel('zendesk/api_views')->get($viewId); $tab = array( 'label' => $this->__($view['title']), 'content' => $this->getLayout()->createBlock('zendesk/adminhtml_dashboard_tab_view')->setView($view)->toHtml(), ); - + if($first) { $tab['active'] = true; $first = false; @@ -71,7 +99,7 @@ protected function _prepareLayout() return parent::_prepareLayout(); } - + public function getIsZendeskDashboard() { $controller = Mage::app()->getFrontController()->getRequest()->getControllerName(); diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid.php new file mode 100644 index 00000000..9ebfd339 --- /dev/null +++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid.php @@ -0,0 +1,214 @@ + + */ +class Zendesk_Zendesk_Block_Adminhtml_Dashboard_Tab_Tickets_Grid extends Mage_Adminhtml_Block_Widget_Grid +{ + + protected $_defaultLimit = 20; + protected $_defaultPage = 1; + protected $_defaultSort = 'created_at'; + protected $_defaultDir = 'desc'; + + public function __construct() + { + parent::__construct(); + $this->setId('zendesk_tab_tickets_grid'); + $this->setSaveParametersInSession(true); + $this->setUseAjax(true); + if ($this->getRequest()->getParam('collapse')) { + $this->setIsCollapsed(true); + } + } + + /** + * Retrieve quote store object + * @return Mage_Core_Model_Store + */ + public function getStore() + { + return Mage::getSingleton('adminhtml/session_quote')->getStore(); + } + + /** + * Prepare collection to be displayed in the grid + * + * @return Mage_Adminhtml_Block_Sales_Order_Create_Search_Grid + */ + protected function _prepareCollection() + { + + $filter = $this->getParam($this->getVarNameFilter(), null); + $data = $this->helper('adminhtml')->prepareFilterString($filter); + $data['per_page'] = (int) $this->getParam($this->getVarNameLimit(), $this->_defaultLimit); + $data['page'] = (int) $this->getParam($this->getVarNamePage(), $this->_defaultPage); + $data['sort_by'] = $this->getParam($this->getVarNameSort(), $this->_defaultSort); + $data['sort_order'] = $this->getParam($this->getVarNameDir(), $this->_defaultDir); + + $collection = Mage::getModel('zendesk/resource_tickets_collection', $data); + + //Get users to render user id + Mage::register('zendesk_users', Mage::getModel('zendesk/api_users')->all()); + + if ( is_string($filter) ) + { + $data = $this->helper('adminhtml')->prepareFilterString($filter); + $this->_setFilterValues($data); + } + else if ( $filter && is_array($filter) ) + { + $this->_setFilterValues($filter); + } + else if ( 0 !== sizeof($this->_defaultFilter) ) + { + $this->_setFilterValues($this->_defaultFilter); + } + + if ( isset($this->_columns[$data['sort_by']]) && $this->_columns[$data['sort_by']]->getIndex() ) + { + $dir = (strtolower($data['sort_order']) == 'desc') ? 'desc' : 'asc'; + $this->_columns[$data['sort_by']]->setDir($dir); + $this->_setCollectionOrder($this->_columns[$data['sort_by']]); + } + + $this->setCollection($collection); + + return $this; + } + + /** + * Prepare columns + * + * @return Mage_Adminhtml_Block_Sales_Order_Create_Search_Grid + */ + protected function _prepareColumns() + { + $this->addColumn('subject', array( + 'header' => Mage::helper('zendesk')->__('Subject'), + 'sortable' => false, + 'width' => '60', + 'renderer' => 'zendesk/adminhtml_dashboard_tab_tickets_grid_renderer_action', + 'index' => 'subject' + )); + $this->addColumn('requester_id', array( + 'header' => Mage::helper('zendesk')->__('Requester'), + 'sortable' => false, + 'filter' => false, + 'width' => '60', + 'renderer' => 'zendesk/adminhtml_dashboard_tab_tickets_grid_renderer_user', + 'index' => 'requester_id' + )); + $this->addColumn('email', array( + 'header' => Mage::helper('zendesk')->__('Email'), + 'sortable' => false, + 'width' => '60', + 'renderer' => 'zendesk/adminhtml_dashboard_tab_tickets_grid_renderer_email', + 'index' => 'email' + )); + + $this->addColumn('status', array( + 'header' => Mage::helper('zendesk')->__('Status'), + 'sortable' => true, + 'width' => '60', + 'type' => 'options', + 'options' => Mage::helper('zendesk')->getStatusMap(), + 'index' => 'status' + )); + $this->addColumn('priority', array( + 'header' => Mage::helper('zendesk')->__('Priority'), + 'sortable' => true, + 'width' => '60', + 'type' => 'options', + 'options' => Mage::helper('zendesk')->getPriorityMap(), + 'index' => 'priority' + )); + $this->addColumn('created_at', array( + 'header' => Mage::helper('zendesk')->__('Requested'), + 'sortable' => true, + 'width' => '60', + 'type' => 'date', + 'renderer' => 'zendesk/adminhtml_dashboard_tab_tickets_grid_renderer_created', + 'index' => 'created_at' + )); + $this->addColumn('updated_at', array( + 'header' => Mage::helper('zendesk')->__('Updated'), + 'sortable' => true, + 'width' => '60', + 'type' => 'date', + 'renderer' => 'zendesk/adminhtml_dashboard_tab_tickets_grid_renderer_updated', + 'index' => 'updated_at' + )); + + Mage::unregister('zendesk_users'); + + return parent::_prepareColumns(); + } + + public function getGridUrl() + { + $url = $this->getUrl('adminhtml/zendesk/loadBlock',array('block'=>'tickets', '_current' => true)); + return $url; + } + + protected function _prepareMassaction() + { + $this->setMassactionIdField('id'); + $this->getMassactionBlock()->setFormFieldName('id'); + + $this->getMassactionBlock()->addItem('delete', array( + 'label' => Mage::helper('zendesk')->__('Delete'), + 'url' => $this->getUrl('*/zendesk/bulkDelete', array('form_key'=>Mage::getSingleton('core/session')->getFormKey())), + 'confirm' => Mage::helper('zendesk')->__('Are you sure you want to delete selected tickets?') + )); + + $this->getMassactionBlock()->addItem('change_status', array( + 'label' => Mage::helper('zendesk')->__('Change Status'), + 'url' => $this->getUrl('*/zendesk/bulkChangestatus', array('form_key'=>Mage::getSingleton('core/session')->getFormKey())), + 'confirm' => Mage::helper('zendesk')->__('Are you sure you want to change status of selected tickets?'), + 'additional' => array( + 'visibility' => array( + 'name' => 'status', + 'type' => 'select', + 'class' => 'required-entry', + 'label' => Mage::helper('zendesk')->__('Status'), + 'values' => Mage::helper('zendesk')->getStatusMap() + ) + ) + )); + return $this; + } + + protected function getNoFilterMassactionColumn(){ + return true; + } + +} diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/Action.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/Action.php new file mode 100644 index 00000000..055d2962 --- /dev/null +++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/Action.php @@ -0,0 +1,40 @@ + + */ +class Zendesk_Zendesk_Block_Adminhtml_Dashboard_Tab_Tickets_Grid_Renderer_Action extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract +{ + public function render(Varien_Object $row) + { + return "getUrl('ticket', $row->getId())."'>".Mage::helper('zendesk')->getExcerpt($row->getData()).""; } + +} diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/Created.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/Created.php new file mode 100644 index 00000000..4e9fd812 --- /dev/null +++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/Created.php @@ -0,0 +1,41 @@ + + */ +class Zendesk_Zendesk_Block_Adminhtml_Dashboard_Tab_Tickets_Grid_Renderer_Created extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract +{ + public function render(Varien_Object $row) + { + return Mage::helper('core')->formatDate($row->getCreatedAt(), Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM, true); + } + +} diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/Email.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/Email.php new file mode 100644 index 00000000..f1e518df --- /dev/null +++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/Email.php @@ -0,0 +1,60 @@ + + */ +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) + { + $maped_users = array(); + $users = Mage::registry('zendesk_users'); + if( $users ) + { + foreach( $users as $user ) + { + $maped_users[$user['id']] = $user['email']; + } + + if( !isset($maped_users[$row->getRequesterId()]) ) + { + $model = Mage::getModel('zendesk/api_users')->get($row->getRequesterId()); + $users[] = $model; + Mage::unregister('zendesk_users'); + Mage::register('zendesk_users', $users); + return $model['email']; + } + } + + return $maped_users[$row->getRequesterId()]; + } + +} diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/Updated.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/Updated.php new file mode 100644 index 00000000..59149968 --- /dev/null +++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/Updated.php @@ -0,0 +1,41 @@ + + */ +class Zendesk_Zendesk_Block_Adminhtml_Dashboard_Tab_Tickets_Grid_Renderer_Updated extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract +{ + public function render(Varien_Object $row) + { + return Mage::helper('core')->formatDate($row->getUpdatedAt(), Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM, true); + } + +} diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/User.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/User.php new file mode 100644 index 00000000..823c33f5 --- /dev/null +++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/User.php @@ -0,0 +1,62 @@ + + */ +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) + { + $maped_users = array(); + $users = Mage::registry('zendesk_users'); + if( $users ) + { + foreach( $users as $user ) + { + $maped_users[$user['id']] = $user['name']; + } + + if( !isset($maped_users[$row->getRequesterId()]) ) + { + $model = Mage::getModel('zendesk/api_users')->get($row->getRequesterId()); + $users[] = $model; + $maped_users[$row->getRequesterId()] = $model['name']; + } + + Mage::unregister('zendesk_users'); + Mage::register('zendesk_users', $users); + } + + + return $maped_users[$row->getRequesterId()]; + } + +} diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Settings/Button.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Settings/Button.php new file mode 100644 index 00000000..ff375ac3 --- /dev/null +++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Settings/Button.php @@ -0,0 +1,42 @@ + http://modulesgarden.com + * CONTACT -> contact@modulesgarden.com + * + * + * + * + * This software is furnished under a license and may be used and copied + * only in accordance with the terms of such license and with the + * inclusion of the above copyright notice. This software or any other + * copies thereof may not be provided or otherwise made available to any + * other person. No title to and ownership of the software is hereby + * transferred. + * + * + * ******************************************************************** */ + +/** + * @author Marcin Kozak + */ + +class Zendesk_Zendesk_Block_Adminhtml_Settings_Button extends Mage_Adminhtml_Block_System_Config_Form_Field { + + protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) { + $this->setElement($element); + $url = $this->getUrl('zendesk/adminhtml_settings/checkConfigurationConnection'); // + + return $this->getLayout()->createBlock('adminhtml/widget_button') + ->setType('button') + ->setClass('scalable') + ->setLabel( Mage::helper('zendesk')->__('Check Connection') ) + ->setOnClick("setLocation('$url')") + ->toHtml(); + } + +} diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Settings/Edit.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Settings/Edit.php new file mode 100644 index 00000000..0cc6accc --- /dev/null +++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Settings/Edit.php @@ -0,0 +1,48 @@ + http://modulesgarden.com + * CONTACT -> contact@modulesgarden.com + * + * + * + * + * This software is furnished under a license and may be used and copied + * only in accordance with the terms of such license and with the + * inclusion of the above copyright notice. This software or any other + * copies thereof may not be provided or otherwise made available to any + * other person. No title to and ownership of the software is hereby + * transferred. + * + * + * ******************************************************************** */ + +/** + * @author Marcin Kozak + */ + +class Zendesk_Zendesk_Block_Adminhtml_Settings_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { + + public function __construct() { + parent::__construct(); + $this->_blockGroup = 'zendesk'; + $this->_controller = 'adminhtml_settings'; + $this->_headerText = Mage::helper('zendesk')->__('Edit Settings'); + + $this->_removeButton('back'); + $this->_removeButton('delete'); + $this->_removeButton('reset'); + + $this->setTemplate('zendesk/widget/form/container.phtml'); + $this->setSkipHeaderCopy(true); + } + + protected function _toHtml() { + return '
' . parent::_toHtml() . '
'; + } + +} diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Settings/Edit/Form.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Settings/Edit/Form.php new file mode 100644 index 00000000..d9518941 --- /dev/null +++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Settings/Edit/Form.php @@ -0,0 +1,106 @@ + http://modulesgarden.com + * CONTACT -> contact@modulesgarden.com + * + * + * + * + * This software is furnished under a license and may be used and copied + * only in accordance with the terms of such license and with the + * inclusion of the above copyright notice. This software or any other + * copies thereof may not be provided or otherwise made available to any + * other person. No title to and ownership of the software is hereby + * transferred. + * + * + * ******************************************************************** */ + +/** + * @author Marcin Kozak + */ + +class Zendesk_Zendesk_Block_Adminhtml_Settings_Edit_Form extends Mage_Adminhtml_Block_Widget_Form { + protected $_settings; + + public function _construct() { + $this->_settings = Mage::registry('zendesk_settings'); + parent::_construct(); + } + + protected function _prepareForm() { + + $renderer = new Zendesk_Zendesk_Block_Adminhtml_Widget_Form_Renderer_Fieldset; + + $renderer->setMessage( $this->getMessage() ); + + $form = new Varien_Data_Form(); + $form->setUseContainer(true); + $form->setId('edit_form'); + $this->setForm($form); + $form->setFieldsetRenderer($renderer); + + $fieldset = $form->addFieldset('zendesk_form', array('legend' => Mage::helper('zendesk')->__('API Connection'))); + + $fieldset->addField('admin_user_id', 'hidden', array( + 'name' => 'admin_user_id', + 'value' => Mage::getSingleton('admin/session')->getUser()->getUserId() + )); + + if( Mage::getSingleton('admin/session')->isAllowed('zendesk/main_api_credentials') ) { + $fieldset->addField('use_global_settings', 'select', array( + 'name' => 'use_global_settings', + 'label' => Mage::helper('zendesk')->__('Use Global Settings'), + 'options' => Mage::getModel('adminhtml/system_config_source_yesno')->toArray(), + 'value' => 1 + )); + } + else { + $fieldset->addField('use_global_settings', 'hidden', array( + 'name' => 'use_global_settings', + 'value' => 0 + )); + } + + $fieldset->addField('username', 'text', array( + 'name' => 'username', + 'label' => Mage::helper('zendesk')->__('Username'), + 'class' => 'validate-require-if-not-global', + )); + + $fieldset->addField('password', 'password', array( + 'name' => 'password', + 'label' => Mage::helper('zendesk')->__('Password'), + 'class' => 'validate-require-if-not-global', + )); + + if ($this->_settings->getId()) { + $fieldset->addField('id', 'hidden', array( + 'name' => 'id', + 'value' => $this->_settings->getId() + )); + + $fieldset->addField('check_connection', 'note', array( + 'text' => '' . Mage::helper('zendesk')->__('Check Connection') . '', + )); + + $form->setValues($this->_settings->getData()); + } + + $form->setAction($this->getUrl('*/*/savesettings'))->setMethod('post'); + + return parent::_prepareForm(); + } + + + + public function getMessage() { + return Mage::helper('zendesk')->__('In this settings you can set up an access to your individual Zendesk account. Otherwise, you can use default account set up in General Zendesk Configuration.'); + } + +} diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Widget/Form/Renderer/Fieldset.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Widget/Form/Renderer/Fieldset.php new file mode 100644 index 00000000..8fa4c18e --- /dev/null +++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Widget/Form/Renderer/Fieldset.php @@ -0,0 +1,24 @@ +setTemplate('zendesk/widget/form/renderer/fieldset.phtml'); + } + + public function setMessage($message) { + $this->_message = $message; + } + + public function getMessage() { + return $this->_message; + } + + public function hasMessage() { + $message = $this->getMessage(); + return ! empty($message); + } +} diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Customer/Tickets.php b/src/app/code/community/Zendesk/Zendesk/Block/Customer/Tickets.php index 49110c1f..2bfe296e 100644 --- a/src/app/code/community/Zendesk/Zendesk/Block/Customer/Tickets.php +++ b/src/app/code/community/Zendesk/Zendesk/Block/Customer/Tickets.php @@ -22,4 +22,8 @@ public function __construct() parent::__construct(); $this->setTemplate('zendesk/customer/tickets.phtml'); } + + public function getSubmitAction() { + return "http://".Mage::getStoreConfig('zendesk/general/domain')."/anonymous_requests/new"; + } } \ No newline at end of file diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Supporttab.php b/src/app/code/community/Zendesk/Zendesk/Block/Supporttab.php index c7f80fdf..c5e41cc0 100644 --- a/src/app/code/community/Zendesk/Zendesk/Block/Supporttab.php +++ b/src/app/code/community/Zendesk/Zendesk/Block/Supporttab.php @@ -19,10 +19,10 @@ class Zendesk_Zendesk_Block_Supporttab extends Mage_Core_Block_Template { protected function _toHtml() { - if(!Mage::getStoreConfig('zendesk/features/feedback_tab_code_active')) { + if(!Mage::getStoreConfig('zendesk/frontend_features/feedback_tab_code_active')) { return ''; } - return Mage::getStoreConfig('zendesk/features/feedback_tab_code'); + return Mage::getStoreConfig('zendesk/frontend_features/feedback_tab_code'); } } \ No newline at end of file diff --git a/src/app/code/community/Zendesk/Zendesk/Helper/Data.php b/src/app/code/community/Zendesk/Zendesk/Helper/Data.php index e7f7e662..426b7003 100644 --- a/src/app/code/community/Zendesk/Zendesk/Helper/Data.php +++ b/src/app/code/community/Zendesk/Zendesk/Helper/Data.php @@ -45,6 +45,86 @@ public function getUrl($object = '', $id = null, $format = 'old') } } + /** + * Returns configured Zendesk Domain + * format: company.zendesk.com + * + * @return mixed Zendesk Account Domain + */ + public function getZendeskDomain() + { + return Mage::getStoreConfig('zendesk/general/domain'); + } + + + /** + * Returns if SSO is enabled for EndUsers + * @return integer + */ + public function isSSOEndUsersEnabled() + { + return Mage::getStoreConfig('zendesk/sso_frontend/enabled'); + } + + /** + * Returns if SSO is enabled for Admin/Agent Users + * @return integer + */ + public function isSSOAdminUsersEnabled() + { + return Mage::getStoreConfig('zendesk/sso/enabled'); + } + + /** + * Returns frontend URL where authentication process starts for EndUsers + * + * @return string SSO Url to auth EndUsers + */ + public function getSSOAuthUrlEndUsers() + { + return Mage::getUrl('zendesk/sso/login'); + } + + /** + * Returns backend URL where authentication process starts for Admin/Agents + * + * @return string SSO Url to auth Admin/Agents + */ + public function getSSOAuthUrlAdminUsers() + { + return Mage::helper('adminhtml')->getUrl('*/zendesk/login'); + } + + /** + * Returns Zendesk Account Login URL for normal access + * format: https:/// + * + * @return string Zendesk Account login url + */ + public function getZendeskAuthNormalUrl() + { + $protocol = 'https://'; + $domain = $this->getZendeskDomain(); + $route = '/access/normal'; + + return $protocol . $domain . $route; + } + + /** + * Returns Zendesk Login Form unauthenticated URL + * format: https:/// + * + * @return string Zendesk Account login unauthenticated form url + */ + public function getZendeskUnauthUrl() + { + $protocol = 'https://'; + $domain = $this->getZendeskDomain(); + $route = '/access/unauthenticated'; + + return $protocol . $domain . $route; + } + public function getApiToken($generate = true) { // Grab any existing token from the admin scope @@ -188,4 +268,148 @@ public function isExternalIdEnabled() { return Mage::getStoreConfig('zendesk/general/use_external_id'); } + + /** + * Retrieve ticket statistics + */ + public function getTicketTotals($type = null, $from = null, $to = null) + { + $tickets = Mage::getModel('zendesk/api_tickets')->all(); + + if( is_null($tickets) ) + { + return false; + } + + $totals = array( + 'open' => 0, + 'new' => 0, + 'solved' => 0, + 'closed' => 0 + ); + + if( $from ) + $from = strtotime($from); + else + $from = 0; + + foreach( $tickets as $ticket ) + { + if( $from || $to ) + { + if( strtotime($ticket['created_at']) > $from) + { + if( $to ) + { + if( strtotime($ticket['created_at']) < strtotime($to) ) + { + if( isset($totals[$ticket['status']]) ) + $totals[$ticket['status']]++; + } + } + else + { + if( isset($totals[$ticket['status']]) ) + $totals[$ticket['status']]++; + } + } + } + else + { + if( isset($totals[$ticket['status']]) ) + $totals[$ticket['status']]++; + } + } + + if( $type && isset($totals[$type])) + { + return $totals[$type]; + } + else + { + return $totals; + } + } + + public function getExcerpt($row) + { + if( !$row ) + { + return Mage::helper('zendesk')->__('Subject'); + } + $url = Mage::helper('zendesk')->getUrl('ticket', $row['id']); + if( $row['subject'] ) + { + return '' . $row['subject']. ''; + } + else + { + $subject = ""; + + $text = explode("Comment:",$row['description']); + $text = explode("------------------", $text[count($text)-1]); + $text = $text[0]; + + if( strlen($text) > 30 ) + { + for( $index = 0; $index <= 30; $index++ ) + { + if( $index === 30) + { + while( $text[$index] !== " " && $index <= strlen($text)) + { + $subject .= $text[$index]; + $index++; + } + break; + } + $subject .= $text[$index]; + } + $subject .= "..."; + } + else + { + $subject = $text; + } + + return '' . $subject . ''; + } + + } + + public function getAdminSettings() { + $admin = Mage::getSingleton('admin/session')->getUser(); + if( $admin ) + { + $adminId = $admin->getUserId(); + $settings = Mage::getModel('zendesk/settings')->loadByAdminId($adminId); + return $settings; + } + else + { + return false; + } + + } + + public function getStatusMap() + { + return array( + 'new' => 'New', + 'open' => 'Open', + 'pending' => 'Pending', + 'solved' => 'Solved', + 'closed' => 'Closed' + ); + } + + public function getPriorityMap() + { + return array( + 'low' => 'Low', + 'normal' => 'Normal', + 'high' => 'High', + 'urgent' => 'Urgent' + ); + } } diff --git a/src/app/code/community/Zendesk/Zendesk/Model/Api/Abstract.php b/src/app/code/community/Zendesk/Zendesk/Model/Api/Abstract.php index 8861c039..7a3df953 100644 --- a/src/app/code/community/Zendesk/Zendesk/Model/Api/Abstract.php +++ b/src/app/code/community/Zendesk/Zendesk/Model/Api/Abstract.php @@ -24,16 +24,8 @@ protected function _getUrl($path) return $base_url . '/' . $path; } - protected function _call( - $endpoint, - $params = null, - $method = 'GET', - $data = null, - $headers = null - ) + protected function _call($endpoint, $params = null, $method = 'GET', $data = null, $silent = false, $global = false) { - $usingRawData = false; - if($params && is_array($params) && count($params) > 0) { $args = array(); foreach($params as $arg => $val) { @@ -41,37 +33,48 @@ protected function _call( } $endpoint .= '?' . implode('&', $args); } - - if (empty($headers)) { - $headers = array( - 'Accept' => 'application/json', - 'Content-Type' => 'application/json', - ); - } - + $url = $this->_getUrl($endpoint); $method = strtoupper($method); $client = new Zend_Http_Client($url); $client->setMethod($method); - $client->setHeaders($headers); - - $client->setAuth( - Mage::getStoreConfig('zendesk/general/email') . '/token', - Mage::getStoreConfig('zendesk/general/password') + $client->setHeaders( + array( + 'Accept' => 'application/json', + 'Content-Type' => 'application/json' + ) ); - - if($method == 'POST' || $method == 'PUT') { - $contentType = $client->getHeader('Content-Type'); - - if ($contentType == 'application/json' && !preg_match('/^[\{\[]/', $contentType)) { - $data = json_encode($data); + + $settings = Mage::helper('zendesk')->getAdminSettings(); + + if( $settings && isset($settings) && $settings->isConfigured() && !$global) + { + if( $settings->getUseGlobalSettings() === "0") + { + $email = $settings->getUsername(); + $password = Mage::helper('core')->decrypt( $settings->getPassword() ); } + else + { + $email = Mage::getStoreConfig('zendesk/general/email'). '/token'; + $password = Mage::getStoreConfig('zendesk/general/password'); + } + } + else + { + $email = Mage::getStoreConfig('zendesk/general/email'). '/token'; + $password = Mage::getStoreConfig('zendesk/general/password'); + } - $client->setRawData($data, $client->getHeader('Content-Type')); + $client->setAuth( + $email, + $password + ); - $usingRawData = true; + if($method == 'POST' || $method == "PUT") { + $client->setRawData(json_encode($data), 'application/json'); } Mage::log( @@ -79,31 +82,45 @@ protected function _call( array( 'url' => $url, 'method' => $method, - 'data' => $usingRawData ? '' : json_encode($data), + 'data' => json_encode($data), ), true ), null, 'zendesk.log' ); - + $response = $client->request(); $body = json_decode($response->getBody(), true); Mage::log(var_export($body, true), null, 'zendesk.log'); + if( (!$settings || $settings->getUseGlobalSettings() === "0") && $response->isError()) + { + return false; + } + if($response->isError()) { if(is_array($body) && isset($body['error'])) { if(is_array($body['error']) && isset($body['error']['title'])) { - throw new Exception($body['error']['title'], $response->getStatus()); + if (!$silent) + throw new Exception($body['error']['title'], $response->getStatus()); + else + return $body; } else { - throw new Exception($body['error'], $response->getStatus()); + if (!$silent) + throw new Exception($body['error'], $response->getStatus()); + else + return $body; } } else { - throw new Exception($body, $response->getStatus()); + if (!$silent) + throw new Exception($body, $response->getStatus()); + else + return $body; } } return $body; } -} +} \ No newline at end of file diff --git a/src/app/code/community/Zendesk/Zendesk/Model/Api/Tickets.php b/src/app/code/community/Zendesk/Zendesk/Model/Api/Tickets.php index 90238cd2..e36198ea 100644 --- a/src/app/code/community/Zendesk/Zendesk/Model/Api/Tickets.php +++ b/src/app/code/community/Zendesk/Zendesk/Model/Api/Tickets.php @@ -87,6 +87,72 @@ public function recent() return $response['tickets']; } + public function all() + { + $response = $this->_call('tickets.json'); + return $response['tickets']; + } + + public function search($data) + { + $options = array( + 'sort_by' => $data['sort_by'], + 'sort_order' => $data['sort_order'], + 'per_page' => $data['per_page'], + 'page' => $data['page'] + ); + + unset($data['per_page']); + unset($data['sort_by']); + unset($data['sort_order']); + unset($data['page']); + + $conditions = "type:ticket"; + + if( isset($data['id']) ) + { + $conditions .= " " . $data['id']; + unset($data['id']); + } + + if( isset($data['created_at']) ) + { + if( isset($data['created_at']['from']) && $data['created_at']['from'] !== "" ) + $conditions .= " created>" . date('Y-m-d', strtotime( str_replace("/","-",$data['created_at']['from']) )); + + if( isset($data['created_at']['to']) && $data['created_at']['to'] !== "" ) + $conditions .= " created<" . date('Y-m-d', strtotime( str_replace("/","-",$data['created_at']['to']) )); + + unset($data['created_at']); + } + + if( isset($data['updated_at']) ) + { + if( isset($data['updated_at']['from']) && $data['updated_at']['from'] !== "" ) + $conditions .= " updated>" . date('Y-m-d', strtotime( str_replace("/","-",$data['updated_at']['from']) )); + + if( isset($data['updated_at']['to']) && $data['updated_at']['to'] !== "" ) + $conditions .= " updated<" . date('Y-m-d', strtotime( str_replace("/","-",$data['updated_at']['to']) )); + + unset($data['updated_at']); + } + + if( isset($data['email']) && $data['email'] !== "") + { + $conditions .= " requester:".$data['email']; + unset($data['email']); + } + + foreach( $data as $key => $value ) + { + $conditions .= " " . $key . ":" . $value; + } + $options['query'] = $conditions; + + $response = $this->_call('search.json', $options); + return $response; + } + public function forOrder($orderIncrementId) { if(!$orderIncrementId) { @@ -103,7 +169,7 @@ public function forOrder($orderIncrementId) // Now check through the tickets to make sure the appropriate field has been filled out with the order number $tickets = array(); - $fieldId = Mage::getStoreConfig('zendesk/features/order_field_id'); + $fieldId = Mage::getStoreConfig('zendesk/frontend_features/order_field_id'); if(!$fieldId) { return false; @@ -132,25 +198,41 @@ public function forOrder($orderIncrementId) public function forRequester($customerEmail) { - if(!$customerEmail || strlen(trim($customerEmail)) === 0) { - throw new InvalidArgumentException('Customer email address not valid'); + $user = Mage::getModel('zendesk/api_users')->find($customerEmail); + if( isset($user['id']) ) + { + $response = $this->_call('users/' . $user['id'] . '/requests.json', null, 'GET', null, false, true); + return $response['requests']; + } + else + { + return array(); } - - $response = $this->_call('search.json', - array( - 'query' => 'requester:' . $customerEmail . ' type:ticket', - 'sort_order' => 'desc', - 'sort_by' => 'updated_at', - ) - ); - - return $response['results']; } - + + public function bulkDelete($data) + { + if ( is_array($data) ) + { + $params['ids'] = implode(",",$data); + $this->_call('tickets/destroy_many.json', $params, 'DELETE'); + } + } + + public function bulkUpdateStatus($data, $status) + { + if ( is_array($data) ) + { + $ticket['ticket'] = array('status' => $status); + $params['ids'] = implode(",",$data); + $response = $this->_call('tickets/update_many.json', $params, 'PUT', $ticket); + } + } + public function create($data) { $response = $this->_call('tickets.json', null, 'POST', $data); - + return $response['ticket']; } diff --git a/src/app/code/community/Zendesk/Zendesk/Model/Api/Users.php b/src/app/code/community/Zendesk/Zendesk/Model/Api/Users.php index 9e944fd7..7aeb73cd 100644 --- a/src/app/code/community/Zendesk/Zendesk/Model/Api/Users.php +++ b/src/app/code/community/Zendesk/Zendesk/Model/Api/Users.php @@ -49,4 +49,51 @@ public function all() $response = $this->_call('users.json'); return $response['users']; } + + public function end($id) + { + if(!Zend_Validate::is($id, 'NotEmpty')) { + throw new InvalidArgumentException('No ID value provided'); + } + + $response = $this->_call('end_users/'. $id .'.json'); + + return $response['user']; + } + + public function getIdentities($id) + { + $response = $this->_call('users/' . $id . '/identities.json'); + return $response['identities']; + } + + public function setPrimaryIdentity($user_id, $identity_id) + { + $response = $this->_call('users/' . $user_id . '/identities/'.$identity_id.'/make_primary.json', null, 'PUT', null, true); + return $response['identities']; + } + + public function addIdentity($user_id, $data) + { + $response = $this->_call('users/' . $user_id . '/identities.json', null, 'POST', $data, true); + return $response['identity']; + } + + public function update($user_id, $user) + { + $response = $this->_call('users/' . $user_id . '.json', null, 'PUT', $user, true); + return $response['user']; + } + + public function create($user) + { + $response = $this->_call('users.json', null, 'POST', $user, true); + return $response['user']; + } + + public function createUserField($field) + { + $response = $this->_call('user_fields.json', null, 'POST', $field, true); + return $response['user_field']; + } } \ No newline at end of file diff --git a/src/app/code/community/Zendesk/Zendesk/Model/Observer.php b/src/app/code/community/Zendesk/Zendesk/Model/Observer.php index cef79f49..942d1e90 100644 --- a/src/app/code/community/Zendesk/Zendesk/Model/Observer.php +++ b/src/app/code/community/Zendesk/Zendesk/Model/Observer.php @@ -70,7 +70,7 @@ public function saveConfig(Varien_Event_Observer $observer) $scopeId = $store->getId(); } - $enableEmail = Mage::getStoreConfig('zendesk/features/contact_us', $storeCode); + $enableEmail = Mage::getStoreConfig('zendesk/frontend_features/contact_us', $storeCode); $currentEmail = Mage::getStoreConfig('contacts/email/recipient_email', $storeCode); $oldEmail = Mage::getStoreConfig('zendesk/hidden/contact_email_old', $storeCode); $zendeskEmail = Mage::helper('zendesk')->getSupportEmail($storeCode); @@ -101,7 +101,7 @@ public function saveConfig(Varien_Event_Observer $observer) public function addTicketButton(Varien_Event_Observer $event) { $block = $event->getBlock(); - if ($block instanceof Mage_Adminhtml_Block_Sales_Order_View && Mage::getStoreConfig('zendesk/features/show_on_order')) { + if ($block instanceof Mage_Adminhtml_Block_Sales_Order_View && Mage::getStoreConfig('zendesk/backend_features/show_on_order')) { $block->addButton('ticket_new', array( 'label' => Mage::helper('zendesk')->__('Create Ticket'), 'onclick' => 'setLocation(\'' . $block->getUrl('adminhtml/zendesk/create') . '\')', @@ -109,4 +109,95 @@ public function addTicketButton(Varien_Event_Observer $event) )); } } + + public function changeIdentity(Varien_Event_Observer $event) + { + if( !Mage::getStoreConfig('zendesk/general/customer_sync') ) + return; + + $user = null; + $customer = $event->getCustomer(); + $email = $customer->getEmail(); + $orig_email = $customer->getOrigData(); + $orig_email = $orig_email['email']; + + //Get Customer Group + $group_id = $customer->getGroupId(); + $group = Mage::getModel('customer/group')->load($group_id); + + //Get Customer Last Login Date + $log_customer = Mage::getModel('log/customer')->loadByCustomer($customer); + + //Get Customer Sales Statistics + $order_totals = Mage::getResourceModel('sales/order_collection'); + if ( is_object($order_totals) ) + { + $order_totals + ->addFieldToSelect('*') + ->addFieldToFilter('customer_id', $customer->getId()) + ->addFieldToFilter('status', Mage_Sales_Model_Order::STATE_COMPLETE) + ->addAttributeToSelect('grand_total') + ->getColumnValues('grand_total'); + $lifetime_sale = Mage::helper('core')->currency(array_sum($order_totals), true, false); + $average_sale = Mage::helper('core')->currency(array_sum($order_totals) / count($order_totals), true, false); + } + + $info['user'] = array( + "name" => $customer->getFirstname() . " " . $customer->getLastname(), + "email" => $email, + "user_fields" => array( + "group" => $group->getCode(), + "name" => $customer->getFirstname() . " " . $customer->getLastname(), + "id" => $customer->getId(), + "logged_in" => date("Y-m-d\TH:i:s\Z",strtotime($log_customer->getLoginAt())), + "average_sale" => $average_sale ? $average_sale : 0, + "lifetime_sale" => $lifetime_sale ? $lifetime_sale : 0 + ) + ); + + if( $orig_email && $orig_email !== $email ) + { + $user = Mage::getModel('zendesk/api_users')->find($orig_email); + + if( isset($user['id']) ) + { + $data['identity'] = array( + 'type' => 'email', + 'value' => $email, + 'verified' => true + ); + $identity = Mage::getModel('zendesk/api_users')->addIdentity($user['id'],$data); + if( isset($identity['id']) ) + { + Mage::getModel('zendesk/api_users')->setPrimaryIdentity($user['id'], $identity['id']); + } + } + } + + if( !$user ) + { + $user = Mage::getModel('zendesk/api_users')->find($email); + } + + if( isset($user['id']) ) + { + $this->syncData($user['id'], $info); + } + else + { + $info['user']['verified'] = true; + $this->createAccount($info); + } + } + + public function syncData($user_id, $data) + { + Mage::getModel('zendesk/api_users')->update($user_id, $data); + } + + public function createAccount($data) + { + Mage::getModel('zendesk/api_users')->create($data); + } + } diff --git a/src/app/code/community/Zendesk/Zendesk/Model/Resource/Settings.php b/src/app/code/community/Zendesk/Zendesk/Model/Resource/Settings.php new file mode 100644 index 00000000..cc203f22 --- /dev/null +++ b/src/app/code/community/Zendesk/Zendesk/Model/Resource/Settings.php @@ -0,0 +1,49 @@ + http://modulesgarden.com + * CONTACT -> contact@modulesgarden.com + * + * + * + * + * This software is furnished under a license and may be used and copied + * only in accordance with the terms of such license and with the + * inclusion of the above copyright notice. This software or any other + * copies thereof may not be provided or otherwise made available to any + * other person. No title to and ownership of the software is hereby + * transferred. + * + * + * ******************************************************************** */ + +/** + * @author Marcin Kozak + */ + +class Zendesk_Zendesk_Model_Resource_Settings extends Mage_Core_Model_Mysql4_Abstract { + + protected function _construct() + { + $this->_init('zendesk/settings', 'id'); + } + + public function loadByAdminId(Zendesk_Zendesk_Model_Settings $settings, $adminId) + { + $table = $this->getMainTable(); + $select = $this->_getReadAdapter()->select()->from($table)->where('admin_user_id = ?', $adminId); + + $settingsId = $this->_getReadAdapter()->fetchOne($select); + + if( $settingsId ) + { + $this->load($settings, $settingsId); + } + + return $this; + } +} diff --git a/src/app/code/community/Zendesk/Zendesk/Model/Resource/Settings/Collection.php b/src/app/code/community/Zendesk/Zendesk/Model/Resource/Settings/Collection.php new file mode 100644 index 00000000..641a21bb --- /dev/null +++ b/src/app/code/community/Zendesk/Zendesk/Model/Resource/Settings/Collection.php @@ -0,0 +1,35 @@ + http://modulesgarden.com + * CONTACT -> contact@modulesgarden.com + * + * + * + * + * This software is furnished under a license and may be used and copied + * only in accordance with the terms of such license and with the + * inclusion of the above copyright notice. This software or any other + * copies thereof may not be provided or otherwise made available to any + * other person. No title to and ownership of the software is hereby + * transferred. + * + * + * ******************************************************************** */ + +/** + * @author Marcin Kozak + */ + +class Zendesk_Zendesk_Model_Resource_Settings_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract +{ + protected function _construct() + { + $this->_init('zendesk/settings'); + } + +} diff --git a/src/app/code/community/Zendesk/Zendesk/Model/Resource/Tickets.php b/src/app/code/community/Zendesk/Zendesk/Model/Resource/Tickets.php new file mode 100644 index 00000000..c2847c7c --- /dev/null +++ b/src/app/code/community/Zendesk/Zendesk/Model/Resource/Tickets.php @@ -0,0 +1,34 @@ + http://modulesgarden.com + * CONTACT -> contact@modulesgarden.com + * + * + * + * + * This software is furnished under a license and may be used and copied + * only in accordance with the terms of such license and with the + * inclusion of the above copyright notice. This software or any other + * copies thereof may not be provided or otherwise made available to any + * other person. No title to and ownership of the software is hereby + * transferred. + * + * + * ******************************************************************** */ + +/** + * @author Marcin Kozak + */ + +class Zendesk_Zendesk_Model_Resource_Tickets extends Mage_Core_Model_Resource_Db_Abstract { + + protected function _construct() + { + $this->_init('zendesk/tickets', 'id'); + } +} diff --git a/src/app/code/community/Zendesk/Zendesk/Model/Resource/Tickets/Collection.php b/src/app/code/community/Zendesk/Zendesk/Model/Resource/Tickets/Collection.php new file mode 100644 index 00000000..286f499f --- /dev/null +++ b/src/app/code/community/Zendesk/Zendesk/Model/Resource/Tickets/Collection.php @@ -0,0 +1,62 @@ + http://modulesgarden.com + * CONTACT -> contact@modulesgarden.com + * + * + * + * + * This software is furnished under a license and may be used and copied + * only in accordance with the terms of such license and with the + * inclusion of the above copyright notice. This software or any other + * copies thereof may not be provided or otherwise made available to any + * other person. No title to and ownership of the software is hereby + * transferred. + * + * + * ******************************************************************** */ + +/** + * @author Maksym Minenko + */ +class Zendesk_Zendesk_Model_Resource_Tickets_Collection extends Varien_Data_Collection +{ + protected $_count; + + + public function __construct($data) + { + $all = Mage::getModel('zendesk/api_tickets')->search($data); + foreach ( $all['results'] as $ticket ) + { + $obj = new Varien_Object(); + $obj->setData($ticket); + $this->addItem($obj); + } + + $this->setPageSize($data['per_page']); + $this->setCurPage($data['page']); + $this->setOrder($data['sort_by'],$data['sort_order']); + $this->_count = $all['count']; + + //Save the total tickets count value to make new request unnecessary + Mage::register('zendesk_tickets_count', $all['count']); + } + + /** + * Retrieve collection all items count + * + * @return int + */ + public function getSize() + { + return $this->_count; + } + +} diff --git a/src/app/code/community/Zendesk/Zendesk/Model/Settings.php b/src/app/code/community/Zendesk/Zendesk/Model/Settings.php new file mode 100644 index 00000000..6d7c145e --- /dev/null +++ b/src/app/code/community/Zendesk/Zendesk/Model/Settings.php @@ -0,0 +1,54 @@ + http://modulesgarden.com + * CONTACT -> contact@modulesgarden.com + * + * + * + * + * This software is furnished under a license and may be used and copied + * only in accordance with the terms of such license and with the + * inclusion of the above copyright notice. This software or any other + * copies thereof may not be provided or otherwise made available to any + * other person. No title to and ownership of the software is hereby + * transferred. + * + * + * ******************************************************************** */ + +/** + * @author Marcin Kozak + */ + +class Zendesk_Zendesk_Model_Settings extends Mage_Core_Model_Abstract { + + protected function _construct() + { + $this->_init('zendesk/settings'); + } + + public function loadByAdminId($adminId) + { + $this->getResource()->loadByAdminId($this, $adminId); + return $this; + } + + public function usesGlobalSettings() + { + return $this->getData('use_global_settings') == 1; + } + + public function isConfigured() + { + $username = $this->getData('username'); + $password = $this->getData('password'); + + return !(empty($username) OR empty($password) ); + } + +} diff --git a/src/app/code/community/Zendesk/Zendesk/Model/Tickets.php b/src/app/code/community/Zendesk/Zendesk/Model/Tickets.php new file mode 100644 index 00000000..164671a4 --- /dev/null +++ b/src/app/code/community/Zendesk/Zendesk/Model/Tickets.php @@ -0,0 +1,35 @@ + http://modulesgarden.com + * CONTACT -> contact@modulesgarden.com + * + * + * + * + * This software is furnished under a license and may be used and copied + * only in accordance with the terms of such license and with the + * inclusion of the above copyright notice. This software or any other + * copies thereof may not be provided or otherwise made available to any + * other person. No title to and ownership of the software is hereby + * transferred. + * + * + * ******************************************************************** */ + +/** + * @author Marcin Kozak + */ + +class Zendesk_Zendesk_Model_Tickets extends Mage_Core_Model_Abstract { + + protected function _construct() + { + $this->_init('zendesk/tickets'); + } + +} diff --git a/src/app/code/community/Zendesk/Zendesk/controllers/Adminhtml/ZendeskController.php b/src/app/code/community/Zendesk/Zendesk/controllers/Adminhtml/ZendeskController.php index 574b0a68..50da198e 100644 --- a/src/app/code/community/Zendesk/Zendesk/controllers/Adminhtml/ZendeskController.php +++ b/src/app/code/community/Zendesk/Zendesk/controllers/Adminhtml/ZendeskController.php @@ -23,6 +23,10 @@ class Zendesk_Zendesk_Adminhtml_ZendeskController extends Mage_Adminhtml_Control public function indexAction() { + $domain = Mage::getStoreConfig('zendesk/general/domain'); + if( !$domain ) + Mage::getSingleton('adminhtml/session')->addError(Mage::helper('zendesk')->__('Please set up Zendesk connection.')); + $this->_title($this->__('Zendesk Dashboard')); $this->loadLayout(); $this->_setActiveMenu('zendesk/zendesk_dashboard'); @@ -80,9 +84,35 @@ public function authenticateAction() $now = time(); $jti = md5($now . rand()); + $settings = Mage::helper('zendesk')->getAdminSettings(); $user = Mage::getSingleton('admin/session')->getUser(); $name = $user->getName(); - $email = $user->getEmail(); + if( $settings && $settings->getUsername() ) + { + $email = $settings->getUsername(); + } + else + { + $email = Mage::getStoreConfig('zendesk/general/email'); + } + + if( $settings && isset($settings) && $settings->isConfigured() && $settings->getUseGlobalSettings() === "0") + { + try + { + $check = Mage::getModel('zendesk/api_users')->all(); + + if( $check ) + { + $email = $settings->getUsername(); + } + } + catch( Exception $exc ) + { + //just do nothing + } + } + $externalId = $user->getId(); $payload = array( @@ -129,11 +159,29 @@ public function logoutAction() $adminSession->getCookie()->delete($adminSession->getSessionName()); $adminSession->addSuccess(Mage::helper('adminhtml')->__('You have logged out.')); - $this->_redirect('*'); + $this->_redirect('adminhtml/zendesk/*'); } public function createAction() { + try + { + $domain = Mage::getStoreConfig('zendesk/general/domain'); + if( !$domain ) + { + Mage::getSingleton('adminhtml/session')->addError(Mage::helper('zendesk')->__('Please set up Zendesk connection.')); + $this->_redirect('adminhtml/zendesk/index'); + return; + } + } + catch( Exception $ex ) + { + Mage::getSingleton('adminhtml/session')->addError(Mage::helper('zendesk')->__('Please set up Zendesk connection.')); + $this->_redirect('adminhtml/zendesk/index'); + return; + } + + // Check if we have been passed an order ID, in which case we can preload some of the form details if($orderId = $this->getRequest()->getParam('order_id')) { $order = Mage::getModel('sales/order')->load($orderId); @@ -162,11 +210,26 @@ public function createAction() $this->getLayout()->getBlock('js')->append($block); $this->renderLayout(); + } public function launchAction() { - $this->_redirectUrl(Mage::helper('zendesk')->getUrl()); + $domain = Mage::getStoreConfig('zendesk/general/domain'); + if( !$domain ) + { + Mage::getSingleton('adminhtml/session')->addError(Mage::helper('zendesk')->__('Please set up Zendesk connection.')); + $this->_redirect("adminhtml/zendesk/index"); + return; + } + + if(Mage::helper('zendesk')->isSSOAdminUsersEnabled()) { + $url = Mage::helper('zendesk')->getSSOAuthUrlAdminUsers(); + } else { + $url = Mage::helper('zendesk')->getZendeskUnauthUrl(); + } + + $this->_redirectUrl($url); } public function saveAction() @@ -255,7 +318,7 @@ public function saveAction() $ticket['ticket']['type'] = $data['type']; } - if( ($fieldId = Mage::getStoreConfig('zendesk/features/order_field_id')) && isset($data['order']) && strlen(trim($data['order'])) > 0) { + if( ($fieldId = Mage::getStoreConfig('zendesk/frontend_features/order_field_id')) && isset($data['order']) && strlen(trim($data['order'])) > 0) { $ticket['ticket']['fields'] = array( 'id' => $fieldId, 'value' => $data['order'] @@ -346,18 +409,350 @@ public function clearLogAction() } public function checkOutboundAction() - { - try { + { + try + { // Try to retrieve a user with ID 1, which should always exist as a user account is needed to set up // the API credentials in the first place. $user = Mage::getModel('zendesk/api_users')->all(); - Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('zendesk')->__('Connection to Zendesk API successful')); - } catch(Exception $e) { - Mage::getSingleton('adminhtml/session')->addError(Mage::helper('zendesk')->__('Connection to Zendesk API failed') . + + $this->getResponse()->clearHeaders()->setHeader('Content-type','application/json',true); + $this->getResponse()->setBody(json_encode(array('success'=>true, 'msg'=>Mage::helper('zendesk')->__('Connection to Zendesk API successful')))); + + } + catch(Exception $e) + { + $error = Mage::helper('zendesk')->__('Connection to Zendesk API failed') . '
' . $e->getCode() . ': ' . $e->getMessage() . - '
' . Mage::helper('zendesk')->__('Troubleshooting tips can be found at %s', 'https://support.zendesk.com/entries/26579987', 'https://support.zendesk.com/entries/26579987')); + '
' . Mage::helper('zendesk')->__('Troubleshooting tips can be found at %s', 'https://support.zendesk.com/entries/26579987', 'https://support.zendesk.com/entries/26579987'); + + $this->getResponse()->clearHeaders()->setHeader('Content-type','application/json',true); + $this->getResponse()->setBody(json_encode(array('success'=>false, 'msg'=>$error))); + } + } + + /** + * Loading page block + */ + public function loadBlockAction() + { + $request = $this->getRequest(); + + $block = $request->getParam('block'); + $update = $this->getLayout()->getUpdate(); + + + $update->addHandle('adminhtml_zendesk_create_load_block_'.$block); + + $this->loadLayoutUpdates()->generateLayoutXml()->generateLayoutBlocks(); + $result = $this->getLayout()->getBlock('content')->toHtml(); + if ($request->getParam('as_js_varname')) { + Mage::getSingleton('adminhtml/session')->setUpdateResult($result); + $this->_redirect('*/*/showUpdateResult'); + } else { + $this->getResponse()->setBody($result); + } + } + + public function getTotalsAction() + { + $request = $this->getRequest(); + $from = $request->getParam('from'); + $to = $request->getParam('to'); + + $totals = Mage::helper("zendesk")->getTicketTotals(null, $from, $to); + if( $totals ) + { + $this->getResponse()->clearHeaders()->setHeader('Content-type','application/json',true); + $this->getResponse()->setBody(json_encode(array('success'=>true, 'totals'=> $totals))); + } + else + { + $this->getResponse()->clearHeaders()->setHeader('Content-type','application/json',true); + $this->getResponse()->setBody(json_encode(array('success'=>false, 'totals'=>array( + 'open' => 0, + 'new' => 0, + 'solved' => 0, + 'closed' => 0 + )))); + } + } + + public function getUserAction() + { + $request = $this->getRequest(); + $id= $request->getParam('id'); + + $user = Mage::getModel('customer/customer')->load($id); + + $this->getResponse()->clearHeaders()->setHeader('Content-type','application/json',true); + + if( $user->getId() ) + { + $this->getResponse()->setBody(json_encode(array('success'=>true, 'usr'=> array( + 'firstname' => $user->getFirstname(), + 'lastname' => $user->getLastname(), + 'email' => $user->getEmail() + )))); + } + else + { + $this->getResponse()->setBody(json_encode(array('success'=>false, 'msg'=>Mage::helper('zendesk')->__('User does not exist')))); } + } + + public function getOrderAction() + { + $request = $this->getRequest(); + $id= $request->getParam('id'); + + $order = Mage::getModel('sales/order')->load($id); + + $this->getResponse()->clearHeaders()->setHeader('Content-type','application/json',true); + if( $order->getId() ) + { + $this->getResponse()->setBody(json_encode(array('success'=>true, 'order'=> array( + 'number' => $order->getIncrementId(), + )))); + } + else + { + $this->getResponse()->setBody(json_encode(array('success'=>false, 'msg'=>Mage::helper('zendesk')->__('Order does not exist')))); + } + } + + public function settingsAction() { + $settings = Mage::helper('zendesk')->getAdminSettings(); + Mage::register('zendesk_settings', $settings); + $this->_initAction(); + $this->renderLayout(); + } + + public function editAction() + { + $settings = Mage::helper('zendesk')->getAdminSettings(); + + Mage::register('zendesk_settings', $settings); - $this->_redirect('adminhtml/system_config/edit/section/zendesk'); + $this->_initAction(); + $this->renderLayout(); } + + public function saveSettingsAction() + { + $post = $this->getRequest()->getPost(); + + try + { + if( empty($post) ) + { + Mage::throwException($this->__('Invalid form data.')); + } + + $settings = Mage::helper('zendesk')->getAdminSettings(); + + if( isset($post['use_global_settings']) AND $post['use_global_settings'] === '1' ) + { + $post['username'] = ''; + $post['password'] = ''; + } + + if( $settings->getPassword() == $post['password'] ) + { + $post['password'] = ""; + } + var_dump(Mage::helper('core')->decrypt($settings->getPassword())); + var_dump($settings->getPassword()); + var_dump($post['password']); + //die; + if( !empty($post['password']) ) + { + $post['password'] = Mage::helper('core')->encrypt($post['password']); + } + else + { + unset($post['password']); + } + + + + $settings->setData($post); + $settings->save(); + Mage::register('zendesk_settings', $settings); + var_dump(Mage::helper('core')->decrypt($settings->getPassword())); + //die; + if( !$settings->getId() ) + { + Mage::throwException(Mage::helper('zendesk')->__('Error saving settings.')); + } + + Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('zendesk')->__('Settings was successfully saved.')); + } + catch( Exception $e ) + { + Mage::getSingleton('adminhtml/session')->addError($e->getMessage()); + } + $this->_redirectReferer(); + } + + public function checkConnectionAction() + { + $user = Mage::getModel('zendesk/api_users')->all(); + + if( $user ) + { + Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('zendesk')->__('Connection success')); + } + else + { + Mage::getSingleton('adminhtml/session')->addError(Mage::helper('zendesk')->__('Connection has failed.')); + } + + $this->_redirectReferer(); + } + + public function syncAction() + { + $this->getResponse()->clearHeaders()->setHeader('Content-type','application/json',true); + try + { + $settings = Mage::helper('zendesk')->getAdminSettings(); + $settings->setUseGlobalSettings("1"); + $settings->save(); + + $user = Mage::getModel('zendesk/api_users')->all(); + if ( is_null($user) ) + throw new Exception; + + $data = array(); + $data[] = array( + 'user_field' => array( + 'type' => 'integer', + 'title' => 'ID', + 'description' => 'Magento Customer Id', + 'position' => 0, + 'active' => true, + 'key' => 'id' + ) + ); + $data[] = array( + 'user_field' => array( + 'type' => 'text', + 'title' => 'Name', + 'description' => 'Magento Customer Name', + 'position' => 1, + 'active' => true, + 'key' => 'name' + ) + ); + $data[] = array( + 'user_field' => array( + 'type' => 'text', + 'title' => 'Group', + 'description' => 'Magento Customer Group', + 'position' => 2, + 'active' => true, + 'key' => 'group' + ) + ); + $data[] = array( + 'user_field' => array( + 'type' => 'text', + 'title' => 'Lifetime Sale', + 'description' => 'Magento Customer Lifetime Sale', + 'position' => 3, + 'active' => true, + 'key' => 'lifetime_sale' + ) + ); + $data[] = array( + 'user_field' => array( + 'type' => 'text', + 'title' => 'Average Sale', + 'description' => 'Magento Customer Average Sale', + 'position' => 4, + 'active' => true, + 'key' => 'average_sale' + ) + ); + $data[] = array( + 'user_field' => array( + 'type' => 'date', + 'title' => 'Last Logged In', + 'description' => 'Last Logged In', + 'position' => 5, + 'active' => true, + 'key' => 'logged_in' + ) + ); + + foreach( $data as $field ) + { + Mage::getModel('zendesk/api_users')->createUserField($field); + } + + $customers = Mage::getModel('customer/customer')->getCollection(); + $customers->addAttributeToSelect(array('firstname', 'lastname', 'email')); + foreach( $customers as $customer ) + { + Mage::dispatchEvent('customer_save_commit_after', array('customer' => $customer)); + } + + $settings->setUseGlobalSettings("0"); + $settings->save(); + + } + catch (Exception $ex) + { + $this->getResponse()->setBody(json_encode(array('success'=>false, 'msg'=>Mage::helper('zendesk')->__('Synchronization failed')))); + return; + } + $this->getResponse()->setBody(json_encode(array('success'=>true, 'msg'=>Mage::helper('zendesk')->__('Customers synchronization finished successfuly')))); + } + + public function bulkDeleteAction() + { + $ids = $this->getRequest()->getParam('id'); + try + { + Mage::getModel('zendesk/api_tickets')->bulkDelete($ids); + Mage::getSingleton('adminhtml/session')->addSuccess( + Mage::helper('zendesk')->__( + '%d ticket(s) were deleted.', count($ids) + ) + ); + } + catch ( Exception $e ) + { + Mage::getSingleton('adminhtml/session')->addError($e->getMessage()); + } + $this->_redirectReferer(); + } + + public function bulkChangestatusAction() + { + $ids = $this->getRequest()->getParam('id'); + $status = $this->getRequest()->getParam('status'); + try + { + Mage::getModel('zendesk/api_tickets')->bulkUpdateStatus($ids, $status); + Mage::getSingleton('adminhtml/session')->addSuccess( + Mage::helper('zendesk')->__( + '%d ticket(s) were updated. Attention: closed and new tickets cannot be updated.', count($ids) + ) + ); + } + catch ( Exception $e ) + { + Mage::getSingleton('adminhtml/session')->addError($e->getMessage()); + } + $this->_redirectReferer(); + } + + protected function _initAction() + { + $this->loadLayout()->_setActiveMenu('zendesk/settings'); + return $this; + } + } diff --git a/src/app/code/community/Zendesk/Zendesk/controllers/ApiController.php b/src/app/code/community/Zendesk/Zendesk/controllers/ApiController.php index c3cd7ae2..618e1de2 100644 --- a/src/app/code/community/Zendesk/Zendesk/controllers/ApiController.php +++ b/src/app/code/community/Zendesk/Zendesk/controllers/ApiController.php @@ -308,7 +308,7 @@ public function finaliseAction() if(!isset($data['order_field_id'])) { $missingFields[] = 'order_field_id'; } else { - $configUpdates['zendesk/features/order_field_id'] = $data['order_field_id']; + $configUpdates['zendesk/frontend_features/order_field_id'] = $data['order_field_id']; } // Check that the required fields were provided and send back an error if not @@ -339,15 +339,15 @@ public function finaliseAction() } if(isset($data['magento_footer_link'])) { - $configUpdates['zendesk/features/footer_link_enabled'] = ($data['magento_footer_link'] == 'true'); + $configUpdates['zendesk/frontend_features/footer_link_enabled'] = ($data['magento_footer_link'] == 'true'); } if(isset($data['email_forwarding'])) { - $configUpdates['zendesk/features/contact_us'] = ($data['email_forwarding'] == 'true'); + $configUpdates['zendesk/frontend_features/contact_us'] = ($data['email_forwarding'] == 'true'); // Process this now, since it otherwise won't be triggered until the config page is saved // Unlike in the observer, we only need to deal with the case where the setting is enabled - if($configUpdates['zendesk/features/contact_us']) { + if($configUpdates['zendesk/frontend_features/contact_us']) { $currentEmail = Mage::getStoreConfig('contacts/email/recipient_email'); $zendeskEmail = 'support@' . $configUpdates['zendesk/general/domain']; @@ -364,11 +364,11 @@ public function finaliseAction() } if(isset($data['feedback_tab'])) { - $configUpdates['zendesk/features/feedback_tab_code_active'] = ($data['feedback_tab'] === 'true'); + $configUpdates['zendesk/frontend_features/feedback_tab_code_active'] = ($data['feedback_tab'] === 'true'); } if(isset($data['feedback_tab_html'])) { - $configUpdates['zendesk/features/feedback_tab_code'] = $data['feedback_tab_html']; + $configUpdates['zendesk/frontend_features/feedback_tab_code'] = $data['feedback_tab_html']; } diff --git a/src/app/code/community/Zendesk/Zendesk/controllers/IndexController.php b/src/app/code/community/Zendesk/Zendesk/controllers/IndexController.php index 63610cd8..4b3ddc8e 100644 --- a/src/app/code/community/Zendesk/Zendesk/controllers/IndexController.php +++ b/src/app/code/community/Zendesk/Zendesk/controllers/IndexController.php @@ -22,7 +22,15 @@ class Zendesk_Zendesk_IndexController extends Mage_Core_Controller_Front_Action */ public function indexAction() { - $url = Mage::helper('zendesk')->getUrl(); + if( Mage::helper('zendesk')->isSSOEndUsersEnabled() ) + { + $url = Mage::helper('zendesk')->getSSOAuthUrlEndUsers(); + } + else + { + $url = Mage::helper('zendesk')->getUrl(); + } $this->_redirectUrl($url); } -} \ No newline at end of file + +} diff --git a/src/app/code/community/Zendesk/Zendesk/etc/config.xml b/src/app/code/community/Zendesk/Zendesk/etc/config.xml index ecc42109..1c3327e9 100644 --- a/src/app/code/community/Zendesk/Zendesk/etc/config.xml +++ b/src/app/code/community/Zendesk/Zendesk/etc/config.xml @@ -23,14 +23,24 @@ - https://signup.zendesk.com/provisioning/magento/welcome + https://support.zendesk.com/hc/en-us/articles/203660046-Magento-Integration-Installing-the-Zendesk-extension-for-Magento Zendesk_Zendesk_Model + zendesk_resource + + Zendesk_Zendesk_Model_Resource + + + zendesk_settings
+ + + + Zendesk_Zendesk_Helper @@ -79,6 +89,24 @@ + + + + + zendesk/observer + changeIdentity + + + + + + + zendesk/observer + changeIdentity + + + + @@ -109,6 +137,7 @@ + @@ -141,6 +170,15 @@ + + + + zendesk/observer + changeIdentity + + + + @@ -163,10 +201,15 @@ 3 - Settings - adminhtml/system_config/edit/section/zendesk + User Settings + adminhtml/zendesk/settings 4 + + Configuration + adminhtml/system_config/edit/section/zendesk + 4 + Log Viewer adminhtml/zendesk/log @@ -218,13 +261,19 @@ - - 1 - 1 - 1 + + 0 + + 0 0 - + + + 0 + 1 + 1 + 1 + diff --git a/src/app/code/community/Zendesk/Zendesk/etc/system.xml b/src/app/code/community/Zendesk/Zendesk/etc/system.xml index 7cf8d965..4fce4868 100644 --- a/src/app/code/community/Zendesk/Zendesk/etc/system.xml +++ b/src/app/code/community/Zendesk/Zendesk/etc/system.xml @@ -90,6 +90,26 @@ 1 + + + select + adminhtml/system_config_source_yesno + 6 + 1 + 1 + 1 + + + + + Sync All Customers And Create User Fields + zendesk/adminhtml_config_buttons_sync + 7 + 1 + 1 + 1 + + @@ -150,53 +170,16 @@ - + 1 - + Decide which features you would like turned on in your Magento store. text 30 1 1 1 - - - - select - adminhtml/system_config_source_yesno - 1 - 1 - 1 - 0 - - - - multiselect - zendesk/source_views - 2 - 1 - 1 - 0 - 1 - - - - select - adminhtml/system_config_source_yesno - 3 - 1 - 1 - 0 - - - - select - adminhtml/system_config_source_yesno - 4 - 1 - 1 - 0 - + select @@ -247,6 +230,16 @@ 1 1 + + + select + adminhtml/system_config_source_yesno + 20 + 1 + 1 + 1 + + text @@ -256,18 +249,66 @@ 1 - - + + + + 1 + + Decide which features you would like turned on in your admin panel. + text + 35 + 1 + 1 + 1 + + + select adminhtml/system_config_source_yesno - 20 + 5 1 1 - 1 - - + 0 + + + + select + adminhtml/system_config_source_yesno + 2 + 1 + 1 + 0 + + + + select + adminhtml/system_config_source_yesno + 2 + 1 + 1 + 0 + + + + multiselect + zendesk/source_views + 3 + 1 + 1 + 0 + 1 + + + + select + adminhtml/system_config_source_yesno + 4 + 1 + 1 + 0 + - + Required for Magento App inside Zendesk to work. @@ -296,7 +337,7 @@ - Generate new token + Generate New Token zendesk/adminhtml_config_buttons_generate 3 1 @@ -417,7 +458,7 @@ - Setup guide + Setup Guide zendesk/adminhtml_config_buttons_signup 1 1 diff --git a/src/app/code/community/Zendesk/Zendesk/sql/zendesk_setup/mysql4-install-1.3.1.php b/src/app/code/community/Zendesk/Zendesk/sql/zendesk_setup/mysql4-install-1.3.1.php new file mode 100644 index 00000000..70c941ba --- /dev/null +++ b/src/app/code/community/Zendesk/Zendesk/sql/zendesk_setup/mysql4-install-1.3.1.php @@ -0,0 +1,39 @@ + http://modulesgarden.com + * CONTACT -> contact@modulesgarden.com + * + * + * + * + * This software is furnished under a license and may be used and copied + * only in accordance with the terms of such license and with the + * inclusion of the above copyright notice. This software or any other + * copies thereof may not be provided or otherwise made available to any + * other person. No title to and ownership of the software is hereby + * transferred. + * + * + * ******************************************************************** */ + +/** + * @author Marcin Kozak + */ +$installer = $this; +$installer->startSetup(); +$installer->run("CREATE TABLE IF NOT EXISTS `{$installer->getTable('zendesk_settings')}` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID', + `admin_user_id` int(10) unsigned NOT NULL COMMENT 'Admin ID', + `use_global_settings` tinyint(1) DEFAULT '0' COMMENT 'User use setting from global configuration', + `username` varchar(255) DEFAULT NULL COMMENT 'Username', + `password` varchar(255) DEFAULT NULL COMMENT 'Password', + `signature` text COMMENT 'Ticket Signature', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='zendesk_settings' AUTO_INCREMENT=2 ; +"); +$installer->endSetup(); \ No newline at end of file diff --git a/src/app/design/adminhtml/default/default/layout/zendesk.xml b/src/app/design/adminhtml/default/default/layout/zendesk.xml index a0ae8259..9fc24149 100644 --- a/src/app/design/adminhtml/default/default/layout/zendesk.xml +++ b/src/app/design/adminhtml/default/default/layout/zendesk.xml @@ -1,37 +1,49 @@ +* Copyright 2012 Zendesk. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ +--> - - - zendesk/zendesk.css - - + + + + zendesk/zendesk.css + + + - zendesk/zendesk.css + + zendesk/zendesk.css + + + + + zendesk/zendesk.css + + + + @@ -39,26 +51,86 @@ + + + zendesk/zendesk.css + + - dashboard + + dashboard + - + + + + + + + <![CDATA[Edit Settings / Zendesk / Magento Admin]]> + + + skin_js + + + + skin_js + + + + skin_js + + + + + + + + + + + + + + + + + + + + + + + + + + + + - create + + create + + + + + + + diff --git a/src/app/design/adminhtml/default/default/template/zendesk/config/button-signup.phtml b/src/app/design/adminhtml/default/default/template/zendesk/config/button-signup.phtml index a7381944..bb49b4c0 100644 --- a/src/app/design/adminhtml/default/default/template/zendesk/config/button-signup.phtml +++ b/src/app/design/adminhtml/default/default/template/zendesk/config/button-signup.phtml @@ -17,7 +17,7 @@ ?> + +
\ No newline at end of file diff --git a/src/app/design/adminhtml/default/default/template/zendesk/config/button-test-zendesk.phtml b/src/app/design/adminhtml/default/default/template/zendesk/config/button-test-zendesk.phtml index 1e4c2816..3ba6d444 100644 --- a/src/app/design/adminhtml/default/default/template/zendesk/config/button-test-zendesk.phtml +++ b/src/app/design/adminhtml/default/default/template/zendesk/config/button-test-zendesk.phtml @@ -15,6 +15,27 @@ * limitations under the License. */ ?> - \ No newline at end of file + + +
\ No newline at end of file diff --git a/src/app/design/adminhtml/default/default/template/zendesk/create/customer.phtml b/src/app/design/adminhtml/default/default/template/zendesk/create/customer.phtml new file mode 100644 index 00000000..413c29ad --- /dev/null +++ b/src/app/design/adminhtml/default/default/template/zendesk/create/customer.phtml @@ -0,0 +1,55 @@ + +
+
+
getButtonsHtml() ?>
+

getHeaderText() ?>

+
+
+ getChildHtml('', true, true) ?> +
+
+ diff --git a/src/app/design/adminhtml/default/default/template/zendesk/create/order.phtml b/src/app/design/adminhtml/default/default/template/zendesk/create/order.phtml new file mode 100644 index 00000000..acbc6c46 --- /dev/null +++ b/src/app/design/adminhtml/default/default/template/zendesk/create/order.phtml @@ -0,0 +1,54 @@ + +
+
+
getButtonsHtml() ?>
+

getHeaderText() ?>

+
+
+ getChildHtml('', true, true) ?> +
+
+ diff --git a/src/app/design/adminhtml/default/default/template/zendesk/customer/tickets.phtml b/src/app/design/adminhtml/default/default/template/zendesk/customer/tickets.phtml index 7d3252c0..de93dbc9 100644 --- a/src/app/design/adminhtml/default/default/template/zendesk/customer/tickets.phtml +++ b/src/app/design/adminhtml/default/default/template/zendesk/customer/tickets.phtml @@ -17,7 +17,7 @@ ?> -getIsZendeskDashboard() || Mage::getStoreConfig('zendesk/features/show_on_dashboard')): ?> +getIsZendeskDashboard() && Mage::getStoreConfig('zendesk/backend_features/show_on_dashboard')): ?> +getTicketTotals(); ?> + +
+
+

+ __('Ticket Statistics') ?> + __('From') ?>:  + Select Date + __('To') ?>:  + Select Date +   +
+

+ + + + + + + +
+ __('Open') ?>
+ + 		+ __('New') ?>
+ + 		+ __('Solved') ?>
+ + 		+ __('Closed') ?>
+ +
+
+
+ + + +getIsZendeskDashboard() || Mage::getStoreConfig('zendesk/backend_features/show_on_dashboard')): ?> getIsZendeskDashboard()): ?>
@@ -41,4 +135,4 @@ getChildHtml('zendesk_dashboard_empty'); ?> - \ No newline at end of file + diff --git a/src/app/design/adminhtml/default/default/template/zendesk/dashboard/tabs/tickets.phtml b/src/app/design/adminhtml/default/default/template/zendesk/dashboard/tabs/tickets.phtml new file mode 100644 index 00000000..c4ee45e6 --- /dev/null +++ b/src/app/design/adminhtml/default/default/template/zendesk/dashboard/tabs/tickets.phtml @@ -0,0 +1,74 @@ + +getView(); +$maped_users = array(); +if( isset($all['users']) ) +{ + foreach( $all['users'] as $user ) + { + $maped_users[$user['id']] = $user['name']; + } + + //Check if all users returned + foreach( $all['tickets'] as $ticket ) + { + if( !isset($maped_users[$ticket['requester_id']]) ) + { + $model = Mage::getModel('zendesk/api_users')->get($ticket['requester_id']); + $maped_users[$ticket['requester_id']] = $model['name']; + } + } +} +?> + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
helper('zendesk')->__('Subject'); ?>helper('zendesk')->__('Requester'); ?>helper('zendesk')->__('Requested'); ?>helper('zendesk')->__('Status'); ?>helper('zendesk')->__('Priority'); ?>helper('zendesk')->__('Updated'); ?>
getExcerpt($row); ?>formatDate($row['created_at'], Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM, true); ?>formatDate($row['updated_at'], Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM, true); ?>
__('No tickets found'); ?>
+
+
+ \ No newline at end of file diff --git a/src/app/design/adminhtml/default/default/template/zendesk/dashboard/tabs/view.phtml b/src/app/design/adminhtml/default/default/template/zendesk/dashboard/tabs/view.phtml index 28d114c7..0f4160b5 100644 --- a/src/app/design/adminhtml/default/default/template/zendesk/dashboard/tabs/view.phtml +++ b/src/app/design/adminhtml/default/default/template/zendesk/dashboard/tabs/view.phtml @@ -24,7 +24,7 @@ if($view) { $columns = $execute['columns']; $rows = $execute['rows']; - + $isScoped = Mage::getModel('customer/customer')->getSharingConfig()->isWebsiteScope(); $users = array(); @@ -58,16 +58,23 @@ if($view) { // Most likely the Zendesk domain has not been configured, so just don't show anything here. $view = null; } -} +?> + +
- - - + + + @@ -91,8 +98,7 @@ if($view) { switch($col['id']) { case 'subject': if(isset($row['ticket']) && isset($row['ticket']['id'])) { - $url = Mage::helper('zendesk')->getUrl('ticket', $row['ticket']['id']); - $value = '' . $value . ''; + $value = Mage::helper('zendesk')->getExcerpt($row['ticket']); } break; diff --git a/src/app/design/adminhtml/default/default/template/zendesk/left-menu.phtml b/src/app/design/adminhtml/default/default/template/zendesk/left-menu.phtml index 152b235d..205d45d4 100644 --- a/src/app/design/adminhtml/default/default/template/zendesk/left-menu.phtml +++ b/src/app/design/adminhtml/default/default/template/zendesk/left-menu.phtml @@ -33,7 +33,7 @@ isAllowed('launch')) { ?>
  • - + __('Launch Zendesk'); ?>
    • @@ -41,7 +41,7 @@ isAllowed('settings')) { ?>
  • - __('Settings'); ?> + __('Configuration'); ?>
    • diff --git a/src/app/design/adminhtml/default/default/template/zendesk/order/tickets.phtml b/src/app/design/adminhtml/default/default/template/zendesk/order/tickets.phtml index 531f54fd..4ded847b 100644 --- a/src/app/design/adminhtml/default/default/template/zendesk/order/tickets.phtml +++ b/src/app/design/adminhtml/default/default/template/zendesk/order/tickets.phtml @@ -17,7 +17,7 @@ ?> +forRequester($customer->getEmail()); + } catch(Exception $e) { + // Don't do anything, just don't show the tickets + } + +} +?> + +
    +
    +
    +
    + +
    +
    +
    +
    __($col['title']); ?>__($col['title']); ?>
    + + + + + + + + + + + + + + get($ticket['id'], true); ?> + + + + + + + + + + + +
    __('Priority') ?>__('Subject') ?>__('Requested') ?>__('Updated') ?>__('Status') ?>__('Group') ?>__('Assignee') ?>
    formatDate($ticket['created_at'], Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM, true); ?>formatDate($ticket['updated_at'], Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM, true); ?>
    +
    + + +
    + \ No newline at end of file diff --git a/src/app/design/adminhtml/default/default/template/zendesk/widget/form/container.phtml b/src/app/design/adminhtml/default/default/template/zendesk/widget/form/container.phtml new file mode 100644 index 00000000..c3afce88 --- /dev/null +++ b/src/app/design/adminhtml/default/default/template/zendesk/widget/form/container.phtml @@ -0,0 +1,55 @@ + http://modulesgarden.com + * CONTACT -> contact@modulesgarden.com + * + * + * + * + * This software is furnished under a license and may be used and copied + * only in accordance with the terms of such license and with the + * inclusion of the above copyright notice. This software or any other + * copies thereof may not be provided or otherwise made available to any + * other person. No title to and ownership of the software is hereby + * transferred. + * + * + * ******************************************************************** */ + +/** + * @author Grzegorz Draganik + */ +?> + +
    + getFormInitScripts() ?> +
    + getHeaderHtml() ?> +

    getButtonsHtml('header') ?>

    +
    + + hasMessage()): ?> +
    +
      +
    • getMessage() ?>
      • +
    +
    + + + getFormHtml() ?> + hasFooterButtons()): ?> +
    +

    getButtonsHtml('footer') ?>

    +
    + + + getFormScripts() ?> +
    diff --git a/src/app/design/adminhtml/default/default/template/zendesk/widget/form/renderer/fieldset.phtml b/src/app/design/adminhtml/default/default/template/zendesk/widget/form/renderer/fieldset.phtml new file mode 100644 index 00000000..69d53101 --- /dev/null +++ b/src/app/design/adminhtml/default/default/template/zendesk/widget/form/renderer/fieldset.phtml @@ -0,0 +1,70 @@ + http://modulesgarden.com + * CONTACT -> contact@modulesgarden.com + * + * + * + * + * This software is furnished under a license and may be used and copied + * only in accordance with the terms of such license and with the + * inclusion of the above copyright notice. This software or any other + * copies thereof may not be provided or otherwise made available to any + * other person. No title to and ownership of the software is hereby + * transferred. + * + * + * ******************************************************************** */ + +/** + * @author Marcin Kozak + */ + +?> +getElement() ?> +getFieldsetContainerId()): ?> +
    + +getLegend()): ?> +
    +

    getLegend() ?>

    +
    getHeaderBar() ?>
    +
    + +getNoContainer()): ?> +
    + +
    + hasMessage()): ?> +
    +
      +
    • getMessage() ?>
      • +
    +
    + + + getComment()): ?> +

    escapeHtml($_element->getComment()) ?>

    + + hasHtmlContent()): ?> + getHtmlContent(); ?> + + + + getChildrenHtml(); ?> + +
    + +
    + getSubFieldsetHtml() ?> +getNoContainer()): ?> +
    + +getFieldsetContainerId()): ?> +
    + diff --git a/src/app/design/frontend/base/default/layout/zendesk.xml b/src/app/design/frontend/base/default/layout/zendesk.xml index 3e7d7c98..6027b5d2 100644 --- a/src/app/design/frontend/base/default/layout/zendesk.xml +++ b/src/app/design/frontend/base/default/layout/zendesk.xml @@ -19,7 +19,7 @@ - + zendesk Support @@ -33,7 +33,7 @@ - + customertickets zendesk/customer_tickets/index @@ -49,5 +49,7 @@ + + \ No newline at end of file diff --git a/src/app/design/frontend/base/default/template/zendesk/customer/tickets.phtml b/src/app/design/frontend/base/default/template/zendesk/customer/tickets.phtml index fbc0b04a..3708db17 100644 --- a/src/app/design/frontend/base/default/template/zendesk/customer/tickets.phtml +++ b/src/app/design/frontend/base/default/template/zendesk/customer/tickets.phtml @@ -17,7 +17,7 @@ ?> @@ -28,4 +28,7 @@
    getChildHtml(); ?>
    + +
    + __('Log In To Zendesk') ?>
    \ No newline at end of file diff --git a/src/app/design/frontend/base/default/template/zendesk/customer/tickets/list.phtml b/src/app/design/frontend/base/default/template/zendesk/customer/tickets/list.phtml index e16f497a..10fc327b 100644 --- a/src/app/design/frontend/base/default/template/zendesk/customer/tickets/list.phtml +++ b/src/app/design/frontend/base/default/template/zendesk/customer/tickets/list.phtml @@ -38,7 +38,7 @@ get($ticket['id'], true); ?> - + getExcerpt($ticket); ?> formatDate($ticket['created_at'], Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM, true); ?> formatDate($ticket['updated_at'], Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM, true); ?> diff --git a/src/app/locale/da_DA/Zendesk_Zendesk.csv b/src/app/locale/da_DA/Zendesk_Zendesk.csv index a6764ce5..06a46a07 100644 --- a/src/app/locale/da_DA/Zendesk_Zendesk.csv +++ b/src/app/locale/da_DA/Zendesk_Zendesk.csv @@ -41,7 +41,7 @@ "Normal","Normal" "On-hold","I bero" "Open","Åben" -"Order number","Ordrenummer" +"Order Number","Ordrenummer" "Pending","Venter" "Priority","Prioritet" "Problem","Problem" diff --git a/src/app/locale/de_DE/Zendesk_Zendesk.csv b/src/app/locale/de_DE/Zendesk_Zendesk.csv index e39b8209..0152675c 100644 --- a/src/app/locale/de_DE/Zendesk_Zendesk.csv +++ b/src/app/locale/de_DE/Zendesk_Zendesk.csv @@ -41,7 +41,7 @@ "Normal","Normal" "On-hold","Angehalten" "Open","Offen" -"Order number","Bestellnummer" +"Order Number","Bestellnummer" "Pending","Wartend" "Priority","Priorität" "Problem","Problem" diff --git a/src/app/locale/en_CA/Zendesk_Zendesk.csv b/src/app/locale/en_CA/Zendesk_Zendesk.csv index fe2823a3..3d8e534d 100644 --- a/src/app/locale/en_CA/Zendesk_Zendesk.csv +++ b/src/app/locale/en_CA/Zendesk_Zendesk.csv @@ -41,7 +41,7 @@ "Normal","Normal" "On-hold","On-hold" "Open","Open" -"Order number","Order number" +"Order Number","Order Number" "Pending","Pending" "Priority","Priority" "Problem","Problem" diff --git a/src/app/locale/en_GB/Zendesk_Zendesk.csv b/src/app/locale/en_GB/Zendesk_Zendesk.csv index fe5d40ee..f271955b 100644 --- a/src/app/locale/en_GB/Zendesk_Zendesk.csv +++ b/src/app/locale/en_GB/Zendesk_Zendesk.csv @@ -41,7 +41,7 @@ "Normal","Normal" "On-hold","On-hold" "Open","Open" -"Order number","Order number" +"Order Number","Order Number" "Pending","Pending" "Priority","Priority" "Problem","Problem" diff --git a/src/app/locale/en_US/Zendesk_Zendesk.csv b/src/app/locale/en_US/Zendesk_Zendesk.csv index b4ae4f85..ccd97dd7 100644 --- a/src/app/locale/en_US/Zendesk_Zendesk.csv +++ b/src/app/locale/en_US/Zendesk_Zendesk.csv @@ -41,7 +41,7 @@ "Normal","Normal" "On-hold","On-hold" "Open","Open" -"Order number","Order number" +"Order Number","Order Number" "Pending","Pending" "Priority","Priority" "Problem","Problem" diff --git a/src/app/locale/en_US/Zendesk_Zendesk.yml b/src/app/locale/en_US/Zendesk_Zendesk.yml index 55f177c2..8c699629 100644 --- a/src/app/locale/en_US/Zendesk_Zendesk.yml +++ b/src/app/locale/en_US/Zendesk_Zendesk.yml @@ -333,7 +333,7 @@ parts: - translation: key: "txt.integrations.magento.tickets.order_number" title: "Label for order number field" - value: "Order number" + value: "Order Number" - translation: key: "txt.integrations.magento.tickets.description" title: "Label for the description of a ticket" diff --git a/src/app/locale/es_419/Zendesk_Zendesk.csv b/src/app/locale/es_419/Zendesk_Zendesk.csv index 9bdf9a5e..5d201724 100644 --- a/src/app/locale/es_419/Zendesk_Zendesk.csv +++ b/src/app/locale/es_419/Zendesk_Zendesk.csv @@ -41,7 +41,7 @@ "Normal","Normal" "On-hold","En espera" "Open","Abierto" -"Order number","Número de pedido" +"Order Number","Número de pedido" "Pending","Pendiente" "Priority","Prioridad" "Problem","Problema" diff --git a/src/app/locale/es_ES/Zendesk_Zendesk.csv b/src/app/locale/es_ES/Zendesk_Zendesk.csv index 1869375e..ac4546f0 100644 --- a/src/app/locale/es_ES/Zendesk_Zendesk.csv +++ b/src/app/locale/es_ES/Zendesk_Zendesk.csv @@ -41,7 +41,7 @@ "Normal","Normal" "On-hold","En espera" "Open","Abierto" -"Order number","Número de pedido" +"Order Number","Número de pedido" "Pending","Pendiente" "Priority","Prioridad" "Problem","Problema" diff --git a/src/app/locale/fr_CA/Zendesk_Zendesk.csv b/src/app/locale/fr_CA/Zendesk_Zendesk.csv index fc92f6ee..61e5257c 100644 --- a/src/app/locale/fr_CA/Zendesk_Zendesk.csv +++ b/src/app/locale/fr_CA/Zendesk_Zendesk.csv @@ -41,7 +41,7 @@ "Normal","Normale" "On-hold","En pause" "Open","Ouvert" -"Order number","Numéro de commande" +"Order Number","Numéro de commande" "Pending","En attente" "Priority","Priorité" "Problem","Problème" diff --git a/src/app/locale/fr_FR/Zendesk_Zendesk.csv b/src/app/locale/fr_FR/Zendesk_Zendesk.csv index e5f281b5..f8aed62d 100644 --- a/src/app/locale/fr_FR/Zendesk_Zendesk.csv +++ b/src/app/locale/fr_FR/Zendesk_Zendesk.csv @@ -41,7 +41,7 @@ "Normal","Normale" "On-hold","En pause" "Open","Ouvert" -"Order number","Numéro de commande" +"Order Number","Numéro de commande" "Pending","En attente" "Priority","Priorité" "Problem","Problème" diff --git a/src/app/locale/it_IT/Zendesk_Zendesk.csv b/src/app/locale/it_IT/Zendesk_Zendesk.csv index 16075c13..c0f428d6 100644 --- a/src/app/locale/it_IT/Zendesk_Zendesk.csv +++ b/src/app/locale/it_IT/Zendesk_Zendesk.csv @@ -41,7 +41,7 @@ "Normal","Normale" "On-hold","In sospeso" "Open","Aperto" -"Order number","Numero ordine" +"Order Number","Numero ordine" "Pending","In attesa" "Priority","Priorità" "Problem","Problema" diff --git a/src/app/locale/ja_JA/Zendesk_Zendesk.csv b/src/app/locale/ja_JA/Zendesk_Zendesk.csv index 01191d0d..a2820b15 100644 --- a/src/app/locale/ja_JA/Zendesk_Zendesk.csv +++ b/src/app/locale/ja_JA/Zendesk_Zendesk.csv @@ -41,7 +41,7 @@ "Normal","普通" "On-hold","待機中" "Open","オープン" -"Order number","注文番号" +"Order Number","注文番号" "Pending","保留中" "Priority","優先度" "Problem","問題" diff --git a/src/app/locale/ja_JP/Zendesk_Zendesk.csv b/src/app/locale/ja_JP/Zendesk_Zendesk.csv index ac3783f6..7b25563c 100644 --- a/src/app/locale/ja_JP/Zendesk_Zendesk.csv +++ b/src/app/locale/ja_JP/Zendesk_Zendesk.csv @@ -51,7 +51,7 @@ "Group","グループ" "New Support Ticket","新規サポートチケット" "No tickets found","該当するチケットがありません" -"Order number","注文番号" +"Order Number","注文番号" "Priority","優先度" "High","高" "Low","低" diff --git a/src/app/locale/ko_KO/Zendesk_Zendesk.csv b/src/app/locale/ko_KO/Zendesk_Zendesk.csv index 9047e6e6..d2dcfd9d 100644 --- a/src/app/locale/ko_KO/Zendesk_Zendesk.csv +++ b/src/app/locale/ko_KO/Zendesk_Zendesk.csv @@ -41,7 +41,7 @@ "Normal","보통" "On-hold","대기" "Open","등록" -"Order number","주문 번호" +"Order Number","주문 번호" "Pending","보류" "Priority","우선 순위" "Problem","문제" diff --git a/src/app/locale/ko_KR/Zendesk_Zendesk.csv b/src/app/locale/ko_KR/Zendesk_Zendesk.csv index 10cb78e1..cef14986 100644 --- a/src/app/locale/ko_KR/Zendesk_Zendesk.csv +++ b/src/app/locale/ko_KR/Zendesk_Zendesk.csv @@ -51,7 +51,7 @@ "Group","그룹" "New Support Ticket","새 지원 티켓" "No tickets found","티켓을 찾을 수 없습니다" -"Order number","주문 번호" +"Order Number","주문 번호" "Priority","우선 순위" "High","높음" "Low","낮음" diff --git a/src/app/locale/nl_NL/Zendesk_Zendesk.csv b/src/app/locale/nl_NL/Zendesk_Zendesk.csv index dddadb4a..e0a65293 100644 --- a/src/app/locale/nl_NL/Zendesk_Zendesk.csv +++ b/src/app/locale/nl_NL/Zendesk_Zendesk.csv @@ -41,7 +41,7 @@ "Normal","Normaal" "On-hold","Geparkeerd" "Open","Open" -"Order number","Ordernummer" +"Order Number","Ordernummer" "Pending","In afwachting" "Priority","Prioriteit" "Problem","Probleem" diff --git a/src/app/locale/no_NO/Zendesk_Zendesk.csv b/src/app/locale/no_NO/Zendesk_Zendesk.csv index 5b9089f1..358ca84f 100644 --- a/src/app/locale/no_NO/Zendesk_Zendesk.csv +++ b/src/app/locale/no_NO/Zendesk_Zendesk.csv @@ -41,7 +41,7 @@ "Normal","Normal" "On-hold","On-hold" "Open","Open" -"Order number","Order number" +"Order Number","Order Number" "Pending","Pending" "Priority","Priority" "Problem","Problem" diff --git a/src/app/locale/pt_BR/Zendesk_Zendesk.csv b/src/app/locale/pt_BR/Zendesk_Zendesk.csv index 034cc4bb..4d3130ea 100644 --- a/src/app/locale/pt_BR/Zendesk_Zendesk.csv +++ b/src/app/locale/pt_BR/Zendesk_Zendesk.csv @@ -41,7 +41,7 @@ "Normal","Normal" "On-hold","Em espera" "Open","Aberto" -"Order number","Número do pedido" +"Order Number","Número do pedido" "Pending","Pendente" "Priority","Prioridade" "Problem","Problema" diff --git a/src/app/locale/pt_PT/Zendesk_Zendesk.csv b/src/app/locale/pt_PT/Zendesk_Zendesk.csv index 3cf39d5b..407c8381 100644 --- a/src/app/locale/pt_PT/Zendesk_Zendesk.csv +++ b/src/app/locale/pt_PT/Zendesk_Zendesk.csv @@ -41,7 +41,7 @@ "Normal","Normal" "On-hold","Em espera" "Open","Aberto" -"Order number","Número do pedido" +"Order Number","Número do pedido" "Pending","Pendente" "Priority","Prioridade" "Problem","Problema" diff --git a/src/app/locale/ru_RU/Zendesk_Zendesk.csv b/src/app/locale/ru_RU/Zendesk_Zendesk.csv index bad3831f..065398b1 100644 --- a/src/app/locale/ru_RU/Zendesk_Zendesk.csv +++ b/src/app/locale/ru_RU/Zendesk_Zendesk.csv @@ -41,7 +41,7 @@ "Normal","Нормальный" "On-hold","На удержании" "Open","Открыт" -"Order number","Номер заказа" +"Order Number","Номер заказа" "Pending","В ожидании" "Priority","Приоритет" "Problem","Проблема" diff --git a/src/app/locale/sv_SV/Zendesk_Zendesk.csv b/src/app/locale/sv_SV/Zendesk_Zendesk.csv index 9ef85812..2527e0f2 100644 --- a/src/app/locale/sv_SV/Zendesk_Zendesk.csv +++ b/src/app/locale/sv_SV/Zendesk_Zendesk.csv @@ -41,7 +41,7 @@ "Normal","Normal" "On-hold","On-hold" "Open","Open" -"Order number","Order number" +"Order Number","Order Number" "Pending","Pending" "Priority","Priority" "Problem","Problem" diff --git a/src/app/locale/tr_TR/Zendesk_Zendesk.csv b/src/app/locale/tr_TR/Zendesk_Zendesk.csv index 3f1cdcf9..7090d2f4 100644 --- a/src/app/locale/tr_TR/Zendesk_Zendesk.csv +++ b/src/app/locale/tr_TR/Zendesk_Zendesk.csv @@ -41,7 +41,7 @@ "Normal","Normal" "On-hold","On-hold" "Open","Open" -"Order number","Order number" +"Order Number","Order Number" "Pending","Pending" "Priority","Priority" "Problem","Problem" diff --git a/src/app/locale/uk_UK/Zendesk_Zendesk.csv b/src/app/locale/uk_UK/Zendesk_Zendesk.csv index 74e8d50e..86935a10 100644 --- a/src/app/locale/uk_UK/Zendesk_Zendesk.csv +++ b/src/app/locale/uk_UK/Zendesk_Zendesk.csv @@ -41,7 +41,7 @@ "Normal","Normal" "On-hold","On-hold" "Open","Open" -"Order number","Order number" +"Order Number","Order Number" "Pending","Pending" "Priority","Priority" "Problem","Problem" diff --git a/src/app/locale/zh_TW/Zendesk_Zendesk.csv b/src/app/locale/zh_TW/Zendesk_Zendesk.csv index edafe221..13962ba5 100644 --- a/src/app/locale/zh_TW/Zendesk_Zendesk.csv +++ b/src/app/locale/zh_TW/Zendesk_Zendesk.csv @@ -41,7 +41,7 @@ "Normal","正常" "On-hold","暫停" "Open","已開啟" -"Order number","訂單號碼" +"Order Number","訂單號碼" "Pending","未決" "Priority","優先等級" "Problem","事故" diff --git a/src/skin/adminhtml/default/default/zendesk/js/jquery-1.11.1.min.js b/src/skin/adminhtml/default/default/zendesk/js/jquery-1.11.1.min.js new file mode 100644 index 00000000..ab28a247 --- /dev/null +++ b/src/skin/adminhtml/default/default/zendesk/js/jquery-1.11.1.min.js @@ -0,0 +1,4 @@ +/*! jQuery v1.11.1 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */ +!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.1",m=function(a,b){return new m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b){return b.toUpperCase()};m.fn=m.prototype={jquery:l,constructor:m,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=m.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return m.each(this,a,b)},map:function(a){return this.pushStack(m.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},m.extend=m.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||m.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(m.isPlainObject(c)||(b=m.isArray(c)))?(b?(b=!1,f=a&&m.isArray(a)?a:[]):f=a&&m.isPlainObject(a)?a:{},g[d]=m.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},m.extend({expando:"jQuery"+(l+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===m.type(a)},isArray:Array.isArray||function(a){return"array"===m.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return!m.isArray(a)&&a-parseFloat(a)>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==m.type(a)||a.nodeType||m.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(k.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&m.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(o,"ms-").replace(p,q)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=r(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(n,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(r(Object(a))?m.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=r(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),m.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||m.guid++,e):void 0},now:function(){return+new Date},support:k}),m.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function r(a){var b=a.length,c=m.type(a);return"function"===c||m.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var s=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+-new Date,v=a.document,w=0,x=0,y=gb(),z=gb(),A=gb(),B=function(a,b){return a===b&&(l=!0),0},C="undefined",D=1<<31,E={}.hasOwnProperty,F=[],G=F.pop,H=F.push,I=F.push,J=F.slice,K=F.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},L="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",N="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=N.replace("w","w#"),P="\\["+M+"*("+N+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+O+"))|)"+M+"*\\]",Q=":("+N+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+P+")*)|.*)\\)|)",R=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),S=new RegExp("^"+M+"*,"+M+"*"),T=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),V=new RegExp(Q),W=new RegExp("^"+O+"$"),X={ID:new RegExp("^#("+N+")"),CLASS:new RegExp("^\\.("+N+")"),TAG:new RegExp("^("+N.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+Q),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+L+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{I.apply(F=J.call(v.childNodes),v.childNodes),F[v.childNodes.length].nodeType}catch(eb){I={apply:F.length?function(a,b){H.apply(a,J.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],!a||"string"!=typeof a)return d;if(1!==(k=b.nodeType)&&9!==k)return[];if(p&&!e){if(f=_.exec(a))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return I.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return I.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=9===k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+qb(o[l]);w=ab.test(a)&&ob(b.parentNode)||b,x=o.join(",")}if(x)try{return I.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function gb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function hb(a){return a[u]=!0,a}function ib(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function jb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function kb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||D)-(~a.sourceIndex||D);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function lb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function nb(a){return hb(function(b){return b=+b,hb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function ob(a){return a&&typeof a.getElementsByTagName!==C&&a}c=fb.support={},f=fb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fb.setDocument=function(a){var b,e=a?a.ownerDocument||a:v,g=e.defaultView;return e!==n&&9===e.nodeType&&e.documentElement?(n=e,o=e.documentElement,p=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){m()},!1):g.attachEvent&&g.attachEvent("onunload",function(){m()})),c.attributes=ib(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ib(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(e.getElementsByClassName)&&ib(function(a){return a.innerHTML="
    ",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=ib(function(a){return o.appendChild(a).id=u,!e.getElementsByName||!e.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==C&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c=typeof a.getAttributeNode!==C&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==C?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==C&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(e.querySelectorAll))&&(ib(function(a){a.innerHTML="",a.querySelectorAll("[msallowclip^='']").length&&q.push("[*^$]="+M+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+M+"*(?:value|"+L+")"),a.querySelectorAll(":checked").length||q.push(":checked")}),ib(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+M+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ib(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",Q)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===v&&t(v,a)?-1:b===e||b.ownerDocument===v&&t(v,b)?1:k?K.call(k,a)-K.call(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],i=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:k?K.call(k,a)-K.call(k,b):0;if(f===g)return kb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?kb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},e):n},fb.matches=function(a,b){return fb(a,null,null,b)},fb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fb(b,n,null,[a]).length>0},fb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&E.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fb.selectors={cacheLength:50,createPseudo:hb,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+M+")"+a+"("+M+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==C&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?hb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=K.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:hb(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?hb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:hb(function(a){return function(b){return fb(a,b).length>0}}),contains:hb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:hb(function(a){return W.test(a||"")||fb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:nb(function(){return[0]}),last:nb(function(a,b){return[b-1]}),eq:nb(function(a,b,c){return[0>c?c+b:c]}),even:nb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:nb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:nb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:nb(function(a,b,c){for(var d=0>c?c+b:c;++db;b++)d+=a[b].value;return d}function rb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function sb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function tb(a,b,c){for(var d=0,e=b.length;e>d;d++)fb(a,b[d],c);return c}function ub(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function vb(a,b,c,d,e,f){return d&&!d[u]&&(d=vb(d)),e&&!e[u]&&(e=vb(e,f)),hb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||tb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ub(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ub(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?K.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ub(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):I.apply(g,r)})}function wb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=rb(function(a){return a===b},h,!0),l=rb(function(a){return K.call(b,a)>-1},h,!0),m=[function(a,c,d){return!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>i;i++)if(c=d.relative[a[i].type])m=[rb(sb(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return vb(i>1&&sb(m),i>1&&qb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&wb(a.slice(i,e)),f>e&&wb(a=a.slice(e)),f>e&&qb(a))}m.push(c)}return sb(m)}function xb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=G.call(i));s=ub(s)}I.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&fb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?hb(f):f}return h=fb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xb(e,d)),f.selector=a}return f},i=fb.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(cb,db),ab.test(j[0].type)&&ob(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qb(j),!a)return I.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&ob(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ib(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ib(function(a){return a.innerHTML="","#"===a.firstChild.getAttribute("href")})||jb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ib(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||jb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ib(function(a){return null==a.getAttribute("disabled")})||jb(L,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fb}(a);m.find=s,m.expr=s.selectors,m.expr[":"]=m.expr.pseudos,m.unique=s.uniqueSort,m.text=s.getText,m.isXMLDoc=s.isXML,m.contains=s.contains;var t=m.expr.match.needsContext,u=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,v=/^.[^:#\[\.,]*$/;function w(a,b,c){if(m.isFunction(b))return m.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return m.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(v.test(b))return m.filter(b,a,c);b=m.filter(b,a)}return m.grep(a,function(a){return m.inArray(a,b)>=0!==c})}m.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?m.find.matchesSelector(d,a)?[d]:[]:m.find.matches(a,m.grep(b,function(a){return 1===a.nodeType}))},m.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(m(a).filter(function(){for(b=0;e>b;b++)if(m.contains(d[b],this))return!0}));for(b=0;e>b;b++)m.find(a,d[b],c);return c=this.pushStack(e>1?m.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(w(this,a||[],!1))},not:function(a){return this.pushStack(w(this,a||[],!0))},is:function(a){return!!w(this,"string"==typeof a&&t.test(a)?m(a):a||[],!1).length}});var x,y=a.document,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=m.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||x).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof m?b[0]:b,m.merge(this,m.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:y,!0)),u.test(c[1])&&m.isPlainObject(b))for(c in b)m.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=y.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return x.find(a);this.length=1,this[0]=d}return this.context=y,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):m.isFunction(a)?"undefined"!=typeof x.ready?x.ready(a):a(m):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),m.makeArray(a,this))};A.prototype=m.fn,x=m(y);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};m.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!m(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),m.fn.extend({has:function(a){var b,c=m(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(m.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=t.test(a)||"string"!=typeof a?m(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&m.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?m.unique(f):f)},index:function(a){return a?"string"==typeof a?m.inArray(this[0],m(a)):m.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(m.unique(m.merge(this.get(),m(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}m.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return m.dir(a,"parentNode")},parentsUntil:function(a,b,c){return m.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return m.dir(a,"nextSibling")},prevAll:function(a){return m.dir(a,"previousSibling")},nextUntil:function(a,b,c){return m.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return m.dir(a,"previousSibling",c)},siblings:function(a){return m.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return m.sibling(a.firstChild)},contents:function(a){return m.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:m.merge([],a.childNodes)}},function(a,b){m.fn[a]=function(c,d){var e=m.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=m.filter(d,e)),this.length>1&&(C[a]||(e=m.unique(e)),B.test(a)&&(e=e.reverse())),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return m.each(a.match(E)||[],function(a,c){b[c]=!0}),b}m.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):m.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){m.each(b,function(b,c){var d=m.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&m.each(arguments,function(a,c){var d;while((d=m.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?m.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},m.extend({Deferred:function(a){var b=[["resolve","done",m.Callbacks("once memory"),"resolved"],["reject","fail",m.Callbacks("once memory"),"rejected"],["notify","progress",m.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return m.Deferred(function(c){m.each(b,function(b,f){var g=m.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&m.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?m.extend(a,d):d}},e={};return d.pipe=d.then,m.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&m.isFunction(a.promise)?e:0,g=1===f?a:m.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&m.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;m.fn.ready=function(a){return m.ready.promise().done(a),this},m.extend({isReady:!1,readyWait:1,holdReady:function(a){a?m.readyWait++:m.ready(!0)},ready:function(a){if(a===!0?!--m.readyWait:!m.isReady){if(!y.body)return setTimeout(m.ready);m.isReady=!0,a!==!0&&--m.readyWait>0||(H.resolveWith(y,[m]),m.fn.triggerHandler&&(m(y).triggerHandler("ready"),m(y).off("ready")))}}});function I(){y.addEventListener?(y.removeEventListener("DOMContentLoaded",J,!1),a.removeEventListener("load",J,!1)):(y.detachEvent("onreadystatechange",J),a.detachEvent("onload",J))}function J(){(y.addEventListener||"load"===event.type||"complete"===y.readyState)&&(I(),m.ready())}m.ready.promise=function(b){if(!H)if(H=m.Deferred(),"complete"===y.readyState)setTimeout(m.ready);else if(y.addEventListener)y.addEventListener("DOMContentLoaded",J,!1),a.addEventListener("load",J,!1);else{y.attachEvent("onreadystatechange",J),a.attachEvent("onload",J);var c=!1;try{c=null==a.frameElement&&y.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!m.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}I(),m.ready()}}()}return H.promise(b)};var K="undefined",L;for(L in m(k))break;k.ownLast="0"!==L,k.inlineBlockNeedsLayout=!1,m(function(){var a,b,c,d;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",k.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(d))}),function(){var a=y.createElement("div");if(null==k.deleteExpando){k.deleteExpando=!0;try{delete a.test}catch(b){k.deleteExpando=!1}}a=null}(),m.acceptData=function(a){var b=m.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var M=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,N=/([A-Z])/g;function O(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(N,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:M.test(c)?m.parseJSON(c):c}catch(e){}m.data(a,b,c)}else c=void 0}return c}function P(a){var b;for(b in a)if(("data"!==b||!m.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeType,j=i?m.cache:a,k=i?a[h]:a[h]&&h; +if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}function R(a,b,c){if(m.acceptData(a)){var d,e,f=a.nodeType,g=f?m.cache:a,h=f?a[m.expando]:m.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){m.isArray(b)?b=b.concat(m.map(b,m.camelCase)):b in d?b=[b]:(b=m.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!P(d):!m.isEmptyObject(d))return}(c||(delete g[h].data,P(g[h])))&&(f?m.cleanData([a],!0):k.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}m.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?m.cache[a[m.expando]]:a[m.expando],!!a&&!P(a)},data:function(a,b,c){return Q(a,b,c)},removeData:function(a,b){return R(a,b)},_data:function(a,b,c){return Q(a,b,c,!0)},_removeData:function(a,b){return R(a,b,!0)}}),m.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=m.data(f),1===f.nodeType&&!m._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=m.camelCase(d.slice(5)),O(f,d,e[d])));m._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){m.data(this,a)}):arguments.length>1?this.each(function(){m.data(this,a,b)}):f?O(f,a,m.data(f,a)):void 0},removeData:function(a){return this.each(function(){m.removeData(this,a)})}}),m.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=m._data(a,b),c&&(!d||m.isArray(c)?d=m._data(a,b,m.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=m.queue(a,b),d=c.length,e=c.shift(),f=m._queueHooks(a,b),g=function(){m.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return m._data(a,c)||m._data(a,c,{empty:m.Callbacks("once memory").add(function(){m._removeData(a,b+"queue"),m._removeData(a,c)})})}}),m.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.lengthh;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},W=/^(?:checkbox|radio)$/i;!function(){var a=y.createElement("input"),b=y.createElement("div"),c=y.createDocumentFragment();if(b.innerHTML="
    a",k.leadingWhitespace=3===b.firstChild.nodeType,k.tbody=!b.getElementsByTagName("tbody").length,k.htmlSerialize=!!b.getElementsByTagName("link").length,k.html5Clone="<:nav>"!==y.createElement("nav").cloneNode(!0).outerHTML,a.type="checkbox",a.checked=!0,c.appendChild(a),k.appendChecked=a.checked,b.innerHTML="",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,c.appendChild(b),b.innerHTML="",k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,k.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){k.noCloneEvent=!1}),b.cloneNode(!0).click()),null==k.deleteExpando){k.deleteExpando=!0;try{delete b.test}catch(d){k.deleteExpando=!1}}}(),function(){var b,c,d=y.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(k[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),k[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var X=/^(?:input|select|textarea)$/i,Y=/^key/,Z=/^(?:mouse|pointer|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=/^([^.]*)(?:\.(.+)|)$/;function ab(){return!0}function bb(){return!1}function cb(){try{return y.activeElement}catch(a){}}m.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=m.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof m===K||a&&m.event.triggered===a.type?void 0:m.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(E)||[""],h=b.length;while(h--)f=_.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=m.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=m.event.special[o]||{},l=m.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&m.expr.match.needsContext.test(e),namespace:p.join(".")},i),(n=g[o])||(n=g[o]=[],n.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?n.splice(n.delegateCount++,0,l):n.push(l),m.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m.hasData(a)&&m._data(a);if(r&&(k=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=_.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=m.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,n=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=n.length;while(f--)g=n[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(n.splice(f,1),g.selector&&n.delegateCount--,l.remove&&l.remove.call(a,g));i&&!n.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||m.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)m.event.remove(a,o+b[j],c,d,!0);m.isEmptyObject(k)&&(delete r.handle,m._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,n,o=[d||y],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||y,3!==d.nodeType&&8!==d.nodeType&&!$.test(p+m.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[m.expando]?b:new m.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:m.makeArray(c,[b]),k=m.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!m.isWindow(d)){for(i=k.delegateType||p,$.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||y)&&o.push(l.defaultView||l.parentWindow||a)}n=0;while((h=o[n++])&&!b.isPropagationStopped())b.type=n>1?i:k.bindType||p,f=(m._data(h,"events")||{})[b.type]&&m._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&m.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&m.acceptData(d)&&g&&d[p]&&!m.isWindow(d)){l=d[g],l&&(d[g]=null),m.event.triggered=p;try{d[p]()}catch(r){}m.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=m.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(m._data(this,"events")||{})[a.type]||[],k=m.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=m.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((m.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?m(c,this).index(i)>=0:m.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h]","i"),hb=/^\s+/,ib=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,jb=/<([\w:]+)/,kb=/\s*$/g,rb={option:[1,""],legend:[1,"
    ","
    "],area:[1,"",""],param:[1,"",""],thead:[1,"","
    "],tr:[2,"","
    "],col:[2,"","
    "],td:[3,"","
    "],_default:k.htmlSerialize?[0,"",""]:[1,"X
    ","
    "]},sb=db(y),tb=sb.appendChild(y.createElement("div"));rb.optgroup=rb.option,rb.tbody=rb.tfoot=rb.colgroup=rb.caption=rb.thead,rb.th=rb.td;function ub(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==K?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==K?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||m.nodeName(d,b)?f.push(d):m.merge(f,ub(d,b));return void 0===b||b&&m.nodeName(a,b)?m.merge([a],f):f}function vb(a){W.test(a.type)&&(a.defaultChecked=a.checked)}function wb(a,b){return m.nodeName(a,"table")&&m.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function xb(a){return a.type=(null!==m.find.attr(a,"type"))+"/"+a.type,a}function yb(a){var b=pb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function zb(a,b){for(var c,d=0;null!=(c=a[d]);d++)m._data(c,"globalEval",!b||m._data(b[d],"globalEval"))}function Ab(a,b){if(1===b.nodeType&&m.hasData(a)){var c,d,e,f=m._data(a),g=m._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)m.event.add(b,c,h[c][d])}g.data&&(g.data=m.extend({},g.data))}}function Bb(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!k.noCloneEvent&&b[m.expando]){e=m._data(b);for(d in e.events)m.removeEvent(b,d,e.handle);b.removeAttribute(m.expando)}"script"===c&&b.text!==a.text?(xb(b).text=a.text,yb(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),k.html5Clone&&a.innerHTML&&!m.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&W.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}m.extend({clone:function(a,b,c){var d,e,f,g,h,i=m.contains(a.ownerDocument,a);if(k.html5Clone||m.isXMLDoc(a)||!gb.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(tb.innerHTML=a.outerHTML,tb.removeChild(f=tb.firstChild)),!(k.noCloneEvent&&k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||m.isXMLDoc(a)))for(d=ub(f),h=ub(a),g=0;null!=(e=h[g]);++g)d[g]&&Bb(e,d[g]);if(b)if(c)for(h=h||ub(a),d=d||ub(f),g=0;null!=(e=h[g]);g++)Ab(e,d[g]);else Ab(a,f);return d=ub(f,"script"),d.length>0&&zb(d,!i&&ub(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,l,n=a.length,o=db(b),p=[],q=0;n>q;q++)if(f=a[q],f||0===f)if("object"===m.type(f))m.merge(p,f.nodeType?[f]:f);else if(lb.test(f)){h=h||o.appendChild(b.createElement("div")),i=(jb.exec(f)||["",""])[1].toLowerCase(),l=rb[i]||rb._default,h.innerHTML=l[1]+f.replace(ib,"<$1>")+l[2],e=l[0];while(e--)h=h.lastChild;if(!k.leadingWhitespace&&hb.test(f)&&p.push(b.createTextNode(hb.exec(f)[0])),!k.tbody){f="table"!==i||kb.test(f)?""!==l[1]||kb.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)m.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}m.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),k.appendChecked||m.grep(ub(p,"input"),vb),q=0;while(f=p[q++])if((!d||-1===m.inArray(f,d))&&(g=m.contains(f.ownerDocument,f),h=ub(o.appendChild(f),"script"),g&&zb(h),c)){e=0;while(f=h[e++])ob.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=m.expando,j=m.cache,l=k.deleteExpando,n=m.event.special;null!=(d=a[h]);h++)if((b||m.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)n[e]?m.event.remove(d,e):m.removeEvent(d,e,g.handle);j[f]&&(delete j[f],l?delete d[i]:typeof d.removeAttribute!==K?d.removeAttribute(i):d[i]=null,c.push(f))}}}),m.fn.extend({text:function(a){return V(this,function(a){return void 0===a?m.text(this):this.empty().append((this[0]&&this[0].ownerDocument||y).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?m.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||m.cleanData(ub(c)),c.parentNode&&(b&&m.contains(c.ownerDocument,c)&&zb(ub(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&m.cleanData(ub(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&m.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return m.clone(this,a,b)})},html:function(a){return V(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(fb,""):void 0;if(!("string"!=typeof a||mb.test(a)||!k.htmlSerialize&&gb.test(a)||!k.leadingWhitespace&&hb.test(a)||rb[(jb.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(ib,"<$1>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(m.cleanData(ub(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,m.cleanData(ub(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,n=this,o=l-1,p=a[0],q=m.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&nb.test(p))return this.each(function(c){var d=n.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(i=m.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=m.map(ub(i,"script"),xb),f=g.length;l>j;j++)d=i,j!==o&&(d=m.clone(d,!0,!0),f&&m.merge(g,ub(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,m.map(g,yb),j=0;f>j;j++)d=g[j],ob.test(d.type||"")&&!m._data(d,"globalEval")&&m.contains(h,d)&&(d.src?m._evalUrl&&m._evalUrl(d.src):m.globalEval((d.text||d.textContent||d.innerHTML||"").replace(qb,"")));i=c=null}return this}}),m.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){m.fn[a]=function(a){for(var c,d=0,e=[],g=m(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),m(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Cb,Db={};function Eb(b,c){var d,e=m(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:m.css(e[0],"display");return e.detach(),f}function Fb(a){var b=y,c=Db[a];return c||(c=Eb(a,b),"none"!==c&&c||(Cb=(Cb||m("