From 8ab442a018c6fb5b3f058a3ae107e57beef4ab62 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 28 Dec 2023 02:53:26 +0000 Subject: [PATCH 1/5] Start `release/1.8.12`. From ec35237d5b6060a559c823c33cedd6e3f504fba2 Mon Sep 17 00:00:00 2001 From: Eason Su Date: Thu, 28 Dec 2023 10:59:00 +0800 Subject: [PATCH 2/5] Remove older changelog entries from readme.txt --- readme.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/readme.txt b/readme.txt index f6bf489a..4c8b4d71 100644 --- a/readme.txt +++ b/readme.txt @@ -70,10 +70,4 @@ Exact wording depends on the national data privacy laws and should be adjusted. * Fix - Prevent firing up the add_to_cart event when clicking in product image. * Tweak - Test environment setup to resolve notice. -= 1.8.9 - 2023-11-07 = -* Tweak - WC 8.3 compatibility. -* Tweak - WP 6.4 compatibility. -* Update - Use new Woo.com domain. -* Update - WordPressCS to version 3.0. - [See changelog for all versions](https://raw.githubusercontent.com/woocommerce/woocommerce-google-analytics-integration/trunk/changelog.txt). From 3854332173931db66981a2fd987e67290ac553bf Mon Sep 17 00:00:00 2001 From: Eason Su Date: Thu, 28 Dec 2023 11:04:42 +0800 Subject: [PATCH 3/5] woorelease: Product version bump update --- package-lock.json | 2 +- package.json | 2 +- readme.txt | 2 +- woocommerce-google-analytics-integration.php | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index e55bd474..a164976a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "woocommerce-google-analytics-integration", - "version": "1.8.11", + "version": "1.8.12", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index fe3a3c8b..f6819e95 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "woocommerce-google-analytics-integration", "title": "WooCommerce Google Analytics Integration", - "version": "1.8.11", + "version": "1.8.12", "license": "GPL-2.0", "homepage": "https://wordpress.org/plugins/woocommerce-google-analytics-integration/", "repository": { diff --git a/readme.txt b/readme.txt index 4c8b4d71..1f133957 100644 --- a/readme.txt +++ b/readme.txt @@ -3,7 +3,7 @@ Contributors: woocommerce, automattic, claudiosanches, bor0, royho, laurendaviss Tags: woocommerce, google analytics Requires at least: 3.9 Tested up to: 6.4 -Stable tag: 1.8.11 +Stable tag: 1.8.12 License: GPLv3 License URI: https://www.gnu.org/licenses/gpl-3.0.html diff --git a/woocommerce-google-analytics-integration.php b/woocommerce-google-analytics-integration.php index 4a153bfe..d2db281b 100644 --- a/woocommerce-google-analytics-integration.php +++ b/woocommerce-google-analytics-integration.php @@ -5,7 +5,7 @@ * Description: Allows Google Analytics tracking code to be inserted into WooCommerce store pages. * Author: WooCommerce * Author URI: https://woo.com - * Version: 1.8.11 + * Version: 1.8.12 * WC requires at least: 6.8 * WC tested up to: 8.4 * Tested up to: 6.4 @@ -22,7 +22,7 @@ if ( ! class_exists( 'WC_Google_Analytics_Integration' ) ) { - define( 'WC_GOOGLE_ANALYTICS_INTEGRATION_VERSION', '1.8.11' ); // WRCS: DEFINED_VERSION. + define( 'WC_GOOGLE_ANALYTICS_INTEGRATION_VERSION', '1.8.12' ); // WRCS: DEFINED_VERSION. define( 'WC_GOOGLE_ANALYTICS_INTEGRATION_MIN_WC_VER', '6.8' ); // Maybe show the GA Pro notice on plugin activation. From d7b238447d84304d19898b0bd7a26512f8466064 Mon Sep 17 00:00:00 2001 From: Eason Su Date: Thu, 28 Dec 2023 11:05:10 +0800 Subject: [PATCH 4/5] woorelease: Changelog update --- changelog.txt | 4 ++++ readme.txt | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/changelog.txt b/changelog.txt index 2d89b5d5..d5d41de7 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,9 @@ *** Changelog *** += 1.8.12 - 2023-12-28 = +* Fix - Avoid JavaScript exceptions when sending checkout event tracking due to incompatible data structure. +* Fix - Correct misplaced each product index value as its quantity when sending checkout event tracking. + = 1.8.11 - 2023-12-18 = * Dev - Prevent DB warnings in unit tests. * Tweak - WC 8.4 compatibility. diff --git a/readme.txt b/readme.txt index 1f133957..c6d9d8d4 100644 --- a/readme.txt +++ b/readme.txt @@ -60,6 +60,10 @@ Exact wording depends on the national data privacy laws and should be adjusted. == Changelog == += 1.8.12 - 2023-12-28 = +* Fix - Avoid JavaScript exceptions when sending checkout event tracking due to incompatible data structure. +* Fix - Correct misplaced each product index value as its quantity when sending checkout event tracking. + = 1.8.11 - 2023-12-18 = * Dev - Prevent DB warnings in unit tests. * Tweak - WC 8.4 compatibility. From 86e2291a2211bc9ff3b259b5e934338bb44f041a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 28 Dec 2023 03:05:28 +0000 Subject: [PATCH 5/5] Update hooks documentation from branch. --- docs/Hooks.md | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/Hooks.md b/docs/Hooks.md index 20a1c443..c7b19a8c 100644 --- a/docs/Hooks.md +++ b/docs/Hooks.md @@ -8,7 +8,7 @@ A list of hooks, e.g. `actions` and `filters`, that are defined or used in this **Used in**: -- [class-wc-google-analytics-js.php#L185](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/e03cbac37989f15f6e8762f6b818d9d08272e6c6/includes/class-wc-google-analytics-js.php#L185) +- [class-wc-google-analytics-js.php#L185](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/d7b238447d84304d19898b0bd7a26512f8466064/includes/class-wc-google-analytics-js.php#L185) ## woocommerce_cart_item_product @@ -16,8 +16,8 @@ A list of hooks, e.g. `actions` and `filters`, that are defined or used in this **Used in**: -- [class-wc-google-gtag-js.php#L441](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/e03cbac37989f15f6e8762f6b818d9d08272e6c6/includes/class-wc-google-gtag-js.php#L441) -- [class-wc-google-analytics-js.php#L475](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/e03cbac37989f15f6e8762f6b818d9d08272e6c6/includes/class-wc-google-analytics-js.php#L475) +- [class-wc-google-gtag-js.php#L441](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/d7b238447d84304d19898b0bd7a26512f8466064/includes/class-wc-google-gtag-js.php#L441) +- [class-wc-google-analytics-js.php#L475](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/d7b238447d84304d19898b0bd7a26512f8466064/includes/class-wc-google-analytics-js.php#L475) ## woocommerce_ga_classic_snippet_output @@ -25,7 +25,7 @@ A list of hooks, e.g. `actions` and `filters`, that are defined or used in this **Used in**: -- [class-wc-google-analytics-js.php#L105](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/e03cbac37989f15f6e8762f6b818d9d08272e6c6/includes/class-wc-google-analytics-js.php#L105) +- [class-wc-google-analytics-js.php#L105](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/d7b238447d84304d19898b0bd7a26512f8466064/includes/class-wc-google-analytics-js.php#L105) ## woocommerce_ga_disable_tracking @@ -33,7 +33,7 @@ A list of hooks, e.g. `actions` and `filters`, that are defined or used in this **Used in**: -- [class-wc-google-analytics.php#L524](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/e03cbac37989f15f6e8762f6b818d9d08272e6c6/includes/class-wc-google-analytics.php#L524) +- [class-wc-google-analytics.php#L524](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/d7b238447d84304d19898b0bd7a26512f8466064/includes/class-wc-google-analytics.php#L524) ## woocommerce_ga_event_tracking_parameters @@ -41,7 +41,7 @@ A list of hooks, e.g. `actions` and `filters`, that are defined or used in this **Used in**: -- [class-wc-google-analytics-js.php#L502](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/e03cbac37989f15f6e8762f6b818d9d08272e6c6/includes/class-wc-google-analytics-js.php#L502) +- [class-wc-google-analytics-js.php#L502](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/d7b238447d84304d19898b0bd7a26512f8466064/includes/class-wc-google-analytics-js.php#L502) ## woocommerce_ga_snippet_create @@ -49,7 +49,7 @@ A list of hooks, e.g. `actions` and `filters`, that are defined or used in this **Used in**: -- [class-wc-google-analytics-js.php#L276](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/e03cbac37989f15f6e8762f6b818d9d08272e6c6/includes/class-wc-google-analytics-js.php#L276) +- [class-wc-google-analytics-js.php#L276](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/d7b238447d84304d19898b0bd7a26512f8466064/includes/class-wc-google-analytics-js.php#L276) ## woocommerce_ga_snippet_developer_id @@ -57,7 +57,7 @@ A list of hooks, e.g. `actions` and `filters`, that are defined or used in this **Used in**: -- [class-wc-google-analytics-js.php#L277](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/e03cbac37989f15f6e8762f6b818d9d08272e6c6/includes/class-wc-google-analytics-js.php#L277) +- [class-wc-google-analytics-js.php#L277](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/d7b238447d84304d19898b0bd7a26512f8466064/includes/class-wc-google-analytics-js.php#L277) ## woocommerce_ga_snippet_head @@ -65,7 +65,7 @@ A list of hooks, e.g. `actions` and `filters`, that are defined or used in this **Used in**: -- [class-wc-google-analytics-js.php#L275](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/e03cbac37989f15f6e8762f6b818d9d08272e6c6/includes/class-wc-google-analytics-js.php#L275) +- [class-wc-google-analytics-js.php#L275](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/d7b238447d84304d19898b0bd7a26512f8466064/includes/class-wc-google-analytics-js.php#L275) ## woocommerce_ga_snippet_output @@ -73,7 +73,7 @@ A list of hooks, e.g. `actions` and `filters`, that are defined or used in this **Used in**: -- [class-wc-google-analytics-js.php#L282](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/e03cbac37989f15f6e8762f6b818d9d08272e6c6/includes/class-wc-google-analytics-js.php#L282) +- [class-wc-google-analytics-js.php#L282](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/d7b238447d84304d19898b0bd7a26512f8466064/includes/class-wc-google-analytics-js.php#L282) ## woocommerce_ga_snippet_require @@ -81,7 +81,7 @@ A list of hooks, e.g. `actions` and `filters`, that are defined or used in this **Used in**: -- [class-wc-google-analytics-js.php#L278](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/e03cbac37989f15f6e8762f6b818d9d08272e6c6/includes/class-wc-google-analytics-js.php#L278) +- [class-wc-google-analytics-js.php#L278](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/d7b238447d84304d19898b0bd7a26512f8466064/includes/class-wc-google-analytics-js.php#L278) ## woocommerce_ga_tracker_variable @@ -89,7 +89,7 @@ A list of hooks, e.g. `actions` and `filters`, that are defined or used in this **Used in**: -- [class-wc-google-analytics-js.php#L44](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/e03cbac37989f15f6e8762f6b818d9d08272e6c6/includes/class-wc-google-analytics-js.php#L44) +- [class-wc-google-analytics-js.php#L44](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/d7b238447d84304d19898b0bd7a26512f8466064/includes/class-wc-google-analytics-js.php#L44) ## woocommerce_google_analytics_script_src @@ -97,7 +97,7 @@ A list of hooks, e.g. `actions` and `filters`, that are defined or used in this **Used in**: -- [class-wc-google-analytics-js.php#L235](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/e03cbac37989f15f6e8762f6b818d9d08272e6c6/includes/class-wc-google-analytics-js.php#L235) +- [class-wc-google-analytics-js.php#L235](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/d7b238447d84304d19898b0bd7a26512f8466064/includes/class-wc-google-analytics-js.php#L235) ## woocommerce_gtag_event_data @@ -105,7 +105,7 @@ A list of hooks, e.g. `actions` and `filters`, that are defined or used in this **Used in**: -- [class-wc-google-gtag-js.php#L126](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/e03cbac37989f15f6e8762f6b818d9d08272e6c6/includes/class-wc-google-gtag-js.php#L126) +- [class-wc-google-gtag-js.php#L126](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/d7b238447d84304d19898b0bd7a26512f8466064/includes/class-wc-google-gtag-js.php#L126) ## woocommerce_gtag_event_tracking_parameters @@ -113,7 +113,7 @@ A list of hooks, e.g. `actions` and `filters`, that are defined or used in this **Used in**: -- [class-wc-google-gtag-js.php#L484](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/e03cbac37989f15f6e8762f6b818d9d08272e6c6/includes/class-wc-google-gtag-js.php#L484) +- [class-wc-google-gtag-js.php#L484](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/d7b238447d84304d19898b0bd7a26512f8466064/includes/class-wc-google-gtag-js.php#L484) ## woocommerce_gtag_snippet @@ -121,7 +121,7 @@ A list of hooks, e.g. `actions` and `filters`, that are defined or used in this **Used in**: -- [class-wc-google-gtag-js.php#L323](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/e03cbac37989f15f6e8762f6b818d9d08272e6c6/includes/class-wc-google-gtag-js.php#L323) +- [class-wc-google-gtag-js.php#L323](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/d7b238447d84304d19898b0bd7a26512f8466064/includes/class-wc-google-gtag-js.php#L323) ## woocommerce_gtag_tracker_variable @@ -129,7 +129,7 @@ A list of hooks, e.g. `actions` and `filters`, that are defined or used in this **Used in**: -- [class-wc-google-gtag-js.php#L88](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/e03cbac37989f15f6e8762f6b818d9d08272e6c6/includes/class-wc-google-gtag-js.php#L88) +- [class-wc-google-gtag-js.php#L88](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/d7b238447d84304d19898b0bd7a26512f8466064/includes/class-wc-google-gtag-js.php#L88) ## plugin_locale @@ -137,5 +137,5 @@ A list of hooks, e.g. `actions` and `filters`, that are defined or used in this **Used in**: -- [woocommerce-google-analytics-integration.php#L139](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/e03cbac37989f15f6e8762f6b818d9d08272e6c6/woocommerce-google-analytics-integration.php#L139) +- [woocommerce-google-analytics-integration.php#L139](https://github.com/woocommerce/woocommerce-google-analytics-integration/blob/d7b238447d84304d19898b0bd7a26512f8466064/woocommerce-google-analytics-integration.php#L139)