Merge branch 'trunk' into update/changeOptionName

newfold-labs · Jun 12, 2024 · 53a5d46 · 53a5d46
2 parents c46f1b4 + f984224
commit 53a5d46
Show file tree

Hide file tree

Showing 39 changed files with 3,917 additions and 2,889 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,3 +23,4 @@ cypress.env.json
 *.log
 *.sql
 *.zip
+.vscode/settings.json
diff --git a/bootstrap.php b/bootstrap.php
@@ -5,7 +5,7 @@
 
 use function NewfoldLabs\WP\ModuleLoader\register;
 
-define( 'NFD_ECOMMERCE_MODULE_VERSION', '1.3.31' );
+define( 'NFD_ECOMMERCE_MODULE_VERSION', '1.3.32' );
 
 if ( function_exists( 'is_admin' ) && is_admin() ) {
 	$old_woocommerce_module_version = get_option( 'nfd_ecommerce_module_version' );

diff --git a/build/index.asset.php b/build/index.asset.php
@@ -1 +1,2 @@
 <?php return array('dependencies' => array('lodash', 'moment', 'react', 'wp-api-fetch', 'wp-data', 'wp-date', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-url'), 'version' => 'befd0e22adb79ae95781');
+
diff --git a/composer.json b/composer.json
@@ -56,6 +56,9 @@
   "config": {
     "optimize-autoloader": true,
     "sort-packages": true,
+    "platform": {
+      "php": "7.3.0"
+    },
     "preferred-install": {
       "newfold-labs/*": "source",
       "*": "dist"

diff --git a/composer.lock b/composer.lock
diff --git a/includes/RestApi/PluginsController.php b/includes/RestApi/PluginsController.php
@@ -103,8 +103,9 @@ public function get_plugins_status( \WP_REST_Request $request) {
 		}
 		$plugins_queue = array_column( $this->get_plugin_queue(), 'slug' );
 		$plugin_being_installed = \get_option( InstallerOptions::get_option_name( 'plugins_init_status' ), false);
-		if ($plugin_being_installed !== false && $plugin_being_installed !== 'completed') {
-			$plugins_queue[] = $plugin_being_installed;
+		$plugin_being_installed_queue = \get_option( InstallerOptions::get_option_name( 'plugin_install_queue' ), array());
+    if ($plugin_being_installed !== false && $plugin_being_installed !== 'completed') {
+      $plugins_queue[] = $plugin_being_installed_queue;
 		}
 		return new \WP_REST_Response(
 			array(