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] 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.