From 43e0c48e82beb284464f1e95c58caa00765809e0 Mon Sep 17 00:00:00 2001 From: Ramya krishna Date: Fri, 13 Oct 2023 11:43:55 +0530 Subject: [PATCH 1/6] to show sales & discounts based on ``canAccessGlobalCTB`` --- src/app/data/routes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/data/routes.js b/src/app/data/routes.js index 8194243bf..1bbb5a85f 100644 --- a/src/app/data/routes.js +++ b/src/app/data/routes.js @@ -84,7 +84,7 @@ export const routes = [ name: '/store/products', title: __( 'Products & Services', 'wp-plugin-bluehost' ), }, - NewfoldRuntime.hasCapability( 'hasYithExtended' ) + NewfoldRuntime.hasCapability( 'hasYithExtended' ) || (NewfoldRuntime.hasCapability('canAccessGlobalCTB') && (NewfoldRuntime.sdk.ecommerce.brand_settings.brand === "bluehost")) ? { name: "/store/sales_discounts", title: __("Sales & Discounts", "wp-plugin-bluehost"), From 92a1f28ef34094b0a6987525918a4418429e7b1d Mon Sep 17 00:00:00 2001 From: Ramya krishna Date: Mon, 16 Oct 2023 19:41:50 +0530 Subject: [PATCH 2/6] removed brand check --- src/app/data/routes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/data/routes.js b/src/app/data/routes.js index 1bbb5a85f..8c3cee31e 100644 --- a/src/app/data/routes.js +++ b/src/app/data/routes.js @@ -84,7 +84,7 @@ export const routes = [ name: '/store/products', title: __( 'Products & Services', 'wp-plugin-bluehost' ), }, - NewfoldRuntime.hasCapability( 'hasYithExtended' ) || (NewfoldRuntime.hasCapability('canAccessGlobalCTB') && (NewfoldRuntime.sdk.ecommerce.brand_settings.brand === "bluehost")) + NewfoldRuntime.hasCapability( 'hasYithExtended' ) || NewfoldRuntime.hasCapability('canAccessGlobalCTB') ? { name: "/store/sales_discounts", title: __("Sales & Discounts", "wp-plugin-bluehost"), From e1a78f557e4e93adb6b07cd43e30d72f1cf5b411 Mon Sep 17 00:00:00 2001 From: Evan Mullins Date: Tue, 17 Oct 2023 19:22:00 -0400 Subject: [PATCH 3/6] update ctb and deacivate modules - Upgrading newfold-labs/wp-module-deactivation (1.0.0 => 1.0.2) - Upgrading newfold-labs/wp-module-global-ctb (1.0.5 => 1.0.7) --- composer.json | 4 ++-- composer.lock | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index bed5694b2..ac1045819 100644 --- a/composer.json +++ b/composer.json @@ -60,9 +60,9 @@ "newfold-labs/wp-module-ctb": "^1.1.2", "newfold-labs/wp-module-customer-bluehost": "^1.6.0", "newfold-labs/wp-module-data": "^2.4.8", - "newfold-labs/wp-module-deactivation": "^1.0", + "newfold-labs/wp-module-deactivation": "^1.0.2", "newfold-labs/wp-module-ecommerce": "^1.3.0", - "newfold-labs/wp-module-global-ctb": "^1.0.5", + "newfold-labs/wp-module-global-ctb": "^1.0.7", "newfold-labs/wp-module-help-center": "1.0.17", "newfold-labs/wp-module-loader": "^1.0.10", "newfold-labs/wp-module-marketplace": "^2.0.2", diff --git a/composer.lock b/composer.lock index f4869e0fe..f4998c838 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2947a33af8fbbf3bc3e1a6158349a6ce", + "content-hash": "7bbbb9bb1f1dd01fdc854f338d51af11", "packages": [ { "name": "doctrine/inflector", @@ -467,16 +467,16 @@ }, { "name": "newfold-labs/wp-module-deactivation", - "version": "1.0.0", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-deactivation.git", - "reference": "66d9e4d888426094ee6eb3b66d03404a6e8110e3" + "reference": "dd8bf1820a0bd136e1a673d3a4b916b4c581179a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-deactivation/zipball/66d9e4d888426094ee6eb3b66d03404a6e8110e3", - "reference": "66d9e4d888426094ee6eb3b66d03404a6e8110e3", + "url": "https://api.github.com/repos/newfold-labs/wp-module-deactivation/zipball/dd8bf1820a0bd136e1a673d3a4b916b4c581179a", + "reference": "dd8bf1820a0bd136e1a673d3a4b916b4c581179a", "shasum": "" }, "require": { @@ -521,10 +521,10 @@ ], "description": "A Module for handling WordPress brand plugins and modules deactivations", "support": { - "source": "https://github.com/newfold-labs/wp-module-deactivation/tree/1.0.0", + "source": "https://github.com/newfold-labs/wp-module-deactivation/tree/1.0.2", "issues": "https://github.com/newfold-labs/wp-module-deactivation/issues" }, - "time": "2023-10-10T18:09:35+00:00" + "time": "2023-10-17T22:48:37+00:00" }, { "name": "newfold-labs/wp-module-ecommerce", @@ -587,16 +587,16 @@ }, { "name": "newfold-labs/wp-module-global-ctb", - "version": "1.0.5", + "version": "1.0.7", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-global-ctb.git", - "reference": "3f93e096365e761b8aea53cb12b182937cb7c73f" + "reference": "d5aab07f1a9d9ddc8759c83310365da1612a8147" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-global-ctb/zipball/3f93e096365e761b8aea53cb12b182937cb7c73f", - "reference": "3f93e096365e761b8aea53cb12b182937cb7c73f", + "url": "https://api.github.com/repos/newfold-labs/wp-module-global-ctb/zipball/d5aab07f1a9d9ddc8759c83310365da1612a8147", + "reference": "d5aab07f1a9d9ddc8759c83310365da1612a8147", "shasum": "" }, "require-dev": { @@ -630,10 +630,10 @@ ], "description": "Newfold module for 'Click to Buy' functionality in brand plugins", "support": { - "source": "https://github.com/newfold-labs/wp-module-global-ctb/tree/1.0.5", + "source": "https://github.com/newfold-labs/wp-module-global-ctb/tree/1.0.7", "issues": "https://github.com/newfold-labs/wp-module-global-ctb/issues" }, - "time": "2023-10-13T18:12:53+00:00" + "time": "2023-10-17T22:48:10+00:00" }, { "name": "newfold-labs/wp-module-help-center", From 8ca940a465e68a442be0b30dd12042cefb55581a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Oct 2023 00:35:18 +0000 Subject: [PATCH 4/6] Composer(deps): Bump newfold-labs/wp-module-patterns from 0.1.5 to 0.1.6 Bumps [newfold-labs/wp-module-patterns](https://github.com/newfold-labs/wp-module-patterns) from 0.1.5 to 0.1.6. - [Release notes](https://github.com/newfold-labs/wp-module-patterns/releases) - [Commits](https://github.com/newfold-labs/wp-module-patterns/compare/0.1.5...0.1.6) --- updated-dependencies: - dependency-name: newfold-labs/wp-module-patterns dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index ac1045819..90e0a1134 100644 --- a/composer.json +++ b/composer.json @@ -68,7 +68,7 @@ "newfold-labs/wp-module-marketplace": "^2.0.2", "newfold-labs/wp-module-notifications": "^1.1.5", "newfold-labs/wp-module-onboarding": "^1.11.3", - "newfold-labs/wp-module-patterns": "^0.1.5", + "newfold-labs/wp-module-patterns": "^0.1.6", "newfold-labs/wp-module-performance": "^1.2.1", "newfold-labs/wp-module-runtime": "^1.0.7", "newfold-labs/wp-module-secure-passwords": "^1.1", diff --git a/composer.lock b/composer.lock index f4998c838..588625498 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7bbbb9bb1f1dd01fdc854f338d51af11", + "content-hash": "7ca032f1831890283f0f5a3520a0eadf", "packages": [ { "name": "doctrine/inflector", @@ -973,16 +973,16 @@ }, { "name": "newfold-labs/wp-module-patterns", - "version": "0.1.5", + "version": "0.1.6", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-patterns.git", - "reference": "39077cd5bd7b73eca1fafb69272f4f89dc0e1350" + "reference": "3a446d1923c6c9bee13d86d0fda4cc4585742959" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-patterns/zipball/39077cd5bd7b73eca1fafb69272f4f89dc0e1350", - "reference": "39077cd5bd7b73eca1fafb69272f4f89dc0e1350", + "url": "https://api.github.com/repos/newfold-labs/wp-module-patterns/zipball/3a446d1923c6c9bee13d86d0fda4cc4585742959", + "reference": "3a446d1923c6c9bee13d86d0fda4cc4585742959", "shasum": "" }, "require-dev": { @@ -1016,10 +1016,10 @@ ], "description": "WordPress Cloud Patterns", "support": { - "source": "https://github.com/newfold-labs/wp-module-patterns/tree/0.1.5", + "source": "https://github.com/newfold-labs/wp-module-patterns/tree/0.1.6", "issues": "https://github.com/newfold-labs/wp-module-patterns/issues" }, - "time": "2023-10-05T00:00:40+00:00" + "time": "2023-10-16T19:35:02+00:00" }, { "name": "newfold-labs/wp-module-performance", From d87ba53c1003212cefb55514cd9b77ab359cb557 Mon Sep 17 00:00:00 2001 From: Evan Mullins Date: Wed, 18 Oct 2023 09:01:29 -0400 Subject: [PATCH 5/6] version bump to 3.4.2 --- bluehost-wordpress-plugin.php | 4 ++-- package-lock.json | 17 +++++++++-------- package.json | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/bluehost-wordpress-plugin.php b/bluehost-wordpress-plugin.php index 65ca1537f..764233d80 100644 --- a/bluehost-wordpress-plugin.php +++ b/bluehost-wordpress-plugin.php @@ -11,7 +11,7 @@ * Plugin Name: The Bluehost Plugin * Plugin URI: https://bluehost.com * Description: WordPress plugin that integrates a WordPress site with the Bluehost control panel, including performance, security, and update features. - * Version: 3.4.1 + * Version: 3.4.2 * Requires at least: 6.0 * Requires PHP: 7.1 * Tested up to: 6.3.2 @@ -31,7 +31,7 @@ } // Define constants -define( 'BLUEHOST_PLUGIN_VERSION', '3.4.1' ); +define( 'BLUEHOST_PLUGIN_VERSION', '3.4.2' ); define( 'BLUEHOST_PLUGIN_FILE', __FILE__ ); define( 'BLUEHOST_PLUGIN_DIR', plugin_dir_path( __FILE__ ) ); define( 'BLUEHOST_PLUGIN_URL', plugin_dir_url( __FILE__ ) ); diff --git a/package-lock.json b/package-lock.json index fe34b1b0f..dffee0cd9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,12 @@ { "name": "bluehost-wordpress-plugin", - "version": "3.4.1", + "version": "3.4.2", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "3.4.1", + "name": "bluehost-wordpress-plugin", + "version": "3.4.2", "license": "GPL-2.0-or-later", "dependencies": { "@heroicons/react": "^2.0.18", @@ -2066,9 +2067,9 @@ } }, "node_modules/@babel/traverse": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.0.tgz", - "integrity": "sha512-t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw==", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz", + "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==", "dev": true, "dependencies": { "@babel/code-frame": "^7.22.13", @@ -24613,9 +24614,9 @@ } }, "@babel/traverse": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.0.tgz", - "integrity": "sha512-t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw==", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz", + "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==", "dev": true, "requires": { "@babel/code-frame": "^7.22.13", diff --git a/package.json b/package.json index e3f0ae8ce..c6ccb675f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "description": "WordPress plugin that integrates your WordPress site with the Bluehost control panel, including performance, security, and update features.", "license": "GPL-2.0-or-later", - "version": "3.4.1", + "version": "3.4.2", "private": true, "repository": { "type": "git", From 0427457d0097036e2df116801b8bd55931db6ca4 Mon Sep 17 00:00:00 2001 From: Evan Mullins Date: Wed, 18 Oct 2023 12:27:29 -0400 Subject: [PATCH 6/6] update notifications module to fix flaky test and ecommerce for ctb update. - Upgrading newfold-labs/wp-module-notifications (1.1.5 => 1.1.6) - Upgrading newfold-labs/wp-module-ecommerce (v1.3.1 => v1.3.4) --- composer.json | 4 ++-- composer.lock | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/composer.json b/composer.json index 90e0a1134..8cf3c887b 100644 --- a/composer.json +++ b/composer.json @@ -61,12 +61,12 @@ "newfold-labs/wp-module-customer-bluehost": "^1.6.0", "newfold-labs/wp-module-data": "^2.4.8", "newfold-labs/wp-module-deactivation": "^1.0.2", - "newfold-labs/wp-module-ecommerce": "^1.3.0", + "newfold-labs/wp-module-ecommerce": "^1.3.4", "newfold-labs/wp-module-global-ctb": "^1.0.7", "newfold-labs/wp-module-help-center": "1.0.17", "newfold-labs/wp-module-loader": "^1.0.10", "newfold-labs/wp-module-marketplace": "^2.0.2", - "newfold-labs/wp-module-notifications": "^1.1.5", + "newfold-labs/wp-module-notifications": "^1.1.6", "newfold-labs/wp-module-onboarding": "^1.11.3", "newfold-labs/wp-module-patterns": "^0.1.6", "newfold-labs/wp-module-performance": "^1.2.1", diff --git a/composer.lock b/composer.lock index 588625498..5d88ed7bb 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7ca032f1831890283f0f5a3520a0eadf", + "content-hash": "a6a6a2e9e1971d732af59c2b438cf8ed", "packages": [ { "name": "doctrine/inflector", @@ -528,16 +528,16 @@ }, { "name": "newfold-labs/wp-module-ecommerce", - "version": "v1.3.1", + "version": "v1.3.4", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-ecommerce.git", - "reference": "58a01c0b313f1cba857147d4ecdb3189e9c18a9c" + "reference": "693becb29473fc03fd21c936179dfcea96d4882b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-ecommerce/zipball/58a01c0b313f1cba857147d4ecdb3189e9c18a9c", - "reference": "58a01c0b313f1cba857147d4ecdb3189e9c18a9c", + "url": "https://api.github.com/repos/newfold-labs/wp-module-ecommerce/zipball/693becb29473fc03fd21c936179dfcea96d4882b", + "reference": "693becb29473fc03fd21c936179dfcea96d4882b", "shasum": "" }, "require": { @@ -560,7 +560,7 @@ }, "scripts": { "i18n": [ - "vendor/bin/wp i18n make-pot . ./languages/wp-module-ecommerce.pot --headers='{\"Report-Msgid-Bugs-To\":\"https://github.com/aulisius/bluehost-wordpress-plugin/issues\",\"POT-Creation-Date\":null}' --exclude=node_modules,src,tests" + "vendor/bin/wp i18n make-pot . ./languages/wp-module-ecommerce.pot --headers='{\"Report-Msgid-Bugs-To\":\"https://github.com/newfold-labs/wp-module-ecommerce/issues\",\"POT-Creation-Date\":null}' --exclude=node_modules,src,tests" ], "fix": [ "vendor/bin/phpcbf --standard=phpcs.xml ." @@ -580,10 +580,10 @@ ], "description": "Brand Agnostic eCommerce Experience", "support": { - "source": "https://github.com/newfold-labs/wp-module-ecommerce/tree/v1.3.1", + "source": "https://github.com/newfold-labs/wp-module-ecommerce/tree/v1.3.4", "issues": "https://github.com/newfold-labs/wp-module-ecommerce/issues" }, - "time": "2023-10-11T07:08:22+00:00" + "time": "2023-10-18T16:16:35+00:00" }, { "name": "newfold-labs/wp-module-global-ctb", @@ -828,16 +828,16 @@ }, { "name": "newfold-labs/wp-module-notifications", - "version": "1.1.5", + "version": "1.1.6", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-notifications.git", - "reference": "042b1ca38ab5f89b1c9e1645eee48863b9f8aa4f" + "reference": "040c63553978974bdebc066febb0ba3842875095" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-notifications/zipball/042b1ca38ab5f89b1c9e1645eee48863b9f8aa4f", - "reference": "042b1ca38ab5f89b1c9e1645eee48863b9f8aa4f", + "url": "https://api.github.com/repos/newfold-labs/wp-module-notifications/zipball/040c63553978974bdebc066febb0ba3842875095", + "reference": "040c63553978974bdebc066febb0ba3842875095", "shasum": "" }, "require": { @@ -866,10 +866,10 @@ ], "description": "A module for managing Newfold in-site notifications.", "support": { - "source": "https://github.com/newfold-labs/wp-module-notifications/tree/1.1.5", + "source": "https://github.com/newfold-labs/wp-module-notifications/tree/1.1.6", "issues": "https://github.com/newfold-labs/wp-module-notifications/issues" }, - "time": "2023-09-19T22:36:12+00:00" + "time": "2023-10-18T16:10:26+00:00" }, { "name": "newfold-labs/wp-module-onboarding",