Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,13 @@ protected function _prepareMassaction() {

$this->getMassactionBlock()->addItem('delete', array(
'label' => Mage::helper('zendesk')->__('Delete'),
'url' => $this->getUrl('*/adminhtml_zendesk/bulkDelete', array('form_key' => $formKey, '_current' => true)),
'url' => $this->getUrl('adminhtml/zendesk/bulkDelete', array('form_key' => $formKey, '_current' => true)),
'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('*/adminhtml_zendesk/bulkChangeStatus', array('form_key' => $formKey, '_current' => true)),
'url' => $this->getUrl('adminhtml/zendesk/bulkChangeStatus', array('form_key' => $formKey, '_current' => true)),
'confirm' => Mage::helper('zendesk')->__('Are you sure you want to change status of selected tickets?'),
'additional' => array(
'visibility' => array(
Expand All @@ -118,7 +118,7 @@ protected function _prepareMassaction() {

$this->getMassactionBlock()->addItem('change_priority', array(
'label' => Mage::helper('zendesk')->__('Change Priority'),
'url' => $this->getUrl('*/adminhtml_zendesk/bulkChangePriority', array('form_key' => $formKey, '_current' => true)),
'url' => $this->getUrl('adminhtml/zendesk/bulkChangePriority', array('form_key' => $formKey, '_current' => true)),
'confirm' => Mage::helper('zendesk')->__('Are you sure you want to change priority of selected tickets?'),
'additional' => array(
'visibility' => array(
Expand All @@ -133,7 +133,7 @@ protected function _prepareMassaction() {

$this->getMassactionBlock()->addItem('change_type', array(
'label' => Mage::helper('zendesk')->__('Change Type'),
'url' => $this->getUrl('*/adminhtml_zendesk/bulkChangeType', array('form_key' => $formKey, '_current' => true)),
'url' => $this->getUrl('adminhtml/zendesk/bulkChangeType', array('form_key' => $formKey, '_current' => true)),
'confirm' => Mage::helper('zendesk')->__('Are you sure you want to change type of selected tickets?'),
'additional' => array(
'visibility' => array(
Expand All @@ -148,7 +148,7 @@ protected function _prepareMassaction() {

$this->getMassactionBlock()->addItem('mark_as_spam', array(
'label' => Mage::helper('zendesk')->__('Mark as Spam'),
'url' => $this->getUrl('*/adminhtml_zendesk/bulkMarkSpam', array('form_key' => $formKey, '_current' => true)),
'url' => $this->getUrl('adminhtml/zendesk/bulkMarkSpam', array('form_key' => $formKey, '_current' => true)),
'confirm' => Mage::helper('zendesk')->__('Are you sure you want to mark as spam selected tickets?'),
));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ if($customer = Mage::registry('current_customer')) {
<td><?php echo Mage::helper('core')->formatDate($ticket['created_at'], Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM, true); ?></td>
<td><?php echo Mage::helper('core')->formatDate($ticket['updated_at'], Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM, true); ?></td>
<td><?php echo ucwords($ticket['status']); ?></td>
<td><?php echo ($ticket['group_id']) ? $t['group']['name'] : ''; ?></td>
<td><?php echo (isset($ticket['group_id'])) ? $t['group']['name'] : ''; ?></td>
<td><?php echo ($ticket['assignee_id']) ? $t['assignee']['name'] : ''; ?></td>
</tr>
<?php endforeach; ?>
Expand Down