From e699b0e223c3d63ce5ac9a82208598706d2cdb2b Mon Sep 17 00:00:00 2001 From: bplv112 Date: Wed, 31 Aug 2022 13:04:07 -0500 Subject: [PATCH 1/4] fix::check if SSL is present on the server. --- src/Plugin.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Plugin.php b/src/Plugin.php index 77f4c33c..c2aac670 100644 --- a/src/Plugin.php +++ b/src/Plugin.php @@ -107,13 +107,12 @@ public function __construct( string $plugin_file ) { public function add_ssl_notice() { $connected = get_option( 'cc_woo_import_connection_established' ); - if ( ! $connected && 'on' !== $_SERVER['HTTPS'] ) { + if ( ! $connected && ( isset( $_SERVER['HTTPS'] ) && 'on' !== $_SERVER['HTTPS'] ) ) { $message = __( 'Your site does not appear to be using a secure connection (SSL). You might face issues when connecting to your account. Please add HTTPS to your site to make sure you have no issues connecting.', 'cc-woo' ); new Notice( new NoticeMessage( $message, 'error', true ) ); } - } /** From 59a83914e287fde18fa0bbdf1517d56a66663c72 Mon Sep 17 00:00:00 2001 From: bplv112 Date: Wed, 31 Aug 2022 13:12:31 -0500 Subject: [PATCH 2/4] fix::added phpcs xml file to exclude list on composer archive. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index acbc8937..c05362e4 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,6 @@ "generate-fixtures": [ "@php ./tests/cypress/bin/generate-cypress-fixtures.php" ], "dist": [ "rm -rf ./vendor", - "rm -rf ./phpcs.xml.dist", "@composer install --no-dev -a", "@composer archive --format=zip --file constant-contact-woocommerce", "mv constant-contact-woocommerce.zip $HOME/Desktop" @@ -55,6 +54,7 @@ "cypress.*", "phpunit.xml", "README.md", + "phpcs.xml.dist", "tags" ] } From ba469eb0cda53d5a0ff3ea9824e5bbe38f6039d6 Mon Sep 17 00:00:00 2001 From: bplv112 Date: Tue, 13 Sep 2022 12:48:43 -0500 Subject: [PATCH 3/4] chore::preped release and changed version number on respective files. --- README.txt | 5 +++++ package.json | 2 +- src/Plugin.php | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/README.txt b/README.txt index 0cb1d31b..8c272e2e 100644 --- a/README.txt +++ b/README.txt @@ -81,6 +81,11 @@ You've connected your WooCommerce store to Constant Contact, promoted your WooCo == Changelog == += 2.0.1 = + +* Fix - Fixed an issue with notice not working when ssl is found. +* Fix - Minor typo fixes. + = 2.0.0 = * Updated - All new ui for the constant contact woocommerce plugin. diff --git a/package.json b/package.json index a27c1f2e..af67d40d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "constant-contact-woocommerce", - "version": "2.0.0", + "version": "2.0.1", "description": "", "main": "index.js", "engines": { diff --git a/src/Plugin.php b/src/Plugin.php index c2aac670..3fa47245 100644 --- a/src/Plugin.php +++ b/src/Plugin.php @@ -47,7 +47,7 @@ final class Plugin extends ServiceRegistrar { * @since 1.0.0 * @var string */ - const PLUGIN_VERSION = '2.0.0'; + const PLUGIN_VERSION = '2.0.1'; /** * Whether the plugin is currently active. From bcf8813dec16a98e2acfdfb5b78a500707f2a0d4 Mon Sep 17 00:00:00 2001 From: bplv112 Date: Tue, 13 Sep 2022 12:59:34 -0500 Subject: [PATCH 4/4] chore::update dist ignore file. --- .distignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.distignore b/.distignore index 11a5e69e..12949347 100644 --- a/.distignore +++ b/.distignore @@ -9,7 +9,7 @@ cypress.example.json phpcs.xml.dist phpunit.xml README.md -webpac.config.js +webpack.config.js .nvmrc .wordpress-org .vscode