From c6ef12a626f8d53fed6a1ca1031224409199ad55 Mon Sep 17 00:00:00 2001
From: Pedro Silva <p.silva@inpsyde.com>
Date: Mon, 26 Feb 2024 09:20:30 +0000
Subject: [PATCH 001/101] Add reauthorize option

---
 modules/ppcp-wc-gateway/services.php          |  5 ++
 .../src/Admin/RenderReauthorizeAction.php     | 70 +++++++++++++++++++
 .../ppcp-wc-gateway/src/WCGatewayModule.php   |  9 ++-
 3 files changed, 82 insertions(+), 2 deletions(-)
 create mode 100644 modules/ppcp-wc-gateway/src/Admin/RenderReauthorizeAction.php

diff --git a/modules/ppcp-wc-gateway/services.php b/modules/ppcp-wc-gateway/services.php
index 1af10b4ed..359807d43 100644
--- a/modules/ppcp-wc-gateway/services.php
+++ b/modules/ppcp-wc-gateway/services.php
@@ -22,6 +22,7 @@ use WooCommerce\PayPalCommerce\Common\Pattern\SingletonDecorator;
 use WooCommerce\PayPalCommerce\Onboarding\Environment;
 use WooCommerce\PayPalCommerce\Onboarding\Render\OnboardingOptionsRenderer;
 use WooCommerce\PayPalCommerce\Onboarding\State;
+use WooCommerce\PayPalCommerce\WcGateway\Admin\RenderReauthorizeAction;
 use WooCommerce\PayPalCommerce\WcGateway\Endpoint\RefreshFeatureStatusEndpoint;
 use WooCommerce\PayPalCommerce\WcSubscriptions\Helper\SubscriptionHelper;
 use WooCommerce\PayPalCommerce\Vendor\Psr\Container\ContainerInterface;
@@ -393,6 +394,10 @@ return array(
 		$column = $container->get( 'wcgateway.admin.orders-payment-status-column' );
 		return new RenderAuthorizeAction( $column );
 	},
+	'wcgateway.admin.render-reauthorize-action'            => static function ( ContainerInterface $container ): RenderReauthorizeAction {
+		$column = $container->get( 'wcgateway.admin.orders-payment-status-column' );
+		return new RenderReauthorizeAction( $column );
+	},
 	'wcgateway.admin.order-payment-status'                 => static function ( ContainerInterface $container ): PaymentStatusOrderDetail {
 		$column = $container->get( 'wcgateway.admin.orders-payment-status-column' );
 		return new PaymentStatusOrderDetail( $column );
diff --git a/modules/ppcp-wc-gateway/src/Admin/RenderReauthorizeAction.php b/modules/ppcp-wc-gateway/src/Admin/RenderReauthorizeAction.php
new file mode 100644
index 000000000..aa2b27b62
--- /dev/null
+++ b/modules/ppcp-wc-gateway/src/Admin/RenderReauthorizeAction.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Renders the order action "Reauthorize PayPal payment"
+ *
+ * @package WooCommerce\PayPalCommerce\WcGateway\Admin
+ */
+
+declare( strict_types=1 );
+
+namespace WooCommerce\PayPalCommerce\WcGateway\Admin;
+
+use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayPalGateway;
+use WooCommerce\PayPalCommerce\WcGateway\Processor\AuthorizedPaymentsProcessor;
+
+/**
+ * Class RenderReauthorizeAction
+ */
+class RenderReauthorizeAction {
+	/**
+	 * The capture info column.
+	 *
+	 * @var OrderTablePaymentStatusColumn
+	 */
+	private $column;
+
+	/**
+	 * PaymentStatusOrderDetail constructor.
+	 *
+	 * @param OrderTablePaymentStatusColumn $column The capture info column.
+	 */
+	public function __construct( OrderTablePaymentStatusColumn $column ) {
+		$this->column = $column;
+	}
+
+	/**
+	 * Renders the action into the $order_actions array based on the WooCommerce order.
+	 *
+	 * @param array     $order_actions The actions to render into.
+	 * @param \WC_Order $wc_order The order for which to render the action.
+	 *
+	 * @return array
+	 */
+	public function render( array $order_actions, \WC_Order $wc_order ) : array {
+
+		if ( ! $this->should_render_for_order( $wc_order ) ) {
+			return $order_actions;
+		}
+
+		$order_actions['ppcp_reauthorize_order'] = esc_html__(
+			'Reauthorized PayPal payment',
+			'woocommerce-paypal-payments'
+		);
+		return $order_actions;
+	}
+
+	/**
+	 * Whether the action should be rendered for a certain WooCommerce order.
+	 *
+	 * @param \WC_Order $order The Woocommerce order.
+	 *
+	 * @return bool
+	 */
+	private function should_render_for_order( \WC_Order $order ) : bool {
+		$status               = $order->get_status();
+		$not_allowed_statuses = array( 'refunded', 'cancelled', 'failed' );
+		return $this->column->should_render_for_order( $order ) &&
+			! $this->column->is_captured( $order ) &&
+			! in_array( $status, $not_allowed_statuses, true );
+	}
+}
diff --git a/modules/ppcp-wc-gateway/src/WCGatewayModule.php b/modules/ppcp-wc-gateway/src/WCGatewayModule.php
index 18875be0f..dcb375040 100644
--- a/modules/ppcp-wc-gateway/src/WCGatewayModule.php
+++ b/modules/ppcp-wc-gateway/src/WCGatewayModule.php
@@ -614,13 +614,18 @@ class WCGatewayModule implements ModuleInterface {
 					return $order_actions;
 				}
 
-				$render = $container->get( 'wcgateway.admin.render-authorize-action' );
+				$render_reauthorize = $container->get( 'wcgateway.admin.render-reauthorize-action' );
+				$render_authorize   = $container->get( 'wcgateway.admin.render-authorize-action' );
+
 				/**
 				 * Renders the authorize action in the select field.
 				 *
 				 * @var RenderAuthorizeAction $render
 				 */
-				return $render->render( $order_actions, $theorder );
+				return $render_reauthorize->render(
+					$render_authorize->render( $order_actions, $theorder ),
+					$theorder
+				);
 			}
 		);
 

From 5469cdb3ddae12f1dbe2174a80e03f08137f7109 Mon Sep 17 00:00:00 2001
From: Pedro Silva <p.silva@inpsyde.com>
Date: Tue, 27 Feb 2024 12:00:09 +0000
Subject: [PATCH 002/101] Add reauthorization functionality.

---
 api/order-functions.php                       | 26 ++++++
 .../src/Endpoint/PaymentsEndpoint.php         | 47 +++++++++++
 modules/ppcp-wc-gateway/services.php          |  4 +-
 .../src/Admin/RenderAuthorizeAction.php       |  3 -
 .../src/Admin/RenderReauthorizeAction.php     |  5 +-
 .../Processor/AuthorizedPaymentsProcessor.php | 83 ++++++++++++++++++-
 .../ppcp-wc-gateway/src/WCGatewayModule.php   | 14 ++++
 7 files changed, 173 insertions(+), 9 deletions(-)

diff --git a/api/order-functions.php b/api/order-functions.php
index 340be8585..cbfa42968 100644
--- a/api/order-functions.php
+++ b/api/order-functions.php
@@ -87,6 +87,32 @@ function ppcp_capture_order( WC_Order $wc_order ): void {
 	}
 }
 
+/**
+ * Reauthorizes the PayPal order.
+ *
+ * @param WC_Order $wc_order The WC order.
+ * @throws InvalidArgumentException When the order cannot be captured.
+ * @throws Exception When the operation fails.
+ */
+function ppcp_reauthorize_order( WC_Order $wc_order ): void {
+	$intent = strtoupper( (string) $wc_order->get_meta( PayPalGateway::INTENT_META_KEY ) );
+
+	if ( $intent !== 'AUTHORIZE' ) {
+		throw new InvalidArgumentException( 'Only orders with "authorize" intent can be reauthorized.' );
+	}
+	$captured = wc_string_to_bool( $wc_order->get_meta( AuthorizedPaymentsProcessor::CAPTURED_META_KEY ) );
+	if ( $captured ) {
+		throw new InvalidArgumentException( 'The order is already captured.' );
+	}
+
+	$authorized_payment_processor = PPCP::container()->get( 'wcgateway.processor.authorized-payments' );
+	assert( $authorized_payment_processor instanceof AuthorizedPaymentsProcessor );
+
+	if ( $authorized_payment_processor->reauthorize_payment( $wc_order ) !== AuthorizedPaymentsProcessor::SUCCESSFUL ) {
+		throw new RuntimeException( $authorized_payment_processor->reauthorization_failure_reason() ?: 'Reauthorization failed.' );
+	}
+}
+
 /**
  * Refunds the PayPal order.
  * Note that you can use wc_refund_payment() to trigger the refund in WC and PayPal.
diff --git a/modules/ppcp-api-client/src/Endpoint/PaymentsEndpoint.php b/modules/ppcp-api-client/src/Endpoint/PaymentsEndpoint.php
index 210beae16..484b89a94 100644
--- a/modules/ppcp-api-client/src/Endpoint/PaymentsEndpoint.php
+++ b/modules/ppcp-api-client/src/Endpoint/PaymentsEndpoint.php
@@ -193,6 +193,53 @@ class PaymentsEndpoint {
 		return $this->capture_factory->from_paypal_response( $json );
 	}
 
+	/**
+	 * Reauthorizes an order.
+	 *
+	 * @param string     $authorization_id The id.
+	 * @param Money|null $amount The amount to capture. If not specified, the whole authorized amount is captured.
+	 *
+	 * @return string
+	 * @throws RuntimeException If the request fails.
+	 * @throws PayPalApiException If the request fails.
+	 */
+	public function reauthorize( string $authorization_id, ?Money $amount = null ) : string {
+		$bearer = $this->bearer->bearer();
+		$url    = trailingslashit( $this->host ) . 'v2/payments/authorizations/' . $authorization_id . '/reauthorize';
+
+		$data = array();
+		if ( $amount ) {
+			$data['amount'] = $amount->to_array();
+		}
+
+		$args = array(
+			'method'  => 'POST',
+			'headers' => array(
+				'Authorization' => 'Bearer ' . $bearer->token(),
+				'Content-Type'  => 'application/json',
+				'Prefer'        => 'return=representation',
+			),
+			'body'    => wp_json_encode( $data, JSON_FORCE_OBJECT ),
+		);
+
+		$response = $this->request( $url, $args );
+		$json     = json_decode( $response['body'] );
+
+		if ( is_wp_error( $response ) ) {
+			throw new RuntimeException( 'Could not reauthorize authorized payment.' );
+		}
+
+		$status_code = (int) wp_remote_retrieve_response_code( $response );
+		if ( 201 !== $status_code || ! is_object( $json ) ) {
+			throw new PayPalApiException(
+				$json,
+				$status_code
+			);
+		}
+
+		return $json->id;
+	}
+
 	/**
 	 * Refunds a payment.
 	 *
diff --git a/modules/ppcp-wc-gateway/services.php b/modules/ppcp-wc-gateway/services.php
index 359807d43..f1b0a0cd8 100644
--- a/modules/ppcp-wc-gateway/services.php
+++ b/modules/ppcp-wc-gateway/services.php
@@ -381,13 +381,15 @@ return array(
 		$notice              = $container->get( 'wcgateway.notice.authorize-order-action' );
 		$settings            = $container->get( 'wcgateway.settings' );
 		$subscription_helper = $container->get( 'wc-subscriptions.helper' );
+		$amount_factory      = $container->get( 'api.factory.amount' );
 		return new AuthorizedPaymentsProcessor(
 			$order_endpoint,
 			$payments_endpoint,
 			$logger,
 			$notice,
 			$settings,
-			$subscription_helper
+			$subscription_helper,
+			$amount_factory
 		);
 	},
 	'wcgateway.admin.render-authorize-action'              => static function ( ContainerInterface $container ): RenderAuthorizeAction {
diff --git a/modules/ppcp-wc-gateway/src/Admin/RenderAuthorizeAction.php b/modules/ppcp-wc-gateway/src/Admin/RenderAuthorizeAction.php
index 1d38e64a6..4185f6125 100644
--- a/modules/ppcp-wc-gateway/src/Admin/RenderAuthorizeAction.php
+++ b/modules/ppcp-wc-gateway/src/Admin/RenderAuthorizeAction.php
@@ -9,9 +9,6 @@ declare( strict_types=1 );
 
 namespace WooCommerce\PayPalCommerce\WcGateway\Admin;
 
-use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayPalGateway;
-use WooCommerce\PayPalCommerce\WcGateway\Processor\AuthorizedPaymentsProcessor;
-
 /**
  * Class RenderAuthorizeAction
  */
diff --git a/modules/ppcp-wc-gateway/src/Admin/RenderReauthorizeAction.php b/modules/ppcp-wc-gateway/src/Admin/RenderReauthorizeAction.php
index aa2b27b62..71dbed0ff 100644
--- a/modules/ppcp-wc-gateway/src/Admin/RenderReauthorizeAction.php
+++ b/modules/ppcp-wc-gateway/src/Admin/RenderReauthorizeAction.php
@@ -9,9 +9,6 @@ declare( strict_types=1 );
 
 namespace WooCommerce\PayPalCommerce\WcGateway\Admin;
 
-use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayPalGateway;
-use WooCommerce\PayPalCommerce\WcGateway\Processor\AuthorizedPaymentsProcessor;
-
 /**
  * Class RenderReauthorizeAction
  */
@@ -47,7 +44,7 @@ class RenderReauthorizeAction {
 		}
 
 		$order_actions['ppcp_reauthorize_order'] = esc_html__(
-			'Reauthorized PayPal payment',
+			'Reauthorize PayPal payment',
 			'woocommerce-paypal-payments'
 		);
 		return $order_actions;
diff --git a/modules/ppcp-wc-gateway/src/Processor/AuthorizedPaymentsProcessor.php b/modules/ppcp-wc-gateway/src/Processor/AuthorizedPaymentsProcessor.php
index e84a80b92..5eb63b683 100644
--- a/modules/ppcp-wc-gateway/src/Processor/AuthorizedPaymentsProcessor.php
+++ b/modules/ppcp-wc-gateway/src/Processor/AuthorizedPaymentsProcessor.php
@@ -10,6 +10,8 @@ declare(strict_types=1);
 namespace WooCommerce\PayPalCommerce\WcGateway\Processor;
 
 use Exception;
+use WooCommerce\PayPalCommerce\ApiClient\Exception\PayPalApiException;
+use WooCommerce\PayPalCommerce\ApiClient\Factory\AmountFactory;
 use WooCommerce\PayPalCommerce\Vendor\Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
 use WC_Order;
@@ -91,6 +93,20 @@ class AuthorizedPaymentsProcessor {
 	 */
 	private $subscription_helper;
 
+	/**
+	 * The amount factory.
+	 *
+	 * @var AmountFactory
+	 */
+	private $amount_factory;
+
+	/**
+	 * The reauthorization failure reason.
+	 *
+	 * @var string
+	 */
+	private $reauthorization_failure_reason;
+
 	/**
 	 * AuthorizedPaymentsProcessor constructor.
 	 *
@@ -100,6 +116,7 @@ class AuthorizedPaymentsProcessor {
 	 * @param AuthorizeOrderActionNotice $notice The notice.
 	 * @param ContainerInterface         $config The settings.
 	 * @param SubscriptionHelper         $subscription_helper The subscription helper.
+	 * @param AmountFactory              $amount_factory The amount factory.
 	 */
 	public function __construct(
 		OrderEndpoint $order_endpoint,
@@ -107,7 +124,8 @@ class AuthorizedPaymentsProcessor {
 		LoggerInterface $logger,
 		AuthorizeOrderActionNotice $notice,
 		ContainerInterface $config,
-		SubscriptionHelper $subscription_helper
+		SubscriptionHelper $subscription_helper,
+		AmountFactory $amount_factory
 	) {
 
 		$this->order_endpoint      = $order_endpoint;
@@ -116,6 +134,7 @@ class AuthorizedPaymentsProcessor {
 		$this->notice              = $notice;
 		$this->config              = $config;
 		$this->subscription_helper = $subscription_helper;
+		$this->amount_factory      = $amount_factory;
 	}
 
 	/**
@@ -249,6 +268,67 @@ class AuthorizedPaymentsProcessor {
 		}
 	}
 
+	/**
+	 * Reauthorizes an authorized payment for an WooCommerce order.
+	 *
+	 * @param WC_Order $wc_order The WooCommerce order.
+	 *
+	 * @return string The status or reauthorization id.
+	 */
+	public function reauthorize_payment( WC_Order $wc_order ): string {
+		$this->reauthorization_failure_reason = '';
+
+		try {
+			$order = $this->paypal_order_from_wc_order( $wc_order );
+		} catch ( Exception $exception ) {
+			$this->logger->error( 'Could not get PayPal order from WC order: ' . $exception->getMessage() );
+			if ( $exception->getCode() === 404 ) {
+				return self::NOT_FOUND;
+			}
+			return self::INACCESSIBLE;
+		}
+
+		$amount = $this->amount_factory->from_wc_order( $wc_order );
+
+		$authorizations            = $this->all_authorizations( $order );
+		$uncaptured_authorizations = $this->authorizations_to_capture( ...$authorizations );
+
+		if ( ! $uncaptured_authorizations ) {
+			if ( $this->captured_authorizations( ...$authorizations ) ) {
+				$this->logger->info( 'Authorizations already captured.' );
+				return self::ALREADY_CAPTURED;
+			}
+
+			$this->logger->info( 'Bad authorization.' );
+			return self::BAD_AUTHORIZATION;
+		}
+
+		$authorization = end( $uncaptured_authorizations );
+
+		try {
+			$this->payments_endpoint->reauthorize( $authorization->id(), new Money( $amount->value(), $amount->currency_code() ) );
+		} catch ( PayPalApiException $exception ) {
+			$this->reauthorization_failure_reason = $exception->details()[0]->description ?? null;
+			$this->logger->error( 'Reauthorization failed: ' . $exception->name() . ' | ' . $this->reauthorization_failure_reason );
+			return self::FAILED;
+
+		} catch ( Exception $exception ) {
+			$this->logger->error( 'Failed to capture authorization: ' . $exception->getMessage() );
+			return self::FAILED;
+		}
+
+		return self::SUCCESSFUL;
+	}
+
+	/**
+	 * The reason for a failed reauthorization.
+	 *
+	 * @return string
+	 */
+	public function reauthorization_failure_reason(): string {
+		return $this->reauthorization_failure_reason;
+	}
+
 	/**
 	 * Voids authorizations for the given PayPal order.
 	 *
@@ -392,4 +472,5 @@ class AuthorizedPaymentsProcessor {
 			}
 		);
 	}
+
 }
diff --git a/modules/ppcp-wc-gateway/src/WCGatewayModule.php b/modules/ppcp-wc-gateway/src/WCGatewayModule.php
index dcb375040..cdf638131 100644
--- a/modules/ppcp-wc-gateway/src/WCGatewayModule.php
+++ b/modules/ppcp-wc-gateway/src/WCGatewayModule.php
@@ -642,6 +642,20 @@ class WCGatewayModule implements ModuleInterface {
 				$authorized_payments_processor->capture_authorized_payment( $wc_order );
 			}
 		);
+
+		add_action(
+			'woocommerce_order_action_ppcp_reauthorize_order',
+			static function ( WC_Order $wc_order ) use ( $container ) {
+
+				/**
+				 * The authorized payments processor.
+				 *
+				 * @var AuthorizedPaymentsProcessor $authorized_payments_processor
+				 */
+				$authorized_payments_processor = $container->get( 'wcgateway.processor.authorized-payments' );
+				$authorized_payments_processor->reauthorize_payment( $wc_order );
+			}
+		);
 	}
 
 	/**

From 9968537f0646453b9779776d3d256e9993ffbe76 Mon Sep 17 00:00:00 2001
From: Pedro Silva <p.silva@inpsyde.com>
Date: Tue, 27 Feb 2024 18:51:01 +0000
Subject: [PATCH 003/101] Fix tests

---
 .../WcGateway/Processor/AuthorizedPaymentsProcessorTest.php  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/PHPUnit/WcGateway/Processor/AuthorizedPaymentsProcessorTest.php b/tests/PHPUnit/WcGateway/Processor/AuthorizedPaymentsProcessorTest.php
index 5dd7c588f..9f9aa8c3c 100644
--- a/tests/PHPUnit/WcGateway/Processor/AuthorizedPaymentsProcessorTest.php
+++ b/tests/PHPUnit/WcGateway/Processor/AuthorizedPaymentsProcessorTest.php
@@ -5,6 +5,7 @@ namespace WooCommerce\PayPalCommerce\WcGateway\Processor;
 
 
 use Mockery\MockInterface;
+use WooCommerce\PayPalCommerce\ApiClient\Factory\AmountFactory;
 use WooCommerce\PayPalCommerce\Vendor\Psr\Container\ContainerInterface;
 use Psr\Log\NullLogger;
 use WC_Order;
@@ -69,6 +70,7 @@ class AuthorizedPaymentsProcessorTest extends TestCase
 
 		$this->config = Mockery::mock(ContainerInterface::class);
 		$this->subscription_helper = Mockery::mock(SubscriptionHelper::class);
+		$this->amount_factory = Mockery::mock(AmountFactory::class);
 
 		$this->testee = new AuthorizedPaymentsProcessor(
 			$this->orderEndpoint,
@@ -76,7 +78,8 @@ class AuthorizedPaymentsProcessorTest extends TestCase
 			new NullLogger(),
 			$this->notice,
 			$this->config,
-			$this->subscription_helper
+			$this->subscription_helper,
+			$this->amount_factory
 		);
 	}
 

From 562a9eed4ca1cb3cda73607e0588dde20b32d668 Mon Sep 17 00:00:00 2001
From: Pedro Silva <p.silva@inpsyde.com>
Date: Wed, 28 Feb 2024 11:14:59 +0000
Subject: [PATCH 004/101] Add admin notice persistence.

---
 .../ppcp-admin-notices/src/AdminNotices.php   | 18 +++++++++
 .../ppcp-admin-notices/src/Entity/Message.php | 14 +++++++
 .../src/Repository/Repository.php             | 39 ++++++++++++++++++-
 .../ppcp-wc-gateway/src/WCGatewayModule.php   | 15 ++++++-
 4 files changed, 84 insertions(+), 2 deletions(-)

diff --git a/modules/ppcp-admin-notices/src/AdminNotices.php b/modules/ppcp-admin-notices/src/AdminNotices.php
index 73fe24b71..edb8d0817 100644
--- a/modules/ppcp-admin-notices/src/AdminNotices.php
+++ b/modules/ppcp-admin-notices/src/AdminNotices.php
@@ -9,6 +9,8 @@ declare(strict_types=1);
 
 namespace WooCommerce\PayPalCommerce\AdminNotices;
 
+use WooCommerce\PayPalCommerce\AdminNotices\Entity\Message;
+use WooCommerce\PayPalCommerce\AdminNotices\Repository\Repository;
 use WooCommerce\PayPalCommerce\Vendor\Dhii\Container\ServiceProvider;
 use WooCommerce\PayPalCommerce\Vendor\Dhii\Modular\Module\ModuleInterface;
 use WooCommerce\PayPalCommerce\Vendor\Interop\Container\ServiceProviderInterface;
@@ -40,6 +42,22 @@ class AdminNotices implements ModuleInterface {
 				$renderer->render();
 			}
 		);
+
+		add_action(
+			Repository::NOTICES_FILTER,
+			function ( $notices ) use ( $c ) {
+				$admin_notices = $c->get( 'admin-notices.repository' );
+				assert( $admin_notices instanceof Repository );
+
+				$persisted_notices = $admin_notices->get_persisted_and_clear();
+
+				if ( $persisted_notices ) {
+					$notices = array_merge( $notices, $persisted_notices );
+				}
+
+				return $notices;
+			}
+		);
 	}
 
 	/**
diff --git a/modules/ppcp-admin-notices/src/Entity/Message.php b/modules/ppcp-admin-notices/src/Entity/Message.php
index 0e8bc959e..97624d872 100644
--- a/modules/ppcp-admin-notices/src/Entity/Message.php
+++ b/modules/ppcp-admin-notices/src/Entity/Message.php
@@ -92,4 +92,18 @@ class Message {
 	public function wrapper(): string {
 		return $this->wrapper;
 	}
+
+	/**
+	 * Returns the object as array.
+	 *
+	 * @return array
+	 */
+	public function to_array(): array {
+		return array(
+			'type'        => $this->type,
+			'message'     => $this->message,
+			'dismissable' => $this->dismissable,
+			'wrapper'     => $this->wrapper,
+		);
+	}
 }
diff --git a/modules/ppcp-admin-notices/src/Repository/Repository.php b/modules/ppcp-admin-notices/src/Repository/Repository.php
index e13a5dd6c..9573a81a4 100644
--- a/modules/ppcp-admin-notices/src/Repository/Repository.php
+++ b/modules/ppcp-admin-notices/src/Repository/Repository.php
@@ -16,7 +16,8 @@ use WooCommerce\PayPalCommerce\AdminNotices\Entity\Message;
  */
 class Repository implements RepositoryInterface {
 
-	const NOTICES_FILTER = 'ppcp.admin-notices.current-notices';
+	const NOTICES_FILTER           = 'ppcp.admin-notices.current-notices';
+	const PERSISTED_NOTICES_OPTION = 'woocommerce_ppcp-admin-notices';
 
 	/**
 	 * Returns the current messages.
@@ -37,4 +38,40 @@ class Repository implements RepositoryInterface {
 			}
 		);
 	}
+
+	/**
+	 * Adds a message to persist between page reloads.
+	 *
+	 * @param Message $message The message.
+	 * @return void
+	 */
+	public function persist( Message $message ): void {
+		$persisted_notices = get_option( self::PERSISTED_NOTICES_OPTION ) ?: array();
+
+		$persisted_notices[] = $message->to_array();
+
+		update_option( self::PERSISTED_NOTICES_OPTION, $persisted_notices );
+	}
+
+	/**
+	 * Adds a message to persist between page reloads.
+	 *
+	 * @return array|Message[]
+	 */
+	public function get_persisted_and_clear(): array {
+		$notices = array();
+
+		$persisted_data = get_option( self::PERSISTED_NOTICES_OPTION ) ?: array();
+		foreach ( $persisted_data as $notice_data ) {
+			$notices[] = new Message(
+				(string) ( $notice_data['message'] ?? '' ),
+				(string) ( $notice_data['type'] ?? '' ),
+				(bool) ( $notice_data['dismissable'] ?? true ),
+				(string) ( $notice_data['wrapper'] ?? '' )
+			);
+		}
+
+		update_option( self::PERSISTED_NOTICES_OPTION, array(), true );
+		return $notices;
+	}
 }
diff --git a/modules/ppcp-wc-gateway/src/WCGatewayModule.php b/modules/ppcp-wc-gateway/src/WCGatewayModule.php
index cdf638131..fd4395223 100644
--- a/modules/ppcp-wc-gateway/src/WCGatewayModule.php
+++ b/modules/ppcp-wc-gateway/src/WCGatewayModule.php
@@ -11,6 +11,7 @@ namespace WooCommerce\PayPalCommerce\WcGateway;
 
 use Psr\Log\LoggerInterface;
 use Throwable;
+use WooCommerce\PayPalCommerce\AdminNotices\Entity\Message;
 use WooCommerce\PayPalCommerce\ApiClient\Entity\Authorization;
 use WooCommerce\PayPalCommerce\ApiClient\Exception\RuntimeException;
 use WooCommerce\PayPalCommerce\ApiClient\Helper\Cache;
@@ -646,6 +647,8 @@ class WCGatewayModule implements ModuleInterface {
 		add_action(
 			'woocommerce_order_action_ppcp_reauthorize_order',
 			static function ( WC_Order $wc_order ) use ( $container ) {
+				$admin_notices = $container->get( 'admin-notices.repository' );
+				assert( $admin_notices instanceof Repository );
 
 				/**
 				 * The authorized payments processor.
@@ -653,7 +656,17 @@ class WCGatewayModule implements ModuleInterface {
 				 * @var AuthorizedPaymentsProcessor $authorized_payments_processor
 				 */
 				$authorized_payments_processor = $container->get( 'wcgateway.processor.authorized-payments' );
-				$authorized_payments_processor->reauthorize_payment( $wc_order );
+
+				if ( $authorized_payments_processor->reauthorize_payment( $wc_order ) !== AuthorizedPaymentsProcessor::SUCCESSFUL ) {
+					$message = sprintf(
+						'%1$s %2$s',
+						esc_html__( 'Reauthorization with PayPal failed: ', 'woocommerce-paypal-payments' ),
+						$authorized_payments_processor->reauthorization_failure_reason() ?: ''
+					);
+					$admin_notices->persist( new Message( $message, 'error' ) );
+				} else {
+					$admin_notices->persist( new Message( 'Payment reauthorized.', 'info' ) );
+				}
 			}
 		);
 	}

From 59b5af65bd6a893b4631309841e0a737a48cf51d Mon Sep 17 00:00:00 2001
From: Pedro Silva <p.silva@inpsyde.com>
Date: Wed, 28 Feb 2024 11:22:44 +0000
Subject: [PATCH 005/101] Fix lint.

---
 modules/ppcp-admin-notices/src/AdminNotices.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/modules/ppcp-admin-notices/src/AdminNotices.php b/modules/ppcp-admin-notices/src/AdminNotices.php
index edb8d0817..0489df02c 100644
--- a/modules/ppcp-admin-notices/src/AdminNotices.php
+++ b/modules/ppcp-admin-notices/src/AdminNotices.php
@@ -45,7 +45,19 @@ class AdminNotices implements ModuleInterface {
 
 		add_action(
 			Repository::NOTICES_FILTER,
+			/**
+			 * Adds persisted notices to the notices array.
+			 *
+			 * @param array $notices The notices.
+			 * @return array
+			 *
+			 * @psalm-suppress MissingClosureParamType
+			 */
 			function ( $notices ) use ( $c ) {
+				if ( ! is_array( $notices ) ) {
+					return $notices;
+				}
+
 				$admin_notices = $c->get( 'admin-notices.repository' );
 				assert( $admin_notices instanceof Repository );
 

From ef5dc3a9f58257e867437bf7ea24d8f9ab7c8d96 Mon Sep 17 00:00:00 2001
From: Pedro Silva <p.silva@inpsyde.com>
Date: Wed, 28 Feb 2024 11:26:43 +0000
Subject: [PATCH 006/101] Fix lint.

---
 .../src/Processor/AuthorizedPaymentsProcessor.php               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ppcp-wc-gateway/src/Processor/AuthorizedPaymentsProcessor.php b/modules/ppcp-wc-gateway/src/Processor/AuthorizedPaymentsProcessor.php
index 5eb63b683..34bc13060 100644
--- a/modules/ppcp-wc-gateway/src/Processor/AuthorizedPaymentsProcessor.php
+++ b/modules/ppcp-wc-gateway/src/Processor/AuthorizedPaymentsProcessor.php
@@ -105,7 +105,7 @@ class AuthorizedPaymentsProcessor {
 	 *
 	 * @var string
 	 */
-	private $reauthorization_failure_reason;
+	private $reauthorization_failure_reason = '';
 
 	/**
 	 * AuthorizedPaymentsProcessor constructor.

From da8d5665601430664214c2a6aa95d0ab13ee0b40 Mon Sep 17 00:00:00 2001
From: Pedro Silva <p.silva@inpsyde.com>
Date: Mon, 4 Mar 2024 15:20:35 +0000
Subject: [PATCH 007/101] Add order notes.

---
 modules/ppcp-wc-gateway/src/WCGatewayModule.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/ppcp-wc-gateway/src/WCGatewayModule.php b/modules/ppcp-wc-gateway/src/WCGatewayModule.php
index fd4395223..e82f65e9e 100644
--- a/modules/ppcp-wc-gateway/src/WCGatewayModule.php
+++ b/modules/ppcp-wc-gateway/src/WCGatewayModule.php
@@ -666,6 +666,10 @@ class WCGatewayModule implements ModuleInterface {
 					$admin_notices->persist( new Message( $message, 'error' ) );
 				} else {
 					$admin_notices->persist( new Message( 'Payment reauthorized.', 'info' ) );
+
+					$wc_order->add_order_note(
+						__( 'Payment reauthorized.', 'woocommerce-paypal-payments' )
+					);
 				}
 			}
 		);

From 13716bfa1681c5602228a48702bbeacb4445b4f8 Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Tue, 5 Mar 2024 15:14:40 +0400
Subject: [PATCH 008/101] Remove the preview from script

---
 .../src/PayLaterConfiguratorModule.php                          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ppcp-paylater-configurator/src/PayLaterConfiguratorModule.php b/modules/ppcp-paylater-configurator/src/PayLaterConfiguratorModule.php
index d3e110289..203c57ac3 100644
--- a/modules/ppcp-paylater-configurator/src/PayLaterConfiguratorModule.php
+++ b/modules/ppcp-paylater-configurator/src/PayLaterConfiguratorModule.php
@@ -79,7 +79,7 @@ class PayLaterConfiguratorModule implements ModuleInterface {
 			static function () use ( $c, $settings ) {
 				wp_enqueue_script(
 					'ppcp-paylater-configurator-lib',
-					'https://www.paypalobjects.com/merchant-library/preview/merchant-configurator.js',
+					'https://www.paypalobjects.com/merchant-library/merchant-configurator.js',
 					array(),
 					$c->get( 'ppcp.asset-version' ),
 					true

From 71c0da5c35cdfd74de97053fa8b3fe68d3a4d96b Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Tue, 5 Mar 2024 17:05:37 +0400
Subject: [PATCH 009/101] Use the "product_preview" for now instead of custom

---
 .../resources/js/paylater-configurator.js                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js b/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js
index 7250e8ce0..0081544bd 100644
--- a/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js
+++ b/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js
@@ -30,7 +30,7 @@ document.addEventListener( 'DOMContentLoaded', () => {
         partnerClientId: PcpPayLaterConfigurator.partnerClientId,
         partnerName: 'WooCommerce',
         bnCode: 'Woo_PPCP',
-        placements: ['cart', 'checkout', 'product', 'category', 'homepage', 'custom_placement'],
+        placements: ['cart', 'checkout', 'product', 'category', 'homepage', 'product_preview'],
         styleOverrides: {
             button: publishButtonClassName,
             header: PcpPayLaterConfigurator.headerClassName,

From f2a741094c8eb85b33a5979c8357947ab6e7c7b9 Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Tue, 5 Mar 2024 17:06:40 +0400
Subject: [PATCH 010/101] Separate "module loaded" "block enabled" methods

---
 .../src/PayLaterBlockModule.php                 | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/modules/ppcp-paylater-block/src/PayLaterBlockModule.php b/modules/ppcp-paylater-block/src/PayLaterBlockModule.php
index 9544c5686..be4c5db75 100644
--- a/modules/ppcp-paylater-block/src/PayLaterBlockModule.php
+++ b/modules/ppcp-paylater-block/src/PayLaterBlockModule.php
@@ -15,6 +15,7 @@ use WooCommerce\PayPalCommerce\Vendor\Dhii\Container\ServiceProvider;
 use WooCommerce\PayPalCommerce\Vendor\Dhii\Modular\Module\ModuleInterface;
 use WooCommerce\PayPalCommerce\Vendor\Interop\Container\ServiceProviderInterface;
 use WooCommerce\PayPalCommerce\Vendor\Psr\Container\ContainerInterface;
+use WooCommerce\PayPalCommerce\WcGateway\Helper\SettingsStatus;
 use WooCommerce\PayPalCommerce\WcGateway\Settings\Settings;
 
 /**
@@ -22,16 +23,26 @@ use WooCommerce\PayPalCommerce\WcGateway\Settings\Settings;
  */
 class PayLaterBlockModule implements ModuleInterface {
 	/**
-	 * Returns whether the block should be loaded.
+	 * Returns whether the block module should be loaded.
 	 */
-	public static function is_enabled(): bool {
+	public static function is_module_loading_required(): bool {
 		return apply_filters(
 			// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
 			'woocommerce.feature-flags.woocommerce_paypal_payments.paylater_block_enabled',
-			getenv( 'PCP_PAYLATER_BLOCK' ) === '1'
+			getenv( 'PCP_PAYLATER_BLOCK' ) !== '0'
 		);
 	}
 
+	/**
+	 * Returns whether the block is enabled.
+	 *
+	 * @param SettingsStatus $settings_status The Settings status helper.
+	 * @return bool true if the block is enabled, otherwise false.
+	 */
+	public static function is_block_enabled( SettingsStatus $settings_status ): bool {
+		return self::is_module_loading_required() && $settings_status->is_pay_later_messaging_enabled_for_location( 'product_preview' );
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */

From b72898c29019de2b6d8696ab78a774214c0e9fbc Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Tue, 5 Mar 2024 17:07:16 +0400
Subject: [PATCH 011/101] Enable feature flag for configurator module

---
 .../src/PayLaterConfiguratorModule.php                          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ppcp-paylater-configurator/src/PayLaterConfiguratorModule.php b/modules/ppcp-paylater-configurator/src/PayLaterConfiguratorModule.php
index 203c57ac3..fd5d4c6d5 100644
--- a/modules/ppcp-paylater-configurator/src/PayLaterConfiguratorModule.php
+++ b/modules/ppcp-paylater-configurator/src/PayLaterConfiguratorModule.php
@@ -29,7 +29,7 @@ class PayLaterConfiguratorModule implements ModuleInterface {
 		return apply_filters(
 			// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
 			'woocommerce.feature-flags.woocommerce_paypal_payments.paylater_configurator_enabled',
-			getenv( 'PCP_PAYLATER_CONFIGURATOR' ) === '1'
+			getenv( 'PCP_PAYLATER_CONFIGURATOR' ) !== '0'
 		);
 	}
 

From e0a232bb49aa5c689bc758bcf36ae10efde70456 Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Tue, 5 Mar 2024 17:07:48 +0400
Subject: [PATCH 012/101] Save the "product_preview" placement

---
 .../ppcp-paylater-configurator/src/Factory/ConfigFactory.php    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php b/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
index cb272984d..dbb81c5a7 100644
--- a/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
+++ b/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
@@ -27,6 +27,7 @@ class ConfigFactory {
 			$this->location_to_configurator_placement( 'product' ) => $this->for_location( $settings, 'product' ),
 			$this->location_to_configurator_placement( 'shop' ) => $this->for_location( $settings, 'shop' ),
 			$this->location_to_configurator_placement( 'home' ) => $this->for_location( $settings, 'home' ),
+			$this->location_to_configurator_placement( 'product_preview' ) => $this->for_location( $settings, 'product_preview' ),
 		);
 	}
 
@@ -76,6 +77,7 @@ class ConfigFactory {
 			case 'cart':
 			case 'checkout':
 			case 'product':
+			case 'product_preview':
 				return $location;
 			case 'shop':
 				return 'category';

From 1f5e32c0b0d1ecff931d43d8761ce6863e88784e Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Tue, 5 Mar 2024 17:08:10 +0400
Subject: [PATCH 013/101] Use the new way to check if block should be enabled

---
 modules.php                                                   | 2 +-
 modules/ppcp-button/src/Assets/SmartButton.php                | 4 ++--
 .../ppcp-paylater-configurator/src/Endpoint/SaveConfig.php    | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules.php b/modules.php
index 8ee91f43e..c6840d8ab 100644
--- a/modules.php
+++ b/modules.php
@@ -68,7 +68,7 @@ return function ( string $root_dir ): iterable {
 		$modules[] = ( require "$modules_dir/ppcp-save-payment-methods/module.php" )();
 	}
 
-	if ( PayLaterBlockModule::is_enabled() ) {
+	if ( PayLaterBlockModule::is_module_loading_required() ) {
 		$modules[] = ( require "$modules_dir/ppcp-paylater-block/module.php" )();
 	}
 
diff --git a/modules/ppcp-button/src/Assets/SmartButton.php b/modules/ppcp-button/src/Assets/SmartButton.php
index d63b56af4..12e7abfbd 100644
--- a/modules/ppcp-button/src/Assets/SmartButton.php
+++ b/modules/ppcp-button/src/Assets/SmartButton.php
@@ -631,7 +631,7 @@ document.querySelector("#payment").before(document.querySelector("#ppcp-messages
 
 		$messaging_enabled_for_current_location = $this->settings_status->is_pay_later_messaging_enabled_for_location( $location );
 
-		$has_paylater_block = has_block( 'woocommerce-paypal-payments/paylater-messages' ) && PayLaterBlockModule::is_enabled();
+		$has_paylater_block = has_block( 'woocommerce-paypal-payments/paylater-messages' ) && PayLaterBlockModule::is_block_enabled( $this->settings_status );
 
 		switch ( $location ) {
 			case 'checkout':
@@ -878,7 +878,7 @@ document.querySelector("#payment").before(document.querySelector("#ppcp-messages
 			'wrapper'   => '#ppcp-messages',
 			'is_hidden' => ! $this->is_pay_later_filter_enabled_for_location( $this->context() ),
 			'block'     => array(
-				'enabled' => PayLaterBlockModule::is_enabled(),
+				'enabled' => PayLaterBlockModule::is_block_enabled( $this->settings_status ),
 			),
 			'amount'    => $amount,
 			'placement' => $placement,
diff --git a/modules/ppcp-paylater-configurator/src/Endpoint/SaveConfig.php b/modules/ppcp-paylater-configurator/src/Endpoint/SaveConfig.php
index 051a89dd6..e5e01c8e8 100644
--- a/modules/ppcp-paylater-configurator/src/Endpoint/SaveConfig.php
+++ b/modules/ppcp-paylater-configurator/src/Endpoint/SaveConfig.php
@@ -156,6 +156,7 @@ class SaveConfig {
 			case 'cart':
 			case 'checkout':
 			case 'product':
+			case 'product_preview':
 				return $placement;
 			case 'category':
 				return 'shop';

From 982b0e950dc49a043667e2a40b901b4fd55d3e05 Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Tue, 5 Mar 2024 18:56:38 +0400
Subject: [PATCH 014/101] Submit the form instead of refreshing the page

---
 .../resources/js/paylater-configurator.js     | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js b/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js
index 7250e8ce0..0d4cc3b79 100644
--- a/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js
+++ b/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js
@@ -15,15 +15,25 @@ document.addEventListener( 'DOMContentLoaded', () => {
     headingRow.parentNode.insertBefore(newRow, headingRow.nextSibling);
 
 
-    saveChangesButton.addEventListener('click', () => {
-        form.querySelector('.' + publishButtonClassName).click();
+    let isSaving = false; // Flag variable to track whether saving is in progress
 
-        // Delay the page refresh by a few milliseconds to ensure changes take effect
-        setTimeout(() => {
-            location.reload();
-        }, 1000);
+    saveChangesButton.addEventListener('click', () => {
+        // Check if saving is not already in progress
+        if (!isSaving) {
+            isSaving = true; // Set flag to indicate saving is in progress
+
+            // Trigger the click event on the publish button
+            form.querySelector('.' + publishButtonClassName).click();
+
+            // Trigger click event on saveChangesButton after a short delay
+            setTimeout(() => {
+                saveChangesButton.click(); // Trigger click event on saveChangesButton
+                isSaving = false; // Reset flag when saving is complete
+            }, 500); // Adjust the delay as needed
+        }
     });
 
+
     merchantConfigurators.Messaging({
         config: PcpPayLaterConfigurator.config,
         merchantClientId: PcpPayLaterConfigurator.merchantClientId,

From f3da7a31624e0c7d8b5641388a8aecae004a5c40 Mon Sep 17 00:00:00 2001
From: Daniel Dudzic <d.dudzic@syde.com>
Date: Mon, 11 Mar 2024 15:25:00 +0100
Subject: [PATCH 015/101] Card Fields: Add a filter for the CVC field, adjust
 the CVC string to match the field label CVV and make it translatable (2658)

---
 modules/ppcp-card-fields/src/CardFieldsModule.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/modules/ppcp-card-fields/src/CardFieldsModule.php b/modules/ppcp-card-fields/src/CardFieldsModule.php
index 213134857..faa36a3bc 100644
--- a/modules/ppcp-card-fields/src/CardFieldsModule.php
+++ b/modules/ppcp-card-fields/src/CardFieldsModule.php
@@ -97,6 +97,17 @@ class CardFieldsModule implements ModuleInterface {
 					}
 				}
 
+				if ( apply_filters( 'woocommerce_paypal_payments_card_fields_translate_card_cvv', true ) ) {
+					if ( isset( $default_fields['card-cvc-field'] ) ) {
+						// Replaces the default card cvc placeholder with a translatable one (which also matches the CVV field label).
+						$default_fields['card-cvc-field'] = str_replace(
+							'CVC',
+							esc_attr__( 'CVV', 'woocommerce-paypal-payments' ),
+							$default_fields['card-cvc-field']
+						);
+					}
+				}
+
 				return $default_fields;
 			},
 			10,

From fd4a21a356869f82072c3f4e49bae4b2f59e293c Mon Sep 17 00:00:00 2001
From: Daniel Dudzic <d.dudzic@syde.com>
Date: Mon, 11 Mar 2024 18:18:06 +0100
Subject: [PATCH 016/101] Remove the str_replace CVC placeholder adjusting in
 favor of using the existing translation

---
 .../ppcp-card-fields/src/CardFieldsModule.php | 11 -----------
 .../src/Gateway/CreditCardGateway.php         | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/modules/ppcp-card-fields/src/CardFieldsModule.php b/modules/ppcp-card-fields/src/CardFieldsModule.php
index faa36a3bc..213134857 100644
--- a/modules/ppcp-card-fields/src/CardFieldsModule.php
+++ b/modules/ppcp-card-fields/src/CardFieldsModule.php
@@ -97,17 +97,6 @@ class CardFieldsModule implements ModuleInterface {
 					}
 				}
 
-				if ( apply_filters( 'woocommerce_paypal_payments_card_fields_translate_card_cvv', true ) ) {
-					if ( isset( $default_fields['card-cvc-field'] ) ) {
-						// Replaces the default card cvc placeholder with a translatable one (which also matches the CVV field label).
-						$default_fields['card-cvc-field'] = str_replace(
-							'CVC',
-							esc_attr__( 'CVV', 'woocommerce-paypal-payments' ),
-							$default_fields['card-cvc-field']
-						);
-					}
-				}
-
 				return $default_fields;
 			},
 			10,
diff --git a/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php b/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php
index f2903d239..a1a3b8f06 100644
--- a/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php
+++ b/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php
@@ -291,8 +291,10 @@ class CreditCardGateway extends \WC_Payment_Gateway_CC {
 	 */
 	public function form() {
 		add_action( 'gettext', array( $this, 'replace_credit_card_cvv_label' ), 10, 3 );
+		add_action( 'gettext', array( $this, 'replace_credit_card_cvv_placeholder' ), 10, 3 );
 		parent::form();
 		remove_action( 'gettext', 'replace_credit_card_cvv_label' );
+		remove_action( 'gettext', 'replace_credit_card_cvv_placeholder' );
 	}
 
 	/**
@@ -312,6 +314,23 @@ class CreditCardGateway extends \WC_Payment_Gateway_CC {
 		return __( 'CVV', 'woocommerce-paypal-payments' );
 	}
 
+	/**
+	 * Replace WooCommerce credit card CVV field placeholder.
+	 *
+	 * @param string $translation Translated text.
+	 * @param string $text Original text to translate.
+	 * @param string $domain Text domain.
+	 *
+	 * @return string Translated field.
+	 */
+	public function replace_credit_card_cvv_placeholder( string $translation, string $text, string $domain ): string {
+		if ( 'woocommerce' !== $domain || 'CVC' !== $text || ! apply_filters( 'woocommerce_paypal_payments_card_fields_translate_card_cvv', true ) ) {
+			return $translation;
+		}
+
+		return __( 'CVV', 'woocommerce-paypal-payments' );
+	}
+
 	/**
 	 * Returns the icons of the gateway.
 	 *

From 27b8155766e45e37c1fa28dd38c0638a398833cb Mon Sep 17 00:00:00 2001
From: Daniel Dudzic <d.dudzic@syde.com>
Date: Mon, 11 Mar 2024 19:12:24 +0100
Subject: [PATCH 017/101] Product Title: Ensure the product title in addition
 to the product description gets correctly sanitized and trimmed before
 getting sent to PayPal

---
 modules/ppcp-api-client/src/Factory/ItemFactory.php    | 10 +++++-----
 modules/ppcp-api-client/src/Helper/ItemTrait.php       |  8 ++++----
 modules/ppcp-order-tracking/src/Shipment/Shipment.php  |  4 ++--
 .../src/SubscriptionsApiHandler.php                    |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/modules/ppcp-api-client/src/Factory/ItemFactory.php b/modules/ppcp-api-client/src/Factory/ItemFactory.php
index e8fc98c86..c2b14d0e1 100644
--- a/modules/ppcp-api-client/src/Factory/ItemFactory.php
+++ b/modules/ppcp-api-client/src/Factory/ItemFactory.php
@@ -61,10 +61,10 @@ class ItemFactory {
 
 				$price = (float) $item['line_subtotal'] / (float) $item['quantity'];
 				return new Item(
-					mb_substr( $product->get_name(), 0, 127 ),
+					$this->prepare_item_string( $product->get_name() ),
 					new Money( $price, $this->currency ),
 					$quantity,
-					$this->prepare_description( $product->get_description() ),
+					$this->prepare_item_string( $product->get_description() ),
 					null,
 					$this->prepare_sku( $product->get_sku() ),
 					( $product->is_virtual() ) ? Item::DIGITAL_GOODS : Item::PHYSICAL_GOODS,
@@ -138,10 +138,10 @@ class ItemFactory {
 		$image                     = $product instanceof WC_Product ? wp_get_attachment_image_src( (int) $product->get_image_id(), 'full' ) : '';
 
 		return new Item(
-			mb_substr( $item->get_name(), 0, 127 ),
+			$this->prepare_item_string( $item->get_name() ),
 			new Money( $price_without_tax_rounded, $currency ),
 			$quantity,
-			$product instanceof WC_Product ? $this->prepare_description( $product->get_description() ) : '',
+			$product instanceof WC_Product ? $this->prepare_item_string( $product->get_description() ) : '',
 			null,
 			$product instanceof WC_Product ? $this->prepare_sku( $product->get_sku() ) : '',
 			( $product instanceof WC_Product && $product->is_virtual() ) ? Item::DIGITAL_GOODS : Item::PHYSICAL_GOODS,
@@ -160,7 +160,7 @@ class ItemFactory {
 	 */
 	private function from_wc_order_fee( \WC_Order_Item_Fee $item, \WC_Order $order ): Item {
 		return new Item(
-			$item->get_name(),
+			$this->prepare_item_string( $item->get_name() ),
 			new Money( (float) $item->get_amount(), $order->get_currency() ),
 			$item->get_quantity(),
 			'',
diff --git a/modules/ppcp-api-client/src/Helper/ItemTrait.php b/modules/ppcp-api-client/src/Helper/ItemTrait.php
index 3b1e05bd0..4a93e3914 100644
--- a/modules/ppcp-api-client/src/Helper/ItemTrait.php
+++ b/modules/ppcp-api-client/src/Helper/ItemTrait.php
@@ -12,14 +12,14 @@ namespace WooCommerce\PayPalCommerce\ApiClient\Helper;
 trait ItemTrait {
 
 	/**
-	 * Cleanups the description and prepares it for sending to PayPal.
+	 * Cleans up item strings (title and description for example) and prepares them for sending to PayPal.
 	 *
 	 * @param string $description Item description.
 	 * @return string
 	 */
-	protected function prepare_description( string $description ): string {
-		$description = strip_shortcodes( wp_strip_all_tags( $description ) );
-		return substr( $description, 0, 127 ) ?: '';
+	protected function prepare_item_string( string $string ): string {
+		$string = strip_shortcodes( wp_strip_all_tags( $string ) );
+		return substr( $string, 0, 127 ) ?: '';
 	}
 
 	/**
diff --git a/modules/ppcp-order-tracking/src/Shipment/Shipment.php b/modules/ppcp-order-tracking/src/Shipment/Shipment.php
index 099801874..9661d574c 100644
--- a/modules/ppcp-order-tracking/src/Shipment/Shipment.php
+++ b/modules/ppcp-order-tracking/src/Shipment/Shipment.php
@@ -169,10 +169,10 @@ class Shipment implements ShipmentInterface {
 			$image                     = wp_get_attachment_image_src( (int) $product->get_image_id(), 'full' );
 
 			$ppcp_order_item = new Item(
-				mb_substr( $item->get_name(), 0, 127 ),
+				$this->prepare_item_string( $item->get_name() ),
 				new Money( $price_without_tax_rounded, $currency ),
 				$quantity,
-				$this->prepare_description( $product->get_description() ),
+				$this->prepare_item_string( $product->get_description() ),
 				null,
 				$this->prepare_sku( $product->get_sku() ),
 				$product->is_virtual() ? Item::DIGITAL_GOODS : Item::PHYSICAL_GOODS,
diff --git a/modules/ppcp-paypal-subscriptions/src/SubscriptionsApiHandler.php b/modules/ppcp-paypal-subscriptions/src/SubscriptionsApiHandler.php
index 4d56558ab..2109f13d2 100644
--- a/modules/ppcp-paypal-subscriptions/src/SubscriptionsApiHandler.php
+++ b/modules/ppcp-paypal-subscriptions/src/SubscriptionsApiHandler.php
@@ -114,7 +114,7 @@ class SubscriptionsApiHandler {
 	 */
 	public function create_product( WC_Product $product ) {
 		try {
-			$subscription_product = $this->products_endpoint->create( $product->get_title(), $this->prepare_description( $product->get_description() ) );
+			$subscription_product = $this->products_endpoint->create( $this->prepare_item_string( $product->get_title() ), $this->prepare_item_string( $product->get_description() ) );
 			$product->update_meta_data( 'ppcp_subscription_product', $subscription_product->to_array() );
 			$product->save();
 		} catch ( RuntimeException $exception ) {
@@ -169,7 +169,7 @@ class SubscriptionsApiHandler {
 				$catalog_product_name        = $catalog_product->name() ?: '';
 				$catalog_product_description = $catalog_product->description() ?: '';
 
-				$wc_product_description = $this->prepare_description( $product->get_description() ) ?: $product->get_title();
+				$wc_product_description = $this->prepare_item_string( $product->get_description() ) ?: $this->prepare_item_string( $product->get_title() );
 
 				if ( $catalog_product_name !== $product->get_title() || $catalog_product_description !== $wc_product_description ) {
 					$data = array();

From beb14ea95ad5964bed49e4d96b7afc287f27b1c7 Mon Sep 17 00:00:00 2001
From: Daniel Dudzic <d.dudzic@syde.com>
Date: Mon, 11 Mar 2024 20:04:40 +0100
Subject: [PATCH 018/101] Update the prepare_item_string() comments

---
 modules/ppcp-api-client/src/Helper/ItemTrait.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ppcp-api-client/src/Helper/ItemTrait.php b/modules/ppcp-api-client/src/Helper/ItemTrait.php
index 4a93e3914..289889290 100644
--- a/modules/ppcp-api-client/src/Helper/ItemTrait.php
+++ b/modules/ppcp-api-client/src/Helper/ItemTrait.php
@@ -14,7 +14,7 @@ trait ItemTrait {
 	/**
 	 * Cleans up item strings (title and description for example) and prepares them for sending to PayPal.
 	 *
-	 * @param string $description Item description.
+	 * @param string $string Item string.
 	 * @return string
 	 */
 	protected function prepare_item_string( string $string ): string {

From 811c921b41e3667958713dc2094a877610628c11 Mon Sep 17 00:00:00 2001
From: Daniel Dudzic <d.dudzic@syde.com>
Date: Mon, 11 Mar 2024 20:54:07 +0100
Subject: [PATCH 019/101] Update the testFromWcOrderMaxStringLength() test to
 match the new title sanitization and trimming

---
 tests/PHPUnit/ApiClient/Factory/ItemFactoryTest.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/PHPUnit/ApiClient/Factory/ItemFactoryTest.php b/tests/PHPUnit/ApiClient/Factory/ItemFactoryTest.php
index f8eedb3bb..65d41e881 100644
--- a/tests/PHPUnit/ApiClient/Factory/ItemFactoryTest.php
+++ b/tests/PHPUnit/ApiClient/Factory/ItemFactoryTest.php
@@ -312,11 +312,12 @@ class ItemFactoryTest extends TestCase
 
         $result = $testee->from_wc_order($order);
         $item = current($result);
+
         /**
          * @var Item $item
          */
-        $this->assertEquals(mb_substr($name, 0, 127), $item->name());
-        $this->assertEquals(substr($description, 0, 127), $item->description());
+        $this->assertEquals(substr( strip_shortcodes( wp_strip_all_tags( $name ) ), 0, 127 ), $item->name());
+        $this->assertEquals(substr( strip_shortcodes( wp_strip_all_tags( $description ) ), 0, 127 ), $item->description());
     }
 
     public function testFromPayPalResponse()

From 91f6007921db56766c0fea9a160abd785a2ea4b4 Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Tue, 12 Mar 2024 17:23:55 +0400
Subject: [PATCH 020/101] Rely on placement existence also on admin panel

---
 .../ppcp-paylater-block/resources/js/edit.js  | 23 ++++++++++++++++++-
 .../src/PayLaterBlockModule.php               |  8 ++++---
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/modules/ppcp-paylater-block/resources/js/edit.js b/modules/ppcp-paylater-block/resources/js/edit.js
index 63330318c..291a8732c 100644
--- a/modules/ppcp-paylater-block/resources/js/edit.js
+++ b/modules/ppcp-paylater-block/resources/js/edit.js
@@ -34,7 +34,7 @@ export default function Edit( { attributes, clientId, setAttributes } ) {
     };
 
     let classes = ['ppcp-paylater-block-preview', 'ppcp-overlay-parent'];
-    if (PcpPayLaterBlock.vaultingEnabled) {
+    if (PcpPayLaterBlock.vaultingEnabled || !PcpPayLaterBlock.placementEnabled) {
         classes = ['ppcp-paylater-block-preview', 'ppcp-paylater-unavailable', 'block-editor-warning'];
     }
     const props = useBlockProps({className: classes});
@@ -68,6 +68,27 @@ export default function Edit( { attributes, clientId, setAttributes } ) {
         </div>
     }
 
+    if (!PcpPayLaterBlock.placementEnabled) {
+        return <div {...props}>
+            <div className={'block-editor-warning__contents'}>
+                <h3>{__('PayPal Pay Later Messaging', 'woocommerce-paypal-payments')}</h3>
+                <p className={'block-editor-warning__message'}>{__('Pay Later Messaging cannot be used while the “WooCommerce Block” messaging placement is disabled. Enable the placement in the PayPal Payments Pay Later settings to reactivate this block.', 'woocommerce-paypal-payments')}</p>
+                <div className={'class="block-editor-warning__actions"'}>
+                    <span className={'block-editor-warning__action'}>
+                        <a href={PcpPayLaterBlock.payLaterSettingsUrl} className={'components-button is-primary'}>
+                            {__('PayPal Payments Settings', 'woocommerce-paypal-payments')}
+                        </a>
+                    </span>
+                    <span className={'block-editor-warning__action'}>
+                        <button onClick={() => wp.data.dispatch( 'core/block-editor' ).removeBlock(clientId)} type={'button'} className={'components-button is-secondary'}>
+                            {__('Remove Block', 'woocommerce-paypal-payments')}
+                        </button>
+                    </span>
+                </div>
+            </div>
+        </div>
+    }
+
     let scriptParams = useScriptParams(PcpPayLaterBlock.ajax.cart_script_params);
     if (scriptParams === null) {
         return loadingElement;
diff --git a/modules/ppcp-paylater-block/src/PayLaterBlockModule.php b/modules/ppcp-paylater-block/src/PayLaterBlockModule.php
index be4c5db75..d5953f407 100644
--- a/modules/ppcp-paylater-block/src/PayLaterBlockModule.php
+++ b/modules/ppcp-paylater-block/src/PayLaterBlockModule.php
@@ -82,13 +82,15 @@ class PayLaterBlockModule implements ModuleInterface {
 					$script_handle,
 					'PcpPayLaterBlock',
 					array(
-						'ajax'            => array(
+						'ajax'                => array(
 							'cart_script_params' => array(
 								'endpoint' => \WC_AJAX::get_endpoint( CartScriptParamsEndpoint::ENDPOINT ),
 							),
 						),
-						'settingsUrl'     => admin_url( 'admin.php?page=wc-settings&tab=checkout&section=ppcp-gateway' ),
-						'vaultingEnabled' => $settings->has( 'vault_enabled' ) && $settings->get( 'vault_enabled' ),
+						'settingsUrl'         => admin_url( 'admin.php?page=wc-settings&tab=checkout&section=ppcp-gateway' ),
+						'vaultingEnabled'     => $settings->has( 'vault_enabled' ) && $settings->get( 'vault_enabled' ),
+						'placementEnabled'    => self::is_block_enabled( $c->get( 'wcgateway.settings.status' ) ),
+						'payLaterSettingsUrl' => admin_url( 'admin.php?page=wc-settings&tab=checkout&section=ppcp-gateway&ppcp-tab=ppcp-pay-later' ),
 					)
 				);
 

From ef9a4d9cdfb4dab86288ba5cc30c25c52a4881cc Mon Sep 17 00:00:00 2001
From: Daniel Dudzic <d.dudzic@syde.com>
Date: Tue, 12 Mar 2024 15:32:15 +0100
Subject: [PATCH 021/101] Pay upon Invoice: Add input validation via pattern
 and required attributes to the Experience Context setting fields (667)

---
 .../PayUponInvoice/PayUponInvoiceGateway.php   | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/PayUponInvoiceGateway.php b/modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/PayUponInvoiceGateway.php
index 20ab81fb6..73967dbc6 100644
--- a/modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/PayUponInvoiceGateway.php
+++ b/modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/PayUponInvoiceGateway.php
@@ -202,7 +202,13 @@ class PayUponInvoiceGateway extends WC_Payment_Gateway {
 				'type'        => 'text',
 				'default'     => get_bloginfo( 'name' ) ?? '',
 				'desc_tip'    => true,
-				'description' => __( 'Merchant name displayed in Ratepay\'s payment instructions.', 'woocommerce-paypal-payments' ),
+				'description' => __( 'Merchant name displayed in Ratepay\'s payment instructions. Should not exceed 127 characters.', 'woocommerce-paypal-payments' ),
+				'maxlength'   => 127,
+				'custom_attributes' => array(
+					'pattern' => '.{1,127}',
+					'autocomplete' => 'off',
+					'required' => ''
+				),
 			),
 			'logo_url'                      => array(
 				'title'       => __( 'Logo URL', 'woocommerce-paypal-payments' ),
@@ -210,6 +216,11 @@ class PayUponInvoiceGateway extends WC_Payment_Gateway {
 				'default'     => '',
 				'desc_tip'    => true,
 				'description' => __( 'Logo to be presented on Ratepay\'s payment instructions.', 'woocommerce-paypal-payments' ),
+				'custom_attributes' => array(
+					'pattern' => '.+',
+					'autocomplete' => 'off',
+					'required' => ''
+				),
 			),
 			'customer_service_instructions' => array(
 				'title'       => __( 'Customer service instructions', 'woocommerce-paypal-payments' ),
@@ -217,6 +228,11 @@ class PayUponInvoiceGateway extends WC_Payment_Gateway {
 				'default'     => '',
 				'desc_tip'    => true,
 				'description' => __( 'Customer service instructions to be presented on Ratepay\'s payment instructions.', 'woocommerce-paypal-payments' ),
+				'custom_attributes' => array(
+					'pattern' => '.+',
+					'autocomplete' => 'off',
+					'required' => ''
+				),
 			),
 		);
 	}

From 680de182a9f7fd94ae47305395ca99478793a363 Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Tue, 12 Mar 2024 18:39:45 +0400
Subject: [PATCH 022/101] Change the placement names for home & shop

---
 .../resources/js/paylater-configurator.js     |  2 +-
 .../src/Endpoint/SaveConfig.php               | 27 +------------
 .../src/Factory/ConfigFactory.php             | 38 ++++---------------
 3 files changed, 11 insertions(+), 56 deletions(-)

diff --git a/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js b/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js
index 0081544bd..2e230b8e4 100644
--- a/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js
+++ b/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js
@@ -30,7 +30,7 @@ document.addEventListener( 'DOMContentLoaded', () => {
         partnerClientId: PcpPayLaterConfigurator.partnerClientId,
         partnerName: 'WooCommerce',
         bnCode: 'Woo_PPCP',
-        placements: ['cart', 'checkout', 'product', 'category', 'homepage', 'product_preview'],
+        placements: ['cart', 'checkout', 'product', 'shop', 'home', 'product_preview'],
         styleOverrides: {
             button: publishButtonClassName,
             header: PcpPayLaterConfigurator.headerClassName,
diff --git a/modules/ppcp-paylater-configurator/src/Endpoint/SaveConfig.php b/modules/ppcp-paylater-configurator/src/Endpoint/SaveConfig.php
index e5e01c8e8..6584b7da3 100644
--- a/modules/ppcp-paylater-configurator/src/Endpoint/SaveConfig.php
+++ b/modules/ppcp-paylater-configurator/src/Endpoint/SaveConfig.php
@@ -101,12 +101,10 @@ class SaveConfig {
 		$enabled_locations = array();
 
 		foreach ( $config as $placement => $data ) {
-			$location = $this->configurator_placement_to_location( $placement );
-
-			$this->save_config_for_location( $data, $location );
+			$this->save_config_for_location( $data, $placement );
 
 			if ( $data['status'] === 'enabled' ) {
-				$enabled_locations[] = $location;
+				$enabled_locations[] = $placement;
 			}
 		}
 
@@ -145,25 +143,4 @@ class SaveConfig {
 			$this->settings->set( $settings_key, $config[ $key ] );
 		}
 	}
-
-	/**
-	 * Converts the configurator placement into location in the old settings.
-	 *
-	 * @param string $placement The configurator placement.
-	 */
-	private function configurator_placement_to_location( string $placement ): string {
-		switch ( $placement ) {
-			case 'cart':
-			case 'checkout':
-			case 'product':
-			case 'product_preview':
-				return $placement;
-			case 'category':
-				return 'shop';
-			case 'homepage':
-				return 'home';
-			default:
-				return '';
-		}
-	}
 }
diff --git a/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php b/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
index dbb81c5a7..240cfeafd 100644
--- a/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
+++ b/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
@@ -22,12 +22,12 @@ class ConfigFactory {
 	 */
 	public function from_settings( Settings $settings ): array {
 		return array(
-			$this->location_to_configurator_placement( 'cart' ) => $this->for_location( $settings, 'cart' ),
-			$this->location_to_configurator_placement( 'checkout' ) => $this->for_location( $settings, 'checkout' ),
-			$this->location_to_configurator_placement( 'product' ) => $this->for_location( $settings, 'product' ),
-			$this->location_to_configurator_placement( 'shop' ) => $this->for_location( $settings, 'shop' ),
-			$this->location_to_configurator_placement( 'home' ) => $this->for_location( $settings, 'home' ),
-			$this->location_to_configurator_placement( 'product_preview' ) => $this->for_location( $settings, 'product_preview' ),
+			'cart'            => $this->for_location( $settings, 'cart' ),
+			'checkout'        => $this->for_location( $settings, 'checkout' ),
+			'product'         => $this->for_location( $settings, 'product' ),
+			'shop'            => $this->for_location( $settings, 'shop' ),
+			'home'            => $this->for_location( $settings, 'home' ),
+			'product_preview' => $this->for_location( $settings, 'product_preview' ),
 		);
 	}
 
@@ -40,8 +40,7 @@ class ConfigFactory {
 	private function for_location( Settings $settings, string $location ): array {
 		$selected_locations = $settings->has( 'pay_later_messaging_locations' ) ? $settings->get( 'pay_later_messaging_locations' ) : array();
 
-		$placement = $this->location_to_configurator_placement( $location );
-		if ( in_array( $placement, array( 'category', 'homepage' ), true ) ) {
+		if ( in_array( $location, array( 'shop', 'home' ), true ) ) {
 			$config = array(
 				'layout' => 'flex',
 				'color'  => $this->get_or_default( $settings, "pay_later_{$location}_message_flex_color", 'black', array( 'black', 'blue', 'white', 'white-no-border' ) ),
@@ -61,33 +60,12 @@ class ConfigFactory {
 		return array_merge(
 			array(
 				'status'    => in_array( $location, $selected_locations, true ) ? 'enabled' : 'disabled',
-				'placement' => $placement,
+				'placement' => $location,
 			),
 			$config
 		);
 	}
 
-	/**
-	 * Converts the location name from the old settings into the configurator placement.
-	 *
-	 * @param string $location The location name in the old settings.
-	 */
-	private function location_to_configurator_placement( string $location ): string {
-		switch ( $location ) {
-			case 'cart':
-			case 'checkout':
-			case 'product':
-			case 'product_preview':
-				return $location;
-			case 'shop':
-				return 'category';
-			case 'home':
-				return 'homepage';
-			default:
-				return '';
-		}
-	}
-
 	/**
 	 * Returns the settings value or default, if does not exist or not allowed value.
 	 *

From 55b2e6d8d456be741efd39c9d71be65b8807ba04 Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Tue, 12 Mar 2024 19:03:17 +0400
Subject: [PATCH 023/101] Change the `product_preview` to `woocommerceBlock`

---
 .../ppcp-paylater-block/src/PayLaterBlockModule.php  |  2 +-
 .../resources/js/paylater-configurator.js            |  5 ++++-
 .../src/Factory/ConfigFactory.php                    | 12 ++++++------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/modules/ppcp-paylater-block/src/PayLaterBlockModule.php b/modules/ppcp-paylater-block/src/PayLaterBlockModule.php
index d5953f407..d6b9c7404 100644
--- a/modules/ppcp-paylater-block/src/PayLaterBlockModule.php
+++ b/modules/ppcp-paylater-block/src/PayLaterBlockModule.php
@@ -40,7 +40,7 @@ class PayLaterBlockModule implements ModuleInterface {
 	 * @return bool true if the block is enabled, otherwise false.
 	 */
 	public static function is_block_enabled( SettingsStatus $settings_status ): bool {
-		return self::is_module_loading_required() && $settings_status->is_pay_later_messaging_enabled_for_location( 'product_preview' );
+		return self::is_module_loading_required() && $settings_status->is_pay_later_messaging_enabled_for_location( 'woocommerceBlock' );
 	}
 
 	/**
diff --git a/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js b/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js
index 2e230b8e4..17bfb4a02 100644
--- a/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js
+++ b/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js
@@ -30,7 +30,10 @@ document.addEventListener( 'DOMContentLoaded', () => {
         partnerClientId: PcpPayLaterConfigurator.partnerClientId,
         partnerName: 'WooCommerce',
         bnCode: 'Woo_PPCP',
-        placements: ['cart', 'checkout', 'product', 'shop', 'home', 'product_preview'],
+        placements: ['cart', 'checkout', 'product', 'shop', 'home'],
+        custom_placement:[{
+            message_reference: 'woocommerceBlock',
+        }],
         styleOverrides: {
             button: publishButtonClassName,
             header: PcpPayLaterConfigurator.headerClassName,
diff --git a/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php b/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
index 240cfeafd..a0e8f063f 100644
--- a/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
+++ b/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
@@ -22,12 +22,12 @@ class ConfigFactory {
 	 */
 	public function from_settings( Settings $settings ): array {
 		return array(
-			'cart'            => $this->for_location( $settings, 'cart' ),
-			'checkout'        => $this->for_location( $settings, 'checkout' ),
-			'product'         => $this->for_location( $settings, 'product' ),
-			'shop'            => $this->for_location( $settings, 'shop' ),
-			'home'            => $this->for_location( $settings, 'home' ),
-			'product_preview' => $this->for_location( $settings, 'product_preview' ),
+			'cart'             => $this->for_location( $settings, 'cart' ),
+			'checkout'         => $this->for_location( $settings, 'checkout' ),
+			'product'          => $this->for_location( $settings, 'product' ),
+			'shop'             => $this->for_location( $settings, 'shop' ),
+			'home'             => $this->for_location( $settings, 'home' ),
+			'woocommerceBlock' => $this->for_location( $settings, 'woocommerceBlock' ),
 		);
 	}
 

From f38ab36da859a272cb09803f57699b2e02256b80 Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Tue, 12 Mar 2024 19:53:53 +0400
Subject: [PATCH 024/101] Revert "Change the `product_preview` to
 `woocommerceBlock`"

This reverts commit 55b2e6d8d456be741efd39c9d71be65b8807ba04.
---
 .../ppcp-paylater-block/src/PayLaterBlockModule.php  |  2 +-
 .../resources/js/paylater-configurator.js            |  5 +----
 .../src/Factory/ConfigFactory.php                    | 12 ++++++------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/modules/ppcp-paylater-block/src/PayLaterBlockModule.php b/modules/ppcp-paylater-block/src/PayLaterBlockModule.php
index d6b9c7404..d5953f407 100644
--- a/modules/ppcp-paylater-block/src/PayLaterBlockModule.php
+++ b/modules/ppcp-paylater-block/src/PayLaterBlockModule.php
@@ -40,7 +40,7 @@ class PayLaterBlockModule implements ModuleInterface {
 	 * @return bool true if the block is enabled, otherwise false.
 	 */
 	public static function is_block_enabled( SettingsStatus $settings_status ): bool {
-		return self::is_module_loading_required() && $settings_status->is_pay_later_messaging_enabled_for_location( 'woocommerceBlock' );
+		return self::is_module_loading_required() && $settings_status->is_pay_later_messaging_enabled_for_location( 'product_preview' );
 	}
 
 	/**
diff --git a/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js b/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js
index 17bfb4a02..2e230b8e4 100644
--- a/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js
+++ b/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js
@@ -30,10 +30,7 @@ document.addEventListener( 'DOMContentLoaded', () => {
         partnerClientId: PcpPayLaterConfigurator.partnerClientId,
         partnerName: 'WooCommerce',
         bnCode: 'Woo_PPCP',
-        placements: ['cart', 'checkout', 'product', 'shop', 'home'],
-        custom_placement:[{
-            message_reference: 'woocommerceBlock',
-        }],
+        placements: ['cart', 'checkout', 'product', 'shop', 'home', 'product_preview'],
         styleOverrides: {
             button: publishButtonClassName,
             header: PcpPayLaterConfigurator.headerClassName,
diff --git a/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php b/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
index a0e8f063f..240cfeafd 100644
--- a/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
+++ b/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
@@ -22,12 +22,12 @@ class ConfigFactory {
 	 */
 	public function from_settings( Settings $settings ): array {
 		return array(
-			'cart'             => $this->for_location( $settings, 'cart' ),
-			'checkout'         => $this->for_location( $settings, 'checkout' ),
-			'product'          => $this->for_location( $settings, 'product' ),
-			'shop'             => $this->for_location( $settings, 'shop' ),
-			'home'             => $this->for_location( $settings, 'home' ),
-			'woocommerceBlock' => $this->for_location( $settings, 'woocommerceBlock' ),
+			'cart'            => $this->for_location( $settings, 'cart' ),
+			'checkout'        => $this->for_location( $settings, 'checkout' ),
+			'product'         => $this->for_location( $settings, 'product' ),
+			'shop'            => $this->for_location( $settings, 'shop' ),
+			'home'            => $this->for_location( $settings, 'home' ),
+			'product_preview' => $this->for_location( $settings, 'product_preview' ),
 		);
 	}
 

From 8aa3837334aeb9268dd51eff7480b0afa8abf92e Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Tue, 12 Mar 2024 17:22:48 +0100
Subject: [PATCH 025/101] Bump 2.6.0-rc1 version

---
 changelog.txt                   | 16 ++++++++++++++++
 package.json                    |  2 +-
 readme.txt                      | 18 +++++++++++++++++-
 woocommerce-paypal-payments.php |  4 ++--
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 86251c280..a4bfe3626 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,21 @@
 *** Changelog ***
 
+= 2.6.0 - xxxx-xx-xx =
+* Fix - invoice_id not included in API call when creating payment with saved card #2086
+* Fix - Typo in SCA indicators for ACDC Vault transactions #2083
+* Fix - Payments with saved card tokens use Capture intent when Authorize is configured #2069
+* Fix - WooPayments multi-currency causing currency mismatch error on Block Cart & Checkout pages #2054
+* Fix - "Must pass createSubscription with intent=subscription" error with PayPal Subscriptions mode #2058
+* Fix - "Proceed to PayPal" button displayed for Free trial PayPal Subscription products when payment token is saved #2041
+* Fix - ACDC payments with new credit card may fail when debugging is enabled (JSON malformed by warning) #2051
+* Enhancement - Add Pay Later Messaging block #1897
+* Enhancement - Submit the form instead of refreshing the page to show the save notice #2081
+* Enhancement - Integrate pay later messaging block with the messaging configurator #2080
+* Enhancement - Reauthorize authorized payments #2062
+* Enhancement - Do not handle VAULT.PAYMENT-TOKEN.CREATED webhook for Vault v3 #2079
+* Enhancement - Improve the messaging configurator styles #2053
+* Enhancement - Ensure PayPal Vaulting is not selected as Subscriptions Mode when Reference Transactions are disabled #2057
+
 = 2.5.4 - 2024-02-27 =
 * Fix - Cannot enable Apple Pay when API credentials were manually created #2015
 * Fix - Cart simulation type error #1943
diff --git a/package.json b/package.json
index 8df693e72..be3d3e101 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "woocommerce-paypal-payments",
-  "version": "2.5.4",
+  "version": "2.6.0",
   "description": "WooCommerce PayPal Payments",
   "repository": "https://github.com/woocommerce/woocommerce-paypal-payments",
   "license": "GPL-2.0",
diff --git a/readme.txt b/readme.txt
index d71087301..df18ceef0 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Tags: woocommerce, paypal, payments, ecommerce, checkout, cart, pay later, apple
 Requires at least: 5.3
 Tested up to: 6.4
 Requires PHP: 7.2
-Stable tag: 2.5.4
+Stable tag: 2.6.0
 License: GPLv2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -179,6 +179,22 @@ If you encounter issues with the PayPal buttons not appearing after an update, p
 
 == Changelog ==
 
+= 2.6.0 - xxxx-xx-xx =
+* Fix - invoice_id not included in API call when creating payment with saved card #2086
+* Fix - Typo in SCA indicators for ACDC Vault transactions #2083
+* Fix - Payments with saved card tokens use Capture intent when Authorize is configured #2069
+* Fix - WooPayments multi-currency causing currency mismatch error on Block Cart & Checkout pages #2054
+* Fix - "Must pass createSubscription with intent=subscription" error with PayPal Subscriptions mode #2058
+* Fix - "Proceed to PayPal" button displayed for Free trial PayPal Subscription products when payment token is saved #2041
+* Fix - ACDC payments with new credit card may fail when debugging is enabled (JSON malformed by warning) #2051
+* Enhancement - Add Pay Later Messaging block #1897
+* Enhancement - Submit the form instead of refreshing the page to show the save notice #2081
+* Enhancement - Integrate pay later messaging block with the messaging configurator #2080
+* Enhancement - Reauthorize authorized payments #2062
+* Enhancement - Do not handle VAULT.PAYMENT-TOKEN.CREATED webhook for Vault v3 #2079
+* Enhancement - Improve the messaging configurator styles #2053
+* Enhancement - Ensure PayPal Vaulting is not selected as Subscriptions Mode when Reference Transactions are disabled #2057
+
 = 2.5.4 - 2024-02-27 =
 * Fix - Cannot enable Apple Pay when API credentials were manually created #2015
 * Fix - Cart simulation type error #1943
diff --git a/woocommerce-paypal-payments.php b/woocommerce-paypal-payments.php
index e764c3271..a1a51d883 100644
--- a/woocommerce-paypal-payments.php
+++ b/woocommerce-paypal-payments.php
@@ -3,7 +3,7 @@
  * Plugin Name: WooCommerce PayPal Payments
  * Plugin URI:  https://woocommerce.com/products/woocommerce-paypal-payments/
  * Description: PayPal's latest complete payments processing solution. Accept PayPal, Pay Later, credit/debit cards, alternative digital wallets local payment types and bank accounts. Turn on only PayPal options or process a full suite of payment methods. Enable global transaction with extensive currency and country coverage.
- * Version:     2.5.4
+ * Version:     2.6.0
  * Author:      WooCommerce
  * Author URI:  https://woocommerce.com/
  * License:     GPL-2.0
@@ -25,7 +25,7 @@ define( 'PAYPAL_API_URL', 'https://api-m.paypal.com' );
 define( 'PAYPAL_URL', 'https://www.paypal.com' );
 define( 'PAYPAL_SANDBOX_API_URL', 'https://api-m.sandbox.paypal.com' );
 define( 'PAYPAL_SANDBOX_URL', 'https://www.sandbox.paypal.com' );
-define( 'PAYPAL_INTEGRATION_DATE', '2024-02-16' );
+define( 'PAYPAL_INTEGRATION_DATE', '2024-03-12' );
 
 ! defined( 'CONNECT_WOO_CLIENT_ID' ) && define( 'CONNECT_WOO_CLIENT_ID', 'AcCAsWta_JTL__OfpjspNyH7c1GGHH332fLwonA5CwX4Y10mhybRZmHLA0GdRbwKwjQIhpDQy0pluX_P' );
 ! defined( 'CONNECT_WOO_SANDBOX_CLIENT_ID' ) && define( 'CONNECT_WOO_SANDBOX_CLIENT_ID', 'AYmOHbt1VHg-OZ_oihPdzKEVbU3qg0qXonBcAztuzniQRaKE0w1Hr762cSFwd4n8wxOl-TCWohEa0XM_' );

From 8e86b242a5c96a76b005a9b3b2ccba95ba24dd8a Mon Sep 17 00:00:00 2001
From: Daniel Dudzic <d.dudzic@syde.com>
Date: Tue, 12 Mar 2024 21:03:03 +0100
Subject: [PATCH 026/101] Add PHPCS fixes to PayUponInvoiceGateway

---
 .../PayUponInvoice/PayUponInvoiceGateway.php  | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/PayUponInvoiceGateway.php b/modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/PayUponInvoiceGateway.php
index 73967dbc6..d4ca29121 100644
--- a/modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/PayUponInvoiceGateway.php
+++ b/modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/PayUponInvoiceGateway.php
@@ -198,40 +198,40 @@ class PayUponInvoiceGateway extends WC_Payment_Gateway {
 				'description' => __( "Specify brand name, logo and customer service instructions to be presented on Ratepay's payment instructions.", 'woocommerce-paypal-payments' ),
 			),
 			'brand_name'                    => array(
-				'title'       => __( 'Brand name', 'woocommerce-paypal-payments' ),
-				'type'        => 'text',
-				'default'     => get_bloginfo( 'name' ) ?? '',
-				'desc_tip'    => true,
-				'description' => __( 'Merchant name displayed in Ratepay\'s payment instructions. Should not exceed 127 characters.', 'woocommerce-paypal-payments' ),
-				'maxlength'   => 127,
+				'title'             => __( 'Brand name', 'woocommerce-paypal-payments' ),
+				'type'              => 'text',
+				'default'           => get_bloginfo( 'name' ) ?? '',
+				'desc_tip'          => true,
+				'description'       => __( 'Merchant name displayed in Ratepay\'s payment instructions. Should not exceed 127 characters.', 'woocommerce-paypal-payments' ),
+				'maxlength'         => 127,
 				'custom_attributes' => array(
-					'pattern' => '.{1,127}',
+					'pattern'      => '.{1,127}',
 					'autocomplete' => 'off',
-					'required' => ''
+					'required'     => '',
 				),
 			),
 			'logo_url'                      => array(
-				'title'       => __( 'Logo URL', 'woocommerce-paypal-payments' ),
-				'type'        => 'url',
-				'default'     => '',
-				'desc_tip'    => true,
-				'description' => __( 'Logo to be presented on Ratepay\'s payment instructions.', 'woocommerce-paypal-payments' ),
+				'title'             => __( 'Logo URL', 'woocommerce-paypal-payments' ),
+				'type'              => 'url',
+				'default'           => '',
+				'desc_tip'          => true,
+				'description'       => __( 'Logo to be presented on Ratepay\'s payment instructions.', 'woocommerce-paypal-payments' ),
 				'custom_attributes' => array(
-					'pattern' => '.+',
+					'pattern'      => '.+',
 					'autocomplete' => 'off',
-					'required' => ''
+					'required'     => '',
 				),
 			),
 			'customer_service_instructions' => array(
-				'title'       => __( 'Customer service instructions', 'woocommerce-paypal-payments' ),
-				'type'        => 'text',
-				'default'     => '',
-				'desc_tip'    => true,
-				'description' => __( 'Customer service instructions to be presented on Ratepay\'s payment instructions.', 'woocommerce-paypal-payments' ),
+				'title'             => __( 'Customer service instructions', 'woocommerce-paypal-payments' ),
+				'type'              => 'text',
+				'default'           => '',
+				'desc_tip'          => true,
+				'description'       => __( 'Customer service instructions to be presented on Ratepay\'s payment instructions.', 'woocommerce-paypal-payments' ),
 				'custom_attributes' => array(
-					'pattern' => '.+',
+					'pattern'      => '.+',
 					'autocomplete' => 'off',
-					'required' => ''
+					'required'     => '',
 				),
 			),
 		);

From 89e56b9e720cad37763b15706fdf3bbf9586f466 Mon Sep 17 00:00:00 2001
From: Daniel Dudzic <d.dudzic@syde.com>
Date: Wed, 13 Mar 2024 12:01:36 +0100
Subject: [PATCH 027/101] Disable markup in the get_plugin_data() return in
 order to fix the issue with incorrect early initialization of wptexturize()
 (652)

---
 src/FilePathPluginFactory.php   | 4 ++--
 woocommerce-paypal-payments.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/FilePathPluginFactory.php b/src/FilePathPluginFactory.php
index 69d118fbb..4be6ff768 100644
--- a/src/FilePathPluginFactory.php
+++ b/src/FilePathPluginFactory.php
@@ -65,7 +65,7 @@ class FilePathPluginFactory implements FilePathPluginFactoryInterface {
 			require_once ABSPATH . 'wp-admin/includes/plugin.php';
 		}
 
-		$plugin_data = get_plugin_data( $filePath );
+		$plugin_data = get_plugin_data( $filePath, false );
 		if ( empty( $plugin_data ) ) {
 			throw new UnexpectedValueException(
 				sprintf(
@@ -98,7 +98,7 @@ class FilePathPluginFactory implements FilePathPluginFactoryInterface {
 			$this->create_version( $plugin_data['Version'] ),
 			$base_dir,
 			$base_name,
-			$plugin_data['Title'],
+			'blah',
 			$plugin_data['Description'],
 			$text_domain,
 			$this->create_version( $plugin_data['RequiresPHP'] ),
diff --git a/woocommerce-paypal-payments.php b/woocommerce-paypal-payments.php
index a1a51d883..35da8f5e3 100644
--- a/woocommerce-paypal-payments.php
+++ b/woocommerce-paypal-payments.php
@@ -97,7 +97,7 @@ define( 'PAYPAL_INTEGRATION_DATE', '2024-03-12' );
 				 */
 				require_once ABSPATH . 'wp-admin/includes/plugin.php';
 			}
-			$plugin_data              = get_plugin_data( __DIR__ . '/woocommerce-paypal-payments.php' );
+			$plugin_data              = get_plugin_data( __DIR__ . '/woocommerce-paypal-payments.php', false );
 			$plugin_version           = $plugin_data['Version'] ?? null;
 			$installed_plugin_version = get_option( 'woocommerce-ppcp-version' );
 			if ( $installed_plugin_version !== $plugin_version ) {

From 6797bed4060d9971f5375e9076394573af9710e7 Mon Sep 17 00:00:00 2001
From: Daniel Dudzic <d.dudzic@syde.com>
Date: Wed, 13 Mar 2024 12:16:35 +0100
Subject: [PATCH 028/101] Fix erroneous code change

---
 src/FilePathPluginFactory.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/FilePathPluginFactory.php b/src/FilePathPluginFactory.php
index 4be6ff768..15f4f761d 100644
--- a/src/FilePathPluginFactory.php
+++ b/src/FilePathPluginFactory.php
@@ -98,7 +98,7 @@ class FilePathPluginFactory implements FilePathPluginFactoryInterface {
 			$this->create_version( $plugin_data['Version'] ),
 			$base_dir,
 			$base_name,
-			'blah',
+			$plugin_data['Title'],
 			$plugin_data['Description'],
 			$text_domain,
 			$this->create_version( $plugin_data['RequiresPHP'] ),

From 62596778552efd04327a5c3d7bdcedbd971a4d4d Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Thu, 14 Mar 2024 16:37:58 +0400
Subject: [PATCH 029/101] Change the `product_preview` to `woocommerceBlock`

---
 .../src/PayLaterBlockModule.php                    |  2 +-
 .../resources/js/paylater-configurator.js          |  5 ++++-
 .../src/Factory/ConfigFactory.php                  | 14 +++++++-------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/modules/ppcp-paylater-block/src/PayLaterBlockModule.php b/modules/ppcp-paylater-block/src/PayLaterBlockModule.php
index d5953f407..d6b9c7404 100644
--- a/modules/ppcp-paylater-block/src/PayLaterBlockModule.php
+++ b/modules/ppcp-paylater-block/src/PayLaterBlockModule.php
@@ -40,7 +40,7 @@ class PayLaterBlockModule implements ModuleInterface {
 	 * @return bool true if the block is enabled, otherwise false.
 	 */
 	public static function is_block_enabled( SettingsStatus $settings_status ): bool {
-		return self::is_module_loading_required() && $settings_status->is_pay_later_messaging_enabled_for_location( 'product_preview' );
+		return self::is_module_loading_required() && $settings_status->is_pay_later_messaging_enabled_for_location( 'woocommerceBlock' );
 	}
 
 	/**
diff --git a/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js b/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js
index 8f2c24f8f..15f65f183 100644
--- a/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js
+++ b/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js
@@ -40,7 +40,10 @@ document.addEventListener( 'DOMContentLoaded', () => {
         partnerClientId: PcpPayLaterConfigurator.partnerClientId,
         partnerName: 'WooCommerce',
         bnCode: 'Woo_PPCP',
-        placements: ['cart', 'checkout', 'product', 'shop', 'home', 'product_preview'],
+        placements: ['cart', 'checkout', 'product', 'shop', 'home'],
+        custom_placement:[{
+            message_reference: 'woocommerceBlock',
+        }],
         styleOverrides: {
             button: publishButtonClassName,
             header: PcpPayLaterConfigurator.headerClassName,
diff --git a/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php b/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
index 240cfeafd..c7b56738f 100644
--- a/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
+++ b/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
@@ -22,12 +22,12 @@ class ConfigFactory {
 	 */
 	public function from_settings( Settings $settings ): array {
 		return array(
-			'cart'            => $this->for_location( $settings, 'cart' ),
-			'checkout'        => $this->for_location( $settings, 'checkout' ),
-			'product'         => $this->for_location( $settings, 'product' ),
-			'shop'            => $this->for_location( $settings, 'shop' ),
-			'home'            => $this->for_location( $settings, 'home' ),
-			'product_preview' => $this->for_location( $settings, 'product_preview' ),
+			'cart'             => $this->for_location( $settings, 'cart' ),
+			'checkout'         => $this->for_location( $settings, 'checkout' ),
+			'product'          => $this->for_location( $settings, 'product' ),
+			'shop'             => $this->for_location( $settings, 'shop' ),
+			'home'             => $this->for_location( $settings, 'home' ),
+			'woocommerceBlock' => $this->for_location( $settings, 'woocommerceBlock' ),
 		);
 	}
 
@@ -46,7 +46,7 @@ class ConfigFactory {
 				'color'  => $this->get_or_default( $settings, "pay_later_{$location}_message_flex_color", 'black', array( 'black', 'blue', 'white', 'white-no-border' ) ),
 				'ratio'  => $this->get_or_default( $settings, "pay_later_{$location}_message_flex_ratio", '8x1', array( '8x1', '20x1' ) ),
 			);
-		} else {
+		} elseif($location !== 'woocommerceBlock') {
 			$config = array(
 				'layout'        => 'text',
 				'logo-position' => $this->get_or_default( $settings, "pay_later_{$location}_message_position", 'left' ),

From ca20e93331ba6f08669d4b93d54d5a206b8bf8b8 Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Thu, 14 Mar 2024 16:49:54 +0400
Subject: [PATCH 030/101] fix the config map

---
 .../ppcp-paylater-configurator/src/Factory/ConfigFactory.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php b/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
index c7b56738f..47affc496 100644
--- a/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
+++ b/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
@@ -62,7 +62,7 @@ class ConfigFactory {
 				'status'    => in_array( $location, $selected_locations, true ) ? 'enabled' : 'disabled',
 				'placement' => $location,
 			),
-			$config
+			$config ?? []
 		);
 	}
 

From 6f8131f8647183a106e6ce38db6e9084c5ce6415 Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Thu, 14 Mar 2024 16:52:25 +0400
Subject: [PATCH 031/101] Add styles for the separator.

---
 .../resources/css/paylater-configurator.scss                 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/ppcp-paylater-configurator/resources/css/paylater-configurator.scss b/modules/ppcp-paylater-configurator/resources/css/paylater-configurator.scss
index 5d7cca405..3e63f2504 100644
--- a/modules/ppcp-paylater-configurator/resources/css/paylater-configurator.scss
+++ b/modules/ppcp-paylater-configurator/resources/css/paylater-configurator.scss
@@ -43,6 +43,11 @@
 	.css-1yo2lxy-text_body_strong, span.css-16jt5za-text_body, span.css-1yo2lxy-text_body_strong, span {
 		font-size: 14px;
 	}
+
+	hr {
+		margin-right: 16px;
+		border-top-color: rgb(84, 93, 104);
+	}
 }
 
 #field-pay_later_messaging_heading h3{

From dc002c7a9b4222ae5d71a20ad5d2c09b3efbfbcf Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Thu, 14 Mar 2024 17:54:02 +0400
Subject: [PATCH 032/101] Adjust block options, add text-size

---
 .../ppcp-paylater-block/resources/js/edit.js  | 32 +++++++++++--------
 .../ppcp-paylater-block/resources/js/save.js  |  3 +-
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/modules/ppcp-paylater-block/resources/js/edit.js b/modules/ppcp-paylater-block/resources/js/edit.js
index 291a8732c..c702d0ad9 100644
--- a/modules/ppcp-paylater-block/resources/js/edit.js
+++ b/modules/ppcp-paylater-block/resources/js/edit.js
@@ -7,7 +7,7 @@ import { loadPaypalScript } from '../../../ppcp-button/resources/js/modules/Help
 import PayPalMessages from "./components/PayPalMessages";
 
 export default function Edit( { attributes, clientId, setAttributes } ) {
-    const { layout, logo, position, color, flexColor, flexRatio, placement, id } = attributes;
+    const { layout, logo, position, color, size, flexColor, flexRatio, placement, id } = attributes;
     const isFlex = layout === 'flex';
 
     const [paypalScriptState, setPaypalScriptState] = useState(null);
@@ -30,6 +30,7 @@ export default function Edit( { attributes, clientId, setAttributes } ) {
         ratio: flexRatio,
         text: {
             color,
+            size
         },
     };
 
@@ -129,10 +130,10 @@ export default function Edit( { attributes, clientId, setAttributes } ) {
                     { !isFlex && (<SelectControl
                         label={__('Logo', 'woocommerce-paypal-payments')}
                         options={[
-                            { label: __('Primary', 'woocommerce-paypal-payments'), value: 'primary' },
-                            { label: __('Alternative', 'woocommerce-paypal-payments'), value: 'alternative' },
+                            { label: __('Full logo', 'woocommerce-paypal-payments'), value: 'primary' },
+                            { label: __('Monogram', 'woocommerce-paypal-payments'), value: 'alternative' },
                             { label: __('Inline', 'woocommerce-paypal-payments'), value: 'inline' },
-                            { label: __('None', 'woocommerce-paypal-payments'), value: 'none' },
+                            { label: __('Message only', 'woocommerce-paypal-payments'), value: 'none' },
                         ]}
                         value={logo}
                         onChange={(value) => setAttributes({logo: value})}
@@ -150,24 +151,31 @@ export default function Edit( { attributes, clientId, setAttributes } ) {
                     { !isFlex && (<SelectControl
                         label={__('Text Color', 'woocommerce-paypal-payments')}
                         options={[
-                            { label: __( 'Black', 'woocommerce-paypal-payments' ), value: 'black' },
-                            { label: __( 'White', 'woocommerce-paypal-payments' ), value: 'white' },
+                            { label: __( 'Black / Blue logo', 'woocommerce-paypal-payments' ), value: 'black' },
+                            { label: __( 'White / White logo', 'woocommerce-paypal-payments' ), value: 'white' },
                             { label: __( 'Monochrome', 'woocommerce-paypal-payments' ), value: 'monochrome' },
-                            { label: __( 'Grayscale', 'woocommerce-paypal-payments' ), value: 'grayscale' },
+                            { label: __( 'Black / Gray logo', 'woocommerce-paypal-payments' ), value: 'grayscale' },
                         ]}
                         value={color}
                         onChange={(value) => setAttributes({color: value})}
                     />)}
+                    { !isFlex && (<SelectControl
+                        label={__('Text Size', 'woocommerce-paypal-payments')}
+                        options={[
+                            { label: __( 'Small', 'woocommerce-paypal-payments' ), value: '12' },
+                            { label: __( 'Medium', 'woocommerce-paypal-payments' ), value: '14' },
+                            { label: __( 'Large', 'woocommerce-paypal-payments' ), value: '16' },
+                        ]}
+                        value={size}
+                        onChange={(value) => setAttributes({size: value})}
+                    />)}
                     { isFlex && (<SelectControl
                         label={__('Color', 'woocommerce-paypal-payments')}
                         options={[
                             { label: __( 'Blue', 'woocommerce-paypal-payments' ), value: 'blue' },
                             { label: __( 'Black', 'woocommerce-paypal-payments' ), value: 'black' },
                             { label: __( 'White', 'woocommerce-paypal-payments' ), value: 'white' },
-                            { label: __( 'White no border', 'woocommerce-paypal-payments' ), value: 'white-no-border' },
-                            { label: __( 'Gray', 'woocommerce-paypal-payments' ), value: 'gray' },
-                            { label: __( 'Monochrome', 'woocommerce-paypal-payments' ), value: 'monochrome' },
-                            { label: __( 'Grayscale', 'woocommerce-paypal-payments' ), value: 'grayscale' },
+                            { label: __( 'White (no border)', 'woocommerce-paypal-payments' ), value: 'white-no-border' },
                         ]}
                         value={flexColor}
                         onChange={(value) => setAttributes({flexColor: value})}
@@ -175,8 +183,6 @@ export default function Edit( { attributes, clientId, setAttributes } ) {
                     { isFlex && (<SelectControl
                         label={__('Ratio', 'woocommerce-paypal-payments')}
                         options={[
-                            { label: __( '1x1', 'woocommerce-paypal-payments' ), value: '1x1' },
-                            { label: __( '1x4', 'woocommerce-paypal-payments' ), value: '1x4' },
                             { label: __( '8x1', 'woocommerce-paypal-payments' ), value: '8x1' },
                             { label: __( '20x1', 'woocommerce-paypal-payments' ), value: '20x1' },
                         ]}
diff --git a/modules/ppcp-paylater-block/resources/js/save.js b/modules/ppcp-paylater-block/resources/js/save.js
index 0e221d29c..6a845e7da 100644
--- a/modules/ppcp-paylater-block/resources/js/save.js
+++ b/modules/ppcp-paylater-block/resources/js/save.js
@@ -1,7 +1,7 @@
 import { useBlockProps } from '@wordpress/block-editor';
 
 export default function save( { attributes } ) {
-    const { layout, logo, position, color, flexColor, flexRatio, placement, id } = attributes;
+    const { layout, logo, position, color, size, flexColor, flexRatio, placement, id } = attributes;
     const paypalAttributes = layout === 'flex' ? {
         'data-pp-style-layout': 'flex',
         'data-pp-style-color': flexColor,
@@ -11,6 +11,7 @@ export default function save( { attributes } ) {
         'data-pp-style-logo-type': logo,
         'data-pp-style-logo-position': position,
         'data-pp-style-text-color': color,
+        'data-pp-style-text-size': size,
     };
     if (placement && placement !== 'auto') {
         paypalAttributes['data-pp-placement'] = placement;

From e66808bd4f69f31665222c6069b01c921cc28f5c Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Thu, 14 Mar 2024 18:08:56 +0400
Subject: [PATCH 033/101] Fix the coding styles

---
 .../ppcp-paylater-configurator/src/Factory/ConfigFactory.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php b/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
index 47affc496..f00085ed5 100644
--- a/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
+++ b/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
@@ -46,7 +46,7 @@ class ConfigFactory {
 				'color'  => $this->get_or_default( $settings, "pay_later_{$location}_message_flex_color", 'black', array( 'black', 'blue', 'white', 'white-no-border' ) ),
 				'ratio'  => $this->get_or_default( $settings, "pay_later_{$location}_message_flex_ratio", '8x1', array( '8x1', '20x1' ) ),
 			);
-		} elseif($location !== 'woocommerceBlock') {
+		} elseif ( $location !== 'woocommerceBlock' ) {
 			$config = array(
 				'layout'        => 'text',
 				'logo-position' => $this->get_or_default( $settings, "pay_later_{$location}_message_position", 'left' ),
@@ -62,7 +62,7 @@ class ConfigFactory {
 				'status'    => in_array( $location, $selected_locations, true ) ? 'enabled' : 'disabled',
 				'placement' => $location,
 			),
-			$config ?? []
+			$config ?? array()
 		);
 	}
 

From 8216b8e7ed15a79ec30b6a21b423cb2a72e32f5f Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Thu, 14 Mar 2024 17:35:43 +0100
Subject: [PATCH 034/101] Update changelog

---
 changelog.txt | 1 +
 readme.txt    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/changelog.txt b/changelog.txt
index a4bfe3626..a6b728429 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -15,6 +15,7 @@
 * Enhancement - Do not handle VAULT.PAYMENT-TOKEN.CREATED webhook for Vault v3 #2079
 * Enhancement - Improve the messaging configurator styles #2053
 * Enhancement - Ensure PayPal Vaulting is not selected as Subscriptions Mode when Reference Transactions are disabled #2057
+* Enhancement - Pay later messaging configurator & messaging block adjustments #2096
 
 = 2.5.4 - 2024-02-27 =
 * Fix - Cannot enable Apple Pay when API credentials were manually created #2015
diff --git a/readme.txt b/readme.txt
index df18ceef0..d7d3aa924 100644
--- a/readme.txt
+++ b/readme.txt
@@ -194,6 +194,7 @@ If you encounter issues with the PayPal buttons not appearing after an update, p
 * Enhancement - Do not handle VAULT.PAYMENT-TOKEN.CREATED webhook for Vault v3 #2079
 * Enhancement - Improve the messaging configurator styles #2053
 * Enhancement - Ensure PayPal Vaulting is not selected as Subscriptions Mode when Reference Transactions are disabled #2057
+* Enhancement - Pay later messaging configurator & messaging block adjustments #2096
 
 = 2.5.4 - 2024-02-27 =
 * Fix - Cannot enable Apple Pay when API credentials were manually created #2015

From c058cd38c87fd54b00ce40b077fae27c863f70c1 Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Fri, 15 Mar 2024 15:53:29 +0100
Subject: [PATCH 035/101] Ensure payment token exist for customer

---
 .../src/Endpoint/PaymentTokensEndpoint.php    | 37 +++++++++++++++++++
 modules/ppcp-wc-subscriptions/services.php    |  3 +-
 .../src/RenewalHandler.php                    | 25 ++++++++++++-
 3 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/modules/ppcp-api-client/src/Endpoint/PaymentTokensEndpoint.php b/modules/ppcp-api-client/src/Endpoint/PaymentTokensEndpoint.php
index bfe05d1b5..d59584095 100644
--- a/modules/ppcp-api-client/src/Endpoint/PaymentTokensEndpoint.php
+++ b/modules/ppcp-api-client/src/Endpoint/PaymentTokensEndpoint.php
@@ -92,4 +92,41 @@ class PaymentTokensEndpoint {
 			throw new PayPalApiException( $json, $status_code );
 		}
 	}
+
+	/**
+	 * Returns all payment tokens for the given customer.
+	 *
+	 * @param string $customer_id
+	 * @return array
+	 */
+	public function payment_tokens_for_customer( string $customer_id ): array {
+		$bearer = $this->bearer->bearer();
+		$url    = trailingslashit( $this->host ) . 'v3/vault/payment-tokens?customer_id=' . $customer_id;
+		$args   = array(
+			'method'  => 'GET',
+			'headers' => array(
+				'Authorization' => 'Bearer ' . $bearer->token(),
+				'Content-Type'  => 'application/json',
+			),
+		);
+
+		$response = $this->request( $url, $args );
+		if ( $response instanceof WP_Error ) {
+			throw new RuntimeException( $response->get_error_message() );
+		}
+
+		$json        = json_decode( $response['body'] );
+		$status_code = (int) wp_remote_retrieve_response_code( $response );
+		if ( 200 !== $status_code ) {
+			throw new PayPalApiException( $json, $status_code );
+		}
+
+		$tokens         = array();
+		$payment_tokens = $json->payment_tokens ?? array();
+		foreach ( $payment_tokens as $payment_token ) {
+			$tokens[] = $payment_token->id;
+		}
+
+		return $tokens;
+	}
 }
diff --git a/modules/ppcp-wc-subscriptions/services.php b/modules/ppcp-wc-subscriptions/services.php
index bab617b04..c3f5796f1 100644
--- a/modules/ppcp-wc-subscriptions/services.php
+++ b/modules/ppcp-wc-subscriptions/services.php
@@ -44,7 +44,8 @@ return array(
 			$authorized_payments_processor,
 			$funding_source_renderer,
 			$container->get( 'wc-subscriptions.helpers.real-time-account-updater' ),
-			$container->get( 'wc-subscriptions.helper' )
+			$container->get( 'wc-subscriptions.helper' ),
+			$container->get( 'api.endpoint.payment-tokens' )
 		);
 	},
 	'wc-subscriptions.repository.payment-token'          => static function ( ContainerInterface $container ): PaymentTokenRepository {
diff --git a/modules/ppcp-wc-subscriptions/src/RenewalHandler.php b/modules/ppcp-wc-subscriptions/src/RenewalHandler.php
index 7e83218e9..1d66685c3 100644
--- a/modules/ppcp-wc-subscriptions/src/RenewalHandler.php
+++ b/modules/ppcp-wc-subscriptions/src/RenewalHandler.php
@@ -13,6 +13,7 @@ use WC_Order;
 use WC_Subscription;
 use WC_Payment_Tokens;
 use WooCommerce\PayPalCommerce\ApiClient\Endpoint\OrderEndpoint;
+use WooCommerce\PayPalCommerce\ApiClient\Endpoint\PaymentTokensEndpoint;
 use WooCommerce\PayPalCommerce\ApiClient\Entity\ApplicationContext;
 use WooCommerce\PayPalCommerce\ApiClient\Entity\Order;
 use WooCommerce\PayPalCommerce\ApiClient\Entity\PaymentSource;
@@ -132,6 +133,13 @@ class RenewalHandler {
 	 */
 	private $subscription_helper;
 
+	/**
+	 * Payment tokens endpoint
+	 *
+	 * @var PaymentTokensEndpoint
+	 */
+	private $payment_tokens_endpoint;
+
 	/**
 	 * RenewalHandler constructor.
 	 *
@@ -147,6 +155,7 @@ class RenewalHandler {
 	 * @param FundingSourceRenderer        $funding_source_renderer The funding source renderer.
 	 * @param RealTimeAccountUpdaterHelper $real_time_account_updater_helper Real Time Account Updater helper.
 	 * @param SubscriptionHelper           $subscription_helper Subscription helper.
+	 * @param PaymentTokensEndpoint        $payment_tokens_endpoint Payment tokens endpoint.
 	 */
 	public function __construct(
 		LoggerInterface $logger,
@@ -160,7 +169,8 @@ class RenewalHandler {
 		AuthorizedPaymentsProcessor $authorized_payments_processor,
 		FundingSourceRenderer $funding_source_renderer,
 		RealTimeAccountUpdaterHelper $real_time_account_updater_helper,
-		SubscriptionHelper $subscription_helper
+		SubscriptionHelper $subscription_helper,
+		PaymentTokensEndpoint $payment_tokens_endpoint
 	) {
 
 		$this->logger                           = $logger;
@@ -175,6 +185,7 @@ class RenewalHandler {
 		$this->funding_source_renderer          = $funding_source_renderer;
 		$this->real_time_account_updater_helper = $real_time_account_updater_helper;
 		$this->subscription_helper              = $subscription_helper;
+		$this->payment_tokens_endpoint          = $payment_tokens_endpoint;
 	}
 
 	/**
@@ -236,8 +247,18 @@ class RenewalHandler {
 		// Vault v3.
 		$payment_source = null;
 		if ( $wc_order->get_payment_method() === PayPalGateway::ID ) {
-			$wc_tokens = WC_Payment_Tokens::get_customer_tokens( $wc_order->get_customer_id(), PayPalGateway::ID );
+			$customer_id = get_user_meta( $user_id, '_ppcp_target_customer_id', true );
+			if ( ! $customer_id ) {
+				$customer_id = get_user_meta( $user_id, 'ppcp_customer_id', true );
+			}
+
+			$wc_tokens       = WC_Payment_Tokens::get_customer_tokens( $user_id, PayPalGateway::ID );
+			$customer_tokens = $this->payment_tokens_endpoint->payment_tokens_for_customer( $customer_id );
 			foreach ( $wc_tokens as $token ) {
+				if ( ! in_array( $token->get_token(), $customer_tokens, true ) ) {
+					continue;
+				}
+
 				$name       = 'paypal';
 				$properties = array(
 					'vault_id' => $token->get_token(),

From 50316d94d32f385378a016371880f7b64f1e0bde Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Fri, 15 Mar 2024 16:03:31 +0100
Subject: [PATCH 036/101] Do not create payment token if customer is not
 registered

---
 .../src/WooCommercePaymentTokens.php                          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/ppcp-save-payment-methods/src/WooCommercePaymentTokens.php b/modules/ppcp-save-payment-methods/src/WooCommercePaymentTokens.php
index b0f37a449..ac687eeea 100644
--- a/modules/ppcp-save-payment-methods/src/WooCommercePaymentTokens.php
+++ b/modules/ppcp-save-payment-methods/src/WooCommercePaymentTokens.php
@@ -80,6 +80,10 @@ class WooCommercePaymentTokens {
 		string $email
 	): int {
 
+		if ( $customer_id === 0 ) {
+			return 0;
+		}
+
 		$wc_tokens = WC_Payment_Tokens::get_customer_tokens( $customer_id, PayPalGateway::ID );
 		if ( $this->payment_token_helper->token_exist( $wc_tokens, $token, PaymentTokenPayPal::class ) ) {
 			return 0;

From 2c8aecde76eb7f9dfeca80748f17689ca464fc7d Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Fri, 15 Mar 2024 17:05:43 +0100
Subject: [PATCH 037/101] Move capture card payment into card gateway to avoid
 error when vault v3 is disabled

---
 modules/ppcp-save-payment-methods/services.php | 14 --------------
 .../src/SavePaymentMethodsModule.php           |  1 -
 modules/ppcp-wc-gateway/services.php           | 16 +++++++++++++++-
 .../src/Endpoint/CaptureCardPayment.php        |  2 +-
 .../src/Gateway/CreditCardGateway.php          | 18 +++++++++---------
 .../Gateway/CreditCardGatewayTest.php          | 10 +++++-----
 6 files changed, 30 insertions(+), 31 deletions(-)
 rename modules/{ppcp-save-payment-methods => ppcp-wc-gateway}/src/Endpoint/CaptureCardPayment.php (98%)

diff --git a/modules/ppcp-save-payment-methods/services.php b/modules/ppcp-save-payment-methods/services.php
index 5d04b16ab..b00d6e0ef 100644
--- a/modules/ppcp-save-payment-methods/services.php
+++ b/modules/ppcp-save-payment-methods/services.php
@@ -9,7 +9,6 @@ declare(strict_types=1);
 
 namespace WooCommerce\PayPalCommerce\SavePaymentMethods;
 
-use WooCommerce\PayPalCommerce\SavePaymentMethods\Endpoint\CaptureCardPayment;
 use WooCommerce\PayPalCommerce\SavePaymentMethods\Endpoint\CreatePaymentToken;
 use WooCommerce\PayPalCommerce\SavePaymentMethods\Endpoint\CreateSetupToken;
 use WooCommerce\PayPalCommerce\SavePaymentMethods\Helper\SavePaymentMethodsApplies;
@@ -819,17 +818,4 @@ return array(
 			$container->get( 'save-payment-methods.wc-payment-tokens' )
 		);
 	},
-	'save-payment-methods.endpoint.capture-card-payment' => static function( ContainerInterface $container ): CaptureCardPayment {
-		return new CaptureCardPayment(
-			$container->get( 'api.host' ),
-			$container->get( 'api.bearer' ),
-			$container->get( 'api.factory.order' ),
-			$container->get( 'api.factory.purchase-unit' ),
-			$container->get( 'api.endpoint.order' ),
-			$container->get( 'session.handler' ),
-			$container->get( 'wc-subscriptions.helpers.real-time-account-updater' ),
-			$container->get( 'wcgateway.settings' ),
-			$container->get( 'woocommerce.logger.woocommerce' )
-		);
-	},
 );
diff --git a/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php b/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php
index 7bfb52cee..73a7c5916 100644
--- a/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php
+++ b/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php
@@ -19,7 +19,6 @@ use WooCommerce\PayPalCommerce\ApiClient\Entity\PaymentSource;
 use WooCommerce\PayPalCommerce\ApiClient\Exception\PayPalApiException;
 use WooCommerce\PayPalCommerce\ApiClient\Exception\RuntimeException;
 use WooCommerce\PayPalCommerce\Button\Helper\ContextTrait;
-use WooCommerce\PayPalCommerce\SavePaymentMethods\Endpoint\CaptureCardPayment;
 use WooCommerce\PayPalCommerce\SavePaymentMethods\Endpoint\CreatePaymentToken;
 use WooCommerce\PayPalCommerce\SavePaymentMethods\Endpoint\CreateSetupToken;
 use WooCommerce\PayPalCommerce\Vendor\Dhii\Container\ServiceProvider;
diff --git a/modules/ppcp-wc-gateway/services.php b/modules/ppcp-wc-gateway/services.php
index 7aa018633..ae589565a 100644
--- a/modules/ppcp-wc-gateway/services.php
+++ b/modules/ppcp-wc-gateway/services.php
@@ -23,6 +23,7 @@ use WooCommerce\PayPalCommerce\Onboarding\Environment;
 use WooCommerce\PayPalCommerce\Onboarding\Render\OnboardingOptionsRenderer;
 use WooCommerce\PayPalCommerce\Onboarding\State;
 use WooCommerce\PayPalCommerce\WcGateway\Admin\RenderReauthorizeAction;
+use WooCommerce\PayPalCommerce\WcGateway\Endpoint\CaptureCardPayment;
 use WooCommerce\PayPalCommerce\WcGateway\Endpoint\RefreshFeatureStatusEndpoint;
 use WooCommerce\PayPalCommerce\WcSubscriptions\Helper\SubscriptionHelper;
 use WooCommerce\PayPalCommerce\Vendor\Psr\Container\ContainerInterface;
@@ -132,7 +133,7 @@ return array(
 			$vaulted_credit_card_handler,
 			$container->get( 'onboarding.environment' ),
 			$container->get( 'api.endpoint.order' ),
-			$container->get( 'save-payment-methods.endpoint.capture-card-payment' ),
+			$container->get( 'wcgateway.endpoint.capture-card-payment' ),
 			$container->get( 'api.prefix' ),
 			$logger
 		);
@@ -1586,4 +1587,17 @@ return array(
 			)
 		);
 	},
+	'wcgateway.endpoint.capture-card-payment' => static function( ContainerInterface $container ): CaptureCardPayment {
+		return new CaptureCardPayment(
+			$container->get( 'api.host' ),
+			$container->get( 'api.bearer' ),
+			$container->get( 'api.factory.order' ),
+			$container->get( 'api.factory.purchase-unit' ),
+			$container->get( 'api.endpoint.order' ),
+			$container->get( 'session.handler' ),
+			$container->get( 'wc-subscriptions.helpers.real-time-account-updater' ),
+			$container->get( 'wcgateway.settings' ),
+			$container->get( 'woocommerce.logger.woocommerce' )
+		);
+	},
 );
diff --git a/modules/ppcp-save-payment-methods/src/Endpoint/CaptureCardPayment.php b/modules/ppcp-wc-gateway/src/Endpoint/CaptureCardPayment.php
similarity index 98%
rename from modules/ppcp-save-payment-methods/src/Endpoint/CaptureCardPayment.php
rename to modules/ppcp-wc-gateway/src/Endpoint/CaptureCardPayment.php
index 73df58a70..bfb8b4bc4 100644
--- a/modules/ppcp-save-payment-methods/src/Endpoint/CaptureCardPayment.php
+++ b/modules/ppcp-wc-gateway/src/Endpoint/CaptureCardPayment.php
@@ -7,7 +7,7 @@
 
 declare(strict_types=1);
 
-namespace WooCommerce\PayPalCommerce\SavePaymentMethods\Endpoint;
+namespace WooCommerce\PayPalCommerce\WcGateway\Endpoint;
 
 use Psr\Log\LoggerInterface;
 use RuntimeException;
diff --git a/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php b/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php
index f2903d239..6d20ee8e5 100644
--- a/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php
+++ b/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php
@@ -19,19 +19,19 @@ use WooCommerce\PayPalCommerce\ApiClient\Exception\PayPalApiException;
 use WooCommerce\PayPalCommerce\ApiClient\Exception\RuntimeException;
 use WooCommerce\PayPalCommerce\Onboarding\Environment;
 use WooCommerce\PayPalCommerce\Onboarding\State;
-use WooCommerce\PayPalCommerce\SavePaymentMethods\Endpoint\CaptureCardPayment;
 use WooCommerce\PayPalCommerce\Session\SessionHandler;
-use WooCommerce\PayPalCommerce\WcGateway\Processor\AuthorizedPaymentsProcessor;
-use WooCommerce\PayPalCommerce\WcGateway\Processor\PaymentsStatusHandlingTrait;
-use WooCommerce\PayPalCommerce\WcGateway\Processor\TransactionIdHandlingTrait;
-use WooCommerce\PayPalCommerce\WcSubscriptions\Helper\SubscriptionHelper;
 use WooCommerce\PayPalCommerce\Vaulting\PaymentTokenRepository;
 use WooCommerce\PayPalCommerce\Vaulting\VaultedCreditCardHandler;
-use WooCommerce\PayPalCommerce\WcGateway\Exception\GatewayGenericException;
-use WooCommerce\PayPalCommerce\WcGateway\Processor\OrderProcessor;
-use WooCommerce\PayPalCommerce\WcGateway\Processor\RefundProcessor;
-use WooCommerce\PayPalCommerce\WcGateway\Settings\SettingsRenderer;
 use WooCommerce\PayPalCommerce\Vendor\Psr\Container\ContainerInterface;
+use WooCommerce\PayPalCommerce\WcGateway\Endpoint\CaptureCardPayment;
+use WooCommerce\PayPalCommerce\WcGateway\Exception\GatewayGenericException;
+use WooCommerce\PayPalCommerce\WcGateway\Processor\AuthorizedPaymentsProcessor;
+use WooCommerce\PayPalCommerce\WcGateway\Processor\OrderProcessor;
+use WooCommerce\PayPalCommerce\WcGateway\Processor\PaymentsStatusHandlingTrait;
+use WooCommerce\PayPalCommerce\WcGateway\Processor\RefundProcessor;
+use WooCommerce\PayPalCommerce\WcGateway\Processor\TransactionIdHandlingTrait;
+use WooCommerce\PayPalCommerce\WcGateway\Settings\SettingsRenderer;
+use WooCommerce\PayPalCommerce\WcSubscriptions\Helper\SubscriptionHelper;
 
 /**
  * Class CreditCardGateway
diff --git a/tests/PHPUnit/WcGateway/Gateway/CreditCardGatewayTest.php b/tests/PHPUnit/WcGateway/Gateway/CreditCardGatewayTest.php
index 745d982f7..0f529a04e 100644
--- a/tests/PHPUnit/WcGateway/Gateway/CreditCardGatewayTest.php
+++ b/tests/PHPUnit/WcGateway/Gateway/CreditCardGatewayTest.php
@@ -4,21 +4,21 @@ declare(strict_types=1);
 namespace WooCommerce\PayPalCommerce\WcGateway\Gateway;
 
 use Mockery;
-use WooCommerce\PayPalCommerce\ApiClient\Endpoint\OrderEndpoint;
-use WooCommerce\PayPalCommerce\Onboarding\Environment;
-use WooCommerce\PayPalCommerce\SavePaymentMethods\Endpoint\CaptureCardPayment;
-use WooCommerce\PayPalCommerce\Vendor\Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
 use WC_Order;
+use WooCommerce\PayPalCommerce\ApiClient\Endpoint\OrderEndpoint;
 use WooCommerce\PayPalCommerce\ApiClient\Endpoint\PaymentsEndpoint;
+use WooCommerce\PayPalCommerce\Onboarding\Environment;
 use WooCommerce\PayPalCommerce\Onboarding\State;
 use WooCommerce\PayPalCommerce\Session\SessionHandler;
-use WooCommerce\PayPalCommerce\WcSubscriptions\Helper\SubscriptionHelper;
 use WooCommerce\PayPalCommerce\TestCase;
 use WooCommerce\PayPalCommerce\Vaulting\VaultedCreditCardHandler;
+use WooCommerce\PayPalCommerce\Vendor\Psr\Container\ContainerInterface;
+use WooCommerce\PayPalCommerce\WcGateway\Endpoint\CaptureCardPayment;
 use WooCommerce\PayPalCommerce\WcGateway\Processor\OrderProcessor;
 use WooCommerce\PayPalCommerce\WcGateway\Processor\RefundProcessor;
 use WooCommerce\PayPalCommerce\WcGateway\Settings\SettingsRenderer;
+use WooCommerce\PayPalCommerce\WcSubscriptions\Helper\SubscriptionHelper;
 use function Brain\Monkey\Functions\when;
 
 class CreditCardGatewayTest extends TestCase

From 9f35681131c8e0331f672cf9e42f4df12be22a82 Mon Sep 17 00:00:00 2001
From: Pedro Silva <p.silva@inpsyde.com>
Date: Fri, 15 Mar 2024 18:40:45 +0000
Subject: [PATCH 038/101] Add handling of onShippingOptionsChange and
 onShippingAddressChange.

---
 .../resources/js/checkout-block.js            | 48 +++++++++++++++++--
 1 file changed, 43 insertions(+), 5 deletions(-)

diff --git a/modules/ppcp-blocks/resources/js/checkout-block.js b/modules/ppcp-blocks/resources/js/checkout-block.js
index 5e6450045..538b646b8 100644
--- a/modules/ppcp-blocks/resources/js/checkout-block.js
+++ b/modules/ppcp-blocks/resources/js/checkout-block.js
@@ -287,7 +287,11 @@ const PayPalComponent = ({
     };
 
     let handleShippingChange = null;
+    let handleShippingOptionsChange = null;
+    let handleShippingAddressChange = null;
     let handleSubscriptionShippingChange = null;
+    let handleSubscriptionShippingOptionsChange = null;
+    let handleSubscriptionShippingAddressChange = null;
     if (shippingData.needsShipping && !config.finalReviewEnabled) {
         handleShippingChange = async (data, actions) => {
             try {
@@ -296,13 +300,15 @@ const PayPalComponent = ({
                     await shippingData.setSelectedRates(shippingOptionId);
                 }
 
-                const address = paypalAddressToWc(data.shipping_address);
+                if (data.shipping_address) {
+                    const address = paypalAddressToWc(data.shipping_address);
 
-                await wp.data.dispatch('wc/store/cart').updateCustomerData({
-                    shipping_address: address,
-                });
+                    await wp.data.dispatch('wc/store/cart').updateCustomerData({
+                        shipping_address: address,
+                    });
 
-                await shippingData.setShippingAddress(address);
+                    await shippingData.setShippingAddress(address);
+                }
 
                 const res = await fetch(config.ajax.update_shipping.endpoint, {
                     method: 'POST',
@@ -325,6 +331,20 @@ const PayPalComponent = ({
             }
         };
 
+        handleShippingOptionsChange = (data, actions) => {
+            handleShippingChange({
+                orderID: data.orderID,
+                selected_shipping_option: data.selectedShippingOption
+            }, actions);
+        };
+
+        handleShippingAddressChange = (data, actions) => {
+            handleShippingChange({
+                orderID: data.orderID,
+                shipping_address: data.shippingAddress
+            }, actions);
+        };
+
         handleSubscriptionShippingChange = async (data, actions) => {
             try {
                 const shippingOptionId = data.selected_shipping_option?.id;
@@ -346,6 +366,20 @@ const PayPalComponent = ({
                 actions.reject();
             }
         };
+
+        handleSubscriptionShippingOptionsChange = (data, actions) => {
+            handleSubscriptionShippingChange({
+                orderID: data.orderID,
+                selected_shipping_option: data.selectedShippingOption
+            }, actions);
+        };
+
+        handleSubscriptionShippingAddressChange = (data, actions) => {
+            handleSubscriptionShippingChange({
+                orderID: data.orderID,
+                shipping_address: data.shippingAddress
+            }, actions);
+        };
     }
 
     useEffect(() => {
@@ -443,6 +477,8 @@ const PayPalComponent = ({
                 createSubscription={createSubscription}
                 onApprove={handleApproveSubscription}
                 onShippingChange={handleSubscriptionShippingChange}
+                onShippingOptionsChange={handleSubscriptionShippingOptionsChange}
+                onShippingAddressChange={handleSubscriptionShippingAddressChange}
             />
         );
     }
@@ -457,6 +493,8 @@ const PayPalComponent = ({
             createOrder={createOrder}
             onApprove={handleApprove}
             onShippingChange={handleShippingChange}
+            onShippingOptionsChange={handleShippingOptionsChange}
+            onShippingAddressChange={handleShippingAddressChange}
         />
     );
 }

From 4f9800079f16e49daf3e2cca9e03c4e603c7e7ae Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Mon, 18 Mar 2024 12:18:04 +0100
Subject: [PATCH 039/101] Delete WC payment token if it does not exist for user

---
 modules/ppcp-wc-subscriptions/src/RenewalHandler.php           | 1 +
 modules/ppcp-webhooks/src/Handler/VaultPaymentTokenCreated.php | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/modules/ppcp-wc-subscriptions/src/RenewalHandler.php b/modules/ppcp-wc-subscriptions/src/RenewalHandler.php
index 1d66685c3..e94daa5a3 100644
--- a/modules/ppcp-wc-subscriptions/src/RenewalHandler.php
+++ b/modules/ppcp-wc-subscriptions/src/RenewalHandler.php
@@ -256,6 +256,7 @@ class RenewalHandler {
 			$customer_tokens = $this->payment_tokens_endpoint->payment_tokens_for_customer( $customer_id );
 			foreach ( $wc_tokens as $token ) {
 				if ( ! in_array( $token->get_token(), $customer_tokens, true ) ) {
+					$token->delete();
 					continue;
 				}
 
diff --git a/modules/ppcp-webhooks/src/Handler/VaultPaymentTokenCreated.php b/modules/ppcp-webhooks/src/Handler/VaultPaymentTokenCreated.php
index e1f202ef5..33bdb1470 100644
--- a/modules/ppcp-webhooks/src/Handler/VaultPaymentTokenCreated.php
+++ b/modules/ppcp-webhooks/src/Handler/VaultPaymentTokenCreated.php
@@ -120,6 +120,8 @@ class VaultPaymentTokenCreated implements RequestHandler {
 			return $this->success_response();
 		}
 
+		$this->logger->info(wc_print_r($request['resource'], true));
+
 		$customer_id = null !== $request['resource'] && isset( $request['resource']['customer_id'] )
 			? $request['resource']['customer_id']
 			: '';

From 3cb06303800b1a584b2043080db0ed2c469ca02a Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Mon, 18 Mar 2024 13:09:14 +0100
Subject: [PATCH 040/101] Handle not found exception when customer id does not
 exist

---
 modules/ppcp-wc-subscriptions/src/RenewalHandler.php   | 10 ++++++++--
 .../src/WcSubscriptionsModule.php                      |  1 +
 .../src/Handler/VaultPaymentTokenCreated.php           |  2 --
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/modules/ppcp-wc-subscriptions/src/RenewalHandler.php b/modules/ppcp-wc-subscriptions/src/RenewalHandler.php
index e94daa5a3..c888b012e 100644
--- a/modules/ppcp-wc-subscriptions/src/RenewalHandler.php
+++ b/modules/ppcp-wc-subscriptions/src/RenewalHandler.php
@@ -19,6 +19,7 @@ use WooCommerce\PayPalCommerce\ApiClient\Entity\Order;
 use WooCommerce\PayPalCommerce\ApiClient\Entity\PaymentSource;
 use WooCommerce\PayPalCommerce\ApiClient\Entity\PaymentToken;
 use WooCommerce\PayPalCommerce\ApiClient\Exception\PayPalApiException;
+use WooCommerce\PayPalCommerce\ApiClient\Exception\RuntimeException;
 use WooCommerce\PayPalCommerce\ApiClient\Factory\PayerFactory;
 use WooCommerce\PayPalCommerce\ApiClient\Factory\PurchaseUnitFactory;
 use WooCommerce\PayPalCommerce\ApiClient\Factory\ShippingPreferenceFactory;
@@ -252,8 +253,13 @@ class RenewalHandler {
 				$customer_id = get_user_meta( $user_id, 'ppcp_customer_id', true );
 			}
 
-			$wc_tokens       = WC_Payment_Tokens::get_customer_tokens( $user_id, PayPalGateway::ID );
-			$customer_tokens = $this->payment_tokens_endpoint->payment_tokens_for_customer( $customer_id );
+			try {
+				$customer_tokens = $this->payment_tokens_endpoint->payment_tokens_for_customer( $customer_id );
+			} catch ( RuntimeException $exception ) {
+				$customer_tokens = array();
+			}
+
+			$wc_tokens = WC_Payment_Tokens::get_customer_tokens( $user_id, PayPalGateway::ID );
 			foreach ( $wc_tokens as $token ) {
 				if ( ! in_array( $token->get_token(), $customer_tokens, true ) ) {
 					$token->delete();
diff --git a/modules/ppcp-wc-subscriptions/src/WcSubscriptionsModule.php b/modules/ppcp-wc-subscriptions/src/WcSubscriptionsModule.php
index 9d19dc0ac..eaa79f5b7 100644
--- a/modules/ppcp-wc-subscriptions/src/WcSubscriptionsModule.php
+++ b/modules/ppcp-wc-subscriptions/src/WcSubscriptionsModule.php
@@ -13,6 +13,7 @@ use Psr\Log\LoggerInterface;
 use WC_Order;
 use WC_Payment_Token_CC;
 use WC_Payment_Tokens;
+use WooCommerce\PayPalCommerce\ApiClient\Endpoint\PaymentTokensEndpoint;
 use WooCommerce\PayPalCommerce\ApiClient\Exception\RuntimeException;
 use WooCommerce\PayPalCommerce\Vaulting\PaymentTokenRepository;
 use WooCommerce\PayPalCommerce\Vendor\Dhii\Container\ServiceProvider;
diff --git a/modules/ppcp-webhooks/src/Handler/VaultPaymentTokenCreated.php b/modules/ppcp-webhooks/src/Handler/VaultPaymentTokenCreated.php
index 33bdb1470..e1f202ef5 100644
--- a/modules/ppcp-webhooks/src/Handler/VaultPaymentTokenCreated.php
+++ b/modules/ppcp-webhooks/src/Handler/VaultPaymentTokenCreated.php
@@ -120,8 +120,6 @@ class VaultPaymentTokenCreated implements RequestHandler {
 			return $this->success_response();
 		}
 
-		$this->logger->info(wc_print_r($request['resource'], true));
-
 		$customer_id = null !== $request['resource'] && isset( $request['resource']['customer_id'] )
 			? $request['resource']['customer_id']
 			: '';

From d9e7ad61cc0c7cb3d9c094b734c8e1ac28a529cc Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Mon, 18 Mar 2024 17:34:49 +0400
Subject: [PATCH 041/101] Change the placement separator color

---
 .../resources/css/paylater-configurator.scss                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ppcp-paylater-configurator/resources/css/paylater-configurator.scss b/modules/ppcp-paylater-configurator/resources/css/paylater-configurator.scss
index 3e63f2504..6b61e8a2c 100644
--- a/modules/ppcp-paylater-configurator/resources/css/paylater-configurator.scss
+++ b/modules/ppcp-paylater-configurator/resources/css/paylater-configurator.scss
@@ -46,7 +46,7 @@
 
 	hr {
 		margin-right: 16px;
-		border-top-color: rgb(84, 93, 104);
+		border-top-color: #B1B7BD;
 	}
 }
 

From 5d45737fdd05667358aab5eb8d3a1de413d67ba0 Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Mon, 18 Mar 2024 17:35:27 +0400
Subject: [PATCH 042/101] Allow legacy values to be passed to the Configurator

---
 .../ppcp-paylater-configurator/src/Factory/ConfigFactory.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php b/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
index f00085ed5..7f66c008b 100644
--- a/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
+++ b/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
@@ -48,7 +48,7 @@ class ConfigFactory {
 			);
 		} elseif ( $location !== 'woocommerceBlock' ) {
 			$config = array(
-				'layout'        => 'text',
+				'layout'        => $this->get_or_default( $settings, "pay_later_{$location}_message_layout", 'text' ),
 				'logo-position' => $this->get_or_default( $settings, "pay_later_{$location}_message_position", 'left' ),
 				'logo-type'     => $this->get_or_default( $settings, "pay_later_{$location}_message_logo", 'inline' ),
 				'text-color'    => $this->get_or_default( $settings, "pay_later_{$location}_message_color", 'black' ),

From be7432a23944ec8d7e280c55f31695a203116da8 Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Mon, 18 Mar 2024 18:02:47 +0400
Subject: [PATCH 043/101] Allow legacy values to be passed to the Configurator

---
 .../ppcp-paylater-configurator/src/Factory/ConfigFactory.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php b/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
index 7f66c008b..e5c006a17 100644
--- a/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
+++ b/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
@@ -42,7 +42,7 @@ class ConfigFactory {
 
 		if ( in_array( $location, array( 'shop', 'home' ), true ) ) {
 			$config = array(
-				'layout' => 'flex',
+				'layout' => $this->get_or_default( $settings, "pay_later_{$location}_message_layout", 'flex' ),
 				'color'  => $this->get_or_default( $settings, "pay_later_{$location}_message_flex_color", 'black', array( 'black', 'blue', 'white', 'white-no-border' ) ),
 				'ratio'  => $this->get_or_default( $settings, "pay_later_{$location}_message_flex_ratio", '8x1', array( '8x1', '20x1' ) ),
 			);

From 9d7bee940384b80aea0c6a98b137fa6c184eb650 Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Mon, 18 Mar 2024 18:11:21 +0400
Subject: [PATCH 044/101] Allow legacy values to be passed to the Configurator

---
 .../ppcp-paylater-configurator/src/Factory/ConfigFactory.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php b/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
index e5c006a17..d36fe91c3 100644
--- a/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
+++ b/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
@@ -43,8 +43,8 @@ class ConfigFactory {
 		if ( in_array( $location, array( 'shop', 'home' ), true ) ) {
 			$config = array(
 				'layout' => $this->get_or_default( $settings, "pay_later_{$location}_message_layout", 'flex' ),
-				'color'  => $this->get_or_default( $settings, "pay_later_{$location}_message_flex_color", 'black', array( 'black', 'blue', 'white', 'white-no-border' ) ),
-				'ratio'  => $this->get_or_default( $settings, "pay_later_{$location}_message_flex_ratio", '8x1', array( '8x1', '20x1' ) ),
+				'color'  => $this->get_or_default( $settings, "pay_later_{$location}_message_flex_color", 'black' ),
+				'ratio'  => $this->get_or_default( $settings, "pay_later_{$location}_message_flex_ratio", '8x1' ),
 			);
 		} elseif ( $location !== 'woocommerceBlock' ) {
 			$config = array(

From 4e6eec462c6e9292e70d7f1943629049b3f188eb Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Tue, 19 Mar 2024 12:05:43 +0100
Subject: [PATCH 045/101] Remove duplicated return

---
 modules/ppcp-button/resources/js/button.js                  | 1 -
 modules/ppcp-wc-subscriptions/src/WcSubscriptionsModule.php | 1 -
 2 files changed, 2 deletions(-)

diff --git a/modules/ppcp-button/resources/js/button.js b/modules/ppcp-button/resources/js/button.js
index f766cc6ed..0f5d573ce 100644
--- a/modules/ppcp-button/resources/js/button.js
+++ b/modules/ppcp-button/resources/js/button.js
@@ -241,7 +241,6 @@ document.addEventListener(
         if (!typeof (PayPalCommerceGateway)) {
             console.error('PayPal button could not be configured.');
             return;
-            return;
         }
 
         if (
diff --git a/modules/ppcp-wc-subscriptions/src/WcSubscriptionsModule.php b/modules/ppcp-wc-subscriptions/src/WcSubscriptionsModule.php
index eaa79f5b7..9d19dc0ac 100644
--- a/modules/ppcp-wc-subscriptions/src/WcSubscriptionsModule.php
+++ b/modules/ppcp-wc-subscriptions/src/WcSubscriptionsModule.php
@@ -13,7 +13,6 @@ use Psr\Log\LoggerInterface;
 use WC_Order;
 use WC_Payment_Token_CC;
 use WC_Payment_Tokens;
-use WooCommerce\PayPalCommerce\ApiClient\Endpoint\PaymentTokensEndpoint;
 use WooCommerce\PayPalCommerce\ApiClient\Exception\RuntimeException;
 use WooCommerce\PayPalCommerce\Vaulting\PaymentTokenRepository;
 use WooCommerce\PayPalCommerce\Vendor\Dhii\Container\ServiceProvider;

From 894920bdf6fe9b136577d9d076cd0408a63303bf Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Tue, 19 Mar 2024 17:10:56 +0400
Subject: [PATCH 046/101] Fix the custom placement

---
 .../resources/js/paylater-configurator.js                    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js b/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js
index 15f65f183..d03912743 100644
--- a/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js
+++ b/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js
@@ -40,10 +40,7 @@ document.addEventListener( 'DOMContentLoaded', () => {
         partnerClientId: PcpPayLaterConfigurator.partnerClientId,
         partnerName: 'WooCommerce',
         bnCode: 'Woo_PPCP',
-        placements: ['cart', 'checkout', 'product', 'shop', 'home'],
-        custom_placement:[{
-            message_reference: 'woocommerceBlock',
-        }],
+        placements: ['cart', 'checkout', 'product', 'shop', 'home', 'woocommerceBlock'],
         styleOverrides: {
             button: publishButtonClassName,
             header: PcpPayLaterConfigurator.headerClassName,

From 785404335f18796eb1c2760df7ab8636a6c9db36 Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Tue, 19 Mar 2024 17:11:23 +0400
Subject: [PATCH 047/101] Save the text color

---
 modules/ppcp-paylater-configurator/src/Endpoint/SaveConfig.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/ppcp-paylater-configurator/src/Endpoint/SaveConfig.php b/modules/ppcp-paylater-configurator/src/Endpoint/SaveConfig.php
index 6584b7da3..41152b6d6 100644
--- a/modules/ppcp-paylater-configurator/src/Endpoint/SaveConfig.php
+++ b/modules/ppcp-paylater-configurator/src/Endpoint/SaveConfig.php
@@ -129,6 +129,7 @@ class SaveConfig {
 		$this->set_value_if_present( $config, 'logo-type', "pay_later_{$location}_message_logo" );
 		$this->set_value_if_present( $config, 'logo-color', "pay_later_{$location}_message_color" );
 		$this->set_value_if_present( $config, 'text-size', "pay_later_{$location}_message_text_size" );
+		$this->set_value_if_present( $config, 'text-color', "pay_later_{$location}_message_text_color" );
 	}
 
 	/**

From 7ca0940ef2e3e6fc0ba429ca13e38191eafb2aed Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Tue, 19 Mar 2024 17:12:20 +0400
Subject: [PATCH 048/101] Adjust the configurator config to support custom
 placement

---
 .../src/Factory/ConfigFactory.php             | 102 ++++++++++++++----
 1 file changed, 80 insertions(+), 22 deletions(-)

diff --git a/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php b/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
index d36fe91c3..0fedbe44c 100644
--- a/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
+++ b/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
@@ -27,7 +27,7 @@ class ConfigFactory {
 			'product'          => $this->for_location( $settings, 'product' ),
 			'shop'             => $this->for_location( $settings, 'shop' ),
 			'home'             => $this->for_location( $settings, 'home' ),
-			'woocommerceBlock' => $this->for_location( $settings, 'woocommerceBlock' ),
+			'custom_placement' => $this->for_location( $settings, 'woocommerceBlock' ),
 		);
 	}
 
@@ -40,29 +40,87 @@ class ConfigFactory {
 	private function for_location( Settings $settings, string $location ): array {
 		$selected_locations = $settings->has( 'pay_later_messaging_locations' ) ? $settings->get( 'pay_later_messaging_locations' ) : array();
 
-		if ( in_array( $location, array( 'shop', 'home' ), true ) ) {
-			$config = array(
-				'layout' => $this->get_or_default( $settings, "pay_later_{$location}_message_layout", 'flex' ),
-				'color'  => $this->get_or_default( $settings, "pay_later_{$location}_message_flex_color", 'black' ),
-				'ratio'  => $this->get_or_default( $settings, "pay_later_{$location}_message_flex_ratio", '8x1' ),
-			);
-		} elseif ( $location !== 'woocommerceBlock' ) {
-			$config = array(
-				'layout'        => $this->get_or_default( $settings, "pay_later_{$location}_message_layout", 'text' ),
-				'logo-position' => $this->get_or_default( $settings, "pay_later_{$location}_message_position", 'left' ),
-				'logo-type'     => $this->get_or_default( $settings, "pay_later_{$location}_message_logo", 'inline' ),
-				'text-color'    => $this->get_or_default( $settings, "pay_later_{$location}_message_color", 'black' ),
-				'text-size'     => $this->get_or_default( $settings, "pay_later_{$location}_message_text_size", '12' ),
-
-			);
+		switch ( $location ) {
+			case 'shop':
+			case 'home':
+				$config = $this->for_shop_or_home( $settings, $location, $selected_locations );
+				break;
+			case 'woocommerceBlock':
+				$config = $this->for_woocommerce_block( $selected_locations );
+				break;
+			default:
+				$config = $this->for_default_location( $settings, $location, $selected_locations );
+				break;
 		}
 
-		return array_merge(
-			array(
-				'status'    => in_array( $location, $selected_locations, true ) ? 'enabled' : 'disabled',
-				'placement' => $location,
-			),
-			$config ?? array()
+		return $config;
+	}
+
+	/**
+	 * Returns the configurator config for shop, home locations.
+	 *
+	 * @param Settings $settings The settings.
+	 * @param string   $location The location.
+	 * @param string[] $selected_locations The list of selected locations.
+	 * @return array{
+	 *     layout: string,
+	 *     color: string,
+	 *     ratio: string,
+	 *     status: string,
+	 *     placement: string
+	 * } The configurator config map.
+	 */
+	private function for_shop_or_home( Settings $settings, string $location, array $selected_locations ): array {
+		return array(
+			'layout'    => $this->get_or_default( $settings, "pay_later_{$location}_message_layout", 'flex' ),
+			'color'     => $this->get_or_default( $settings, "pay_later_{$location}_message_flex_color", 'black' ),
+			'ratio'     => $this->get_or_default( $settings, "pay_later_{$location}_message_flex_ratio", '8x1' ),
+			'status'    => in_array( $location, $selected_locations, true ) ? 'enabled' : 'disabled',
+			'placement' => $location,
+		);
+	}
+
+	/**
+	 * Returns the configurator config for woocommerceBlock location.
+	 *
+	 * @param array $selected_locations The list of selected locations.
+	 * @return array{
+	 *     status: string,
+	 *     message_reference: string
+	 * } The configurator config map.
+	 */
+	private function for_woocommerce_block( array $selected_locations ): array {
+		return array(
+			'status'            => in_array( 'woocommerceBlock', $selected_locations, true ) ? 'enabled' : 'disabled',
+			'message_reference' => 'woocommerceBlock',
+		);
+	}
+
+	/**
+	 * Returns the configurator config for default locations.
+	 *
+	 * @param Settings $settings The settings.
+	 * @param string   $location The location.
+	 * @param string[] $selected_locations The list of selected locations.
+	 * @return array{
+	 *     layout: string,
+	 *     logo-position: string,
+	 *     logo-type: string,
+	 *     text-color: string,
+	 *     text-size: string,
+	 *     status: string,
+	 *     placement: string
+	 * } The configurator config map.
+	 */
+	private function for_default_location( Settings $settings, string $location, array $selected_locations ): array {
+		return array(
+			'layout'        => $this->get_or_default( $settings, "pay_later_{$location}_message_layout", 'text' ),
+			'logo-position' => $this->get_or_default( $settings, "pay_later_{$location}_message_position", 'left' ),
+			'logo-type'     => $this->get_or_default( $settings, "pay_later_{$location}_message_logo", 'inline' ),
+			'text-color'    => $this->get_or_default( $settings, "pay_later_{$location}_message_text_color", 'black' ),
+			'text-size'     => $this->get_or_default( $settings, "pay_later_{$location}_message_text_size", '12' ),
+			'status'        => in_array( $location, $selected_locations, true ) ? 'enabled' : 'disabled',
+			'placement'     => $location,
 		);
 	}
 

From 47c9223d9b90c8f45d6edd3d5f90540be443b138 Mon Sep 17 00:00:00 2001
From: Pedro Silva <p.silva@inpsyde.com>
Date: Tue, 19 Mar 2024 14:05:30 +0000
Subject: [PATCH 049/101] Fix block shipping address handlers.

---
 .../ppcp-blocks/resources/js/Helper/Helper.js | 22 +++++
 .../resources/js/checkout-block.js            | 95 ++++++++++---------
 2 files changed, 70 insertions(+), 47 deletions(-)
 create mode 100644 modules/ppcp-blocks/resources/js/Helper/Helper.js

diff --git a/modules/ppcp-blocks/resources/js/Helper/Helper.js b/modules/ppcp-blocks/resources/js/Helper/Helper.js
new file mode 100644
index 000000000..379c88a49
--- /dev/null
+++ b/modules/ppcp-blocks/resources/js/Helper/Helper.js
@@ -0,0 +1,22 @@
+/**
+ * @param str
+ * @returns {string}
+ */
+export const toSnakeCase = (str) => {
+    return str.replace(/[\w]([A-Z])/g, function(m) {
+        return m[0] + "_" + m[1];
+    }).toLowerCase();
+}
+
+/**
+ * @param obj
+ * @returns {{}}
+ */
+export const convertKeysToSnakeCase = (obj) => {
+    const newObj = {};
+    Object.keys(obj).forEach((key) => {
+        const newKey = toSnakeCase(key);
+        newObj[newKey] = obj[key];
+    });
+    return newObj;
+}
diff --git a/modules/ppcp-blocks/resources/js/checkout-block.js b/modules/ppcp-blocks/resources/js/checkout-block.js
index 538b646b8..61fc22da5 100644
--- a/modules/ppcp-blocks/resources/js/checkout-block.js
+++ b/modules/ppcp-blocks/resources/js/checkout-block.js
@@ -6,6 +6,9 @@ import {
     paypalOrderToWcAddresses,
     paypalSubscriptionToWcAddresses
 } from "./Helper/Address";
+import {
+    convertKeysToSnakeCase
+} from "./Helper/Helper";
 import {
     cartHasSubscriptionProducts,
     isPayPalSubscription
@@ -18,6 +21,7 @@ import {
 } from '../../../ppcp-button/resources/js/modules/Helper/Style'
 import buttonModuleWatcher from "../../../ppcp-button/resources/js/modules/ButtonModuleWatcher";
 import BlockCheckoutMessagesBootstrap from "./Bootstrap/BlockCheckoutMessagesBootstrap";
+import {keysToCamelCase} from "../../../ppcp-button/resources/js/modules/Helper/Utils";
 const config = wc.wcSettings.getSetting('ppcp-gateway_data');
 
 window.ppcpFundingSource = config.fundingSource;
@@ -286,30 +290,18 @@ const PayPalComponent = ({
         onClick();
     };
 
-    let handleShippingChange = null;
     let handleShippingOptionsChange = null;
     let handleShippingAddressChange = null;
-    let handleSubscriptionShippingChange = null;
     let handleSubscriptionShippingOptionsChange = null;
     let handleSubscriptionShippingAddressChange = null;
     if (shippingData.needsShipping && !config.finalReviewEnabled) {
-        handleShippingChange = async (data, actions) => {
+        handleShippingOptionsChange = async (data, actions) => {
             try {
-                const shippingOptionId = data.selected_shipping_option?.id;
+                const shippingOptionId = data.selectedShippingOption?.id;
                 if (shippingOptionId) {
                     await shippingData.setSelectedRates(shippingOptionId);
                 }
 
-                if (data.shipping_address) {
-                    const address = paypalAddressToWc(data.shipping_address);
-
-                    await wp.data.dispatch('wc/store/cart').updateCustomerData({
-                        shipping_address: address,
-                    });
-
-                    await shippingData.setShippingAddress(address);
-                }
-
                 const res = await fetch(config.ajax.update_shipping.endpoint, {
                     method: 'POST',
                     credentials: 'same-origin',
@@ -331,28 +323,53 @@ const PayPalComponent = ({
             }
         };
 
-        handleShippingOptionsChange = (data, actions) => {
-            handleShippingChange({
-                orderID: data.orderID,
-                selected_shipping_option: data.selectedShippingOption
-            }, actions);
-        };
-
-        handleShippingAddressChange = (data, actions) => {
-            handleShippingChange({
-                orderID: data.orderID,
-                shipping_address: data.shippingAddress
-            }, actions);
-        };
-
-        handleSubscriptionShippingChange = async (data, actions) => {
+        handleShippingAddressChange = async (data, actions) => {
             try {
-                const shippingOptionId = data.selected_shipping_option?.id;
+                const address = paypalAddressToWc(convertKeysToSnakeCase(data.shippingAddress));
+
+                await wp.data.dispatch('wc/store/cart').updateCustomerData({
+                    shipping_address: address,
+                });
+
+                await shippingData.setShippingAddress(address);
+
+                const res = await fetch(config.ajax.update_shipping.endpoint, {
+                    method: 'POST',
+                    credentials: 'same-origin',
+                    body: JSON.stringify({
+                        nonce: config.ajax.update_shipping.nonce,
+                        order_id: data.orderID,
+                    })
+                });
+
+                const json = await res.json();
+
+                if (!json.success) {
+                    throw new Error(json.data.message);
+                }
+            } catch (e) {
+                console.error(e);
+
+                actions.reject();
+            }
+        };
+
+        handleSubscriptionShippingOptionsChange = async (data, actions) => {
+            try {
+                const shippingOptionId = data.selectedShippingOption?.id;
                 if (shippingOptionId) {
                     await shippingData.setSelectedRates(shippingOptionId);
                 }
+            } catch (e) {
+                console.error(e);
 
-                const address = paypalAddressToWc(data.shipping_address);
+                actions.reject();
+            }
+        };
+
+        handleSubscriptionShippingAddressChange = async (data, actions) => {
+            try {
+                const address = paypalAddressToWc(convertKeysToSnakeCase(data.shippingAddress));
 
                 await wp.data.dispatch('wc/store/cart').updateCustomerData({
                     shipping_address: address,
@@ -366,20 +383,6 @@ const PayPalComponent = ({
                 actions.reject();
             }
         };
-
-        handleSubscriptionShippingOptionsChange = (data, actions) => {
-            handleSubscriptionShippingChange({
-                orderID: data.orderID,
-                selected_shipping_option: data.selectedShippingOption
-            }, actions);
-        };
-
-        handleSubscriptionShippingAddressChange = (data, actions) => {
-            handleSubscriptionShippingChange({
-                orderID: data.orderID,
-                shipping_address: data.shippingAddress
-            }, actions);
-        };
     }
 
     useEffect(() => {
@@ -476,7 +479,6 @@ const PayPalComponent = ({
                 onError={onClose}
                 createSubscription={createSubscription}
                 onApprove={handleApproveSubscription}
-                onShippingChange={handleSubscriptionShippingChange}
                 onShippingOptionsChange={handleSubscriptionShippingOptionsChange}
                 onShippingAddressChange={handleSubscriptionShippingAddressChange}
             />
@@ -492,7 +494,6 @@ const PayPalComponent = ({
             onError={onClose}
             createOrder={createOrder}
             onApprove={handleApprove}
-            onShippingChange={handleShippingChange}
             onShippingOptionsChange={handleShippingOptionsChange}
             onShippingAddressChange={handleShippingAddressChange}
         />

From ded41850fffcbd707805a1dc3fa724f67986d927 Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Tue, 19 Mar 2024 18:07:19 +0400
Subject: [PATCH 050/101] Change placment names for the block

---
 modules/ppcp-paylater-block/resources/js/edit.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/ppcp-paylater-block/resources/js/edit.js b/modules/ppcp-paylater-block/resources/js/edit.js
index c702d0ad9..06f801761 100644
--- a/modules/ppcp-paylater-block/resources/js/edit.js
+++ b/modules/ppcp-paylater-block/resources/js/edit.js
@@ -194,12 +194,11 @@ export default function Edit( { attributes, clientId, setAttributes } ) {
                         help={ __( 'Used for the analytics dashboard in the merchant account.', 'woocommerce-paypal-payments' ) }
                         options={ [
                             { label: __( 'Detect automatically', 'woocommerce-paypal-payments' ), value: 'auto' },
+                            { label: __( 'Product Page', 'woocommerce-paypal-payments' ), value: 'product-page' },
                             { label: __( 'Cart', 'woocommerce-paypal-payments' ), value: 'cart' },
-                            { label: __( 'Payment', 'woocommerce-paypal-payments' ), value: 'payment' },
-                            { label: __( 'Product', 'woocommerce-paypal-payments' ), value: 'product' },
-                            { label: __( 'Product list', 'woocommerce-paypal-payments' ), value: 'product-list' },
+                            { label: __( 'Checkout', 'woocommerce-paypal-payments' ), value: 'checkout' },
                             { label: __( 'Home', 'woocommerce-paypal-payments' ), value: 'home' },
-                            { label: __( 'Category', 'woocommerce-paypal-payments' ), value: 'category' },
+                            { label: __( 'Shop', 'woocommerce-paypal-payments' ), value: 'shop' },
                         ] }
                         value={ placement }
                         onChange={ ( value ) => setAttributes( { placement: value } ) }

From 6c60ee1e86f19029a00f60d0272f59f895a5ac5c Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Tue, 19 Mar 2024 18:35:49 +0400
Subject: [PATCH 051/101] Fix Psalm

---
 .../src/Factory/ConfigFactory.php                      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php b/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
index 0fedbe44c..7c7b61e7c 100644
--- a/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
+++ b/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
@@ -66,7 +66,7 @@ class ConfigFactory {
 	 *     layout: string,
 	 *     color: string,
 	 *     ratio: string,
-	 *     status: string,
+	 *     status: "disabled"|"enabled",
 	 *     placement: string
 	 * } The configurator config map.
 	 */
@@ -85,7 +85,7 @@ class ConfigFactory {
 	 *
 	 * @param array $selected_locations The list of selected locations.
 	 * @return array{
-	 *     status: string,
+	 *     status: "disabled"|"enabled",
 	 *     message_reference: string
 	 * } The configurator config map.
 	 */
@@ -108,7 +108,7 @@ class ConfigFactory {
 	 *     logo-type: string,
 	 *     text-color: string,
 	 *     text-size: string,
-	 *     status: string,
+	 *     status: "disabled"|"enabled",
 	 *     placement: string
 	 * } The configurator config map.
 	 */
@@ -131,9 +131,9 @@ class ConfigFactory {
 	 * @param string     $key The key.
 	 * @param mixed      $default The default value.
 	 * @param array|null $allowed_values The list of allowed values, or null if all values are allowed.
-	 * @return mixed
+	 * @return string
 	 */
-	private function get_or_default( Settings $settings, string $key, $default, ?array $allowed_values = null ) {
+	private function get_or_default( Settings $settings, string $key, $default, ?array $allowed_values = null ): string {
 		if ( $settings->has( $key ) ) {
 			$value = $settings->get( $key );
 			if ( ! $allowed_values || in_array( $value, $allowed_values, true ) ) {

From 8ea790feddd1af4d0030c5be372ac399c71d0c6c Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Tue, 19 Mar 2024 16:26:50 +0100
Subject: [PATCH 052/101] Delete WC card payment token if it does not exist on
 PayPal

---
 modules/ppcp-wc-gateway/services.php          |  3 ++-
 .../src/Gateway/CreditCardGateway.php         | 27 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/modules/ppcp-wc-gateway/services.php b/modules/ppcp-wc-gateway/services.php
index ae589565a..0239ddb81 100644
--- a/modules/ppcp-wc-gateway/services.php
+++ b/modules/ppcp-wc-gateway/services.php
@@ -135,6 +135,7 @@ return array(
 			$container->get( 'api.endpoint.order' ),
 			$container->get( 'wcgateway.endpoint.capture-card-payment' ),
 			$container->get( 'api.prefix' ),
+			$container->get( 'api.endpoint.payment-tokens' ),
 			$logger
 		);
 	},
@@ -1587,7 +1588,7 @@ return array(
 			)
 		);
 	},
-	'wcgateway.endpoint.capture-card-payment' => static function( ContainerInterface $container ): CaptureCardPayment {
+	'wcgateway.endpoint.capture-card-payment'              => static function( ContainerInterface $container ): CaptureCardPayment {
 		return new CaptureCardPayment(
 			$container->get( 'api.host' ),
 			$container->get( 'api.bearer' ),
diff --git a/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php b/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php
index 6d20ee8e5..1250eab98 100644
--- a/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php
+++ b/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php
@@ -15,6 +15,7 @@ use WC_Order;
 use WC_Payment_Tokens;
 use WooCommerce\PayPalCommerce\ApiClient\Endpoint\OrderEndpoint;
 use WooCommerce\PayPalCommerce\ApiClient\Endpoint\PaymentsEndpoint;
+use WooCommerce\PayPalCommerce\ApiClient\Endpoint\PaymentTokensEndpoint;
 use WooCommerce\PayPalCommerce\ApiClient\Exception\PayPalApiException;
 use WooCommerce\PayPalCommerce\ApiClient\Exception\RuntimeException;
 use WooCommerce\PayPalCommerce\Onboarding\Environment;
@@ -154,6 +155,13 @@ class CreditCardGateway extends \WC_Payment_Gateway_CC {
 	 */
 	private $prefix;
 
+	/**
+	 * Payment tokens endpoint.
+	 *
+	 * @var PaymentTokensEndpoint
+	 */
+	private $payment_tokens_endpoint;
+
 	/**
 	 * The logger.
 	 *
@@ -179,6 +187,7 @@ class CreditCardGateway extends \WC_Payment_Gateway_CC {
 	 * @param OrderEndpoint            $order_endpoint The order endpoint.
 	 * @param CaptureCardPayment       $capture_card_payment Capture card payment.
 	 * @param string                   $prefix The prefix.
+	 * @param PaymentTokensEndpoint    $payment_tokens_endpoint Payment tokens endpoint.
 	 * @param LoggerInterface          $logger The logger.
 	 */
 	public function __construct(
@@ -197,6 +206,7 @@ class CreditCardGateway extends \WC_Payment_Gateway_CC {
 		OrderEndpoint $order_endpoint,
 		CaptureCardPayment $capture_card_payment,
 		string $prefix,
+		PaymentTokensEndpoint $payment_tokens_endpoint,
 		LoggerInterface $logger
 	) {
 		$this->id                          = self::ID;
@@ -215,6 +225,7 @@ class CreditCardGateway extends \WC_Payment_Gateway_CC {
 		$this->order_endpoint              = $order_endpoint;
 		$this->capture_card_payment        = $capture_card_payment;
 		$this->prefix                      = $prefix;
+		$this->payment_tokens_endpoint     = $payment_tokens_endpoint;
 		$this->logger                      = $logger;
 
 		if ( $state->current_state() === State::STATE_ONBOARDED ) {
@@ -414,9 +425,25 @@ class CreditCardGateway extends \WC_Payment_Gateway_CC {
 		// phpcs:ignore WordPress.Security.NonceVerification.Missing
 		$card_payment_token_id = wc_clean( wp_unslash( $_POST['wc-ppcp-credit-card-gateway-payment-token'] ?? '' ) );
 		if ( $card_payment_token_id ) {
+			$customer_id = get_user_meta( get_current_user_id(), '_ppcp_target_customer_id', true );
+			if ( ! $customer_id ) {
+				$customer_id = get_user_meta( get_current_user_id(), 'ppcp_customer_id', true );
+			}
+
+			try {
+				$customer_tokens = $this->payment_tokens_endpoint->payment_tokens_for_customer( $customer_id );
+			} catch ( RuntimeException $exception ) {
+				$customer_tokens = array();
+			}
+
 			$tokens = WC_Payment_Tokens::get_customer_tokens( get_current_user_id() );
 			foreach ( $tokens as $token ) {
 				if ( $token->get_id() === (int) $card_payment_token_id ) {
+					if ( ! in_array( $token->get_token(), $customer_tokens, true ) ) {
+						$token->delete();
+						continue;
+					}
+
 					$custom_id    = $wc_order->get_order_number();
 					$invoice_id   = $this->prefix . $wc_order->get_order_number();
 					$create_order = $this->capture_card_payment->create_order( $token->get_token(), $custom_id, $invoice_id );

From 9c9aa96b8cd5fceb8a56a6e1b885a5d14c64ab24 Mon Sep 17 00:00:00 2001
From: mattallan <matt.allan@automattic.com>
Date: Wed, 20 Mar 2024 10:51:20 +1000
Subject: [PATCH 053/101] woorelease: Product version bump update

---
 changelog.txt | 2 +-
 readme.txt    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index a6b728429..bd4294893 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,6 +1,6 @@
 *** Changelog ***
 
-= 2.6.0 - xxxx-xx-xx =
+= 2.6.0 - 2024-03-20 =
 * Fix - invoice_id not included in API call when creating payment with saved card #2086
 * Fix - Typo in SCA indicators for ACDC Vault transactions #2083
 * Fix - Payments with saved card tokens use Capture intent when Authorize is configured #2069
diff --git a/readme.txt b/readme.txt
index d7d3aa924..d4b1f1b07 100644
--- a/readme.txt
+++ b/readme.txt
@@ -179,7 +179,7 @@ If you encounter issues with the PayPal buttons not appearing after an update, p
 
 == Changelog ==
 
-= 2.6.0 - xxxx-xx-xx =
+= 2.6.0 - 2024-03-20 =
 * Fix - invoice_id not included in API call when creating payment with saved card #2086
 * Fix - Typo in SCA indicators for ACDC Vault transactions #2083
 * Fix - Payments with saved card tokens use Capture intent when Authorize is configured #2069

From 3de845a93489328be9d629e5bccc7bce7e8b0e72 Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Wed, 20 Mar 2024 13:02:25 +0100
Subject: [PATCH 054/101] Ensure payment token exist for customer for card
 payment subscription renewal

---
 .../src/RenewalHandler.php                     | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/modules/ppcp-wc-subscriptions/src/RenewalHandler.php b/modules/ppcp-wc-subscriptions/src/RenewalHandler.php
index c888b012e..7be01f1b7 100644
--- a/modules/ppcp-wc-subscriptions/src/RenewalHandler.php
+++ b/modules/ppcp-wc-subscriptions/src/RenewalHandler.php
@@ -298,6 +298,24 @@ class RenewalHandler {
 		}
 
 		if ( $wc_order->get_payment_method() === CreditCardGateway::ID ) {
+			$customer_id = get_user_meta( $user_id, '_ppcp_target_customer_id', true );
+			if ( ! $customer_id ) {
+				$customer_id = get_user_meta( $user_id, 'ppcp_customer_id', true );
+			}
+
+			try {
+				$customer_tokens = $this->payment_tokens_endpoint->payment_tokens_for_customer( $customer_id );
+			} catch ( RuntimeException $exception ) {
+				$customer_tokens = array();
+			}
+
+			$wc_tokens = WC_Payment_Tokens::get_customer_tokens( $wc_order->get_customer_id(), CreditCardGateway::ID );
+			foreach ( $wc_tokens as $token ) {
+				if ( ! in_array( $token->get_token(), $customer_tokens, true ) ) {
+					$token->delete();
+				}
+			}
+
 			$wc_tokens  = WC_Payment_Tokens::get_customer_tokens( $wc_order->get_customer_id(), CreditCardGateway::ID );
 			$last_token = end( $wc_tokens );
 			if ( $last_token ) {

From 4cfa04b47396891eea9af390a639a02324395dcb Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Wed, 20 Mar 2024 16:24:00 +0400
Subject: [PATCH 055/101] Fix the text color

---
 .../resources/js/paylater-configurator.js                       | 2 +-
 modules/ppcp-paylater-configurator/src/Endpoint/SaveConfig.php  | 2 +-
 .../ppcp-paylater-configurator/src/Factory/ConfigFactory.php    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js b/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js
index d03912743..440e2648b 100644
--- a/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js
+++ b/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js
@@ -29,7 +29,7 @@ document.addEventListener( 'DOMContentLoaded', () => {
             setTimeout(() => {
                 saveChangesButton.click(); // Trigger click event on saveChangesButton
                 isSaving = false; // Reset flag when saving is complete
-            }, 500); // Adjust the delay as needed
+            }, 1000); // Adjust the delay as needed
         }
     });
 
diff --git a/modules/ppcp-paylater-configurator/src/Endpoint/SaveConfig.php b/modules/ppcp-paylater-configurator/src/Endpoint/SaveConfig.php
index 41152b6d6..b44ca77af 100644
--- a/modules/ppcp-paylater-configurator/src/Endpoint/SaveConfig.php
+++ b/modules/ppcp-paylater-configurator/src/Endpoint/SaveConfig.php
@@ -129,7 +129,7 @@ class SaveConfig {
 		$this->set_value_if_present( $config, 'logo-type', "pay_later_{$location}_message_logo" );
 		$this->set_value_if_present( $config, 'logo-color', "pay_later_{$location}_message_color" );
 		$this->set_value_if_present( $config, 'text-size', "pay_later_{$location}_message_text_size" );
-		$this->set_value_if_present( $config, 'text-color', "pay_later_{$location}_message_text_color" );
+		$this->set_value_if_present( $config, 'text-color', "pay_later_{$location}_message_color" );
 	}
 
 	/**
diff --git a/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php b/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
index 7c7b61e7c..695fadf4c 100644
--- a/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
+++ b/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
@@ -117,7 +117,7 @@ class ConfigFactory {
 			'layout'        => $this->get_or_default( $settings, "pay_later_{$location}_message_layout", 'text' ),
 			'logo-position' => $this->get_or_default( $settings, "pay_later_{$location}_message_position", 'left' ),
 			'logo-type'     => $this->get_or_default( $settings, "pay_later_{$location}_message_logo", 'inline' ),
-			'text-color'    => $this->get_or_default( $settings, "pay_later_{$location}_message_text_color", 'black' ),
+			'text-color'    => $this->get_or_default( $settings, "pay_later_{$location}_message_color", 'black' ),
 			'text-size'     => $this->get_or_default( $settings, "pay_later_{$location}_message_text_size", '12' ),
 			'status'        => in_array( $location, $selected_locations, true ) ? 'enabled' : 'disabled',
 			'placement'     => $location,

From 2fedd36dbf329aeffbac9d88e5491adfc0559aea Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Wed, 20 Mar 2024 16:26:28 +0400
Subject: [PATCH 056/101] Fix the placement label for block

---
 modules/ppcp-paylater-block/resources/js/edit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ppcp-paylater-block/resources/js/edit.js b/modules/ppcp-paylater-block/resources/js/edit.js
index 06f801761..44b4f895d 100644
--- a/modules/ppcp-paylater-block/resources/js/edit.js
+++ b/modules/ppcp-paylater-block/resources/js/edit.js
@@ -194,7 +194,7 @@ export default function Edit( { attributes, clientId, setAttributes } ) {
                         help={ __( 'Used for the analytics dashboard in the merchant account.', 'woocommerce-paypal-payments' ) }
                         options={ [
                             { label: __( 'Detect automatically', 'woocommerce-paypal-payments' ), value: 'auto' },
-                            { label: __( 'Product Page', 'woocommerce-paypal-payments' ), value: 'product-page' },
+                            { label: __( 'Product Page', 'woocommerce-paypal-payments' ), value: 'product' },
                             { label: __( 'Cart', 'woocommerce-paypal-payments' ), value: 'cart' },
                             { label: __( 'Checkout', 'woocommerce-paypal-payments' ), value: 'checkout' },
                             { label: __( 'Home', 'woocommerce-paypal-payments' ), value: 'home' },

From 082550b363b07cbdcd3a2c9d19f2b64822de451a Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Thu, 21 Mar 2024 12:36:45 +0100
Subject: [PATCH 057/101] Create WC payment token if it exist in PayPal

---
 .../src/Endpoint/PaymentTokensEndpoint.php    | 17 +++++-
 modules/ppcp-wc-gateway/services.php          |  1 +
 .../src/Gateway/CreditCardGateway.php         | 31 ++++++++++-
 modules/ppcp-wc-subscriptions/services.php    |  3 +-
 .../src/RenewalHandler.php                    | 54 +++++++++++++++++--
 5 files changed, 99 insertions(+), 7 deletions(-)

diff --git a/modules/ppcp-api-client/src/Endpoint/PaymentTokensEndpoint.php b/modules/ppcp-api-client/src/Endpoint/PaymentTokensEndpoint.php
index d59584095..284bc887f 100644
--- a/modules/ppcp-api-client/src/Endpoint/PaymentTokensEndpoint.php
+++ b/modules/ppcp-api-client/src/Endpoint/PaymentTokensEndpoint.php
@@ -11,6 +11,7 @@ namespace WooCommerce\PayPalCommerce\ApiClient\Endpoint;
 
 use Psr\Log\LoggerInterface;
 use WooCommerce\PayPalCommerce\ApiClient\Authentication\Bearer;
+use WooCommerce\PayPalCommerce\ApiClient\Entity\PaymentSource;
 use WooCommerce\PayPalCommerce\ApiClient\Exception\PayPalApiException;
 use WooCommerce\PayPalCommerce\ApiClient\Exception\RuntimeException;
 use WP_Error;
@@ -96,8 +97,11 @@ class PaymentTokensEndpoint {
 	/**
 	 * Returns all payment tokens for the given customer.
 	 *
-	 * @param string $customer_id
+	 * @param string $customer_id PayPal customer id.
 	 * @return array
+	 *
+	 * @throws RuntimeException When something went wrong with the request.
+	 * @throws PayPalApiException When something went wrong getting the payment tokens.
 	 */
 	public function payment_tokens_for_customer( string $customer_id ): array {
 		$bearer = $this->bearer->bearer();
@@ -124,7 +128,16 @@ class PaymentTokensEndpoint {
 		$tokens         = array();
 		$payment_tokens = $json->payment_tokens ?? array();
 		foreach ( $payment_tokens as $payment_token ) {
-			$tokens[] = $payment_token->id;
+			$name = array_key_first( (array) $payment_token->payment_source ) ?? '';
+			if ( $name ) {
+				$tokens[] = array(
+					'id'             => $payment_token->id,
+					'payment_source' => new PaymentSource(
+						$name,
+						$payment_token->payment_source->$name
+					),
+				);
+			}
 		}
 
 		return $tokens;
diff --git a/modules/ppcp-wc-gateway/services.php b/modules/ppcp-wc-gateway/services.php
index 0239ddb81..a90feb16b 100644
--- a/modules/ppcp-wc-gateway/services.php
+++ b/modules/ppcp-wc-gateway/services.php
@@ -136,6 +136,7 @@ return array(
 			$container->get( 'wcgateway.endpoint.capture-card-payment' ),
 			$container->get( 'api.prefix' ),
 			$container->get( 'api.endpoint.payment-tokens' ),
+			$container->get( 'save-payment-methods.wc-payment-tokens' ),
 			$logger
 		);
 	},
diff --git a/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php b/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php
index 1250eab98..734204090 100644
--- a/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php
+++ b/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php
@@ -20,6 +20,7 @@ use WooCommerce\PayPalCommerce\ApiClient\Exception\PayPalApiException;
 use WooCommerce\PayPalCommerce\ApiClient\Exception\RuntimeException;
 use WooCommerce\PayPalCommerce\Onboarding\Environment;
 use WooCommerce\PayPalCommerce\Onboarding\State;
+use WooCommerce\PayPalCommerce\SavePaymentMethods\WooCommercePaymentTokens;
 use WooCommerce\PayPalCommerce\Session\SessionHandler;
 use WooCommerce\PayPalCommerce\Vaulting\PaymentTokenRepository;
 use WooCommerce\PayPalCommerce\Vaulting\VaultedCreditCardHandler;
@@ -162,6 +163,13 @@ class CreditCardGateway extends \WC_Payment_Gateway_CC {
 	 */
 	private $payment_tokens_endpoint;
 
+	/**
+	 * WooCommerce payment tokens factory.
+	 *
+	 * @var WooCommercePaymentTokens
+	 */
+	private $wc_payment_tokens;
+
 	/**
 	 * The logger.
 	 *
@@ -188,6 +196,7 @@ class CreditCardGateway extends \WC_Payment_Gateway_CC {
 	 * @param CaptureCardPayment       $capture_card_payment Capture card payment.
 	 * @param string                   $prefix The prefix.
 	 * @param PaymentTokensEndpoint    $payment_tokens_endpoint Payment tokens endpoint.
+	 * @param WooCommercePaymentTokens $wc_payment_tokens WooCommerce payment tokens factory.
 	 * @param LoggerInterface          $logger The logger.
 	 */
 	public function __construct(
@@ -207,6 +216,7 @@ class CreditCardGateway extends \WC_Payment_Gateway_CC {
 		CaptureCardPayment $capture_card_payment,
 		string $prefix,
 		PaymentTokensEndpoint $payment_tokens_endpoint,
+		WooCommercePaymentTokens $wc_payment_tokens,
 		LoggerInterface $logger
 	) {
 		$this->id                          = self::ID;
@@ -226,6 +236,7 @@ class CreditCardGateway extends \WC_Payment_Gateway_CC {
 		$this->capture_card_payment        = $capture_card_payment;
 		$this->prefix                      = $prefix;
 		$this->payment_tokens_endpoint     = $payment_tokens_endpoint;
+		$this->wc_payment_tokens           = $wc_payment_tokens;
 		$this->logger                      = $logger;
 
 		if ( $state->current_state() === State::STATE_ONBOARDED ) {
@@ -436,10 +447,28 @@ class CreditCardGateway extends \WC_Payment_Gateway_CC {
 				$customer_tokens = array();
 			}
 
+			$wc_tokens = WC_Payment_Tokens::get_customer_tokens( get_current_user_id(), PayPalGateway::ID );
+
+			if ( $customer_tokens && empty( $wc_tokens ) ) {
+				foreach ( $customer_tokens as $customer_token ) {
+					if ( $customer_token['payment_source']->name() === 'card' ) {
+						$this->wc_payment_tokens->create_payment_token_card(
+							get_current_user_id(),
+							$customer_token['id']
+						);
+					}
+				}
+			}
+
+			$customer_token_ids = array();
+			foreach ( $customer_tokens as $customer_token ) {
+				$customer_token_ids[] = $customer_token['id'];
+			}
+
 			$tokens = WC_Payment_Tokens::get_customer_tokens( get_current_user_id() );
 			foreach ( $tokens as $token ) {
 				if ( $token->get_id() === (int) $card_payment_token_id ) {
-					if ( ! in_array( $token->get_token(), $customer_tokens, true ) ) {
+					if ( ! in_array( $token->get_token(), $customer_token_ids, true ) ) {
 						$token->delete();
 						continue;
 					}
diff --git a/modules/ppcp-wc-subscriptions/services.php b/modules/ppcp-wc-subscriptions/services.php
index c3f5796f1..c83c0c1a2 100644
--- a/modules/ppcp-wc-subscriptions/services.php
+++ b/modules/ppcp-wc-subscriptions/services.php
@@ -45,7 +45,8 @@ return array(
 			$funding_source_renderer,
 			$container->get( 'wc-subscriptions.helpers.real-time-account-updater' ),
 			$container->get( 'wc-subscriptions.helper' ),
-			$container->get( 'api.endpoint.payment-tokens' )
+			$container->get( 'api.endpoint.payment-tokens' ),
+			$container->get( 'save-payment-methods.wc-payment-tokens' )
 		);
 	},
 	'wc-subscriptions.repository.payment-token'          => static function ( ContainerInterface $container ): PaymentTokenRepository {
diff --git a/modules/ppcp-wc-subscriptions/src/RenewalHandler.php b/modules/ppcp-wc-subscriptions/src/RenewalHandler.php
index 7be01f1b7..61bcb1b7a 100644
--- a/modules/ppcp-wc-subscriptions/src/RenewalHandler.php
+++ b/modules/ppcp-wc-subscriptions/src/RenewalHandler.php
@@ -24,6 +24,7 @@ use WooCommerce\PayPalCommerce\ApiClient\Factory\PayerFactory;
 use WooCommerce\PayPalCommerce\ApiClient\Factory\PurchaseUnitFactory;
 use WooCommerce\PayPalCommerce\ApiClient\Factory\ShippingPreferenceFactory;
 use WooCommerce\PayPalCommerce\Onboarding\Environment;
+use WooCommerce\PayPalCommerce\SavePaymentMethods\WooCommercePaymentTokens;
 use WooCommerce\PayPalCommerce\Vaulting\PaymentTokenApplePay;
 use WooCommerce\PayPalCommerce\Vaulting\PaymentTokenPayPal;
 use WooCommerce\PayPalCommerce\Vaulting\PaymentTokenRepository;
@@ -141,6 +142,13 @@ class RenewalHandler {
 	 */
 	private $payment_tokens_endpoint;
 
+	/**
+	 * WooCommerce payments tokens factory.
+	 *
+	 * @var WooCommercePaymentTokens
+	 */
+	private $wc_payment_tokens;
+
 	/**
 	 * RenewalHandler constructor.
 	 *
@@ -157,6 +165,7 @@ class RenewalHandler {
 	 * @param RealTimeAccountUpdaterHelper $real_time_account_updater_helper Real Time Account Updater helper.
 	 * @param SubscriptionHelper           $subscription_helper Subscription helper.
 	 * @param PaymentTokensEndpoint        $payment_tokens_endpoint Payment tokens endpoint.
+	 * @param WooCommercePaymentTokens     $wc_payment_tokens WooCommerce payments tokens factory.
 	 */
 	public function __construct(
 		LoggerInterface $logger,
@@ -171,7 +180,8 @@ class RenewalHandler {
 		FundingSourceRenderer $funding_source_renderer,
 		RealTimeAccountUpdaterHelper $real_time_account_updater_helper,
 		SubscriptionHelper $subscription_helper,
-		PaymentTokensEndpoint $payment_tokens_endpoint
+		PaymentTokensEndpoint $payment_tokens_endpoint,
+		WooCommercePaymentTokens $wc_payment_tokens
 	) {
 
 		$this->logger                           = $logger;
@@ -187,6 +197,7 @@ class RenewalHandler {
 		$this->real_time_account_updater_helper = $real_time_account_updater_helper;
 		$this->subscription_helper              = $subscription_helper;
 		$this->payment_tokens_endpoint          = $payment_tokens_endpoint;
+		$this->wc_payment_tokens                = $wc_payment_tokens;
 	}
 
 	/**
@@ -259,9 +270,28 @@ class RenewalHandler {
 				$customer_tokens = array();
 			}
 
+			$wc_tokens = WC_Payment_Tokens::get_customer_tokens( $user_id, PayPalGateway::ID );
+
+			if ( $customer_tokens && empty( $wc_tokens ) ) {
+				foreach ( $customer_tokens as $customer_token ) {
+					if ( $customer_token['payment_source']->name() === 'paypal' ) {
+						$this->wc_payment_tokens->create_payment_token_paypal(
+							$user_id,
+							$customer_token['id'],
+							$customer_token['payment_source']->properties()->email_address ?? ''
+						);
+					}
+				}
+			}
+
+			$customer_token_ids = array();
+			foreach ( $customer_tokens as $customer_token ) {
+				$customer_token_ids[] = $customer_token['id'];
+			}
+
 			$wc_tokens = WC_Payment_Tokens::get_customer_tokens( $user_id, PayPalGateway::ID );
 			foreach ( $wc_tokens as $token ) {
-				if ( ! in_array( $token->get_token(), $customer_tokens, true ) ) {
+				if ( ! in_array( $token->get_token(), $customer_token_ids, true ) ) {
 					$token->delete();
 					continue;
 				}
@@ -309,9 +339,27 @@ class RenewalHandler {
 				$customer_tokens = array();
 			}
 
+			$wc_tokens = WC_Payment_Tokens::get_customer_tokens( $user_id, PayPalGateway::ID );
+
+			if ( $customer_tokens && empty( $wc_tokens ) ) {
+				foreach ( $customer_tokens as $customer_token ) {
+					if ( $customer_token['payment_source']->name() === 'card' ) {
+						$this->wc_payment_tokens->create_payment_token_card(
+							get_current_user_id(),
+							$customer_token['id']
+						);
+					}
+				}
+			}
+
+			$customer_token_ids = array();
+			foreach ( $customer_tokens as $customer_token ) {
+				$customer_token_ids[] = $customer_token['id'];
+			}
+
 			$wc_tokens = WC_Payment_Tokens::get_customer_tokens( $wc_order->get_customer_id(), CreditCardGateway::ID );
 			foreach ( $wc_tokens as $token ) {
-				if ( ! in_array( $token->get_token(), $customer_tokens, true ) ) {
+				if ( ! in_array( $token->get_token(), $customer_token_ids, true ) ) {
 					$token->delete();
 				}
 			}

From 5d92a6e7912c2264f96e74e74d0e18e3853879ed Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Thu, 21 Mar 2024 15:48:15 +0100
Subject: [PATCH 058/101] Fix wrong card payment source sent to create wc card
 payment

---
 modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php | 7 ++++++-
 modules/ppcp-wc-subscriptions/src/RenewalHandler.php      | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php b/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php
index 734204090..abee0c304 100644
--- a/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php
+++ b/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php
@@ -454,7 +454,12 @@ class CreditCardGateway extends \WC_Payment_Gateway_CC {
 					if ( $customer_token['payment_source']->name() === 'card' ) {
 						$this->wc_payment_tokens->create_payment_token_card(
 							get_current_user_id(),
-							$customer_token['id']
+							(object) array(
+								'id'             => $customer_token['id'],
+								'payment_source' => (object) array(
+									$customer_token['payment_source']->name() => $customer_token['payment_source']->properties(),
+								),
+							)
 						);
 					}
 				}
diff --git a/modules/ppcp-wc-subscriptions/src/RenewalHandler.php b/modules/ppcp-wc-subscriptions/src/RenewalHandler.php
index 61bcb1b7a..c651d772d 100644
--- a/modules/ppcp-wc-subscriptions/src/RenewalHandler.php
+++ b/modules/ppcp-wc-subscriptions/src/RenewalHandler.php
@@ -346,7 +346,12 @@ class RenewalHandler {
 					if ( $customer_token['payment_source']->name() === 'card' ) {
 						$this->wc_payment_tokens->create_payment_token_card(
 							get_current_user_id(),
-							$customer_token['id']
+							(object) array(
+								'id'             => $customer_token['id'],
+								'payment_source' => (object) array(
+									$customer_token['payment_source']->name() => $customer_token['payment_source']->properties(),
+								),
+							)
 						);
 					}
 				}

From fd9ca3c01159999eb78616a23ae55e728abbfbc2 Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Thu, 21 Mar 2024 16:19:36 +0100
Subject: [PATCH 059/101] Fix wrong user when creating wc card payment token

---
 modules/ppcp-wc-subscriptions/src/RenewalHandler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ppcp-wc-subscriptions/src/RenewalHandler.php b/modules/ppcp-wc-subscriptions/src/RenewalHandler.php
index c651d772d..3c4780e28 100644
--- a/modules/ppcp-wc-subscriptions/src/RenewalHandler.php
+++ b/modules/ppcp-wc-subscriptions/src/RenewalHandler.php
@@ -345,7 +345,7 @@ class RenewalHandler {
 				foreach ( $customer_tokens as $customer_token ) {
 					if ( $customer_token['payment_source']->name() === 'card' ) {
 						$this->wc_payment_tokens->create_payment_token_card(
-							get_current_user_id(),
+							$user_id,
 							(object) array(
 								'id'             => $customer_token['id'],
 								'payment_source' => (object) array(

From 56a6c4ce32435398be776b5286531d0a004f666e Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Thu, 21 Mar 2024 16:32:35 +0100
Subject: [PATCH 060/101] Fix wrong user when creating wc card payment token

---
 .../src/WooCommercePaymentTokens.php                        | 2 +-
 modules/ppcp-wc-subscriptions/src/RenewalHandler.php        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/ppcp-save-payment-methods/src/WooCommercePaymentTokens.php b/modules/ppcp-save-payment-methods/src/WooCommercePaymentTokens.php
index ac687eeea..e1ea05947 100644
--- a/modules/ppcp-save-payment-methods/src/WooCommercePaymentTokens.php
+++ b/modules/ppcp-save-payment-methods/src/WooCommercePaymentTokens.php
@@ -223,7 +223,7 @@ class WooCommercePaymentTokens {
 
 		$token = new WC_Payment_Token_CC();
 		$token->set_token( $payment_token->id );
-		$token->set_user_id( get_current_user_id() );
+		$token->set_user_id( $customer_id );
 		$token->set_gateway_id( CreditCardGateway::ID );
 
 		$token->set_last4( $payment_token->payment_source->card->last_digits ?? '' );
diff --git a/modules/ppcp-wc-subscriptions/src/RenewalHandler.php b/modules/ppcp-wc-subscriptions/src/RenewalHandler.php
index 3c4780e28..fd838e6b7 100644
--- a/modules/ppcp-wc-subscriptions/src/RenewalHandler.php
+++ b/modules/ppcp-wc-subscriptions/src/RenewalHandler.php
@@ -362,14 +362,14 @@ class RenewalHandler {
 				$customer_token_ids[] = $customer_token['id'];
 			}
 
-			$wc_tokens = WC_Payment_Tokens::get_customer_tokens( $wc_order->get_customer_id(), CreditCardGateway::ID );
+			$wc_tokens = WC_Payment_Tokens::get_customer_tokens( $user_id, CreditCardGateway::ID );
 			foreach ( $wc_tokens as $token ) {
 				if ( ! in_array( $token->get_token(), $customer_token_ids, true ) ) {
 					$token->delete();
 				}
 			}
 
-			$wc_tokens  = WC_Payment_Tokens::get_customer_tokens( $wc_order->get_customer_id(), CreditCardGateway::ID );
+			$wc_tokens  = WC_Payment_Tokens::get_customer_tokens( $user_id, CreditCardGateway::ID );
 			$last_token = end( $wc_tokens );
 			if ( $last_token ) {
 				$payment_source = $this->card_payment_source( $last_token->get_token(), $wc_order );
@@ -394,7 +394,7 @@ class RenewalHandler {
 			if ( $wc_order->get_payment_method() === CreditCardGateway::ID ) {
 				$card_payment_source = $order->payment_source();
 				if ( $card_payment_source ) {
-					$wc_tokens   = WC_Payment_Tokens::get_customer_tokens( $wc_order->get_customer_id(), CreditCardGateway::ID );
+					$wc_tokens   = WC_Payment_Tokens::get_customer_tokens( $user_id, CreditCardGateway::ID );
 					$last_token  = end( $wc_tokens );
 					$expiry      = $card_payment_source->properties()->expiry ?? '';
 					$last_digits = $card_payment_source->properties()->last_digits ?? '';

From 93514a798a67b1d5c15c66cd118bf842b62dd506 Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Thu, 21 Mar 2024 16:49:03 +0100
Subject: [PATCH 061/101] Ensure no wc payment token is created if user id does
 not exist

---
 .../src/WooCommercePaymentTokens.php                 | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/modules/ppcp-save-payment-methods/src/WooCommercePaymentTokens.php b/modules/ppcp-save-payment-methods/src/WooCommercePaymentTokens.php
index e1ea05947..b875eb323 100644
--- a/modules/ppcp-save-payment-methods/src/WooCommercePaymentTokens.php
+++ b/modules/ppcp-save-payment-methods/src/WooCommercePaymentTokens.php
@@ -132,6 +132,10 @@ class WooCommercePaymentTokens {
 		string $email
 	): int {
 
+		if ( $customer_id === 0 ) {
+			return 0;
+		}
+
 		$wc_tokens = WC_Payment_Tokens::get_customer_tokens( $customer_id, PayPalGateway::ID );
 		if ( $this->payment_token_helper->token_exist( $wc_tokens, $token, PaymentTokenVenmo::class ) ) {
 			return 0;
@@ -178,6 +182,10 @@ class WooCommercePaymentTokens {
 		string $token
 	): int {
 
+		if ( $customer_id === 0 ) {
+			return 0;
+		}
+
 		$wc_tokens = WC_Payment_Tokens::get_customer_tokens( $customer_id, PayPalGateway::ID );
 		if ( $this->payment_token_helper->token_exist( $wc_tokens, $token, PaymentTokenApplePay::class ) ) {
 			return 0;
@@ -216,6 +224,10 @@ class WooCommercePaymentTokens {
 	 * @return int
 	 */
 	public function create_payment_token_card( int $customer_id, stdClass $payment_token ): int {
+		if ( $customer_id === 0 ) {
+			return 0;
+		}
+
 		$wc_tokens = WC_Payment_Tokens::get_customer_tokens( $customer_id, CreditCardGateway::ID );
 		if ( $this->payment_token_helper->token_exist( $wc_tokens, $payment_token->id ) ) {
 			return 0;

From 04be31b06581cde983d2579abfda528b968a402e Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Fri, 22 Mar 2024 11:04:32 +0100
Subject: [PATCH 062/101] Fix wrong payment method when getting wc payment
 tokens for card payment

---
 modules/ppcp-wc-subscriptions/src/RenewalHandler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ppcp-wc-subscriptions/src/RenewalHandler.php b/modules/ppcp-wc-subscriptions/src/RenewalHandler.php
index fd838e6b7..dd7252930 100644
--- a/modules/ppcp-wc-subscriptions/src/RenewalHandler.php
+++ b/modules/ppcp-wc-subscriptions/src/RenewalHandler.php
@@ -339,7 +339,7 @@ class RenewalHandler {
 				$customer_tokens = array();
 			}
 
-			$wc_tokens = WC_Payment_Tokens::get_customer_tokens( $user_id, PayPalGateway::ID );
+			$wc_tokens = WC_Payment_Tokens::get_customer_tokens( $user_id, CreditCardGateway::ID );
 
 			if ( $customer_tokens && empty( $wc_tokens ) ) {
 				foreach ( $customer_tokens as $customer_token ) {

From 87b2aea2107974f1c6b08e1f5d2e75db7cfa3ed6 Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Fri, 22 Mar 2024 11:55:44 +0100
Subject: [PATCH 063/101] Refactor

---
 .../ppcp-save-payment-methods/services.php    |  9 +--
 .../src/Endpoint/CreatePaymentToken.php       |  4 +-
 .../src/SavePaymentMethodsModule.php          |  3 +-
 modules/ppcp-vaulting/services.php            |  7 +++
 .../src/WooCommercePaymentTokens.php          | 59 +++++++++++++++++--
 modules/ppcp-wc-gateway/services.php          |  2 +-
 .../src/Gateway/CreditCardGateway.php         | 29 ++-------
 modules/ppcp-wc-subscriptions/services.php    |  2 +-
 .../src/RenewalHandler.php                    | 53 +++--------------
 9 files changed, 77 insertions(+), 91 deletions(-)
 rename modules/{ppcp-save-payment-methods => ppcp-vaulting}/src/WooCommercePaymentTokens.php (80%)

diff --git a/modules/ppcp-save-payment-methods/services.php b/modules/ppcp-save-payment-methods/services.php
index b00d6e0ef..2453235c8 100644
--- a/modules/ppcp-save-payment-methods/services.php
+++ b/modules/ppcp-save-payment-methods/services.php
@@ -804,18 +804,11 @@ return array(
 			$container->get( 'api.endpoint.payment-method-tokens' )
 		);
 	},
-	'save-payment-methods.wc-payment-tokens'             => static function( ContainerInterface $container ): WooCommercePaymentTokens {
-		return new WooCommercePaymentTokens(
-			$container->get( 'vaulting.payment-token-helper' ),
-			$container->get( 'vaulting.payment-token-factory' ),
-			$container->get( 'woocommerce.logger.woocommerce' )
-		);
-	},
 	'save-payment-methods.endpoint.create-payment-token' => static function ( ContainerInterface $container ): CreatePaymentToken {
 		return new CreatePaymentToken(
 			$container->get( 'button.request-data' ),
 			$container->get( 'api.endpoint.payment-method-tokens' ),
-			$container->get( 'save-payment-methods.wc-payment-tokens' )
+			$container->get( 'vaulting.wc-payment-tokens' )
 		);
 	},
 );
diff --git a/modules/ppcp-save-payment-methods/src/Endpoint/CreatePaymentToken.php b/modules/ppcp-save-payment-methods/src/Endpoint/CreatePaymentToken.php
index 3a4807ec2..ca4839372 100644
--- a/modules/ppcp-save-payment-methods/src/Endpoint/CreatePaymentToken.php
+++ b/modules/ppcp-save-payment-methods/src/Endpoint/CreatePaymentToken.php
@@ -14,9 +14,7 @@ use WooCommerce\PayPalCommerce\ApiClient\Endpoint\PaymentMethodTokensEndpoint;
 use WooCommerce\PayPalCommerce\ApiClient\Entity\PaymentSource;
 use WooCommerce\PayPalCommerce\Button\Endpoint\EndpointInterface;
 use WooCommerce\PayPalCommerce\Button\Endpoint\RequestData;
-use WooCommerce\PayPalCommerce\SavePaymentMethods\WooCommercePaymentTokens;
-use WooCommerce\PayPalCommerce\WcGateway\Gateway\CreditCardGateway;
-use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayPalGateway;
+use WooCommerce\PayPalCommerce\Vaulting\WooCommercePaymentTokens;
 
 /**
  * Class CreatePaymentToken
diff --git a/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php b/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php
index 73a7c5916..59010f6ca 100644
--- a/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php
+++ b/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php
@@ -21,6 +21,7 @@ use WooCommerce\PayPalCommerce\ApiClient\Exception\RuntimeException;
 use WooCommerce\PayPalCommerce\Button\Helper\ContextTrait;
 use WooCommerce\PayPalCommerce\SavePaymentMethods\Endpoint\CreatePaymentToken;
 use WooCommerce\PayPalCommerce\SavePaymentMethods\Endpoint\CreateSetupToken;
+use WooCommerce\PayPalCommerce\Vaulting\WooCommercePaymentTokens;
 use WooCommerce\PayPalCommerce\Vendor\Dhii\Container\ServiceProvider;
 use WooCommerce\PayPalCommerce\Vendor\Dhii\Modular\Module\ModuleInterface;
 use WooCommerce\PayPalCommerce\Vendor\Interop\Container\ServiceProviderInterface;
@@ -196,7 +197,7 @@ class SavePaymentMethodsModule implements ModuleInterface {
 
 					update_user_meta( $wc_order->get_customer_id(), '_ppcp_target_customer_id', $customer_id );
 
-					$wc_payment_tokens = $c->get( 'save-payment-methods.wc-payment-tokens' );
+					$wc_payment_tokens = $c->get( 'vaulting.wc-payment-tokens' );
 					assert( $wc_payment_tokens instanceof WooCommercePaymentTokens );
 
 					if ( $wc_order->get_payment_method() === CreditCardGateway::ID ) {
diff --git a/modules/ppcp-vaulting/services.php b/modules/ppcp-vaulting/services.php
index 44d042a7e..fe003c0e6 100644
--- a/modules/ppcp-vaulting/services.php
+++ b/modules/ppcp-vaulting/services.php
@@ -56,4 +56,11 @@ return array(
 			$container->get( 'woocommerce.logger.woocommerce' )
 		);
 	},
+	'vaulting.wc-payment-tokens'          => static function( ContainerInterface $container ): WooCommercePaymentTokens {
+		return new WooCommercePaymentTokens(
+			$container->get( 'vaulting.payment-token-helper' ),
+			$container->get( 'vaulting.payment-token-factory' ),
+			$container->get( 'woocommerce.logger.woocommerce' )
+		);
+	},
 );
diff --git a/modules/ppcp-save-payment-methods/src/WooCommercePaymentTokens.php b/modules/ppcp-vaulting/src/WooCommercePaymentTokens.php
similarity index 80%
rename from modules/ppcp-save-payment-methods/src/WooCommercePaymentTokens.php
rename to modules/ppcp-vaulting/src/WooCommercePaymentTokens.php
index b875eb323..6f08c2810 100644
--- a/modules/ppcp-save-payment-methods/src/WooCommercePaymentTokens.php
+++ b/modules/ppcp-vaulting/src/WooCommercePaymentTokens.php
@@ -7,18 +7,14 @@
 
 declare(strict_types=1);
 
-namespace WooCommerce\PayPalCommerce\SavePaymentMethods;
+namespace WooCommerce\PayPalCommerce\Vaulting;
 
 use Exception;
 use Psr\Log\LoggerInterface;
 use stdClass;
 use WC_Payment_Token_CC;
 use WC_Payment_Tokens;
-use WooCommerce\PayPalCommerce\Vaulting\PaymentTokenApplePay;
-use WooCommerce\PayPalCommerce\Vaulting\PaymentTokenFactory;
-use WooCommerce\PayPalCommerce\Vaulting\PaymentTokenHelper;
-use WooCommerce\PayPalCommerce\Vaulting\PaymentTokenPayPal;
-use WooCommerce\PayPalCommerce\Vaulting\PaymentTokenVenmo;
+use WooCommerce\PayPalCommerce\ApiClient\Exception\RuntimeException;
 use WooCommerce\PayPalCommerce\WcGateway\Gateway\CreditCardGateway;
 use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayPalGateway;
 
@@ -259,4 +255,55 @@ class WooCommercePaymentTokens {
 		$token->save();
 		return $token->get_id();
 	}
+	/**
+	 * Returns PayPal payment tokens for the given WP user id.
+	 *
+	 * @param int $user_id WP user id.
+	 * @return array
+	 */
+	public function customer_tokens( int $user_id ): array {
+		$customer_id = get_user_meta( $user_id, '_ppcp_target_customer_id', true );
+		if ( ! $customer_id ) {
+			$customer_id = get_user_meta( $user_id, 'ppcp_customer_id', true );
+		}
+
+		try {
+			$customer_tokens = $this->payment_tokens_endpoint->payment_tokens_for_customer( $customer_id );
+		} catch ( RuntimeException $exception ) {
+			$customer_tokens = array();
+		}
+
+		return $customer_tokens;
+	}
+
+	/**
+	 * Creates WC payment tokens for the given WP user id using PayPal payment tokens as source.
+	 *
+	 * @param array $customer_tokens PayPal customer payment tokens.
+	 * @param int   $user_id WP user id.
+	 * @return void
+	 */
+	public function create_wc_tokens( array $customer_tokens, int $user_id ): void {
+		foreach ( $customer_tokens as $customer_token ) {
+			if ( $customer_token['payment_source']->name() === 'paypal' ) {
+				$this->create_payment_token_paypal(
+					$user_id,
+					$customer_token['id'],
+					$customer_token['payment_source']->properties()->email_address ?? ''
+				);
+			}
+
+			if ( $customer_token['payment_source']->name() === 'card' ) {
+				$this->create_payment_token_card(
+					$user_id,
+					(object) array(
+						'id'             => $customer_token['id'],
+						'payment_source' => (object) array(
+							$customer_token['payment_source']->name() => $customer_token['payment_source']->properties(),
+						),
+					)
+				);
+			}
+		}
+	}
 }
diff --git a/modules/ppcp-wc-gateway/services.php b/modules/ppcp-wc-gateway/services.php
index a90feb16b..822115d54 100644
--- a/modules/ppcp-wc-gateway/services.php
+++ b/modules/ppcp-wc-gateway/services.php
@@ -136,7 +136,7 @@ return array(
 			$container->get( 'wcgateway.endpoint.capture-card-payment' ),
 			$container->get( 'api.prefix' ),
 			$container->get( 'api.endpoint.payment-tokens' ),
-			$container->get( 'save-payment-methods.wc-payment-tokens' ),
+			$container->get( 'vaulting.wc-payment-tokens' ),
 			$logger
 		);
 	},
diff --git a/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php b/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php
index 848f1aba0..4032869d1 100644
--- a/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php
+++ b/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php
@@ -20,10 +20,10 @@ use WooCommerce\PayPalCommerce\ApiClient\Exception\PayPalApiException;
 use WooCommerce\PayPalCommerce\ApiClient\Exception\RuntimeException;
 use WooCommerce\PayPalCommerce\Onboarding\Environment;
 use WooCommerce\PayPalCommerce\Onboarding\State;
-use WooCommerce\PayPalCommerce\SavePaymentMethods\WooCommercePaymentTokens;
 use WooCommerce\PayPalCommerce\Session\SessionHandler;
 use WooCommerce\PayPalCommerce\Vaulting\PaymentTokenRepository;
 use WooCommerce\PayPalCommerce\Vaulting\VaultedCreditCardHandler;
+use WooCommerce\PayPalCommerce\Vaulting\WooCommercePaymentTokens;
 use WooCommerce\PayPalCommerce\Vendor\Psr\Container\ContainerInterface;
 use WooCommerce\PayPalCommerce\WcGateway\Endpoint\CaptureCardPayment;
 use WooCommerce\PayPalCommerce\WcGateway\Exception\GatewayGenericException;
@@ -455,33 +455,12 @@ class CreditCardGateway extends \WC_Payment_Gateway_CC {
 		// phpcs:ignore WordPress.Security.NonceVerification.Missing
 		$card_payment_token_id = wc_clean( wp_unslash( $_POST['wc-ppcp-credit-card-gateway-payment-token'] ?? '' ) );
 		if ( $card_payment_token_id ) {
-			$customer_id = get_user_meta( get_current_user_id(), '_ppcp_target_customer_id', true );
-			if ( ! $customer_id ) {
-				$customer_id = get_user_meta( get_current_user_id(), 'ppcp_customer_id', true );
-			}
+			$customer_tokens = $this->wc_payment_tokens->customer_tokens( get_current_user_id() );
 
-			try {
-				$customer_tokens = $this->payment_tokens_endpoint->payment_tokens_for_customer( $customer_id );
-			} catch ( RuntimeException $exception ) {
-				$customer_tokens = array();
-			}
-
-			$wc_tokens = WC_Payment_Tokens::get_customer_tokens( get_current_user_id(), PayPalGateway::ID );
+			$wc_tokens = WC_Payment_Tokens::get_customer_tokens( get_current_user_id(), self::ID );
 
 			if ( $customer_tokens && empty( $wc_tokens ) ) {
-				foreach ( $customer_tokens as $customer_token ) {
-					if ( $customer_token['payment_source']->name() === 'card' ) {
-						$this->wc_payment_tokens->create_payment_token_card(
-							get_current_user_id(),
-							(object) array(
-								'id'             => $customer_token['id'],
-								'payment_source' => (object) array(
-									$customer_token['payment_source']->name() => $customer_token['payment_source']->properties(),
-								),
-							)
-						);
-					}
-				}
+				$this->wc_payment_tokens->create_wc_tokens( $customer_tokens, get_current_user_id() );
 			}
 
 			$customer_token_ids = array();
diff --git a/modules/ppcp-wc-subscriptions/services.php b/modules/ppcp-wc-subscriptions/services.php
index c83c0c1a2..dc23fca9f 100644
--- a/modules/ppcp-wc-subscriptions/services.php
+++ b/modules/ppcp-wc-subscriptions/services.php
@@ -46,7 +46,7 @@ return array(
 			$container->get( 'wc-subscriptions.helpers.real-time-account-updater' ),
 			$container->get( 'wc-subscriptions.helper' ),
 			$container->get( 'api.endpoint.payment-tokens' ),
-			$container->get( 'save-payment-methods.wc-payment-tokens' )
+			$container->get( 'vaulting.wc-payment-tokens' )
 		);
 	},
 	'wc-subscriptions.repository.payment-token'          => static function ( ContainerInterface $container ): PaymentTokenRepository {
diff --git a/modules/ppcp-wc-subscriptions/src/RenewalHandler.php b/modules/ppcp-wc-subscriptions/src/RenewalHandler.php
index dd7252930..695bce551 100644
--- a/modules/ppcp-wc-subscriptions/src/RenewalHandler.php
+++ b/modules/ppcp-wc-subscriptions/src/RenewalHandler.php
@@ -9,9 +9,10 @@ declare(strict_types=1);
 
 namespace WooCommerce\PayPalCommerce\WcSubscriptions;
 
+use Psr\Log\LoggerInterface;
 use WC_Order;
-use WC_Subscription;
 use WC_Payment_Tokens;
+use WC_Subscription;
 use WooCommerce\PayPalCommerce\ApiClient\Endpoint\OrderEndpoint;
 use WooCommerce\PayPalCommerce\ApiClient\Endpoint\PaymentTokensEndpoint;
 use WooCommerce\PayPalCommerce\ApiClient\Entity\ApplicationContext;
@@ -19,17 +20,15 @@ use WooCommerce\PayPalCommerce\ApiClient\Entity\Order;
 use WooCommerce\PayPalCommerce\ApiClient\Entity\PaymentSource;
 use WooCommerce\PayPalCommerce\ApiClient\Entity\PaymentToken;
 use WooCommerce\PayPalCommerce\ApiClient\Exception\PayPalApiException;
-use WooCommerce\PayPalCommerce\ApiClient\Exception\RuntimeException;
 use WooCommerce\PayPalCommerce\ApiClient\Factory\PayerFactory;
 use WooCommerce\PayPalCommerce\ApiClient\Factory\PurchaseUnitFactory;
 use WooCommerce\PayPalCommerce\ApiClient\Factory\ShippingPreferenceFactory;
 use WooCommerce\PayPalCommerce\Onboarding\Environment;
-use WooCommerce\PayPalCommerce\SavePaymentMethods\WooCommercePaymentTokens;
 use WooCommerce\PayPalCommerce\Vaulting\PaymentTokenApplePay;
 use WooCommerce\PayPalCommerce\Vaulting\PaymentTokenPayPal;
 use WooCommerce\PayPalCommerce\Vaulting\PaymentTokenRepository;
-use Psr\Log\LoggerInterface;
 use WooCommerce\PayPalCommerce\Vaulting\PaymentTokenVenmo;
+use WooCommerce\PayPalCommerce\Vaulting\WooCommercePaymentTokens;
 use WooCommerce\PayPalCommerce\WcGateway\Exception\NotFoundException;
 use WooCommerce\PayPalCommerce\WcGateway\FundingSource\FundingSourceRenderer;
 use WooCommerce\PayPalCommerce\WcGateway\Gateway\CreditCardGateway;
@@ -259,29 +258,12 @@ class RenewalHandler {
 		// Vault v3.
 		$payment_source = null;
 		if ( $wc_order->get_payment_method() === PayPalGateway::ID ) {
-			$customer_id = get_user_meta( $user_id, '_ppcp_target_customer_id', true );
-			if ( ! $customer_id ) {
-				$customer_id = get_user_meta( $user_id, 'ppcp_customer_id', true );
-			}
-
-			try {
-				$customer_tokens = $this->payment_tokens_endpoint->payment_tokens_for_customer( $customer_id );
-			} catch ( RuntimeException $exception ) {
-				$customer_tokens = array();
-			}
+			$customer_tokens = $this->wc_payment_tokens->customer_tokens( $user_id );
 
 			$wc_tokens = WC_Payment_Tokens::get_customer_tokens( $user_id, PayPalGateway::ID );
 
 			if ( $customer_tokens && empty( $wc_tokens ) ) {
-				foreach ( $customer_tokens as $customer_token ) {
-					if ( $customer_token['payment_source']->name() === 'paypal' ) {
-						$this->wc_payment_tokens->create_payment_token_paypal(
-							$user_id,
-							$customer_token['id'],
-							$customer_token['payment_source']->properties()->email_address ?? ''
-						);
-					}
-				}
+				$this->wc_payment_tokens->create_wc_tokens( $customer_tokens, $user_id );
 			}
 
 			$customer_token_ids = array();
@@ -328,33 +310,12 @@ class RenewalHandler {
 		}
 
 		if ( $wc_order->get_payment_method() === CreditCardGateway::ID ) {
-			$customer_id = get_user_meta( $user_id, '_ppcp_target_customer_id', true );
-			if ( ! $customer_id ) {
-				$customer_id = get_user_meta( $user_id, 'ppcp_customer_id', true );
-			}
-
-			try {
-				$customer_tokens = $this->payment_tokens_endpoint->payment_tokens_for_customer( $customer_id );
-			} catch ( RuntimeException $exception ) {
-				$customer_tokens = array();
-			}
+			$customer_tokens = $this->wc_payment_tokens->customer_tokens( $user_id );
 
 			$wc_tokens = WC_Payment_Tokens::get_customer_tokens( $user_id, CreditCardGateway::ID );
 
 			if ( $customer_tokens && empty( $wc_tokens ) ) {
-				foreach ( $customer_tokens as $customer_token ) {
-					if ( $customer_token['payment_source']->name() === 'card' ) {
-						$this->wc_payment_tokens->create_payment_token_card(
-							$user_id,
-							(object) array(
-								'id'             => $customer_token['id'],
-								'payment_source' => (object) array(
-									$customer_token['payment_source']->name() => $customer_token['payment_source']->properties(),
-								),
-							)
-						);
-					}
-				}
+				$this->wc_payment_tokens->create_wc_tokens( $customer_tokens, $user_id );
 			}
 
 			$customer_token_ids = array();

From 831275b8fcee21afd165c0f743094c5683a1a46d Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Fri, 22 Mar 2024 12:32:36 +0100
Subject: [PATCH 064/101] Add missing dependency payment tokens endpoint into
 wc payment tokens

---
 modules/ppcp-vaulting/services.php            |  1 +
 .../src/WooCommercePaymentTokens.php          | 24 ++++++++++++++-----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/modules/ppcp-vaulting/services.php b/modules/ppcp-vaulting/services.php
index fe003c0e6..7d3c5e485 100644
--- a/modules/ppcp-vaulting/services.php
+++ b/modules/ppcp-vaulting/services.php
@@ -60,6 +60,7 @@ return array(
 		return new WooCommercePaymentTokens(
 			$container->get( 'vaulting.payment-token-helper' ),
 			$container->get( 'vaulting.payment-token-factory' ),
+			$container->get( 'api.endpoint.payment-tokens' ),
 			$container->get( 'woocommerce.logger.woocommerce' )
 		);
 	},
diff --git a/modules/ppcp-vaulting/src/WooCommercePaymentTokens.php b/modules/ppcp-vaulting/src/WooCommercePaymentTokens.php
index 6f08c2810..d5cb96ecb 100644
--- a/modules/ppcp-vaulting/src/WooCommercePaymentTokens.php
+++ b/modules/ppcp-vaulting/src/WooCommercePaymentTokens.php
@@ -14,6 +14,7 @@ use Psr\Log\LoggerInterface;
 use stdClass;
 use WC_Payment_Token_CC;
 use WC_Payment_Tokens;
+use WooCommerce\PayPalCommerce\ApiClient\Endpoint\PaymentTokensEndpoint;
 use WooCommerce\PayPalCommerce\ApiClient\Exception\RuntimeException;
 use WooCommerce\PayPalCommerce\WcGateway\Gateway\CreditCardGateway;
 use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayPalGateway;
@@ -37,6 +38,13 @@ class WooCommercePaymentTokens {
 	 */
 	private $payment_token_factory;
 
+	/**
+	 * Payment tokens endpoint.
+	 *
+	 * @var PaymentTokensEndpoint
+	 */
+	private $payment_tokens_endpoint;
+
 	/**
 	 * The logger.
 	 *
@@ -47,18 +55,21 @@ class WooCommercePaymentTokens {
 	/**
 	 * WooCommercePaymentTokens constructor.
 	 *
-	 * @param PaymentTokenHelper  $payment_token_helper The payment token helper.
-	 * @param PaymentTokenFactory $payment_token_factory The payment token factory.
-	 * @param LoggerInterface     $logger The logger.
+	 * @param PaymentTokenHelper    $payment_token_helper The payment token helper.
+	 * @param PaymentTokenFactory   $payment_token_factory The payment token factory.
+	 * @param PaymentTokensEndpoint $payment_tokens_endpoint Payment tokens endpoint.
+	 * @param LoggerInterface       $logger The logger.
 	 */
 	public function __construct(
 		PaymentTokenHelper $payment_token_helper,
 		PaymentTokenFactory $payment_token_factory,
+		PaymentTokensEndpoint $payment_tokens_endpoint,
 		LoggerInterface $logger
 	) {
-		$this->payment_token_helper  = $payment_token_helper;
-		$this->payment_token_factory = $payment_token_factory;
-		$this->logger                = $logger;
+		$this->payment_token_helper    = $payment_token_helper;
+		$this->payment_token_factory   = $payment_token_factory;
+		$this->payment_tokens_endpoint = $payment_tokens_endpoint;
+		$this->logger                  = $logger;
 	}
 
 	/**
@@ -255,6 +266,7 @@ class WooCommercePaymentTokens {
 		$token->save();
 		return $token->get_id();
 	}
+
 	/**
 	 * Returns PayPal payment tokens for the given WP user id.
 	 *

From 9d6fc84c03cb6d3b0bb67c5892721f0534293ca9 Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Fri, 22 Mar 2024 13:00:27 +0100
Subject: [PATCH 065/101] Fix phpunit

---
 tests/PHPUnit/WcGateway/Gateway/CreditCardGatewayTest.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/PHPUnit/WcGateway/Gateway/CreditCardGatewayTest.php b/tests/PHPUnit/WcGateway/Gateway/CreditCardGatewayTest.php
index 0f529a04e..60b86a643 100644
--- a/tests/PHPUnit/WcGateway/Gateway/CreditCardGatewayTest.php
+++ b/tests/PHPUnit/WcGateway/Gateway/CreditCardGatewayTest.php
@@ -8,11 +8,13 @@ use Psr\Log\LoggerInterface;
 use WC_Order;
 use WooCommerce\PayPalCommerce\ApiClient\Endpoint\OrderEndpoint;
 use WooCommerce\PayPalCommerce\ApiClient\Endpoint\PaymentsEndpoint;
+use WooCommerce\PayPalCommerce\ApiClient\Endpoint\PaymentTokensEndpoint;
 use WooCommerce\PayPalCommerce\Onboarding\Environment;
 use WooCommerce\PayPalCommerce\Onboarding\State;
 use WooCommerce\PayPalCommerce\Session\SessionHandler;
 use WooCommerce\PayPalCommerce\TestCase;
 use WooCommerce\PayPalCommerce\Vaulting\VaultedCreditCardHandler;
+use WooCommerce\PayPalCommerce\Vaulting\WooCommercePaymentTokens;
 use WooCommerce\PayPalCommerce\Vendor\Psr\Container\ContainerInterface;
 use WooCommerce\PayPalCommerce\WcGateway\Endpoint\CaptureCardPayment;
 use WooCommerce\PayPalCommerce\WcGateway\Processor\OrderProcessor;
@@ -34,6 +36,8 @@ class CreditCardGatewayTest extends TestCase
 	private $subscriptionHelper;
 	private $captureCardPayment;
 	private $prefix;
+	private $paymentTokensEndpoint;
+	private $wcPaymentTokens;
 	private $logger;
 	private $paymentsEndpoint;
 	private $vaultedCreditCardHandler;
@@ -56,6 +60,8 @@ class CreditCardGatewayTest extends TestCase
 		$this->subscriptionHelper = Mockery::mock(SubscriptionHelper::class);
 		$this->captureCardPayment = Mockery::mock(CaptureCardPayment::class);
 		$this->prefix = 'some-prefix';
+		$this->paymentTokensEndpoint = Mockery::mock(PaymentTokensEndpoint::class);
+		$this->wcPaymentTokens = Mockery::mock(WooCommercePaymentTokens::class);
 		$this->logger = Mockery::mock(LoggerInterface::class);
 		$this->paymentsEndpoint = Mockery::mock(PaymentsEndpoint::class);
 		$this->vaultedCreditCardHandler = Mockery::mock(VaultedCreditCardHandler::class);
@@ -84,6 +90,8 @@ class CreditCardGatewayTest extends TestCase
 			$this->orderEndpoint,
 			$this->captureCardPayment,
 			$this->prefix,
+			$this->paymentTokensEndpoint,
+			$this->wcPaymentTokens,
 			$this->logger
 		);
 	}

From 342b62326af8707f63489b7574a36cb47ea5899f Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Fri, 22 Mar 2024 15:08:38 +0100
Subject: [PATCH 066/101] Fix psalm

---
 modules/ppcp-vaulting/src/WooCommercePaymentTokens.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/ppcp-vaulting/src/WooCommercePaymentTokens.php b/modules/ppcp-vaulting/src/WooCommercePaymentTokens.php
index d5cb96ecb..9136f7d85 100644
--- a/modules/ppcp-vaulting/src/WooCommercePaymentTokens.php
+++ b/modules/ppcp-vaulting/src/WooCommercePaymentTokens.php
@@ -306,6 +306,11 @@ class WooCommercePaymentTokens {
 			}
 
 			if ( $customer_token['payment_source']->name() === 'card' ) {
+				/**
+				 * Suppress ArgumentTypeCoercion
+				 *
+				 * @psalm-suppress ArgumentTypeCoercion
+				 */
 				$this->create_payment_token_card(
 					$user_id,
 					(object) array(

From fdca5c56a53569cf85c6d79c2978b736c2411387 Mon Sep 17 00:00:00 2001
From: Pedro Silva <p.silva@inpsyde.com>
Date: Mon, 25 Mar 2024 15:45:12 +0000
Subject: [PATCH 067/101] Adjustments funding source naming

---
 modules/ppcp-button/src/Assets/SmartButton.php         | 10 +++++++++-
 modules/ppcp-wc-gateway/services.php                   |  4 +++-
 .../src/FundingSource/FundingSourceRenderer.php        |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/modules/ppcp-button/src/Assets/SmartButton.php b/modules/ppcp-button/src/Assets/SmartButton.php
index 12e7abfbd..e0e40a798 100644
--- a/modules/ppcp-button/src/Assets/SmartButton.php
+++ b/modules/ppcp-button/src/Assets/SmartButton.php
@@ -1318,7 +1318,7 @@ document.querySelector("#payment").before(document.querySelector("#ppcp-messages
 				$disable_funding,
 				array_diff(
 					array_keys( $this->all_funding_sources ),
-					array( 'venmo', 'paylater' )
+					array( 'venmo', 'paylater', 'paypal' )
 				)
 			);
 		}
@@ -1339,6 +1339,14 @@ document.querySelector("#payment").before(document.querySelector("#ppcp-messages
 			$disable_funding[] = 'paylater';
 		}
 
+		// Make sure paypal is not sent in disable funding.
+		$disable_funding = array_filter(
+			$disable_funding,
+			function( $value ) {
+				return $value !== 'paypal';
+			}
+		);
+
 		if ( count( $disable_funding ) > 0 ) {
 			$params['disable-funding'] = implode( ',', array_unique( $disable_funding ) );
 		}
diff --git a/modules/ppcp-wc-gateway/services.php b/modules/ppcp-wc-gateway/services.php
index 7aa018633..ae6d77ad0 100644
--- a/modules/ppcp-wc-gateway/services.php
+++ b/modules/ppcp-wc-gateway/services.php
@@ -962,7 +962,8 @@ return array(
 			'sofort'     => _x( 'Sofort', 'Name of payment method', 'woocommerce-paypal-payments' ),
 			'venmo'      => _x( 'Venmo', 'Name of payment method', 'woocommerce-paypal-payments' ),
 			'trustly'    => _x( 'Trustly', 'Name of payment method', 'woocommerce-paypal-payments' ),
-			'paylater'   => _x( 'Pay Later', 'Name of payment method', 'woocommerce-paypal-payments' ),
+			'paylater'   => _x( 'PayPal Pay Later', 'Name of payment method', 'woocommerce-paypal-payments' ),
+			'paypal'     => _x( 'PayPal', 'Name of payment method', 'woocommerce-paypal-payments' ),
 		);
 	},
 
@@ -985,6 +986,7 @@ return array(
 			array_flip(
 				array(
 					'paylater',
+					'paypal',
 				)
 			)
 		);
diff --git a/modules/ppcp-wc-gateway/src/FundingSource/FundingSourceRenderer.php b/modules/ppcp-wc-gateway/src/FundingSource/FundingSourceRenderer.php
index 071410615..6d66f9700 100644
--- a/modules/ppcp-wc-gateway/src/FundingSource/FundingSourceRenderer.php
+++ b/modules/ppcp-wc-gateway/src/FundingSource/FundingSourceRenderer.php
@@ -34,7 +34,7 @@ class FundingSourceRenderer {
 	 *
 	 * @var string[]
 	 */
-	protected $own_funding_sources = array( 'venmo', 'paylater' );
+	protected $own_funding_sources = array( 'venmo', 'paylater', 'paypal' );
 
 	/**
 	 * FundingSourceRenderer constructor.

From eec344f35d5cbca47ca0d9e69db39884584fe729 Mon Sep 17 00:00:00 2001
From: Pedro Silva <p.silva@inpsyde.com>
Date: Mon, 25 Mar 2024 16:08:49 +0000
Subject: [PATCH 068/101] Fix lint

---
 modules/ppcp-button/src/Assets/SmartButton.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/modules/ppcp-button/src/Assets/SmartButton.php b/modules/ppcp-button/src/Assets/SmartButton.php
index e0e40a798..c33bdcf47 100644
--- a/modules/ppcp-button/src/Assets/SmartButton.php
+++ b/modules/ppcp-button/src/Assets/SmartButton.php
@@ -1339,11 +1339,17 @@ document.querySelector("#payment").before(document.querySelector("#ppcp-messages
 			$disable_funding[] = 'paylater';
 		}
 
-		// Make sure paypal is not sent in disable funding.
 		$disable_funding = array_filter(
 			$disable_funding,
-			function( $value ) {
-				return $value !== 'paypal';
+			/**
+			 * Make sure paypal is not sent in disable funding.
+			 *
+			 * @param string $funding_source The funding_source.
+			 *
+			 * @psalm-suppress MissingClosureParamType
+			 */
+			function( $funding_source ) {
+				return $funding_source !== 'paypal';
 			}
 		);
 

From 510a6c6913c8b13a0672a02a3e276e5e6f83bc2d Mon Sep 17 00:00:00 2001
From: Pedro Silva <p.silva@inpsyde.com>
Date: Wed, 27 Mar 2024 11:50:40 +0000
Subject: [PATCH 069/101] Improve fraud prevention capabilities

---
 .../ppcp-button/src/Assets/SmartButton.php    | 14 ++++++--
 .../src/Endpoint/CreateOrderEndpoint.php      |  9 ++++++
 .../src/Helper/EarlyOrderHandler.php          |  9 ++++++
 .../ppcp-button/src/Helper/ThreeDSecure.php   | 32 ++++++++++++++-----
 .../ppcp-card-fields/src/CardFieldsModule.php | 14 ++++----
 .../src/SavePaymentMethodsModule.php          |  6 +++-
 .../src/Gateway/PayPalGateway.php             |  1 +
 .../CreditCardOrderInfoHandlingTrait.php      |  7 ++--
 .../src/Processor/OrderMetaTrait.php          |  8 +++++
 .../ppcp-wc-gateway/src/WCGatewayModule.php   | 14 ++++++++
 .../Vaulting/VaultedCreditCardHandlerTest.php |  3 ++
 .../Gateway/OXXO/OXXOGatewayTest.php          |  1 +
 .../Processor/OrderProcessorTest.php          |  3 ++
 13 files changed, 102 insertions(+), 19 deletions(-)

diff --git a/modules/ppcp-button/src/Assets/SmartButton.php b/modules/ppcp-button/src/Assets/SmartButton.php
index 12e7abfbd..17e9810ab 100644
--- a/modules/ppcp-button/src/Assets/SmartButton.php
+++ b/modules/ppcp-button/src/Assets/SmartButton.php
@@ -990,11 +990,21 @@ document.querySelector("#payment").before(document.querySelector("#ppcp-messages
 		if ( $this->settings->has( '3d_secure_contingency' ) ) {
 			$value = $this->settings->get( '3d_secure_contingency' );
 			if ( $value ) {
-				return $value;
+				return $this->return_3ds_contingency( $value );
 			}
 		}
 
-		return 'SCA_WHEN_REQUIRED';
+		return $this->return_3ds_contingency( 'SCA_WHEN_REQUIRED' );
+	}
+
+	/**
+	 * Processes and returns the 3D Secure contingency.
+	 *
+	 * @param string $contingency The ThreeD secure contingency.
+	 * @return string
+	 */
+	private function return_3ds_contingency( string $contingency ): string {
+		return apply_filters( 'woocommerce_paypal_payments_three_d_secure_contingency', $contingency );
 	}
 
 	/**
diff --git a/modules/ppcp-button/src/Endpoint/CreateOrderEndpoint.php b/modules/ppcp-button/src/Endpoint/CreateOrderEndpoint.php
index c286b9f20..980e03770 100644
--- a/modules/ppcp-button/src/Endpoint/CreateOrderEndpoint.php
+++ b/modules/ppcp-button/src/Endpoint/CreateOrderEndpoint.php
@@ -329,6 +329,15 @@ class CreateOrderEndpoint implements EndpointInterface {
 			if ( 'pay-now' === $data['context'] && is_a( $wc_order, \WC_Order::class ) ) {
 				$wc_order->update_meta_data( PayPalGateway::ORDER_ID_META_KEY, $order->id() );
 				$wc_order->update_meta_data( PayPalGateway::INTENT_META_KEY, $order->intent() );
+
+				$payer = $order->payer();
+				if ( $payer ) {
+					$payer_email = $payer->email_address();
+					if ( $payer_email ) {
+						$wc_order->update_meta_data( PayPalGateway::ORDER_PAYER_EMAIL_META_KEY, $payer_email );
+					}
+				}
+
 				$wc_order->save_meta_data();
 
 				do_action( 'woocommerce_paypal_payments_woocommerce_order_created', $wc_order, $order );
diff --git a/modules/ppcp-button/src/Helper/EarlyOrderHandler.php b/modules/ppcp-button/src/Helper/EarlyOrderHandler.php
index 03d8fbeed..adff6f56c 100644
--- a/modules/ppcp-button/src/Helper/EarlyOrderHandler.php
+++ b/modules/ppcp-button/src/Helper/EarlyOrderHandler.php
@@ -159,6 +159,15 @@ class EarlyOrderHandler {
 		$wc_order = wc_get_order( $order_id );
 		$wc_order->update_meta_data( PayPalGateway::ORDER_ID_META_KEY, $order->id() );
 		$wc_order->update_meta_data( PayPalGateway::INTENT_META_KEY, $order->intent() );
+
+		$payer = $order->payer();
+		if ( $payer && $wc_order instanceof \WC_Order ) {
+			$payer_email = $payer->email_address();
+			if ( $payer_email ) {
+				$wc_order->update_meta_data( PayPalGateway::ORDER_PAYER_EMAIL_META_KEY, $payer_email );
+			}
+		}
+
 		$wc_order->save_meta_data();
 
 		/**
diff --git a/modules/ppcp-button/src/Helper/ThreeDSecure.php b/modules/ppcp-button/src/Helper/ThreeDSecure.php
index 66c89e4be..1991112b5 100644
--- a/modules/ppcp-button/src/Helper/ThreeDSecure.php
+++ b/modules/ppcp-button/src/Helper/ThreeDSecure.php
@@ -57,21 +57,24 @@ class ThreeDSecure {
 	 *
 	 * @link https://developer.paypal.com/docs/business/checkout/add-capabilities/3d-secure/#authenticationresult
 	 *
-	 * @param Order $order The order for which the decission is needed.
+	 * @param Order $order The order for which the decision is needed.
 	 *
 	 * @return int
 	 */
 	public function proceed_with_order( Order $order ): int {
+
+		do_action( 'woocommerce_paypal_payments_three_d_secure_before_check', $order );
+
 		$payment_source = $order->payment_source();
 		if ( ! $payment_source ) {
-			return self::NO_DECISION;
+			return $this->return_decision( self::NO_DECISION, $order );
 		}
 
 		if ( ! ( $payment_source->properties()->brand ?? '' ) ) {
-			return self::NO_DECISION;
+			return $this->return_decision( self::NO_DECISION, $order );
 		}
 		if ( ! ( $payment_source->properties()->authentication_result ?? '' ) ) {
-			return self::NO_DECISION;
+			return $this->return_decision( self::NO_DECISION, $order );
 		}
 
 		$authentication_result = $payment_source->properties()->authentication_result ?? null;
@@ -81,18 +84,31 @@ class ThreeDSecure {
 			$this->logger->info( '3DS Authentication Result: ' . wc_print_r( $result->to_array(), true ) );
 
 			if ( $result->liability_shift() === AuthResult::LIABILITY_SHIFT_POSSIBLE ) {
-				return self::PROCCEED;
+				return $this->return_decision( self::PROCCEED, $order );
 			}
 
 			if ( $result->liability_shift() === AuthResult::LIABILITY_SHIFT_UNKNOWN ) {
-				return self::RETRY;
+				return $this->return_decision( self::RETRY, $order );
 			}
 			if ( $result->liability_shift() === AuthResult::LIABILITY_SHIFT_NO ) {
-				return $this->no_liability_shift( $result );
+				return $this->return_decision( $this->no_liability_shift( $result ), $order );
 			}
 		}
 
-		return self::NO_DECISION;
+		return $this->return_decision( self::NO_DECISION, $order );
+	}
+
+	/**
+	 * Processes and returns a ThreeD secure decision.
+	 *
+	 * @param int   $decision The ThreeD secure decision.
+	 * @param Order $order The PayPal Order object.
+	 * @return int
+	 */
+	public function return_decision( int $decision, Order $order ) {
+		$decision = apply_filters( 'woocommerce_paypal_payments_three_d_secure_decision', $decision, $order );
+		do_action( 'woocommerce_paypal_payments_three_d_secure_after_check', $order, $decision );
+		return $decision;
 	}
 
 	/**
diff --git a/modules/ppcp-card-fields/src/CardFieldsModule.php b/modules/ppcp-card-fields/src/CardFieldsModule.php
index 213134857..6835108c3 100644
--- a/modules/ppcp-card-fields/src/CardFieldsModule.php
+++ b/modules/ppcp-card-fields/src/CardFieldsModule.php
@@ -115,17 +115,19 @@ class CardFieldsModule implements ModuleInterface {
 				$settings = $c->get( 'wcgateway.settings' );
 				assert( $settings instanceof Settings );
 
+				$three_d_secure_contingency =
+					$settings->has( '3d_secure_contingency' )
+						? apply_filters( 'woocommerce_paypal_payments_three_d_secure_contingency', $settings->get( '3d_secure_contingency' ) )
+						: '';
+
 				if (
-				$settings->has( '3d_secure_contingency' )
-				&& (
-					$settings->get( '3d_secure_contingency' ) === 'SCA_ALWAYS'
-					|| $settings->get( '3d_secure_contingency' ) === 'SCA_WHEN_REQUIRED'
-				)
+					$three_d_secure_contingency === 'SCA_ALWAYS'
+					|| $three_d_secure_contingency === 'SCA_WHEN_REQUIRED'
 				) {
 					$data['payment_source']['card'] = array(
 						'attributes' => array(
 							'verification' => array(
-								'method' => $settings->get( '3d_secure_contingency' ),
+								'method' => $three_d_secure_contingency,
 							),
 						),
 					);
diff --git a/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php b/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php
index 59010f6ca..667175aaf 100644
--- a/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php
+++ b/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php
@@ -281,7 +281,11 @@ class SavePaymentMethodsModule implements ModuleInterface {
 
 					$settings = $c->get( 'wcgateway.settings' );
 					assert( $settings instanceof Settings );
-					$verification_method = $settings->has( '3d_secure_contingency' ) ? $settings->get( '3d_secure_contingency' ) : '';
+
+					$verification_method =
+						$settings->has( '3d_secure_contingency' )
+							? apply_filters( 'woocommerce_paypal_payments_three_d_secure_contingency', $settings->get( '3d_secure_contingency' ) )
+							: '';
 
 					$change_payment_method = wc_clean( wp_unslash( $_GET['change_payment_method'] ?? '' ) ); // phpcs:ignore WordPress.Security.NonceVerification
 
diff --git a/modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php b/modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php
index 73afb085b..2a04aa478 100644
--- a/modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php
+++ b/modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php
@@ -48,6 +48,7 @@ class PayPalGateway extends \WC_Payment_Gateway {
 	const ORDER_ID_META_KEY             = '_ppcp_paypal_order_id';
 	const ORDER_PAYMENT_MODE_META_KEY   = '_ppcp_paypal_payment_mode';
 	const ORDER_PAYMENT_SOURCE_META_KEY = '_ppcp_paypal_payment_source';
+	const ORDER_PAYER_EMAIL_META_KEY    = '_ppcp_paypal_payer_email';
 	const FEES_META_KEY                 = '_ppcp_paypal_fees';
 	const REFUND_FEES_META_KEY          = '_ppcp_paypal_refund_fees';
 	const REFUNDS_META_KEY              = '_ppcp_refunds';
diff --git a/modules/ppcp-wc-gateway/src/Processor/CreditCardOrderInfoHandlingTrait.php b/modules/ppcp-wc-gateway/src/Processor/CreditCardOrderInfoHandlingTrait.php
index 32569c60b..281045099 100644
--- a/modules/ppcp-wc-gateway/src/Processor/CreditCardOrderInfoHandlingTrait.php
+++ b/modules/ppcp-wc-gateway/src/Processor/CreditCardOrderInfoHandlingTrait.php
@@ -52,6 +52,7 @@ trait CreditCardOrderInfoHandlingTrait {
                                                                 <li>%1$s</li>
                                                                 <li>%2$s</li>
                                                                 <li>%3$s</li>
+                                                                <li>%4$s</li>
                                                             </ul>';
 			$three_d_response_order_note_result        = sprintf(
 				$three_d_response_order_note_result_format,
@@ -60,7 +61,9 @@ trait CreditCardOrderInfoHandlingTrait {
 				/* translators: %s is enrollment status */
 				sprintf( __( 'Enrollment Status: %s', 'woocommerce-paypal-payments' ), esc_html( $result->enrollment_status() ) ),
 				/* translators: %s is authentication status */
-				sprintf( __( 'Authentication Status: %s', 'woocommerce-paypal-payments' ), esc_html( $result->authentication_result() ) )
+				sprintf( __( 'Authentication Status: %s', 'woocommerce-paypal-payments' ), esc_html( $result->authentication_result() ) ),
+				/* translators: %s card last digits */
+				sprintf( __( 'Card Last Digits: %s', 'woocommerce-paypal-payments' ), esc_html( $payment_source->properties()->last_digits ?? '' ) )
 			);
 			$three_d_response_order_note = sprintf(
 				$three_d_response_order_note_format,
@@ -76,7 +79,7 @@ trait CreditCardOrderInfoHandlingTrait {
 			/**
 			 * Fired when the 3DS information is added to WC order.
 			 */
-			do_action( 'woocommerce_paypal_payments_thee_d_secure_added', $wc_order, $order );
+			do_action( 'woocommerce_paypal_payments_three_d_secure_added', $wc_order, $order );
 		}
 	}
 
diff --git a/modules/ppcp-wc-gateway/src/Processor/OrderMetaTrait.php b/modules/ppcp-wc-gateway/src/Processor/OrderMetaTrait.php
index b18468d7b..1d9b87a2f 100644
--- a/modules/ppcp-wc-gateway/src/Processor/OrderMetaTrait.php
+++ b/modules/ppcp-wc-gateway/src/Processor/OrderMetaTrait.php
@@ -45,6 +45,14 @@ trait OrderMetaTrait {
 			$wc_order->update_meta_data( PayPalGateway::ORDER_PAYMENT_SOURCE_META_KEY, $payment_source );
 		}
 
+		$payer = $order->payer();
+		if ( $payer ) {
+			$payer_email = $payer->email_address();
+			if ( $payer_email ) {
+				$wc_order->update_meta_data( PayPalGateway::ORDER_PAYER_EMAIL_META_KEY, $payer_email );
+			}
+		}
+
 		$wc_order->save();
 
 		do_action( 'woocommerce_paypal_payments_woocommerce_order_created', $wc_order, $order );
diff --git a/modules/ppcp-wc-gateway/src/WCGatewayModule.php b/modules/ppcp-wc-gateway/src/WCGatewayModule.php
index e82f65e9e..03241f555 100644
--- a/modules/ppcp-wc-gateway/src/WCGatewayModule.php
+++ b/modules/ppcp-wc-gateway/src/WCGatewayModule.php
@@ -448,6 +448,20 @@ class WCGatewayModule implements ModuleInterface {
 				delete_transient( 'ppcp_reference_transaction_enabled' );
 			}
 		);
+
+		add_action(
+			'woocommerce_admin_order_data_after_billing_address',
+			function ( \WC_Order $wc_order ) {
+				if ( ! apply_filters( 'woocommerce_paypal_payments_order_details_show_paypal_email', true ) ) {
+					return;
+				}
+
+				$email = $wc_order->get_meta( PayPalGateway::ORDER_PAYER_EMAIL_META_KEY ) ?: '';
+				if ( $email ) {
+					echo '<p><strong>' . esc_html__( 'PayPal buyer account', 'woocommerce-paypal-payments' ) . ':</strong><br>' . esc_attr( $email ) . '</p>';
+				}
+			}
+		);
 	}
 
 	/**
diff --git a/tests/PHPUnit/Vaulting/VaultedCreditCardHandlerTest.php b/tests/PHPUnit/Vaulting/VaultedCreditCardHandlerTest.php
index fb728709a..c7d176c8e 100644
--- a/tests/PHPUnit/Vaulting/VaultedCreditCardHandlerTest.php
+++ b/tests/PHPUnit/Vaulting/VaultedCreditCardHandlerTest.php
@@ -92,6 +92,8 @@ class VaultedCreditCardHandlerTest extends TestCase
 		$customer = Mockery::mock(WC_Customer::class);
 
 		$payer = Mockery::mock(Payer::class);
+		$payer->shouldReceive('email_address');
+
 		$this->payerFactory->shouldReceive('from_wc_order')
 			->andReturn($payer);
 		$this->shippingPreferenceFactory->shouldReceive('from_state')
@@ -100,6 +102,7 @@ class VaultedCreditCardHandlerTest extends TestCase
 		$order = Mockery::mock(Order::class);
 		$order->shouldReceive('id')->andReturn('1');
 		$order->shouldReceive('intent')->andReturn('CAPTURE');
+		$order->shouldReceive('payer')->andReturn($payer);
 
 		$paymentSource = Mockery::mock(PaymentSource::class);
 		$paymentSource->shouldReceive('name')->andReturn('card');
diff --git a/tests/PHPUnit/WcGateway/Gateway/OXXO/OXXOGatewayTest.php b/tests/PHPUnit/WcGateway/Gateway/OXXO/OXXOGatewayTest.php
index abff51a10..0f70f801c 100644
--- a/tests/PHPUnit/WcGateway/Gateway/OXXO/OXXOGatewayTest.php
+++ b/tests/PHPUnit/WcGateway/Gateway/OXXO/OXXOGatewayTest.php
@@ -89,6 +89,7 @@ private $testee;
 		$order->shouldReceive('id')->andReturn('1');
 		$order->shouldReceive('intent');
 		$order->shouldReceive('payment_source');
+		$order->shouldReceive('payer');
 
 		$this->orderEndpoint
 			->shouldReceive('create')
diff --git a/tests/PHPUnit/WcGateway/Processor/OrderProcessorTest.php b/tests/PHPUnit/WcGateway/Processor/OrderProcessorTest.php
index d27ec6ff7..95f1b7b48 100644
--- a/tests/PHPUnit/WcGateway/Processor/OrderProcessorTest.php
+++ b/tests/PHPUnit/WcGateway/Processor/OrderProcessorTest.php
@@ -93,6 +93,7 @@ class OrderProcessorTest extends TestCase
 		$currentOrder
 			->shouldReceive('payment_source')
 			->andReturn(null);
+		$currentOrder->shouldReceive('payer');
 
         $wcOrder
             ->shouldReceive('get_meta')
@@ -230,6 +231,7 @@ class OrderProcessorTest extends TestCase
 		$currentOrder
 			->shouldReceive('payment_source')
 			->andReturn(null);
+		$currentOrder->shouldReceive('payer');
 
         $wcOrder
             ->shouldReceive('get_meta')
@@ -357,6 +359,7 @@ class OrderProcessorTest extends TestCase
         $currentOrder
             ->shouldReceive('purchase_units')
             ->andReturn([$purchaseUnit]);
+		$currentOrder->shouldReceive('payer');
 
         $wcOrder
             ->shouldReceive('get_meta')

From 101734bc0269c458f8fc47947f074a7518abd1e5 Mon Sep 17 00:00:00 2001
From: Daniel Dudzic <d.dudzic@syde.com>
Date: Wed, 27 Mar 2024 14:43:12 +0100
Subject: [PATCH 070/101] Remove all Sofort references as it has been
 deprecated

---
 modules/ppcp-wc-gateway/services.php                          | 1 -
 .../src/FundingSource/FundingSourceRenderer.php               | 4 ++--
 .../src/Settings/Fields/connection-tab-fields.php             | 2 +-
 tests/Playwright/.env.example                                 | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/ppcp-wc-gateway/services.php b/modules/ppcp-wc-gateway/services.php
index 822115d54..134d2c3f0 100644
--- a/modules/ppcp-wc-gateway/services.php
+++ b/modules/ppcp-wc-gateway/services.php
@@ -962,7 +962,6 @@ return array(
 			'ideal'      => _x( 'iDEAL', 'Name of payment method', 'woocommerce-paypal-payments' ),
 			'mybank'     => _x( 'MyBank', 'Name of payment method', 'woocommerce-paypal-payments' ),
 			'p24'        => _x( 'Przelewy24', 'Name of payment method', 'woocommerce-paypal-payments' ),
-			'sofort'     => _x( 'Sofort', 'Name of payment method', 'woocommerce-paypal-payments' ),
 			'venmo'      => _x( 'Venmo', 'Name of payment method', 'woocommerce-paypal-payments' ),
 			'trustly'    => _x( 'Trustly', 'Name of payment method', 'woocommerce-paypal-payments' ),
 			'paylater'   => _x( 'Pay Later', 'Name of payment method', 'woocommerce-paypal-payments' ),
diff --git a/modules/ppcp-wc-gateway/src/FundingSource/FundingSourceRenderer.php b/modules/ppcp-wc-gateway/src/FundingSource/FundingSourceRenderer.php
index 071410615..0fff4a5b4 100644
--- a/modules/ppcp-wc-gateway/src/FundingSource/FundingSourceRenderer.php
+++ b/modules/ppcp-wc-gateway/src/FundingSource/FundingSourceRenderer.php
@@ -63,7 +63,7 @@ class FundingSourceRenderer {
 				return $this->funding_sources[ $id ];
 			}
 			return sprintf(
-				/* translators: %s - Sofort, BLIK, iDeal, Mercado Pago, etc. */
+				/* translators: %s - BLIK, iDeal, Mercado Pago, etc. */
 				__( '%s (via PayPal)', 'woocommerce-paypal-payments' ),
 				$this->funding_sources[ $id ]
 			);
@@ -84,7 +84,7 @@ class FundingSourceRenderer {
 
 		if ( array_key_exists( $id, $this->funding_sources ) ) {
 			return sprintf(
-				/* translators: %s - Sofort, BLIK, iDeal, Mercado Pago, etc. */
+				/* translators: %s - BLIK, iDeal, Mercado Pago, etc. */
 				__( 'Pay via %s.', 'woocommerce-paypal-payments' ),
 				$this->funding_sources[ $id ]
 			);
diff --git a/modules/ppcp-wc-gateway/src/Settings/Fields/connection-tab-fields.php b/modules/ppcp-wc-gateway/src/Settings/Fields/connection-tab-fields.php
index 59bb440f1..25a367693 100644
--- a/modules/ppcp-wc-gateway/src/Settings/Fields/connection-tab-fields.php
+++ b/modules/ppcp-wc-gateway/src/Settings/Fields/connection-tab-fields.php
@@ -65,7 +65,7 @@ return function ( ContainerInterface $container, array $fields ): array {
 			<a href="https://woo.com/document/woocommerce-paypal-payments/#paypal-card-processing-acdc" target="_blank"><img alt="American Express" src="' . esc_url( $module_url ) . 'assets/images/amex.svg"/></a>
 			<a href="https://woo.com/document/woocommerce-paypal-payments/#paypal-card-processing-acdc" target="_blank"><img alt="Discover" src="' . esc_url( $module_url ) . 'assets/images/discover.svg"/></a>
 			<a href="https://woo.com/document/woocommerce-paypal-payments/#alternative-payment-methods" target="_blank"><img alt="iDEAL" src="' . esc_url( $module_url ) . 'assets/images/ideal-dark.svg"/></a>
-			<a href="https://woo.com/document/woocommerce-paypal-payments/#alternative-payment-methods" target="_blank"><img alt="Sofort" src="' . esc_url( $module_url ) . 'assets/images/sofort.svg"/></a>
+			<a href="https://woo.com/document/woocommerce-paypal-payments/#alternative-payment-methods" target="_blank"><img alt="BLIK" src="' . esc_url( $module_url ) . 'assets/images/blik.svg"/></a>
 		</div>
 		<div class="ppcp-onboarding-header-apm-logos">
 			<a href="https://woo.com/document/woocommerce-paypal-payments/#apple-pay" target="_blank"><img alt="Apple Pay" src="' . esc_url( $module_url ) . 'assets/images/button-Apple-Pay.png"/></a>
diff --git a/tests/Playwright/.env.example b/tests/Playwright/.env.example
index 3de8add8c..e23512085 100644
--- a/tests/Playwright/.env.example
+++ b/tests/Playwright/.env.example
@@ -13,7 +13,7 @@ PRODUCT_ID=123
 
 SUBSCRIPTION_URL="/product/sub"
 
-APM_ID="sofort"
+APM_ID="paypal"
 
 WP_MERCHANT_USER="admin"
 WP_MERCHANT_PASSWORD="admin"

From 03374e45866b0d2d6ea2dbb722eec630f5108a38 Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Thu, 28 Mar 2024 11:53:53 +0100
Subject: [PATCH 071/101] Update amex card eligibility

---
 modules/ppcp-api-client/services.php | 50 ++++++++++++++--------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/modules/ppcp-api-client/services.php b/modules/ppcp-api-client/services.php
index 0ae8ed7af..225530ec2 100644
--- a/modules/ppcp-api-client/services.php
+++ b/modules/ppcp-api-client/services.php
@@ -1408,32 +1408,32 @@ return array(
 				'BE' => array(
 					'mastercard' => array(),
 					'visa'       => array(),
-					'amex'       => array( 'EUR', 'USD', 'CAD' ),
+					'amex'       => array(),
 				),
 				'BG' => array(
 					'mastercard' => array(),
 					'visa'       => array(),
-					'amex'       => array( 'EUR' ),
+					'amex'       => array(),
 				),
 				'CY' => array(
 					'mastercard' => array(),
 					'visa'       => array(),
-					'amex'       => array( 'EUR' ),
+					'amex'       => array(),
 				),
 				'CZ' => array(
 					'mastercard' => array(),
 					'visa'       => array(),
-					'amex'       => array( 'CZK' ),
+					'amex'       => array(),
 				),
 				'DE' => array(
 					'mastercard' => array(),
 					'visa'       => array(),
-					'amex'       => array( 'EUR' ),
+					'amex'       => array(),
 				),
 				'DK' => array(
 					'mastercard' => array(),
 					'visa'       => array(),
-					'amex'       => array( 'DKK' ),
+					'amex'       => array(),
 				),
 				'EE' => array(
 					'mastercard' => array(),
@@ -1443,32 +1443,32 @@ return array(
 				'ES' => array(
 					'mastercard' => array(),
 					'visa'       => array(),
-					'amex'       => array( 'EUR' ),
+					'amex'       => array(),
 				),
 				'FI' => array(
 					'mastercard' => array(),
 					'visa'       => array(),
-					'amex'       => array( 'EUR' ),
+					'amex'       => array(),
 				),
 				'FR' => array(
 					'mastercard' => array(),
 					'visa'       => array(),
-					'amex'       => array( 'EUR' ),
+					'amex'       => array(),
 				),
 				'GB' => array(
 					'mastercard' => array(),
 					'visa'       => array(),
-					'amex'       => array( 'GBP', 'USD' ),
+					'amex'       => array(),
 				),
 				'GR' => array(
 					'mastercard' => array(),
 					'visa'       => array(),
-					'amex'       => array( 'EUR' ),
+					'amex'       => array(),
 				),
 				'HU' => array(
 					'mastercard' => array(),
 					'visa'       => array(),
-					'amex'       => array( 'HUF' ),
+					'amex'       => array(),
 				),
 				'IE' => array(
 					'mastercard' => array(),
@@ -1478,7 +1478,7 @@ return array(
 				'IT' => array(
 					'mastercard' => array(),
 					'visa'       => array(),
-					'amex'       => array( 'EUR' ),
+					'amex'       => array(),
 				),
 				'US' => array(
 					'mastercard' => array(),
@@ -1489,7 +1489,7 @@ return array(
 				'CA' => array(
 					'mastercard' => array(),
 					'visa'       => array(),
-					'amex'       => array( 'CAD' ),
+					'amex'       => array( 'CAD', 'USD' ),
 					'jcb'        => array( 'CAD' ),
 				),
 				'LI' => array(
@@ -1500,22 +1500,22 @@ return array(
 				'LT' => array(
 					'mastercard' => array(),
 					'visa'       => array(),
-					'amex'       => array( 'EUR' ),
+					'amex'       => array(),
 				),
 				'LU' => array(
 					'mastercard' => array(),
 					'visa'       => array(),
-					'amex'       => array( 'EUR' ),
+					'amex'       => array(),
 				),
 				'LV' => array(
 					'mastercard' => array(),
 					'visa'       => array(),
-					'amex'       => array( 'EUR', 'USD' ),
+					'amex'       => array(),
 				),
 				'MT' => array(
 					'mastercard' => array(),
 					'visa'       => array(),
-					'amex'       => array( 'EUR' ),
+					'amex'       => array(),
 				),
 				'MX' => array(
 					'mastercard' => array(),
@@ -1525,7 +1525,7 @@ return array(
 				'NL' => array(
 					'mastercard' => array(),
 					'visa'       => array(),
-					'amex'       => array( 'EUR', 'USD' ),
+					'amex'       => array(),
 				),
 				'NO' => array(
 					'mastercard' => array(),
@@ -1535,32 +1535,32 @@ return array(
 				'PL' => array(
 					'mastercard' => array(),
 					'visa'       => array(),
-					'amex'       => array( 'EUR', 'USD', 'GBP', 'PLN' ),
+					'amex'       => array(),
 				),
 				'PT' => array(
 					'mastercard' => array(),
 					'visa'       => array(),
-					'amex'       => array( 'EUR', 'USD', 'CAD', 'GBP' ),
+					'amex'       => array(),
 				),
 				'RO' => array(
 					'mastercard' => array(),
 					'visa'       => array(),
-					'amex'       => array( 'EUR', 'USD' ),
+					'amex'       => array(),
 				),
 				'SE' => array(
 					'mastercard' => array(),
 					'visa'       => array(),
-					'amex'       => array( 'EUR', 'SEK' ),
+					'amex'       => array(),
 				),
 				'SI' => array(
 					'mastercard' => array(),
 					'visa'       => array(),
-					'amex'       => array( 'EUR' ),
+					'amex'       => array(),
 				),
 				'SK' => array(
 					'mastercard' => array(),
 					'visa'       => array(),
-					'amex'       => array( 'EUR', 'GBP' ),
+					'amex'       => array(),
 				),
 				'JP' => array(
 					'mastercard' => array(),

From f1cf2f6a9b9853f03eb727adf5ca93cad2bd6118 Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Thu, 28 Mar 2024 12:03:08 +0100
Subject: [PATCH 072/101] Replace woocommerce connect service url

---
 woocommerce-paypal-payments.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/woocommerce-paypal-payments.php b/woocommerce-paypal-payments.php
index 35da8f5e3..5e6127104 100644
--- a/woocommerce-paypal-payments.php
+++ b/woocommerce-paypal-payments.php
@@ -31,8 +31,8 @@ define( 'PAYPAL_INTEGRATION_DATE', '2024-03-12' );
 ! defined( 'CONNECT_WOO_SANDBOX_CLIENT_ID' ) && define( 'CONNECT_WOO_SANDBOX_CLIENT_ID', 'AYmOHbt1VHg-OZ_oihPdzKEVbU3qg0qXonBcAztuzniQRaKE0w1Hr762cSFwd4n8wxOl-TCWohEa0XM_' );
 ! defined( 'CONNECT_WOO_MERCHANT_ID' ) && define( 'CONNECT_WOO_MERCHANT_ID', 'K8SKZ36LQBWXJ' );
 ! defined( 'CONNECT_WOO_SANDBOX_MERCHANT_ID' ) && define( 'CONNECT_WOO_SANDBOX_MERCHANT_ID', 'MPMFHQTVMBZ6G' );
-! defined( 'CONNECT_WOO_URL' ) && define( 'CONNECT_WOO_URL', 'https://connect.woocommerce.com/ppc' );
-! defined( 'CONNECT_WOO_SANDBOX_URL' ) && define( 'CONNECT_WOO_SANDBOX_URL', 'https://connect.woocommerce.com/ppcsandbox' );
+! defined( 'CONNECT_WOO_URL' ) && define( 'CONNECT_WOO_URL', 'https://api.woocommerce.com/integrations/ppc' );
+! defined( 'CONNECT_WOO_SANDBOX_URL' ) && define( 'CONNECT_WOO_SANDBOX_URL', 'https://api.woocommerce.com/integrations/ppcsandbox' );
 
 ( function () {
 	$autoload_filepath = __DIR__ . '/vendor/autoload.php';

From 54ebb93383fe578bab1bd331b2f376efa958f2e5 Mon Sep 17 00:00:00 2001
From: Pedro Silva <p.silva@inpsyde.com>
Date: Thu, 28 Mar 2024 15:02:22 +0000
Subject: [PATCH 073/101] Fix fraud prevention data presentation.

---
 .../src/Endpoint/CreateOrderEndpoint.php          | 10 ++++++++--
 .../ppcp-button/src/Helper/EarlyOrderHandler.php  | 11 +++++++++--
 .../ppcp-wc-gateway/src/Gateway/PayPalGateway.php |  5 +++++
 .../CreditCardOrderInfoHandlingTrait.php          | 15 ++++++++-------
 .../src/Processor/OrderMetaTrait.php              |  6 +++++-
 modules/ppcp-wc-gateway/src/WCGatewayModule.php   |  2 +-
 6 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/modules/ppcp-button/src/Endpoint/CreateOrderEndpoint.php b/modules/ppcp-button/src/Endpoint/CreateOrderEndpoint.php
index 980e03770..1ef06c3be 100644
--- a/modules/ppcp-button/src/Endpoint/CreateOrderEndpoint.php
+++ b/modules/ppcp-button/src/Endpoint/CreateOrderEndpoint.php
@@ -330,8 +330,14 @@ class CreateOrderEndpoint implements EndpointInterface {
 				$wc_order->update_meta_data( PayPalGateway::ORDER_ID_META_KEY, $order->id() );
 				$wc_order->update_meta_data( PayPalGateway::INTENT_META_KEY, $order->intent() );
 
-				$payer = $order->payer();
-				if ( $payer ) {
+				$payment_source      = $order->payment_source();
+				$payment_source_name = $payment_source ? $payment_source->name() : null;
+				$payer               = $order->payer();
+				if (
+					$payer
+					&& $payment_source_name
+					&& in_array( $payment_source_name, PayPalGateway::PAYMENT_SOURCES_WITH_PAYER_EMAIL, true )
+				) {
 					$payer_email = $payer->email_address();
 					if ( $payer_email ) {
 						$wc_order->update_meta_data( PayPalGateway::ORDER_PAYER_EMAIL_META_KEY, $payer_email );
diff --git a/modules/ppcp-button/src/Helper/EarlyOrderHandler.php b/modules/ppcp-button/src/Helper/EarlyOrderHandler.php
index adff6f56c..46b4ddf41 100644
--- a/modules/ppcp-button/src/Helper/EarlyOrderHandler.php
+++ b/modules/ppcp-button/src/Helper/EarlyOrderHandler.php
@@ -160,8 +160,15 @@ class EarlyOrderHandler {
 		$wc_order->update_meta_data( PayPalGateway::ORDER_ID_META_KEY, $order->id() );
 		$wc_order->update_meta_data( PayPalGateway::INTENT_META_KEY, $order->intent() );
 
-		$payer = $order->payer();
-		if ( $payer && $wc_order instanceof \WC_Order ) {
+		$payment_source      = $order->payment_source();
+		$payment_source_name = $payment_source ? $payment_source->name() : null;
+		$payer               = $order->payer();
+		if (
+			$payer
+			&& $payment_source_name
+			&& in_array( $payment_source_name, PayPalGateway::PAYMENT_SOURCES_WITH_PAYER_EMAIL, true )
+			&& $wc_order instanceof \WC_Order
+		) {
 			$payer_email = $payer->email_address();
 			if ( $payer_email ) {
 				$wc_order->update_meta_data( PayPalGateway::ORDER_PAYER_EMAIL_META_KEY, $payer_email );
diff --git a/modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php b/modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php
index 2a04aa478..19ebe9d08 100644
--- a/modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php
+++ b/modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php
@@ -55,6 +55,11 @@ class PayPalGateway extends \WC_Payment_Gateway {
 	const THREE_D_AUTH_RESULT_META_KEY  = '_ppcp_paypal_3DS_auth_result';
 	const FRAUD_RESULT_META_KEY         = '_ppcp_paypal_fraud_result';
 
+	/**
+	 * List of payment sources wich we are expected to store the payer email in the WC Order metadata.
+	 */
+	const PAYMENT_SOURCES_WITH_PAYER_EMAIL = array( 'paypal', 'paylater', 'venmo' );
+
 	/**
 	 * The Settings Renderer.
 	 *
diff --git a/modules/ppcp-wc-gateway/src/Processor/CreditCardOrderInfoHandlingTrait.php b/modules/ppcp-wc-gateway/src/Processor/CreditCardOrderInfoHandlingTrait.php
index 281045099..4cd9e07ed 100644
--- a/modules/ppcp-wc-gateway/src/Processor/CreditCardOrderInfoHandlingTrait.php
+++ b/modules/ppcp-wc-gateway/src/Processor/CreditCardOrderInfoHandlingTrait.php
@@ -52,7 +52,6 @@ trait CreditCardOrderInfoHandlingTrait {
                                                                 <li>%1$s</li>
                                                                 <li>%2$s</li>
                                                                 <li>%3$s</li>
-                                                                <li>%4$s</li>
                                                             </ul>';
 			$three_d_response_order_note_result        = sprintf(
 				$three_d_response_order_note_result_format,
@@ -61,9 +60,7 @@ trait CreditCardOrderInfoHandlingTrait {
 				/* translators: %s is enrollment status */
 				sprintf( __( 'Enrollment Status: %s', 'woocommerce-paypal-payments' ), esc_html( $result->enrollment_status() ) ),
 				/* translators: %s is authentication status */
-				sprintf( __( 'Authentication Status: %s', 'woocommerce-paypal-payments' ), esc_html( $result->authentication_result() ) ),
-				/* translators: %s card last digits */
-				sprintf( __( 'Card Last Digits: %s', 'woocommerce-paypal-payments' ), esc_html( $payment_source->properties()->last_digits ?? '' ) )
+				sprintf( __( 'Authentication Status: %s', 'woocommerce-paypal-payments' ), esc_html( $result->authentication_result() ) )
 			);
 			$three_d_response_order_note = sprintf(
 				$three_d_response_order_note_format,
@@ -99,8 +96,9 @@ trait CreditCardOrderInfoHandlingTrait {
 			return;
 		}
 
-		$fraud_responses = $fraud->to_array();
-		$card_brand      = $payment_source->properties()->brand ?? __( 'N/A', 'woocommerce-paypal-payments' );
+		$fraud_responses  = $fraud->to_array();
+		$card_brand       = $payment_source->properties()->brand ?? __( 'N/A', 'woocommerce-paypal-payments' );
+		$card_last_digits = $payment_source->properties()->last_digits ?? __( 'N/A', 'woocommerce-paypal-payments' );
 
 		$avs_response_order_note_title = __( 'Address Verification Result', 'woocommerce-paypal-payments' );
 		/* translators: %1$s is AVS order note title, %2$s is AVS order note result markup */
@@ -112,6 +110,7 @@ trait CreditCardOrderInfoHandlingTrait {
                                                                     <li>%3$s</li>
                                                                 </ul>
                                                                 <li>%4$s</li>
+                                                                <li>%5$s</li>
                                                             </ul>';
 		$avs_response_order_note_result        = sprintf(
 			$avs_response_order_note_result_format,
@@ -122,7 +121,9 @@ trait CreditCardOrderInfoHandlingTrait {
 			/* translators: %s is fraud AVS postal match */
 			sprintf( __( 'Postal Match: %s', 'woocommerce-paypal-payments' ), esc_html( $fraud_responses['postal_match'] ) ),
 			/* translators: %s is card brand */
-			sprintf( __( 'Card Brand: %s', 'woocommerce-paypal-payments' ), esc_html( $card_brand ) )
+			sprintf( __( 'Card Brand: %s', 'woocommerce-paypal-payments' ), esc_html( $card_brand ) ),
+			/* translators: %s card last digits */
+			sprintf( __( 'Card Last Digits: %s', 'woocommerce-paypal-payments' ), esc_html( $card_last_digits ) )
 		);
 		$avs_response_order_note = sprintf(
 			$avs_response_order_note_format,
diff --git a/modules/ppcp-wc-gateway/src/Processor/OrderMetaTrait.php b/modules/ppcp-wc-gateway/src/Processor/OrderMetaTrait.php
index 1d9b87a2f..62a80456a 100644
--- a/modules/ppcp-wc-gateway/src/Processor/OrderMetaTrait.php
+++ b/modules/ppcp-wc-gateway/src/Processor/OrderMetaTrait.php
@@ -46,7 +46,11 @@ trait OrderMetaTrait {
 		}
 
 		$payer = $order->payer();
-		if ( $payer ) {
+		if (
+			$payer
+			&& $payment_source
+			&& in_array( $payment_source, PayPalGateway::PAYMENT_SOURCES_WITH_PAYER_EMAIL, true )
+		) {
 			$payer_email = $payer->email_address();
 			if ( $payer_email ) {
 				$wc_order->update_meta_data( PayPalGateway::ORDER_PAYER_EMAIL_META_KEY, $payer_email );
diff --git a/modules/ppcp-wc-gateway/src/WCGatewayModule.php b/modules/ppcp-wc-gateway/src/WCGatewayModule.php
index 03241f555..7a8ef6d48 100644
--- a/modules/ppcp-wc-gateway/src/WCGatewayModule.php
+++ b/modules/ppcp-wc-gateway/src/WCGatewayModule.php
@@ -458,7 +458,7 @@ class WCGatewayModule implements ModuleInterface {
 
 				$email = $wc_order->get_meta( PayPalGateway::ORDER_PAYER_EMAIL_META_KEY ) ?: '';
 				if ( $email ) {
-					echo '<p><strong>' . esc_html__( 'PayPal buyer account', 'woocommerce-paypal-payments' ) . ':</strong><br>' . esc_attr( $email ) . '</p>';
+					echo '<p><strong>' . esc_html__( 'PayPal email address', 'woocommerce-paypal-payments' ) . ':</strong><br>' . esc_attr( $email ) . '</p>';
 				}
 			}
 		);

From 585c4e76cf59e6dd7032ddc1b4c5d40d97db11fb Mon Sep 17 00:00:00 2001
From: Pedro Silva <p.silva@inpsyde.com>
Date: Mon, 1 Apr 2024 16:32:07 +0100
Subject: [PATCH 074/101] Refactor paypal email display in order detail.

---
 .../ppcp-wc-gateway/src/WCGatewayModule.php   | 37 +++++++++++++++----
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/modules/ppcp-wc-gateway/src/WCGatewayModule.php b/modules/ppcp-wc-gateway/src/WCGatewayModule.php
index 7a8ef6d48..d0e57e5de 100644
--- a/modules/ppcp-wc-gateway/src/WCGatewayModule.php
+++ b/modules/ppcp-wc-gateway/src/WCGatewayModule.php
@@ -449,17 +449,38 @@ class WCGatewayModule implements ModuleInterface {
 			}
 		);
 
-		add_action(
-			'woocommerce_admin_order_data_after_billing_address',
-			function ( \WC_Order $wc_order ) {
-				if ( ! apply_filters( 'woocommerce_paypal_payments_order_details_show_paypal_email', true ) ) {
-					return;
+		/**
+		 * Param types removed to avoid third-party issues.
+		 *
+		 * @psalm-suppress MissingClosureParamType
+		 */
+		add_filter(
+			'woocommerce_admin_billing_fields',
+			function ( $fields ) {
+				global $theorder;
+
+				if ( ! is_array( $fields ) ) {
+					return $fields;
 				}
 
-				$email = $wc_order->get_meta( PayPalGateway::ORDER_PAYER_EMAIL_META_KEY ) ?: '';
-				if ( $email ) {
-					echo '<p><strong>' . esc_html__( 'PayPal email address', 'woocommerce-paypal-payments' ) . ':</strong><br>' . esc_attr( $email ) . '</p>';
+				if ( ! $theorder instanceof WC_Order ) {
+					return $fields;
 				}
+
+				$email = $theorder->get_meta( PayPalGateway::ORDER_PAYER_EMAIL_META_KEY ) ?: '';
+
+				if ( ! $email ) {
+					return $fields;
+				}
+
+				$fields['paypal_email'] = array(
+					'label'             => __( 'PayPal email address', 'woocommerce-paypal-payments' ),
+					'value'             => $email,
+					'wrapper_class'     => 'form-field-wide',
+					'custom_attributes' => array( 'disabled' => 'disabled' ),
+				);
+
+				return $fields;
 			}
 		);
 	}

From 48f9efbfd4bfcc22488fef7e191102773cda0b43 Mon Sep 17 00:00:00 2001
From: Pedro Silva <p.silva@inpsyde.com>
Date: Tue, 2 Apr 2024 11:19:00 +0100
Subject: [PATCH 075/101] Fix display of paypal email when funding source is
 not paypal.

---
 modules/ppcp-wc-gateway/src/WCGatewayModule.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/ppcp-wc-gateway/src/WCGatewayModule.php b/modules/ppcp-wc-gateway/src/WCGatewayModule.php
index d0e57e5de..4295b1b17 100644
--- a/modules/ppcp-wc-gateway/src/WCGatewayModule.php
+++ b/modules/ppcp-wc-gateway/src/WCGatewayModule.php
@@ -473,6 +473,14 @@ class WCGatewayModule implements ModuleInterface {
 					return $fields;
 				}
 
+				// Is payment source is paypal exclude all non paypal funding sources.
+				$payment_source           = $theorder->get_meta( PayPalGateway::ORDER_PAYMENT_SOURCE_META_KEY ) ?: '';
+				$is_paypal_funding_source = ( strpos( $theorder->get_payment_method_title(), '(via PayPal)' ) === false );
+
+				if ( $payment_source === 'paypal' && ! $is_paypal_funding_source ) {
+					return $fields;
+				}
+
 				$fields['paypal_email'] = array(
 					'label'             => __( 'PayPal email address', 'woocommerce-paypal-payments' ),
 					'value'             => $email,

From 8309a4d54a2a5608887abde3372819e66cf6f144 Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Tue, 2 Apr 2024 15:09:02 +0400
Subject: [PATCH 076/101] Fix the block placement name

---
 .../ppcp-paylater-configurator/src/Factory/ConfigFactory.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php b/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
index 695fadf4c..c73bbd0ab 100644
--- a/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
+++ b/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php
@@ -27,7 +27,7 @@ class ConfigFactory {
 			'product'          => $this->for_location( $settings, 'product' ),
 			'shop'             => $this->for_location( $settings, 'shop' ),
 			'home'             => $this->for_location( $settings, 'home' ),
-			'custom_placement' => $this->for_location( $settings, 'woocommerceBlock' ),
+			'custom_placement' => array( $this->for_location( $settings, 'woocommerceBlock' ) ),
 		);
 	}
 
@@ -91,7 +91,7 @@ class ConfigFactory {
 	 */
 	private function for_woocommerce_block( array $selected_locations ): array {
 		return array(
-			'status'            => in_array( 'woocommerceBlock', $selected_locations, true ) ? 'enabled' : 'disabled',
+			'status'            => in_array( 'custom_placement', $selected_locations, true ) ? 'enabled' : 'disabled',
 			'message_reference' => 'woocommerceBlock',
 		);
 	}

From 012c7281f73f8d6da5529459589a8e50cf0e0722 Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Tue, 2 Apr 2024 15:09:21 +0400
Subject: [PATCH 077/101] Fix the block placement name

---
 .../resources/js/paylater-configurator.js                      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js b/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js
index 440e2648b..9549ef2af 100644
--- a/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js
+++ b/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js
@@ -33,14 +33,13 @@ document.addEventListener( 'DOMContentLoaded', () => {
         }
     });
 
-
     merchantConfigurators.Messaging({
         config: PcpPayLaterConfigurator.config,
         merchantClientId: PcpPayLaterConfigurator.merchantClientId,
         partnerClientId: PcpPayLaterConfigurator.partnerClientId,
         partnerName: 'WooCommerce',
         bnCode: 'Woo_PPCP',
-        placements: ['cart', 'checkout', 'product', 'shop', 'home', 'woocommerceBlock'],
+        placements: ['cart', 'checkout', 'product', 'shop', 'home', 'custom_placement'],
         styleOverrides: {
             button: publishButtonClassName,
             header: PcpPayLaterConfigurator.headerClassName,

From 155677934abbd831a9f95b7b0a66dbdc7e448c68 Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Tue, 2 Apr 2024 15:09:52 +0400
Subject: [PATCH 078/101] Fix saving the block config

---
 .../ppcp-paylater-configurator/src/Endpoint/SaveConfig.php   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/ppcp-paylater-configurator/src/Endpoint/SaveConfig.php b/modules/ppcp-paylater-configurator/src/Endpoint/SaveConfig.php
index b44ca77af..df4e4affa 100644
--- a/modules/ppcp-paylater-configurator/src/Endpoint/SaveConfig.php
+++ b/modules/ppcp-paylater-configurator/src/Endpoint/SaveConfig.php
@@ -99,10 +99,13 @@ class SaveConfig {
 		$this->settings->set( 'pay_later_messaging_enabled', true );
 
 		$enabled_locations = array();
-
 		foreach ( $config as $placement => $data ) {
 			$this->save_config_for_location( $data, $placement );
 
+			if ( $placement === 'custom_placement' ) {
+				$data = $data[0] ?? array();
+			}
+
 			if ( $data['status'] === 'enabled' ) {
 				$enabled_locations[] = $placement;
 			}

From b4e1ce3eb8db4232313efad0d65baca0ba10c3ef Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Tue, 2 Apr 2024 15:10:35 +0400
Subject: [PATCH 079/101] Fix checking if the block placement is active

---
 modules/ppcp-paylater-block/src/PayLaterBlockModule.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ppcp-paylater-block/src/PayLaterBlockModule.php b/modules/ppcp-paylater-block/src/PayLaterBlockModule.php
index d6b9c7404..223ccd972 100644
--- a/modules/ppcp-paylater-block/src/PayLaterBlockModule.php
+++ b/modules/ppcp-paylater-block/src/PayLaterBlockModule.php
@@ -40,7 +40,7 @@ class PayLaterBlockModule implements ModuleInterface {
 	 * @return bool true if the block is enabled, otherwise false.
 	 */
 	public static function is_block_enabled( SettingsStatus $settings_status ): bool {
-		return self::is_module_loading_required() && $settings_status->is_pay_later_messaging_enabled_for_location( 'woocommerceBlock' );
+		return self::is_module_loading_required() && $settings_status->is_pay_later_messaging_enabled_for_location( 'custom_placement' );
 	}
 
 	/**

From 2bf3c14feb33b1d6fabebb0d61d75f27b62fec15 Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Wed, 3 Apr 2024 09:59:40 +0200
Subject: [PATCH 080/101] Do not execute current free trial flow if vault v3
 enabled

---
 modules/ppcp-button/resources/js/button.js    |  7 +++++-
 modules/ppcp-button/services.php              |  1 +
 .../ppcp-button/src/Assets/SmartButton.php    | 25 +++++++++++++------
 .../resources/js/add-payment-method.js        |  2 +-
 .../src/SavePaymentMethodsModule.php          |  8 ++++++
 modules/ppcp-vaulting/services.php            |  3 +++
 6 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/modules/ppcp-button/resources/js/button.js b/modules/ppcp-button/resources/js/button.js
index 0f5d573ce..d0e1a8543 100644
--- a/modules/ppcp-button/resources/js/button.js
+++ b/modules/ppcp-button/resources/js/button.js
@@ -137,7 +137,12 @@ const bootstrap = () => {
         }
 
         const isFreeTrial = PayPalCommerceGateway.is_free_trial_cart;
-        if (isFreeTrial && data.fundingSource !== 'card' && ! PayPalCommerceGateway.subscription_plan_id) {
+        if (
+            isFreeTrial
+            && data.fundingSource !== 'card'
+            && ! PayPalCommerceGateway.subscription_plan_id
+            && ! PayPalCommerceGateway.vault_v3_enabled
+        ) {
             freeTrialHandler.handle();
             return actions.reject();
         }
diff --git a/modules/ppcp-button/services.php b/modules/ppcp-button/services.php
index a812dc53e..13c130c2a 100644
--- a/modules/ppcp-button/services.php
+++ b/modules/ppcp-button/services.php
@@ -145,6 +145,7 @@ return array(
 			$container->get( 'button.early-wc-checkout-validation-enabled' ),
 			$container->get( 'button.pay-now-contexts' ),
 			$container->get( 'wcgateway.funding-sources-without-redirect' ),
+			$container->get('vaulting.vault-v3-enabled'),
 			$container->get( 'woocommerce.logger.woocommerce' )
 		);
 	},
diff --git a/modules/ppcp-button/src/Assets/SmartButton.php b/modules/ppcp-button/src/Assets/SmartButton.php
index c33bdcf47..e2c64ac0c 100644
--- a/modules/ppcp-button/src/Assets/SmartButton.php
+++ b/modules/ppcp-button/src/Assets/SmartButton.php
@@ -184,13 +184,6 @@ class SmartButton implements SmartButtonInterface {
 	 */
 	private $funding_sources_without_redirect;
 
-	/**
-	 * The logger.
-	 *
-	 * @var LoggerInterface
-	 */
-	private $logger;
-
 	/**
 	 * Session handler.
 	 *
@@ -198,6 +191,20 @@ class SmartButton implements SmartButtonInterface {
 	 */
 	private $session_handler;
 
+	/**
+	 * Whether Vault v3 module is enabled.
+	 *
+	 * @var bool
+	 */
+	private $vault_v3_enabled;
+
+	/**
+	 * The logger.
+	 *
+	 * @var LoggerInterface
+	 */
+	private $logger;
+
 	/**
 	 * SmartButton constructor.
 	 *
@@ -220,6 +227,7 @@ class SmartButton implements SmartButtonInterface {
 	 * @param bool                   $early_validation_enabled Whether to execute WC validation of the checkout form.
 	 * @param array                  $pay_now_contexts The contexts that should have the Pay Now button.
 	 * @param string[]               $funding_sources_without_redirect The sources that do not cause issues about redirecting (on mobile, ...) and sometimes not returning back.
+	 * @param bool                   $vault_v3_enabled Whether Vault v3 module is enabled.
 	 * @param LoggerInterface        $logger The logger.
 	 */
 	public function __construct(
@@ -242,6 +250,7 @@ class SmartButton implements SmartButtonInterface {
 		bool $early_validation_enabled,
 		array $pay_now_contexts,
 		array $funding_sources_without_redirect,
+		bool $vault_v3_enabled,
 		LoggerInterface $logger
 	) {
 
@@ -264,6 +273,7 @@ class SmartButton implements SmartButtonInterface {
 		$this->early_validation_enabled          = $early_validation_enabled;
 		$this->pay_now_contexts                  = $pay_now_contexts;
 		$this->funding_sources_without_redirect  = $funding_sources_without_redirect;
+		$this->vault_v3_enabled                  = $vault_v3_enabled;
 		$this->logger                            = $logger;
 	}
 
@@ -1063,6 +1073,7 @@ document.querySelector("#payment").before(document.querySelector("#ppcp-messages
 			),
 			'cart_contains_subscription'              => $this->subscription_helper->cart_contains_subscription(),
 			'subscription_plan_id'                    => $this->subscription_helper->paypal_subscription_id(),
+			'vault_v3_enabled'                        => $this->vault_v3_enabled,
 			'variable_paypal_subscription_variations' => $this->subscription_helper->variable_paypal_subscription_variations(),
 			'subscription_product_allowed'            => $this->subscription_helper->checkout_subscription_product_allowed(),
 			'locations_with_subscription_product'     => $this->subscription_helper->locations_with_subscription_product(),
diff --git a/modules/ppcp-save-payment-methods/resources/js/add-payment-method.js b/modules/ppcp-save-payment-methods/resources/js/add-payment-method.js
index 8aca64f7c..6178bd92c 100644
--- a/modules/ppcp-save-payment-methods/resources/js/add-payment-method.js
+++ b/modules/ppcp-save-payment-methods/resources/js/add-payment-method.js
@@ -12,7 +12,7 @@ import ErrorHandler from "../../../ppcp-button/resources/js/modules/ErrorHandler
 import {cardFieldStyles} from "../../../ppcp-button/resources/js/modules/Helper/CardFieldsHelper";
 
 const errorHandler = new ErrorHandler(
-    PayPalCommerceGateway.labels.error.generic,
+    ppcp_add_payment_method.labels.error.generic,
     document.querySelector('.woocommerce-notices-wrapper')
 );
 
diff --git a/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php b/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php
index 59010f6ca..f93a75a66 100644
--- a/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php
+++ b/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php
@@ -312,6 +312,14 @@ class SavePaymentMethodsModule implements ModuleInterface {
 									'nonce'    => wp_create_nonce( SubscriptionChangePaymentMethod::nonce() ),
 								),
 							),
+							'labels' => array(
+								'error' => array(
+									'generic' => __(
+										'Something went wrong. Please try again or choose another payment source.',
+										'woocommerce-paypal-payments'
+									),
+								)
+							),
 						)
 					);
 				} catch ( RuntimeException $exception ) {
diff --git a/modules/ppcp-vaulting/services.php b/modules/ppcp-vaulting/services.php
index 7d3c5e485..45355225d 100644
--- a/modules/ppcp-vaulting/services.php
+++ b/modules/ppcp-vaulting/services.php
@@ -64,4 +64,7 @@ return array(
 			$container->get( 'woocommerce.logger.woocommerce' )
 		);
 	},
+	'vaulting.vault-v3-enabled'           => static function( ContainerInterface $container ): bool {
+		return $container->has( 'save-payment-methods.eligible' ) && $container->get( 'save-payment-methods.eligible' );
+	},
 );

From 8efe8dfd6b3424762133e23f8e2e38bdfc51b12d Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Wed, 3 Apr 2024 11:02:35 +0200
Subject: [PATCH 081/101] Bump 2.6.1-rc1 version

---
 changelog.txt                   | 14 ++++++++++++++
 package.json                    |  2 +-
 readme.txt                      | 18 ++++++++++++++++--
 woocommerce-paypal-payments.php |  6 +++---
 4 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index bd4294893..089810461 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,19 @@
 *** Changelog ***
 
+= 2.6.1 - xxxx-xx-xx =
+* Fix - Payment tokens fixes and adjustments #2106
+* Fix - Pay upon Invoice: Add input validation to Experience Context fields #2092
+* Fix - Disable markup in get_plugin_data() returns to fix an issue with wptexturize() #2094
+* Enhancement - Pay later messaging configurator improvements #2107
+* Enhancement - Replace the middleware URL from connect.woocommerce.com to api.woocommerce.com/integrations #2130
+* Enhancement - Remove all Sofort references as it has been deprecated #2124
+* Enhancement - Improve funding source names #2118
+* Enhancement - More fraud prevention capabilities by storing additional data in the order #2125
+* Enhancement - Update ACDC currency eligibility for AMEX #2129
+* Enhancement - Sync shipping options with Venmo when skipping final confirmation on Checkout #2108
+* Enhancement - Card Fields: Add a filter for the CVC field and update the placeholder to match the label #2089
+* Enhancement - Product Title: Sanitize before sending to PayPal #2090
+
 = 2.6.0 - 2024-03-20 =
 * Fix - invoice_id not included in API call when creating payment with saved card #2086
 * Fix - Typo in SCA indicators for ACDC Vault transactions #2083
diff --git a/package.json b/package.json
index be3d3e101..a0e2d325a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "woocommerce-paypal-payments",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "description": "WooCommerce PayPal Payments",
   "repository": "https://github.com/woocommerce/woocommerce-paypal-payments",
   "license": "GPL-2.0",
diff --git a/readme.txt b/readme.txt
index d4b1f1b07..5c1181a21 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,9 +2,9 @@
 Contributors: woocommerce, automattic, inpsyde
 Tags: woocommerce, paypal, payments, ecommerce, checkout, cart, pay later, apple pay, subscriptions, debit card, credit card, google pay
 Requires at least: 5.3
-Tested up to: 6.4
+Tested up to: 6.5
 Requires PHP: 7.2
-Stable tag: 2.6.0
+Stable tag: 2.6.1
 License: GPLv2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -179,6 +179,20 @@ If you encounter issues with the PayPal buttons not appearing after an update, p
 
 == Changelog ==
 
+= 2.6.1 - xxxx-xx-xx =
+* Fix - Payment tokens fixes and adjustments #2106
+* Fix - Pay upon Invoice: Add input validation to Experience Context fields #2092
+* Fix - Disable markup in get_plugin_data() returns to fix an issue with wptexturize() #2094
+* Enhancement - Pay later messaging configurator improvements #2107
+* Enhancement - Replace the middleware URL from connect.woocommerce.com to api.woocommerce.com/integrations #2130
+* Enhancement - Remove all Sofort references as it has been deprecated #2124
+* Enhancement - Improve funding source names #2118
+* Enhancement - More fraud prevention capabilities by storing additional data in the order #2125
+* Enhancement - Update ACDC currency eligibility for AMEX #2129
+* Enhancement - Sync shipping options with Venmo when skipping final confirmation on Checkout #2108
+* Enhancement - Card Fields: Add a filter for the CVC field and update the placeholder to match the label #2089
+* Enhancement - Product Title: Sanitize before sending to PayPal #2090
+
 = 2.6.0 - 2024-03-20 =
 * Fix - invoice_id not included in API call when creating payment with saved card #2086
 * Fix - Typo in SCA indicators for ACDC Vault transactions #2083
diff --git a/woocommerce-paypal-payments.php b/woocommerce-paypal-payments.php
index 5e6127104..446f88f64 100644
--- a/woocommerce-paypal-payments.php
+++ b/woocommerce-paypal-payments.php
@@ -3,13 +3,13 @@
  * Plugin Name: WooCommerce PayPal Payments
  * Plugin URI:  https://woocommerce.com/products/woocommerce-paypal-payments/
  * Description: PayPal's latest complete payments processing solution. Accept PayPal, Pay Later, credit/debit cards, alternative digital wallets local payment types and bank accounts. Turn on only PayPal options or process a full suite of payment methods. Enable global transaction with extensive currency and country coverage.
- * Version:     2.6.0
+ * Version:     2.6.1
  * Author:      WooCommerce
  * Author URI:  https://woocommerce.com/
  * License:     GPL-2.0
  * Requires PHP: 7.2
  * WC requires at least: 3.9
- * WC tested up to: 8.6
+ * WC tested up to: 8.7
  * Text Domain: woocommerce-paypal-payments
  *
  * @package WooCommerce\PayPalCommerce
@@ -25,7 +25,7 @@ define( 'PAYPAL_API_URL', 'https://api-m.paypal.com' );
 define( 'PAYPAL_URL', 'https://www.paypal.com' );
 define( 'PAYPAL_SANDBOX_API_URL', 'https://api-m.sandbox.paypal.com' );
 define( 'PAYPAL_SANDBOX_URL', 'https://www.sandbox.paypal.com' );
-define( 'PAYPAL_INTEGRATION_DATE', '2024-03-12' );
+define( 'PAYPAL_INTEGRATION_DATE', '2024-04-03' );
 
 ! defined( 'CONNECT_WOO_CLIENT_ID' ) && define( 'CONNECT_WOO_CLIENT_ID', 'AcCAsWta_JTL__OfpjspNyH7c1GGHH332fLwonA5CwX4Y10mhybRZmHLA0GdRbwKwjQIhpDQy0pluX_P' );
 ! defined( 'CONNECT_WOO_SANDBOX_CLIENT_ID' ) && define( 'CONNECT_WOO_SANDBOX_CLIENT_ID', 'AYmOHbt1VHg-OZ_oihPdzKEVbU3qg0qXonBcAztuzniQRaKE0w1Hr762cSFwd4n8wxOl-TCWohEa0XM_' );

From 535153253189333c09c1e3f4bc525b867e1700b0 Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Wed, 3 Apr 2024 12:00:03 +0200
Subject: [PATCH 082/101] Add filter to disable multiple payment tokens vault
 feature

---
 .../src/SavePaymentMethodsModule.php                          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php b/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php
index 667175aaf..7f94aa15b 100644
--- a/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php
+++ b/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php
@@ -141,7 +141,7 @@ class SavePaymentMethodsModule implements ModuleInterface {
 									'vault' => array(
 										'store_in_vault' => 'ON_SUCCESS',
 										'usage_type'     => 'MERCHANT',
-										'permit_multiple_payment_tokens' => true,
+										'permit_multiple_payment_tokens' => apply_filters( 'woocommerce_paypal_payments_permit_multiple_payment_tokens', true ),
 									),
 								),
 							),
@@ -167,7 +167,7 @@ class SavePaymentMethodsModule implements ModuleInterface {
 									'vault' => array(
 										'store_in_vault' => 'ON_SUCCESS',
 										'usage_type'     => 'MERCHANT',
-										'permit_multiple_payment_tokens' => true,
+										'permit_multiple_payment_tokens' => apply_filters( 'woocommerce_paypal_payments_permit_multiple_payment_tokens', true ),
 									),
 								),
 							),

From 48771720171876baded151122c23391f26f9b128 Mon Sep 17 00:00:00 2001
From: Pedro Silva <p.silva@inpsyde.com>
Date: Wed, 3 Apr 2024 11:57:14 +0100
Subject: [PATCH 083/101] Add filter to hide PayPal email address on order
 detail page.

---
 modules/ppcp-wc-gateway/src/WCGatewayModule.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/ppcp-wc-gateway/src/WCGatewayModule.php b/modules/ppcp-wc-gateway/src/WCGatewayModule.php
index 4295b1b17..8e765a8e9 100644
--- a/modules/ppcp-wc-gateway/src/WCGatewayModule.php
+++ b/modules/ppcp-wc-gateway/src/WCGatewayModule.php
@@ -459,6 +459,10 @@ class WCGatewayModule implements ModuleInterface {
 			function ( $fields ) {
 				global $theorder;
 
+				if ( ! apply_filters( 'woocommerce_paypal_payments_order_details_show_paypal_email', true ) ) {
+					return $fields;
+				}
+
 				if ( ! is_array( $fields ) ) {
 					return $fields;
 				}

From 8be56951e6e0dd850e109a544a208a2452b05705 Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Thu, 4 Apr 2024 09:21:49 +0200
Subject: [PATCH 084/101] Update changelog

---
 changelog.txt | 2 ++
 readme.txt    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/changelog.txt b/changelog.txt
index 089810461..87510a692 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -13,6 +13,8 @@
 * Enhancement - Sync shipping options with Venmo when skipping final confirmation on Checkout #2108
 * Enhancement - Card Fields: Add a filter for the CVC field and update the placeholder to match the label #2089
 * Enhancement - Product Title: Sanitize before sending to PayPal #2090
+* Enhancement - Add filter for disabling permit_multiple_payment_tokens vault attribute #2136
+* Enhancement - Filter to hide PayPal email address not working on order detail #2137
 
 = 2.6.0 - 2024-03-20 =
 * Fix - invoice_id not included in API call when creating payment with saved card #2086
diff --git a/readme.txt b/readme.txt
index 5c1181a21..30b7db50b 100644
--- a/readme.txt
+++ b/readme.txt
@@ -192,6 +192,8 @@ If you encounter issues with the PayPal buttons not appearing after an update, p
 * Enhancement - Sync shipping options with Venmo when skipping final confirmation on Checkout #2108
 * Enhancement - Card Fields: Add a filter for the CVC field and update the placeholder to match the label #2089
 * Enhancement - Product Title: Sanitize before sending to PayPal #2090
+* Enhancement - Add filter for disabling permit_multiple_payment_tokens vault attribute #2136
+* Enhancement - Filter to hide PayPal email address not working on order detail #2137
 
 = 2.6.0 - 2024-03-20 =
 * Fix - invoice_id not included in API call when creating payment with saved card #2086

From bc0eb5746079ec31ca459196f025c79307694c08 Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Thu, 4 Apr 2024 16:52:08 +0200
Subject: [PATCH 085/101] Do not create PayPal order for free trial
 subscription if user has payment token

---
 modules/ppcp-button/services.php              |  3 +-
 .../ppcp-button/src/Assets/SmartButton.php    | 24 +++++++++++++++-
 modules/ppcp-wc-gateway/services.php          |  3 +-
 .../src/Gateway/PayPalGateway.php             | 28 +++++++++++++++++--
 4 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/modules/ppcp-button/services.php b/modules/ppcp-button/services.php
index 13c130c2a..6f781911b 100644
--- a/modules/ppcp-button/services.php
+++ b/modules/ppcp-button/services.php
@@ -145,7 +145,8 @@ return array(
 			$container->get( 'button.early-wc-checkout-validation-enabled' ),
 			$container->get( 'button.pay-now-contexts' ),
 			$container->get( 'wcgateway.funding-sources-without-redirect' ),
-			$container->get('vaulting.vault-v3-enabled'),
+			$container->get( 'vaulting.vault-v3-enabled' ),
+			$container->get( 'api.endpoint.payment-tokens' ),
 			$container->get( 'woocommerce.logger.woocommerce' )
 		);
 	},
diff --git a/modules/ppcp-button/src/Assets/SmartButton.php b/modules/ppcp-button/src/Assets/SmartButton.php
index 22ff4e208..605006d12 100644
--- a/modules/ppcp-button/src/Assets/SmartButton.php
+++ b/modules/ppcp-button/src/Assets/SmartButton.php
@@ -14,6 +14,7 @@ use Psr\Log\LoggerInterface;
 use WC_Order;
 use WC_Product;
 use WC_Product_Variation;
+use WooCommerce\PayPalCommerce\ApiClient\Endpoint\PaymentTokensEndpoint;
 use WooCommerce\PayPalCommerce\ApiClient\Entity\Money;
 use WooCommerce\PayPalCommerce\ApiClient\Entity\PaymentToken;
 use WooCommerce\PayPalCommerce\ApiClient\Factory\PayerFactory;
@@ -198,6 +199,13 @@ class SmartButton implements SmartButtonInterface {
 	 */
 	private $vault_v3_enabled;
 
+	/**
+	 * Payment tokens endpoint.
+	 *
+	 * @var PaymentTokensEndpoint
+	 */
+	private $payment_tokens_endpoint;
+
 	/**
 	 * The logger.
 	 *
@@ -228,6 +236,7 @@ class SmartButton implements SmartButtonInterface {
 	 * @param array                  $pay_now_contexts The contexts that should have the Pay Now button.
 	 * @param string[]               $funding_sources_without_redirect The sources that do not cause issues about redirecting (on mobile, ...) and sometimes not returning back.
 	 * @param bool                   $vault_v3_enabled Whether Vault v3 module is enabled.
+	 * @param PaymentTokensEndpoint  $payment_tokens_endpoint Payment tokens endpoint.
 	 * @param LoggerInterface        $logger The logger.
 	 */
 	public function __construct(
@@ -251,6 +260,7 @@ class SmartButton implements SmartButtonInterface {
 		array $pay_now_contexts,
 		array $funding_sources_without_redirect,
 		bool $vault_v3_enabled,
+		PaymentTokensEndpoint $payment_tokens_endpoint,
 		LoggerInterface $logger
 	) {
 
@@ -275,6 +285,7 @@ class SmartButton implements SmartButtonInterface {
 		$this->funding_sources_without_redirect  = $funding_sources_without_redirect;
 		$this->vault_v3_enabled                  = $vault_v3_enabled;
 		$this->logger                            = $logger;
+		$this->payment_tokens_endpoint           = $payment_tokens_endpoint;
 	}
 
 	/**
@@ -1915,8 +1926,18 @@ document.querySelector("#payment").before(document.querySelector("#ppcp-messages
 	 */
 	private function get_vaulted_paypal_email(): string {
 		try {
-			$tokens = $this->get_payment_tokens();
+			$customer_id = get_user_meta( get_current_user_id(), '_ppcp_target_customer_id', true );
+			if ( $customer_id ) {
+				$customer_tokens = $this->payment_tokens_endpoint->payment_tokens_for_customer( $customer_id );
+				foreach ( $customer_tokens as $token ) {
+					$email_address = $token['payment_source']->properties()->email_address ?? '';
+					if ( $email_address ) {
+						return $email_address;
+					}
+				}
+			}
 
+			$tokens = $this->get_payment_tokens();
 			foreach ( $tokens as $token ) {
 				if ( isset( $token->source()->paypal ) ) {
 					return $token->source()->paypal->payer->email_address;
@@ -1925,6 +1946,7 @@ document.querySelector("#payment").before(document.querySelector("#ppcp-messages
 		} catch ( Exception $exception ) {
 			$this->logger->error( 'Failed to get PayPal vaulted email. ' . $exception->getMessage() );
 		}
+
 		return '';
 	}
 
diff --git a/modules/ppcp-wc-gateway/services.php b/modules/ppcp-wc-gateway/services.php
index 9802e1951..a78a6527e 100644
--- a/modules/ppcp-wc-gateway/services.php
+++ b/modules/ppcp-wc-gateway/services.php
@@ -103,7 +103,8 @@ return array(
 			$api_shop_country,
 			$container->get( 'api.endpoint.order' ),
 			$container->get( 'api.factory.paypal-checkout-url' ),
-			$container->get( 'wcgateway.place-order-button-text' )
+			$container->get( 'wcgateway.place-order-button-text' ),
+			$container->get( 'api.endpoint.payment-tokens' )
 		);
 	},
 	'wcgateway.credit-card-gateway'                        => static function ( ContainerInterface $container ): CreditCardGateway {
diff --git a/modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php b/modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php
index 19ebe9d08..14beda474 100644
--- a/modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php
+++ b/modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php
@@ -14,6 +14,7 @@ use Psr\Log\LoggerInterface;
 use WC_Order;
 use WC_Payment_Tokens;
 use WooCommerce\PayPalCommerce\ApiClient\Endpoint\OrderEndpoint;
+use WooCommerce\PayPalCommerce\ApiClient\Endpoint\PaymentTokensEndpoint;
 use WooCommerce\PayPalCommerce\ApiClient\Entity\OrderStatus;
 use WooCommerce\PayPalCommerce\ApiClient\Entity\PaymentToken;
 use WooCommerce\PayPalCommerce\ApiClient\Exception\PayPalApiException;
@@ -179,6 +180,13 @@ class PayPalGateway extends \WC_Payment_Gateway {
 	 */
 	private $paypal_checkout_url_factory;
 
+	/**
+	 * Payment tokens endpoint.
+	 *
+	 * @var PaymentTokensEndpoint
+	 */
+	private $payment_tokens_endpoint;
+
 	/**
 	 * PayPalGateway constructor.
 	 *
@@ -199,6 +207,7 @@ class PayPalGateway extends \WC_Payment_Gateway {
 	 * @param OrderEndpoint           $order_endpoint The order endpoint.
 	 * @param callable(string):string $paypal_checkout_url_factory The function return the PayPal checkout URL for the given order ID.
 	 * @param string                  $place_order_button_text The text for the standard "Place order" button.
+	 * @param PaymentTokensEndpoint   $payment_tokens_endpoint Payment tokens endpoint.
 	 */
 	public function __construct(
 		SettingsRenderer $settings_renderer,
@@ -217,7 +226,8 @@ class PayPalGateway extends \WC_Payment_Gateway {
 		string $api_shop_country,
 		OrderEndpoint $order_endpoint,
 		callable $paypal_checkout_url_factory,
-		string $place_order_button_text
+		string $place_order_button_text,
+		PaymentTokensEndpoint $payment_tokens_endpoint
 	) {
 		$this->id                          = self::ID;
 		$this->settings_renderer           = $settings_renderer;
@@ -300,7 +310,8 @@ class PayPalGateway extends \WC_Payment_Gateway {
 			)
 		);
 
-		$this->order_endpoint = $order_endpoint;
+		$this->order_endpoint          = $order_endpoint;
+		$this->payment_tokens_endpoint = $payment_tokens_endpoint;
 	}
 
 	/**
@@ -501,6 +512,18 @@ class PayPalGateway extends \WC_Payment_Gateway {
 		}
 
 		if ( 'card' !== $funding_source && $this->is_free_trial_order( $wc_order ) && ! $this->subscription_helper->paypal_subscription_id() ) {
+			$customer_id = get_user_meta( $wc_order->get_customer_id(), '_ppcp_target_customer_id', true );
+			if ( $customer_id ) {
+				$customer_tokens = $this->payment_tokens_endpoint->payment_tokens_for_customer( $customer_id );
+				foreach ( $customer_tokens as $token ) {
+					$payment_source_name = $token['payment_source']->name() ?? '';
+					if ( $payment_source_name === 'paypal' || $payment_source_name === 'venmo' ) {
+						$wc_order->payment_complete();
+						return $this->handle_payment_success( $wc_order );
+					}
+				}
+			}
+
 			$user_id = (int) $wc_order->get_customer_id();
 			$tokens  = $this->payment_token_repository->all_for_user_id( $user_id );
 			if ( ! array_filter(
@@ -513,7 +536,6 @@ class PayPalGateway extends \WC_Payment_Gateway {
 			}
 
 			$wc_order->payment_complete();
-
 			return $this->handle_payment_success( $wc_order );
 		}
 

From 4a5b1fbc90e5904427dfe34474b569819cf6d45a Mon Sep 17 00:00:00 2001
From: Pedro Silva <p.silva@inpsyde.com>
Date: Thu, 4 Apr 2024 18:11:59 +0100
Subject: [PATCH 086/101] Fix update shipping option in block pages.

---
 modules/ppcp-blocks/resources/js/checkout-block.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/ppcp-blocks/resources/js/checkout-block.js b/modules/ppcp-blocks/resources/js/checkout-block.js
index 61fc22da5..dd324bd2c 100644
--- a/modules/ppcp-blocks/resources/js/checkout-block.js
+++ b/modules/ppcp-blocks/resources/js/checkout-block.js
@@ -299,6 +299,7 @@ const PayPalComponent = ({
             try {
                 const shippingOptionId = data.selectedShippingOption?.id;
                 if (shippingOptionId) {
+                    await wp.data.dispatch('wc/store/cart').selectShippingRate(shippingOptionId);
                     await shippingData.setSelectedRates(shippingOptionId);
                 }
 
@@ -358,6 +359,7 @@ const PayPalComponent = ({
             try {
                 const shippingOptionId = data.selectedShippingOption?.id;
                 if (shippingOptionId) {
+                    await wp.data.dispatch('wc/store/cart').selectShippingRate(shippingOptionId);
                     await shippingData.setSelectedRates(shippingOptionId);
                 }
             } catch (e) {

From 499246c2de7d21327b8029bc5676d3217a422ace Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Fri, 5 Apr 2024 10:48:44 +0200
Subject: [PATCH 087/101] Update changelog

---
 changelog.txt | 1 +
 readme.txt    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/changelog.txt b/changelog.txt
index 87510a692..b1257e486 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -4,6 +4,7 @@
 * Fix - Payment tokens fixes and adjustments #2106
 * Fix - Pay upon Invoice: Add input validation to Experience Context fields #2092
 * Fix - Disable markup in get_plugin_data() returns to fix an issue with wptexturize() #2094
+* Fix - Problem changing the shipping option in block pages #2142
 * Enhancement - Pay later messaging configurator improvements #2107
 * Enhancement - Replace the middleware URL from connect.woocommerce.com to api.woocommerce.com/integrations #2130
 * Enhancement - Remove all Sofort references as it has been deprecated #2124
diff --git a/readme.txt b/readme.txt
index 30b7db50b..cdf872418 100644
--- a/readme.txt
+++ b/readme.txt
@@ -183,6 +183,7 @@ If you encounter issues with the PayPal buttons not appearing after an update, p
 * Fix - Payment tokens fixes and adjustments #2106
 * Fix - Pay upon Invoice: Add input validation to Experience Context fields #2092
 * Fix - Disable markup in get_plugin_data() returns to fix an issue with wptexturize() #2094
+* Fix - Problem changing the shipping option in block pages #2142
 * Enhancement - Pay later messaging configurator improvements #2107
 * Enhancement - Replace the middleware URL from connect.woocommerce.com to api.woocommerce.com/integrations #2130
 * Enhancement - Remove all Sofort references as it has been deprecated #2124

From 457e9f0182d07a45e73f49040ac576694aa5d3e4 Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Sat, 6 Apr 2024 17:31:57 +0200
Subject: [PATCH 088/101] Allow free trial subscription without payment token
 for logged-in users

---
 .../ActionHandler/CheckoutActionHandler.js    | 49 +++++++++++++++++++
 .../ContextBootstrap/CheckoutBootstap.js      |  8 +++
 .../ppcp-button/src/Assets/SmartButton.php    | 10 ++++
 .../tests/save-payment-methods.spec.js        | 47 ++++++++++++++++++
 4 files changed, 114 insertions(+)

diff --git a/modules/ppcp-button/resources/js/modules/ActionHandler/CheckoutActionHandler.js b/modules/ppcp-button/resources/js/modules/ActionHandler/CheckoutActionHandler.js
index 93ecf7c8f..f3afd4f30 100644
--- a/modules/ppcp-button/resources/js/modules/ActionHandler/CheckoutActionHandler.js
+++ b/modules/ppcp-button/resources/js/modules/ActionHandler/CheckoutActionHandler.js
@@ -144,6 +144,55 @@ class CheckoutActionHandler {
             }
         }
     }
+
+    addPaymentMethodConfiguration() {
+        return {
+            createVaultSetupToken: async () => {
+                const response = await fetch(this.config.ajax.create_setup_token.endpoint, {
+                    method: "POST",
+                    credentials: 'same-origin',
+                    headers: {
+                        'Content-Type': 'application/json',
+                    },
+                    body: JSON.stringify({
+                        nonce: this.config.ajax.create_setup_token.nonce,
+                    })
+                });
+
+                const result = await response.json()
+                if (result.data.id) {
+                    return result.data.id
+                }
+
+                console.error(result)
+            },
+            onApprove: async ({vaultSetupToken}) => {
+                const response = await fetch(this.config.ajax.create_payment_token.endpoint, {
+                    method: "POST",
+                    credentials: 'same-origin',
+                    headers: {
+                        'Content-Type': 'application/json',
+                    },
+                    body: JSON.stringify({
+                        nonce: this.config.ajax.create_payment_token.nonce,
+                        vault_setup_token: vaultSetupToken,
+                        return_url: location.href,
+                    })
+                })
+
+                const result = await response.json();
+                if (result.success === true) {
+                    window.location.href = location.href;
+                    return;
+                }
+
+                console.error(result)
+            },
+            onError: (error) => {
+                console.error(error)
+            }
+        }
+    }
 }
 
 export default CheckoutActionHandler;
diff --git a/modules/ppcp-button/resources/js/modules/ContextBootstrap/CheckoutBootstap.js b/modules/ppcp-button/resources/js/modules/ContextBootstrap/CheckoutBootstap.js
index e7fae33b0..26a278736 100644
--- a/modules/ppcp-button/resources/js/modules/ContextBootstrap/CheckoutBootstap.js
+++ b/modules/ppcp-button/resources/js/modules/ContextBootstrap/CheckoutBootstap.js
@@ -116,6 +116,14 @@ class CheckoutBootstap {
             return;
         }
 
+        if(
+            PayPalCommerceGateway.is_free_trial_cart
+            && PayPalCommerceGateway.vault_v3_enabled
+        ) {
+            this.renderer.render(actionHandler.addPaymentMethodConfiguration(), {}, actionHandler.configuration());
+            return;
+        }
+
         this.renderer.render(actionHandler.configuration(), {}, actionHandler.configuration());
     }
 
diff --git a/modules/ppcp-button/src/Assets/SmartButton.php b/modules/ppcp-button/src/Assets/SmartButton.php
index 605006d12..db703c7f1 100644
--- a/modules/ppcp-button/src/Assets/SmartButton.php
+++ b/modules/ppcp-button/src/Assets/SmartButton.php
@@ -34,6 +34,8 @@ use WooCommerce\PayPalCommerce\Button\Helper\ContextTrait;
 use WooCommerce\PayPalCommerce\Button\Helper\MessagesApply;
 use WooCommerce\PayPalCommerce\Onboarding\Environment;
 use WooCommerce\PayPalCommerce\PayLaterBlock\PayLaterBlockModule;
+use WooCommerce\PayPalCommerce\SavePaymentMethods\Endpoint\CreatePaymentToken;
+use WooCommerce\PayPalCommerce\SavePaymentMethods\Endpoint\CreateSetupToken;
 use WooCommerce\PayPalCommerce\Session\SessionHandler;
 use WooCommerce\PayPalCommerce\WcSubscriptions\FreeTrialHandlerTrait;
 use WooCommerce\PayPalCommerce\WcSubscriptions\Helper\SubscriptionHelper;
@@ -1091,6 +1093,14 @@ document.querySelector("#payment").before(document.querySelector("#ppcp-messages
 				'cart_script_params'   => array(
 					'endpoint' => \WC_AJAX::get_endpoint( CartScriptParamsEndpoint::ENDPOINT ),
 				),
+				'create_setup_token'   => array(
+					'endpoint' => \WC_AJAX::get_endpoint( CreateSetupToken::ENDPOINT ),
+					'nonce'    => wp_create_nonce( CreateSetupToken::nonce() ),
+				),
+				'create_payment_token' => array(
+					'endpoint' => \WC_AJAX::get_endpoint( CreatePaymentToken::ENDPOINT ),
+					'nonce'    => wp_create_nonce( CreatePaymentToken::nonce() ),
+				),
 			),
 			'cart_contains_subscription'              => $this->subscription_helper->cart_contains_subscription(),
 			'subscription_plan_id'                    => $this->subscription_helper->paypal_subscription_id(),
diff --git a/tests/Playwright/tests/save-payment-methods.spec.js b/tests/Playwright/tests/save-payment-methods.spec.js
index 4648eebca..f6fb46315 100644
--- a/tests/Playwright/tests/save-payment-methods.spec.js
+++ b/tests/Playwright/tests/save-payment-methods.spec.js
@@ -37,6 +37,53 @@ test('Save during purchase', async ({page}) => {
     await expectOrderReceivedPage(page);
 });
 
+test('PayPal add payment method', async ({page}) => {
+    await loginAsCustomer(page);
+    await page.goto('/my-account/add-payment-method');
+
+    const popup = await openPaypalPopup(page);
+    await loginIntoPaypal(popup);
+    popup.locator('#consentButton').click();
+
+    await page.waitForURL('/my-account/payment-methods');
+});
+
+test('ACDC add payment method', async ({page}) => {
+    await loginAsCustomer(page);
+    await page.goto('/my-account/add-payment-method');
+
+    await page.click("text=Debit & Credit Cards");
+
+    const creditCardNumber = await page.frameLocator('[title="paypal_card_number_field"]').locator('.card-field-number');
+    await creditCardNumber.fill('4005519200000004');
+
+    const expirationDate = await page.frameLocator('[title="paypal_card_expiry_field"]').locator('.card-field-expiry');
+    await expirationDate.fill('01/25');
+
+    const cvv = await page.frameLocator('[title="paypal_card_cvv_field"]').locator('.card-field-cvv');
+    await cvv.fill('123');
+
+    await page.waitForURL('/my-account/payment-methods');
+});
+
+test('PayPal logged-in user free trial subscription without payment token', async ({page}) => {
+    await loginAsCustomer(page);
+
+    await page.goto('/shop');
+    await page.click("text=Sign up now");
+    await page.goto('/classic-checkout');
+
+    const popup = await openPaypalPopup(page);
+    await loginIntoPaypal(popup);
+    popup.locator('#consentButton').click();
+
+    await page.click("text=Proceed to PayPal");
+
+    const title = await page.locator('.entry-title');
+    await expect(title).toHaveText('Order received');
+})
+
+
 
 
 

From efc20c390d51eac93dd49d5061b3065963cd24dd Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Mon, 8 Apr 2024 13:38:18 +0200
Subject: [PATCH 089/101] Rename method

---
 .../src/Endpoint/PaymentMethodTokensEndpoint.php                | 2 +-
 .../src/Endpoint/CreatePaymentToken.php                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/ppcp-api-client/src/Endpoint/PaymentMethodTokensEndpoint.php b/modules/ppcp-api-client/src/Endpoint/PaymentMethodTokensEndpoint.php
index ab8d5473b..1b547a11e 100644
--- a/modules/ppcp-api-client/src/Endpoint/PaymentMethodTokensEndpoint.php
+++ b/modules/ppcp-api-client/src/Endpoint/PaymentMethodTokensEndpoint.php
@@ -115,7 +115,7 @@ class PaymentMethodTokensEndpoint {
 	 * @throws RuntimeException When something when wrong with the request.
 	 * @throws PayPalApiException When something when wrong setting up the token.
 	 */
-	public function payment_tokens( PaymentSource $payment_source ): stdClass {
+	public function create_payment_token(PaymentSource $payment_source ): stdClass {
 		$data = array(
 			'payment_source' => array(
 				$payment_source->name() => $payment_source->properties(),
diff --git a/modules/ppcp-save-payment-methods/src/Endpoint/CreatePaymentToken.php b/modules/ppcp-save-payment-methods/src/Endpoint/CreatePaymentToken.php
index ca4839372..4fea1f188 100644
--- a/modules/ppcp-save-payment-methods/src/Endpoint/CreatePaymentToken.php
+++ b/modules/ppcp-save-payment-methods/src/Endpoint/CreatePaymentToken.php
@@ -94,7 +94,7 @@ class CreatePaymentToken implements EndpointInterface {
 				)
 			);
 
-			$result = $this->payment_method_tokens_endpoint->payment_tokens( $payment_source );
+			$result = $this->payment_method_tokens_endpoint->create_payment_token( $payment_source );
 
 			if ( is_user_logged_in() && isset( $result->customer->id ) ) {
 				$current_user_id = get_current_user_id();

From 2842c43661239de5946bf1842111babb80a8e5ad Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Mon, 8 Apr 2024 17:16:02 +0200
Subject: [PATCH 090/101] Revert filter to disable multiple payment tokens by
 default

---
 .../src/SavePaymentMethodsModule.php                          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php b/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php
index 7f94aa15b..63f84ccd5 100644
--- a/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php
+++ b/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php
@@ -141,7 +141,7 @@ class SavePaymentMethodsModule implements ModuleInterface {
 									'vault' => array(
 										'store_in_vault' => 'ON_SUCCESS',
 										'usage_type'     => 'MERCHANT',
-										'permit_multiple_payment_tokens' => apply_filters( 'woocommerce_paypal_payments_permit_multiple_payment_tokens', true ),
+										'permit_multiple_payment_tokens' => apply_filters( 'woocommerce_paypal_payments_permit_multiple_payment_tokens', false ),
 									),
 								),
 							),
@@ -167,7 +167,7 @@ class SavePaymentMethodsModule implements ModuleInterface {
 									'vault' => array(
 										'store_in_vault' => 'ON_SUCCESS',
 										'usage_type'     => 'MERCHANT',
-										'permit_multiple_payment_tokens' => apply_filters( 'woocommerce_paypal_payments_permit_multiple_payment_tokens', true ),
+										'permit_multiple_payment_tokens' => apply_filters( 'woocommerce_paypal_payments_permit_multiple_payment_tokens', false ),
 									),
 								),
 							),

From c88a08d93265158352a47baf373fb63a33f1c6f1 Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Mon, 8 Apr 2024 17:30:31 +0200
Subject: [PATCH 091/101] Update changelog

---
 changelog.txt | 1 +
 readme.txt    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/changelog.txt b/changelog.txt
index b1257e486..925131c5b 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -5,6 +5,7 @@
 * Fix - Pay upon Invoice: Add input validation to Experience Context fields #2092
 * Fix - Disable markup in get_plugin_data() returns to fix an issue with wptexturize() #2094
 * Fix - Problem changing the shipping option in block pages #2142
+* Fix - Saved payment token deleted after payment with another saved payment token #2146
 * Enhancement - Pay later messaging configurator improvements #2107
 * Enhancement - Replace the middleware URL from connect.woocommerce.com to api.woocommerce.com/integrations #2130
 * Enhancement - Remove all Sofort references as it has been deprecated #2124
diff --git a/readme.txt b/readme.txt
index cdf872418..145e0a97b 100644
--- a/readme.txt
+++ b/readme.txt
@@ -184,6 +184,7 @@ If you encounter issues with the PayPal buttons not appearing after an update, p
 * Fix - Pay upon Invoice: Add input validation to Experience Context fields #2092
 * Fix - Disable markup in get_plugin_data() returns to fix an issue with wptexturize() #2094
 * Fix - Problem changing the shipping option in block pages #2142
+* Fix - Saved payment token deleted after payment with another saved payment token #2146
 * Enhancement - Pay later messaging configurator improvements #2107
 * Enhancement - Replace the middleware URL from connect.woocommerce.com to api.woocommerce.com/integrations #2130
 * Enhancement - Remove all Sofort references as it has been deprecated #2124

From 636541c6c1e2ac292d32deeb094b0f8dbd463b4f Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Tue, 9 Apr 2024 11:10:40 +0200
Subject: [PATCH 092/101] Inject vault v3 enabled service into PayPal gateway

---
 modules/ppcp-wc-gateway/services.php            |  3 ++-
 .../src/Gateway/PayPalGateway.php               | 17 +++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/modules/ppcp-wc-gateway/services.php b/modules/ppcp-wc-gateway/services.php
index a78a6527e..83c55ae1a 100644
--- a/modules/ppcp-wc-gateway/services.php
+++ b/modules/ppcp-wc-gateway/services.php
@@ -104,7 +104,8 @@ return array(
 			$container->get( 'api.endpoint.order' ),
 			$container->get( 'api.factory.paypal-checkout-url' ),
 			$container->get( 'wcgateway.place-order-button-text' ),
-			$container->get( 'api.endpoint.payment-tokens' )
+			$container->get( 'api.endpoint.payment-tokens' ),
+			$container->get( 'vaulting.vault-v3-enabled' )
 		);
 	},
 	'wcgateway.credit-card-gateway'                        => static function ( ContainerInterface $container ): CreditCardGateway {
diff --git a/modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php b/modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php
index 14beda474..d341000dd 100644
--- a/modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php
+++ b/modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php
@@ -187,6 +187,13 @@ class PayPalGateway extends \WC_Payment_Gateway {
 	 */
 	private $payment_tokens_endpoint;
 
+	/**
+	 * Whether Vault v3 module is enabled.
+	 *
+	 * @var bool
+	 */
+	private $vault_v3_enabled;
+
 	/**
 	 * PayPalGateway constructor.
 	 *
@@ -208,6 +215,7 @@ class PayPalGateway extends \WC_Payment_Gateway {
 	 * @param callable(string):string $paypal_checkout_url_factory The function return the PayPal checkout URL for the given order ID.
 	 * @param string                  $place_order_button_text The text for the standard "Place order" button.
 	 * @param PaymentTokensEndpoint   $payment_tokens_endpoint Payment tokens endpoint.
+	 * @param bool $vault_v3_enabled Whether Vault v3 module is enabled.
 	 */
 	public function __construct(
 		SettingsRenderer $settings_renderer,
@@ -227,7 +235,8 @@ class PayPalGateway extends \WC_Payment_Gateway {
 		OrderEndpoint $order_endpoint,
 		callable $paypal_checkout_url_factory,
 		string $place_order_button_text,
-		PaymentTokensEndpoint $payment_tokens_endpoint
+		PaymentTokensEndpoint $payment_tokens_endpoint,
+		bool $vault_v3_enabled
 	) {
 		$this->id                          = self::ID;
 		$this->settings_renderer           = $settings_renderer;
@@ -247,6 +256,9 @@ class PayPalGateway extends \WC_Payment_Gateway {
 		$this->api_shop_country            = $api_shop_country;
 		$this->paypal_checkout_url_factory = $paypal_checkout_url_factory;
 		$this->order_button_text           = $place_order_button_text;
+		$this->order_endpoint          = $order_endpoint;
+		$this->payment_tokens_endpoint = $payment_tokens_endpoint;
+		$this->vault_v3_enabled = $vault_v3_enabled;
 
 		if ( $this->onboarded ) {
 			$this->supports = array( 'refunds', 'tokenization' );
@@ -309,9 +321,6 @@ class PayPalGateway extends \WC_Payment_Gateway {
 				'process_admin_options',
 			)
 		);
-
-		$this->order_endpoint          = $order_endpoint;
-		$this->payment_tokens_endpoint = $payment_tokens_endpoint;
 	}
 
 	/**

From ad6b924f7f2d97aef65cdd3507a9036ca6bde16f Mon Sep 17 00:00:00 2001
From: Daniel Dudzic <d.dudzic@syde.com>
Date: Tue, 9 Apr 2024 14:31:22 +0200
Subject: [PATCH 093/101] Save Card Last Digits in order meta (PCP-2935)

---
 .../src/Processor/CreditCardOrderInfoHandlingTrait.php       | 2 +-
 package.json                                                 | 3 ++-
 yarn.lock                                                    | 5 +++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/ppcp-wc-gateway/src/Processor/CreditCardOrderInfoHandlingTrait.php b/modules/ppcp-wc-gateway/src/Processor/CreditCardOrderInfoHandlingTrait.php
index 4cd9e07ed..7a1b09035 100644
--- a/modules/ppcp-wc-gateway/src/Processor/CreditCardOrderInfoHandlingTrait.php
+++ b/modules/ppcp-wc-gateway/src/Processor/CreditCardOrderInfoHandlingTrait.php
@@ -140,7 +140,7 @@ trait CreditCardOrderInfoHandlingTrait {
 		);
 		$wc_order->add_order_note( $cvv_response_order_note );
 
-		$meta_details = array_merge( $fraud_responses, array( 'card_brand' => $card_brand ) );
+		$meta_details = array_merge( $fraud_responses, array( 'card_brand' => $card_brand, 'card_last_digits' => $card_last_digits ) );
 		$wc_order->update_meta_data( PayPalGateway::FRAUD_RESULT_META_KEY, $meta_details );
 		$wc_order->save_meta_data();
 
diff --git a/package.json b/package.json
index a0e2d325a..beed09ccb 100644
--- a/package.json
+++ b/package.json
@@ -86,6 +86,7 @@
   },
   "dependencies": {
     "dotenv": "^16.0.3",
-    "npm-run-all": "^4.1.5"
+    "npm-run-all": "^4.1.5",
+    "run-s": "^0.0.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 9316efe59..b9ab4e05f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -454,6 +454,11 @@ resolve@^1.10.0:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
+run-s@^0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/run-s/-/run-s-0.0.0.tgz#599912be20c00ba7698655c9936d075d31b71754"
+  integrity sha512-KPDNauF2Tpnm3nG0+0LJuJxwBFrhAdthpM8bVdDvjWQA7pWP7QoNwEl1+dJ7WVJj81AQP/i6kl6JUmAk7tg3Og==
+
 safe-regex-test@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295"

From 4f2e98e9cc57d57cdd90b42523119a9d5d62d9e3 Mon Sep 17 00:00:00 2001
From: Daniel Dudzic <d.dudzic@syde.com>
Date: Tue, 9 Apr 2024 14:43:00 +0200
Subject: [PATCH 094/101] Remove the yarn.lock and package.json changes

---
 package.json | 3 +--
 yarn.lock    | 5 -----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/package.json b/package.json
index beed09ccb..a0e2d325a 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,6 @@
   },
   "dependencies": {
     "dotenv": "^16.0.3",
-    "npm-run-all": "^4.1.5",
-    "run-s": "^0.0.0"
+    "npm-run-all": "^4.1.5"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index b9ab4e05f..9316efe59 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -454,11 +454,6 @@ resolve@^1.10.0:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
-run-s@^0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/run-s/-/run-s-0.0.0.tgz#599912be20c00ba7698655c9936d075d31b71754"
-  integrity sha512-KPDNauF2Tpnm3nG0+0LJuJxwBFrhAdthpM8bVdDvjWQA7pWP7QoNwEl1+dJ7WVJj81AQP/i6kl6JUmAk7tg3Og==
-
 safe-regex-test@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295"

From ac81bb5e5ac5dc223fb57e2e7fdd781f1c6176a3 Mon Sep 17 00:00:00 2001
From: Daniel Dudzic <d.dudzic@syde.com>
Date: Tue, 9 Apr 2024 15:35:19 +0200
Subject: [PATCH 095/101] Fix PHPCS errors

---
 .../src/Processor/CreditCardOrderInfoHandlingTrait.php    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/ppcp-wc-gateway/src/Processor/CreditCardOrderInfoHandlingTrait.php b/modules/ppcp-wc-gateway/src/Processor/CreditCardOrderInfoHandlingTrait.php
index 7a1b09035..51a3a741c 100644
--- a/modules/ppcp-wc-gateway/src/Processor/CreditCardOrderInfoHandlingTrait.php
+++ b/modules/ppcp-wc-gateway/src/Processor/CreditCardOrderInfoHandlingTrait.php
@@ -140,7 +140,13 @@ trait CreditCardOrderInfoHandlingTrait {
 		);
 		$wc_order->add_order_note( $cvv_response_order_note );
 
-		$meta_details = array_merge( $fraud_responses, array( 'card_brand' => $card_brand, 'card_last_digits' => $card_last_digits ) );
+		$meta_details = array_merge(
+			$fraud_responses,
+			array(
+				'card_brand'       => $card_brand,
+				'card_last_digits' => $card_last_digits,
+			)
+		);
 		$wc_order->update_meta_data( PayPalGateway::FRAUD_RESULT_META_KEY, $meta_details );
 		$wc_order->save_meta_data();
 

From 197e70607a6ffcb620b9688ed74d377bd80425c6 Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Tue, 9 Apr 2024 17:34:51 +0200
Subject: [PATCH 096/101] Add payment token for guest free trial subscription
 (WIP)

---
 .../ActionHandler/CheckoutActionHandler.js    |  7 +-
 .../ppcp-button/src/Assets/SmartButton.php    |  5 ++
 .../ppcp-save-payment-methods/services.php    |  7 ++
 .../Endpoint/CreatePaymentTokenForGuest.php   | 90 +++++++++++++++++++
 .../src/SavePaymentMethodsModule.php          | 11 +++
 modules/ppcp-wc-gateway/services.php          |  3 +-
 .../src/Gateway/PayPalGateway.php             | 45 +++++++++-
 7 files changed, 161 insertions(+), 7 deletions(-)
 create mode 100644 modules/ppcp-save-payment-methods/src/Endpoint/CreatePaymentTokenForGuest.php

diff --git a/modules/ppcp-button/resources/js/modules/ActionHandler/CheckoutActionHandler.js b/modules/ppcp-button/resources/js/modules/ActionHandler/CheckoutActionHandler.js
index f3afd4f30..ed5926816 100644
--- a/modules/ppcp-button/resources/js/modules/ActionHandler/CheckoutActionHandler.js
+++ b/modules/ppcp-button/resources/js/modules/ActionHandler/CheckoutActionHandler.js
@@ -167,22 +167,21 @@ class CheckoutActionHandler {
                 console.error(result)
             },
             onApprove: async ({vaultSetupToken}) => {
-                const response = await fetch(this.config.ajax.create_payment_token.endpoint, {
+                const response = await fetch(this.config.ajax.create_payment_token_for_guest.endpoint, {
                     method: "POST",
                     credentials: 'same-origin',
                     headers: {
                         'Content-Type': 'application/json',
                     },
                     body: JSON.stringify({
-                        nonce: this.config.ajax.create_payment_token.nonce,
+                        nonce: this.config.ajax.create_payment_token_for_guest.nonce,
                         vault_setup_token: vaultSetupToken,
-                        return_url: location.href,
                     })
                 })
 
                 const result = await response.json();
                 if (result.success === true) {
-                    window.location.href = location.href;
+                    document.querySelector('#place_order').click()
                     return;
                 }
 
diff --git a/modules/ppcp-button/src/Assets/SmartButton.php b/modules/ppcp-button/src/Assets/SmartButton.php
index db703c7f1..6f73e6d88 100644
--- a/modules/ppcp-button/src/Assets/SmartButton.php
+++ b/modules/ppcp-button/src/Assets/SmartButton.php
@@ -36,6 +36,7 @@ use WooCommerce\PayPalCommerce\Onboarding\Environment;
 use WooCommerce\PayPalCommerce\PayLaterBlock\PayLaterBlockModule;
 use WooCommerce\PayPalCommerce\SavePaymentMethods\Endpoint\CreatePaymentToken;
 use WooCommerce\PayPalCommerce\SavePaymentMethods\Endpoint\CreateSetupToken;
+use WooCommerce\PayPalCommerce\SavePaymentMethods\Endpoint\CreatePaymentTokenForGuest;
 use WooCommerce\PayPalCommerce\Session\SessionHandler;
 use WooCommerce\PayPalCommerce\WcSubscriptions\FreeTrialHandlerTrait;
 use WooCommerce\PayPalCommerce\WcSubscriptions\Helper\SubscriptionHelper;
@@ -1101,6 +1102,10 @@ document.querySelector("#payment").before(document.querySelector("#ppcp-messages
 					'endpoint' => \WC_AJAX::get_endpoint( CreatePaymentToken::ENDPOINT ),
 					'nonce'    => wp_create_nonce( CreatePaymentToken::nonce() ),
 				),
+				'create_payment_token_for_guest' => array(
+					'endpoint' => \WC_AJAX::get_endpoint( CreatePaymentTokenForGuest::ENDPOINT ),
+					'nonce'    => wp_create_nonce( CreatePaymentTokenForGuest::nonce() ),
+				),
 			),
 			'cart_contains_subscription'              => $this->subscription_helper->cart_contains_subscription(),
 			'subscription_plan_id'                    => $this->subscription_helper->paypal_subscription_id(),
diff --git a/modules/ppcp-save-payment-methods/services.php b/modules/ppcp-save-payment-methods/services.php
index 2453235c8..a0b43f021 100644
--- a/modules/ppcp-save-payment-methods/services.php
+++ b/modules/ppcp-save-payment-methods/services.php
@@ -11,6 +11,7 @@ namespace WooCommerce\PayPalCommerce\SavePaymentMethods;
 
 use WooCommerce\PayPalCommerce\SavePaymentMethods\Endpoint\CreatePaymentToken;
 use WooCommerce\PayPalCommerce\SavePaymentMethods\Endpoint\CreateSetupToken;
+use WooCommerce\PayPalCommerce\SavePaymentMethods\Endpoint\CreatePaymentTokenForGuest;
 use WooCommerce\PayPalCommerce\SavePaymentMethods\Helper\SavePaymentMethodsApplies;
 use WooCommerce\PayPalCommerce\Vendor\Psr\Container\ContainerInterface;
 
@@ -811,4 +812,10 @@ return array(
 			$container->get( 'vaulting.wc-payment-tokens' )
 		);
 	},
+	'save-payment-methods.endpoint.create-payment-token-for-guest' => static function ( ContainerInterface $container ): CreatePaymentTokenForGuest {
+		return new CreatePaymentTokenForGuest(
+			$container->get( 'button.request-data' ),
+			$container->get( 'api.endpoint.payment-method-tokens' )
+		);
+	},
 );
diff --git a/modules/ppcp-save-payment-methods/src/Endpoint/CreatePaymentTokenForGuest.php b/modules/ppcp-save-payment-methods/src/Endpoint/CreatePaymentTokenForGuest.php
new file mode 100644
index 000000000..e458c96be
--- /dev/null
+++ b/modules/ppcp-save-payment-methods/src/Endpoint/CreatePaymentTokenForGuest.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Create payment token for guest user.
+ *
+ * @package WooCommerce\PayPalCommerce\ApiClient\Endpoint
+ */
+
+declare(strict_types=1);
+
+namespace WooCommerce\PayPalCommerce\SavePaymentMethods\Endpoint;
+
+use Exception;
+use WooCommerce\PayPalCommerce\ApiClient\Endpoint\PaymentMethodTokensEndpoint;
+use WooCommerce\PayPalCommerce\ApiClient\Entity\PaymentSource;
+use WooCommerce\PayPalCommerce\Button\Endpoint\EndpointInterface;
+use WooCommerce\PayPalCommerce\Button\Endpoint\RequestData;
+
+/**
+ * Class UpdateCustomerId
+ */
+class CreatePaymentTokenForGuest implements EndpointInterface {
+
+	const ENDPOINT = 'ppc-update-customer-id';
+
+	/**
+	 * The request data.
+	 *
+	 * @var RequestData
+	 */
+	private $request_data;
+
+	/**
+	 * The payment method tokens endpoint.
+	 *
+	 * @var PaymentMethodTokensEndpoint
+	 */
+	private $payment_method_tokens_endpoint;
+
+	/**
+	 * CreatePaymentToken constructor.
+	 *
+	 * @param RequestData                 $request_data The request data.
+	 * @param PaymentMethodTokensEndpoint $payment_method_tokens_endpoint The payment method tokens endpoint.
+	 */
+	public function __construct(
+		RequestData $request_data,
+		PaymentMethodTokensEndpoint $payment_method_tokens_endpoint
+	) {
+		$this->request_data                   = $request_data;
+		$this->payment_method_tokens_endpoint = $payment_method_tokens_endpoint;
+	}
+
+	/**
+	 * Returns the nonce.
+	 *
+	 * @return string
+	 */
+	public static function nonce(): string {
+		return self::ENDPOINT;
+	}
+
+	/**
+	 * Handles the request.
+	 *
+	 * @return bool
+	 * @throws Exception On Error.
+	 */
+	public function handle_request(): bool {
+		$data = $this->request_data->read_request( $this->nonce() );
+
+		/**
+		 * Suppress ArgumentTypeCoercion
+		 *
+		 * @psalm-suppress ArgumentTypeCoercion
+		 */
+		$payment_source = new PaymentSource(
+			'token',
+			(object) array(
+				'id'   => $data['vault_setup_token'],
+				'type' => 'SETUP_TOKEN',
+			)
+		);
+
+		$result = $this->payment_method_tokens_endpoint->create_payment_token( $payment_source );
+		WC()->session->set( 'ppcp_guest_payment_for_free_trial', $result );
+
+		wp_send_json_success();
+		return true;
+	}
+}
diff --git a/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php b/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php
index 61244b2e2..8daafae4a 100644
--- a/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php
+++ b/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php
@@ -20,6 +20,7 @@ use WooCommerce\PayPalCommerce\ApiClient\Exception\PayPalApiException;
 use WooCommerce\PayPalCommerce\ApiClient\Exception\RuntimeException;
 use WooCommerce\PayPalCommerce\Button\Helper\ContextTrait;
 use WooCommerce\PayPalCommerce\SavePaymentMethods\Endpoint\CreatePaymentToken;
+use WooCommerce\PayPalCommerce\SavePaymentMethods\Endpoint\CreatePaymentTokenForGuest;
 use WooCommerce\PayPalCommerce\SavePaymentMethods\Endpoint\CreateSetupToken;
 use WooCommerce\PayPalCommerce\Vaulting\WooCommercePaymentTokens;
 use WooCommerce\PayPalCommerce\Vendor\Dhii\Container\ServiceProvider;
@@ -371,6 +372,16 @@ class SavePaymentMethodsModule implements ModuleInterface {
 			}
 		);
 
+		add_action(
+			'wc_ajax_' . CreatePaymentTokenForGuest::ENDPOINT,
+			static function () use ( $c ) {
+				$endpoint = $c->get( 'save-payment-methods.endpoint.create-payment-token-for-guest' );
+				assert( $endpoint instanceof CreatePaymentTokenForGuest );
+
+				$endpoint->handle_request();
+			}
+		);
+
 		add_action(
 			'woocommerce_paypal_payments_before_delete_payment_token',
 			function( string $token_id ) use ( $c ) {
diff --git a/modules/ppcp-wc-gateway/services.php b/modules/ppcp-wc-gateway/services.php
index 83c55ae1a..6bf3d5ecf 100644
--- a/modules/ppcp-wc-gateway/services.php
+++ b/modules/ppcp-wc-gateway/services.php
@@ -105,7 +105,8 @@ return array(
 			$container->get( 'api.factory.paypal-checkout-url' ),
 			$container->get( 'wcgateway.place-order-button-text' ),
 			$container->get( 'api.endpoint.payment-tokens' ),
-			$container->get( 'vaulting.vault-v3-enabled' )
+			$container->get( 'vaulting.vault-v3-enabled' ),
+			$container->get( 'vaulting.wc-payment-tokens' )
 		);
 	},
 	'wcgateway.credit-card-gateway'                        => static function ( ContainerInterface $container ): CreditCardGateway {
diff --git a/modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php b/modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php
index d341000dd..20b7a840d 100644
--- a/modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php
+++ b/modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php
@@ -21,6 +21,7 @@ use WooCommerce\PayPalCommerce\ApiClient\Exception\PayPalApiException;
 use WooCommerce\PayPalCommerce\Onboarding\Environment;
 use WooCommerce\PayPalCommerce\Onboarding\State;
 use WooCommerce\PayPalCommerce\Session\SessionHandler;
+use WooCommerce\PayPalCommerce\Vaulting\WooCommercePaymentTokens;
 use WooCommerce\PayPalCommerce\WcSubscriptions\FreeTrialHandlerTrait;
 use WooCommerce\PayPalCommerce\WcSubscriptions\Helper\SubscriptionHelper;
 use WooCommerce\PayPalCommerce\Vaulting\PaymentTokenRepository;
@@ -194,6 +195,13 @@ class PayPalGateway extends \WC_Payment_Gateway {
 	 */
 	private $vault_v3_enabled;
 
+	/**
+	 * WooCommerce payment tokens.
+	 *
+	 * @var WooCommercePaymentTokens
+	 */
+	private $wc_payment_tokens;
+
 	/**
 	 * PayPalGateway constructor.
 	 *
@@ -216,6 +224,7 @@ class PayPalGateway extends \WC_Payment_Gateway {
 	 * @param string                  $place_order_button_text The text for the standard "Place order" button.
 	 * @param PaymentTokensEndpoint   $payment_tokens_endpoint Payment tokens endpoint.
 	 * @param bool $vault_v3_enabled Whether Vault v3 module is enabled.
+	 * @param WooCommercePaymentTokens $wc_payment_tokens WooCommerce payment tokens.
 	 */
 	public function __construct(
 		SettingsRenderer $settings_renderer,
@@ -236,7 +245,8 @@ class PayPalGateway extends \WC_Payment_Gateway {
 		callable $paypal_checkout_url_factory,
 		string $place_order_button_text,
 		PaymentTokensEndpoint $payment_tokens_endpoint,
-		bool $vault_v3_enabled
+		bool $vault_v3_enabled,
+		WooCommercePaymentTokens $wc_payment_tokens
 	) {
 		$this->id                          = self::ID;
 		$this->settings_renderer           = $settings_renderer;
@@ -259,6 +269,7 @@ class PayPalGateway extends \WC_Payment_Gateway {
 		$this->order_endpoint          = $order_endpoint;
 		$this->payment_tokens_endpoint = $payment_tokens_endpoint;
 		$this->vault_v3_enabled = $vault_v3_enabled;
+		$this->wc_payment_tokens = $wc_payment_tokens;
 
 		if ( $this->onboarded ) {
 			$this->supports = array( 'refunds', 'tokenization' );
@@ -520,7 +531,37 @@ class PayPalGateway extends \WC_Payment_Gateway {
 			$wc_order->save();
 		}
 
-		if ( 'card' !== $funding_source && $this->is_free_trial_order( $wc_order ) && ! $this->subscription_helper->paypal_subscription_id() ) {
+		if (
+			'card' !== $funding_source
+			&& $this->is_free_trial_order( $wc_order )
+			&& ! $this->subscription_helper->paypal_subscription_id()
+		) {
+			$ppcp_guest_payment_for_free_trial = WC()->session->get( 'ppcp_guest_payment_for_free_trial') ?? null;
+			if($this->vault_v3_enabled && $ppcp_guest_payment_for_free_trial) {
+				$customer_id = $ppcp_guest_payment_for_free_trial->customer->id ?? '';
+				if($customer_id) {
+					update_user_meta( $wc_order->get_customer_id(), '_ppcp_target_customer_id', $customer_id );
+				}
+
+				if ( isset( $ppcp_guest_payment_for_free_trial->payment_source->paypal ) ) {
+					$email = '';
+					if ( isset( $ppcp_guest_payment_for_free_trial->payment_source->paypal->email_address ) ) {
+						$email = $ppcp_guest_payment_for_free_trial->payment_source->paypal->email_address;
+					}
+
+					$this->wc_payment_tokens->create_payment_token_paypal(
+						$wc_order->get_customer_id(),
+						$ppcp_guest_payment_for_free_trial->id,
+						$email
+					);
+				}
+
+				WC()->session->set( 'ppcp_guest_payment_for_free_trial', null);
+
+				$wc_order->payment_complete();
+				return $this->handle_payment_success( $wc_order );
+			}
+
 			$customer_id = get_user_meta( $wc_order->get_customer_id(), '_ppcp_target_customer_id', true );
 			if ( $customer_id ) {
 				$customer_tokens = $this->payment_tokens_endpoint->payment_tokens_for_customer( $customer_id );

From e336606960a727628f988485f27bfb76b1e990f8 Mon Sep 17 00:00:00 2001
From: Diego Curbelo <diego@curbelo.com>
Date: Tue, 9 Apr 2024 16:28:51 -0300
Subject: [PATCH 097/101] Add required plugins header

---
 woocommerce-paypal-payments.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/woocommerce-paypal-payments.php b/woocommerce-paypal-payments.php
index 446f88f64..b55b1f00d 100644
--- a/woocommerce-paypal-payments.php
+++ b/woocommerce-paypal-payments.php
@@ -8,6 +8,7 @@
  * Author URI:  https://woocommerce.com/
  * License:     GPL-2.0
  * Requires PHP: 7.2
+ * Requires Plugins: woocommerce
  * WC requires at least: 3.9
  * WC tested up to: 8.7
  * Text Domain: woocommerce-paypal-payments

From 7f384e532c4f4e6fb57cf8904896e40c3e0c2cd7 Mon Sep 17 00:00:00 2001
From: Diego Curbelo <diego@curbelo.com>
Date: Tue, 9 Apr 2024 17:01:32 -0300
Subject: [PATCH 098/101] woorelease: Product version bump update

---
 changelog.txt | 2 +-
 readme.txt    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 925131c5b..ad4695527 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,6 +1,6 @@
 *** Changelog ***
 
-= 2.6.1 - xxxx-xx-xx =
+= 2.6.1 - 2024-04-09 =
 * Fix - Payment tokens fixes and adjustments #2106
 * Fix - Pay upon Invoice: Add input validation to Experience Context fields #2092
 * Fix - Disable markup in get_plugin_data() returns to fix an issue with wptexturize() #2094
diff --git a/readme.txt b/readme.txt
index 145e0a97b..bbf1fecfc 100644
--- a/readme.txt
+++ b/readme.txt
@@ -179,7 +179,7 @@ If you encounter issues with the PayPal buttons not appearing after an update, p
 
 == Changelog ==
 
-= 2.6.1 - xxxx-xx-xx =
+= 2.6.1 - 2024-04-09 =
 * Fix - Payment tokens fixes and adjustments #2106
 * Fix - Pay upon Invoice: Add input validation to Experience Context fields #2092
 * Fix - Disable markup in get_plugin_data() returns to fix an issue with wptexturize() #2094

From 93f74aac92aa3373a7280c07994ac167ab5531e5 Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Wed, 10 Apr 2024 16:13:44 +0200
Subject: [PATCH 099/101] Ensure free trial with saved card payment does not
 create PayPal order

---
 .../src/Gateway/CreditCardGateway.php              | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php b/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php
index 4032869d1..6e21e70df 100644
--- a/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php
+++ b/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php
@@ -33,6 +33,7 @@ use WooCommerce\PayPalCommerce\WcGateway\Processor\PaymentsStatusHandlingTrait;
 use WooCommerce\PayPalCommerce\WcGateway\Processor\RefundProcessor;
 use WooCommerce\PayPalCommerce\WcGateway\Processor\TransactionIdHandlingTrait;
 use WooCommerce\PayPalCommerce\WcGateway\Settings\SettingsRenderer;
+use WooCommerce\PayPalCommerce\WcSubscriptions\FreeTrialHandlerTrait;
 use WooCommerce\PayPalCommerce\WcSubscriptions\Helper\SubscriptionHelper;
 
 /**
@@ -40,7 +41,7 @@ use WooCommerce\PayPalCommerce\WcSubscriptions\Helper\SubscriptionHelper;
  */
 class CreditCardGateway extends \WC_Payment_Gateway_CC {
 
-	use ProcessPaymentTrait, GatewaySettingsRendererTrait, TransactionIdHandlingTrait, PaymentsStatusHandlingTrait;
+	use ProcessPaymentTrait, GatewaySettingsRendererTrait, TransactionIdHandlingTrait, PaymentsStatusHandlingTrait, FreeTrialHandlerTrait;
 
 	const ID = 'ppcp-credit-card-gateway';
 
@@ -454,6 +455,17 @@ class CreditCardGateway extends \WC_Payment_Gateway_CC {
 
 		// phpcs:ignore WordPress.Security.NonceVerification.Missing
 		$card_payment_token_id = wc_clean( wp_unslash( $_POST['wc-ppcp-credit-card-gateway-payment-token'] ?? '' ) );
+
+		if ( $this->is_free_trial_order( $wc_order ) && $card_payment_token_id ) {
+			$customer_tokens = $this->wc_payment_tokens->customer_tokens( get_current_user_id() );
+			foreach ( $customer_tokens as $token ) {
+				if ( $token['payment_source']->name() === 'card' ) {
+					$wc_order->payment_complete();
+					return $this->handle_payment_success( $wc_order );
+				}
+			}
+		}
+
 		if ( $card_payment_token_id ) {
 			$customer_tokens = $this->wc_payment_tokens->customer_tokens( get_current_user_id() );
 

From dd53229e8d545141dbfde5f18892355f89c9474b Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Wed, 10 Apr 2024 16:36:41 +0200
Subject: [PATCH 100/101] Fix phpunit

---
 tests/PHPUnit/WcGateway/Gateway/WcGatewayTest.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/tests/PHPUnit/WcGateway/Gateway/WcGatewayTest.php b/tests/PHPUnit/WcGateway/Gateway/WcGatewayTest.php
index 5239af7dc..041141492 100644
--- a/tests/PHPUnit/WcGateway/Gateway/WcGatewayTest.php
+++ b/tests/PHPUnit/WcGateway/Gateway/WcGatewayTest.php
@@ -6,11 +6,13 @@ namespace WooCommerce\PayPalCommerce\WcGateway\Gateway;
 use Exception;
 use Psr\Log\LoggerInterface;
 use WooCommerce\PayPalCommerce\ApiClient\Endpoint\OrderEndpoint;
+use WooCommerce\PayPalCommerce\ApiClient\Endpoint\PaymentTokensEndpoint;
 use WooCommerce\PayPalCommerce\ApiClient\Entity\Order;
 use WooCommerce\PayPalCommerce\ApiClient\Entity\OrderStatus;
 use WooCommerce\PayPalCommerce\Onboarding\Environment;
 use WooCommerce\PayPalCommerce\Onboarding\State;
 use WooCommerce\PayPalCommerce\Session\SessionHandler;
+use WooCommerce\PayPalCommerce\Vaulting\WooCommercePaymentTokens;
 use WooCommerce\PayPalCommerce\WcSubscriptions\Helper\SubscriptionHelper;
 use WooCommerce\PayPalCommerce\TestCase;
 use WooCommerce\PayPalCommerce\Vaulting\PaymentTokenRepository;
@@ -44,6 +46,9 @@ class WcGatewayTest extends TestCase
 	private $logger;
 	private $apiShopCountry;
 	private $orderEndpoint;
+	private $paymentTokensEndpoint;
+	private $vaultV3Enabled;
+	private $wcPaymentTokens;
 
 	public function setUp(): void {
 		parent::setUp();
@@ -88,6 +93,10 @@ class WcGatewayTest extends TestCase
 
 		$this->logger->shouldReceive('info');
 		$this->logger->shouldReceive('error');
+
+		$this->paymentTokensEndpoint = Mockery::mock(PaymentTokensEndpoint::class);
+		$this->vaultV3Enabled = true;
+		$this->wcPaymentTokens = Mockery::mock(WooCommercePaymentTokens::class);
 	}
 
 	private function createGateway()
@@ -111,7 +120,10 @@ class WcGatewayTest extends TestCase
 			function ($id) {
 				return 'checkoutnow=' . $id;
 			},
-			'Pay via PayPal'
+			'Pay via PayPal',
+			$this->paymentTokensEndpoint,
+			$this->vaultV3Enabled,
+			$this->wcPaymentTokens
 		);
 	}
 

From bd9f80f82f4316fe0bf5a413fa0396a9870717f0 Mon Sep 17 00:00:00 2001
From: Emili Castells Guasch <ecastells@MacBook-Air-de-Emili.local>
Date: Wed, 10 Apr 2024 17:05:33 +0200
Subject: [PATCH 101/101] Fix phpcs

---
 .../Endpoint/PaymentMethodTokensEndpoint.php  |  2 +-
 .../ppcp-button/src/Assets/SmartButton.php    | 22 ++++----
 .../src/SavePaymentMethodsModule.php          |  4 +-
 .../src/Gateway/PayPalGateway.php             | 54 +++++++++----------
 4 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/modules/ppcp-api-client/src/Endpoint/PaymentMethodTokensEndpoint.php b/modules/ppcp-api-client/src/Endpoint/PaymentMethodTokensEndpoint.php
index 1b547a11e..538ca224d 100644
--- a/modules/ppcp-api-client/src/Endpoint/PaymentMethodTokensEndpoint.php
+++ b/modules/ppcp-api-client/src/Endpoint/PaymentMethodTokensEndpoint.php
@@ -115,7 +115,7 @@ class PaymentMethodTokensEndpoint {
 	 * @throws RuntimeException When something when wrong with the request.
 	 * @throws PayPalApiException When something when wrong setting up the token.
 	 */
-	public function create_payment_token(PaymentSource $payment_source ): stdClass {
+	public function create_payment_token( PaymentSource $payment_source ): stdClass {
 		$data = array(
 			'payment_source' => array(
 				$payment_source->name() => $payment_source->properties(),
diff --git a/modules/ppcp-button/src/Assets/SmartButton.php b/modules/ppcp-button/src/Assets/SmartButton.php
index 6f73e6d88..d795d4950 100644
--- a/modules/ppcp-button/src/Assets/SmartButton.php
+++ b/modules/ppcp-button/src/Assets/SmartButton.php
@@ -1059,46 +1059,46 @@ document.querySelector("#payment").before(document.querySelector("#ppcp-messages
 			'redirect'                                => wc_get_checkout_url(),
 			'context'                                 => $this->context(),
 			'ajax'                                    => array(
-				'simulate_cart'        => array(
+				'simulate_cart'                  => array(
 					'endpoint' => \WC_AJAX::get_endpoint( SimulateCartEndpoint::ENDPOINT ),
 					'nonce'    => wp_create_nonce( SimulateCartEndpoint::nonce() ),
 				),
-				'change_cart'          => array(
+				'change_cart'                    => array(
 					'endpoint' => \WC_AJAX::get_endpoint( ChangeCartEndpoint::ENDPOINT ),
 					'nonce'    => wp_create_nonce( ChangeCartEndpoint::nonce() ),
 				),
-				'create_order'         => array(
+				'create_order'                   => array(
 					'endpoint' => \WC_AJAX::get_endpoint( CreateOrderEndpoint::ENDPOINT ),
 					'nonce'    => wp_create_nonce( CreateOrderEndpoint::nonce() ),
 				),
-				'approve_order'        => array(
+				'approve_order'                  => array(
 					'endpoint' => \WC_AJAX::get_endpoint( ApproveOrderEndpoint::ENDPOINT ),
 					'nonce'    => wp_create_nonce( ApproveOrderEndpoint::nonce() ),
 				),
-				'approve_subscription' => array(
+				'approve_subscription'           => array(
 					'endpoint' => \WC_AJAX::get_endpoint( ApproveSubscriptionEndpoint::ENDPOINT ),
 					'nonce'    => wp_create_nonce( ApproveSubscriptionEndpoint::nonce() ),
 				),
-				'vault_paypal'         => array(
+				'vault_paypal'                   => array(
 					'endpoint' => \WC_AJAX::get_endpoint( StartPayPalVaultingEndpoint::ENDPOINT ),
 					'nonce'    => wp_create_nonce( StartPayPalVaultingEndpoint::nonce() ),
 				),
-				'save_checkout_form'   => array(
+				'save_checkout_form'             => array(
 					'endpoint' => \WC_AJAX::get_endpoint( SaveCheckoutFormEndpoint::ENDPOINT ),
 					'nonce'    => wp_create_nonce( SaveCheckoutFormEndpoint::nonce() ),
 				),
-				'validate_checkout'    => array(
+				'validate_checkout'              => array(
 					'endpoint' => \WC_AJAX::get_endpoint( ValidateCheckoutEndpoint::ENDPOINT ),
 					'nonce'    => wp_create_nonce( ValidateCheckoutEndpoint::nonce() ),
 				),
-				'cart_script_params'   => array(
+				'cart_script_params'             => array(
 					'endpoint' => \WC_AJAX::get_endpoint( CartScriptParamsEndpoint::ENDPOINT ),
 				),
-				'create_setup_token'   => array(
+				'create_setup_token'             => array(
 					'endpoint' => \WC_AJAX::get_endpoint( CreateSetupToken::ENDPOINT ),
 					'nonce'    => wp_create_nonce( CreateSetupToken::nonce() ),
 				),
-				'create_payment_token' => array(
+				'create_payment_token'           => array(
 					'endpoint' => \WC_AJAX::get_endpoint( CreatePaymentToken::ENDPOINT ),
 					'nonce'    => wp_create_nonce( CreatePaymentToken::nonce() ),
 				),
diff --git a/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php b/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php
index 8daafae4a..b667fb10b 100644
--- a/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php
+++ b/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php
@@ -317,13 +317,13 @@ class SavePaymentMethodsModule implements ModuleInterface {
 									'nonce'    => wp_create_nonce( SubscriptionChangePaymentMethod::nonce() ),
 								),
 							),
-							'labels' => array(
+							'labels'                  => array(
 								'error' => array(
 									'generic' => __(
 										'Something went wrong. Please try again or choose another payment source.',
 										'woocommerce-paypal-payments'
 									),
-								)
+								),
 							),
 						)
 					);
diff --git a/modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php b/modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php
index 20b7a840d..8ac87156f 100644
--- a/modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php
+++ b/modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php
@@ -205,25 +205,25 @@ class PayPalGateway extends \WC_Payment_Gateway {
 	/**
 	 * PayPalGateway constructor.
 	 *
-	 * @param SettingsRenderer        $settings_renderer The Settings Renderer.
-	 * @param FundingSourceRenderer   $funding_source_renderer The funding source renderer.
-	 * @param OrderProcessor          $order_processor The Order Processor.
-	 * @param ContainerInterface      $config The settings.
-	 * @param SessionHandler          $session_handler The Session Handler.
-	 * @param RefundProcessor         $refund_processor The Refund Processor.
-	 * @param State                   $state The state.
-	 * @param TransactionUrlProvider  $transaction_url_provider Service providing transaction view URL based on order.
-	 * @param SubscriptionHelper      $subscription_helper The subscription helper.
-	 * @param string                  $page_id ID of the current PPCP gateway settings page, or empty if it is not such page.
-	 * @param Environment             $environment The environment.
-	 * @param PaymentTokenRepository  $payment_token_repository The payment token repository.
-	 * @param LoggerInterface         $logger The logger.
-	 * @param string                  $api_shop_country The api shop country.
-	 * @param OrderEndpoint           $order_endpoint The order endpoint.
-	 * @param callable(string):string $paypal_checkout_url_factory The function return the PayPal checkout URL for the given order ID.
-	 * @param string                  $place_order_button_text The text for the standard "Place order" button.
-	 * @param PaymentTokensEndpoint   $payment_tokens_endpoint Payment tokens endpoint.
-	 * @param bool $vault_v3_enabled Whether Vault v3 module is enabled.
+	 * @param SettingsRenderer         $settings_renderer The Settings Renderer.
+	 * @param FundingSourceRenderer    $funding_source_renderer The funding source renderer.
+	 * @param OrderProcessor           $order_processor The Order Processor.
+	 * @param ContainerInterface       $config The settings.
+	 * @param SessionHandler           $session_handler The Session Handler.
+	 * @param RefundProcessor          $refund_processor The Refund Processor.
+	 * @param State                    $state The state.
+	 * @param TransactionUrlProvider   $transaction_url_provider Service providing transaction view URL based on order.
+	 * @param SubscriptionHelper       $subscription_helper The subscription helper.
+	 * @param string                   $page_id ID of the current PPCP gateway settings page, or empty if it is not such page.
+	 * @param Environment              $environment The environment.
+	 * @param PaymentTokenRepository   $payment_token_repository The payment token repository.
+	 * @param LoggerInterface          $logger The logger.
+	 * @param string                   $api_shop_country The api shop country.
+	 * @param OrderEndpoint            $order_endpoint The order endpoint.
+	 * @param callable(string):string  $paypal_checkout_url_factory The function return the PayPal checkout URL for the given order ID.
+	 * @param string                   $place_order_button_text The text for the standard "Place order" button.
+	 * @param PaymentTokensEndpoint    $payment_tokens_endpoint Payment tokens endpoint.
+	 * @param bool                     $vault_v3_enabled Whether Vault v3 module is enabled.
 	 * @param WooCommercePaymentTokens $wc_payment_tokens WooCommerce payment tokens.
 	 */
 	public function __construct(
@@ -266,10 +266,10 @@ class PayPalGateway extends \WC_Payment_Gateway {
 		$this->api_shop_country            = $api_shop_country;
 		$this->paypal_checkout_url_factory = $paypal_checkout_url_factory;
 		$this->order_button_text           = $place_order_button_text;
-		$this->order_endpoint          = $order_endpoint;
-		$this->payment_tokens_endpoint = $payment_tokens_endpoint;
-		$this->vault_v3_enabled = $vault_v3_enabled;
-		$this->wc_payment_tokens = $wc_payment_tokens;
+		$this->order_endpoint              = $order_endpoint;
+		$this->payment_tokens_endpoint     = $payment_tokens_endpoint;
+		$this->vault_v3_enabled            = $vault_v3_enabled;
+		$this->wc_payment_tokens           = $wc_payment_tokens;
 
 		if ( $this->onboarded ) {
 			$this->supports = array( 'refunds', 'tokenization' );
@@ -536,10 +536,10 @@ class PayPalGateway extends \WC_Payment_Gateway {
 			&& $this->is_free_trial_order( $wc_order )
 			&& ! $this->subscription_helper->paypal_subscription_id()
 		) {
-			$ppcp_guest_payment_for_free_trial = WC()->session->get( 'ppcp_guest_payment_for_free_trial') ?? null;
-			if($this->vault_v3_enabled && $ppcp_guest_payment_for_free_trial) {
+			$ppcp_guest_payment_for_free_trial = WC()->session->get( 'ppcp_guest_payment_for_free_trial' ) ?? null;
+			if ( $this->vault_v3_enabled && $ppcp_guest_payment_for_free_trial ) {
 				$customer_id = $ppcp_guest_payment_for_free_trial->customer->id ?? '';
-				if($customer_id) {
+				if ( $customer_id ) {
 					update_user_meta( $wc_order->get_customer_id(), '_ppcp_target_customer_id', $customer_id );
 				}
 
@@ -556,7 +556,7 @@ class PayPalGateway extends \WC_Payment_Gateway {
 					);
 				}
 
-				WC()->session->set( 'ppcp_guest_payment_for_free_trial', null);
+				WC()->session->set( 'ppcp_guest_payment_for_free_trial', null );
 
 				$wc_order->payment_complete();
 				return $this->handle_payment_success( $wc_order );