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

Fix merge conflicts

Browse source
This commit is contained in:
dinamiko 2021-10-20 15:01:53 +02:00
commit e3a793e3e5
12 changed files with 236 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/ppcp-webhooks/services.php
View file

@ -68,7 +68,7 @@ return array(
new CheckoutOrderCompleted( $logger, $prefix ),
new PaymentCaptureRefunded( $logger, $prefix ),
new PaymentCaptureReversed( $logger, $prefix ),
new PaymentCaptureCompleted( $logger, $prefix ),
new PaymentCaptureCompleted( $logger, $prefix, $order_endpoint ),
);
},

114
modules/ppcp-webhooks/src/Handler/PaymentCaptureCompleted.php
View file

@ -9,16 +9,20 @@ declare(strict_types=1);
namespace WooCommerce\PayPalCommerce\Webhooks\Handler;
use Exception;
use WooCommerce\PayPalCommerce\ApiClient\Endpoint\OrderEndpoint;
use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayPalGateway;
use Psr\Log\LoggerInterface;
use WooCommerce\PayPalCommerce\WcGateway\Processor\AuthorizedPaymentsProcessor;
use WooCommerce\PayPalCommerce\WcGateway\Processor\TransactionIdHandlingTrait;
use WP_REST_Response;
/**
* Class PaymentCaptureCompleted
*/
class PaymentCaptureCompleted implements RequestHandler {
use PrefixTrait;
use PrefixTrait, TransactionIdHandlingTrait;
/**
* The logger.
@ -27,15 +31,28 @@ class PaymentCaptureCompleted implements RequestHandler {
*/
private $logger;
/**
* The order endpoint.
*
* @var OrderEndpoint
*/
private $order_endpoint;
/**
* PaymentCaptureCompleted constructor.
*
* @param LoggerInterface $logger The logger.
* @param string $prefix The prefix.
* @param OrderEndpoint $order_endpoint The order endpoint.
*/
public function __construct( LoggerInterface $logger, string $prefix ) {
$this->logger = $logger;
$this->prefix = $prefix;
public function __construct(
LoggerInterface $logger,
string $prefix,
OrderEndpoint $order_endpoint
) {
$this->logger = $logger;
$this->prefix = $prefix;
$this->order_endpoint = $order_endpoint;
}
/**
@ -63,56 +80,41 @@ class PaymentCaptureCompleted implements RequestHandler {
*
* @param \WP_REST_Request $request The request.
*
* @return \WP_REST_Response
* @return WP_REST_Response
*/
public function handle_request( \WP_REST_Request $request ): \WP_REST_Response {
public function handle_request( \WP_REST_Request $request ): WP_REST_Response {
$response = array( 'success' => false );
$order_id = isset( $request['resource']['custom_id'] ) ?
$this->sanitize_custom_id( $request['resource']['custom_id'] ) : 0;
if ( ! $order_id ) {
$message = sprintf(
// translators: %s is the PayPal webhook Id.
__(
'No order for webhook event %s was found.',
'woocommerce-paypal-payments'
),
isset( $request['id'] ) ? $request['id'] : ''
);
$this->logger->log(
'warning',
$message,
array(
'request' => $request,
)
);
$response['message'] = $message;
return rest_ensure_response( $response );
}
$wc_order = wc_get_order( $order_id );
if ( ! is_a( $wc_order, \WC_Order::class ) ) {
$message = sprintf(
// translators: %s is the PayPal webhook Id.
__(
'No order for webhook event %s was found.',
'woocommerce-paypal-payments'
),
isset( $request['id'] ) ? $request['id'] : ''
);
$this->logger->log(
'warning',
$message,
array(
'request' => $request,
)
);
$webhook_id = (string) ( $request['id'] ?? '' );
$resource = $request['resource'];
if ( ! is_array( $resource ) ) {
$message = 'Resource data not found in webhook request.';
$this->logger->warning( $message, array( 'request' => $request ) );
$response['message'] = $message;
return rest_ensure_response( $response );
return new WP_REST_Response( $response );
}
$wc_order_id = isset( $resource['custom_id'] ) ?
$this->sanitize_custom_id( (string) $resource['custom_id'] ) : 0;
if ( ! $wc_order_id ) {
$message = sprintf( 'No order for webhook event %s was found.', $webhook_id );
$this->logger->warning( $message, array( 'request' => $request ) );
$response['message'] = $message;
return new WP_REST_Response( $response );
}
$wc_order = wc_get_order( $wc_order_id );
if ( ! is_a( $wc_order, \WC_Order::class ) ) {
$message = sprintf( 'No order for webhook event %s was found.', $webhook_id );
$this->logger->warning( $message, array( 'request' => $request ) );
$response['message'] = $message;
return new WP_REST_Response( $response );
}
if ( $wc_order->get_status() !== 'on-hold' ) {
$response['success'] = true;
return rest_ensure_response( $response );
return new WP_REST_Response( $response );
}
$wc_order->add_order_note(
__( 'Payment successfully captured.', 'woocommerce-paypal-payments' )
@ -136,7 +138,25 @@ class PaymentCaptureCompleted implements RequestHandler {
'order' => $wc_order,
)
);
$order_id = $resource['supplementary_data']['related_ids']['order_id'] ?? null;
if ( $order_id ) {
try {
$this->logger->emergency( (string) $order_id );
$order = $this->order_endpoint->order( $order_id );
$transaction_id = $this->get_paypal_order_transaction_id( $order );
if ( $transaction_id ) {
$this->update_transaction_id( $transaction_id, $wc_order, $this->logger );
}
} catch ( Exception $exception ) {
$this->logger->warning( 'Failed to get transaction ID: ' . $exception->getMessage() );
}
}
$response['success'] = true;
return rest_ensure_response( $response );
return new WP_REST_Response( $response );
}
}