Changeset 2760263

Timestamp:

07/22/2022 12:59:40 PM (4 years ago)

Author:

newsmanapp

Message:

updates:

Location:

newsmanapp/trunk

Files:

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

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

@@ -160 +160 @@
 
         $ga_snippet_head = "
-        //Newsman remarketing tracking code             
+
+        //Newsman remarketing tracking code REPLACEABLE
+
+        var remarketingid = '$remarketingid';
+        var _nzmPluginInfo = '2.3.8:woocommerce';
+        
+        //Newsman remarketing tracking code REPLACEABLE
+
+        //Newsman remarketing tracking code  
+
         var endpoint = 'https://retargeting.newsmanapp.com';
         var remarketingEndpoint = endpoint + '/js/retargeting/track.js';
-        var remarketingid = '$remarketingid';
-
-        var _nzmPluginInfo = '2.3.7:woocommerce';
+
         var _nzm = _nzm || [];
         var _nzm_config = _nzm_config || [];
@@ -193 +200 @@
         //Newsman remarketing tracking code     
 
+        //Newsman remarketing auto events REPLACEABLE
+
+        var ajaxurl = 'https://' + document.location.hostname + '?newsman=getCart.json';
+
+        //Newsman remarketing auto events REPLACEABLE
+
         //Newsman remarketing auto events
 
-        let _nzmIsProd = true;
+        var isProd = true;
 
         let lastCart = sessionStorage.getItem('lastCart');
         if (lastCart === null)
-            lastCart = {};
+            lastCart = {};
 
         var lastCartFlag = false;
@@ -205 +218 @@
         var bufferedXHR = false;
         var unlockClearCart = true;
-        var ajaxurl = '" . get_site_url() . "?newsman=getCart.json';
-        var documentComparer = '" . get_site_url() . "/';
+        var isError = false;
+        var documentComparer = document.location.hostname;
         var documentUrl = document.URL;
         var sameOrigin = (documentUrl.indexOf(documentComparer) !== -1);
 
