Fix checkout

composer.json

@@ -33,8 +33,8 @@
         "php": ">=7.4.1",
         "automattic/jetpack-autoloader": "^5.0.0",
         "wp-ultimo/autoloader-plugin": "dev-main",
-        "wordpress/abilities-api": "dev-trunk",
-        "wordpress/mcp-adapter": "dev-trunk",
+        "wordpress/abilities-api": "^0.1.1",
+        "wordpress/mcp-adapter": "dev-trunk#7a2d22cff92328bc94f5b1648a66ae4273e949c5",
         "rpnzl/arrch": "dev-master#994258bbefb7722243211654c4f78813312cd5ed",
         "amphp/amp": "^2.6.2",
         "amphp/byte-stream": "^1.8.1",
@@ -189,4 +189,4 @@
     "replace": {
         "paragonie/random_compat": "*"
     }
-}
+}

inc/builders/block-editor/class-block-editor-widget-manager.php

@@ -36,7 +36,7 @@ public function init(): void {
 
 			add_action('init', [$this, 'register_scripts']);
 
-			add_action('wu_element_is_preview', [$this, 'is_block_preview']);
+			add_filter('wu_element_is_preview', [$this, 'is_block_preview']);
 		}
 	}
 
@@ -111,7 +111,7 @@ public function register_block($element): void {
 			[
 				'attributes'      => $attributes,
 				'editor_script'   => 'wu-blocks',
-				'render_callback' => \Closure::fromCallable([$element, 'display']),
+				'render_callback' => \Closure::fromCallable([$element, 'get_content']),
 			]
 		);
 	}

inc/checkout/class-cart.php

@@ -10,6 +10,7 @@
 namespace WP_Ultimo\Checkout;
 
 use WP_Ultimo\Database\Memberships\Membership_Status;
+use WP_Ultimo\Database\Payments\Payment_Status;
 use Arrch\Arrch as Array_Search;
 
 // Exit if accessed directly
@@ -475,11 +476,16 @@ protected function build_cart() {
 
 		if (is_array($this->attributes->products)) {
 			/*
-			 * Otherwise, we add the products to build the cart.
-			 */
+			* Otherwise, we add the products to build the cart.
+			*/
 			foreach ($this->attributes->products as $product_id) {
 				$this->add_product($product_id);
 			}
+
+			/*
+			* Cancel conflicting pending payments for new checkouts.
+			*/
+			$this->cancel_conflicting_pending_payments();
 		}
 	}
 
@@ -1581,6 +1587,13 @@ public function add_product($product_id_or_slug, $quantity = 1): bool {
 			return false;
 		}
 
+		// Check if this product is already in the cart (prevents duplicates when building from payment/membership)
+		foreach ($this->products as $existing_product) {
+			if ($existing_product->get_id() === $product->get_id()) {
+				return true; // Silently skip duplicate
+			}
+		}
+
 		// Here we check if the product is recurring and if so, get the correct variation
 		if ($product->is_recurring() && ! empty($this->duration) && ($product->get_duration() !== $this->duration || $product->get_duration_unit() !== $this->duration_unit)) {
 			$product = $product->get_as_variation($this->duration, $this->duration_unit);
@@ -1596,17 +1609,23 @@ public function add_product($product_id_or_slug, $quantity = 1): bool {
 
 		if ($product->get_type() === 'plan') {
 			/*
-			 * If we already have a plan, we can't add
-			 * another one. Bail.
+			 * If we already have a plan, we can't add another one
+			 * unless it's the same plan (which can happen when
+			 * building from payment/membership and products are passed).
 			 */
-			if ( ! empty($this->plan_id)) {
-				$message = __('Theres already a plan in this membership.', 'ultimate-multisite');
+			if ( ! empty($this->plan_id) && $this->plan_id !== $product->get_id()) {
+				$message = __("There's already a plan in this membership.", 'ultimate-multisite');
 
 				$this->errors->add('plan-already-added', $message);
 
 				return false;
 			}
 
+			// If it's the same plan, just skip adding it again
+			if ($this->plan_id === $product->get_id()) {
+				return true;
+			}
+
 			$this->plan_id        = $product->get_id();
 			$this->billing_cycles = $product->get_billing_cycles();
 		}
@@ -2771,4 +2790,35 @@ public function get_cart_url() {
 			$base_url
 		);
 	}
+
+	/**
+	 * Cancels conflicting pending payments for new checkouts.
+	 *
+	 * @since 2.1.4
+	 * @return void
+	 */
+	protected function cancel_conflicting_pending_payments(): void {
+
+		if ('new' !== $this->cart_type || ! $this->customer) {
+			return;
+		}
+
+		$pending_payments = wu_get_payments(
+			[
+				'customer_id' => $this->customer->get_id(),
+				'status'      => Payment_Status::PENDING,
+			]
+		);
+
+		foreach ($pending_payments as $payment) {
+			// Cancel if it's not the same cart (simple check: different total or products)
+			$payment_total = $payment->get_total();
+			$cart_total    = $this->get_total();
+
+			if (abs($payment_total - $cart_total) > 0.01) { // Allow small differences
+				$payment->set_status(Payment_Status::CANCELLED);
+				$payment->save();
+			}
+		}
+	}
 }