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

Merge branch 'trunk' into PCP-412-when-there-is-a-payment-saved-th

Browse source
This commit is contained in:
dinamiko 2021-12-20 11:35:57 +01:00
commit ba7bea6fa6
23 changed files with 349 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

23
modules/ppcp-webhooks/src/Handler/CheckoutOrderApproved.php
View file

@ -136,7 +136,7 @@ class CheckoutOrderApproved implements RequestHandler {
}
if ( $order->intent() === 'CAPTURE' ) {
$this->order_endpoint->capture( $order );
$order = $this->order_endpoint->capture( $order );
}
} catch ( RuntimeException $error ) {
$message = sprintf(
@ -187,23 +187,18 @@ class CheckoutOrderApproved implements RequestHandler {
return rest_ensure_response( $response );
}
$new_status = $order->intent() === 'CAPTURE' ? 'processing' : 'on-hold';
$status_message = $order->intent() === 'CAPTURE' ?
__( 'Payment received.', 'woocommerce-paypal-payments' )
: __( 'Payment can be captured.', 'woocommerce-paypal-payments' );
foreach ( $wc_orders as $wc_order ) {
if ( ! in_array( $wc_order->get_status(), array( 'pending', 'on-hold' ), true ) ) {
continue;
}
/**
* The WooCommerce order.
*
* @var \WC_Order $wc_order
*/
$wc_order->update_status(
$new_status,
$status_message
);
if ( $order->intent() === 'CAPTURE' ) {
$wc_order->payment_complete();
} else {
$wc_order->update_status(
'on-hold',
__( 'Payment can be captured.', 'woocommerce-paypal-payments' )
);
}
$this->logger->log(
'info',
sprintf(

10
modules/ppcp-webhooks/src/Handler/CheckoutOrderCompleted.php
View file

@ -134,15 +134,7 @@ class CheckoutOrderCompleted implements RequestHandler {
if ( ! in_array( $wc_order->get_status(), array( 'pending', 'on-hold' ), true ) ) {
continue;
}
/**
* The WooCommerce order.
*
* @var \WC_Order $wc_order
*/
$wc_order->update_status(
'processing',
__( 'Payment received.', 'woocommerce-paypal-payments' )
);
$wc_order->payment_complete();
$this->logger->log(
'info',
sprintf(