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

Merge branch 'trunk' into PCP-1970-unify-conditional-display-logic-for-plugin-settings

Browse source 
# Conflicts:
#	modules/ppcp-wc-gateway/resources/js/SettingsHandler/SubElementsHandler.js
This commit is contained in:
Pedro Silva 2023-09-19 09:45:35 +01:00
commit a9766c01e1
No known key found for this signature in database
GPG key ID: E2EE20C0669D24B3
6 changed files with 39 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',
);
if (
( $this->config->has( 'vault_enabled_dcc' ) && $this->config->get( 'vault_enabled_dcc' ) )
|| ( $this->config->has( 'subscriptions_mode' ) && $this->config->get( 'subscriptions_mode' ) === 'subscriptions_api' )
) {
if ( $this->config->has( 'vault_enabled_dcc' ) && $this->config->get( 'vault_enabled_dcc' ) ) {
array_push(
$this->supports,
'subscriptions',

1
modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php
View file

@ -543,6 +543,7 @@ class PayPalGateway extends \WC_Payment_Gateway {
}
$wc_order->payment_complete();
return $this->handle_payment_success( $wc_order );
}

2
modules/ppcp-wc-gateway/src/Gateway/ProcessPaymentTrait.php
View file

@ -77,6 +77,7 @@ trait ProcessPaymentTrait {
}
$this->session_handler->destroy_session_data();
WC()->session->set( 'ppcp_subscription_id', '' );
wc_add_notice( $error->getMessage(), 'error' );
@ -100,6 +101,7 @@ trait ProcessPaymentTrait {
}
$this->session_handler->destroy_session_data();
WC()->session->set( 'ppcp_subscription_id', '' );
return array(
'result' => 'success',

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.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;
}

12
tests/PHPUnit/WcGateway/Gateway/CreditCardGatewayTest.php
View file

@ -78,6 +78,12 @@ class CreditCardGatewayTest extends TestCase
$wc_order = Mockery::mock(WC_Order::class);
when('wc_get_order')->justReturn($wc_order);
$woocommerce = Mockery::mock(\WooCommerce::class);
$session = Mockery::mock(\WC_Session::class);
when('WC')->justReturn($woocommerce);
$woocommerce->session = $session;
$session->shouldReceive('set')->andReturn([]);
$this->orderProcessor->shouldReceive('process')
->with($wc_order)
->andReturn(true);
@ -95,6 +101,12 @@ class CreditCardGatewayTest extends TestCase
$wc_order->shouldReceive('get_customer_id')->andReturn(1);
when('wc_get_order')->justReturn($wc_order);
$woocommerce = Mockery::mock(\WooCommerce::class);
$session = Mockery::mock(\WC_Session::class);
when('WC')->justReturn($woocommerce);
$woocommerce->session = $session;
$session->shouldReceive('set')->andReturn([]);
$savedCreditCard = 'abc123';
$_POST['saved_credit_card'] = $savedCreditCard;

9
tests/PHPUnit/WcGateway/Gateway/WcGatewayTest.php
View file

@ -147,9 +147,11 @@ class WcGatewayTest extends TestCase
when('WC')->justReturn($woocommerce);
$woocommerce->cart = $cart;
$cart->shouldReceive('empty_cart');
$session = Mockery::mock(\WC_Session::class);
$woocommerce->session = $session;
$session->shouldReceive('get');
$session->shouldReceive('set');
$result = $testee->process_payment($orderId);
@ -164,6 +166,12 @@ class WcGatewayTest extends TestCase
$testee = $this->createGateway();
$woocommerce = Mockery::mock(\WooCommerce::class);
$session = Mockery::mock(\WC_Session::class);
when('WC')->justReturn($woocommerce);
$woocommerce->session = $session;
$session->shouldReceive('set')->andReturn([]);
expect('wc_get_order')
->with($orderId)
->andReturn(false);
@ -227,6 +235,7 @@ class WcGatewayTest extends TestCase
$session = Mockery::mock(\WC_Session::class);
$woocommerce->session = $session;
$session->shouldReceive('get');
$session->shouldReceive('set');
$result = $testee->process_payment($orderId);