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

Merge branch 'trunk' into pcp-370-onboarding

Browse source
This commit is contained in:
Alex P 2022-01-21 15:06:16 +02:00
commit 8b3f6cb613
26 changed files with 231 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -121,8 +121,7 @@ return array(
'wcgateway.disabler' => static function ( ContainerInterface $container ): DisableGateways {
$session_handler = $container->get( 'session.handler' );
$settings = $container->get( 'wcgateway.settings' );
$subscription_helper = $container->get( 'subscription.helper' );
return new DisableGateways( $session_handler, $settings, $subscription_helper );
return new DisableGateways( $session_handler, $settings );
},
'wcgateway.is-wc-payments-page' => static function ( ContainerInterface $container ): bool {
$page = isset( $_GET['page'] ) ? sanitize_text_field( wp_unslash( $_GET['page'] ) ) : '';
@ -2035,7 +2034,7 @@ return array(
'wcgateway.url' => static function ( ContainerInterface $container ): string {
return plugins_url(
$container->get( 'wcgateway.relative-path' ),
dirname( __FILE__, 3 ) . '/woocommerce-paypal-payments.php'
dirname( realpath( __FILE__ ), 3 ) . '/woocommerce-paypal-payments.php'
);
},
'wcgateway.relative-path' => static function( ContainerInterface $container ): string {
@ -2043,7 +2042,7 @@ return array(
},
'wcgateway.absolute-path' => static function( ContainerInterface $container ): string {
return plugin_dir_path(
dirname( __FILE__, 3 ) . '/woocommerce-paypal-payments.php'
dirname( realpath( __FILE__ ), 3 ) . '/woocommerce-paypal-payments.php'
) .
$container->get( 'wcgateway.relative-path' );
},

2
modules/ppcp-wc-gateway/src/Assets/SettingsPageAssets.php
View file

@ -59,7 +59,7 @@ class SettingsPageAssets {
add_action(
'admin_enqueue_scripts',
function() use ( $bearer ) {
if ( ! is_admin() || is_ajax() ) {
if ( ! is_admin() || wp_doing_ajax() ) {
return;
}

21
modules/ppcp-wc-gateway/src/Checkout/DisableGateways.php
View file

@ -10,7 +10,6 @@ declare(strict_types=1);
namespace WooCommerce\PayPalCommerce\WcGateway\Checkout;
use WooCommerce\PayPalCommerce\Session\SessionHandler;
use WooCommerce\PayPalCommerce\Subscription\Helper\SubscriptionHelper;
use WooCommerce\PayPalCommerce\WcGateway\Gateway\CreditCardGateway;
use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayPalGateway;
use Psr\Container\ContainerInterface;
@ -34,29 +33,19 @@ class DisableGateways {
*/
private $settings;
/**
* The subscription helper
*
* @var SubscriptionHelper
*/
private $subscription_helper;
/**
* DisableGateways constructor.
*
* @param SessionHandler $session_handler The Session Handler.
* @param ContainerInterface $settings The Settings.
* @param SubscriptionHelper $subscription_helper The subscription helper.
*/
public function __construct(
SessionHandler $session_handler,
ContainerInterface $settings,
SubscriptionHelper $subscription_helper
ContainerInterface $settings
) {
$this->session_handler = $session_handler;
$this->settings = $settings;
$this->subscription_helper = $subscription_helper;
$this->session_handler = $session_handler;
$this->settings = $settings;
}
/**
@ -110,10 +99,6 @@ class DisableGateways {
return true;
}
if ( $this->subscription_helper->cart_contains_subscription() && ! is_user_logged_in() ) {
return true;
}
return false;
}