Changeset 2900108

Timestamp:

04/17/2023 10:29:07 AM (3 years ago)

Author:

workshopbutlers

Message:

Update to version 3.2 from GitHub

Location:

workshop-butler

Files:

• tags/3.2 (copied) (copied from workshop-butler/trunk)
• tags/3.2/public/js/registration-page.js (modified) (1 diff)
• tags/3.2/readme.txt (modified) (2 diffs)
• tags/3.2/workshop-butler.php (modified) (2 diffs)
• trunk/public/js/registration-page.js (modified) (1 diff)
• trunk/readme.txt (modified) (2 diffs)
• trunk/workshop-butler.php (modified) (2 diffs)

workshop-butler/tags/3.2/public/js/registration-page.js

@@ -5 +5 @@
  */
 function submitGaEvent() {
-    let wsb_ga_key = wsb_ga.google_analytics_key;
-
-    if (wsb_ga_key !== '') {
-        if (typeof ga === 'function') {
-
-            ga('create', wsb_ga_key, 'auto');
-            ga('send', 'event', 'Registration Completed', 'submit');
-
-        } else {
-
-            (function (i, s, o, g, r, a, m) {
-                i['GoogleAnalyticsObject'] = r;
-                i[r] = i[r] || function () {
-                    (i[r].q = i[r].q || []).push(arguments)
-                }, i[r].l = 1 * new Date();
-                a = s.createElement(o),
-                    m = s.getElementsByTagName(o)[0];
-                a.async = 1;
-                a.src = g;
-                m.parentNode.insertBefore(a, m)
-            })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
-
-            ga('create', wsb_ga_key, 'auto');
-            ga('send', 'event', 'Registration Completed', 'submit');
-        }
-    }
+    const wsb_ga_key = wsb_ga.google_analytics_key;
+
+    if (!wsb_ga_key) {
+    return;
+  }
+
+  if (typeof ga === 'function') {
+    ga('create', wsb_ga_key, 'auto', 'wsbIntegration');
+    ga('wsbIntegration.send', 'event', 'Registration Completed', 'submit');
+    return;
+  }
+
+  // check if google tag manager is initialized
+  if (typeof window.dataLayer !== 'object') {
+    return;
+  }
+
+  if (typeof gtag !== 'function') {
+    function gtag(){dataLayer.push(arguments);}
+  }
+
+  gtag('event', 'submit', {
+    'send_to': wsb_ga_key,
+    'event_category': 'Registration Completed'
+  });
+
 }
 

workshop-butler/tags/3.2/readme.txt

@@ -3 +3 @@
 Tags: event management, training management, event schedule, workshop crm, online registrations
 Requires at least: 5.5
-Tested up to: 6.1
-Stable tag: 3.1.9
+Tested up to: 6.2
+Stable tag: 3.2
 Requires PHP: 7.2.5
 License: GPLv2 or later
@@ -70 +70 @@
 
 == Changelog ==
+= 3.2 =
+* Update compatibility up to WP 6.2
+* Add Google Analytics 4 support
+* Do not load the GA analytics script any further; it should be loaded externally.
+
 = 3.1.9 =
 * Fix compatibility issue with ReduxFramework

workshop-butler/tags/3.2/workshop-butler.php

@@ -12 +12 @@
  * Description:       This plugin integrates Workshop Butler Events, Trainers and Testimonials to your WordPress
  *     website.
- * Version:           3.1.9
+ * Version:           3.2
  * Author:            Workshop Butler
  * Author URI:        https://workshopbutler.com/
@@ -37 +37 @@
  * Currently plugin version.
  */
-define( 'WSB_INTEGRATION_VERSION', '3.1.9' );
+define( 'WSB_INTEGRATION_VERSION', '3.2' );
 
 /**

workshop-butler/trunk/public/js/registration-page.js

@@ -5 +5 @@
  */
 function submitGaEvent() {
-    let wsb_ga_key = wsb_ga.google_analytics_key;
-
-    if (wsb_ga_key !== '') {
-        if (typeof ga === 'function') {
-
-            ga('create', wsb_ga_key, 'auto');
-            ga('send', 'event', 'Registration Completed', 'submit');
-
-        } else {
-
-            (function (i, s, o, g, r, a, m) {
-                i['GoogleAnalyticsObject'] = r;
-                i[r] = i[r] || function () {
-                    (i[r].q = i[r].q || []).push(arguments)
-                }, i[r].l = 1 * new Date();
-                a = s.createElement(o),
-                    m = s.getElementsByTagName(o)[0];
-                a.async = 1;
-                a.src = g;
-                m.parentNode.insertBefore(a, m)
-            })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
-
-            ga('create', wsb_ga_key, 'auto');
-            ga('send', 'event', 'Registration Completed', 'submit');
-        }
-    }
+    const wsb_ga_key = wsb_ga.google_analytics_key;
+
+    if (!wsb_ga_key) {
+    return;
+  }
+
+  if (typeof ga === 'function') {
+    ga('create', wsb_ga_key, 'auto', 'wsbIntegration');
+    ga('wsbIntegration.send', 'event', 'Registration Completed', 'submit');
+    return;
+  }
+
+  // check if google tag manager is initialized
+  if (typeof window.dataLayer !== 'object') {
+    return;
+  }
+
+  if (typeof gtag !== 'function') {
+    function gtag(){dataLayer.push(arguments);}
+  }
+
+  gtag('event', 'submit', {
+    'send_to': wsb_ga_key,
+    'event_category': 'Registration Completed'
+  });
+
 }
 

workshop-butler/trunk/readme.txt

@@ -3 +3 @@
 Tags: event management, training management, event schedule, workshop crm, online registrations
 Requires at least: 5.5
-Tested up to: 6.1
-Stable tag: 3.1.9
+Tested up to: 6.2
+Stable tag: 3.2
 Requires PHP: 7.2.5
 License: GPLv2 or later
@@ -70 +70 @@
 
 == Changelog ==
+= 3.2 =
+* Update compatibility up to WP 6.2
+* Add Google Analytics 4 support
+* Do not load the GA analytics script any further; it should be loaded externally.
+
 = 3.1.9 =
 * Fix compatibility issue with ReduxFramework

workshop-butler/trunk/workshop-butler.php

@@ -12 +12 @@
  * Description:       This plugin integrates Workshop Butler Events, Trainers and Testimonials to your WordPress
  *     website.
- * Version:           3.1.9
+ * Version:           3.2
  * Author:            Workshop Butler
  * Author URI:        https://workshopbutler.com/
@@ -37 +37 @@
  * Currently plugin version.
  */
-define( 'WSB_INTEGRATION_VERSION', '3.1.9' );
+define( 'WSB_INTEGRATION_VERSION', '3.2' );
 
 /**