From a25db9ed4540ea6f6541cadb4d9cb10124fa92c6 Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Tue, 22 Nov 2016 10:18:06 -0300
Subject: [PATCH 1/5] Order Status not visible at website scope fixed.

---
 app/code/community/Ebizmarts/Autoresponder/etc/system.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/community/Ebizmarts/Autoresponder/etc/system.xml b/app/code/community/Ebizmarts/Autoresponder/etc/system.xml
index b2484229..1861d51b 100644
--- 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>

From 7fd8792900834018f0dfcd9b8ffa6e2a4a44468f Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Tue, 22 Nov 2016 14:44:24 -0300
Subject: [PATCH 2/5] Fixed typo.

---
 lib/Mandrill/Message.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Mandrill/Message.php b/lib/Mandrill/Message.php
index c0a73e25..9eb4f5b8 100644
--- 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;
     }

From 1a7fcbfac62124e9fb3c7f27adf2e4add84729c2 Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Mon, 5 Dec 2016 12:05:20 -0300
Subject: [PATCH 3/5] Fix for website_id filter on coupons. closes #158

---
 app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php | 2 +-
 app/code/community/Ebizmarts/Autoresponder/Model/Cron.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php b/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php
index e0ed4e0b..ff601a9e 100644
--- 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
index b2b8e146..3e8dbe62 100644
--- 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);

From 518b161d48818da576a379fabdac2834f2f4f9f5 Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Wed, 22 Feb 2017 11:56:35 -0300
Subject: [PATCH 4/5] Added escapehtml when rendering subscriber first name and
 last name.

---
 .../Adminhtml/Newsletter/Subscriber/Renderer/Firstname.php    | 4 ++--
 .../Adminhtml/Newsletter/Subscriber/Renderer/Lastname.php     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Newsletter/Subscriber/Renderer/Firstname.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Newsletter/Subscriber/Renderer/Firstname.php
index af290994..f62373a1 100644
--- a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Newsletter/Subscriber/Renderer/Firstname.php
+++ b/app/code/community/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/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Newsletter/Subscriber/Renderer/Lastname.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Newsletter/Subscriber/Renderer/Lastname.php
index af9179c7..ea85c6c5 100644
--- a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Newsletter/Subscriber/Renderer/Lastname.php
+++ b/app/code/community/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 '----';
         }

From 3a8557a807a230a9b714f38d0ec3df36d261b3db Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Wed, 22 Feb 2017 11:57:35 -0300
Subject: [PATCH 5/5] Update module version.

---
 app/code/community/Ebizmarts/MageMonkey/etc/config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/community/Ebizmarts/MageMonkey/etc/config.xml b/app/code/community/Ebizmarts/MageMonkey/etc/config.xml
index d20ad918..6b0263be 100755
--- 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>