Problem with mixed emails sent when made simultaneously on checkout s…

…olved. closes#147
ebizmarts · Sep 13, 2016 · baac9ab · baac9ab · Santiagoebizmarts · Sep 13, 2016
1 parent 21e9d7e
commit baac9ab
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/app/code/community/Ebizmarts/MageMonkey/etc/config.xml b/app/code/community/Ebizmarts/MageMonkey/etc/config.xml
@@ -10,7 +10,7 @@
 <config>
     <modules>
         <Ebizmarts_MageMonkey>
-            <version>1.2.6</version>
+            <version>1.2.6.1</version>
         </Ebizmarts_MageMonkey>
     </modules>
     <global>

diff --git a/app/code/community/Ebizmarts/Mandrill/Model/Email/Queue.php b/app/code/community/Ebizmarts/Mandrill/Model/Email/Queue.php
@@ -137,12 +137,9 @@ public function getMail($storeId)
         if (!Mage::getStoreConfig(Ebizmarts_Mandrill_Model_System_Config::ENABLE, $storeId)) {
             return parent::getMail();
         }
-        if ($this->_mail) {
-            return $this->_mail;
-        } else {
-            Mage::helper('ebizmarts_mandrill')->log("store: $storeId API: " . Mage::getStoreConfig(Ebizmarts_Mandrill_Model_System_Config::APIKEY, $storeId));
-            $this->_mail = new Mandrill_Message(Mage::getStoreConfig(Ebizmarts_Mandrill_Model_System_Config::APIKEY, $storeId));
-            return $this->_mail;
-        }
+
+        Mage::helper('ebizmarts_mandrill')->log("store: $storeId API: " . Mage::getStoreConfig(Ebizmarts_Mandrill_Model_System_Config::APIKEY, $storeId));
+        $this->_mail = new Mandrill_Message(Mage::getStoreConfig(Ebizmarts_Mandrill_Model_System_Config::APIKEY, $storeId));
+        return $this->_mail;
     }
 }
diff --git 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.11</version>
+            <version>2.0.12</version>
         </Ebizmarts_Mandrill>
     </modules>
     <global>