Merge pull request #602 from bluehost/release/3.0.9

Release/3.0.9
bluehost · Aug 9, 2023 · e6e040a · e6e040a
2 parents a066d2c + fd36e4d
commit e6e040a
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 44 deletions.
diff --git a/.github/workflows/cypress-matrix.yml b/.github/workflows/cypress-matrix.yml
@@ -30,9 +30,9 @@ jobs:
           - '8.1'
           - '8.2'
         wpVersion:
-          - '6.0'
           - '6.1'
           - '6.2'
+          - '6.3'
 
     steps:
 

diff --git a/.wp-env.json b/.wp-env.json
@@ -1,5 +1,5 @@
 {
-    "core": "WordPress/WordPress#tags/6.2.2",
+    "core": "WordPress/WordPress#tags/6.3",
     "config": {
         "WP_DEBUG": true,
         "WP_DEBUG_LOG": true,

diff --git a/bluehost-wordpress-plugin.php b/bluehost-wordpress-plugin.php
@@ -11,10 +11,10 @@
  * 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.0.8
+ * Version:           3.0.9
  * Requires at least: 6.0
  * Requires PHP:      7.1
- * Tested up to:      6.2.2
+ * Tested up to:      6.3
  * Author:            Bluehost
  * Author URI:        https://bluehost.com
  * Text Domain:       wp-plugin-bluehost
@@ -31,7 +31,7 @@
 }
 
 // Define constants
-define( 'BLUEHOST_PLUGIN_VERSION', '3.0.8' );
+define( 'BLUEHOST_PLUGIN_VERSION', '3.0.9' );
 define( 'BLUEHOST_PLUGIN_FILE', __FILE__ );
 define( 'BLUEHOST_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
 define( 'BLUEHOST_PLUGIN_URL', plugin_dir_url( __FILE__ ) );

diff --git a/composer.json b/composer.json
@@ -60,7 +60,7 @@
     "newfold-labs/wp-module-coming-soon": "^1.1.3",
     "newfold-labs/wp-module-ctb": "^1.0.0",
     "newfold-labs/wp-module-customer-bluehost": "^1.6.0",
-    "newfold-labs/wp-module-data": "^2.3.4",
+    "newfold-labs/wp-module-data": "^2.4.3",
     "newfold-labs/wp-module-ecommerce": "^1.1.1",
     "newfold-labs/wp-module-help-center": "^1.0.11",
     "newfold-labs/wp-module-loader": "^1.0.10",

diff --git a/composer.lock b/composer.lock
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "bluehost-wordpress-plugin",
     "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.0.8",
+    "version": "3.0.9",
     "private": true,
     "repository": {
         "type": "git",
@@ -47,7 +47,7 @@
         "@replayio/cypress": "^1.0.2",
         "@tailwindcss/forms": "^0.5.3",
         "@testing-library/cypress": "^9.0.0",
-        "@wordpress/env": "^8.2.0",
+        "@wordpress/env": "^8.4.0",
         "@wordpress/scripts": "^26.6.0",
         "@yoast/tailwindcss-preset": "^2.2.0",
         "cypress": "^12.15.0",

diff --git a/src/app/components/icons/HelpIcon.svg b/src/app/components/icons/HelpIcon.svg
diff --git a/src/app/data/routes.js b/src/app/data/routes.js
@@ -18,6 +18,7 @@ import Settings from '../pages/settings';
 import Staging from '../pages/staging';
 import Example from '../pages/example';
 import Help from '../pages/help';
+import { ReactComponent as HelpIcon } from "../components/icons/HelpIcon.svg";
 
 const addPartialMatch = (prefix, path) =>
   prefix === path ? `${prefix}/*` : path;
@@ -89,6 +90,12 @@ export const routes = [
 				title: __("Sales & Discounts", "wp-plugin-bluehost"),
 			}
 			: null,
+			NewfoldRuntime.hasCapability( 'isEcommerce' )
+			? {
+				name: '/store/payments',
+				title: __( 'Payments', 'wp-plugin-bluehost' ),
+			}
+			: null,
 			{
 				name: '/store/details',
 				title: __( 'Store Details', 'wp-plugin-bluehost' ),
@@ -150,7 +157,7 @@ export const routes = [
 		name: '/help',
 		title: __( 'Help', 'wp-plugin-bluehost' ),
 		Component: Help,
-		Icon: QuestionMarkCircleIcon,
+		Icon: HelpIcon,
 		action: NewfoldRuntime.hasCapability( 'canAccessHelpCenter' ) ? HelpCenterAI : false,
 	},
 ];
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,9 +30,9 @@ jobs: @@
               - '8.1'
               - '8.2'
             wpVersion:
-              - '6.0'
               - '6.1'
               - '6.2'
+              - '6.3'
         steps:
@@ Expand Down @@