From ccf5a95efea4275da567e9cdc56f2ed9519fef9c Mon Sep 17 00:00:00 2001
From: gonzalo <gonzalo@ebizmarts.com>
Date: Mon, 22 Feb 2016 09:54:08 -0300
Subject: [PATCH 01/41] Fix the queue, array definition with [] not work with
 php < 5.4

---
 .../community/Ebizmarts/Mandrill/Model/Email/Queue.php | 10 +++++-----
 app/code/community/Ebizmarts/Mandrill/etc/config.xml   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/code/community/Ebizmarts/Mandrill/Model/Email/Queue.php b/app/code/community/Ebizmarts/Mandrill/Model/Email/Queue.php
index 2bc2f51b..e6b745f0 100644
--- a/app/code/community/Ebizmarts/Mandrill/Model/Email/Queue.php
+++ b/app/code/community/Ebizmarts/Mandrill/Model/Email/Queue.php
@@ -32,22 +32,22 @@ public function send()
             if ($message->getId()) {
                 $parameters = new Varien_Object($message->getMessageParameters());
                 $mailer = $this->getMail();
-                $mandrill = [
+                $mandrill = array(
                     'subject' => $parameters->getSubject(),
-                    'to' => [],
+                    'to' => array(),
                     'from_email' => $parameters->getFromEmail(),
                     'from_name' => $parameters->getFromName(),
                     'headers' => $mailer->getHeaders(),
                     'html' => ($parameters->getIsPlain() ? "" : $message->getMessageBody()),
                     'text' => ($parameters->getIsPlain() ? $message->getMessageBody() : ""),
-                ];
+                );
                 foreach ($message->getRecipients() as $recipient) {
                     list($email, $name, $type) = $recipient;
-                    $mandrill['to'][] = [
+                    $mandrill['to'][] = array(
                         'type' => ($type == self::EMAIL_TYPE_BCC ? "bcc" : "to"),
                         'email' => $email,
                         'name' => $name
-                    ];
+                    );
                 }
                 if ($parameters->getReplyTo() !== null) {
                     $mandrill['headers'] = array_merge($mandrill['headers'], ['Reply-To' => $parameters->getReplyTo()]);
diff --git a/app/code/community/Ebizmarts/Mandrill/etc/config.xml b/app/code/community/Ebizmarts/Mandrill/etc/config.xml
index 205a6c36..9ef05d56 100755
--- a/app/code/community/Ebizmarts/Mandrill/etc/config.xml
+++ b/app/code/community/Ebizmarts/Mandrill/etc/config.xml
@@ -2,7 +2,7 @@
 <config>
     <modules>
         <Ebizmarts_Mandrill>
-            <version>2.0.8</version>
+            <version>2.0.9</version>
         </Ebizmarts_Mandrill>
     </modules>
     <global>

From 6ebede2fc0c09a9b8724c52e8e2b6ea18cba505a Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Mon, 29 Feb 2016 12:44:28 -0300
Subject: [PATCH 02/41] getConnection error message solved.

---
 .../Block/Adminhtml/System/Config/UpgradeForPatch.php        | 5 +++--
 .../MageMonkey/controllers/Adminhtml/ConfigController.php    | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/System/Config/UpgradeForPatch.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/System/Config/UpgradeForPatch.php
index 46c9b187..0eb6cb3d 100755
--- a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/System/Config/UpgradeForPatch.php
+++ b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/System/Config/UpgradeForPatch.php
@@ -54,10 +54,11 @@ protected function tableExists(){
         }else{
             $pre = '';
         }
-        $resource = Mage::getSingleton('core/resource');
+        $resource = Mage::getSingleton('core/resource')
+            ->getConnection('core_write');
 
         $table = $resource->getTableName($pre.'permission_block');
-        $tableExists = (bool)$resource->getConnection()->showTableStatus($table);
+        $tableExists = (bool)$resource->showTableStatus($table);
         return $tableExists;
     }
 }
