Skip to content

Commit

Permalink
Use modern array syntax
Browse files Browse the repository at this point in the history
  • Loading branch information
ajbonner committed Jan 15, 2024
1 parent df661f9 commit cf89cf0
Show file tree
Hide file tree
Showing 44 changed files with 548 additions and 549 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ public function render(Varien_Data_Form_Element_Abstract $element)
protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
{
$originalData = $element->getOriginalData();
$this->addData(array(
$this->addData([
'button_label' => Mage::helper('zendesk')->__($originalData['button_label']),
'html_id' => $element->getHtmlId(),
'url' => Mage::getSingleton('adminhtml/url')->getUrl('*/setup/start')
));
]);

return $this->_toHtml();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ public function render(Varien_Data_Form_Element_Abstract $element)
protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
{
$originalData = $element->getOriginalData();
$this->addData(array(
$this->addData([
'button_label' => Mage::helper('zendesk')->__($originalData['button_label']),
'html_id' => $element->getHtmlId(),
'url' => Mage::getSingleton('adminhtml/url')->getUrl('*/setup/start')
));
]);

return $this->_toHtml();
}
Expand All @@ -53,4 +53,4 @@ public function getAuthHeader()
{
return 'Token token="' . Mage::helper('zendesk')->getApiToken(false) . '"';
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ public function render(Varien_Data_Form_Element_Abstract $element)
protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
{
$originalData = $element->getOriginalData();
$this->addData(array(
$this->addData([
'button_label' => Mage::helper('zendesk')->__($originalData['button_label']),
'button_url' => Mage::helper('zendesk')->__($originalData['button_url']),
'html_id' => $element->getHtmlId(),
'url' => Mage::getSingleton('adminhtml/url')->getUrl('*/setup/start')
));
]);

return $this->_toHtml();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ public function render(Varien_Data_Form_Element_Abstract $element)
protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
{
$originalData = $element->getOriginalData();
$this->addData(array(
$this->addData([
'button_label' => Mage::helper('zendesk')->__($originalData['button_label']),
'html_id' => $element->getHtmlId(),
'url' => Mage::getSingleton('adminhtml/url')->getUrl('adminhtml/zendesk/sync')
));
]);

return $this->_toHtml();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ public function render(Varien_Data_Form_Element_Abstract $element)
protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
{
$originalData = $element->getOriginalData();
$this->addData(array(
$this->addData([
'button_label' => Mage::helper('zendesk')->__($originalData['button_label']),
'html_id' => $element->getHtmlId(),
'url' => Mage::getSingleton('adminhtml/url')->getUrl('adminhtml/zendesk/checkOutbound')
));
]);

return $this->_toHtml();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)

$url = Mage::helper('zendesk')->getUrl('raw', $path);

$this->addData(array('label' => $label, 'link_url' => $url));
$this->addData(['label' => $label, 'link_url' => $url]);

return $this->_toHtml();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ public function getHeaderText()
{
return Mage::helper('zendesk')->__('Please Select User to Add');
}

public function getButtonsHtml($area = null)
{
$addButtonData = array(
$addButtonData = [
'label' => Mage::helper('zendesk')->__('Select User'),
'onclick' => 'showUsers()',
'id' => 'show-users'
);
];
return $this->getLayout()->createBlock('adminhtml/widget_button')->setData($addButtonData)->toHtml();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ protected function _prepareCollection()
->addAttributeToSelect('firstname')
->addAttributeToSelect('lastname')
->addAttributeToSelect('email');


$this->setCollection($collection);
return parent::_prepareCollection();
Expand All @@ -62,39 +62,39 @@ protected function _prepareCollection()
*/
protected function _prepareColumns()
{
$this->addColumn('entity_id', array(
$this->addColumn('entity_id', [
'header' => Mage::helper('zendesk')->__('ID'),
'sortable' => true,
'width' => '60',
'index' => 'entity_id'
));
$this->addColumn('firstname', array(
]);
$this->addColumn('firstname', [
'header' => Mage::helper('zendesk')->__('Firstname'),
'index' => 'firstname'
));
$this->addColumn('lastname', array(
]);
$this->addColumn('lastname', [
'header' => Mage::helper('zendesk')->__('Lastname'),
'index' => 'lastname'
));
$this->addColumn('email', array(
]);
$this->addColumn('email', [
'header' => Mage::helper('zendesk')->__('Email'),
'index' => 'email'
));
$this->addColumn('action', array(
]);
$this->addColumn('action', [
'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));
return $this->getUrl('adminhtml/zendesk/loadBlock', ['block'=>'customer_grid', '_current' => true, 'collapse' => null]);
}

public function getRowUrl($row)
{
return "";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class Zendesk_Zendesk_Block_Adminhtml_Create_Edit extends Mage_Adminhtml_Block_W
protected function _construct()
{
$this->_controller = false;
parent::_construct();
parent::_construct();
}

protected function _preparelayout()
Expand All @@ -34,19 +34,19 @@ protected function _preparelayout()
$data = Mage::registry('zendesk_create_data');

if(isset($data['order_id'])) {
$this->_addButton('back', array(
$this->_addButton('back', [
'label' => Mage::helper('adminhtml')->__('Back'),
'onclick' => 'setLocation(\'' . $this->getZdBackUrl($data['order_id']) . '\')',
'class' => 'back',
), -1);
], -1);
}
}

$this->_addButton('save', array(
$this->_addButton('save', [
'label' => Mage::helper('zendesk')->__('Create Ticket'),
'onclick' => 'editForm.submit();',
'class' => 'save',
), 1);
], 1);
$this->setChild('form', $this->getLayout()->createBlock('zendesk/adminhtml_create_edit_form'));
return parent::_prepareLayout();
}
Expand All @@ -65,13 +65,13 @@ public function getHeaderText()
public function getZdBackUrl($orderId)
{
if (Mage::getSingleton('admin/session')->isAllowed('sales/order/actions/view')) {
return $this->getUrl('adminhtml/sales_order/view', array('order_id' => $orderId));
return $this->getUrl('adminhtml/sales_order/view', ['order_id' => $orderId]);
}
return false;
}

public function getSaveUrl()
{
return $this->getUrl('*/*/save', array('_current' => true, 'back' => null));
return $this->getUrl('*/*/save', ['_current' => true, 'back' => null]);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,104 +19,104 @@ class Zendesk_Zendesk_Block_Adminhtml_Create_Edit_form extends Mage_Adminhtml_Bl
{
protected function _prepareForm()
{
$form = new Varien_Data_Form(array(
$form = new Varien_Data_Form([
'id' => 'edit_form',
'action' => $this->getData('action'),
'method' => 'post'
));
]);

$fieldset = $form->addFieldset('base', array(
$fieldset = $form->addFieldset('base', [
'legend'=>Mage::helper('adminhtml')->__('New Ticket'),
'class'=>'fieldset-wide'
));
]);

$fieldset->addField('requester', 'text', array(
$fieldset->addField('requester', 'text', [
'name' => 'requester',
'label' => Mage::helper('zendesk')->__('Requester Email'),
'title' => Mage::helper('zendesk')->__('Requester Email'),
'required' => true,
'class' => 'requester'
));
]);

$fieldset->addField('requester_name', 'text', array(
$fieldset->addField('requester_name', 'text', [
'name' => 'requester_name',
'label' => Mage::helper('zendesk')->__('Requester Name'),
'title' => Mage::helper('zendesk')->__('Requester Name'),
'required' => false,
'class' => 'requester'
));
]);

if(Mage::getModel('customer/customer')->getSharingConfig()->isWebsiteScope()) {
$fieldset->addField('website_id', 'select', array(
$fieldset->addField('website_id', 'select', [
'name' => 'website_id',
'label' => Mage::helper('zendesk')->__('Requester Website'),
'title' => Mage::helper('zendesk')->__('Requester Website'),
'required' => true,
'values' => Mage::getModel('adminhtml/system_config_source_website')->toOptionArray(),
));
]);
}

$fieldset->addField('subject', 'text', array(
$fieldset->addField('subject', 'text', [
'name' => 'subject',
'label' => Mage::helper('zendesk')->__('Subject'),
'title' => Mage::helper('zendesk')->__('Subject'),
'required' => true
));
$fieldset->addField('status', 'select', array(
]);

$fieldset->addField('status', 'select', [
'name' => 'status',
'label' => Mage::helper('zendesk')->__('Status'),
'title' => Mage::helper('zendesk')->__('Status'),
'required' => true,
'values' => array(
array('label' => 'New', 'value' => 'new'),
array('label' => 'Open', 'value' => 'open'),
array('label' => 'Pending', 'value' => 'pending'),
array('label' => 'Solved', 'value' => 'solved'),
)
));
$fieldset->addField('type', 'select', array(
'values' => [
['label' => 'New', 'value' => 'new'],
['label' => 'Open', 'value' => 'open'],
['label' => 'Pending', 'value' => 'pending'],
['label' => 'Solved', 'value' => 'solved'],
]
]);

$fieldset->addField('type', 'select', [
'name' => 'type',
'label' => Mage::helper('zendesk')->__('Type'),
'title' => Mage::helper('zendesk')->__('Type'),
'required' => false,
'values' => array(
array('label' => '-', 'value' => ''),
array('label' => 'Problem', 'value' => 'problem'),
array('label' => 'Incident', 'value' => 'incident'),
array('label' => 'Question', 'value' => 'question'),
array('label' => 'Task', 'value' => 'task'),
)
));
$fieldset->addField('priority', 'select', array(
'values' => [
['label' => '-', 'value' => ''],
['label' => 'Problem', 'value' => 'problem'],
['label' => 'Incident', 'value' => 'incident'],
['label' => 'Question', 'value' => 'question'],
['label' => 'Task', 'value' => 'task'],
]
]);

$fieldset->addField('priority', 'select', [
'name' => 'priority',
'label' => Mage::helper('zendesk')->__('Priority'),
'title' => Mage::helper('zendesk')->__('Priority'),
'required' => false,
'values' => array(
array('label' => 'Low', 'value' => 'low'),
array('label' => 'Normal', 'value' => 'normal'),
array('label' => 'High', 'value' => 'high'),
array('label' => 'Urgent', 'value' => 'urgent'),
)
));
$fieldset->addField('order', 'text', array(
'values' => [
['label' => 'Low', 'value' => 'low'],
['label' => 'Normal', 'value' => 'normal'],
['label' => 'High', 'value' => 'high'],
['label' => 'Urgent', 'value' => 'urgent'],
]
]);

$fieldset->addField('order', 'text', [
'name' => 'order',
'label' => Mage::helper('zendesk')->__('Order Number'),
'title' => Mage::helper('zendesk')->__('Order Number'),
'required' => false
));
]);

$fieldset->addField('description', 'textarea', array(
$fieldset->addField('description', 'textarea', [
'name' => 'description',
'label' => Mage::helper('zendesk')->__('Description'),
'title' => Mage::helper('zendesk')->__('Description'),
'required' => true
));
]);

if (Mage::registry('zendesk_create_data')) {
$form->setValues(Mage::registry('zendesk_create_data'));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ public function getHeaderText()
{
return Mage::helper('zendesk')->__('Please Select Order to Add');
}

public function getButtonsHtml($area = null)
{
$addButtonData = array(
$addButtonData = [
'label' => Mage::helper('zendesk')->__('Select Order'),
'onclick' => 'showOrders()',
'id' => 'show-orders'
);
];
return $this->getLayout()->createBlock('adminhtml/widget_button')->setData($addButtonData)->toHtml();
}

Expand Down
Loading

0 comments on commit cf89cf0

Please sign in to comment.