Merge pull request #1979 from woocommerce/PCP-2084-free-trial-subscri…

…ption-products-using-pay-pal-vaulting-when-pay-pal-subscriptions-configured-as-subscriptions-mode Free trial subscription products using PayPal Vaulting when PayPal Subscriptions configured as Subscriptions Mode (2084)
woocommerce · Feb 1, 2024 · 9988675 · 9988675
2 parents f95fe26 + 0160e42
commit 9988675
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/modules/ppcp-button/resources/js/button.js b/modules/ppcp-button/resources/js/button.js
@@ -137,7 +137,7 @@ const bootstrap = () => {
         }
 
         const isFreeTrial = PayPalCommerceGateway.is_free_trial_cart;
-        if (isFreeTrial && data.fundingSource !== 'card') {
+        if (isFreeTrial && data.fundingSource !== 'card' && ! PayPalCommerceGateway.subscription_plan_id) {
             freeTrialHandler.handle();
             return actions.reject();
         }
@@ -241,6 +241,7 @@ document.addEventListener(
         if (!typeof (PayPalCommerceGateway)) {
             console.error('PayPal button could not be configured.');
             return;
+            return;
         }
 
         if (

diff --git a/modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php b/modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php
@@ -498,7 +498,7 @@ public function process_payment( $order_id ) {
 			$wc_order->save();
 		}
 
-		if ( 'card' !== $funding_source && $this->is_free_trial_order( $wc_order ) ) {
+		if ( 'card' !== $funding_source && $this->is_free_trial_order( $wc_order ) && ! $this->subscription_helper->paypal_subscription_id() ) {
 			$user_id = (int) $wc_order->get_customer_id();
 			$tokens  = $this->payment_token_repository->all_for_user_id( $user_id );
 			if ( ! array_filter(