woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-09-06 14:57:26 +08:00
Code Issues Projects Packages Wiki Activity Actions

Merge branch 'trunk' into PCP-1797-critical-error-when-editing-the-description-of-a-product-linked-with-a-pay-pal-subscription-to-exceed-127-characters

Browse source
This commit is contained in:
Emili Castells Guasch 2023-09-18 09:22:20 +02:00
commit 9a21e9df50
2 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php
View file

@ -180,10 +180,7 @@ class CreditCardGateway extends \WC_Payment_Gateway_CC {
'products', 'products',
); );
if ( if ( $this->config->has( 'vault_enabled_dcc' ) && $this->config->get( 'vault_enabled_dcc' ) ) {
( $this->config->has( 'vault_enabled_dcc' ) && $this->config->get( 'vault_enabled_dcc' ) )
|| ( $this->config->has( 'subscriptions_mode' ) && $this->config->get( 'subscriptions_mode' ) === 'subscriptions_api' )
) {
array_push( array_push(
$this->supports, $this->supports,
'subscriptions', 'subscriptions',

15
modules/ppcp-wc-gateway/src/Settings/SettingsListener.php
View file

@ -340,7 +340,20 @@ class SettingsListener {
* phpcs:disable WordPress.Security.NonceVerification.Missing * phpcs:disable WordPress.Security.NonceVerification.Missing
* phpcs:disable WordPress.Security.NonceVerification.Recommended * phpcs:disable WordPress.Security.NonceVerification.Recommended
*/ */
if ( ! isset( $_POST['ppcp']['vault_enabled'] ) ) { $vault_enabled = wc_clean( wp_unslash( $_POST['ppcp']['vault_enabled'] ?? '' ) );
$subscription_mode = wc_clean( wp_unslash( $_POST['ppcp']['subscriptions_mode'] ?? '' ) );
if ( $subscription_mode === 'vaulting_api' && $vault_enabled !== '1' ) {
$this->settings->set( 'vault_enabled', true );
$this->settings->persist();
}
if ( $subscription_mode === 'disable_paypal_subscriptions' && $vault_enabled === '1' ) {
$this->settings->set( 'vault_enabled', false );
$this->settings->persist();
}
if ( $vault_enabled !== '1' ) {
return; return;
} }