From ea23cf743a9f5d586f0c94ac92823a6918d7e372 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Mon, 3 Mar 2025 19:00:41 +0100
Subject: [PATCH] =?UTF-8?q?=E2=8F=AA=EF=B8=8F=20Remove=20unnecessary=20end?=
 =?UTF-8?q?point,=20restore=20URL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Those changes are not relevant for 3DS integration
---
 .../modules/OnApproveHandler/onApproveForContinue.js  |  2 +-
 modules/ppcp-button/services.php                      |  8 --------
 modules/ppcp-button/src/Assets/SmartButton.php        |  6 +-----
 modules/ppcp-button/src/ButtonModule.php              | 11 -----------
 4 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/modules/ppcp-button/resources/js/modules/OnApproveHandler/onApproveForContinue.js b/modules/ppcp-button/resources/js/modules/OnApproveHandler/onApproveForContinue.js
index 8f8edd3c9..13b914335 100644
--- a/modules/ppcp-button/resources/js/modules/OnApproveHandler/onApproveForContinue.js
+++ b/modules/ppcp-button/resources/js/modules/OnApproveHandler/onApproveForContinue.js
@@ -14,7 +14,6 @@ const initiateRedirect = ( successUrl ) => {
 };
 
 const onApprove = ( context, errorHandler ) => {
-	console.log( 'onApprove' );
 	return ( data, actions ) => {
 		const canCreateOrder =
 			! context.config.vaultingEnabled || data.paymentSource !== 'venmo';
@@ -49,6 +48,7 @@ const onApprove = ( context, errorHandler ) => {
 					} );
 				}
 
+				const orderReceivedUrl = approveData.data?.order_received_url;
 				initiateRedirect( orderReceivedUrl || context.config.redirect );
 			} );
 	};
diff --git a/modules/ppcp-button/services.php b/modules/ppcp-button/services.php
index 9432ab216..93f1454bc 100644
--- a/modules/ppcp-button/services.php
+++ b/modules/ppcp-button/services.php
@@ -10,7 +10,6 @@ declare(strict_types=1);
 namespace WooCommerce\PayPalCommerce\Button;
 
 use WooCommerce\PayPalCommerce\Button\Endpoint\ApproveSubscriptionEndpoint;
-use WooCommerce\PayPalCommerce\Button\Endpoint\CaptureOrderEndpoint;
 use WooCommerce\PayPalCommerce\Button\Endpoint\CartScriptParamsEndpoint;
 use WooCommerce\PayPalCommerce\Button\Endpoint\GetOrderEndpoint;
 use WooCommerce\PayPalCommerce\Button\Endpoint\SimulateCartEndpoint;
@@ -290,13 +289,6 @@ return array(
 			$container->get( 'api.endpoint.order' )
 		);
 	},
-	'button.endpoint.capture-order'        => static function( ContainerInterface $container ): CaptureOrderEndpoint {
-		return new CaptureOrderEndpoint(
-			$container->get( 'button.request-data' ),
-			$container->get( 'api.endpoint.order' ),
-			$container->get( 'button.helper.wc-order-creator' ),
-		);
-	},
 	'button.checkout-form-saver'                  => static function ( ContainerInterface $container ): CheckoutFormSaver {
 		return new CheckoutFormSaver(
 			$container->get( 'session.handler' )
diff --git a/modules/ppcp-button/src/Assets/SmartButton.php b/modules/ppcp-button/src/Assets/SmartButton.php
index ff33158ad..b1c1c7e87 100644
--- a/modules/ppcp-button/src/Assets/SmartButton.php
+++ b/modules/ppcp-button/src/Assets/SmartButton.php
@@ -1145,7 +1145,7 @@ document.querySelector("#payment").before(document.querySelector(".ppcp-messages
 					'endpoint' => \WC_AJAX::get_endpoint( ChangeCartEndpoint::ENDPOINT ),
 					'nonce'    => wp_create_nonce( ChangeCartEndpoint::nonce() ),
 				),
-				'get_order'                   => array(
+				'get_order'                      => array(
 					'endpoint' => \WC_AJAX::get_endpoint( GetOrderEndpoint::ENDPOINT ),
 					'nonce'    => wp_create_nonce( GetOrderEndpoint::nonce() ),
 				),
@@ -1153,10 +1153,6 @@ document.querySelector("#payment").before(document.querySelector(".ppcp-messages
 					'endpoint' => \WC_AJAX::get_endpoint( CreateOrderEndpoint::ENDPOINT ),
 					'nonce'    => wp_create_nonce( CreateOrderEndpoint::nonce() ),
 				),
-				'capture_order'                   => array(
-					'endpoint' => \WC_AJAX::get_endpoint( CaptureOrderEndpoint::ENDPOINT ),
-					'nonce'    => wp_create_nonce( CaptureOrderEndpoint::nonce() ),
-				),
 				'approve_order'                  => array(
 					'endpoint' => \WC_AJAX::get_endpoint( ApproveOrderEndpoint::ENDPOINT ),
 					'nonce'    => wp_create_nonce( ApproveOrderEndpoint::nonce() ),
diff --git a/modules/ppcp-button/src/ButtonModule.php b/modules/ppcp-button/src/ButtonModule.php
index 160943f28..2ae0456d6 100644
--- a/modules/ppcp-button/src/ButtonModule.php
+++ b/modules/ppcp-button/src/ButtonModule.php
@@ -10,7 +10,6 @@ declare(strict_types=1);
 namespace WooCommerce\PayPalCommerce\Button;
 
 use WooCommerce\PayPalCommerce\Button\Endpoint\ApproveSubscriptionEndpoint;
-use WooCommerce\PayPalCommerce\Button\Endpoint\CaptureOrderEndpoint;
 use WooCommerce\PayPalCommerce\Button\Endpoint\CartScriptParamsEndpoint;
 use WooCommerce\PayPalCommerce\Button\Endpoint\GetOrderEndpoint;
 use WooCommerce\PayPalCommerce\Button\Endpoint\SaveCheckoutFormEndpoint;
@@ -189,16 +188,6 @@ class ButtonModule implements ServiceModule, ExtendingModule, ExecutableModule {
 			}
 		);
 
-		add_action(
-			'wc_ajax_' . CaptureOrderEndpoint::ENDPOINT,
-			static function () use ( $container ) {
-				$endpoint = $container->get( 'button.endpoint.capture-order' );
-				assert( $endpoint instanceof GetOrderEndpoint );
-
-				$endpoint->handle_request();
-			}
-		);
-
 		add_action(
 			'wc_ajax_' . CreateOrderEndpoint::ENDPOINT,
 			static function () use ( $container ) {