Changeset 2761915

Timestamp:

07/26/2022 04:09:47 PM (3 years ago)

Author:

newsmanapp

Message:

improvements

Location:

newsmanapp/trunk

Files:

• includes/class-wc-newsman-remarketing-js.php (modified) (9 diffs)
• newsmanapp.php (modified) (1 diff)
• wc-newsman-remarketing.php (modified) (1 diff)

newsmanapp/trunk/includes/class-wc-newsman-remarketing-js.php

@@ -164 +164 @@
 
         var remarketingid = '$remarketingid';
-        var _nzmPluginInfo = '2.3.8:woocommerce';
+        var _nzmPluginInfo = '2.3.9:woocommerce';
         
         //Newsman remarketing tracking code REPLACEABLE
@@ -194 +194 @@
             script_dom.setAttribute('data-site-id', remarketingid);
             script_dom.src = remarketingEndpoint;
+            //check for engine name
+            if (_nzmPluginInfo.indexOf('shopify') !== -1) {
+                script_dom.onload = function(){
+                    if (typeof newsmanRemarketingLoad === 'function')
+                        newsmanRemarketingLoad();
+                }
+            }
             s.parentNode.insertBefore(script_dom, s);
         })();
@@ -257 +264 @@
         }
 
-        function timestamp(min, max) {
+        function timestampGenerator(min, max) {
             min = Math.ceil(min);
             max = Math.floor(max);
@@ -266 +273 @@
 
             if (!endTimePassed())
+            {
+                if (!isProd)
+                    console.log('newsman remarketing: execution stopped at the beginning, 5 seconds didn\"t pass between requests');
+
                 return;
+            }
 
             if (isError && isProd == true) {
@@ -278 +290 @@
             if (bufferedXHR || firstLoad) {
 
-                var paramChar = '?t=';
-
-                if (ajaxurl.indexOf('?') >= 0)
-                    paramChar = '&t=';
-
-                var timestamp = paramChar + Date.now() + this.timestamp(999, 999999999);
-
+            var paramChar = '?t=';
+
+            if (ajaxurl.indexOf('?') >= 0)
+                paramChar = '&t=';
+
+            var timestamp = paramChar + Date.now() + timestampGenerator(999, 999999999);
+
+            try{
                 xhr.open('GET', ajaxurl + timestamp, true);
+            }
+            catch(ex){
+                if (!isProd)
+                console.log('newsman remarketing: malformed XHR url');
+
+                isError = true;
+            }
 
                 startTimePassed();
@@ -304 +324 @@
                         }
 
+                        //check for engine name
+                        if (_nzmPluginInfo.indexOf('shopify') !== -1) {
+
+                            var products = [];
+
+                            if(response.item_count > 0)
+                            {
+                                response.items.forEach(function(item){
+                                
+                                    products.push(
+                                        {
+                                            'id': item.id,
+                                            'name': item.product_title,
+                                            'quantity': item.quantity,
+                                            'price': item.price
+                                        }
+                                    );
+
+                                });
+                            }
+
+                            response = products;
+                        }
+
                         lastCart = JSON.parse(sessionStorage.getItem('lastCart'));
 
@@ -356 +400 @@
                 }
 
-                xhr.send(null);
+                try{
+                    xhr.send(null);
+                }
+                catch(ex){
+                    if (!isProd)
+                    console.log('newsman remarketing: error on xhr send');
+
+                isError = true;
+                }
 
             } else {
@@ -419 +471 @@
                     //own request exclusion
                     if (
-                                    pointer.responseURL.indexOf('getCart.json') >= 0 ||
+                                    _location.indexOf('getCart.json') >= 0 ||
                                     //magento 2.x
-                                    pointer.responseURL.indexOf('/static/') >= 0 ||
-                                    pointer.responseURL.indexOf('/pub/static') >= 0 ||
-                                    pointer.responseURL.indexOf('/customer/section') >= 0 ||
+                                    _location.indexOf('/static/') >= 0 ||
+                                    _location.indexOf('/pub/static') >= 0 ||
+                                    _location.indexOf('/customer/section') >= 0 ||
                                     //opencart 1
-                                    pointer.responseURL.indexOf('getCart=true') >= 0
+                                    _location.indexOf('getCart=true') >= 0 ||
+                                    //shopify
+                                    _location.indexOf('cart.js') >= 0
                     ) {
                         validate = false;
                     } else {
-                        if (_location.indexOf(window.location.origin) !== -1)
+                        //check for engine name
+                        if (_nzmPluginInfo.indexOf('shopify') !== -1) {
                             validate = true;
+                        }
+                        else{
+                            if (_location.indexOf(window.location.origin) !== -1)
+                            validate = true;
+                        }
                     }
- 
+
                     if (validate) {
                         bufferedXHR = true;
@@ -451 +511 @@
         }
 
-         //Newsman remarketing auto events
+        //Newsman remarketing auto events
         ";
         

newsmanapp/trunk/newsmanapp.php

@@ -5 +5 @@
 Plugin URI: https://github.com/Newsman/WP-Plugin-NewsmanApp
 Description: NewsmanApp for Wordpress (sign up widget, subscribers sync, create and send newsletters from blog posts)
-Version: 2.3.8
+Version: 2.3.9
 Author: Newsman
 Author URI: https://www.newsman.com

newsmanapp/trunk/wc-newsman-remarketing.php

@@ -6 +6 @@
  * Author: Newsman
  * Author URI: https://newsman.com
- * Version: 2.3.8
+ * Version: 2.3.9
  * WC requires at least: 2.1
  * WC tested up to: 4.1