Fix merge conflicts

This commit is contained in:
dinamiko 2022-02-10 09:34:42 +01:00
commit ccff0fa586
9 changed files with 94 additions and 7 deletions

View file

@ -10,13 +10,14 @@ declare(strict_types=1);
namespace WooCommerce\PayPalCommerce\Webhooks\Handler;
use Psr\Log\LoggerInterface;
use WooCommerce\PayPalCommerce\WcGateway\Processor\TransactionIdHandlingTrait;
/**
* Class PaymentCaptureRefunded
*/
class PaymentCaptureRefunded implements RequestHandler {
use PrefixTrait;
use PrefixTrait, TransactionIdHandlingTrait;
/**
* The logger.
@ -150,6 +151,11 @@ class PaymentCaptureRefunded implements RequestHandler {
'order' => $wc_order,
)
);
if ( is_array( $request['resource'] ) && isset( $request['resource']['id'] ) ) {
$this->update_transaction_id( $request['resource']['id'], $wc_order, $this->logger );
}
$response['success'] = true;
return rest_ensure_response( $response );
}