Extract template type field (#20)

magento-hackathon · Oct 8, 2017 · a98e85b · a98e85b
1 parent 380c6e0
commit a98e85b
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 9 deletions.
diff --git a/app/code/community/Hackathon/EmailPreview/Block/Adminhtml/Email/Preview.php b/app/code/community/Hackathon/EmailPreview/Block/Adminhtml/Email/Preview.php
@@ -47,7 +47,8 @@ protected function _prepareForm()
          */
         $dependenceBlock = Mage::app()->getLayout()->createBlock('adminhtml/widget_form_element_dependence');
 
-        $templateTypeField = $this->_addSpecificFields($fieldset, $helper);
+        $this->_addSpecificFields($fieldset, $helper);
+        $templateTypeField = $this->_addTemplateTypeField($fieldset, $helper);
 
         $incrementFields['invoice'] = $fieldset->addField('invoiceIncrementId', 'select', array(
             'name' => 'invoiceIncrementId',
@@ -246,7 +247,7 @@ protected function addIncrementIdField(Varien_Data_Form_Element_Fieldset $fields
     /**
      * @param Varien_Data_Form_Element_Fieldset $fieldset
      * @param Hackathon_EmailPreview_Helper_Data $helper
-     * @return Varien_Data_Form_Element_Abstract
+     * @return void
      */
     protected function _addSpecificFields(Varien_Data_Form_Element_Fieldset $fieldset, Hackathon_EmailPreview_Helper_Data $helper)
     {
@@ -261,14 +262,19 @@ protected function _addSpecificFields(Varien_Data_Form_Element_Fieldset $fieldse
             'name' => 'templateId',
             'value' => $templateId
         ));
+    }
 
-        $templateTypeField = $fieldset->addField('templateType', 'select', array(
+    /**
+     * @param Varien_Data_Form_Element_Fieldset $fieldset
+     * @param Hackathon_EmailPreview_Helper_Data $helper
+     * @return Varien_Data_Form_Element_Abstract
+     */
+    protected function _addTemplateTypeField(Varien_Data_Form_Element_Fieldset $fieldset, Hackathon_EmailPreview_Helper_Data $helper)
+    {
+        return $fieldset->addField('templateType', 'select', array(
             'name' => 'templateType',
             'options' => Mage::getModel('hackathon_emailpreview/source_testtypes')->toOptionArray(),
             'label' => $helper->__('Template Type'),
         ));
-
-        return $templateTypeField;
     }
-
 }
diff --git a/app/code/community/Hackathon/EmailPreview/Block/Adminhtml/Tool.php b/app/code/community/Hackathon/EmailPreview/Block/Adminhtml/Tool.php
@@ -4,6 +4,11 @@ class Hackathon_EmailPreview_Block_Adminhtml_Tool
     extends Hackathon_EmailPreview_Block_Adminhtml_Email_Preview
 {
 
+    /**
+     * @param Varien_Data_Form_Element_Fieldset $fieldset
+     * @param Hackathon_EmailPreview_Helper_Data $helper
+     * @return void
+     */
     protected function _addSpecificFields(Varien_Data_Form_Element_Fieldset $fieldset, Hackathon_EmailPreview_Helper_Data $helper)
     {
         $fieldset->addField('testType', 'hidden', array(
@@ -15,13 +20,19 @@ protected function _addSpecificFields(Varien_Data_Form_Element_Fieldset $fieldse
             'name' => 'testRecipient',
             'label' => $helper->__('Test Recipient'),
         ));
+    }
 
-        $templateTypeField = $fieldset->addField('templateType', 'select', array(
+    /**
+     * @param Varien_Data_Form_Element_Fieldset $fieldset
+     * @param Hackathon_EmailPreview_Helper_Data $helper
+     * @return Varien_Data_Form_Element_Abstract
+     */
+    protected function _addTemplateTypeField(Varien_Data_Form_Element_Fieldset $fieldset, Hackathon_EmailPreview_Helper_Data $helper)
+    {
+        return $fieldset->addField('templateType', 'select', array(
             'name' => 'templateType',
             'options' => Mage::getModel('hackathon_emailpreview/source_templatetypes')->toOptionArray(),
             'label' => $helper->__('Template Type'),
         ));
-
-        return $templateTypeField;
     }
 }