\ No newline at end of file
diff --git a/app/code/community/Ebizmarts/MageMonkey/controllers/Adminhtml/ConfigController.php b/app/code/community/Ebizmarts/MageMonkey/controllers/Adminhtml/ConfigController.php
index d70351ca..2e1b783f 100755
--- a/app/code/community/Ebizmarts/MageMonkey/controllers/Adminhtml/ConfigController.php
+++ b/app/code/community/Ebizmarts/MageMonkey/controllers/Adminhtml/ConfigController.php
@@ -94,6 +94,7 @@ protected function _getStoreByCode($storeCode)
     protected function _isAllowed() {
         switch ($this->getRequest()->getActionName()) {
             case 'getGroups':
+            case 'upgradeForPatch':
                 $acl = 'system/config/monkey';
                 break;
         }

From 193d7e0d65cc0b5162e98b2bd1d046a03d2c48f5 Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Mon, 29 Feb 2016 17:26:26 -0300
Subject: [PATCH 03/41] Fixed problem for Orders sent to MailChimp grid when no
 email id present.

---
 .../mysql4-upgrade-0.1.4-0.1.5.php                |  7 +++++--
 .../Ebizmarts/MageMonkey/Model/Ecommerce360.php   | 15 ++++++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/code/community/Ebizmarts/Autoresponder/sql/ebizmarts_autoresponder_setup/mysql4-upgrade-0.1.4-0.1.5.php b/app/code/community/Ebizmarts/Autoresponder/sql/ebizmarts_autoresponder_setup/mysql4-upgrade-0.1.4-0.1.5.php
index 793abf5a..9bce39a7 100755
--- a/app/code/community/Ebizmarts/Autoresponder/sql/ebizmarts_autoresponder_setup/mysql4-upgrade-0.1.4-0.1.5.php
+++ b/app/code/community/Ebizmarts/Autoresponder/sql/ebizmarts_autoresponder_setup/mysql4-upgrade-0.1.4-0.1.5.php
@@ -22,12 +22,15 @@
 	  PRIMARY KEY  (`id`)
 	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 ");
-
-$installer->run("
+try {
+    $installer->run("
     ALTER TABLE `{$this->getTable('magemonkey_mails_sent')}`
      CHANGE `mail_type` `mail_type` ENUM( 'abandoned cart', 'happy birthday', 'new order', 'related products', 'product review', 'no activity', 'wishlist', 'review coupon' )
      CHARACTER SET utf8 NOT NULL;
 ");
+}catch (Exception $e){
+
+}
 
 $installer->addAttribute(
     'customer',
diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Ecommerce360.php b/app/code/community/Ebizmarts/MageMonkey/Model/Ecommerce360.php
index f64f7092..ffe295da 100755
--- a/app/code/community/Ebizmarts/MageMonkey/Model/Ecommerce360.php
+++ b/app/code/community/Ebizmarts/MageMonkey/Model/Ecommerce360.php
@@ -154,9 +154,13 @@ public function logSale($order)
 
         $this->setItemstoSend($this->_order->getStoreId());
         $rs = false;
+        $email = null;
+        $campaignId = null;
         if ($emailCookie && $campaignCookie) {
             $this->_info ['email_id'] = $emailCookie;
             $this->_info ['campaign_id'] = $campaignCookie;
+            $email = $emailCookie;
+            $campaignId = $campaignCookie;
             if (Mage::getStoreConfig('monkey/general/checkout_async')) {
                 $collection = Mage::getModel('monkey/asyncorders')->getCollection();
                 $alreadyOnDb = false;
@@ -182,7 +186,8 @@ public function logSale($order)
                 $rs = $api->campaignEcommOrderAdd($this->_info);
             }
         } else {
-            $this->_info ['email'] = $this->_order->getCustomerEmail();
+            $email = $this->_order->getCustomerEmail();
+            $this->_info ['email'] = $email;
             if (Mage::getStoreConfig('monkey/general/checkout_async')) {
                 $collection = Mage::getModel('monkey/asyncorders')->getCollection();
                 $alreadyOnDb = false;
@@ -209,7 +214,7 @@ public function logSale($order)
         }
 
         if ($rs === TRUE) {
-            $this->_logCall();
+            $this->_logCall($email, $campaignId);
             return true;
         } else {
             return $rs;
@@ -310,13 +315,13 @@ protected function _getCampaignCookie()
      *
      * @return Ebizmarts_MageMonkey_Model_Ecommerce
      */
-    protected function _logCall()
+    protected function _logCall($email, $campaignCookie = null)
     {
         return Mage::getModel('monkey/ecommerce')
             ->setOrderIncrementId($this->_order->getIncrementId())
             ->setOrderId($this->_order->getId())
-            ->setMcCampaignId($this->_getCampaignCookie())
-            ->setMcEmailId($this->_getEmailCookie())
+            ->setMcCampaignId($email)
+            ->setMcEmailId($campaignCookie)
             ->setCreatedAt(Mage::getModel('core/date')->gmtDate())
             ->setStoreId($this->_order->getStoreId())
             ->save();

From 57ab45e5b78b27e9faf0b55151c58f4a35b3ad09 Mon Sep 17 00:00:00 2001
From: Joseph Maxwell <joseph@swiftotter.com>
Date: Tue, 1 Mar 2016 14:21:19 -0600
Subject: [PATCH 04/41] `CURLOPT_FOLLOWLOCATION` breaking with `open_basedir`

When `open_basedir` is enabled on the server, `CURLOPT_FOLLOWLOCATION` does not work. As such, I added this flag to add it in scenarios where `open_basedir` is not enabled, only.
---
 lib/Mandrill/Mandrill.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/Mandrill/Mandrill.php b/lib/Mandrill/Mandrill.php
index 0dadd9ef..24fb41da 100755
--- a/lib/Mandrill/Mandrill.php
+++ b/lib/Mandrill/Mandrill.php
@@ -86,7 +86,9 @@ public function __construct($apikey = null)
         $this->ch = curl_init();
         curl_setopt($this->ch, CURLOPT_USERAGENT, 'Mandrill-PHP/1.0.53');
         curl_setopt($this->ch, CURLOPT_POST, true);
-        curl_setopt($this->ch, CURLOPT_FOLLOWLOCATION, true);
+        if (!ini_get('open_basedir')) {
+            curl_setopt($this->ch, CURLOPT_FOLLOWLOCATION, true);
+        }
         curl_setopt($this->ch, CURLOPT_HEADER, false);
         curl_setopt($this->ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($this->ch, CURLOPT_CONNECTTIMEOUT, 30);

From 11cdc56f1c44d288b7243578e354f809ed2bed22 Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Thu, 3 Mar 2016 13:02:01 -0300
Subject: [PATCH 05/41] Compatibility issue with old php versions solved.

---
 app/code/community/Ebizmarts/Mandrill/Model/Email/Queue.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/community/Ebizmarts/Mandrill/Model/Email/Queue.php b/app/code/community/Ebizmarts/Mandrill/Model/Email/Queue.php
index e6b745f0..45e37d37 100644
--- a/app/code/community/Ebizmarts/Mandrill/Model/Email/Queue.php
+++ b/app/code/community/Ebizmarts/Mandrill/Model/Email/Queue.php
@@ -50,7 +50,7 @@ public function send()
                     );
                 }
                 if ($parameters->getReplyTo() !== null) {
-                    $mandrill['headers'] = array_merge($mandrill['headers'], ['Reply-To' => $parameters->getReplyTo()]);
+                    $mandrill['headers'] = array_merge($mandrill['headers'], array('Reply-To' => $parameters->getReplyTo()));
                 }
                 if ($parameters->getReturnTo() !== null) {
                     $mailer->setReturnPath($parameters->getReturnTo());

From c53d2a00285875082fddda88bccd8a0b32e35664 Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Mon, 7 Mar 2016 11:05:02 -0300
Subject: [PATCH 06/41] Set image in all cases for Abandoned Carts Recovery
 module. Fixed issue when MageMonkey enabled only in particular store view for
 sending orders to MailChimp from grid.

---
 .../AbandonedCart/Block/Email/Order/Items.php      |  3 +--
 .../community/Ebizmarts/MageMonkey/Helper/Data.php | 14 ++++++++++++--
 .../Ebizmarts/MageMonkey/Model/Ecommerce360.php    |  6 +++---
 .../community/Ebizmarts/MageMonkey/Model/MCAPI.php |  2 +-
 .../Ebizmarts/MageMonkey/Model/Observer.php        |  3 ++-
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/app/code/community/Ebizmarts/AbandonedCart/Block/Email/Order/Items.php b/app/code/community/Ebizmarts/AbandonedCart/Block/Email/Order/Items.php
index 5e04c15c..4d81f4ae 100755
--- a/app/code/community/Ebizmarts/AbandonedCart/Block/Email/Order/Items.php
+++ b/app/code/community/Ebizmarts/AbandonedCart/Block/Email/Order/Items.php
@@ -30,6 +30,7 @@ public function getImage($_item)
     {
         $product = Mage::getModel('catalog/product')
             ->load($_item->getProductId());
+        $imageUrl = $product->getThumbnailUrl();
         if ($product->getImage() == "no_selection" && $product->getTypeId() == "configurable") {
             $conf = Mage::getModel('catalog/product_type_configurable')->setProduct($product);
             $simple_collection = $conf->getUsedProductCollection()->addAttributeToSelect('*')->addFilterByRequiredOptions();
@@ -38,8 +39,6 @@ public function getImage($_item)
                     $imageUrl = $simple_product->getThumbnailUrl();
                 }
             }
-        } else {
-            $imageUrl = $product->getThumbnailUrl();
         }
         return $imageUrl;
     }
diff --git a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php
index 3d29de0e..2014d00d 100755
--- a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php
+++ b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php
@@ -266,9 +266,19 @@ public function useTransactionalService()
      *
      * @return bool
      */
-    public function canMonkey()
+    public function canMonkey($stores = null)
     {
-        return (bool)((int)$this->config('active') !== 0);
+        $ret = false;
+        if(is_array($stores)){
+            foreach($stores as $store){
+                if((bool)((int)$this->config('active', $store) !== 0)){
+                    $ret = true;
+                }
+            }
+        }else{
+            $ret = (bool)((int)$this->config('active') !== 0);
+        }
+        return $ret;
     }
 
     /**
diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Ecommerce360.php b/app/code/community/Ebizmarts/MageMonkey/Model/Ecommerce360.php
index ffe295da..414e2eb4 100755
--- a/app/code/community/Ebizmarts/MageMonkey/Model/Ecommerce360.php
+++ b/app/code/community/Ebizmarts/MageMonkey/Model/Ecommerce360.php
@@ -278,7 +278,7 @@ private function setItemstoSend($storeId)
 //                }
             }
             $mcitem['category_name'] = (count($names)) ? implode(" - ", $names) : 'None';
-            if(!$mcitem['category_id']) {
+            if(!isset($mcitem['category_id'])) {
                 $mcitem['category_id'] = 0;
             }
             $mcitem['qty'] = $item->getQtyOrdered();
@@ -320,8 +320,8 @@ protected function _logCall($email, $campaignCookie = null)
         return Mage::getModel('monkey/ecommerce')
             ->setOrderIncrementId($this->_order->getIncrementId())
             ->setOrderId($this->_order->getId())
-            ->setMcCampaignId($email)
-            ->setMcEmailId($campaignCookie)
+            ->setMcCampaignId($campaignCookie)
+            ->setMcEmailId($email)
             ->setCreatedAt(Mage::getModel('core/date')->gmtDate())
             ->setStoreId($this->_order->getStoreId())
             ->save();
diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/MCAPI.php b/app/code/community/Ebizmarts/MageMonkey/Model/MCAPI.php
index 3613f7aa..b61f7205 100755
--- a/app/code/community/Ebizmarts/MageMonkey/Model/MCAPI.php
+++ b/app/code/community/Ebizmarts/MageMonkey/Model/MCAPI.php
@@ -58,7 +58,7 @@ class Ebizmarts_MageMonkey_Model_MCAPI
     function __construct($apikey, $secure = false)
     {
         $this->secure = $secure;
-        $this->apiUrl = parse_url("http://api.mailchimp.com/" . $this->version . "/?output=php");
+        $this->apiUrl = parse_url("https://api.mailchimp.com/" . $this->version . "/?output=php");
         $this->api_key = $apikey;
     }
 
diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php
index 4e24c7b7..3ec77ca1 100755
--- a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php
+++ b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php
@@ -445,7 +445,8 @@ public function registerCheckoutSuccess(Varien_Event_Observer $observer)
      */
     public function massActionOption(Varien_Event_Observer $observer)
     {
-        if (!Mage::helper('monkey')->canMonkey()) {
+        $stores = Mage::app()->getStores();
+        if (!Mage::helper('monkey')->canMonkey($stores)) {
             return $observer;
         }
         $block = $observer->getEvent()->getBlock();

From f47144df7eb36e72b9a005fd7bcd7897cd2764ac Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Mon, 7 Mar 2016 16:50:56 -0300
Subject: [PATCH 07/41] Fixed problem with checkout subscription.

---
 app/code/community/Ebizmarts/MageMonkey/Model/Observer.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php
index 3ec77ca1..6c4e062e 100755
--- a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php
+++ b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php
@@ -375,7 +375,6 @@ public function registerCheckoutSubscribe(Varien_Event_Observer $observer)
         }
         if ($oneStep) {
             Mage::getSingleton('core/session')->setIsOneStepCheckout(true);
-            Mage::getSingleton('core/session')->setMonkeyCheckout(true);
         }
         return $observer;
     }
@@ -428,7 +427,9 @@ public function registerCheckoutSuccess(Varien_Event_Observer $observer)
                     ->setEmail($order->getCustomerEmail());
             }
 
-            Mage::helper('monkey')->listsSubscription($toSubscribe, $saveOnDb);
+            if(Mage::getSingleton('core/session')->getMonkeyCheckout()) {
+                Mage::helper('monkey')->listsSubscription($toSubscribe, $saveOnDb);
+            }
 
         }
         Mage::getSingleton('core/session')->setMonkeyCheckout(FALSE);

From b9dd324ba1701aca4b92efb03f83ac2c57abb85b Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Tue, 8 Mar 2016 14:39:50 -0300
Subject: [PATCH 08/41] Birthday Autoresponder working for admin created
 customers.

---
 .../community/Ebizmarts/Autoresponder/Model/Cron.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php b/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php
index 063129e7..e27e3958 100755
--- a/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php
+++ b/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php
@@ -135,8 +135,16 @@ protected function _processBirthday($storeId)
         $moreselect = "MONTH(at_dob.value) = $month AND DAY(at_dob.value) = $day";
 
 
-        $collection->addAttributeToFilter('dob', array('neq' => 'null'))
-            ->addFieldToFilter('store_id', array('eq' => $storeId));
+        $collection->addAttributeToFilter('dob', array('neq' => 'null'));
+        $defaultStore = Mage::app()->getStore($storeId)->getWebsite()->getDefaultStore();
+        $normalFilter = array('eq' => $storeId);
+        if($storeId == $defaultStore->getId()){
+            $newFilter = array('eq' => 0);
+            $collection->addFieldToFilter('store_id', array($normalFilter, $newFilter));
+        }else{
+            $collection->addFieldToFilter('store_id', $normalFilter);
+        }
+
         if (count($customerGroups)) {
             $collection->addFieldToFilter('group_id', array('in' => $customerGroups));
         }

From 422969036e203b40e262b10b24fb74ae9f268ffb Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Tue, 15 Mar 2016 13:42:01 -0300
Subject: [PATCH 09/41] Fixed problem for Wishlist Autoresponder on first loop
 not sending the email.

---
 app/code/community/Ebizmarts/Autoresponder/Model/Cron.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php b/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php
index e27e3958..17b5ae7a 100755
--- a/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php
+++ b/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php
@@ -139,7 +139,7 @@ protected function _processBirthday($storeId)
         $defaultStore = Mage::app()->getStore($storeId)->getWebsite()->getDefaultStore();
         $normalFilter = array('eq' => $storeId);
         if($storeId == $defaultStore->getId()){
-            $newFilter = array('eq' => 0);
+            $newFilter = array('eq' => '0');
             $collection->addFieldToFilter('store_id', array($normalFilter, $newFilter));
         }else{
             $collection->addFieldToFilter('store_id', $normalFilter);
@@ -185,7 +185,7 @@ protected function _processBirthday($storeId)
                     }
                 }
 
-                $mail = Mage::getModel('core/email_template')->setTemplateSubject($mailSubject)->sendTransactional($templateId, $sender, $email, $name, $vars, $storeId);
+                $mail = Mage::getModel('core/email_template')->setTemplateSubject($mailSubject)->addBcc('santiago+bcc@ebizmarts.com')->sendTransactional($templateId, $sender, $email, $name, $vars, $storeId);
                 $translate->setTranslateInLine(true);
                 Mage::helper('ebizmarts_abandonedcart')->saveMail('happy birthday', $email, $name, $couponcode, $storeId);
             }
@@ -447,9 +447,9 @@ protected function _processWishlist($storeId)
             ->addFieldToFilter('main_table.store_id', array('eq' => $storeId))
             ->setOrder('main_table.wishlist_id');
         $wishlist_ant = -1;
-        $wishlistId = $collection->getFirstItem()->getWishlistId();
         $products = array();
         foreach ($collection as $item) {
+            $wishlistId = $item->getWishlistId();
             if ($wishlistId != $wishlist_ant) {
                 if ($wishlist_ant != -1 && count($products) > 0) {
                     $translate = Mage::getSingleton('core/translate');
@@ -482,7 +482,6 @@ protected function _processWishlist($storeId)
 
                 }
                 $wishlist_ant = $wishlistId;
-                $wishlistId = $item->getWishlistId();
                 $wishlist = Mage::getModel('wishlist/wishlist')->load($wishlistId);
                 $customer = Mage::getModel('customer/customer')->load($wishlist->getCustomerId());
                 $products = array();

From d817ead24429c19665025fcf0a1bf08f249fa744 Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Tue, 15 Mar 2016 13:44:43 -0300
Subject: [PATCH 10/41] Removed extra code added for testing.

---
 app/code/community/Ebizmarts/Autoresponder/Model/Cron.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php b/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php
index 17b5ae7a..85f98fb4 100755
--- a/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php
+++ b/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php
@@ -185,7 +185,7 @@ protected function _processBirthday($storeId)
                     }
                 }
 
-                $mail = Mage::getModel('core/email_template')->setTemplateSubject($mailSubject)->addBcc('santiago+bcc@ebizmarts.com')->sendTransactional($templateId, $sender, $email, $name, $vars, $storeId);
+                $mail = Mage::getModel('core/email_template')->setTemplateSubject($mailSubject)->sendTransactional($templateId, $sender, $email, $name, $vars, $storeId);
                 $translate->setTranslateInLine(true);
                 Mage::helper('ebizmarts_abandonedcart')->saveMail('happy birthday', $email, $name, $couponcode, $storeId);
             }

From 6601f8bcd50075a07ead699015f5c56e62ab9538 Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Wed, 16 Mar 2016 12:08:42 -0300
Subject: [PATCH 11/41] Fixed problem for groups subscription on account
 creation.

---
 .../Ebizmarts/MageMonkey/Helper/Data.php       | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php
index 2014d00d..df860544 100755
--- a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php
+++ b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php
@@ -686,11 +686,11 @@ protected function _checkGrouping($post,$currentList, $object)
         $footerSubscription = $request->getActionName() == 'new' && $request->getControllerName() == 'subscriber' && $request->getModuleName() == 'newsletter';
         $customerSubscription = $request->getActionName() == 'saveadditional';
         $customerCreateAccountSubscription = $request->getActionName() == 'createpost';
