Merge pull request #4084 from woocommerce/dev/PCP-4891-agentic-commerce

Agentic Commerce (4891)

Author: Dinamiko

composer.json

@@ -18,7 +18,8 @@
         "psr/log": "^1.1",
         "ralouphie/getallheaders": "^3.0",
         "wikimedia/composer-merge-plugin": "^2.0",
-        "symfony/polyfill-php80": "^1.19"
+        "symfony/polyfill-php80": "^1.19",
+        "firebase/php-jwt": "^6"
     },
     "require-dev": {
         "inpsyde/composer-assets-compiler": "^2.5",
@@ -112,6 +113,11 @@
             "dealerdirect/phpcodesniffer-composer-installer": true,
             "wikimedia/composer-merge-plugin": true,
             "composer/installers": true
+        },
+        "audit": {
+            "ignore": {
+                "PKSA-y2cr-5h3j-g3ys": "Disputed CVE. Only affects applications generating weak keys, which is not relevant for this plugin."
+            }
         }
     }
 }

composer.lock

@@ -10,8 +10,9 @@
 use WooCommerce\PayPalCommerce\PayLaterBlock\PayLaterBlockModule;
 use WooCommerce\PayPalCommerce\PayLaterWCBlocks\PayLaterWCBlocksModule;
 use WooCommerce\PayPalCommerce\PayLaterConfigurator\PayLaterConfiguratorModule;
+use WooCommerce\PayPalCommerce\Settings\SettingsModule;
 
-return function ( string $root_dir ): iterable {
+return static function ( string $root_dir ): iterable {
 	$modules_dir = "$root_dir/modules";
 
 	$modules = array(
@@ -85,5 +86,12 @@
 		$modules[] = ( require "$modules_dir/ppcp-axo-block/module.php" )();
 	}
 
+	if ( apply_filters(
+		'woocommerce.feature-flags.woocommerce_paypal_payments.store_sync_enabled',
+		getenv( 'PCP_STORE_SYNC_ENABLED' ) === '1'
+	) ) {
+		$modules[] = ( require "$modules_dir/ppcp-store-sync/module.php" )();
+	}
+
 	return $modules;
 };

modules.php

@@ -203,4 +203,50 @@ public function order( string $id ): array {
 
 		return $response;
 	}
+
+	/**
+	 * Patch a PayPal order.
+	 *
+	 * @param string $id PayPal order ID.
+	 * @param array  $patch_data The PATCH operations array.
+	 * @return array
+	 * @throws RuntimeException If something went wrong with the request.
+	 * @throws PayPalApiException If something went wrong with the PayPal API request.
+	 */
+	public function patch_order( string $id, array $patch_data ): array {
+		$bearer = $this->bearer->bearer();
+		$url    = trailingslashit( $this->host ) . 'v2/checkout/orders/' . $id;
+
+		$args = array(
+			'method'  => 'PATCH',
+			'headers' => array(
+				'Authorization'     => 'Bearer ' . $bearer->token(),
+				'Content-Type'      => 'application/json',
+				'PayPal-Request-Id' => uniqid( 'ppcp-', true ),
+			),
+			'body'    => wp_json_encode( $patch_data ),
+		);
+
+		$response = $this->request( $url, $args );
+		if ( $response instanceof WP_Error ) {
+			throw new RuntimeException( $response->get_error_message() );
+		}
+
+		$status_code = (int) wp_remote_retrieve_response_code( $response );
+		if ( $status_code !== 204 ) {
+			$body = json_decode( $response['body'] );
+
+			$message = $body->details[0]->description ?? '';
+			if ( $message ) {
+				throw new RuntimeException( $message );
+			}
+
+			throw new PayPalApiException(
+				$body,
+				$status_code
+			);
+		}
+
+		return $response;
+	}
 }

modules/ppcp-api-client/src/Endpoint/Orders.php

