woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-09-06 12:25:15 +08:00
Code Issues Projects Packages Wiki Activity Actions 7

Improve return url handling when no WC order

Browse source
This commit is contained in:
Alex P 2023-06-07 20:12:28 +03:00
parent e3bd42b93b
commit eb4418931a
No known key found for this signature in database
GPG key ID: 54487A734A204D71
2 changed files with 31 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/ppcp-wc-gateway/services.php
View file

@ -943,6 +943,7 @@ return array(
$gateway,
$endpoint,
$prefix,
$container->get( 'session.handler' ),
$container->get( 'woocommerce.logger.woocommerce' )
);
},

38
modules/ppcp-wc-gateway/src/Endpoint/ReturnUrlEndpoint.php
View file

@ -11,6 +11,8 @@ namespace WooCommerce\PayPalCommerce\WcGateway\Endpoint;
use Psr\Log\LoggerInterface;
use WooCommerce\PayPalCommerce\ApiClient\Endpoint\OrderEndpoint;
use WooCommerce\PayPalCommerce\ApiClient\Entity\OrderStatus;
use WooCommerce\PayPalCommerce\Session\SessionHandler;
use WooCommerce\PayPalCommerce\WcGateway\Gateway\OXXO\OXXOGateway;
use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayPalGateway;
use WooCommerce\PayPalCommerce\Webhooks\Handler\PrefixTrait;
@ -37,6 +39,13 @@ class ReturnUrlEndpoint {
*/
private $order_endpoint;
/**
* The session handler
*
* @var SessionHandler
*/
protected $session_handler;
/**
* The logger.
*
@ -47,21 +56,24 @@ class ReturnUrlEndpoint {
/**
* ReturnUrlEndpoint constructor.
*
* @param PayPalGateway $gateway The PayPal Gateway.
* @param OrderEndpoint $order_endpoint The Order Endpoint.
* @param string $prefix The prefix.
* @param LoggerInterface $logger The logger.
* @param PayPalGateway $gateway The PayPal Gateway.
* @param OrderEndpoint $order_endpoint The Order Endpoint.
* @param string $prefix The prefix.
* @param SessionHandler $session_handler The session handler.
* @param LoggerInterface $logger The logger.
*/
public function __construct(
PayPalGateway $gateway,
OrderEndpoint $order_endpoint,
string $prefix,
SessionHandler $session_handler,
LoggerInterface $logger
) {
$this->gateway = $gateway;
$this->order_endpoint = $order_endpoint;
$this->prefix = $prefix;
$this->logger = $logger;
$this->gateway = $gateway;
$this->order_endpoint = $order_endpoint;
$this->prefix = $prefix;
$this->session_handler = $session_handler;
$this->logger = $logger;
}
/**
@ -80,6 +92,16 @@ class ReturnUrlEndpoint {
$wc_order_id = $this->sanitize_custom_id( $order->purchase_units()[0]->custom_id() );
if ( ! $wc_order_id ) {
// We cannot finish processing here without WC order, but at least go into the continuation mode.
if ( $order->status()->is( OrderStatus::APPROVED )
|| $order->status()->is( OrderStatus::COMPLETED )
) {
$this->session_handler->replace_order( $order );
wp_safe_redirect( wc_get_checkout_url() );
exit();
}
$this->logger->warning( "Return URL endpoint $token: no WC order ID." );
exit();
}