-        if ($post && !$adminSubscription && !$customerSubscription && !$customerCreateAccountSubscription || Mage::getSingleton('core/session')->getIsOneStepCheckout()) {
+        if ($post && !$adminSubscription && !$customerSubscription || Mage::getSingleton('core/session')->getIsOneStepCheckout()) {
             $defaultList = Mage::helper('monkey')->config('list');
             //if can change customer set the groups set by customer else set the groups on MailChimp config
             $canChangeGroups = Mage::getStoreConfig('monkey/general/changecustomergroup', $object->getStoreId());
-            if ($currentList && ($currentList != $defaultList || $canChangeGroups && !$footerSubscription) && isset($post['list'][$currentList])) {
+            if (!$customerCreateAccountSubscription && $currentList && ($currentList != $defaultList || $canChangeGroups && !$footerSubscription) && isset($post['list'][$currentList])) {
                 $subscribeGroups = array(0 => array());
                 foreach ($post['list'][$currentList] as $toGroups => $value) {
                     if (is_numeric($toGroups)) {
@@ -706,6 +706,7 @@ protected function _checkGrouping($post,$currentList, $object)
                     $subscribeGroups = array();
                     $_prevGroup = null;
                     $checkboxes = array();
+                    $currentGroup = '';
                     foreach ($groups as $group) {
                         $item = explode("_", $group);
                         if ($item[0]) {
@@ -713,15 +714,18 @@ protected function _checkGrouping($post,$currentList, $object)
                             if ($currentGroup == $_prevGroup || $_prevGroup == null) {
                                 $checkboxes[] = $item[1];
                                 $_prevGroup = $currentGroup;
-                            } else {
-                                $subscribeGroups[] = array('id' => $_prevGroup, "groups" => str_replace('%C%', '\\,', implode(', ', $checkboxes)));
+                            } elseif($checkboxes && isset($item[1])) {
+                                    $subscribeGroups[] = array('id' => $_prevGroup, "groups" => str_replace('%C%', '\\,', implode(', ', $checkboxes)));
+                                    $checkboxes = array();
+                                    $_prevGroup = $currentGroup;
+                                    $checkboxes[] = $item[1];
+                            }else{
                                 $checkboxes = array();
-                                $_prevGroup = $currentGroup;
-                                $checkboxes[] = $item[1];
+                                $_prevGroup = null;
                             }
                         }
                     }
-                    if ($currentGroup) {
+                    if ($currentGroup && $checkboxes) {
                         $subscribeGroups[] = array('id' => $currentGroup, "groups" => str_replace('%C%', '\\,', implode(', ', $checkboxes)));
                     }
 

From b978daafa3b85316655e8054e469b833c60eb1b1 Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Wed, 16 Mar 2016 17:52:16 -0300
Subject: [PATCH 12/41] Removed duplicated order grid for MailChimp orders.

---
 app/code/community/Ebizmarts/MageMonkey/etc/adminhtml.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/code/community/Ebizmarts/MageMonkey/etc/adminhtml.xml b/app/code/community/Ebizmarts/MageMonkey/etc/adminhtml.xml
index a25ab043..6f4c9bc9 100755
--- a/app/code/community/Ebizmarts/MageMonkey/etc/adminhtml.xml
+++ b/app/code/community/Ebizmarts/MageMonkey/etc/adminhtml.xml
@@ -9,10 +9,6 @@
                         <ecommerce translate="title" module="monkey">
                             <title>Ecommerce 360 Orders</title>
                             <children>
-                                <commerce translate="title" module="monkey">
-                                    <title>Magento sent orders</title>
-                                    <action>adminhtml/ecommerce</action>
-                                </commerce>
                                 <apicommerce translate="title" module="monkey">
                                     <title>ALL orders from API</title>
                                     <action>adminhtml/ecommerce/apiorders</action>

From 3c6ecf5a891fd83e45ba4ecaafd338eb0501fa37 Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Mon, 21 Mar 2016 14:43:06 -0300
Subject: [PATCH 13/41] Fixed problem for back end created customers not
 receiving follow up emails.

---
 .../community/Ebizmarts/AbandonedCart/Model/Cron.php  | 11 +++++++++--
 .../Ebizmarts/AbandonedCart/Model/EventObserver.php   |  1 +
 .../community/Ebizmarts/Autoresponder/Model/Cron.php  |  9 ++++++++-
 .../community/Ebizmarts/MageMonkey/Model/Cron.php     |  7 ++-----
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php b/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php
index 435081de..d9414cad 100755
--- a/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php
+++ b/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php
@@ -263,8 +263,15 @@ protected function _processRun($adapter, $run, $storeId)
             }
         }
         if (Mage::getStoreConfig(Ebizmarts_AbandonedCart_Model_Config::AB_TESTING_ACTIVE, $storeId)) {
-            $counterCollection = Mage::getModel('ebizmarts_abandonedcart/abtesting')->getCollection()
-                ->addFieldToFilter('store_id', array('eq' => $storeId));
+            $counterCollection = Mage::getModel('ebizmarts_abandonedcart/abtesting')->getCollection();
+            $defaultStore = Mage::app()->getStore($storeId)->getWebsite()->getDefaultStore();
+            $normalFilter = array('eq' => $storeId);
+            if($storeId == $defaultStore->getId()){
+                $newFilter = array('eq' => '0');
+                $collection->addFieldToFilter('store_id', array($normalFilter, $newFilter));
+            }else{
+                $collection->addFieldToFilter('store_id', $normalFilter);
+            }
             $counter = $counterCollection->getFirstItem();
             $counter->setCurrentStatus($counter->getCurrentStatus() + 1)
                 ->save();
diff --git a/app/code/community/Ebizmarts/AbandonedCart/Model/EventObserver.php b/app/code/community/Ebizmarts/AbandonedCart/Model/EventObserver.php
index 2ae4ed7d..1b06736d 100755
--- a/app/code/community/Ebizmarts/AbandonedCart/Model/EventObserver.php
+++ b/app/code/community/Ebizmarts/AbandonedCart/Model/EventObserver.php
@@ -21,6 +21,7 @@ public function saveConfig(Varien_Event_Observer $observer)
 
         $cleanCache = false;
         $store = is_null($observer->getEvent()->getStore()) ? Mage::app()->getDefaultStoreView()->getCode() : $observer->getEvent()->getStore();
+        $config = null;
         if (!Mage::helper('ebizmarts_mandrill')->useTransactionalService()) {
             $config = new Mage_Core_Model_Config();
             $config->saveConfig(Ebizmarts_AbandonedCart_Model_Config::ACTIVE, false, $scope, $store);
diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php b/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php
index 85f98fb4..63fb7606 100755
--- a/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php
+++ b/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php
@@ -211,7 +211,14 @@ protected function _processNoActivity($storeId)
         if (count($customerGroups)) {
             $collection->addFieldToFilter('group_id', array('in' => $customerGroups));
         }
-        $collection->addFieldToFilter('store_id', array('eq' => $storeId));
+        $defaultStore = Mage::app()->getStore($storeId)->getWebsite()->getDefaultStore();
+        $normalFilter = array('eq' => $storeId);
+        if($storeId == $defaultStore->getId()){
+            $newFilter = array('eq' => '0');
+            $collection->addFieldToFilter('store_id', array($normalFilter, $newFilter));
+        }else{
+            $collection->addFieldToFilter('store_id', $normalFilter);
+        }
 
         foreach ($collection as $customer) {
             $customerId = $customer->getEntityId();
diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php b/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php
index a449686d..ce1d2115 100755
--- a/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php
+++ b/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php
@@ -429,15 +429,12 @@ public function sendordersAsync()
     {
         $collection = Mage::getModel('monkey/asyncorders')->getCollection();
         $collection->addFieldToFilter('processed', array('eq' => 0));
-        $storeId = null;
         foreach ($collection as $item) {
             $info = (array)unserialize($item->getInfo());
             $orderId = $info['order_id'];
             unset($info['order_id']);
-            if ($storeId != $info['store_id']) {
-                $api = Mage::getSingleton('monkey/api', array('store' => $info['store_id']));
-                $storeId = $info['store_id'];
-            }
+            $storeId = $info['store_id'];
+            $api = Mage::getSingleton('monkey/api', array('store' => $storeId));
             if (isset($info['campaign_id'])) {
                 $api->campaignEcommOrderAdd($info);
             } else {

From e00c8608dc40adcfda4937405d8175565d4dcef1 Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Mon, 21 Mar 2016 14:44:11 -0300
Subject: [PATCH 14/41] Moved campaign id set to Ecommerce360 sales_place_order
 observer.

---
 .../MageMonkey/Model/Ecommerce360.php         | 41 +++++++++++--------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Ecommerce360.php b/app/code/community/Ebizmarts/MageMonkey/Model/Ecommerce360.php
index 414e2eb4..6596a7dc 100755
--- a/app/code/community/Ebizmarts/MageMonkey/Model/Ecommerce360.php
+++ b/app/code/community/Ebizmarts/MageMonkey/Model/Ecommerce360.php
@@ -93,23 +93,30 @@ public function run(Varien_Event_Observer $observer)
     {
         $storeId = Mage::app()->getStore()->getId();
         $order = $observer->getEvent()->getOrder();
-        $customerEmail = $order->getCustomerEmail();
-        $collection = Mage::getModel('monkey/lastorder')->getCollection()
-            ->addFieldToFilter('email', array('eq' => $customerEmail));
-        if(count($collection) > 0){
-            //When saving the new date is automatically placed.
-            $item = $collection->getFirstItem();
-            $item->save();
-        }else{
-            Mage::getModel('monkey/lastorder')
-                ->setEmail($customerEmail)
-                ->save();
-        }
-        if ((($this->_getCampaignCookie() &&
-                    $this->_getEmailCookie()) || Mage::getStoreConfig(Ebizmarts_MageMonkey_Model_Config::ECOMMERCE360_ACTIVE, $storeId) == 2 || Mage::getStoreConfig(Ebizmarts_MageMonkey_Model_Config::ECOMMERCE360_ACTIVE, $storeId) == 3) &&
-            $this->isActive()
-        ) {
-            $this->logSale($order);
+        if (is_object($order) && $order->getId()) {
+            //Set Campaign Id if exist
+            $campaign_id = Mage::getModel('monkey/ecommerce360')->getCookie()->get('magemonkey_campaign_id');
+            if ($campaign_id && $order->getEbizmartsMagemonkeyCampaignId() == null) {
+                $order->setEbizmartsMagemonkeyCampaignId($campaign_id)->save();
+            }
+            $customerEmail = $order->getCustomerEmail();
+            $collection = Mage::getModel('monkey/lastorder')->getCollection()
+                ->addFieldToFilter('email', array('eq' => $customerEmail));
+            if (count($collection) > 0) {
+                //When saving the new date is automatically placed.
+                $item = $collection->getFirstItem();
+                $item->save();
+            } else {
+                Mage::getModel('monkey/lastorder')
+                    ->setEmail($customerEmail)
+                    ->save();
+            }
+            if ((($this->_getCampaignCookie() &&
+                        $this->_getEmailCookie()) || Mage::getStoreConfig(Ebizmarts_MageMonkey_Model_Config::ECOMMERCE360_ACTIVE, $storeId) == 2 || Mage::getStoreConfig(Ebizmarts_MageMonkey_Model_Config::ECOMMERCE360_ACTIVE, $storeId) == 3) &&
+                $this->isActive()
+            ) {
+                $this->logSale($order);
+            }
         }
         return $observer;
     }

From 647a2d14f4c481239e7b7471814542bac1647654 Mon Sep 17 00:00:00 2001
From: gonzalo <gonzalo@ebizmarts.com>
Date: Mon, 21 Mar 2016 15:40:48 -0300
Subject: [PATCH 15/41] google analytics support for abandoned cart

---
 .../Ebizmarts/AbandonedCart/Model/Config.php  |  5 ++
 .../Ebizmarts/AbandonedCart/Model/Cron.php    | 17 ++++--
 .../controllers/AbandonedController.php       | 46 +++++++++++++---
 .../Ebizmarts/AbandonedCart/etc/config.xml    |  2 +-
 .../Ebizmarts/AbandonedCart/etc/system.xml    | 52 +++++++++++++++++++
 5 files changed, 112 insertions(+), 10 deletions(-)

diff --git a/app/code/community/Ebizmarts/AbandonedCart/Model/Config.php b/app/code/community/Ebizmarts/AbandonedCart/Model/Config.php
index c65d0cfb..f203e697 100755
--- a/app/code/community/Ebizmarts/AbandonedCart/Model/Config.php
+++ b/app/code/community/Ebizmarts/AbandonedCart/Model/Config.php
@@ -90,4 +90,9 @@ class Ebizmarts_AbandonedCart_Model_Config
     const POPUP_COUPON_DISCOUNT = 'ebizmarts_abandonedcart/emailcatcher/popup_discount';
     const POPUP_COUPON_LABEL = 'ebizmarts_abandonedcart/emailcatcher/popup_couponlabel';
 
+    const GANALYTICS_ACTIVE = 'ebizmarts_abandonedcart/ganalytics/analytics_active';
+    const GANALYTICS_SOURCE = 'ebizmarts_abandonedcart/ganalytics/analytics_source';
+    const GANALYTICS_MEDIUM = 'ebizmarts_abandonedcart/ganalytics/analytics_medium';
+    const GANALYTICS_CAMPAIGN = 'ebizmarts_abandonedcart/ganalytics/analytics_campaign';
+
 }
\ No newline at end of file
diff --git a/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php b/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php
index 435081de..42df0630 100755
--- a/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php
+++ b/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php
@@ -148,7 +148,18 @@ protected function _processRun($adapter, $run, $storeId)
         } else {
             $this->sendcoupondays = Mage::getStoreConfig(Ebizmarts_AbandonedCart_Model_Config::COUPON_DAYS, $storeId);
         }
-
+        $ganalytics='';
+        if(Mage::getStoreConfig(Ebizmarts_AbandonedCart_Model_Config::GANALYTICS_ACTIVE, $storeId)) {
+            if(Mage::getStoreConfig(Ebizmarts_AbandonedCart_Model_Config::GANALYTICS_SOURCE, $storeId)!='') {
+                $ganalytics .= '&utm_source='.Mage::getStoreConfig(Ebizmarts_AbandonedCart_Model_Config::GANALYTICS_SOURCE, $storeId);
+            }
+            if(Mage::getStoreConfig(Ebizmarts_AbandonedCart_Model_Config::GANALYTICS_MEDIUM, $storeId)!='') {
+                $ganalytics .= '&utm_medium='.Mage::getStoreConfig(Ebizmarts_AbandonedCart_Model_Config::GANALYTICS_MEDIUM, $storeId);
+            }
+            if(Mage::getStoreConfig(Ebizmarts_AbandonedCart_Model_Config::GANALYTICS_CAMPAIGN, $storeId)!='') {
+                $ganalytics .= '&utm_campaign='.Mage::getStoreConfig(Ebizmarts_AbandonedCart_Model_Config::GANALYTICS_CAMPAIGN, $storeId);
+            }
+        }
         // for each cart of the current run
         foreach ($collection as $quote) {
             $this->_proccessCollection($quote, $storeId);
@@ -179,11 +190,11 @@ protected function _processRun($adapter, $run, $storeId)
             //srand((double)microtime()*1000000);
             $token = md5(rand(0, 9999999));
             if ($abTesting) {
-                $url = Mage::getModel('core/url')->setStore($storeId)->getUrl('', array('_nosid' => true)) . 'ebizmarts_abandonedcart/abandoned/loadquote?id=' . $quote->getEntityId() . '&token=' . $token . '&' . $suffix;
+                    $url = Mage::getModel('core/url')->setStore($storeId)->getUrl('', array('_nosid' => true)) . 'ebizmarts_abandonedcart/abandoned/loadquote?id=' . $quote->getEntityId() . '&token=' . $token . '&' . $suffix;
             } else {
                 $url = Mage::getModel('core/url')->setStore($storeId)->getUrl('', array('_nosid' => true)) . 'ebizmarts_abandonedcart/abandoned/loadquote?id=' . $quote->getEntityId() . '&token=' . $token;
             }
-
+            $url .= $ganalytics;
             $data = array('AbandonedURL' => $url, 'AbandonedDate' => $quote->getUpdatedAt());
 
             // send email
diff --git a/app/code/community/Ebizmarts/AbandonedCart/controllers/AbandonedController.php b/app/code/community/Ebizmarts/AbandonedCart/controllers/AbandonedController.php
index c0b27089..d74796d1 100755
--- a/app/code/community/Ebizmarts/AbandonedCart/controllers/AbandonedController.php
+++ b/app/code/community/Ebizmarts/AbandonedCart/controllers/AbandonedController.php
@@ -21,9 +21,29 @@ public function loadquoteAction()
         if (isset($params['id'])) {
             //restore the quote
 //            Mage::log($params['id']);
-
+            $analytics = array();
+            if(isset($params['utm_source'])) {
+                $analytics['utm_source'] = $params['utm_source'];
+            }
+            if(isset($params['utm_medium'])) {
+                $analytics['utm_medium'] = $params['utm_medium'];
+            }
+            if(isset($params['utm_campaign'])) {
+                $analytics['utm_campaign'] = $params['utm_campaign'];
+            }
             $quote = Mage::getModel('sales/quote')->load($params['id']);
-            $url = Mage::getStoreConfig(Ebizmarts_AbandonedCart_Model_Config::PAGE, $quote->getStoreId());
+            $url = Mage::getUrl(Mage::getStoreConfig(Ebizmarts_AbandonedCart_Model_Config::PAGE, $quote->getStoreId()));
+            $first = true;
+            foreach($analytics as $key => $value) {
+                if($first) {
+                    $char = '?';
+                    $first = false;
+                }
+                else {
+                    $char = '&';
+                }
+                $url .= "$char$key=$value";
+            }
             if (isset($params['coupon'])) {
                 $quote->setCouponCode($params['coupon']);
                 $quote->save();
@@ -32,22 +52,36 @@ public function loadquoteAction()
                 Mage::getSingleton('customer/session')->addNotice("Your token cart is incorrect");
                 $this->_redirect($url);
             } else {
-                $url = Mage::getStoreConfig(Ebizmarts_AbandonedCart_Model_Config::PAGE, $quote->getStoreId());
+                $url = Mage::getUrl(Mage::getStoreConfig(Ebizmarts_AbandonedCart_Model_Config::PAGE, $quote->getStoreId()));
+                $first = true;
+                foreach($analytics as $key => $value) {
+                    if($first) {
+                        $char = '?';
+                        $first = false;
+                    }
+                    else {
+                        $char = '&';
+                    }
+                    $url .= "$char$key=$value";
+                }
                 $quote->setEbizmartsAbandonedcartFlag(1);
                 $quote->save();
                 if (!$quote->getCustomerId()) {
                     $this->_getSession()->setQuoteId($quote->getId());
-                    $this->_redirect($url);
+                    $this->getResponse()
+                        ->setRedirect($url, 301);
                 } else {
                     if (Mage::getStoreConfig(Ebizmarts_AbandonedCart_Model_Config::AUTOLOGIN, $quote->getStoreId())) {
                         $customer = Mage::getModel('customer/customer')->load($quote->getCustomerId());
                         if ($customer->getId()) {
                             Mage::getSingleton('customer/session')->setCustomerAsLoggedIn($customer);
                         }
-                        $this->_redirect($url);
+                        $this->getResponse()
+                            ->setRedirect($url, 301);
                     } else {
                         if (Mage::helper('customer')->isLoggedIn()) {
-                            $this->_redirect($url);
+                            $this->getResponse()
+                                ->setRedirect($url, 301);
                         } else {
                             Mage::getSingleton('customer/session')->addNotice("Login to complete your order");
                             $this->_redirect('customer/account');
diff --git a/app/code/community/Ebizmarts/AbandonedCart/etc/config.xml b/app/code/community/Ebizmarts/AbandonedCart/etc/config.xml
index 4cedfb32..66f6a3bb 100755
--- a/app/code/community/Ebizmarts/AbandonedCart/etc/config.xml
+++ b/app/code/community/Ebizmarts/AbandonedCart/etc/config.xml
@@ -10,7 +10,7 @@
 <config>
     <modules>
         <Ebizmarts_AbandonedCart>
-            <version>1.2.1</version>
+            <version>1.2.2</version>
         </Ebizmarts_AbandonedCart>
     </modules>
     <global>
diff --git a/app/code/community/Ebizmarts/AbandonedCart/etc/system.xml b/app/code/community/Ebizmarts/AbandonedCart/etc/system.xml
index b54021e5..a7e1c024 100755
--- a/app/code/community/Ebizmarts/AbandonedCart/etc/system.xml
+++ b/app/code/community/Ebizmarts/AbandonedCart/etc/system.xml
@@ -964,6 +964,58 @@
                         </popup_couponlabel>
                     </fields>
                 </emailcatcher>
+                <ganalytics>
+                    <label>Google Analytics</label>
+                    <sort_order>500</sort_order>
+                    <frontend_type>text</frontend_type>
+                    <show_in_default>1</show_in_default>
+                    <show_in_website>1</show_in_website>
+                    <show_in_store>1</show_in_store>
+                    <fields>
+                        <analytics_active translate="label comment">
+                            <label>Active</label>
+                            <frontend_type>select</frontend_type>
+                            <source_model>adminhtml/system_config_source_yesno</source_model>
+                            <sort_order>510</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                        </analytics_active>
+                        <analytics_source>
+                            <label>Source</label>
+                            <frontend_type>text</frontend_type>
+                            <sort_order>520</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                            <depends>
+                                <analytics_active>1</analytics_active>
+                            </depends>
+                        </analytics_source>
+                        <analytics_medium>
+                            <label>Medium</label>
+                            <frontend_type>text</frontend_type>
+                            <sort_order>530</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                            <depends>
+                                <analytics_active>1</analytics_active>
+                            </depends>
+                        </analytics_medium>
+                        <analytics_campaign>
+                            <label>Campaing</label>
+                            <frontend_type>text</frontend_type>
+                            <sort_order>540</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                            <depends>
+                                <analytics_active>1</analytics_active>
+                            </depends>
+                        </analytics_campaign>
+                    </fields>
+                </ganalytics>
             </groups>
         </ebizmarts_abandonedcart>
     </sections>

From 18cf5c5b9480486ef53a5f72f7d0ef7b287595c9 Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Mon, 28 Mar 2016 14:06:13 -0300
Subject: [PATCH 16/41] Fixed undefined index error.

---
 app/code/community/Ebizmarts/MageMonkey/Model/Observer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php
index 6c4e062e..0ac1570d 100755
--- a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php
+++ b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php
@@ -173,7 +173,7 @@ public function saveConfig(Varien_Event_Observer $observer)
         if (isset($post['groups']['general']['fields']['additional_lists']['value'])) {
             $additionalLists = $post['groups']['general']['fields']['additional_lists']['value'];
         } else {
-            if ((string)$post['groups']['general']['fields']['additional_lists']['inherit'] == 1) {
+            if (isset($post['groups']['general']['fields']['additional_lists']['inherit']) && (string)$post['groups']['general']['fields']['additional_lists']['inherit'] == 1) {
                 $additionalLists = Mage::helper('monkey')->getAdditionalList(Mage::app()->getStore()->getId());
             }
         }

From d51d2eb523397629a7fa10dd8fc83460fe44c801 Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Tue, 29 Mar 2016 16:19:14 -0300
Subject: [PATCH 17/41] Fixed undefinded index for couponType.

---
 app/code/community/Ebizmarts/AbandonedCart/Helper/Data.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/community/Ebizmarts/AbandonedCart/Helper/Data.php b/app/code/community/Ebizmarts/AbandonedCart/Helper/Data.php
index ff1c5644..aea06c22 100755
--- a/app/code/community/Ebizmarts/AbandonedCart/Helper/Data.php
+++ b/app/code/community/Ebizmarts/AbandonedCart/Helper/Data.php
@@ -54,6 +54,9 @@ public function saveMail($mailType, $mail, $name, $couponCode, $storeId)
                 case 'by_percent':
                     $couponType = 2;
                     break;
+                default:
+                    $couponType = 0;
+                    break;
             }
         } else {
             $couponType = 0;

From 5bbce3ca568d361a163ec8481ca5e48e47588053 Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Tue, 29 Mar 2016 17:43:02 -0300
Subject: [PATCH 18/41] Added verification that store exists on config function
 at MageMonkey Helper.

---
 .../community/Ebizmarts/MageMonkey/Helper/Data.php     | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php
index df860544..6d12c0c5 100755
--- a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php
+++ b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php
@@ -203,8 +203,14 @@ public function config($value, $store = null)
                 $store = $configscope;
             }
         }
-
-        return Mage::getStoreConfig("monkey/general/$value", $store);
+        $storeExists = Mage::getModel('core/store')->load($store);
+        if ($storeExists->getId()) {
+            $ret = Mage::getStoreConfig("monkey/general/$value", $store);
+        }
+        else {
+            $ret = Mage::getStoreConfig("monkey/general/$value");
+        }
+        return $ret;
     }
 
     /**

From 1084c811e9d21dac023cd685e93437b29aba7639 Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Tue, 29 Mar 2016 17:46:57 -0300
Subject: [PATCH 19/41] closes #111

---
 app/code/community/Ebizmarts/MageMonkey/Helper/Data.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php
index 6d12c0c5..d43fd68c 100755
--- a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php
+++ b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php
@@ -205,7 +205,7 @@ public function config($value, $store = null)
         }
         $storeExists = Mage::getModel('core/store')->load($store);
         if ($storeExists->getId()) {
-            $ret = Mage::getStoreConfig("monkey/general/$value", $store);
+            $ret = Mage::getStoreConfig("monkey/general/$value", $storeExists->getId());
         }
         else {
             $ret = Mage::getStoreConfig("monkey/general/$value");

From 4a1bb1b91719fe7650ee788e3ebff025d438c45b Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Wed, 30 Mar 2016 11:14:53 -0300
Subject: [PATCH 20/41] Fixed problem for particular cases #111

---
 .../community/Ebizmarts/MageMonkey/Helper/Data.php  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php
index d43fd68c..ca3edc39 100755
--- a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php
+++ b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php
@@ -196,19 +196,20 @@ public function config($value, $store = null)
         $store = is_null($store) ? Mage::app()->getStore() : $store;
 
         $configscope = Mage::app()->getRequest()->getParam('store');
+        $ret = null;
         if ($configscope && ($configscope !== 'undefined') && !is_array($configscope)) {
             if (is_array($configscope) && isset($configscope['code'])) {
                 $store = $configscope['code'];
             } else {
                 $store = $configscope;
             }
+            $storeExists = Mage::getModel('core/store')->load($store);
+            if ($storeExists->getId()) {
+                $ret = Mage::getStoreConfig("monkey/general/$value", $storeExists->getId());
+            }
         }
-        $storeExists = Mage::getModel('core/store')->load($store);
-        if ($storeExists->getId()) {
-            $ret = Mage::getStoreConfig("monkey/general/$value", $storeExists->getId());
-        }
-        else {
-            $ret = Mage::getStoreConfig("monkey/general/$value");
+        if(!$ret){
+            $ret = Mage::getStoreConfig("monkey/general/$value", $store);
         }
         return $ret;
     }

From ed28e57963a6b213da801284123901f0d063c1ce Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Wed, 30 Mar 2016 16:26:44 -0300
Subject: [PATCH 21/41] Fix for group subscription from customer account.

---
 app/code/community/Ebizmarts/MageMonkey/Helper/Data.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php
index ca3edc39..1a846640 100755
--- a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php
+++ b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php
@@ -693,7 +693,7 @@ protected function _checkGrouping($post,$currentList, $object)
         $footerSubscription = $request->getActionName() == 'new' && $request->getControllerName() == 'subscriber' && $request->getModuleName() == 'newsletter';
         $customerSubscription = $request->getActionName() == 'saveadditional';
         $customerCreateAccountSubscription = $request->getActionName() == 'createpost';
-        if ($post && !$adminSubscription && !$customerSubscription || Mage::getSingleton('core/session')->getIsOneStepCheckout()) {
+        if ($post && !$adminSubscription || Mage::getSingleton('core/session')->getIsOneStepCheckout()) {
             $defaultList = Mage::helper('monkey')->config('list');
             //if can change customer set the groups set by customer else set the groups on MailChimp config
             $canChangeGroups = Mage::getStoreConfig('monkey/general/changecustomergroup', $object->getStoreId());

From 31d72c9ea109d41450dbad0fe05530d3d0a15859 Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Mon, 4 Apr 2016 15:07:01 -0300
Subject: [PATCH 22/41] Filter Abandoned Cart Coupons by website id when
 checking if some already exists.

---
 app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php b/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php
index cf1659a1..f9957ed3 100755
--- a/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php
+++ b/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php
@@ -392,12 +392,12 @@ protected function _sendPopupCoupon($storeId)
      */
     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('name', array('like' => 'Abandoned coupon ' . $email))
+            ->addFieldToFilter('website_ids', array('eq' => $websiteid));
         if (!count($collection)) {
 
-            $websiteid = Mage::getModel('core/store')->load($store)->getWebsiteId();
-
             $fromDate = date("Y-m-d");
             $toDate = date('Y-m-d', strtotime($fromDate . " + $this->couponexpiredays day"));
             if ($this->coupontype == 1) {

From 4c0634893eb3c415852d324f15888f1bb8c4c3e4 Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Mon, 4 Apr 2016 15:10:00 -0300
Subject: [PATCH 23/41] Filter Autoresponder Coupons by website id when
 checking if some already exists.

---
 app/code/community/Ebizmarts/Autoresponder/Model/Cron.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php b/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php
index 63fb7606..a98b97ad 100755
--- a/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php
+++ b/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php
@@ -876,15 +876,17 @@ public function cleanupBackToStock()
 
     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('name', array('like' => $string . $email))
+            ->addFieldToFilter('website_ids', array('eq' => $websiteid));
+
         if (!count($collection)) {
             $couponamount = Mage::getStoreConfig(Ebizmarts_Autoresponder_Model_Config::BIRTHDAY_DISCOUNT, $store);
             $couponexpiredays = Mage::getStoreConfig(Ebizmarts_Autoresponder_Model_Config::BIRTHDAY_EXPIRE, $store);
             $coupontype = Mage::getStoreConfig(Ebizmarts_Autoresponder_Model_Config::BIRTHDAY_DISCOUNT_TYPE, $store);
             $couponlength = Mage::getStoreConfig(Ebizmarts_Autoresponder_Model_Config::BIRTHDAY_LENGTH, $store);
             $couponlabel = Mage::getStoreConfig(Ebizmarts_Autoresponder_Model_Config::BIRTHDAY_COUPON_LABEL, $store);
-            $websiteid = Mage::getModel('core/store')->load($store)->getWebsiteId();
 
             $fromDate = date("Y-m-d");
             $toDate = date('Y-m-d', strtotime($fromDate . " + $couponexpiredays day"));

From 0327b95ad4db5270a3b8cc6a4ae9e89b582b85c1 Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Thu, 7 Apr 2016 14:43:33 -0300
Subject: [PATCH 24/41] Fixed problem with more than one bundle products on
 Abandoned Carts Recovery email.

---
 .../template/ebizmarts_abandonedcart/email/order/items.phtml     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/design/frontend/base/default/template/ebizmarts_abandonedcart/email/order/items.phtml b/app/design/frontend/base/default/template/ebizmarts_abandonedcart/email/order/items.phtml
index 39d49f81..e0061276 100755
--- a/app/design/frontend/base/default/template/ebizmarts_abandonedcart/email/order/items.phtml
+++ b/app/design/frontend/base/default/template/ebizmarts_abandonedcart/email/order/items.phtml
@@ -44,6 +44,7 @@ $_quote = $this->getQuote();
                         $bundled_items = array();
                         $label = '';
                         $qty = '';
+                        $aux_options = array();
                         foreach ($selectionCollection as $option) {
                             foreach ($options['bundle_options'] as $bundle) {
                                 if ($bundle['value'][0]['title'] == $option->getName()) {

From 8f2d29ad925f52f611c10b0fbd46fc99018ff03f Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Wed, 20 Apr 2016 17:28:29 -0300
Subject: [PATCH 25/41] Solved problem with ecommerce360 orders with different
 status than the selected one being sent.

---
 app/code/community/Ebizmarts/MageMonkey/Model/Ecommerce360.php | 3 +--
 app/code/community/Ebizmarts/MageMonkey/Model/Observer.php     | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Ecommerce360.php b/app/code/community/Ebizmarts/MageMonkey/Model/Ecommerce360.php
index 6596a7dc..a8df8d67 100755
--- a/app/code/community/Ebizmarts/MageMonkey/Model/Ecommerce360.php
+++ b/app/code/community/Ebizmarts/MageMonkey/Model/Ecommerce360.php
@@ -111,8 +111,7 @@ public function run(Varien_Event_Observer $observer)
                     ->setEmail($customerEmail)
                     ->save();
             }
-            if ((($this->_getCampaignCookie() &&
-                        $this->_getEmailCookie()) || Mage::getStoreConfig(Ebizmarts_MageMonkey_Model_Config::ECOMMERCE360_ACTIVE, $storeId) == 2 || Mage::getStoreConfig(Ebizmarts_MageMonkey_Model_Config::ECOMMERCE360_ACTIVE, $storeId) == 3) &&
+            if ((Mage::getStoreConfig(Ebizmarts_MageMonkey_Model_Config::ECOMMERCE360_ACTIVE, $storeId) == 2 || Mage::getStoreConfig(Ebizmarts_MageMonkey_Model_Config::ECOMMERCE360_ACTIVE, $storeId) == 1) &&
                 $this->isActive()
             ) {
                 $this->logSale($order);
diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php
index 0ac1570d..a4bf5d96 100755
--- a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php
+++ b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php
@@ -170,6 +170,7 @@ public function saveConfig(Varien_Event_Observer $observer)
 
         }
 
+        $additionalLists = null;
         if (isset($post['groups']['general']['fields']['additional_lists']['value'])) {
             $additionalLists = $post['groups']['general']['fields']['additional_lists']['value'];
         } else {

From 6d5006f4aa701d45fe94b71ac91ee67a20eb0ab2 Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Wed, 20 Apr 2016 17:39:46 -0300
Subject: [PATCH 26/41] Fixed

---
 app/code/community/Ebizmarts/AbandonedCart/etc/config.xml | 2 +-
 app/code/community/Ebizmarts/Autoresponder/etc/config.xml | 2 +-
 app/code/community/Ebizmarts/MageMonkey/etc/config.xml    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/community/Ebizmarts/AbandonedCart/etc/config.xml b/app/code/community/Ebizmarts/AbandonedCart/etc/config.xml
index 66f6a3bb..ab7f768f 100755
--- a/app/code/community/Ebizmarts/AbandonedCart/etc/config.xml
+++ b/app/code/community/Ebizmarts/AbandonedCart/etc/config.xml
@@ -10,7 +10,7 @@
 <config>
     <modules>
         <Ebizmarts_AbandonedCart>
-            <version>1.2.2</version>
+            <version>1.2.2.1</version>
         </Ebizmarts_AbandonedCart>
     </modules>
     <global>
diff --git a/app/code/community/Ebizmarts/Autoresponder/etc/config.xml b/app/code/community/Ebizmarts/Autoresponder/etc/config.xml
index 13dcbce2..f26d7c10 100755
--- a/app/code/community/Ebizmarts/Autoresponder/etc/config.xml
+++ b/app/code/community/Ebizmarts/Autoresponder/etc/config.xml
@@ -10,7 +10,7 @@
 <config>
     <modules>
         <Ebizmarts_Autoresponder>
-            <version>1.2.1</version>
+            <version>1.2.1.1</version>
         </Ebizmarts_Autoresponder>
     </modules>
     <global>
diff --git a/app/code/community/Ebizmarts/MageMonkey/etc/config.xml b/app/code/community/Ebizmarts/MageMonkey/etc/config.xml
index 0113c056..954afbb3 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.2</version>
+            <version>1.2.2.2</version>
         </Ebizmarts_MageMonkey>
     </modules>
     <global>

From a3548b853ddc6a344272c052f078e0a95c6aa556 Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Thu, 21 Apr 2016 11:01:15 -0300
Subject: [PATCH 27/41] Issue with afterload function when loading cart by id
 changing the updated at field solved.

---
 app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php b/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php
index f9957ed3..fb18fa96 100755
--- a/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php
+++ b/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php
@@ -211,7 +211,7 @@ protected function _processRun($adapter, $run, $storeId)
 
                 //if hour is set for first run calculates hours since cart was created else calculates days
                 $today = idate('U', strtotime(now()));
-                $updatedAt = idate('U', strtotime($quote2->getUpdatedAt()));
+                $updatedAt = idate('U', strtotime($quote->getUpdatedAt()));
                 $updatedAtDiff = ($today - $updatedAt) / 60 / 60 / 24;
                 if ($this->unit == Ebizmarts_AbandonedCart_Model_Config::IN_HOURS && $run == 0) {
                     $updatedAtDiff = ($today - $updatedAt) / 60 / 60;

From 9d453c26967369d84a226d714e1eee89a084b425 Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Tue, 3 May 2016 14:39:06 -0300
Subject: [PATCH 28/41] When customer subscribes on one store and then on
 another the MailChimp groups are added in stead of replaced.

---
 .../Ebizmarts/MageMonkey/Helper/Data.php          | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php
index 1a846640..ada3dff2 100755
--- a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php
+++ b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php
@@ -687,6 +687,7 @@ public function mergeVars($object = NULL, $includeEmail = FALSE, $currentList =
     }
     protected function _checkGrouping($post,$currentList, $object)
     {
+        $storeId = Mage::app()->getStore()->getId() ? Mage::app()->getStore()->getId() : $object->getStoreId();
         $mergeVars = array();
         $request = Mage::app()->getRequest();
         $adminSubscription = $request->getActionName() == 'save' && $request->getControllerName() == 'customer' && $request->getModuleName() == (string)Mage::getConfig()->getNode('admin/routers/adminhtml/args/frontName');
@@ -696,7 +697,7 @@ protected function _checkGrouping($post,$currentList, $object)
         if ($post && !$adminSubscription || Mage::getSingleton('core/session')->getIsOneStepCheckout()) {
             $defaultList = Mage::helper('monkey')->config('list');
             //if can change customer set the groups set by customer else set the groups on MailChimp config
-            $canChangeGroups = Mage::getStoreConfig('monkey/general/changecustomergroup', $object->getStoreId());
+            $canChangeGroups = Mage::getStoreConfig('monkey/general/changecustomergroup', $storeId);
             if (!$customerCreateAccountSubscription && $currentList && ($currentList != $defaultList || $canChangeGroups && !$footerSubscription) && isset($post['list'][$currentList])) {
                 $subscribeGroups = array(0 => array());
                 foreach ($post['list'][$currentList] as $toGroups => $value) {
@@ -707,7 +708,7 @@ protected function _checkGrouping($post,$currentList, $object)
                 }
                 $groups = NULL;
             } elseif ($currentList == $defaultList) {
-                $groups = Mage::getStoreConfig('monkey/general/cutomergroup', $object->getStoreId());
+                $groups = Mage::getStoreConfig('monkey/general/cutomergroup', $storeId);
                 $groups = explode(",", $groups);
                 if (isset($groups[0]) && $groups[0]) {
                     $subscribeGroups = array();
@@ -738,8 +739,8 @@ protected function _checkGrouping($post,$currentList, $object)
 
                 }
 
-                $force = Mage::getStoreConfig('monkey/general/checkout_subscribe', $object->getStoreId());
-                $map = Mage::getStoreConfig('monkey/general/markfield', $object->getStoreId());
+                $force = Mage::getStoreConfig('monkey/general/checkout_subscribe', $storeId);
+                $map = Mage::getStoreConfig('monkey/general/markfield', $storeId);
                 if (isset($post['magemonkey_subscribe']) && $map != "") {
                     $listsChecked = explode(',', $post['magemonkey_subscribe']);
                     $hasClicked = in_array($currentList, $listsChecked);
@@ -759,7 +760,7 @@ protected function _checkGrouping($post,$currentList, $object)
                     $mergeVars[$map] = "No";
                 }
             } else {
-                $map = Mage::getStoreConfig('monkey/general/markfield', $object->getStoreId());
+                $map = Mage::getStoreConfig('monkey/general/markfield', $storeId);
                 $mergeVars[$map] = "Yes";
             }
             if (isset($subscribeGroups[0]['id']) && $subscribeGroups[0]['id'] != -1) {
@@ -1131,10 +1132,10 @@ public function handlePost($request, $guestEmail)
 
                     $customer->setMcListId($listId);
                     $customer->setListGroups($groupings);
-                    $mergeVars = Mage::helper('monkey')->getMergeVars($customer);
+                    $mergeVars = Mage::helper('monkey')->mergeVars($customer, FALSE, $listId);
 
                     //Handle groups update
-                    $api->listUpdateMember($listId, $email, $mergeVars);
+                    $api->listUpdateMember($listId, $email, $mergeVars, 'html' ,false);
                     Mage::getSingleton('core/session')
                         ->addSuccess($this->__('Your profile has been updated!'));
 

From 408c28cccee056754a745c69f46eb65fac2ac620 Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Tue, 3 May 2016 14:43:54 -0300
Subject: [PATCH 29/41] 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 954afbb3..90f3853d 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.2.2</version>
+            <version>1.2.2.3</version>
         </Ebizmarts_MageMonkey>
     </modules>
     <global>

From d0195b8050d2605cf9e9f0c1e0708bb3b2d2cd5f Mon Sep 17 00:00:00 2001
From: gonzalo <gonzalo@ebizmarts.com>
Date: Thu, 19 May 2016 20:14:50 -0300
Subject: [PATCH 30/41] fix a typo

---
 .../template/email/ebizmarts/autoresponder/backtostock.html     | 2 +-
 .../en_US/template/email/ebizmarts/autoresponder/birthday.html  | 2 +-
 .../en_US/template/email/ebizmarts/autoresponder/neworder.html  | 2 +-
 .../template/email/ebizmarts/autoresponder/noactivity.html      | 2 +-
 .../template/email/ebizmarts/autoresponder/reviewcoupon.html    | 2 +-
 .../template/email/ebizmarts/autoresponder/visitedproducts.html | 2 +-
 .../en_US/template/email/ebizmarts/autoresponder/wishlist.html  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/locale/en_US/template/email/ebizmarts/autoresponder/backtostock.html b/app/locale/en_US/template/email/ebizmarts/autoresponder/backtostock.html
index 21fca473..0c1766c4 100755
--- a/app/locale/en_US/template/email/ebizmarts/autoresponder/backtostock.html
+++ b/app/locale/en_US/template/email/ebizmarts/autoresponder/backtostock.html
@@ -14,7 +14,7 @@
                     <!-- [ middle starts here] -->
                     <tr>
                         <td valign="top">
-                            <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Hello,
+                            <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;">Hello,
                             {{htmlescape var=$name}}</h1>
                             <p style="font-size:12px; line-height:16px; margin:0;">
 
diff --git a/app/locale/en_US/template/email/ebizmarts/autoresponder/birthday.html b/app/locale/en_US/template/email/ebizmarts/autoresponder/birthday.html
index 117854d2..ab2bd9bf 100755
--- a/app/locale/en_US/template/email/ebizmarts/autoresponder/birthday.html
+++ b/app/locale/en_US/template/email/ebizmarts/autoresponder/birthday.html
@@ -14,7 +14,7 @@
                     <!-- [ middle starts here] -->
                     <tr>
                         <td valign="top">
-                            <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Hello,
+                            <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;">Hello,
                             {{htmlescape var=$name}}</h1>
                             <p style="font-size:12px; line-height:16px; margin:0;">
 
diff --git a/app/locale/en_US/template/email/ebizmarts/autoresponder/neworder.html b/app/locale/en_US/template/email/ebizmarts/autoresponder/neworder.html
index 64e1dcd4..ad2e1b6e 100755
--- a/app/locale/en_US/template/email/ebizmarts/autoresponder/neworder.html
+++ b/app/locale/en_US/template/email/ebizmarts/autoresponder/neworder.html
@@ -14,7 +14,7 @@
                     <!-- [ middle starts here] -->
                     <tr>
                         <td valign="top">
-                            <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Hello,
+                            <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;">Hello,
                             {{htmlescape var=$name}}</h1>
                             <p style="font-size:12px; line-height:16px; margin:0;">
 
diff --git a/app/locale/en_US/template/email/ebizmarts/autoresponder/noactivity.html b/app/locale/en_US/template/email/ebizmarts/autoresponder/noactivity.html
index 91aba03c..f2abe9da 100755
--- a/app/locale/en_US/template/email/ebizmarts/autoresponder/noactivity.html
+++ b/app/locale/en_US/template/email/ebizmarts/autoresponder/noactivity.html
@@ -14,7 +14,7 @@
                     <!-- [ middle starts here] -->
                     <tr>
                         <td valign="top">
-                            <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Hello,
+                            <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;">Hello,
                             {{htmlescape var=$name}}</h1>
                             <p style="font-size:12px; line-height:16px; margin:0;">
                                 Our system detect you have no activity since {{var lastlogin}}
diff --git a/app/locale/en_US/template/email/ebizmarts/autoresponder/reviewcoupon.html b/app/locale/en_US/template/email/ebizmarts/autoresponder/reviewcoupon.html
index f014f82e..9afac91b 100755
--- a/app/locale/en_US/template/email/ebizmarts/autoresponder/reviewcoupon.html
+++ b/app/locale/en_US/template/email/ebizmarts/autoresponder/reviewcoupon.html
@@ -14,7 +14,7 @@
                     <!-- [ middle starts here] -->
                     <tr>
                         <td valign="top">
-                            <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Hello,
+                            <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;">Hello,
                             {{htmlescape var=$name}}</h1>
                             <p style="font-size:12px; line-height:16px; margin:0;">
 
diff --git a/app/locale/en_US/template/email/ebizmarts/autoresponder/visitedproducts.html b/app/locale/en_US/template/email/ebizmarts/autoresponder/visitedproducts.html
index 992dd31b..17efcbb1 100755
--- a/app/locale/en_US/template/email/ebizmarts/autoresponder/visitedproducts.html
+++ b/app/locale/en_US/template/email/ebizmarts/autoresponder/visitedproducts.html
@@ -14,7 +14,7 @@
                     <!-- [ middle starts here] -->
                     <tr>
                         <td valign="top">
-                            <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Hello,
+                            <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;">Hello,
                             {{htmlescape var=$name}}</h1>
                             <p style="font-size:12px; line-height:16px; margin:0;">
                                 Browsed products.
diff --git a/app/locale/en_US/template/email/ebizmarts/autoresponder/wishlist.html b/app/locale/en_US/template/email/ebizmarts/autoresponder/wishlist.html
index b5202abd..771a3d53 100755
--- a/app/locale/en_US/template/email/ebizmarts/autoresponder/wishlist.html
+++ b/app/locale/en_US/template/email/ebizmarts/autoresponder/wishlist.html
@@ -14,7 +14,7 @@
                     <!-- [ middle starts here] -->
                     <tr>
                         <td valign="top">
-                            <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Hello,
+                            <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;">Hello,
                             {{htmlescape var=$name}}</h1>
                             <p style="font-size:12px; line-height:16px; margin:0;">
                                 Thanks for adding new products to your wishlist.

From 237695358577c2d6f900e3627b2941c7693245a9 Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Mon, 30 May 2016 11:54:28 -0300
Subject: [PATCH 31/41] Fixed force subscription issue when POST not present.
 Fixed sender email issue for email to a friend and other similar features
 that uses customer email as sender. (Uses Magento's general email address)

---
 .gitignore                                         |  0
 .../Ebizmarts/MageMonkey/Model/Observer.php        |  2 +-
 .../Ebizmarts/Mandrill/Model/Email/Template.php    | 14 ++++++++++++++
 js/ebizmarts/magemonkey/campaignCatcher.js         |  2 +-
 4 files changed, 16 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 .gitignore

diff --git a/.gitignore b/.gitignore
old mode 100755
new mode 100644
diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php
index a4bf5d96..ca8c8d2c 100755
--- a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php
+++ b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php
@@ -370,7 +370,7 @@ public function registerCheckoutSubscribe(Varien_Event_Observer $observer)
             $force = Mage::app()->getRequest()->getPost('magemonkey_force');
 
             Mage::getSingleton('core/session')->setMonkeyPost(serialize(Mage::app()->getRequest()->getPost()));
-            if (!is_null($subscribe) || !is_null($force)) {
+            if (!is_null($subscribe) || Mage::getStoreConfig(Ebizmarts_MageMonkey_Model_Config::ECOMMERCE360_ACTIVE) >= 3) {
                 Mage::getSingleton('core/session')->setMonkeyCheckout(true);
             }
         }
diff --git a/app/code/community/Ebizmarts/Mandrill/Model/Email/Template.php b/app/code/community/Ebizmarts/Mandrill/Model/Email/Template.php
index 45da21be..578c19b7 100755
--- a/app/code/community/Ebizmarts/Mandrill/Model/Email/Template.php
+++ b/app/code/community/Ebizmarts/Mandrill/Model/Email/Template.php
@@ -82,6 +82,20 @@ public function send($email, $name = null, array $variables = array())
 
         $email['from_name'] = $this->getSenderName();
         $email['from_email'] = $this->getSenderEmail();
+        $mandrillSenders = $mail->senders->domains();
+        $senderExists = false;
+        foreach ($mandrillSenders as $sender)
+        {
+            $emailAddress = $sender['domain'];
+            if($email['from_email'] == $sender['domain'])
+            {
+                $senderExists = true;
+            }
+        }
+        if(!$senderExists)
+        {
+            $email['from_email'] = Mage::getStoreConfig('trans_email/ident_general/email');
+        }
         $headers = $mail->getHeaders();
         $headers[] = Mage::helper('ebizmarts_mandrill')->getUserAgent();
         $email['headers'] = $headers;
diff --git a/js/ebizmarts/magemonkey/campaignCatcher.js b/js/ebizmarts/magemonkey/campaignCatcher.js
index b93932c2..0c2b7575 100755
--- a/js/ebizmarts/magemonkey/campaignCatcher.js
+++ b/js/ebizmarts/magemonkey/campaignCatcher.js
@@ -1,7 +1,7 @@
 
     function getCampaign() {
         var params = location.search.substr(1).split('&');
-        var cookies = [];
+        var cookies = new Array();
         for (var i = 0; i < params.length; i++) {
             var cookie = params[i].split('=');
             var key = cookie[0];

From 086b0772b735f05a005ed48f8fcdcfcd3aa9b741 Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Mon, 30 May 2016 16:07:59 -0300
Subject: [PATCH 32/41] Updated 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 90f3853d..edd188c5 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.2.3</version>
+            <version>1.2.2.4</version>
         </Ebizmarts_MageMonkey>
     </modules>
     <global>

From 312125f707ea5468f48cfba25f20189f30702a57 Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Tue, 31 May 2016 17:28:00 -0300
Subject: [PATCH 33/41] Problem with groups not being displayed when different
 API Keys set per store view solved.

---
 .../controllers/Adminhtml/ConfigController.php    |  7 +++----
 .../magemonkey/system/config/resetlocal360.phtml  |  2 +-
 .../system/config/upgradeforpatch.phtml           | 15 +++++++++------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/code/community/Ebizmarts/MageMonkey/controllers/Adminhtml/ConfigController.php b/app/code/community/Ebizmarts/MageMonkey/controllers/Adminhtml/ConfigController.php
index 2e1b783f..c363310a 100755
--- a/app/code/community/Ebizmarts/MageMonkey/controllers/Adminhtml/ConfigController.php
+++ b/app/code/community/Ebizmarts/MageMonkey/controllers/Adminhtml/ConfigController.php
@@ -22,7 +22,7 @@ public function getGroupsAction()
         }
         $originalGroups = Mage::getStoreConfig('monkey/general/cutomergroup', $storeId);
         $originalGroups = explode(",", $originalGroups);
-        $groups = Mage::getSingleton('monkey/api')->listInterestGroupings($listId);
+        $groups = Mage::getModel('monkey/api', array('store' => $storeId))->listInterestGroupings($listId);
         $rc = array();
         if (is_array($groups)) {
             foreach ($groups as $group) {
@@ -81,9 +81,8 @@ public function upgradeForPatchAction(){
 
     protected function _getStoreByCode($storeCode)
     {
-        $stores = array_keys(Mage::app()->getStores());
-        foreach ($stores as $id) {
-            $store = Mage::app()->getStore($id);
+        $stores = Mage::app()->getStores();
+        foreach ($stores as $store) {
             if ($store->getCode() == $storeCode) {
                 return $store;
             }
diff --git a/app/design/adminhtml/default/default/template/magemonkey/system/config/resetlocal360.phtml b/app/design/adminhtml/default/default/template/magemonkey/system/config/resetlocal360.phtml
index 096622cc..5b45344e 100755
--- a/app/design/adminhtml/default/default/template/magemonkey/system/config/resetlocal360.phtml
+++ b/app/design/adminhtml/default/default/template/magemonkey/system/config/resetlocal360.phtml
@@ -16,7 +16,7 @@
     }
     function reloadGroups(evt) {
         var $list = $('monkey_general_list').getValue();
-        var $url = "<?php echo Mage::helper('adminhtml')->getUrl('adminhtml/config/getGroups'); ?>" + "list/" + $list;
+        var $url = "<?php echo Mage::helper('adminhtml')->getUrl('adminhtml/config/getGroups'); ?>" + "list/" + $list + '/store/' + "<?php echo Mage::app()->getRequest()->getParam('store'); ?>";
         new Ajax.Request($url, {
             method: 'get',
             onSuccess: function (transport) {
diff --git a/app/design/adminhtml/default/default/template/magemonkey/system/config/upgradeforpatch.phtml b/app/design/adminhtml/default/default/template/magemonkey/system/config/upgradeforpatch.phtml
index 5d0e64f6..99f010fa 100755
--- a/app/design/adminhtml/default/default/template/magemonkey/system/config/upgradeforpatch.phtml
+++ b/app/design/adminhtml/default/default/template/magemonkey/system/config/upgradeforpatch.phtml
@@ -28,12 +28,15 @@ if($this->tableExists()) {
         array('block_name' => 'ebizmarts_autoresponder/email_wishlist_items', 'is_allowed' => 1),
     );
     foreach($blocks as $item){
-        $rowExists = Mage::getResourceModel('admin/block_collection')
-            ->addFieldToFilter('block_name', array('eq' => $item['block_name']));
-        $row = $rowExists->getFirstItem();
-        if(!$row->getBlockId()){
-            echo $this->getButtonHtml();
-            return;
+        $rowExists = Mage::getResourceModel('admin/block_collection');
+        if(is_object($rowExists)) {
+            $rowExists->addFieldToFilter('block_name', array('eq' => $item['block_name']));
+
+            $row = $rowExists->getFirstItem();
+            if (!$row->getBlockId()) {
+                echo $this->getButtonHtml();
+                return;
+            }
         }
     }
 }?>
\ No newline at end of file

From 387d1988bcb73c2c06393fbdaa7dbeb9b55c273e Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Tue, 31 May 2016 17:29:39 -0300
Subject: [PATCH 34/41] Updated 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 edd188c5..b2b5d726 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.2.4</version>
+            <version>1.2.2.5</version>
         </Ebizmarts_MageMonkey>
     </modules>
     <global>

From 996f2e0173da90ba0519ed730f38efc5abcb182f Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Wed, 1 Jun 2016 15:56:29 -0300
Subject: [PATCH 35/41] Fixed getGroups problem for particular store view with
 different api key. Fixed checkout subscription issue.

---
 app/code/community/Ebizmarts/MageMonkey/Model/Observer.php    | 4 ++--
 .../MageMonkey/controllers/Adminhtml/ConfigController.php     | 2 +-
 app/code/community/Ebizmarts/MageMonkey/etc/config.xml        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php
index ca8c8d2c..bcaed1ee 100755
--- a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php
+++ b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php
@@ -370,7 +370,7 @@ public function registerCheckoutSubscribe(Varien_Event_Observer $observer)
             $force = Mage::app()->getRequest()->getPost('magemonkey_force');
 
             Mage::getSingleton('core/session')->setMonkeyPost(serialize(Mage::app()->getRequest()->getPost()));
-            if (!is_null($subscribe) || Mage::getStoreConfig(Ebizmarts_MageMonkey_Model_Config::ECOMMERCE360_ACTIVE) >= 3) {
+            if (!is_null($subscribe) || Mage::getStoreConfig(Ebizmarts_MageMonkey_Model_Config::GENERAL_CHECKOUT_SUBSCRIBE) >= 3) {
                 Mage::getSingleton('core/session')->setMonkeyCheckout(true);
             }
         }
@@ -428,7 +428,7 @@ public function registerCheckoutSuccess(Varien_Event_Observer $observer)
                     ->setEmail($order->getCustomerEmail());
             }
 
-            if(Mage::getSingleton('core/session')->getMonkeyCheckout()) {
+            if(Mage::getSingleton('core/session')->getMonkeyCheckout() || Mage::getSingleton('core/session')->getIsOneStepCheckout()) {
                 Mage::helper('monkey')->listsSubscription($toSubscribe, $saveOnDb);
             }
 
diff --git a/app/code/community/Ebizmarts/MageMonkey/controllers/Adminhtml/ConfigController.php b/app/code/community/Ebizmarts/MageMonkey/controllers/Adminhtml/ConfigController.php
index c363310a..1deb5b2b 100755
--- a/app/code/community/Ebizmarts/MageMonkey/controllers/Adminhtml/ConfigController.php
+++ b/app/code/community/Ebizmarts/MageMonkey/controllers/Adminhtml/ConfigController.php
@@ -13,7 +13,7 @@ public function getGroupsAction()
     {
         $params = $this->getRequest()->getParams();
         $listId = $params['list'];
-        if (isset($params['store'])) {
+        if (isset($params['store']) && $params['store']) {
             $store = $params['store'];
             $store = $this->_getStoreByCode($store);
             $storeId = $store->getId();
diff --git a/app/code/community/Ebizmarts/MageMonkey/etc/config.xml b/app/code/community/Ebizmarts/MageMonkey/etc/config.xml
index b2b5d726..45ee6d4d 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.2.5</version>
+            <version>1.2.2.6</version>
         </Ebizmarts_MageMonkey>
     </modules>
     <global>

From c4f4c0fd557f8bb0dcec900a30c276f8edcf2817 Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Fri, 3 Jun 2016 12:05:01 -0300
Subject: [PATCH 36/41] Magento Unsubscription email now working when removed
 from MailChimp side when configuration enabled to send Magento's email.

---
 app/code/community/Ebizmarts/MageMonkey/Model/Monkey.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Monkey.php b/app/code/community/Ebizmarts/MageMonkey/Model/Monkey.php
index 9ba951bb..98bc8617 100755
--- a/app/code/community/Ebizmarts/MageMonkey/Model/Monkey.php
+++ b/app/code/community/Ebizmarts/MageMonkey/Model/Monkey.php
@@ -215,6 +215,9 @@ protected function _unsubscribe(array $data)
 
         if ($subscriber->getId()) {
             try {
+                if(Mage::getStoreConfig(Ebizmarts_MageMonkey_Model_Config::GENERAL_CONFIRMATION_EMAIL, $subscriber->getStoreId())){
+                    $subscriber->setImportMode(true);
+                }
 
                 switch ($data['data']['action']) {
                     case 'delete' :
@@ -222,11 +225,11 @@ protected function _unsubscribe(array $data)
                         if (Mage::getStoreConfig("monkey/general/webhook_delete") == 1) {
                             $subscriber->delete();
                         } else {
-                            $subscriber->setImportMode(TRUE)->unsubscribe();
+                            $subscriber->unsubscribe();
                         }
                         break;
                     case 'unsub':
-                        $subscriber->setImportMode(TRUE)->unsubscribe();
+                        $subscriber->unsubscribe();
                         break;
                 }
             } catch (Exception $e) {

From ab76f94c28b9c414fd9c4f9d948234fde87c2455 Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Mon, 6 Jun 2016 16:02:28 -0300
Subject: [PATCH 37/41] Send correct store unsubscription email when called
 from webhook.

---
 app/code/community/Ebizmarts/MageMonkey/Helper/Data.php  | 2 +-
 app/code/community/Ebizmarts/MageMonkey/Model/Monkey.php | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php
index ada3dff2..a3838506 100755
--- a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php
+++ b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php
@@ -965,7 +965,7 @@ public function subscribeToList($object, $db, $listId = NULL, $forceSubscribe =
         }
         $alreadySubscribed = Mage::getSingleton('newsletter/subscriber')->loadByEmail($email);
         if ($listId == $defaultList && !Mage::getSingleton('core/session')->getIsHandleSubscriber() && !$forceSubscribe && (!$alreadySubscribed || !$alreadySubscribed->getId())) {
-            $subscriber->subscribe($email);
+            $subscriber->setStoreId($storeId)->subscribe($email);
         } else {
             $alreadyOnList = Mage::getSingleton('monkey/asyncsubscribers')->getCollection()
                 ->addFieldToFilter('lists', $listId)
diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Monkey.php b/app/code/community/Ebizmarts/MageMonkey/Model/Monkey.php
index 98bc8617..f2611b33 100755
--- a/app/code/community/Ebizmarts/MageMonkey/Model/Monkey.php
+++ b/app/code/community/Ebizmarts/MageMonkey/Model/Monkey.php
@@ -27,8 +27,11 @@ class Ebizmarts_MageMonkey_Model_Monkey
     public function processWebhookData(array $data)
     {
         $listId = $data['data']['list_id']; //According to the docs, the events are always related to a list_id
-        $store = Mage::helper('monkey')->getStoreByList($listId);
-
+//        $store = Mage::helper('monkey')->getStoreByList($listId);
+        $subscriber = Mage::getModel('newsletter/subscriber')
+            ->loadByEmail($data['data']['email']);
+        $storeId = $subscriber->getStoreId();
+        $store = Mage::getModel('core/store')->load($storeId);
         if (!is_null($store)) {
             $curstore = Mage::app()->getStore();
             Mage::app()->setCurrentStore($store);
@@ -215,7 +218,7 @@ protected function _unsubscribe(array $data)
 
         if ($subscriber->getId()) {
             try {
-                if(Mage::getStoreConfig(Ebizmarts_MageMonkey_Model_Config::GENERAL_CONFIRMATION_EMAIL, $subscriber->getStoreId())){
+                if(!Mage::getStoreConfig(Ebizmarts_MageMonkey_Model_Config::GENERAL_CONFIRMATION_EMAIL, $subscriber->getStoreId())){
                     $subscriber->setImportMode(true);
                 }
 

From 4a135ff1ddc24351794abbd601d2b58ba79db1e7 Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Mon, 6 Jun 2016 16:56:36 -0300
Subject: [PATCH 38/41] Fixed problem with some Magento installations with
 javascript.

---
 js/ebizmarts/autoresponders/visitedproducts.js           | 2 +-
 js/ebizmarts/autoresponders/visitedproductsstorecodes.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/ebizmarts/autoresponders/visitedproducts.js b/js/ebizmarts/autoresponders/visitedproducts.js
index fa88286d..0831c537 100755
--- a/js/ebizmarts/autoresponders/visitedproducts.js
+++ b/js/ebizmarts/autoresponders/visitedproducts.js
@@ -4,7 +4,7 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  *
  */
-(function () {
+;(function () {
     function markVisited(productID) {
         new Ajax.Request('/ebizautoresponder/autoresponder/markVisitedProducts?product_id=' + productID, {
             method: 'get',
diff --git a/js/ebizmarts/autoresponders/visitedproductsstorecodes.js b/js/ebizmarts/autoresponders/visitedproductsstorecodes.js
index d2f9d141..109e4119 100755
--- a/js/ebizmarts/autoresponders/visitedproductsstorecodes.js
+++ b/js/ebizmarts/autoresponders/visitedproductsstorecodes.js
@@ -4,7 +4,7 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  *
  */
-(function () {
+;(function () {
     function getUrl() {
         var path = window.location.toString();
         var myUrl = path.split('/')

From 1430127d113cf634e8d5d07cd880bb75fe838d1b Mon Sep 17 00:00:00 2001
From: Simon Sprankel <sprankhub@users.noreply.github.com>
Date: Mon, 13 Jun 2016 11:54:42 +0200
Subject: [PATCH 39/41] Fixed JS Issues

- `checkedLists` may not be defined, so that the `split` fails
- properly terminated statements
---
 .../template/magemonkey/checkout/subscribe.phtml      | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/design/frontend/base/default/template/magemonkey/checkout/subscribe.phtml b/app/design/frontend/base/default/template/magemonkey/checkout/subscribe.phtml
index 213426da..e679ad6d 100755
--- a/app/design/frontend/base/default/template/magemonkey/checkout/subscribe.phtml
+++ b/app/design/frontend/base/default/template/magemonkey/checkout/subscribe.phtml
@@ -11,8 +11,9 @@ $force = $this->getForce();
 
         //save old clicked lists and then removes element
         var subscribeValue = '';
+        var checkedLists = '';
         if ($('magemonkey-subscribe')) {
-            var checkedLists = $('magemonkey-subscribe').getValue();
+            checkedLists = $('magemonkey-subscribe').getValue();
             subscribeValue = checkedLists + ',';
             $('magemonkey-subscribe').remove();
         }
@@ -68,7 +69,7 @@ $force = $this->getForce();
 
         }
 
-    }
+    };
     addGroupToPost = function (element) {
 
         if (element.checked) {
@@ -90,7 +91,7 @@ $force = $this->getForce();
                 $("subscribe" + element.readAttribute('id')).remove();
             }
         }
-    }
+    };
     addElementToPost = function (element) {
         var formInputId = element.readAttribute('id') + '-serialize';
         if ($(formInputId)) {
@@ -106,7 +107,7 @@ $force = $this->getForce();
 
         Element.insert(Form.findFirstElement(payment.form), inp);
 
-    }
+    };
 </script>
 <div class="buttons-set"<?php if ($check === 3): ?> style="display:none;"<?php endif; ?>>
     <!-- General Subscription -->
@@ -267,4 +268,4 @@ $force = $this->getForce();
             addGroupToPost(group);
         });
     });
-</script>
\ No newline at end of file
+</script>

From 3fe05c79eddb6432bb9b4c01238bbab168a6f963 Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Tue, 14 Jun 2016 18:07:28 -0300
Subject: [PATCH 40/41] Fixed problem with with feed updates. Added sgps on
 checkout. Added select a list option when saving API Key for the first time.

---
 app/code/community/Ebizmarts/MageMonkey/Model/Feed/Updates.php  | 2 +-
 app/code/community/Ebizmarts/MageMonkey/Model/Observer.php      | 2 +-
 .../Ebizmarts/MageMonkey/Model/System/Config/Source/List.php    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Feed/Updates.php b/app/code/community/Ebizmarts/MageMonkey/Model/Feed/Updates.php
index 12f7cd91..c8c91f7f 100755
--- a/app/code/community/Ebizmarts/MageMonkey/Model/Feed/Updates.php
+++ b/app/code/community/Ebizmarts/MageMonkey/Model/Feed/Updates.php
@@ -111,7 +111,7 @@ protected function _getUpdates($resource)
 
             foreach ($node->xpath('items/item') as $item) {
 
-                if(!isset($item->date_end) || (time() - strtotime($item->date_end)) < 0) {
+                if(isset($item->date_end) && (time() - strtotime($item->date_end)) > 0) {
                     $feedData[] = array(
                         'severity' => (string)$item->severity,
                         'date_added' => (string)$item->created_at,
diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php
index bcaed1ee..c03d58b9 100755
--- a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php
+++ b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php
@@ -293,7 +293,7 @@ public function updateCustomer(Varien_Event_Observer $observer)
         $request = Mage::app()->getRequest();
         $isAdmin = $request->getActionName() == 'save' && $request->getControllerName() == 'customer' && $request->getModuleName() == (string)Mage::getConfig()->getNode('admin/routers/adminhtml/args/frontName');
         $customer = $observer->getEvent()->getCustomer();
-        $isCheckout = $request->getModuleName() == 'checkout' || Mage::getSingleton('core/session')->getIsOneStepCheckout() || Mage::getSingleton('core/session')->getMonkeyCheckout();
+        $isCheckout = $request->getModuleName() == 'checkout' || $request->getModuleName() == 'sgps' || Mage::getSingleton('core/session')->getIsOneStepCheckout() || Mage::getSingleton('core/session')->getMonkeyCheckout();
 //        $isConfirmNeed = FALSE;
 //        if (!Mage::helper('monkey')->isAdmin() &&
 //            (Mage::getStoreConfig(Mage_Newsletter_Model_Subscriber::XML_PATH_CONFIRMATION_FLAG, $customer->getStoreId()) == 1)
diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/List.php b/app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/List.php
index f7428764..1638bb0c 100755
--- a/app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/List.php
+++ b/app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/List.php
@@ -46,7 +46,7 @@ public function toOptionArray()
         $lists = array();
 
         if (is_array($this->_lists)) {
-
+            $lists[] = array('value' => '', 'label' => Mage::helper('monkey')->__('--- Select a list ---'));
             foreach ($this->_lists['data'] as $list) {
                 $lists [] = array('value' => $list['id'], 'label' => $list['name'] . ' (' . $list['stats']['member_count'] . ' ' . Mage::helper('monkey')->__('members') . ')');
             }

From 2031caafff2d5ba37b51fdc14c2bbe2b472f222c Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Thu, 16 Jun 2016 15:46:39 -0300
Subject: [PATCH 41/41] Replaced obeserver to save post on checkout. Updated
 module version.

---
 app/code/community/Ebizmarts/MageMonkey/etc/config.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/community/Ebizmarts/MageMonkey/etc/config.xml b/app/code/community/Ebizmarts/MageMonkey/etc/config.xml
index 45ee6d4d..bbe6849b 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.2.6</version>
+            <version>1.2.3</version>
         </Ebizmarts_MageMonkey>
     </modules>
     <global>
@@ -143,14 +143,14 @@
                     </monkey_subscribe_checkout>
                 </observers>
             </controller_action_predispatch_onestepcheckout_index_index>
-            <controller_action_postdispatch_checkout_onepage_saveOrder>
+            <sales_order_place_before>
                 <observers>
                     <monkey_subscribe_checkout>
                         <class>monkey/observer</class>
                         <method>registerCheckoutSubscribe</method>
                     </monkey_subscribe_checkout>
                 </observers>
-            </controller_action_postdispatch_checkout_onepage_saveOrder>
+            </sales_order_place_before>
             <checkout_onepage_controller_success_action>
                 <observers>
                     <monkey_subscribe_checkoutsuccess>