release: v1.12.15

- Starter Sites Improvements
Codeinwp · Nov 29, 2024 · 4c6dbc2 · 4c6dbc2
2 parents 0bc8d2b + 6bc55b1
commit 4c6dbc2
Show file tree

Hide file tree

Showing 7 changed files with 127 additions and 21 deletions.
diff --git a/assets/src/Components/ImportModal.js b/assets/src/Components/ImportModal.js
@@ -583,6 +583,7 @@ const ImportModal = ( {
 			source: 'remote',
 			frontPage: importData.front_page,
 			shopPages: importData.shop_pages,
+			paymentForms: importData.payment_forms,
 			demoSlug: importData.slug,
 			editor,
 		} )

diff --git a/composer.lock b/composer.lock
diff --git a/includes/Importers/Cleanup/Active_State.php b/includes/Importers/Cleanup/Active_State.php
@@ -14,20 +14,21 @@
  */
 class Active_State {
 
-	const STATE_NAME      = 'neve_last_imports';
-	const HOUR_IN_SECONDS = 3600;
-	const PLUGINS_NSP     = 'plugins';
-	const CATEGORY_NSP    = 'category';
-	const TAGS_NSP        = 'tags';
-	const TERMS_NSP       = 'terms';
-	const POSTS_NSP       = 'posts';
-	const COMMENTS_NSP    = 'comments';
-	const ATTACHMENT_NSP  = 'attachment';
-	const FRONT_PAGE_NSP  = 'front_page_options';
-	const SHOP_PAGE_NSP   = 'shop_page_options';
-	const THEME_MODS_NSP  = 'theme_mods';
-	const MENUS_NSP       = 'menus';
-	const WIDGETS_NSP     = 'widgets';
+	const STATE_NAME       = 'neve_last_imports';
+	const HOUR_IN_SECONDS  = 3600;
+	const PLUGINS_NSP      = 'plugins';
+	const CATEGORY_NSP     = 'category';
+	const TAGS_NSP         = 'tags';
+	const TERMS_NSP        = 'terms';
+	const POSTS_NSP        = 'posts';
+	const COMMENTS_NSP     = 'comments';
+	const ATTACHMENT_NSP   = 'attachment';
+	const FRONT_PAGE_NSP   = 'front_page_options';
+	const SHOP_PAGE_NSP    = 'shop_page_options';
+	const PAYMENT_FORM_NSP = 'payment_form_options';
+	const THEME_MODS_NSP   = 'theme_mods';
+	const MENUS_NSP        = 'menus';
+	const WIDGETS_NSP      = 'widgets';
 	/**
 	 * @var array $state
 	 */
@@ -64,6 +65,7 @@ private function is_allowed_property( $property_key ) {
 				self::WIDGETS_NSP,
 				self::FRONT_PAGE_NSP,
 				self::SHOP_PAGE_NSP,
+				self::PAYMENT_FORM_NSP,
 			),
 			true
 		);

diff --git a/includes/Importers/Cleanup/Manager.php b/includes/Importers/Cleanup/Manager.php
@@ -240,6 +240,44 @@ private function cleanup_options( $namespace, $state ) {
 		}
 	}
 
