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 diff --git a/.gitignore b/.gitignore index 56c3ea39..7d54e31d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ cypress.env.json cypress.json /tests/cypress/screenshots/* /tests/cypress/videos/* +.vscode/ \ No newline at end of file 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/composer.json b/composer.json index ac695ebe..8d9eac17 100644 --- a/composer.json +++ b/composer.json @@ -13,11 +13,6 @@ "scripts": { "test": [ "./vendor/bin/phpunit" ], "generate-fixtures": [ "@php ./tests/cypress/bin/generate-cypress-fixtures.php" ], - "dist": [ - "rm -rf ./vendor", - "rm -rf ./phpcs.xml.dist", - "@composer install --no-dev -a" - ], "install-codestandards": "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin::run", "lint": "@php ./vendor/squizlabs/php_codesniffer/bin/phpcs --standard=phpcs.xml.dist", "post-install-cmd": [ @@ -53,6 +48,7 @@ "cypress.*", "phpunit.xml", "README.md", + "phpcs.xml.dist", "tags" ] } 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/plugin.php b/plugin.php index 17a9b5d5..ef2e6fd2 100644 --- a/plugin.php +++ b/plugin.php @@ -10,7 +10,7 @@ * Plugin Name: Constant Contact + WooCommerce * Description: Add products to your emails and sync your contacts. * Plugin URI: https://github.com/WebDevStudios/constant-contact-woocommerce - * Version: 2.0.0 + * Version: 2.0.1 * Author: Constant Contact * Author URI: https://www.constantcontact.com/ * Text Domain: cc-woo diff --git a/src/Plugin.php b/src/Plugin.php index 77f4c33c..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. @@ -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 ) ); } - } /**