Merge branch 'develop' into santisp_dev

ebizmarts · Sep 8, 2016 · b5ef7d7 · b5ef7d7
2 parents 9832416 + 2ff3a7b
commit b5ef7d7
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 21 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.5</version>
+            <version>1.2.6</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
@@ -33,36 +33,46 @@ public function send()
                     if (Mage::getStoreConfig(Ebizmarts_Mandrill_Model_System_Config::ENABLE, $storeId)) {
                         $parameters = new Varien_Object($message->getMessageParameters());
                         $mailer = $this->getMail($storeId);
-                        $mandrill = array(
-                            'subject' => $parameters->getSubject(),
-                            'to' => array(),
-                            'from_email' => $parameters->getFromEmail(),
-                            'from_name' => $parameters->getFromName(),
-                            'headers' => $mailer->getHeaders(),
-                            'html' => ($parameters->getIsPlain() ? "" : $message->getMessageBody()),
-                            'text' => ($parameters->getIsPlain() ? $message->getMessageBody() : ""),
-                        );
+                        $mailer->setFrom($parameters->getFromEmail(),$parameters->getFromName());
+                        $mailer->setSubject($parameters->getSubject());
+                        if ($parameters->getIsPlain()) {
+                            $mailer->setBodyText($message->getMessageBody());
+                        } else {
+                            $mailer->setBodyHtml($message->getMessageBody());
+                        }
                         foreach ($message->getRecipients() as $recipient) {
                             list($email, $name, $type) = $recipient;
-                            $mandrill['to'][] = array(
-                                'type' => ($type == self::EMAIL_TYPE_BCC ? "bcc" : "to"),
-                                'email' => $email,
-                                'name' => $name
-                            );
+                            switch ($type) {
+                                case self::EMAIL_TYPE_TO:
+                                case self::EMAIL_TYPE_CC:
+                                    $mailer->addTo($email,$name);
+                                    break;
+                                case self::EMAIL_TYPE_BCC:
+                                    $mailer->addBcc($email);
+                                    break;
+                            }
                         }
                         if ($parameters->getReplyTo() !== null) {
-                            $mandrill['headers'] = array_merge($mandrill['headers'], array('Reply-To' => $parameters->getReplyTo()));
+                            $mailer->setReplyTo($parameters->getReplyTo());
                         }
                         if ($parameters->getReturnTo() !== null) {
                             $mailer->setReturnPath($parameters->getReturnTo());
                         }
                         try {
-                            $mailer->messages->send($mandrill);
+                            Mage::dispatchEvent(
+                                'fooman_emailattachments_before_send_queue',
+                                array(
+                                    'mailer'         => $mailer,
+                                    'message'        => $message,
+                                    'mail_transport' => false
+
+                                )
+                            );
+                            $mailer->send();
                         } catch (Exception $e) {
                             Mage::logException($e);
                         }
                         unset($mailer);
-                        unset($mandrill);
                         $message->setProcessedAt(Varien_Date::formatDate(true));
                         $message->save();
                     } else {

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.10</version>
+            <version>2.0.11</version>
         </Ebizmarts_Mandrill>
     </modules>
     <global>

diff --git a/js/ebizmarts/magemonkey/campaignCatcher.js b/js/ebizmarts/magemonkey/campaignCatcher.js
@@ -21,7 +21,6 @@ function getCampaign() {
 function createCookie(name, value, expirationInSec) {
     var now = new Date();
     var expire = new Date(now.getTime() + (expirationInSec * 1000));//[(1 * 365 * 24 * 60) * 60000] == 1 year  -- (Years * Days * Hours * Minutes) * 60000
-    alert('creating cookie');
     Mage.Cookies.expires = expire;
     Mage.Cookies.set(name,value);
 }
@@ -30,4 +29,4 @@ if (document.loaded) {
     getCampaign;
 } else {
     document.observe('dom:loaded', getCampaign);
-}
+}