diff --git a/modules/ppcp-button/services.php b/modules/ppcp-button/services.php index 93f1454bc..44e9a52ac 100644 --- a/modules/ppcp-button/services.php +++ b/modules/ppcp-button/services.php @@ -11,7 +11,6 @@ namespace WooCommerce\PayPalCommerce\Button; use WooCommerce\PayPalCommerce\Button\Endpoint\ApproveSubscriptionEndpoint; use WooCommerce\PayPalCommerce\Button\Endpoint\CartScriptParamsEndpoint; -use WooCommerce\PayPalCommerce\Button\Endpoint\GetOrderEndpoint; use WooCommerce\PayPalCommerce\Button\Endpoint\SimulateCartEndpoint; use WooCommerce\PayPalCommerce\Button\Helper\CartProductsHelper; use WooCommerce\PayPalCommerce\Button\Helper\CheckoutFormSaver; @@ -283,12 +282,6 @@ return array( $container->get( 'wcgateway.paypal-gateway' ) ); }, - 'button.endpoint.get-order' => static function( ContainerInterface $container ): GetOrderEndpoint { - return new GetOrderEndpoint( - $container->get( 'button.request-data' ), - $container->get( 'api.endpoint.order' ) - ); - }, '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 b1c1c7e87..81ced3a68 100644 --- a/modules/ppcp-button/src/Assets/SmartButton.php +++ b/modules/ppcp-button/src/Assets/SmartButton.php @@ -24,12 +24,10 @@ use WooCommerce\PayPalCommerce\ApiClient\Helper\DccApplies; use WooCommerce\PayPalCommerce\Blocks\Endpoint\UpdateShippingEndpoint; use WooCommerce\PayPalCommerce\Button\Endpoint\ApproveOrderEndpoint; use WooCommerce\PayPalCommerce\Button\Endpoint\ApproveSubscriptionEndpoint; -use WooCommerce\PayPalCommerce\Button\Endpoint\CaptureOrderEndpoint; use WooCommerce\PayPalCommerce\Button\Endpoint\CartScriptParamsEndpoint; use WooCommerce\PayPalCommerce\Button\Endpoint\ChangeCartEndpoint; use WooCommerce\PayPalCommerce\Button\Endpoint\CreateOrderEndpoint; use WooCommerce\PayPalCommerce\Button\Endpoint\DataClientIdEndpoint; -use WooCommerce\PayPalCommerce\Button\Endpoint\GetOrderEndpoint; use WooCommerce\PayPalCommerce\Button\Endpoint\RequestData; use WooCommerce\PayPalCommerce\Button\Endpoint\SaveCheckoutFormEndpoint; use WooCommerce\PayPalCommerce\Button\Endpoint\SimulateCartEndpoint; @@ -1145,10 +1143,6 @@ document.querySelector("#payment").before(document.querySelector(".ppcp-messages 'endpoint' => \WC_AJAX::get_endpoint( ChangeCartEndpoint::ENDPOINT ), 'nonce' => wp_create_nonce( ChangeCartEndpoint::nonce() ), ), - 'get_order' => array( - 'endpoint' => \WC_AJAX::get_endpoint( GetOrderEndpoint::ENDPOINT ), - 'nonce' => wp_create_nonce( GetOrderEndpoint::nonce() ), - ), 'create_order' => array( 'endpoint' => \WC_AJAX::get_endpoint( CreateOrderEndpoint::ENDPOINT ), 'nonce' => wp_create_nonce( CreateOrderEndpoint::nonce() ), diff --git a/modules/ppcp-button/src/ButtonModule.php b/modules/ppcp-button/src/ButtonModule.php index 2ae0456d6..cd2c8d381 100644 --- a/modules/ppcp-button/src/ButtonModule.php +++ b/modules/ppcp-button/src/ButtonModule.php @@ -11,7 +11,6 @@ namespace WooCommerce\PayPalCommerce\Button; use WooCommerce\PayPalCommerce\Button\Endpoint\ApproveSubscriptionEndpoint; use WooCommerce\PayPalCommerce\Button\Endpoint\CartScriptParamsEndpoint; -use WooCommerce\PayPalCommerce\Button\Endpoint\GetOrderEndpoint; use WooCommerce\PayPalCommerce\Button\Endpoint\SaveCheckoutFormEndpoint; use WooCommerce\PayPalCommerce\Button\Endpoint\SimulateCartEndpoint; use WooCommerce\PayPalCommerce\Button\Endpoint\ValidateCheckoutEndpoint; @@ -178,16 +177,6 @@ class ButtonModule implements ServiceModule, ExtendingModule, ExecutableModule { } ); - add_action( - 'wc_ajax_' . GetOrderEndpoint::ENDPOINT, - static function () use ( $container ) { - $endpoint = $container->get( 'button.endpoint.get-order' ); - assert( $endpoint instanceof GetOrderEndpoint ); - - $endpoint->handle_request(); - } - ); - add_action( 'wc_ajax_' . CreateOrderEndpoint::ENDPOINT, static function () use ( $container ) { diff --git a/modules/ppcp-button/src/Endpoint/GetOrderEndpoint.php b/modules/ppcp-button/src/Endpoint/GetOrderEndpoint.php deleted file mode 100644 index a412d705a..000000000 --- a/modules/ppcp-button/src/Endpoint/GetOrderEndpoint.php +++ /dev/null @@ -1,81 +0,0 @@ -request_data = $request_data; - $this->order_endpoint = $order_endpoint; - } - - /** - * The nonce. - * - * @return string - */ - public static function nonce() : string { - return self::ENDPOINT; - } - - /** - * Handles the request responds with the PayPal order details. - * - * @return bool This method never returns a value, but we must implement the interface. - * @throws RuntimeException When order not found or handling failed. - */ - public function handle_request() : bool { - $data = $this->request_data->read_request( self::nonce() ); - - if ( ! isset( $data['order_id'] ) ) { - throw new RuntimeException( - __( 'No order id given', 'woocommerce-paypal-payments' ) - ); - } - - $order = $this->order_endpoint->raw_order( $data['order_id'] ); - - wp_send_json_success( $order ); - - return true; - } -}