@@ -143,7 +143,7 @@ static function () use ( $c ) {
 		add_filter(
 			'woocommerce_paypal_payments_sdk_components_hook',
 			function ( array $components, string $context ) {
-				if ( str_ends_with( $context, '-block' ) ) {
+				if ( substr( $context, -6 ) === '-block' ) {
 					$components[] = 'buttons';
 				}
 

modules/ppcp-blocks/src/BlocksModule.php

@@ -563,7 +563,7 @@ private function create_paypal_order( ?WC_Order $wc_order = null, string $paymen
 				&& array_filter(
 					$exception->details(),
 					function ( stdClass $detail ): bool {
-						return isset( $detail->field ) && str_contains( (string) $detail->field, 'shipping/address' );
+						return isset( $detail->field ) && strpos( (string) $detail->field, 'shipping/address' ) !== false;
 					}
 				) ) {
 				$this->logger->info( 'Invalid shipping address for order creation, retrying without it.' );

modules/ppcp-button/src/Endpoint/CreateOrderEndpoint.php

@@ -443,6 +443,11 @@ function ( $option ) {
 			$shipping                                   = $this->shipping_factory->from_paypal_response( $shipping_address_data );
 		}
 
-		return $shipping;
+		return apply_filters(
+			'woocommerce_paypal_payments_order_creator_get_shipping',
+			$shipping,
+			$order,
+			$paypal_data
+		);
 	}
 }

modules/ppcp-button/src/Helper/WooCommerceOrderCreator.php

@@ -187,8 +187,15 @@ function ( Order $order ) use ( $c ) {
 
 					$logger->warning( "Could not capture order {$order->id()}" );
 
-					if ( apply_filters( 'woocommerce_paypal_payments_force_delete_wc_order_on_failed_capture', true ) ) {
-						// Add delete order flag in WC session to force delete on process payment failure handler.
+					// Only set session flag if WC session exists (not in API/agentic context).
+					/**
+					 * Fires to add a delete order flag in WC session.
+					 */
+					if ( apply_filters( 'woocommerce_paypal_payments_force_delete_wc_order_on_failed_capture', true )
+						&& function_exists( 'WC' ) && WC()->session instanceof \WC_Session ) {
+						/**
+						 * Add delete order flag in WC session to force delete on process payment failure handler.
+						 */
 						WC()->session->set( 'ppcp_delete_wc_order_on_payment_failure', true );
 					}
 

modules/ppcp-card-fields/src/CardFieldsModule.php

@@ -542,7 +542,7 @@ private function is_rest_request(): bool {
 		// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
 		$request_uri = wp_unslash( $_SERVER['REQUEST_URI'] ?? '' );
 
-		return str_contains( $request_uri, '/wp-json/wc/' );
+		return is_string( $request_uri ) && strpos( $request_uri, '/wp-json/wc/' ) !== false;
 	}
 
 	/**

modules/ppcp-local-alternative-payment-methods/src/LocalAlternativePaymentMethodsModule.php

@@ -10,11 +10,10 @@ import SettingsBlock from '@ppcp-settings/Components/ReusableComponents/Settings
 import Accordion from '@ppcp-settings/Components/ReusableComponents/AccordionSection';
 import { SettingsHooks } from '@ppcp-settings/data';
 import SoftDescriptorInput from '@ppcp-settings/Components/ReusableComponents/Controls/SoftdescriptorInput';
+import { useRegisteredSettings, SLOTS } from '@ppcp-settings/extensions';
 
 const PaypalSettings = ( { hasContactModule } ) => {
 	const {
-		savePaypalAndVenmo,
-		setSavePaypalAndVenmo,
 		contactModule,
 		setContactModule,
 		subtotalAdjustment,
@@ -34,6 +33,9 @@ const PaypalSettings = ( { hasContactModule } ) => {
 	const siteTitle = siteData?.title;
 	const buttonLanguageChoices = window.ppcpSettings.buttonLanguageChoices;
 
+	// Get registered settings for this slot
+	const footerSettings = useRegisteredSettings( SLOTS.PAYPAL_SETTINGS_END );
+
 	return (
 		<Accordion
 			className="ppcp--paypal-settings"
@@ -158,6 +160,11 @@ const PaypalSettings = ( { hasContactModule } ) => {
 					) }
 				/>
 			</SettingsBlock>
+
+			{ /* Extension point */ }
+			{ footerSettings.map( ( { component: Component, id } ) => (
+				<Component key={ id } />
+			) ) }
 		</Accordion>
 	);
 };