woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-08-30 05:00:51 +08:00
Code Issues Projects Packages Wiki Activity Actions 18

Merge pull request #3410 from woocommerce/PCP-4254-mexico-installments-new-ux-updates-bcdc-fix

Browse source 
Add Mexico-specific logic for BCDC (4254)
This commit is contained in:
Emili Castells 2025-05-26 16:19:01 +02:00 • committed by GitHub
commit b5c9a6f5f4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 127 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/ppcp-button/services.php
View file

@ -346,7 +346,8 @@ return array(
return new DisabledFundingSources(
$container->get( 'wcgateway.settings' ),
$container->get( 'wcgateway.all-funding-sources' ),
$container->get( 'wcgateway.configuration.card-configuration' )
$container->get( 'wcgateway.configuration.card-configuration' ),
$container->get( 'settings.data.general' )->get_merchant_country()
);
},
'button.is-logged-in' => static function ( ContainerInterface $container ): bool {

18
modules/ppcp-button/src/Helper/DisabledFundingSources.php
View file

@ -13,6 +13,7 @@ use WooCommerce\PayPalCommerce\WcGateway\Exception\NotFoundException;
use WooCommerce\PayPalCommerce\WcGateway\Settings\Settings;
use WooCommerce\PayPalCommerce\WcSubscriptions\FreeTrialHandlerTrait;
use WooCommerce\PayPalCommerce\WcGateway\Helper\CardPaymentsConfiguration;
use WooCommerce\PayPalCommerce\WcGateway\Helper\CartCheckoutDetector;
/**
* Class DisabledFundingSources
@ -42,17 +43,26 @@ class DisabledFundingSources {
*/
private CardPaymentsConfiguration $dcc_configuration;
/**
* Merchant Country
*
* @var string
*/
private string $merchant_country;
/**
* DisabledFundingSources constructor.
*
* @param Settings $settings The settings.
* @param array $all_funding_sources All existing funding sources.
* @param CardPaymentsConfiguration $dcc_configuration DCC gateway configuration.
* @param string $merchant_country Merchant country.
*/
public function __construct( Settings $settings, array $all_funding_sources, CardPaymentsConfiguration $dcc_configuration ) {
public function __construct( Settings $settings, array $all_funding_sources, CardPaymentsConfiguration $dcc_configuration, string $merchant_country ) {
$this->settings = $settings;
$this->all_funding_sources = $all_funding_sources;
$this->dcc_configuration = $dcc_configuration;
$this->merchant_country = $merchant_country;
}
/**
@ -145,11 +155,13 @@ class DisabledFundingSources {
* @return array
*/
private function apply_context_rules( array $disable_funding ) : array {
if ( 'MX' === $this->merchant_country && $this->dcc_configuration->is_bcdc_enabled() && CartCheckoutDetector::has_classic_checkout() && is_checkout() ) {
return $disable_funding;
}
if ( ! is_checkout() || $this->dcc_configuration->use_acdc() ) {
// Non-checkout pages, or ACDC capability: Don't load card button.
$disable_funding[] = 'card';
return $disable_funding;
}
return $disable_funding;

14
modules/ppcp-settings/services.php
View file

@ -575,16 +575,16 @@ return array(
'acdc' => $features['advanced_credit_and_debit_cards']['enabled'] ?? false,
'save_paypal' => $features['save_paypal_and_venmo']['enabled'] ?? false,
'alternative_payment_methods' => $features['alternative_payment_methods']['enabled'] ?? false,
'installments' => $features['installments']['enabled'] ?? false,
'installments' => $features['installments']['enabled'] ?? false,
);
$merchant_capabilities = array(
'save_paypal' => $capabilities['save_paypal'], // Save PayPal and Venmo eligibility.
'acdc' => $capabilities['acdc'], // Advanced credit and debit cards eligibility.
'apm' => $capabilities['alternative_payment_methods'], // Alternative payment methods eligibility.
'google_pay' => $capabilities['acdc'] && $capabilities['google_pay'], // Google Pay eligibility.
'apple_pay' => $capabilities['acdc'] && $capabilities['apple_pay'], // Apple Pay eligibility.
'pay_later' => $capabilities['acdc'] && ! $gateways['card-button'], // Pay Later eligibility.
'save_paypal' => $capabilities['save_paypal'], // Save PayPal and Venmo eligibility.
'acdc' => $capabilities['acdc'], // Advanced credit and debit cards eligibility.
'apm' => $capabilities['alternative_payment_methods'], // Alternative payment methods eligibility.
'google_pay' => $capabilities['acdc'] && $capabilities['google_pay'], // Google Pay eligibility.
'apple_pay' => $capabilities['acdc'] && $capabilities['apple_pay'], // Apple Pay eligibility.
'pay_later' => $capabilities['acdc'] && ! $gateways['card-button'], // Pay Later eligibility.
'installments' => $capabilities['installments'], // Installments eligibility.
);
return new FeaturesDefinition(

3
modules/ppcp-wc-gateway/services.php
View file

@ -1404,7 +1404,8 @@ return array(
$container->get( 'settings.connection-state' ),
$container->get( 'wcgateway.settings' ),
$container->get( 'api.helpers.dccapplies' ),
$container->get( 'wcgateway.helper.dcc-product-status' )
$container->get( 'wcgateway.helper.dcc-product-status' ),
$container->get( 'settings.data.general' )
);
},

18
modules/ppcp-wc-gateway/src/Helper/CardPaymentsConfiguration.php
View file

@ -13,6 +13,7 @@ declare( strict_types = 1 );
namespace WooCommerce\PayPalCommerce\WcGateway\Helper;
use WooCommerce\PayPalCommerce\Settings\Data\GeneralSettings;
use WooCommerce\PayPalCommerce\WcGateway\Settings\Settings;
use WooCommerce\PayPalCommerce\WcGateway\Exception\NotFoundException;
use WooCommerce\PayPalCommerce\Axo\Helper\PropertiesDictionary;
@ -69,6 +70,13 @@ class CardPaymentsConfiguration {
*/
private DCCProductStatus $dcc_status;
/**
* General Settings
*
* @var GeneralSettings
*/
private GeneralSettings $general_settings;
/**
* This classes lazily resolves settings on first access. This flag indicates
* whether the setting values were resolved, or still need to be evaluated.
@ -134,17 +142,20 @@ class CardPaymentsConfiguration {
* @param Settings $settings Plugin settings instance.
* @param DccApplies $dcc_applies DCC eligibility helper.
* @param DCCProductStatus $dcc_status Manages the Seller status.
* @param GeneralSettings $general_settings General settings instance.
*/
public function __construct(
ConnectionState $connection_state,
Settings $settings,
DccApplies $dcc_applies,
DCCProductStatus $dcc_status
DCCProductStatus $dcc_status,
GeneralSettings $general_settings
) {
$this->connection_state = $connection_state;
$this->settings = $settings;
$this->dcc_applies = $dcc_applies;
$this->dcc_status = $dcc_status;
$this->general_settings = $general_settings;
$this->is_resolved = false;
}
@ -319,6 +330,11 @@ class CardPaymentsConfiguration {
* @return bool
*/
public function is_bcdc_enabled() : bool {
if ( 'MX' === $this->general_settings->get_merchant_country() ) {
$bcdc_setting = get_option( 'woocommerce_ppcp-card-button-gateway_settings' );
return 'yes' === $bcdc_setting['enabled'];
}
return $this->is_enabled() && ! $this->use_acdc();
}

87
tests/PHPUnit/Button/Helper/DisabledFundingSourcesTest.php
View file

@ -32,10 +32,11 @@ class DisabledFundingSourcesTest extends TestCase
{
$this->dcc_configuration->shouldReceive('is_enabled')->andReturn(true);
$this->dcc_configuration->shouldReceive('use_acdc')->andReturn(true);
$sut = new DisabledFundingSources($this->settings, [], $this->dcc_configuration);
$sut = new DisabledFundingSources($this->settings, [], $this->dcc_configuration, 'US');
$this->setExpectations();
$this->setWcPaymentGateways();
$this->setWooCommerceFunctionMocks();
when('is_checkout')->justReturn(true);
@ -50,10 +51,11 @@ class DisabledFundingSourcesTest extends TestCase
{
$this->dcc_configuration->shouldReceive('is_enabled')->andReturn(true);
$this->dcc_configuration->shouldReceive('use_acdc')->andReturn(true);
$sut = new DisabledFundingSources($this->settings, [], $this->dcc_configuration);
$sut = new DisabledFundingSources($this->settings, [], $this->dcc_configuration, 'US');
$this->setExpectations();
$this->setWcPaymentGateways();
$this->setWooCommerceFunctionMocks();
when('is_checkout')->justReturn(false);
@ -71,17 +73,82 @@ class DisabledFundingSourcesTest extends TestCase
'paypal' => 'PayPal',
'foo' => 'Bar',
],
$this->dcc_configuration
$this->dcc_configuration,
'US'
);
$this->setExpectations();
$this->setWcPaymentGateways();
$this->setWooCommerceFunctionMocks();
when('is_checkout')->justReturn(true);
$this->assertEquals(['card', 'foo'], $sut->sources('checkout-block'));
}
/**
* Test Mexico-specific logic: BCDC enabled should not disable card funding
*/
public function test_mexico_bcdc_enabled_does_not_disable_card_funding()
{
$this->dcc_configuration->shouldReceive('is_enabled')->andReturn(true);
$this->dcc_configuration->shouldReceive('use_acdc')->andReturn(false); // Changed to false
$this->dcc_configuration->shouldReceive('is_bcdc_enabled')->andReturn(true);
$sut = new DisabledFundingSources($this->settings, [], $this->dcc_configuration, 'MX');
$this->setExpectations();
$this->setWcPaymentGateways();
$this->setWooCommerceFunctionMocks();
when('is_checkout')->justReturn(true);
// For Mexico with BCDC enabled, card should not be in disabled funding sources
$this->assertEquals([], $sut->sources('checkout-block'));
}
/**
* Test Mexico-specific logic: BCDC disabled should disable card funding
*/
public function test_mexico_bcdc_disabled_disables_card_funding()
{
$this->dcc_configuration->shouldReceive('is_enabled')->andReturn(true);
$this->dcc_configuration->shouldReceive('use_acdc')->andReturn(true); // This should cause card to be disabled
$this->dcc_configuration->shouldReceive('is_bcdc_enabled')->andReturn(false);
$sut = new DisabledFundingSources($this->settings, [], $this->dcc_configuration, 'MX');
$this->setExpectations();
$this->setWcPaymentGateways();
$this->setWooCommerceFunctionMocks();
when('is_checkout')->justReturn(true);
// For Mexico with BCDC disabled, card should be in disabled funding sources
$this->assertEquals(['card'], $sut->sources('checkout-block'));
}
/**
* Test non-Mexico country behavior remains unchanged
*/
public function test_non_mexico_country_behavior_unchanged()
{
$this->dcc_configuration->shouldReceive('is_enabled')->andReturn(true);
$this->dcc_configuration->shouldReceive('use_acdc')->andReturn(true);
// BCDC method should not be called for non-Mexico countries
$sut = new DisabledFundingSources($this->settings, [], $this->dcc_configuration, 'CA');
$this->setExpectations();
$this->setWcPaymentGateways();
$this->setWooCommerceFunctionMocks();
when('is_checkout')->justReturn(true);
// For non-Mexico countries, existing logic applies
$this->assertEquals(['card'], $sut->sources('checkout-block'));
}
private function setExpectations(
array $disabledFundings = [],
bool $dccEnambled = true
@ -113,4 +180,18 @@ class DisabledFundingSourcesTest extends TestCase
$payment_gateways->shouldReceive('get_available_payment_gateways')
->andReturn($paymentGateways);
}
/**
* Set up common WooCommerce function mocks
*/
private function setWooCommerceFunctionMocks(): void
{
when('wc_get_page_id')->justReturn(123);
when('has_block')->justReturn(false);
when('get_post')->justReturn((object) [
'ID' => 123,
'post_content' => 'Mock post content',
'post_type' => 'page'
]);
}
}