From 88c830d24f136d9dbfe32af2eb16d29f04bf0255 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chris=20G=C3=A5rdenberg?= <chga@multinet.se>
Date: Thu, 18 Jan 2024 11:42:36 +0100
Subject: [PATCH] fix: Better check if gtag is defined

---
 class/class-edu-google.php | 14 +++++++-------
 eduadmin-analytics.php     |  2 +-
 package.json               |  2 +-
 readme.md                  |  2 +-
 readme.txt                 |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/class/class-edu-google.php b/class/class-edu-google.php
index d8bfc5c..49a37ea 100644
--- a/class/class-edu-google.php
+++ b/class/class-edu-google.php
@@ -78,7 +78,7 @@ public function track_list_course_view( $courses ) {
 
 			if ( count( $gtag_items ) > 0 ) {
 				?>
-                <script type="text/javascript">if (gtag) {
+                <script type="text/javascript">if (typeof gtag != 'undefined') {
                         gtag('event', 'view_item_list', {
                             'item_list_id': 'course_list',
                             'item_list_name': 'Course list',
@@ -113,7 +113,7 @@ public function track_list_event_view( $events ) {
 
 			if ( count( $gtag_items ) > 0 ) {
 				?>
-                <script type="text/javascript">if (gtag) {
+                <script type="text/javascript">if (typeof gtag != 'undefined') {
                         gtag('event', 'view_item_list', {
                             'item_list_id': 'event_list',
                             'item_list_name': 'Event list',
@@ -149,7 +149,7 @@ public function track_detail_view( $course_template ) {
 
 			if ( count( $gtag_items ) > 0 ) {
 				?>
-                <script type="text/javascript">if (gtag) {
+                <script type="text/javascript">if (typeof gtag != 'undefined') {
                         gtag('event', 'view_item', {
                             'currency': '<?php echo esc_js( $currency ); ?>',
                             'items': <?php echo wp_json_encode( $gtag_items, JSON_PRETTY_PRINT ); ?> });
@@ -180,7 +180,7 @@ public function track_programme_detail_view( $programme ) {
 
 			if ( count( $gtag_items ) > 0 ) {
 				?>
-                <script type="text/javascript">if (gtag) {
+                <script type="text/javascript">if (typeof gtag != 'undefined') {
                         gtag('event', 'view_item', {
                             'currency': '<?php echo esc_js( $currency ); ?>',
                             'items': <?php echo wp_json_encode( $gtag_items, JSON_PRETTY_PRINT ); ?> });
@@ -215,7 +215,7 @@ public function track_booking_view( $course_template ) {
 
 			if ( count( $gtag_items ) > 0 ) {
 				?>
-                <script type="text/javascript">if (gtag) {
+                <script type="text/javascript">if (typeof gtag != 'undefined') {
                         gtag('event', 'begin_checkout', {
                             'currency': '<?php echo esc_js( $currency ); ?>',
                             'items': <?php echo wp_json_encode( $gtag_items, JSON_PRETTY_PRINT ); ?> });
@@ -246,7 +246,7 @@ public function track_programme_booking_view( $programme ) {
 
 			if ( count( $gtag_items ) > 0 ) {
 				?>
-                <script type="text/javascript">if (gtag) {
+                <script type="text/javascript">if (typeof gtag != 'undefined') {
                         gtag('event', 'begin_checkout', {
                             'currency': '<?php echo esc_js( $currency ); ?>',
                             'items': <?php echo wp_json_encode( $gtag_items, JSON_PRETTY_PRINT ); ?> });
@@ -286,7 +286,7 @@ public function track_booking_completed( $booking_info ) {
 
 			if ( count( $order_rows ) > 0 ) {
 				?>
-                <script type="text/javascript">if (gtag) {
+                <script type="text/javascript">if (typeof gtag != 'undefined') {
                         gtag('event', 'purchase', {
                             'transaction_id': '<?php echo esc_js( $transaction_id ); ?>',
                             'currency': '<?php echo esc_js( $currency ); ?>',
diff --git a/eduadmin-analytics.php b/eduadmin-analytics.php
index 2401246..f59656f 100644
--- a/eduadmin-analytics.php
+++ b/eduadmin-analytics.php
@@ -6,7 +6,7 @@
  * Plugin URI:	https://www.eduadmin.se
  * Description:	This plugin adds support for Google Analytics / Tag Manager to your EduAdmin plugin (WordPress only, not the course portal).
  * Tags: booking, participants, courses, events, eduadmin, lega online, google, analytics, tag manager
- * Version:	1.1.1
+ * Version:	1.1.2
  * GitHub Plugin URI: multinetinteractive/eduadmin-google
  * GitHub Plugin URI: https://github.com/multinetinteractive/eduadmin-google
  * Requires at least: 5.8
diff --git a/package.json b/package.json
index 9f813ce..599fa17 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eduadmin-analytics",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "This plugin adds support for Google Analytics / Tag Manager to your EduAdmin plugin (WordPress only, not the course portal).",
   "repository": "https://github.com/MultinetInteractive/eduadmin-google.git",
   "author": "Chris Gårdenberg <chga@multinet.se>",
diff --git a/readme.md b/readme.md
index 873ce56..267be3b 100644
--- a/readme.md
+++ b/readme.md
@@ -3,7 +3,7 @@
 - Tags: booking, participants, courses, events, eduadmin, lega online, google, analytics, tag manager
 - Requires at least: 5.8
 - Tested up to: 6.4
-- Stable tag: 1.1.1
+- Stable tag: 1.1.2
 - Requires PHP: 7.0
 - License: GPL3
 - License-URI: https://www.gnu.org/licenses/gpl-3.0.en.html
diff --git a/readme.txt b/readme.txt
index 7b2fc66..ba9ba2d 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: mnchga
 Tags: booking, participants, courses, events, eduadmin, lega online, google, analytics, tag manager
 Requires at least: 5.8
 Tested up to: 6.4
-Stable tag: 1.1.1
+Stable tag: 1.1.2
 Requires PHP: 7.0
 License: GPL3
 License-URI: https://www.gnu.org/licenses/gpl-3.0.en.html