+	/**
+	 * Handles form cleanup.
+	 * @param array $state The cleanup state.
+	 */
+	private function cleanup_forms( $namespace, $state ) {
+		if ( ! class_exists( 'MM_WPFS_Database' ) ) {
+			return;
+		}
+
+		$db = new \MM_WPFS_Database();
+
+		if ( isset( $state[ $namespace ] ) ) {
+			foreach ( $state[ $namespace ] as $name => $form ) {
+				$get    = 'get' . ucfirst( $form['layout'] ) . ucfirst( $form['type'] ) . 'FormByName';
+				$method = 'delete' . ucfirst( $form['layout'] ) . ucfirst( $form['type'] ) . 'Form';
+				$id     = null;
+
+				if ( method_exists( 'MM_WPFS_Database', $get ) ) {
+					$item = $db->$get( $name );
+					foreach ( $item as $key => $value ) {
+						if ( strpos( $key, 'FormID' ) !== false ) {
+							$id = $value;
+							break;
+						}
+					}
+				}
+
+				if ( empty( $id ) ) {
+					continue;
+				}
+
+				if ( method_exists( 'MM_WPFS_Database', $method ) ) {
+					$db->$method( $id );
+				}
+			}
+		}
+	}
+
 	final public function do_cleanup() {
 		$active_state = new Active_State();
 		$state        = $active_state->get();
@@ -250,6 +288,7 @@ final public function do_cleanup() {
 		$this->cleanup_terms( $state );
 		$this->cleanup_options( Active_State::FRONT_PAGE_NSP, $state );
 		$this->cleanup_options( Active_State::SHOP_PAGE_NSP, $state );
+		$this->cleanup_forms( Active_State::PAYMENT_FORM_NSP, $state );
 		$this->cleanup_posts( $state );
 		$this->cleanup_attachments( $state );
 		$this->cleanup_widgets( $state );

diff --git a/includes/Importers/Content_Importer.php b/includes/Importers/Content_Importer.php
@@ -156,6 +156,12 @@ public function import_remote_xml( WP_REST_Request $request ) {
 		}
 		do_action( 'themeisle_ob_after_shop_pages_setup' );
 
+		// Set payment forms.
+		if ( isset( $body['paymentForms'] ) ) {
+			$this->setup_payment_forms( $body['paymentForms'] );
+		}
+		do_action( 'themeisle_ob_after_payment_forms_setup' );
+
 		if ( empty( $frontpage_id ) ) {
 			$this->logger->log( 'No front page ID.' );
 		}
@@ -265,6 +271,62 @@ public function setup_shop_pages( $pages, $demo_slug ) {
 		$this->logger->log( 'Shop pages set up.', 'success' );
 	}
 
+	public function setup_payment_forms( $forms ) {
+		$this->logger->log( 'Setting up payment forms.', 'progress' );
+		if ( ! class_exists( 'MM_WPFS_Database' ) ) {
+			$this->logger->log( 'No WP Full Stripe.', 'success' );
+			return;
+		}
+
+		if ( ! is_array( $forms ) ) {
+			$this->logger->log( 'No Payment Forms.', 'success' );
+			return;
+		}
+
+		$db = new \MM_WPFS_Database();
+
+		$payment_form_options = array();
+		foreach ( $forms as $key => $form ) {
+			if ( ! in_array( $form['type'], array( 'payment', 'subscription', 'donation' ) ) || ! in_array( $form['layout'], array( 'inline', 'checkout' ) ) ) {
+				continue;
+			}
+
+			$check  = 'get' . ucfirst( $form['layout'] ) . ucfirst( $form['type'] ) . 'FormByName';
+			$insert = 'insert' . ucfirst( $form['layout'] ) . ucfirst( $form['type'] ) . 'Form';
+
+			if ( method_exists( $db, $check ) ) {
+				$existing_form = $db->$check( $form['name'] );
+				if ( $existing_form ) {
+					$this->logger->log( "Form {$form['name']} already exists.", 'success' );
+					continue;
+				}
+			}
+
+			if ( method_exists( $db, $insert ) ) {
+				$form['data'] = array_filter(
+					$form['data'],
+					function ( $key ) {
+						return strpos( $key, 'FormID' ) === false;
+					},
+					ARRAY_FILTER_USE_KEY
+				);
+
+				$db->$insert( $form['data'] );
+
+				$payment_form_options[ $form['data']['name'] ] = array(
+					'layout' => $form['layout'],
+					'type'   => $form['type'],
+				);
+			} else {
+				$this->logger->log( "Method {$insert} does not exist.", 'error' );
+			}
+		}
+
+		do_action( 'themeisle_cl_add_property_state', Active_State::PAYMENT_FORM_NSP, $payment_form_options );
+
+		$this->logger->log( 'Payment forms set up.', 'success' );
+	}
+
 	/**
 	 * Maybe bust cache for elementor plugin.
 	 */

diff --git a/includes/Importers/Plugin_Importer.php b/includes/Importers/Plugin_Importer.php
@@ -53,6 +53,7 @@ class Plugin_Importer {
 		'recipe-card-blocks-by-wpzoom'     => 'wpzoom-recipe-card.php',
 		'restrict-content'                 => 'restrictcontent.php',
 		'pods'                             => 'init.php',
+		'wp-full-stripe-free'              => 'wp-full-stripe.php',
 	);
 
 	public function __construct() {

diff --git a/onboarding/src/Components/Steps/Import.js b/onboarding/src/Components/Steps/Import.js
@@ -160,6 +160,7 @@ const Import = ( {
 			source: 'remote',
 			frontPage: importData.front_page,
 			shopPages: importData.shop_pages,
+			paymentForms: importData.payment_forms,
 			demoSlug: importData.slug,
 			editor,
 		} )