From 3d2ce55b1126900a526817cbc25f4f46349fb0c1 Mon Sep 17 00:00:00 2001 From: Nerijus Zaniauskas Date: Mon, 12 Feb 2024 17:58:18 +0200 Subject: [PATCH 1/6] Use updated Omnisend plugin --- composer.lock | 2 +- .../class-omnisendaddon.php | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.lock b/composer.lock index 15e1992..b39c963 100644 --- a/composer.lock +++ b/composer.lock @@ -407,5 +407,5 @@ "platform-dev": { "php": ">=7.1.0" }, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.3.0" } diff --git a/omnisend-for-gravity-forms/class-omnisendaddon.php b/omnisend-for-gravity-forms/class-omnisendaddon.php index b8ba1b5..23425b5 100644 --- a/omnisend-for-gravity-forms/class-omnisendaddon.php +++ b/omnisend-for-gravity-forms/class-omnisendaddon.php @@ -5,7 +5,7 @@ * @package OmnisendGravityFormsPlugin */ -use Omnisend\Public\V1\Contact; +use Omnisend\Sdk\V1\Contact; if ( ! defined( 'ABSPATH' ) ) { exit; @@ -41,13 +41,13 @@ public function omnisend_custom_requirement_callback( $meets_requirements ) { return $meets_requirements; } - if ( ! class_exists( 'Omnisend\Public\V1\Omnisend' ) ) { + if ( ! class_exists( 'Omnisend\Sdk\V1\Omnisend' ) ) { $meets_requirements['meets_requirements'] = false; $meets_requirements['errors'][] = 'Your Email Marketing by Omnisend is not up to date. Please update plugins'; return $meets_requirements; } - if ( ! Omnisend\Public\V1\Omnisend::is_connected() ) { + if ( ! Omnisend\Sdk\V1\Omnisend::is_connected() ) { $meets_requirements['meets_requirements'] = false; $meets_requirements['errors'][] = 'Your Email Marketing by Omnisend is not configured properly. Please configure it firstly'; } @@ -265,7 +265,7 @@ public function form_settings_fields( $form ) { * @param array $form The form currently being processed. */ public function after_submission( $entry, $form ) { - if ( ! class_exists( 'Omnisend\Public\V1\Omnisend' ) ) { + if ( ! class_exists( 'Omnisend\Sdk\V1\Omnisend' ) ) { return; } @@ -351,13 +351,13 @@ public function after_submission( $entry, $form ) { $this->mapCustomProperties( $form, $entry, $settings, $contact ); - $response = \Omnisend\Public\V1\Omnisend::get_client( OMNISEND_GRAVITY_ADDON_NAME, OMNISEND_GRAVITY_ADDON_VERSION )->create_contact( $contact ); - if ( is_wp_error( $response ) ) { - error_log( 'Error in after_submission: ' . $response->get_error_message()); // phpcs:ignore + $response = \Omnisend\Sdk\V1\Omnisend::get_client( OMNISEND_GRAVITY_ADDON_NAME, OMNISEND_GRAVITY_ADDON_VERSION )->create_contact( $contact ); + if ( $response->get_wp_error()->has_errors() ) { + error_log( 'Error in after_submission: ' . $response->get_wp_error()->get_error_message()); // phpcs:ignore return; } - if ( ! is_string( $response ) ) { + if ( ! $response->get_contact_id() ) { error_log( 'Unexpected error. Please contact Omnisend support.'); // phpcs:ignore return; } From 9fe2f7717c4a8b8bb64186074e54cb219f47c66f Mon Sep 17 00:00:00 2001 From: Nerijus Zaniauskas Date: Mon, 12 Feb 2024 18:10:19 +0200 Subject: [PATCH 2/6] Use updated Omnisend plugin --- omnisend-for-gravity-forms/class-omnisendaddon.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/omnisend-for-gravity-forms/class-omnisendaddon.php b/omnisend-for-gravity-forms/class-omnisendaddon.php index 23425b5..1d8a5fb 100644 --- a/omnisend-for-gravity-forms/class-omnisendaddon.php +++ b/omnisend-for-gravity-forms/class-omnisendaddon.php @@ -357,11 +357,6 @@ public function after_submission( $entry, $form ) { return; } - if ( ! $response->get_contact_id() ) { - error_log( 'Unexpected error. Please contact Omnisend support.'); // phpcs:ignore - return; - } - $this->enableWebTracking( $email, $phone_number ); } catch ( Exception $e ) { From f99aec28238ce4a2091f98934f6363e51d14ab03 Mon Sep 17 00:00:00 2001 From: Nerijus Zaniauskas Date: Mon, 12 Feb 2024 18:11:08 +0200 Subject: [PATCH 3/6] Restore --- composer.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.lock b/composer.lock index b39c963..15e1992 100644 --- a/composer.lock +++ b/composer.lock @@ -407,5 +407,5 @@ "platform-dev": { "php": ">=7.1.0" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } From f84f2fba0008c592771a2141b08fdc7be237542d Mon Sep 17 00:00:00 2001 From: Nerijus Zaniauskas Date: Tue, 13 Feb 2024 09:37:19 +0200 Subject: [PATCH 4/6] Change namespace --- omnisend-for-gravity-forms/class-omnisendaddon.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/omnisend-for-gravity-forms/class-omnisendaddon.php b/omnisend-for-gravity-forms/class-omnisendaddon.php index 1d8a5fb..71d4cd1 100644 --- a/omnisend-for-gravity-forms/class-omnisendaddon.php +++ b/omnisend-for-gravity-forms/class-omnisendaddon.php @@ -5,7 +5,7 @@ * @package OmnisendGravityFormsPlugin */ -use Omnisend\Sdk\V1\Contact; +use Omnisend\SDK\V1\Contact; if ( ! defined( 'ABSPATH' ) ) { exit; @@ -41,13 +41,13 @@ public function omnisend_custom_requirement_callback( $meets_requirements ) { return $meets_requirements; } - if ( ! class_exists( 'Omnisend\Sdk\V1\Omnisend' ) ) { + if ( ! class_exists( 'Omnisend\SDK\V1\Omnisend' ) ) { $meets_requirements['meets_requirements'] = false; $meets_requirements['errors'][] = 'Your Email Marketing by Omnisend is not up to date. Please update plugins'; return $meets_requirements; } - if ( ! Omnisend\Sdk\V1\Omnisend::is_connected() ) { + if ( ! Omnisend\SDK\V1\Omnisend::is_connected() ) { $meets_requirements['meets_requirements'] = false; $meets_requirements['errors'][] = 'Your Email Marketing by Omnisend is not configured properly. Please configure it firstly'; } @@ -265,7 +265,7 @@ public function form_settings_fields( $form ) { * @param array $form The form currently being processed. */ public function after_submission( $entry, $form ) { - if ( ! class_exists( 'Omnisend\Sdk\V1\Omnisend' ) ) { + if ( ! class_exists( 'Omnisend\SDK\V1\Omnisend' ) ) { return; } @@ -351,7 +351,7 @@ public function after_submission( $entry, $form ) { $this->mapCustomProperties( $form, $entry, $settings, $contact ); - $response = \Omnisend\Sdk\V1\Omnisend::get_client( OMNISEND_GRAVITY_ADDON_NAME, OMNISEND_GRAVITY_ADDON_VERSION )->create_contact( $contact ); + $response = \Omnisend\SDK\V1\Omnisend::get_client( OMNISEND_GRAVITY_ADDON_NAME, OMNISEND_GRAVITY_ADDON_VERSION )->create_contact( $contact ); if ( $response->get_wp_error()->has_errors() ) { error_log( 'Error in after_submission: ' . $response->get_wp_error()->get_error_message()); // phpcs:ignore return; From b133adbf45c21d10c8a8795a50c5e8732da2af20 Mon Sep 17 00:00:00 2001 From: Nerijus Zaniauskas Date: Tue, 13 Feb 2024 11:20:39 +0200 Subject: [PATCH 5/6] Update version --- .../class-omnisend-addon-bootstrap.php | 2 +- omnisend-for-gravity-forms/readme.txt | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/omnisend-for-gravity-forms/class-omnisend-addon-bootstrap.php b/omnisend-for-gravity-forms/class-omnisend-addon-bootstrap.php index eabfdc1..1d90e21 100644 --- a/omnisend-for-gravity-forms/class-omnisend-addon-bootstrap.php +++ b/omnisend-for-gravity-forms/class-omnisend-addon-bootstrap.php @@ -2,7 +2,7 @@ /** * Plugin Name: Omnisend for Gravity Forms Add-On * Description: A gravity forms add-on to sync contacts with Omnisend. In collaboration with Omnisnnd for WooCommerce plugin it enables better customer tracking - * Version: 1.1.1 + * Version: 1.2.0 * Author: Omnisend * Author URI: https://www.omnisend.com * Developer: Omnisend diff --git a/omnisend-for-gravity-forms/readme.txt b/omnisend-for-gravity-forms/readme.txt index 4b1c3e0..5ed5bbd 100644 --- a/omnisend-for-gravity-forms/readme.txt +++ b/omnisend-for-gravity-forms/readme.txt @@ -5,7 +5,7 @@ Tags: Gravity forms, form, email marketing, web tracking, subscriber collection Requires at least: 4.7.0 Tested up to: 6.4 Requires PHP: 7.1 -Stable tag: 1.1.1 +Stable tag: 1.2.0 License: GPLv3 or later License URI: http://www.gnu.org/licenses/gpl-3.0.html @@ -61,6 +61,10 @@ Read Omnisend [Terms of Use](https://www.omnisend.com/terms) == Changelog == += 1.2.0 = + +* Used Updated Omnisend plugin. + = 1.1.1 = * Update plugin icon. From 999b5e6da4238783e8af1aba7eb2afdc0aa37c40 Mon Sep 17 00:00:00 2001 From: Nerijus Zaniauskas Date: Tue, 13 Feb 2024 11:33:03 +0200 Subject: [PATCH 6/6] Update readme.txt --- omnisend-for-gravity-forms/readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omnisend-for-gravity-forms/readme.txt b/omnisend-for-gravity-forms/readme.txt index 5ed5bbd..2ce3227 100644 --- a/omnisend-for-gravity-forms/readme.txt +++ b/omnisend-for-gravity-forms/readme.txt @@ -63,7 +63,7 @@ Read Omnisend [Terms of Use](https://www.omnisend.com/terms) = 1.2.0 = -* Used Updated Omnisend plugin. +* Use Updated Omnisend plugin. = 1.1.1 =