From cfc10ff0d9fc9db562b1fdae69efc948389e7575 Mon Sep 17 00:00:00 2001
From: Alex P <alex.pantec@gmail.com>
Date: Tue, 21 Dec 2021 17:01:11 +0200
Subject: [PATCH 01/14] Add "View logs" link in settings

---
 modules/ppcp-wc-gateway/services.php | 3 ++-
 tests/PHPUnit/ModularTestCase.php    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/ppcp-wc-gateway/services.php b/modules/ppcp-wc-gateway/services.php
index cb6d3b604..29996a486 100644
--- a/modules/ppcp-wc-gateway/services.php
+++ b/modules/ppcp-wc-gateway/services.php
@@ -729,7 +729,8 @@ return array(
 				'title'        => __( 'Logging', 'woocommerce-paypal-payments' ),
 				'type'         => 'checkbox',
 				'desc_tip'     => true,
-				'label'        => __( 'Enable logging', 'woocommerce-paypal-payments' ),
+				'label'        => __( 'Enable logging. ', 'woocommerce-paypal-payments' ) .
+					' <a href="' . admin_url( 'admin.php?page=wc-status&tab=logs' ) . '">' . __( 'View logs', 'woocommerce-paypal-payments' ) . '</a>',
 				'description'  => __( 'Enable logging of unexpected behavior. This can also log private data and should only be enabled in a development or stage environment.', 'woocommerce-paypal-payments' ),
 				'default'      => false,
 				'screens'      => array(
diff --git a/tests/PHPUnit/ModularTestCase.php b/tests/PHPUnit/ModularTestCase.php
index be813085f..9756108ef 100644
--- a/tests/PHPUnit/ModularTestCase.php
+++ b/tests/PHPUnit/ModularTestCase.php
@@ -19,6 +19,7 @@ class ModularTestCase extends TestCase
         parent::setUp();
 
         when('get_option')->justReturn(null);
+        when('admin_url')->returnArg();
         when('plugins_url')->returnArg();
         when('plugin_dir_path')->alias(function ($file) { return trailingslashit(dirname($file)); });
         when('get_current_blog_id')->justReturn(42);

From b93d0acfcc4f4f2d38e46e486a689021d376427b Mon Sep 17 00:00:00 2001
From: Alex P <alex.pantec@gmail.com>
Date: Tue, 21 Dec 2021 17:51:28 +0200
Subject: [PATCH 02/14] Use translation from WC for "Place order" / "Pay for
 order"

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

diff --git a/modules/ppcp-button/src/Assets/SmartButton.php b/modules/ppcp-button/src/Assets/SmartButton.php
index 62ec1aa90..ccfa66d62 100644
--- a/modules/ppcp-button/src/Assets/SmartButton.php
+++ b/modules/ppcp-button/src/Assets/SmartButton.php
@@ -570,7 +570,8 @@ class SmartButton implements SmartButtonInterface {
 			return;
 		}
 
-		$label = 'checkout' === $this->context() ? __( 'Place order', 'woocommerce-paypal-payments' ) : __( 'Pay for order', 'woocommerce-paypal-payments' );
+		// phpcs:ignore WordPress.WP.I18n.TextDomainMismatch
+		$label = 'checkout' === $this->context() ? apply_filters( 'woocommerce_order_button_text', __( 'Place order', 'woocommerce' ) ) : __( 'Pay for order', 'woocommerce' );
 
 		printf(
 			'<div id="%1$s" style="display:none;">

From 6d0c821b191299eb1a895037dc1b89f4cb387188 Mon Sep 17 00:00:00 2001
From: dinamiko <e.castells@inpsyde.com>
Date: Tue, 4 Jan 2022 10:43:18 +0100
Subject: [PATCH 03/14] Check if pay for order contains subscription

---
 .../ppcp-button/src/Assets/SmartButton.php    | 11 ++++----
 .../src/Helper/SubscriptionHelper.php         | 27 +++++++++++++++++++
 .../PaymentTokenRepositoryTest.php            |  0
 3 files changed, 33 insertions(+), 5 deletions(-)
 rename tests/PHPUnit/{Subscription/Repository => Vaulting}/PaymentTokenRepositoryTest.php (100%)

diff --git a/modules/ppcp-button/src/Assets/SmartButton.php b/modules/ppcp-button/src/Assets/SmartButton.php
index 62ec1aa90..d72d1ffd3 100644
--- a/modules/ppcp-button/src/Assets/SmartButton.php
+++ b/modules/ppcp-button/src/Assets/SmartButton.php
@@ -215,11 +215,12 @@ class SmartButton implements SmartButtonInterface {
 				function ( array $default_fields, $id ) use ( $subscription_helper ) : array {
 					if ( is_user_logged_in() && $this->settings->has( 'vault_enabled' ) && $this->settings->get( 'vault_enabled' ) && CreditCardGateway::ID === $id ) {
 
-						if ( ! $subscription_helper->cart_contains_subscription() ) {
-							$default_fields['card-vault'] = sprintf(
-								'<p class="form-row form-row-wide"><label for="vault"><input class="ppcp-credit-card-vault" type="checkbox" id="ppcp-credit-card-vault" name="vault">%s</label></p>',
-								esc_html__( 'Save your Credit Card', 'woocommerce-paypal-payments' )
-							);
+						$default_fields['card-vault'] = sprintf(
+							'<p class="form-row form-row-wide"><label for="vault"><input class="ppcp-credit-card-vault" type="checkbox" id="ppcp-credit-card-vault" name="vault">%s</label></p>',
+							esc_html__( 'Save your Credit Card', 'woocommerce-paypal-payments' )
+						);
+						if ( $subscription_helper->cart_contains_subscription() || $subscription_helper->order_pay_contains_subscription() ) {
+							$default_fields['card-vault'] = '';
 						}
 
 						$tokens = $this->payment_token_repository->all_for_user_id( get_current_user_id() );
diff --git a/modules/ppcp-subscription/src/Helper/SubscriptionHelper.php b/modules/ppcp-subscription/src/Helper/SubscriptionHelper.php
index cd4b197dd..1c99ca144 100644
--- a/modules/ppcp-subscription/src/Helper/SubscriptionHelper.php
+++ b/modules/ppcp-subscription/src/Helper/SubscriptionHelper.php
@@ -55,6 +55,33 @@ class SubscriptionHelper {
 		return false;
 	}
 
+	/**
+	 * Whether pay for order contains subscriptions.
+	 *
+	 * @return bool
+	 */
+	public function order_pay_contains_subscription(): bool {
+		if ( ! $this->plugin_is_active() || ! is_wc_endpoint_url( 'order-pay' ) ) {
+			return false;
+		}
+
+		global $wp;
+		$order_id = (int) $wp->query_vars['order-pay'] ?? 0;
+		if ( 0 === $order_id ) {
+			return false;
+		}
+
+		$order = wc_get_order( $order_id );
+		foreach ( $order->get_items() as $item ) {
+			$product = wc_get_product( $item->get_product_id() );
+			if ( $product->get_type() === 'subscription' ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
 	/**
 	 * Whether only automatic payment gateways are accepted.
 	 *
diff --git a/tests/PHPUnit/Subscription/Repository/PaymentTokenRepositoryTest.php b/tests/PHPUnit/Vaulting/PaymentTokenRepositoryTest.php
similarity index 100%
rename from tests/PHPUnit/Subscription/Repository/PaymentTokenRepositoryTest.php
rename to tests/PHPUnit/Vaulting/PaymentTokenRepositoryTest.php

From 08d3dea790d9aa75464adf7672eb4fdbbb4303b6 Mon Sep 17 00:00:00 2001
From: dinamiko <e.castells@inpsyde.com>
Date: Tue, 4 Jan 2022 11:01:34 +0100
Subject: [PATCH 04/14] Check if pay for order contains subscription

---
 modules/ppcp-button/src/Assets/SmartButton.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/ppcp-button/src/Assets/SmartButton.php b/modules/ppcp-button/src/Assets/SmartButton.php
index d72d1ffd3..f5f6212f7 100644
--- a/modules/ppcp-button/src/Assets/SmartButton.php
+++ b/modules/ppcp-button/src/Assets/SmartButton.php
@@ -613,6 +613,10 @@ class SmartButton implements SmartButtonInterface {
 		if ( is_product() ) {
 			return $this->subscription_helper->current_product_is_subscription();
 		}
+		if ( is_wc_endpoint_url( 'order-pay' ) ) {
+			return $this->subscription_helper->order_pay_contains_subscription();
+		}
+
 		return $this->subscription_helper->cart_contains_subscription();
 	}
 

From ae886ea425ededefcd30778421d991b5762bd6fc Mon Sep 17 00:00:00 2001
From: dinamiko <e.castells@inpsyde.com>
Date: Tue, 4 Jan 2022 11:40:22 +0100
Subject: [PATCH 05/14] Fix psalm errors

---
 .../src/Helper/SubscriptionHelper.php              | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/ppcp-subscription/src/Helper/SubscriptionHelper.php b/modules/ppcp-subscription/src/Helper/SubscriptionHelper.php
index 1c99ca144..5a46d92ef 100644
--- a/modules/ppcp-subscription/src/Helper/SubscriptionHelper.php
+++ b/modules/ppcp-subscription/src/Helper/SubscriptionHelper.php
@@ -66,16 +66,20 @@ class SubscriptionHelper {
 		}
 
 		global $wp;
-		$order_id = (int) $wp->query_vars['order-pay'] ?? 0;
+		$order_id = (int) $wp->query_vars['order-pay'];
 		if ( 0 === $order_id ) {
 			return false;
 		}
 
 		$order = wc_get_order( $order_id );
-		foreach ( $order->get_items() as $item ) {
-			$product = wc_get_product( $item->get_product_id() );
-			if ( $product->get_type() === 'subscription' ) {
-				return true;
+		if ( is_a( $order, \WC_Order::class ) ) {
+			foreach ( $order->get_items() as $item ) {
+				if ( is_a( $item, \WC_Order_Item_Product::class ) ) {
+					$product = wc_get_product( $item->get_product_id() );
+					if ( is_a( $product, \WC_Product_Subscription::class ) ) {
+						return true;
+					}
+				}
 			}
 		}
 

From 9c72fbc2477571df2e007b4f817decd58372f55a Mon Sep 17 00:00:00 2001
From: dinamiko <e.castells@inpsyde.com>
Date: Tue, 4 Jan 2022 11:52:43 +0100
Subject: [PATCH 06/14] Fix psalm errors

---
 modules/ppcp-subscription/src/Helper/SubscriptionHelper.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/ppcp-subscription/src/Helper/SubscriptionHelper.php b/modules/ppcp-subscription/src/Helper/SubscriptionHelper.php
index 5a46d92ef..cf06ab5d3 100644
--- a/modules/ppcp-subscription/src/Helper/SubscriptionHelper.php
+++ b/modules/ppcp-subscription/src/Helper/SubscriptionHelper.php
@@ -76,6 +76,9 @@ class SubscriptionHelper {
 			foreach ( $order->get_items() as $item ) {
 				if ( is_a( $item, \WC_Order_Item_Product::class ) ) {
 					$product = wc_get_product( $item->get_product_id() );
+					/**
+					 * @psalm-suppress UndefinedClass
+					 */
 					if ( is_a( $product, \WC_Product_Subscription::class ) ) {
 						return true;
 					}

From fcd3317d05c3edd6652d336e7c570fd0204adb42 Mon Sep 17 00:00:00 2001
From: dinamiko <e.castells@inpsyde.com>
Date: Tue, 4 Jan 2022 12:01:21 +0100
Subject: [PATCH 07/14] Fix psalm errors

---
 modules/ppcp-subscription/src/Helper/SubscriptionHelper.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/ppcp-subscription/src/Helper/SubscriptionHelper.php b/modules/ppcp-subscription/src/Helper/SubscriptionHelper.php
index cf06ab5d3..1a49bb53b 100644
--- a/modules/ppcp-subscription/src/Helper/SubscriptionHelper.php
+++ b/modules/ppcp-subscription/src/Helper/SubscriptionHelper.php
@@ -77,6 +77,8 @@ class SubscriptionHelper {
 				if ( is_a( $item, \WC_Order_Item_Product::class ) ) {
 					$product = wc_get_product( $item->get_product_id() );
 					/**
+					 * Class already exist in subscriptions plugin.
+					 *
 					 * @psalm-suppress UndefinedClass
 					 */
 					if ( is_a( $product, \WC_Product_Subscription::class ) ) {

From d42cb3e47c2a2d4c4965ba91fa580e56c9460a0f Mon Sep 17 00:00:00 2001
From: Alex P <alex.pantec@gmail.com>
Date: Tue, 4 Jan 2022 17:30:26 +0200
Subject: [PATCH 08/14] Fix renewal logging

---
 .../ppcp-subscription/src/RenewalHandler.php  | 84 +++----------------
 .../Subscription/RenewalHandlerTest.php       |  4 +-
 2 files changed, 16 insertions(+), 72 deletions(-)

diff --git a/modules/ppcp-subscription/src/RenewalHandler.php b/modules/ppcp-subscription/src/RenewalHandler.php
index 5517f27bb..7451dee9d 100644
--- a/modules/ppcp-subscription/src/RenewalHandler.php
+++ b/modules/ppcp-subscription/src/RenewalHandler.php
@@ -90,52 +90,23 @@ class RenewalHandler {
 	 * @param \WC_Order $wc_order The WooCommerce order.
 	 */
 	public function renew( \WC_Order $wc_order ) {
-
-		$this->logger->log(
-			'info',
-			sprintf(
-				// translators: %d is the id of the order.
-				__( 'Start moneytransfer for order %d', 'woocommerce-paypal-payments' ),
-				(int) $wc_order->get_id()
-			),
-			array(
-				'order' => $wc_order,
-			)
-		);
-
 		try {
 			$this->process_order( $wc_order );
 		} catch ( \Exception $error ) {
-			$this->logger->log(
-				'error',
+			$this->logger->error(
 				sprintf(
-					// translators: %1$d is the order number, %2$s the error message.
-					__(
-						'An error occured while trying to renew the subscription for order %1$d: %2$s',
-						'woocommerce-paypal-payments'
-					),
-					(int) $wc_order->get_id(),
+					'An error occurred while trying to renew the subscription for order %1$d: %2$s',
+					$wc_order->get_id(),
 					$error->getMessage()
-				),
-				array(
-					'order' => $wc_order,
 				)
 			);
 
 			return;
 		}
-		$this->logger->log(
-			'info',
+		$this->logger->info(
 			sprintf(
-				// translators: %d is the order number.
-				__(
-					'Moneytransfer for order %d is completed.',
-					'woocommerce-paypal-payments'
-				),
-				(int) $wc_order->get_id()
-			),
-			array(
-				'order' => $wc_order,
+				'Renewal for order %d is completed.',
+				$wc_order->get_id()
 			)
 		);
 	}
@@ -164,7 +135,10 @@ class RenewalHandler {
 			$token
 		);
 
-		$this->capture_order( $order, $wc_order );
+		if ( $order->intent() === 'AUTHORIZE' ) {
+			$this->order_endpoint->authorize( $order );
+			$wc_order->update_meta_data( AuthorizedPaymentsProcessor::CAPTURED_META_KEY, 'false' );
+		}
 	}
 
 	/**
@@ -185,12 +159,8 @@ class RenewalHandler {
 		if ( ! $tokens ) {
 
 			$error_message = sprintf(
-			// translators: %d is the customer id.
-				__(
-					'Payment failed. No payment tokens found for customer %d.',
-					'woocommerce-paypal-payments'
-				),
-				(int) $customer->get_id()
+				'Payment failed. No payment tokens found for customer %d.',
+				$customer->get_id()
 			);
 
 			$wc_order->update_status(
@@ -198,14 +168,7 @@ class RenewalHandler {
 				$error_message
 			);
 
-			$this->logger->log(
-				'error',
-				$error_message,
-				array(
-					'customer' => $customer,
-					'order'    => $wc_order,
-				)
-			);
+			$this->logger->error( $error_message );
 		}
 
 		$subscription = function_exists( 'wcs_get_subscription' ) ? wcs_get_subscription( $wc_order->get_meta( '_subscription_renewal' ) ) : null;
@@ -223,25 +186,4 @@ class RenewalHandler {
 
 		return current( $tokens );
 	}
-
-	/**
-	 * If the PayPal order is captured/authorized the WooCommerce order gets updated accordingly.
-	 *
-	 * @param Order     $order The PayPal order.
-	 * @param \WC_Order $wc_order The related WooCommerce order.
-	 */
-	private function capture_order( Order $order, \WC_Order $wc_order ) {
-
-		if ( $order->intent() === 'CAPTURE' && $order->status()->is( OrderStatus::COMPLETED ) ) {
-			$wc_order->update_status(
-				'processing',
-				__( 'Payment received.', 'woocommerce-paypal-payments' )
-			);
-		}
-
-		if ( $order->intent() === 'AUTHORIZE' ) {
-			$this->order_endpoint->authorize( $order );
-			$wc_order->update_meta_data( AuthorizedPaymentsProcessor::CAPTURED_META_KEY, 'false' );
-		}
-	}
 }
diff --git a/tests/PHPUnit/Subscription/RenewalHandlerTest.php b/tests/PHPUnit/Subscription/RenewalHandlerTest.php
index 09c82f3cc..114825c5c 100644
--- a/tests/PHPUnit/Subscription/RenewalHandlerTest.php
+++ b/tests/PHPUnit/Subscription/RenewalHandlerTest.php
@@ -37,6 +37,9 @@ class RenewalHandlerTest extends TestCase
         $this->purchaseUnitFactory = Mockery::mock(PurchaseUnitFactory::class);
         $this->payerFactory = Mockery::mock(PayerFactory::class);
 
+		$this->logger->shouldReceive('error');
+		$this->logger->shouldReceive('info');
+
         $this->sut = new RenewalHandler(
             $this->logger,
             $this->repository,
@@ -59,7 +62,6 @@ class RenewalHandlerTest extends TestCase
         $payer = Mockery::mock(Payer::class);
         $order = Mockery::mock(Order::class);
 
-        $this->logger->shouldReceive('log');
         $wcOrder
             ->shouldReceive('get_id')
             ->andReturn(1);

From 7bcff0c39cc7f9834f66fbaa81660515c8d19a3c Mon Sep 17 00:00:00 2001
From: Alex P <alex.pantec@gmail.com>
Date: Wed, 5 Jan 2022 15:25:22 +0200
Subject: [PATCH 09/14] Update renewal to be similar to other order handlers

---
 modules/ppcp-subscription/services.php        |  4 ++-
 .../ppcp-subscription/src/RenewalHandler.php  | 34 ++++++++++++++++---
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/modules/ppcp-subscription/services.php b/modules/ppcp-subscription/services.php
index dbd78239a..b4f25c52d 100644
--- a/modules/ppcp-subscription/services.php
+++ b/modules/ppcp-subscription/services.php
@@ -23,12 +23,14 @@ return array(
 		$endpoint              = $container->get( 'api.endpoint.order' );
 		$purchase_unit_factory = $container->get( 'api.factory.purchase-unit' );
 		$payer_factory         = $container->get( 'api.factory.payer' );
+		$environment           = $container->get( 'onboarding.environment' );
 		return new RenewalHandler(
 			$logger,
 			$repository,
 			$endpoint,
 			$purchase_unit_factory,
-			$payer_factory
+			$payer_factory,
+			$environment
 		);
 	},
 	'subscription.repository.payment-token' => static function ( ContainerInterface $container ): PaymentTokenRepository {
diff --git a/modules/ppcp-subscription/src/RenewalHandler.php b/modules/ppcp-subscription/src/RenewalHandler.php
index 7451dee9d..e2815baf6 100644
--- a/modules/ppcp-subscription/src/RenewalHandler.php
+++ b/modules/ppcp-subscription/src/RenewalHandler.php
@@ -10,21 +10,26 @@ declare(strict_types=1);
 namespace WooCommerce\PayPalCommerce\Subscription;
 
 use WooCommerce\PayPalCommerce\ApiClient\Endpoint\OrderEndpoint;
-use WooCommerce\PayPalCommerce\ApiClient\Entity\Order;
-use WooCommerce\PayPalCommerce\ApiClient\Entity\OrderStatus;
 use WooCommerce\PayPalCommerce\ApiClient\Entity\PaymentToken;
 use WooCommerce\PayPalCommerce\ApiClient\Factory\PayerFactory;
 use WooCommerce\PayPalCommerce\ApiClient\Factory\PurchaseUnitFactory;
+use WooCommerce\PayPalCommerce\Onboarding\Environment;
 use WooCommerce\PayPalCommerce\Vaulting\PaymentTokenRepository;
-use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayPalGateway;
 use Psr\Log\LoggerInterface;
 use WooCommerce\PayPalCommerce\WcGateway\Processor\AuthorizedPaymentsProcessor;
+use WooCommerce\PayPalCommerce\WcGateway\Processor\OrderMetaTrait;
+use WooCommerce\PayPalCommerce\WcGateway\Processor\PaymentsStatusHandlingTrait;
+use WooCommerce\PayPalCommerce\WcGateway\Processor\TransactionIdHandlingTrait;
 
 /**
  * Class RenewalHandler
  */
 class RenewalHandler {
 
+	use OrderMetaTrait;
+	use TransactionIdHandlingTrait;
+	use PaymentsStatusHandlingTrait;
+
 	/**
 	 * The logger.
 	 *
@@ -60,6 +65,13 @@ class RenewalHandler {
 	 */
 	private $payer_factory;
 
+	/**
+	 * The environment.
+	 *
+	 * @var Environment
+	 */
+	protected $environment;
+
 	/**
 	 * RenewalHandler constructor.
 	 *
@@ -68,13 +80,15 @@ class RenewalHandler {
 	 * @param OrderEndpoint          $order_endpoint The order endpoint.
 	 * @param PurchaseUnitFactory    $purchase_unit_factory The purchase unit factory.
 	 * @param PayerFactory           $payer_factory The payer factory.
+	 * @param Environment            $environment The environment.
 	 */
 	public function __construct(
 		LoggerInterface $logger,
 		PaymentTokenRepository $repository,
 		OrderEndpoint $order_endpoint,
 		PurchaseUnitFactory $purchase_unit_factory,
-		PayerFactory $payer_factory
+		PayerFactory $payer_factory,
+		Environment $environment
 	) {
 
 		$this->logger                = $logger;
@@ -82,6 +96,7 @@ class RenewalHandler {
 		$this->order_endpoint        = $order_endpoint;
 		$this->purchase_unit_factory = $purchase_unit_factory;
 		$this->payer_factory         = $payer_factory;
+		$this->environment           = $environment;
 	}
 
 	/**
@@ -135,10 +150,19 @@ class RenewalHandler {
 			$token
 		);
 
+		$this->add_paypal_meta( $wc_order, $order, $this->environment );
+
 		if ( $order->intent() === 'AUTHORIZE' ) {
-			$this->order_endpoint->authorize( $order );
+			$order = $this->order_endpoint->authorize( $order );
 			$wc_order->update_meta_data( AuthorizedPaymentsProcessor::CAPTURED_META_KEY, 'false' );
 		}
+
+		$transaction_id = $this->get_paypal_order_transaction_id( $order );
+		if ( $transaction_id ) {
+			$this->update_transaction_id( $transaction_id, $wc_order );
+		}
+
+		$this->handle_new_order_status( $order, $wc_order );
 	}
 
 	/**

From 2ab379c98248f9452fdc848908c5e5733f2dd2d2 Mon Sep 17 00:00:00 2001
From: Alex P <alex.pantec@gmail.com>
Date: Wed, 5 Jan 2022 15:25:40 +0200
Subject: [PATCH 10/14] Fix test

---
 .../Subscription/RenewalHandlerTest.php       | 169 +++++++++++-------
 1 file changed, 109 insertions(+), 60 deletions(-)

diff --git a/tests/PHPUnit/Subscription/RenewalHandlerTest.php b/tests/PHPUnit/Subscription/RenewalHandlerTest.php
index 114825c5c..fc92fcf9f 100644
--- a/tests/PHPUnit/Subscription/RenewalHandlerTest.php
+++ b/tests/PHPUnit/Subscription/RenewalHandlerTest.php
@@ -3,90 +3,139 @@ declare(strict_types=1);
 
 namespace WooCommerce\PayPalCommerce\Subscription;
 
+use Dhii\Container\Dictionary;
+use Exception;
 use Psr\Log\LoggerInterface;
 use WooCommerce\PayPalCommerce\ApiClient\Endpoint\OrderEndpoint;
+use WooCommerce\PayPalCommerce\ApiClient\Entity\Capture;
+use WooCommerce\PayPalCommerce\ApiClient\Entity\CaptureStatus;
 use WooCommerce\PayPalCommerce\ApiClient\Entity\Order;
 use WooCommerce\PayPalCommerce\ApiClient\Entity\Payer;
+use WooCommerce\PayPalCommerce\ApiClient\Entity\Payments;
 use WooCommerce\PayPalCommerce\ApiClient\Entity\PaymentToken;
 use WooCommerce\PayPalCommerce\ApiClient\Entity\PurchaseUnit;
 use WooCommerce\PayPalCommerce\ApiClient\Factory\PayerFactory;
 use WooCommerce\PayPalCommerce\ApiClient\Factory\PurchaseUnitFactory;
+use WooCommerce\PayPalCommerce\Onboarding\Environment;
 use WooCommerce\PayPalCommerce\TestCase;
 use Mockery;
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use WooCommerce\PayPalCommerce\Vaulting\PaymentTokenRepository;
+use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayPalGateway;
 
 class RenewalHandlerTest extends TestCase
 {
-    use MockeryPHPUnitIntegration;
+	use MockeryPHPUnitIntegration;
 
-    private $logger;
-    private $repository;
-    private $orderEndpoint;
-    private $purchaseUnitFactory;
-    private $payerFactory;
-    private $sut;
+	private $logger;
+	private $repository;
+	private $orderEndpoint;
+	private $purchaseUnitFactory;
+	private $payerFactory;
+	private $environment;
+	private $sut;
 
-    public function setUp(): void
-    {
-        parent::setUp();
+	public function setUp(): void
+	{
+		parent::setUp();
 
-        $this->logger = Mockery::mock(LoggerInterface::class);
-        $this->repository = Mockery::mock(PaymentTokenRepository::class);
-        $this->orderEndpoint = Mockery::mock(OrderEndpoint::class);
-        $this->purchaseUnitFactory = Mockery::mock(PurchaseUnitFactory::class);
-        $this->payerFactory = Mockery::mock(PayerFactory::class);
+		$this->logger = Mockery::mock(LoggerInterface::class);
+		$this->repository = Mockery::mock(PaymentTokenRepository::class);
+		$this->orderEndpoint = Mockery::mock(OrderEndpoint::class);
+		$this->purchaseUnitFactory = Mockery::mock(PurchaseUnitFactory::class);
+		$this->payerFactory = Mockery::mock(PayerFactory::class);
+		$this->environment = new Environment(new Dictionary([]));
 
-		$this->logger->shouldReceive('error');
+		$this->logger->shouldReceive('error')->andReturnUsing(function ($msg) {
+			throw new Exception($msg);
+		});
 		$this->logger->shouldReceive('info');
 
-        $this->sut = new RenewalHandler(
-            $this->logger,
-            $this->repository,
-            $this->orderEndpoint,
-            $this->purchaseUnitFactory,
-            $this->payerFactory
-        );
-    }
+		$this->sut = new RenewalHandler(
+			$this->logger,
+			$this->repository,
+			$this->orderEndpoint,
+			$this->purchaseUnitFactory,
+			$this->payerFactory,
+			$this->environment
+		);
+	}
 
-    /**
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     */
-    public function testRenewProcessOrder()
-    {
-        $wcOrder = Mockery::mock(\WC_Order::class);
-        $customer = Mockery::mock('overload:WC_Customer');
-        $token = Mockery::mock(PaymentToken::class);
-        $purchaseUnit = Mockery::mock(PurchaseUnit::class);
-        $payer = Mockery::mock(Payer::class);
-        $order = Mockery::mock(Order::class);
+	/**
+	 * @runInSeparateProcess
+	 * @preserveGlobalState disabled
+	 */
+	public function testRenewProcessOrder()
+	{
+		$transactionId = 'ABC123';
+		$wcOrder = Mockery::mock(\WC_Order::class);
+		$customer = Mockery::mock('overload:WC_Customer');
+		$token = Mockery::mock(PaymentToken::class);
+		$payer = Mockery::mock(Payer::class);
+		$order = Mockery::mock(Order::class);
 
-        $wcOrder
-            ->shouldReceive('get_id')
-            ->andReturn(1);
-        $wcOrder
-            ->shouldReceive('get_customer_id')
-            ->andReturn(1);
-        $this->repository->shouldReceive('for_user_id')
-            ->andReturn($token);
-        $customer->shouldReceive('get_id')
-            ->andReturn(1);
-        $this->purchaseUnitFactory->shouldReceive('from_wc_order')
-            ->andReturn($purchaseUnit);
-        $this->payerFactory->shouldReceive('from_customer')
-            ->andReturn($payer);
+		$capture = Mockery::mock(Capture::class);
+		$capture->expects('id')
+			->andReturn($transactionId);
+		$capture->expects('status')
+			->andReturn(new CaptureStatus(CaptureStatus::COMPLETED));
 
-        $this->orderEndpoint->shouldReceive('create')
-            ->with([$purchaseUnit], $payer, $token)
-            ->andReturn($order);
+		$payments = Mockery::mock(Payments::class);
+		$payments->shouldReceive('captures')
+			->andReturn([$capture]);
 
-        $order->shouldReceive('intent')
-            ->andReturn('CAPTURE');
-        $order->shouldReceive('status->is')
-            ->andReturn(true);
-        $wcOrder->shouldReceive('update_status');
+		$purchaseUnit = Mockery::mock(PurchaseUnit::class);
+		$purchaseUnit->shouldReceive('payments')
+			->andReturn($payments);
 
-        $this->sut->renew($wcOrder);
-    }
+		$order
+			->shouldReceive('id')
+			->andReturn('101');
+		$order->shouldReceive('intent')
+			->andReturn('CAPTURE');
+		$order->shouldReceive('status->is')
+			->andReturn(true);
+		$order
+			->shouldReceive('purchase_units')
+			->andReturn([$purchaseUnit]);
+
+		$wcOrder
+			->shouldReceive('get_id')
+			->andReturn(1);
+		$wcOrder
+			->shouldReceive('get_customer_id')
+			->andReturn(2);
+		$wcOrder
+			->expects('update_meta_data')
+			->with(PayPalGateway::ORDER_ID_META_KEY, '101');
+		$wcOrder
+			->expects('update_meta_data')
+			->with(PayPalGateway::INTENT_META_KEY, 'CAPTURE');
+		$wcOrder
+			->expects('update_meta_data')
+			->with(PayPalGateway::ORDER_PAYMENT_MODE_META_KEY, 'live');
+		$wcOrder
+			->expects('payment_complete');
+		$wcOrder
+			->expects('set_transaction_id');
+
+		$this->repository->shouldReceive('all_for_user_id')
+			->andReturn([$token]);
+
+		$customer->shouldReceive('get_id')
+			->andReturn(1);
+
+		$this->purchaseUnitFactory->shouldReceive('from_wc_order')
+			->andReturn($purchaseUnit);
+		$this->payerFactory->shouldReceive('from_customer')
+			->andReturn($payer);
+
+		$this->orderEndpoint->shouldReceive('create')
+			->with([$purchaseUnit], $payer, $token)
+			->andReturn($order);
+
+		$wcOrder->shouldReceive('update_status');
+
+		$this->sut->renew($wcOrder);
+	}
 }

From a432e39436acd4ead8fa5785d33a2f21623185ae Mon Sep 17 00:00:00 2001
From: Alex P <alex.pantec@gmail.com>
Date: Thu, 6 Jan 2022 13:41:12 +0200
Subject: [PATCH 11/14] Do not use get_woocommerce_currency

---
 modules/ppcp-api-client/services.php | 8 +++++++-
 tests/PHPUnit/ModularTestCase.php    | 1 -
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/ppcp-api-client/services.php b/modules/ppcp-api-client/services.php
index 49b1408bf..23aff1b99 100644
--- a/modules/ppcp-api-client/services.php
+++ b/modules/ppcp-api-client/services.php
@@ -322,7 +322,13 @@ return array(
 	},
 
 	'api.shop.currency'                         => static function ( ContainerInterface $container ) : string {
-		return get_woocommerce_currency();
+		// We use option instead of get_woocommerce_currency
+		// because it will not be overridden by currency switching plugins.
+		$currency = get_option( 'woocommerce_currency' );
+		if ( ! $currency ) {
+			return 'NO_CURRENCY'; // Unlikely to happen.
+		}
+		return $currency;
 	},
 	'api.shop.country'                          => static function ( ContainerInterface $container ) : string {
 		$location = wc_get_base_location();
diff --git a/tests/PHPUnit/ModularTestCase.php b/tests/PHPUnit/ModularTestCase.php
index be813085f..111792f85 100644
--- a/tests/PHPUnit/ModularTestCase.php
+++ b/tests/PHPUnit/ModularTestCase.php
@@ -25,7 +25,6 @@ class ModularTestCase extends TestCase
         when('get_site_url')->justReturn('example.com');
         when('get_bloginfo')->justReturn('My Shop');
         when('wc_get_base_location')->justReturn(['country' => 'US']);
-        when('get_woocommerce_currency')->justReturn('USD');
         when('WC')->justReturn((object) [
         	'session' => null,
 		]);

From 8e703061a8d994dd416280b25910be6555b366c2 Mon Sep 17 00:00:00 2001
From: Alex P <alex.pantec@gmail.com>
Date: Thu, 6 Jan 2022 14:46:42 +0200
Subject: [PATCH 12/14] Do not log reference transactions checks

---
 .../src/Endpoint/BillingAgreementsEndpoint.php   | 16 +++++++++++-----
 .../src/Endpoint/RequestTrait.php                | 11 ++++++++++-
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/modules/ppcp-api-client/src/Endpoint/BillingAgreementsEndpoint.php b/modules/ppcp-api-client/src/Endpoint/BillingAgreementsEndpoint.php
index 3fd590367..e226253a2 100644
--- a/modules/ppcp-api-client/src/Endpoint/BillingAgreementsEndpoint.php
+++ b/modules/ppcp-api-client/src/Endpoint/BillingAgreementsEndpoint.php
@@ -120,11 +120,17 @@ class BillingAgreementsEndpoint {
 	 */
 	public function reference_transaction_enabled(): bool {
 		try {
-			$this->create_token(
-				'Checking if reference transactions are enabled',
-				'https://example.com/return',
-				'https://example.com/cancel'
-			);
+			$this->is_request_logging_enabled = false;
+
+			try {
+				$this->create_token(
+					'Checking if reference transactions are enabled',
+					'https://example.com/return',
+					'https://example.com/cancel'
+				);
+			} finally {
+				$this->is_request_logging_enabled = true;
+			}
 
 			return true;
 		} catch ( PayPalApiException $exception ) {
diff --git a/modules/ppcp-api-client/src/Endpoint/RequestTrait.php b/modules/ppcp-api-client/src/Endpoint/RequestTrait.php
index 8c05e27db..c4cbb2a45 100644
--- a/modules/ppcp-api-client/src/Endpoint/RequestTrait.php
+++ b/modules/ppcp-api-client/src/Endpoint/RequestTrait.php
@@ -16,6 +16,13 @@ use WP_Error;
  */
 trait RequestTrait {
 
+	/**
+	 * Whether to log the detailed request/response info.
+	 *
+	 * @var bool
+	 */
+	protected $is_request_logging_enabled = true;
+
 	/**
 	 * Performs a request
 	 *
@@ -39,7 +46,9 @@ trait RequestTrait {
 		}
 
 		$response = wp_remote_get( $url, $args );
-		$this->logger->debug( $this->request_response_string( $url, $args, $response ) );
+		if ( $this->is_request_logging_enabled ) {
+			$this->logger->debug( $this->request_response_string( $url, $args, $response ) );
+		}
 		return $response;
 	}
 

From df311e5f5df0e0258a5dbdd5789ecdd385d5a93f Mon Sep 17 00:00:00 2001
From: Alex P <alex.pantec@gmail.com>
Date: Thu, 6 Jan 2022 15:30:20 +0200
Subject: [PATCH 13/14] Add AMEX AUD

---
 modules/ppcp-api-client/services.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/ppcp-api-client/services.php b/modules/ppcp-api-client/services.php
index 49b1408bf..4dcf39223 100644
--- a/modules/ppcp-api-client/services.php
+++ b/modules/ppcp-api-client/services.php
@@ -510,6 +510,7 @@ return array(
 			'AU' => array(
 				'mastercard' => array(),
 				'visa'       => array(),
+				'amex'       => array( 'AUD' ),
 			),
 			'ES' => array(
 				'mastercard' => array(),

From ed1c41ec13a981685731e44b31fe7c47c3492fdc Mon Sep 17 00:00:00 2001
From: Alex P <alex.pantec@gmail.com>
Date: Thu, 6 Jan 2022 16:02:23 +0200
Subject: [PATCH 14/14] Add ACDC availability link

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

diff --git a/modules/ppcp-wc-gateway/src/Settings/SettingsRenderer.php b/modules/ppcp-wc-gateway/src/Settings/SettingsRenderer.php
index 3ffcaf3e0..39c6c8390 100644
--- a/modules/ppcp-wc-gateway/src/Settings/SettingsRenderer.php
+++ b/modules/ppcp-wc-gateway/src/Settings/SettingsRenderer.php
@@ -538,6 +538,14 @@ $data_rows_html
 						'woocommerce-paypal-payments'
 					);
 					?>
+					<a href="https://developer.paypal.com/docs/checkout/advanced/currency-availability-advanced-cards/">
+						<?php
+						esc_html_e(
+							'Advanced credit and debit country and currency availability.',
+							'woocommerce-paypal-payments'
+						);
+						?>
+					</a>
 				</p>
 			</td>
 		</tr>