-
Notifications
You must be signed in to change notification settings - Fork 94
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1003 from mailchimp/pre-release/1.1.17
Pre release/1.1.17
- Loading branch information
Showing
154 changed files
with
4,505 additions
and
1,741 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/Ecommerce/Resendecommercedata.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <?php | ||
|
|
||
| class Ebizmarts_MailChimp_Block_Adminhtml_Ecommerce_Resendecommercedata extends Mage_Adminhtml_Block_Widget_Form_Container | ||
| { | ||
| protected $_mode = 'resendecommercedata'; | ||
| public function __construct() | ||
| { | ||
| $this->_controller = 'adminhtml_ecommerce'; | ||
| $this->_blockGroup = 'mailchimp'; | ||
|
|
||
| parent::__construct(); | ||
| $this->_removeButton("delete"); | ||
| $this->_removeButton("back"); | ||
| $this->_removeButton("reset"); | ||
| } | ||
|
|
||
| public function getHeaderText() | ||
| { | ||
| return Mage::helper('mailchimp')->__('Data to send'); | ||
| } | ||
|
|
||
| public function _prepareForm() | ||
| { | ||
| } | ||
| } |
81 changes: 81 additions & 0 deletions
81
...code/community/Ebizmarts/MailChimp/Block/Adminhtml/Ecommerce/Resendecommercedata/Form.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| <?php | ||
|
|
||
| class Ebizmarts_MailChimp_Block_Adminhtml_Ecommerce_Resendecommercedata_Form extends Mage_Adminhtml_Block_Widget_Form | ||
| { | ||
| protected function _prepareForm() | ||
| { | ||
| $form = new Varien_Data_Form(array('id' => 'edit_form', 'action' => $this->getUrl('*/*/resendEcommerceData'), 'method' => 'post')); | ||
| $fieldset = $form->addFieldset('base_fieldset', array('legend' => Mage::helper('mailchimp')->__('Resend Data'))); | ||
|
|
||
|
|
||
| $fieldset->addField( | ||
| 'products', | ||
| 'checkbox', | ||
| array( | ||
| 'name' => 'filter[]', | ||
| 'label' => "Products", | ||
| 'id' => 'products', | ||
| 'title' => "Products", | ||
| 'value' => Ebizmarts_MailChimp_Model_Config::IS_PRODUCT, | ||
| 'required' => false, | ||
| 'checked' => '1', | ||
| ) | ||
| ); | ||
| $fieldset->addField( | ||
| 'customers', | ||
| 'checkbox', | ||
| array( | ||
| 'name' => 'filter[]', | ||
| 'label' => "Customers", | ||
| 'id' => 'customers', | ||
| 'title' => 'Customers', | ||
| 'value' => Ebizmarts_MailChimp_Model_Config::IS_CUSTOMER, | ||
| 'required' => false, | ||
| 'checked' => '1', | ||
| ) | ||
| ); | ||
| $fieldset->addField( | ||
| 'orders', | ||
| 'checkbox', | ||
| array( | ||
| 'name' => 'filter[]', | ||
| 'label' => "Orders", | ||
| 'id' => 'orders', | ||
| 'title' => 'Orders', | ||
| 'value' => Ebizmarts_MailChimp_Model_Config::IS_ORDER, | ||
| 'required' => false, | ||
| 'checked' => '1', | ||
| ) | ||
| ); | ||
| $fieldset->addField( | ||
| 'carts', | ||
| 'checkbox', | ||
| array( | ||
| 'name' => 'filter[]', | ||
| 'label' => "Carts", | ||
| 'id' => 'carts', | ||
| 'title' => 'Carts', | ||
| 'value' => Ebizmarts_MailChimp_Model_Config::IS_QUOTE, | ||
| 'required' => false, | ||
| 'checked' => '1', | ||
| ) | ||
| ); | ||
| $fieldset->addField( | ||
| 'promo', | ||
| 'checkbox', | ||
| array( | ||
| 'name' => 'filter[]', | ||
| 'label' => "Promo Rules", | ||
| 'id' => 'promo', | ||
| 'title' => 'Promo Rules', | ||
| 'value' => Ebizmarts_MailChimp_Model_Config::IS_PROMO_CODE. ', ' . Ebizmarts_MailChimp_Model_Config::IS_PROMO_RULE, | ||
| 'required' => false, | ||
| 'checked' => '1', | ||
| ) | ||
| ); | ||
|
|
||
| $form->setUseContainer(true); | ||
| $this->setForm($form); | ||
| return parent::_prepareForm(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,7 +22,5 @@ public function __construct() | |
|
|
||
| parent::__construct(); | ||
| $this->removeButton('add'); | ||
|
|
||
| } | ||
|
|
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,5 +20,4 @@ public function __construct() | |
|
|
||
| parent::__construct(); | ||
| } | ||
|
|
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.