Merge pull request #558 from mailchimp/Issue554-2.3

Issue554 2.3
mailchimp · Jan 18, 2019 · 34d54dc · 34d54dc
2 parents 2e03754 + bd0f5bc
commit 34d54dc
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 13 deletions.
diff --git a/etc/di.xml b/etc/di.xml
@@ -11,6 +11,12 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Quote\Model\Quote">
+        <plugin name="mailchimp-save-quote" type="Ebizmarts\MailChimp\Model\Plugin\Quote" sortOrder="10"/>
+    </type>
+    <type name="Magento\Newsletter\Controller\Manage\Save">
+        <plugin name="mailchimp-account-interest-group" type="Ebizmarts\MailChimp\Model\Plugin\Newsletter\Save" sortOrder="10"/>
+    </type>
     <type name="Ebizmarts\MailChimp\Model\Logger\Handler">
         <arguments>
             <argument name="filesystem" xsi:type="object">Magento\Framework\Filesystem\Driver\File</argument>

diff --git a/etc/events.xml b/etc/events.xml
@@ -14,6 +14,9 @@
     <event name="sales_model_service_quote_submit_before">
         <observer name="mailchimp_sales_model_service_quote_submit_before" instance="\Ebizmarts\MailChimp\Observer\Sales\Order\SubmitBefore" />
     </event>
+    <event name="sales_model_service_quote_submit_success">
+        <observer name="mailchimp_sales_model_service_quote_submit_after" instance="\Ebizmarts\MailChimp\Observer\Sales\Order\SubmitAfter" />
+    </event>
     <event name="customer_save_before">
         <observer name="mailchimp_customer_save_before" instance="\Ebizmarts\MailChimp\Observer\Customer\SaveBefore" />
     </event>

diff --git a/view/frontend/web/js/campaigncatcher.js b/view/frontend/web/js/campaigncatcher.js
@@ -18,26 +18,42 @@ define(
         $.widget('mage.campaigncatcher', {
             _init: function () {
                 $(document).ready(function () {
-                    var urlparams = location.search.substr(1).split('&');
-                    var params = new Array();
+                    var path = location;
+                    var urlparams = null;
+                    var isGet = path.search.search('&');
                     var mc_cid = null;
                     var isMailchimp = false;
-                    for (var i = 0; i < urlparams.length; i++) {
-                        var param = urlparams[i].split('=');
-                        var key = param[0];
-                        var val = param[1];
-                        if (key && val) {
-                            params[key] = val;
-                        }
+                    if(isGet > 0) {
+                        urlparams = path.search.substr(1).split('&');
+                        for (var i = 0; i < urlparams.length; i++) {
+                            var param = urlparams[i].split('=');
+                            var key = param[0];
+                            var val = param[1];
 
-                        if (key=='utm_source') {
+                            if (key=='utm_source') {
+                                var reg = /^mailchimp$/;
+                                if (reg.exec(val)) {
+                                    isMailchimp = true;
+                                }
+                            } else {
+                                if (key=='mc_cid') {
+                                    mc_cid = val;
+                                }
+                            }
+                        }
+                    } else {
+                        urlparams = path.pathname.split('/');
+                        var utmIndex = $.inArray('utm_source', urlparams);
+                        var mccidIndex = $.inArray('mc_cid', urlparams);
+                        if (utmIndex != -1) {
+                            var value = urlparams[utmIndex + 1];
                             var reg = /^mailchimp$/;
-                            if (reg.exec(val)) {
+                            if (reg.exec(value)) {
                                 isMailchimp = true;
                             }
                         } else {
-                            if (key=='mc_cid') {
-                                mc_cid = val;
+                            if (mccidIndex != -1) {
+                                mc_cid = urlparams[mccidIndex + 1];
                             }
                         }
                     }