From 16eb414f91c3af1e08997a37f7c7dd81e17cc65a Mon Sep 17 00:00:00 2001 From: Torben Lundsgaard Date: Tue, 7 May 2024 12:00:15 +0200 Subject: [PATCH] Prepare release 1.22 --- gtm-kit.php | 4 +- inc/main.php | 4 +- languages/gtm-kit.pot | 78 ++++++++++++++++++++------- package-lock.json | 4 +- package.json | 2 +- readme.txt | 37 ++----------- src/Admin/IntegrationsOptionsPage.php | 2 +- src/Common/Util.php | 9 ++++ vendor/composer/installed.php | 12 ++--- 9 files changed, 87 insertions(+), 65 deletions(-) diff --git a/gtm-kit.php b/gtm-kit.php index f18bf52..5991a96 100644 --- a/gtm-kit.php +++ b/gtm-kit.php @@ -3,7 +3,7 @@ * GTM Kit Plugin * * Plugin Name: GTM Kit - * Version: 1.21 + * Version: 1.22 * Plugin URI: https://gtmkit.com/ * Description: Google Tag Manager implementation focusing on flexibility and pagespeed. * Author: GTM Kit @@ -27,7 +27,7 @@ exit(); } -const GTMKIT_VERSION = '1.21'; +const GTMKIT_VERSION = '1.22'; if ( ! defined( 'GTMKIT_FILE' ) ) { define( 'GTMKIT_FILE', __FILE__ ); diff --git a/inc/main.php b/inc/main.php index 78884ee..d588988 100644 --- a/inc/main.php +++ b/inc/main.php @@ -148,7 +148,9 @@ function gtmkit_admin_init(): void { SetupWizard::register( $options, $util ); GeneralOptionsPage::register( $options, $util ); IntegrationsOptionsPage::register( $options, $util ); - TemplatesOptionsPage::register( $options, $util ); + if ( ! $util->is_premium() ) { + TemplatesOptionsPage::register( $options, $util ); + } HelpOptionsPage::register( $options, $util ); do_action( 'gtmkit_admin_init', $options, $util ); diff --git a/languages/gtm-kit.pot b/languages/gtm-kit.pot index 5826f9d..da72f00 100644 --- a/languages/gtm-kit.pot +++ b/languages/gtm-kit.pot @@ -2,14 +2,14 @@ # This file is distributed under the GPLv3. msgid "" msgstr "" -"Project-Id-Version: GTM Kit 1.21\n" +"Project-Id-Version: GTM Kit 1.22\n" "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/gtm-kit\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2024-04-13T13:18:02+00:00\n" +"POT-Creation-Date: 2024-05-07T09:45:11+00:00\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "X-Generator: WP-CLI 2.9.0\n" "X-Domain: gtm-kit\n" @@ -39,19 +39,19 @@ msgstr "" msgid "Settings" msgstr "" -#: src/Admin/AbstractOptionsPage.php:254 -#: src/Admin/SetupWizard.php:210 +#: src/Admin/AbstractOptionsPage.php:257 +#: src/Admin/SetupWizard.php:211 msgid "Whoops, something's not working." msgstr "" -#: src/Admin/AbstractOptionsPage.php:257 -#: src/Admin/SetupWizard.php:213 +#: src/Admin/AbstractOptionsPage.php:260 +#: src/Admin/SetupWizard.php:214 msgid "It looks like something is preventing JavaScript from loading on your website. GTM Kit requires JavaScript in order to give you the best possible experience." msgstr "" -#: src/Admin/AbstractOptionsPage.php:262 -#: src/Admin/SetupWizard.php:161 -#: src/Admin/SetupWizard.php:218 +#: src/Admin/AbstractOptionsPage.php:265 +#: src/Admin/SetupWizard.php:162 +#: src/Admin/SetupWizard.php:219 msgid "Go back to the Dashboard" msgstr "" @@ -435,7 +435,7 @@ msgid "Page Speed Optimization" msgstr "" #: assets/admin/settings.js:1 -msgid "load_js event" +msgid "load_delayed_js event" msgstr "" #: assets/admin/settings.js:1 @@ -447,7 +447,7 @@ msgid "Delay JavaScript execution" msgstr "" #: assets/admin/settings.js:1 -msgid "Page optimization plugins can delay the 'load_js' event and this can be used to delay the triggering og tags in Google Tag Manager." +msgid "Page optimization plugins can delay the 'load_delayed_js' event and this can be used to delay the triggering og tags in Google Tag Manager." msgstr "" #: assets/admin/settings.js:1 @@ -761,6 +761,34 @@ msgstr "" msgid "Enables storage related to security such as authentication functionality, fraud prevention, and other user protection" msgstr "" +#: assets/admin/settings.js:1 +msgid "Advanced" +msgstr "" + +#: assets/admin/settings.js:1 +msgid "Redact Ads Data" +msgstr "" + +#: assets/admin/settings.js:1 +msgid "Redact advertising data" +msgstr "" + +#: assets/admin/settings.js:1 +msgid "Pass through URL parameters" +msgstr "" + +#: assets/admin/settings.js:1 +msgid "Pass through ad click, client ID, and session ID information in URLs" +msgstr "" + +#: assets/admin/settings.js:1 +msgid "Wait For Update" +msgstr "" + +#: assets/admin/settings.js:1 +msgid "Enter time in milliseconds" +msgstr "" + #: assets/admin/settings.js:1 #: assets/admin/wizard.js:1 msgid "GTM Kit is used together with a wide variety of server configurations and plugins. It is very helpful for us to know what some of these configurations are so we can test the most common configurations." @@ -788,6 +816,14 @@ msgstr "" msgid "Logging and debugging" msgstr "" +#: assets/admin/settings.js:1 +msgid "Event Inspector" +msgstr "" + +#: assets/admin/settings.js:1 +msgid "The event inspector is placed in the footer of the front and it allows you to see all the fired GTM events." +msgstr "" + #: assets/admin/settings.js:1 msgid "Console log" msgstr "" @@ -934,6 +970,18 @@ msgstr "" msgid "In order to use webhooks you must first enable Server-side Tagging by entering a sGTM Container Domain" msgstr "" +#: assets/admin/settings.js:13 +msgid "Go to sGTM settings" +msgstr "" + +#: assets/admin/settings.js:13 +msgid "In order to use webhooks you must configure you server-side container to handle the webhooks" +msgstr "" + +#: assets/admin/settings.js:13 +msgid "Go to GTM Templates" +msgstr "" + #: assets/admin/settings.js:13 msgid "Send webhooks to server GTM container" msgstr "" @@ -1357,14 +1405,6 @@ msgstr "" msgid "Google Tag Manager templates" msgstr "" -#: assets/admin/wizard.js:1 -msgid "Google Analytics 4 - Basic Configuration" -msgstr "" - -#: assets/admin/wizard.js:1 -msgid "Google Analytics 4 - eCommerce" -msgstr "" - #: assets/admin/wizard.js:1 msgid "Getting started with GTM Kit" msgstr "" diff --git a/package-lock.json b/package-lock.json index c80ab04..a82b4cd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "gtm-kit", - "version": "1.21.0", + "version": "1.22.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "gtm-kit", - "version": "1.21.0", + "version": "1.22.0", "dependencies": { "@wordpress/api-fetch": "^6.54.0", "@wordpress/components": "^27.5.0", diff --git a/package.json b/package.json index e2af210..6967c2e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gtm-kit", - "version": "1.21.0", + "version": "1.22.0", "description": "Development files for the GTM Kit", "author": "GTM Kit", "keywords": [ diff --git a/readme.txt b/readme.txt index 455e4af..0b9fc9a 100644 --- a/readme.txt +++ b/readme.txt @@ -3,7 +3,7 @@ Contributors: tlamedia, torbenlundsgaard, gtmkit Donate link: https://github.com/tlamedia/gtm-kit Tags: google tag manager, gtm, woocommerce, analytics, ga4 Tested up to: 6.5 -Stable tag: 1.21 +Stable tag: 1.22 License: GPLv3 License URI: https://www.gnu.org/licenses/gpl-3.0.html @@ -88,21 +88,16 @@ Yes! Pagespeed is one of our main focus points, and we strive to make the plugin == Changelog == += 1.22 = -= 1.X = - -Release date: 2024-MM-DD +Release date: 2024-05-08 Find out about what's new in our [our release post](https://gtmkit.com/gtm-kit-1-22/). #### Enhancements: - Added an Event Inspector for verifying that events are being pushed to the datalayer. You can now debug events without using GTM preview mode. - Added advanced GCM settings: 'ads_data_redaction', 'url_passthrough' and 'wait_for_update'. -- Updated the custom container loader. - -#### Bugfixes: - -#### Other: +- Updated the custom container loader for use with Stape.io. = 1.21 = @@ -142,30 +137,6 @@ Find out about what's new in our [our release post](https://gtmkit.com/gtm-kit-1 #### Other: * Require WooCommerce 8.0. -= 1.19.1 = - -Release date: 2024-03-05 - -#### Bugfixes: -* Scripts were not enqueued if the container was inactive. - -#### Other: -* Tested up to WordPress 6.5. -* Tested up to WooCommerce 8.7. - -= 1.19 = - -Release date: 2024-02-07 - -Find out about what's new in our [our release post](https://gtmkit.com/gtm-kit-1-19/). - -#### Enhancements: -* Add option to fire a 'load_delayed_js' event, which can be used to delay JavaScript execution in Google Tag Manager. -* This release comes with many behind-the-scenes improvements and general enhancements. -* The script settings are the same on all pages and are now cached in the object cache for better performance. -* The function to share system data with the support team has been improved with more data. -* The code has been refactored for extendability. - == Upgrade Notice == = 1.20 = diff --git a/src/Admin/IntegrationsOptionsPage.php b/src/Admin/IntegrationsOptionsPage.php index f2eab9b..032dd2b 100644 --- a/src/Admin/IntegrationsOptionsPage.php +++ b/src/Admin/IntegrationsOptionsPage.php @@ -108,7 +108,7 @@ public function localize_script( string $page_slug, string $script_handle ): voi 'currentPage' => $page_slug, 'root' => \esc_url_raw( rest_url() ), 'nonce' => \wp_create_nonce( 'wp_rest' ), - 'wa' => defined( 'GTMKIT_WOO_FILE' ), + 'wa' => $this->util->is_premium(), 'dashboardUrl' => \menu_page_url( 'gtmkit_general', false ), 'integrationsUrl' => \menu_page_url( 'gtmkit_integrations', false ), 'templatesUrl' => \menu_page_url( 'gtmkit_templates', false ), diff --git a/src/Common/Util.php b/src/Common/Util.php index 8a9ba72..76b5da8 100644 --- a/src/Common/Util.php +++ b/src/Common/Util.php @@ -437,4 +437,13 @@ public function normalize_and_hash_email_address( } return $this->normalize_and_hash( $hash_algorithm, $normalized_email, true ); } + + /** + * Is premium + * + * @return bool True when is premium. + */ + public function is_premium(): bool { + return \defined( 'GTMKIT_WOO_FILE' ); + } } diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index eb6eaca..447ec39 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -1,9 +1,9 @@ array( 'name' => 'tlamedia/gtm-kit', - 'pretty_version' => 'dev-main', - 'version' => 'dev-main', - 'reference' => '7d7add9b4965313a1dad5c3508c9d4b6857e11ce', + 'pretty_version' => 'dev-support', + 'version' => 'dev-support', + 'reference' => 'dfbedd763557cbcd7bcac30b5a630c0676c2e4d5', 'type' => 'wordpress-plugin', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -11,9 +11,9 @@ ), 'versions' => array( 'tlamedia/gtm-kit' => array( - 'pretty_version' => 'dev-main', - 'version' => 'dev-main', - 'reference' => '7d7add9b4965313a1dad5c3508c9d4b6857e11ce', + 'pretty_version' => 'dev-support', + 'version' => 'dev-support', + 'reference' => 'dfbedd763557cbcd7bcac30b5a630c0676c2e4d5', 'type' => 'wordpress-plugin', 'install_path' => __DIR__ . '/../../', 'aliases' => array(),