From 088b019854ca3190c6032e87244f39beedba21fc Mon Sep 17 00:00:00 2001 From: Woo Date: Thu, 14 Nov 2024 10:24:16 +0000 Subject: [PATCH] Updates to 6.1.1 --- automatewoo.php | 8 ++++---- changelog.txt | 8 ++++++++ includes/DatabaseTables/Carts.php | 6 +++--- includes/Queued_Event.php | 15 ++++++++++++++- languages/automatewoo.pot | 8 +++----- vendor/composer/installed.php | 12 ++++++------ 6 files changed, 38 insertions(+), 19 deletions(-) diff --git a/automatewoo.php b/automatewoo.php index 4a5f777..4c1076c 100644 --- a/automatewoo.php +++ b/automatewoo.php @@ -3,17 +3,17 @@ * Plugin Name: AutomateWoo * Plugin URI: https://automatewoo.com * Description: Powerful marketing automation for your WooCommerce store. - * Version: 6.1.0 + * Version: 6.1.1 * Author: WooCommerce * Author URI: https://woocommerce.com * License: GPLv3 * License URI: http://www.gnu.org/licenses/gpl-3.0 * Text Domain: automatewoo * Domain Path: /languages - * Tested up to: 6.6 + * Tested up to: 6.7 * Requires Plugins: woocommerce * WC requires at least: 7.9 - * WC tested up to: 9.3.0 + * WC tested up to: 9.4 * Woo: 4652610:f6f1f8a56a16a3715b30b21fb557e78f * * This program is free software: you can redistribute it and/or modify @@ -37,7 +37,7 @@ defined( 'ABSPATH' ) || exit; define( 'AUTOMATEWOO_SLUG', 'automatewoo' ); -define( 'AUTOMATEWOO_VERSION', '6.1.0' ); // WRCS: DEFINED_VERSION. +define( 'AUTOMATEWOO_VERSION', '6.1.1' ); // WRCS: DEFINED_VERSION. define( 'AUTOMATEWOO_FILE', __FILE__ ); define( 'AUTOMATEWOO_PATH', __DIR__ ); define( 'AUTOMATEWOO_MIN_PHP_VER', '7.4.0' ); diff --git a/changelog.txt b/changelog.txt index 9a742b3..ef368d6 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,13 @@ *** AutomateWoo Changelog *** +2024-11-14 - version 6.1.1 +* Dev - Fix missing blueprint dependency. +* Dev - WordPress 6.7 Compatibility: Fix the issue that E2E test. +* Tweak - WC 9.4 compatibility. +* Tweak - WP 6.7 compatibility. +* Tweak - WordPress 6.7 Compatibility: Avoid errors in the database where a LONGTEXT type can't have a default value. +* Tweak - Write a log message when the required data of the queued event was not found. + 2024-09-05 - version 6.1.0 * Break - Remove WooCommerce Navigation integration. * Tweak - WC 9.3.0 compatibility. diff --git a/includes/DatabaseTables/Carts.php b/includes/DatabaseTables/Carts.php index 3da42d2..efed3ac 100644 --- a/includes/DatabaseTables/Carts.php +++ b/includes/DatabaseTables/Carts.php @@ -56,9 +56,9 @@ function get_install_query() { guest_id bigint(20) NOT NULL default 0, last_modified datetime NULL, created datetime NULL, - items longtext NOT NULL default '', - coupons longtext NOT NULL default '', - fees longtext NOT NULL default '', + items longtext NOT NULL, + coupons longtext NOT NULL, + fees longtext NOT NULL, shipping_tax_total double DEFAULT 0 NOT NULL, shipping_total double DEFAULT 0 NOT NULL, total double DEFAULT 0 NOT NULL, diff --git a/includes/Queued_Event.php b/includes/Queued_Event.php index 436eeeb..9a08187 100644 --- a/includes/Queued_Event.php +++ b/includes/Queued_Event.php @@ -194,7 +194,20 @@ public function get_data_layer() { foreach ( $compressed_data_layer as $data_type_id => $compressed_item ) { $data_type = DataTypes::get( $data_type_id ); if ( $data_type ) { - $uncompressed_data_layer[ $data_type_id ] = $data_type->decompress( $compressed_item, $compressed_data_layer ); + $decompressed_data = $data_type->decompress( $compressed_item, $compressed_data_layer ); + if ( ! $decompressed_data && $this->id ) { + $message = sprintf( + 'Some of the required data was not found. Queued event ID: %s. The missing "%s" data\'s ID: %d.', + $this->id, + $data_type_id, + Clean::id( $compressed_item ) + ); + if ( 'subscription' === $data_type_id ) { + $message .= ' For example, the order or subscription order could have been deleted. This issue may occur when a subscription order initially fails due to payment issues, but later succeeds. In such cases, the subscription order with the failed payment is deleted, but its workflow remains intact.'; + } + Logger::info( 'queued-event', $message ); + } + $uncompressed_data_layer[ $data_type_id ] = $decompressed_data; } } } diff --git a/languages/automatewoo.pot b/languages/automatewoo.pot index b688249..aa22b0a 100644 --- a/languages/automatewoo.pot +++ b/languages/automatewoo.pot @@ -2,14 +2,14 @@ # This file is distributed under the GPLv3. msgid "" msgstr "" -"Project-Id-Version: AutomateWoo 6.1.0\n" +"Project-Id-Version: AutomateWoo 6.1.1\n" "Report-Msgid-Bugs-To: https://woocommerce.com/my-account/contact-support/\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2024-09-05T13:24:19+00:00\n" +"POT-Creation-Date: 2024-11-14T07:14:24+00:00\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "X-Generator: WP-CLI 2.7.1\n" "X-Domain: automatewoo\n" @@ -3823,7 +3823,6 @@ msgid_plural "Disabled (%s)" msgstr[0] "" msgstr[1] "" -#. translators: placeholder is previous workflow title #: includes/Post_Types.php:90 #: includes/Post_Types.php:93 #: includes/Post_Types.php:96 @@ -3863,7 +3862,6 @@ msgctxt "used in \"Workflow scheduled for \"" msgid "M j, Y @ G:i" msgstr "" -#. translators: php date string, see http://php.net/date #: includes/Post_Types.php:101 msgid "Workflow draft updated." msgstr "" @@ -4248,7 +4246,7 @@ msgstr "" msgid "Cancelled" msgstr "" -#: includes/Queued_Event.php:310 +#: includes/Queued_Event.php:323 msgid "Queued Workflow: Run failed as requirements are no longer met for this workflow." msgstr "" diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 9308033..761b553 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -1,9 +1,9 @@ array( 'name' => 'woocommerce/automatewoo', - 'pretty_version' => 'dev-release/6.1.0', - 'version' => 'dev-release/6.1.0', - 'reference' => '6da258e42b000e8721d6b0e370d96e4da32d57dd', + 'pretty_version' => 'dev-release/6.1.1', + 'version' => 'dev-release/6.1.1', + 'reference' => '87454899359ffd782f18c0789f824031b7c42ec3', 'type' => 'wordpress-plugin', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -11,9 +11,9 @@ ), 'versions' => array( 'woocommerce/automatewoo' => array( - 'pretty_version' => 'dev-release/6.1.0', - 'version' => 'dev-release/6.1.0', - 'reference' => '6da258e42b000e8721d6b0e370d96e4da32d57dd', + 'pretty_version' => 'dev-release/6.1.1', + 'version' => 'dev-release/6.1.1', + 'reference' => '87454899359ffd782f18c0789f824031b7c42ec3', 'type' => 'wordpress-plugin', 'install_path' => __DIR__ . '/../../', 'aliases' => array(),