Merge branch 'develop' into release/2.13.3

bluehost · Apr 26, 2023 · a06fc3f · a06fc3f
2 parents ecc0f29 + 4166bae
commit a06fc3f
Show file tree

Hide file tree

Showing 12 changed files with 91 additions and 436 deletions.
diff --git a/bluehost-wordpress-plugin.php b/bluehost-wordpress-plugin.php
@@ -18,6 +18,8 @@
 
 use NewfoldLabs\WP\ModuleLoader\Container;
 use NewfoldLabs\WP\ModuleLoader\Plugin;
+// use NewfoldLabs\WP\Module\CustomerBluehost\CustomerBluehost;
+use Bluehost\SiteMeta;
 
 use function NewfoldLabs\WP\ModuleLoader\container as setContainer;
 
@@ -122,6 +124,8 @@ function () {
 					'file'         => BLUEHOST_PLUGIN_FILE,
 					'brand'        => get_option( 'mm_brand', 'bluehost' ),
 					'install_date' => get_option( 'bh_plugin_install_date' ),
+					// 'customer'     => CustomerBluehost::collect(),
+					'site_id'      => SiteMeta::get_id(),
 				)
 			);
 		}

diff --git a/bootstrap.php b/bootstrap.php
@@ -74,7 +74,6 @@ function () {
 require __DIR__ . '/inc/cli-init.php';
 require __DIR__ . '/inc/jetpack.php';
 require __DIR__ . '/inc/menu.php';
-require __DIR__ . '/inc/CTB/bootstrap.php';
 require __DIR__ . '/inc/partners.php';
 require __DIR__ . '/inc/performance.php';
 require __DIR__ . '/inc/track-last-login.php';

diff --git a/composer.json b/composer.json
@@ -38,11 +38,12 @@
         "doctrine/inflector": "1.2.0 as 1.3.1",
         "newfold-labs/wp-module-business-reviews": "^1.1",
         "newfold-labs/wp-module-coming-soon": "^1.1.3",
+        "newfold-labs/wp-module-ctb": "^1.0.0",
         "newfold-labs/wp-module-customer-bluehost": "^1.5.3",
         "newfold-labs/wp-module-data": "^2.3.0",
         "newfold-labs/wp-module-ecommerce": "0.8.2",
         "newfold-labs/wp-module-loader": "^1.0.10",
-        "newfold-labs/wp-module-marketplace": "^1.5.0",
+        "newfold-labs/wp-module-marketplace": "^1.5.1",
         "newfold-labs/wp-module-notifications": "^1.1.2",
         "newfold-labs/wp-module-onboarding": "1.4.1",
         "newfold-labs/wp-module-secure-passwords": "^1.1",

diff --git a/composer.lock b/composer.lock
diff --git a/inc/CTB/CTBApi.php b/inc/CTB/CTBApi.php
diff --git a/inc/CTB/bootstrap.php b/inc/CTB/bootstrap.php