Merge branch 'santisp_dev' into develop

ebizmarts · Feb 22, 2017 · 4fd57d9 · 4fd57d9
2 parents 635b2c8 + 3a8557a
commit 4fd57d9
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php b/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php
@@ -403,7 +403,7 @@ protected function _createNewCoupon($store, $email)
         $websiteid = Mage::getModel('core/store')->load($store)->getWebsiteId();
         $collection = Mage::getModel('salesrule/rule')->getCollection()
             ->addFieldToFilter('name', array('like' => 'Abandoned coupon ' . $email))
-            ->addFieldToFilter('website_id', array('eq' => $websiteid));
+            ->addFieldToFilter('website_ids', array('eq' => $websiteid));
         if (!count($collection)) {
 
             $fromDate = date("Y-m-d");

diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php b/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php
@@ -895,7 +895,7 @@ protected function _createNewCoupon($store, $email, $string)
         $websiteid = Mage::getModel('core/store')->load($store)->getWebsiteId();
         $collection = Mage::getModel('salesrule/rule')->getCollection()
             ->addFieldToFilter('name', array('like' => $string . $email))
-            ->addFieldToFilter('website_id', array('eq' => $websiteid));
+            ->addFieldToFilter('website_ids', array('eq' => $websiteid));
 
         if (!count($collection)) {
             $couponamount = Mage::getStoreConfig(Ebizmarts_Autoresponder_Model_Config::BIRTHDAY_DISCOUNT, $store);

diff --git a/app/code/community/Ebizmarts/Autoresponder/etc/system.xml b/app/code/community/Ebizmarts/Autoresponder/etc/system.xml
@@ -112,7 +112,7 @@
                             <source_model>adminhtml/system_config_source_order_status</source_model>
                             <sort_order>23</sort_order>
                             <show_in_default>1</show_in_default>
-                            <show_in_website>0</show_in_website>
+                            <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <comment><![CDATA[The email will be sent when order gets to the selected status.]]></comment>
                             <depends>

diff --git a/...mmunity/Ebizmarts/MageMonkey/Block/Adminhtml/Newsletter/Subscriber/Renderer/Firstname.php b/...mmunity/Ebizmarts/MageMonkey/Block/Adminhtml/Newsletter/Subscriber/Renderer/Firstname.php
@@ -13,9 +13,9 @@ public function render(Varien_Object $row)
         $subscriberFirstName = $row->getData('subscriber_firstname');
         $customerFirstName = $row->getData('customer_firstname');
         if ($customerFirstName) {
-            return $customerFirstName;
+            return $this->escapeHtml($customerFirstName);
         } elseif ($subscriberFirstName) {
-            return $subscriberFirstName;
+            return $this->escapeHtml($subscriberFirstName);
         } else {
             return '----';
         }

diff --git a/...ommunity/Ebizmarts/MageMonkey/Block/Adminhtml/Newsletter/Subscriber/Renderer/Lastname.php b/...ommunity/Ebizmarts/MageMonkey/Block/Adminhtml/Newsletter/Subscriber/Renderer/Lastname.php
@@ -13,9 +13,9 @@ public function render(Varien_Object $row)
         $subscriberLastName = $row->getData('subscriber_lastname');
         $customerLastName = $row->getData('customer_lastname');
         if ($customerLastName) {
-            return $customerLastName;
+            return $this->escapeHtml($customerLastName);
         } elseif ($subscriberLastName) {
-            return $subscriberLastName;
+            return $this->escapeHtml($subscriberLastName);
         } else {
             return '----';
         }

diff --git a/app/code/community/Ebizmarts/MageMonkey/etc/config.xml b/app/code/community/Ebizmarts/MageMonkey/etc/config.xml
@@ -10,7 +10,7 @@
 <config>
     <modules>
         <Ebizmarts_MageMonkey>
-            <version>1.2.8</version>
+            <version>1.2.9</version>
         </Ebizmarts_MageMonkey>
     </modules>
     <global>

diff --git a/lib/Mandrill/Message.php b/lib/Mandrill/Message.php
@@ -194,7 +194,7 @@ public function addHeader($name, $value, $append = false)
             throw new Zend_Mail_Exception('Cannot set standard header from addHeader()');
         }
 
-        $this->_header[$name] = $value;
+        $this->_headers[$name] = $value;
 
         return $this;
     }