-        let startTime, endTime;
-        let retryS = 5;
-        var errorFirstLoad = true;
+        let startTime, endTime;
 
         function startTimePassed() {
@@ -221 +232 @@
 
         function endTimePassed() {
-
-            var flag = true;
+            var flag = false;
 
             endTime = new Date();
@@ -231 +241 @@
             var seconds = Math.round(timeDiff);
 
-            if(errorFirstLoad)
-                return true;
-
-            if (seconds < retryS)
-                flag = false;
+            if (firstLoad)
+                flag = true;
+
+            if (seconds >= 5)
+                flag = true;
 
             return flag;
@@ -247 +257 @@
         }
 
+        function timestamp(min, max) {
+            min = Math.ceil(min);
+            max = Math.floor(max);
+            return Math.floor(Math.random() * (max - min + 1)) + min;
+        }
+
         function NewsmanAutoEvents() {
 
             if (!endTimePassed())
-            {
-                if (!_nzmIsProd)
-                console.log('newsman remarketing: endTimePassed false, exit execution');
-
                 return;
+
+            if (isError && isProd == true) {
+                console.log('newsman remarketing: an error occurred, set isProd = false in console, script execution stopped;');
+
+                return;
             }
 
@@ -261 +278 @@
             if (bufferedXHR || firstLoad) {
 
-                xhr.open('GET', ajaxurl, true);
+                var paramChar = '?t=';
+
+                if (ajaxurl.indexOf('?') >= 0)
+                    paramChar = '&t=';
+
+                var timestamp = paramChar + Date.now() + this.timestamp(999, 999999999);
+
+                xhr.open('GET', ajaxurl + timestamp, true);
 
                 startTimePassed();
@@ -269 +293 @@
                     if (xhr.status == 200 || xhr.status == 201) {
 
-                        try{
+                        try {
                             var response = JSON.parse(xhr.responseText);
+                        } catch (error) {
+                            if (!isProd)
+                                console.log('newsman remarketing: error occured json parsing response');
+
+                            isError = true;
+
+                            return;
                         }
-                        catch(ex)
-                        {
-                            retryS += 5;
-
-                            errorFirstLoad = false;
-
-                            if (!_nzmIsProd)
-                            {
-                                    console.log('newsman remarketing: error occurred on parsing xhr');
-                                    console.log('newsman remarketing: error: ' + ex);
-                            }
-
-                            return;
-                        }                   
 
                         lastCart = JSON.parse(sessionStorage.getItem('lastCart'));
@@ -295 +312 @@
                         if (lastCart.length > 0 && lastCart != null && lastCart != undefined && response.length > 0 && response != null && response != undefined) {
                             if (JSON.stringify(lastCart) === JSON.stringify(response)) {
-                                if (!_nzmIsProd)
+                                if (!isProd)
                                     console.log('newsman remarketing: cache loaded, cart is unchanged');
 
@@ -302 +319 @@
                                 lastCartFlag = false;
 
-                                if (!_nzmIsProd)
+                                if (!isProd)
                                     console.log('newsman remarketing: cache loaded, cart is changed');
                             }
@@ -317 +334 @@
                             clearCart();
 
-                            if (!_nzmIsProd)
+                            if (!isProd)
                                 console.log('newsman remarketing: clear cart sent');
 
                         } else {
 
-                            if (!_nzmIsProd)
+                            if (!isProd)
                                 console.log('newsman remarketing: request not sent');
 
                         }
 
+                        firstLoad = false;
+                        bufferedXHR = false;
+
+                    } else {
+                        if (!isProd)
+                            console.log('newsman remarketing: response http status code is not 200');
+
+                        isError = true;
                     }
 
-                    firstLoad = false;
-                    bufferedXHR = false;
-                    errorFirstLoad = false;
-
                 }
 
@@ -338 +359 @@
 
             } else {
-                if (!_nzmIsProd)
-                    console.log('newsman remarketing: !buffered xhr || !first load');
+                if (!isProd)
+                    console.log('newsman remarketing: !buffered xhr || first load');
             }
 
@@ -358 +379 @@
 
             _nzm.run('ec:setAction', 'clear_cart');
-
-            try{
-
-                _nzm.run('send', 'event', 'detail view', 'click', 'clearCart', null, _nzm.createFunctionWithTimeout(function() {
-
-                    for (var item in response) {
-
-                        _nzm.run('ec:addProduct',
-                            response[item]
-                        );
-
-                    }
-
-                    _nzm.run('ec:setAction', 'add');
-                    _nzm.run('send', 'event', 'UX', 'click', 'add to cart');
-
-                    sessionStorage.setItem('lastCart', JSON.stringify(response));
-                    unlockClearCart = true;
-
-                    if (!_nzmIsProd)
-                        console.log('newsman remarketing: cart sent');
-
-                }));
-
-            }
-            catch(ex){
-
-                retryS += 5;
-
-                errorFirstLoad = false;
-
-                if (!_nzmIsProd)
-                {
-                        console.log('newsman remarketing: add to cart failed, error loading tracking code (adblock, or other problem)');
-                        console.log('newsman remarketing: error: ' + ex);
+            _nzm.run('send', 'event', 'detail view', 'click', 'clearCart', null, _nzm.createFunctionWithTimeout(function() {
+
+                for (var item in response) {
+
+                    _nzm.run('ec:addProduct',
+                        response[item]
+                    );
+
                 }
 
-            }
+                _nzm.run('ec:setAction', 'add');
+                _nzm.run('send', 'event', 'UX', 'click', 'add to cart');
+
+                sessionStorage.setItem('lastCart', JSON.stringify(response));
+                unlockClearCart = true;
+
+                if (!isProd)
+                    console.log('newsman remarketing: cart sent');
+
+            }));
 
         }
@@ -416 +419 @@
                     //own request exclusion
                     if (
-                        pointer.responseURL.indexOf('getCart.json') >= 0 ||
-                        //magento 2-2.3.x
-                        pointer.responseURL.indexOf('/static/') >= 0 ||
-                        pointer.responseURL.indexOf('/pub/static') >= 0 ||
-                        pointer.responseURL.indexOf('/customer/section') >= 0 ||
-                        //opencart 1
-                        pointer.responseURL.indexOf('getCart=true') >= 0
+                                    pointer.responseURL.indexOf('getCart.json') >= 0 ||
+                                    //magento 2.x
+                                    pointer.responseURL.indexOf('/static/') >= 0 ||
+                                    pointer.responseURL.indexOf('/pub/static') >= 0 ||
+                                    pointer.responseURL.indexOf('/customer/section') >= 0 ||
+                                    //opencart 1
+                                    pointer.responseURL.indexOf('getCart=true') >= 0
                     ) {
                         validate = false;
@@ -433 +436 @@
                         bufferedXHR = true;
 
-                        if (!_nzmIsProd)
+                        if (!isProd)
                             console.log('newsman remarketing: ajax request fired and catched from same domain');
 

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.7
+Version: 2.3.8
 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.7
+ * Version: 2.3.8
  * WC requires at least: 2.1
  * WC tested up to: 4.1
@@ -80 +80 @@
                                                     
                          }                                                          
-
-                        $this->_json($prod);
-                        return;
+ 
+                         header("Cache-Control: no-store, no-cache, must-revalidate, max-age=0");
+                         header("Cache-Control: post-check=0, pre-check=0", false);
+                         header("Pragma: no-cache");
+                         header('Content-Type:application/json');
+                         echo json_encode($prod, JSON_PRETTY_PRINT);
+                         exit;
 
                         break;