diff --git a/composer.lock b/composer.lock index 81fff3c..56f68bd 100644 --- a/composer.lock +++ b/composer.lock @@ -87,16 +87,16 @@ }, { "name": "php-stubs/woocommerce-stubs", - "version": "v8.3.0", + "version": "v8.3.1", "source": { "type": "git", "url": "https://github.com/php-stubs/woocommerce-stubs.git", - "reference": "b828a0e4de8c187f2bacafdf28b1d3f915230d6f" + "reference": "bf594026d5d6ec043c42956a6cf465ec616cbba2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-stubs/woocommerce-stubs/zipball/b828a0e4de8c187f2bacafdf28b1d3f915230d6f", - "reference": "b828a0e4de8c187f2bacafdf28b1d3f915230d6f", + "url": "https://api.github.com/repos/php-stubs/woocommerce-stubs/zipball/bf594026d5d6ec043c42956a6cf465ec616cbba2", + "reference": "bf594026d5d6ec043c42956a6cf465ec616cbba2", "shasum": "" }, "require": { @@ -125,9 +125,9 @@ ], "support": { "issues": "https://github.com/php-stubs/woocommerce-stubs/issues", - "source": "https://github.com/php-stubs/woocommerce-stubs/tree/v8.3.0" + "source": "https://github.com/php-stubs/woocommerce-stubs/tree/v8.3.1" }, - "time": "2023-11-16T18:52:10+00:00" + "time": "2023-11-21T21:16:40+00:00" }, { "name": "php-stubs/wordpress-stubs", @@ -532,16 +532,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.43", + "version": "1.10.44", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "2c4129f6ca8c7cfa870098884b8869b410a5a361" + "reference": "bf84367c53a23f759513985c54ffe0d0c249825b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/2c4129f6ca8c7cfa870098884b8869b410a5a361", - "reference": "2c4129f6ca8c7cfa870098884b8869b410a5a361", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/bf84367c53a23f759513985c54ffe0d0c249825b", + "reference": "bf84367c53a23f759513985c54ffe0d0c249825b", "shasum": "" }, "require": { @@ -590,7 +590,7 @@ "type": "tidelift" } ], - "time": "2023-11-19T19:55:25+00:00" + "time": "2023-11-21T16:30:46+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", diff --git a/gtm-kit.php b/gtm-kit.php index ad0c4e7..21a5f2f 100644 --- a/gtm-kit.php +++ b/gtm-kit.php @@ -3,7 +3,7 @@ * GTM Kit Plugin * * Plugin Name: GTM Kit - * Version: 1.16.2 + * Version: 1.17.0-beta.1 * Plugin URI: https://gtmkit.com/ * Description: Google Tag Manager implementation focusing on flexibility and pagespeed. * Author: TLA Media @@ -27,7 +27,7 @@ exit(); } -const GTMKIT_VERSION = '1.16.2'; +const GTMKIT_VERSION = '1.17.0-beta.1'; if ( ! defined( 'GTMKIT_FILE' ) ) { define( 'GTMKIT_FILE', __FILE__ ); diff --git a/languages/gtm-kit.pot b/languages/gtm-kit.pot index 29b0b88..0c5415d 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.16\n" +"Project-Id-Version: GTM Kit 1.17.0-beta.1\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: 2023-11-14T14:56:30+00:00\n" +"POT-Creation-Date: 2023-11-23T22:24:56+00:00\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "X-Generator: WP-CLI 2.8.1\n" "X-Domain: gtm-kit\n" @@ -36,11 +36,11 @@ msgstr "" msgid "https://www.tlamedia.dk/" msgstr "" -#: inc/main.php:78 +#: inc/main.php:79 msgid "Go to GTM Kit Settings page" msgstr "" -#: inc/main.php:79 +#: inc/main.php:80 #: assets/admin/settings.js:1 msgid "Settings" msgstr "" @@ -102,53 +102,53 @@ msgstr "" msgid "%1$sNote:%2$s This will only be applied if page type has been activated in the global settings of GTM Kit." msgstr "" -#: src/Common/Util.php:57 +#: src/Common/Util.php:94 msgid "Server type:" msgstr "" -#: src/Common/Util.php:62 +#: src/Common/Util.php:99 msgid "PHP version number:" msgstr "" -#: src/Common/Util.php:67 +#: src/Common/Util.php:104 msgid "WordPress version number:" msgstr "" -#: src/Common/Util.php:72 +#: src/Common/Util.php:109 msgid "WordPress multisite:" msgstr "" -#: src/Common/Util.php:73 +#: src/Common/Util.php:110 #: assets/admin/wizard.js:1 msgid "Yes" msgstr "" -#: src/Common/Util.php:73 +#: src/Common/Util.php:110 #: assets/admin/wizard.js:1 msgid "No" msgstr "" -#: src/Common/Util.php:77 +#: src/Common/Util.php:114 msgid "Current theme:" msgstr "" -#: src/Common/Util.php:82 +#: src/Common/Util.php:119 msgid "Current site language:" msgstr "" -#: src/Common/Util.php:87 +#: src/Common/Util.php:124 msgid "Active plugins:" msgstr "" -#: src/Common/Util.php:88 +#: src/Common/Util.php:125 msgid "Plugin name and version of all active plugins" msgstr "" -#: src/Common/Util.php:92 +#: src/Common/Util.php:129 msgid "Anonymized GTM Kit settings:" msgstr "" -#: src/Common/Util.php:93 +#: src/Common/Util.php:130 msgid "Which GTM Kit settings are active" msgstr "" @@ -166,7 +166,7 @@ msgid "Best Sellers" msgstr "" #: src/Integration/WooCommerce.php:249 -#: src/Integration/WooCommerce.php:928 +#: src/Integration/WooCommerce.php:925 msgid "Product Category" msgstr "" @@ -183,7 +183,7 @@ msgid "Products By Attribute" msgstr "" #: src/Integration/WooCommerce.php:253 -#: src/Integration/WooCommerce.php:930 +#: src/Integration/WooCommerce.php:927 msgid "Product Tag" msgstr "" @@ -195,21 +195,21 @@ msgstr "" msgid "Shipping tier not found" msgstr "" -#: src/Integration/WooCommerce.php:787 +#: src/Integration/WooCommerce.php:784 msgid "Grouped Product" msgstr "" -#: src/Integration/WooCommerce.php:821 +#: src/Integration/WooCommerce.php:818 msgid "Search Results" msgstr "" -#: src/Integration/WooCommerce.php:821 -#: src/Integration/WooCommerce.php:862 -#: src/Integration/WooCommerce.php:895 +#: src/Integration/WooCommerce.php:818 +#: src/Integration/WooCommerce.php:859 +#: src/Integration/WooCommerce.php:892 msgid "General Product List" msgstr "" -#: src/Integration/WooCommerce.php:1079 +#: src/Integration/WooCommerce.php:1076 msgid "GTM Kit data." msgstr "" @@ -223,34 +223,6 @@ msgstr "" msgid "Saved Successfully." msgstr "" -#: assets/admin/settings.js:1 -msgid "Dashboard" -msgstr "" - -#: assets/admin/settings.js:1 -msgid "Container" -msgstr "" - -#: assets/admin/settings.js:1 -msgid "Post data" -msgstr "" - -#: assets/admin/settings.js:1 -msgid "User data" -msgstr "" - -#: assets/admin/settings.js:1 -msgid "Google Consent Mode" -msgstr "" - -#: assets/admin/settings.js:1 -msgid "Misc" -msgstr "" - -#: assets/admin/settings.js:1 -msgid "Support" -msgstr "" - #: assets/admin/settings.js:1 msgid "Save" msgstr "" @@ -371,7 +343,7 @@ msgid "Google Tag Manager container" msgstr "" #: assets/admin/settings.js:1 -msgid "Google Tag Manager container code" +msgid "General Container Settings" msgstr "" #: assets/admin/settings.js:1 @@ -475,6 +447,58 @@ msgstr "" msgid "Learn more about Stape.io" msgstr "" +#: assets/admin/settings.js:1 +msgid "Google Tag Manager Environment" +msgstr "" + +#: assets/admin/settings.js:1 +msgid "gtm_auth:" +msgstr "" + +#: assets/admin/settings.js:1 +msgid "Enter gtm_auth code" +msgstr "" + +#: assets/admin/settings.js:1 +msgid "Enter your gtm_auth code your GTM environment." +msgstr "" + +#: assets/admin/settings.js:1 +msgid "gtm_preview:" +msgstr "" + +#: assets/admin/settings.js:1 +msgid "Enter gtm_preview code" +msgstr "" + +#: assets/admin/settings.js:1 +msgid "Enter your gtm_preview code your GTM environment." +msgstr "" + +#: assets/admin/settings.js:1 +msgid "Environments" +msgstr "" + +#: assets/admin/settings.js:1 +msgid "In Google Tag Manager you can define different environments like Live, Dev and QA." +msgstr "" + +#: assets/admin/settings.js:1 +msgid "To use a specific environment in GTM Kit you must enter the \"gtm_auth\" and \"gtm_preview\" codes for that environment." +msgstr "" + +#: assets/admin/settings.js:1 +msgid "If left empty the default environment will be used." +msgstr "" + +#: assets/admin/settings.js:1 +msgid "Override settings in wp-config.php" +msgstr "" + +#: assets/admin/settings.js:1 +msgid "You can override the values of using constants in wp-config.php, which is a very useful for setting the value in your development and staging environments." +msgstr "" + #: assets/admin/settings.js:1 msgid "Container Code Implementation" msgstr "" @@ -571,6 +595,10 @@ msgstr "" msgid "Post ID" msgstr "" +#: assets/admin/settings.js:1 +msgid "Post data" +msgstr "" + #: assets/admin/settings.js:1 msgid "Include the post date." msgstr "" @@ -635,6 +663,10 @@ msgstr "" msgid "Include the user role if the user is logged in." msgstr "" +#: assets/admin/settings.js:1 +msgid "Google Consent Mode" +msgstr "" + #: assets/admin/settings.js:1 msgid "Google Consent Mode Activation" msgstr "" @@ -717,6 +749,10 @@ msgstr "" msgid "You can help by sharing anonymous data with us. Below is a detailed view of all data GTM Kit will collect if granted permission:" msgstr "" +#: assets/admin/settings.js:1 +msgid "Misc" +msgstr "" + #: assets/admin/settings.js:1 msgid "GTM Kit will never transmit any domain names or container ID's." msgstr "" @@ -1058,6 +1094,22 @@ msgstr "" msgid "The Github repository" msgstr "" +#: assets/admin/settings.js:1 +msgid "Dashboard" +msgstr "" + +#: assets/admin/settings.js:1 +msgid "Container" +msgstr "" + +#: assets/admin/settings.js:1 +msgid "User data" +msgstr "" + +#: assets/admin/settings.js:1 +msgid "Support" +msgstr "" + #: assets/admin/wizard.js:1 msgid "Container ID" msgstr "" diff --git a/package-lock.json b/package-lock.json index 5ca612c..961b313 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "gtm-kit", - "version": "1.16.2", + "version": "1.17.0-beta.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "gtm-kit", - "version": "1.16.2", + "version": "1.17.0-beta.1", "dependencies": { "@wordpress/api-fetch": "^6.43.0", "@wordpress/components": "^25.12.0", diff --git a/package.json b/package.json index 668ee23..3154409 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gtm-kit", - "version": "1.16.2", + "version": "1.17.0-beta.1", "description": "Development files for the GTM Kit", "author": "TLA Media", "keywords": [ diff --git a/readme.txt b/readme.txt index f1b4c84..1a66389 100644 --- a/readme.txt +++ b/readme.txt @@ -3,7 +3,7 @@ Contributors: tlamedia, torbenlundsgaard Donate link: https://github.com/tlamedia/gtm-kit Tags: google tag manager, gtm, woocommerce, analytics, ga4, gtag, easy digital downloads Tested up to: 6.4 -Stable tag: 1.16.2 +Stable tag: 1.17.0-beta.1 License: GPLv3 License URI: https://www.gnu.org/licenses/gpl-3.0.html @@ -88,11 +88,11 @@ Yes! Pagespeed is one of our main focus points, and we strive to make the plugin == Changelog == -= 1.X = += 1.17.0-beta.1 = Release date: YYYY-MM-DD -Find out about what's new in our [our release post](https://gtmkit.com/gtm-kit-1-16/). +Find out about what's new in our [our release post](https://gtmkit.com/gtm-kit-1-17/). #### Enhancements: * Added option to specify the Google Tag Manager environment. @@ -104,6 +104,7 @@ Find out about what's new in our [our release post](https://gtmkit.com/gtm-kit-1 * GTMKIT_EDD_DEBUG_TRACK_PURCHASE and GTMKIT_WC_DEBUG_TRACK_PURCHASE was not overriding correct. #### Other: +* Refactoring code for simplicity and maintainability = 1.16.2 = diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 3df1d89..9f16abe 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -3,7 +3,7 @@ 'name' => 'tlamedia/gtm-kit', 'pretty_version' => 'dev-main', 'version' => 'dev-main', - 'reference' => 'df7dba8cc960d98768293ee1d0c7815035868a33', + 'reference' => 'd9835a2a11462e9314d9933b8413bb18fba4111b', 'type' => 'wordpress-plugin', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -13,7 +13,7 @@ 'tlamedia/gtm-kit' => array( 'pretty_version' => 'dev-main', 'version' => 'dev-main', - 'reference' => 'df7dba8cc960d98768293ee1d0c7815035868a33', + 'reference' => 'd9835a2a11462e9314d9933b8413bb18fba4111b', 'type' => 'wordpress-plugin', 'install_path' => __DIR__ . '/../../', 'aliases' => array(),