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 11

Merge branch 'trunk' into PCP-3644-apple-pay-button-disappears-on-classic-checkout

Browse source
This commit is contained in:
Alex P. 2024-10-29 21:41:23 +02:00
commit db273075c4
No known key found for this signature in database
GPG key ID: 54487A734A204D71
141 changed files with 7321 additions and 1086 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/ppcp-googlepay/services.php
View file

@ -174,6 +174,7 @@ return array(
$container->get( 'googlepay.sdk_url' ),
$container->get( 'ppcp.asset-version' ),
$container->get( 'session.handler' ),
$container->get( 'wc-subscriptions.helper' ),
$container->get( 'wcgateway.settings' ),
$container->get( 'onboarding.environment' ),
$container->get( 'wcgateway.settings.status' ),

2
modules/ppcp-googlepay/src/Assets/BlocksPaymentMethod.php
View file

@ -107,7 +107,7 @@ class BlocksPaymentMethod extends AbstractPaymentMethodType {
'id' => $this->name,
'title' => $paypal_data['title'], // See if we should use another.
'description' => $paypal_data['description'], // See if we should use another.
'enabled' => $paypal_data['enabled'], // This button is enabled when PayPal buttons are.
'enabled' => $paypal_data['smartButtonsEnabled'], // This button is enabled when PayPal buttons are.
'scriptData' => $this->button->script_data(),
);
}

58
modules/ppcp-googlepay/src/Assets/Button.php
View file

@ -21,6 +21,7 @@ use WooCommerce\PayPalCommerce\Session\SessionHandler;
use WooCommerce\PayPalCommerce\WcGateway\Exception\NotFoundException;
use WooCommerce\PayPalCommerce\WcGateway\Helper\SettingsStatus;
use WooCommerce\PayPalCommerce\WcGateway\Settings\Settings;
use WooCommerce\PayPalCommerce\WcSubscriptions\Helper\SubscriptionHelper;
/**
* Class Button
@ -85,37 +86,47 @@ class Button implements ButtonInterface {
*/
private $session_handler;
/**
* The Subscription Helper.
*
* @var SubscriptionHelper
*/
private $subscription_helper;
/**
* SmartButton constructor.
*
* @param string $module_url The URL to the module.
* @param string $sdk_url The URL to the SDK.
* @param string $version The assets version.
* @param SessionHandler $session_handler The Session handler.
* @param Settings $settings The Settings.
* @param Environment $environment The environment object.
* @param SettingsStatus $settings_status The Settings status helper.
* @param LoggerInterface $logger The logger.
* @param string $module_url The URL to the module.
* @param string $sdk_url The URL to the SDK.
* @param string $version The assets version.
* @param SessionHandler $session_handler The Session handler.
* @param SubscriptionHelper $subscription_helper The subscription helper.
* @param Settings $settings The Settings.
* @param Environment $environment The environment object.
* @param SettingsStatus $settings_status The Settings status helper.
* @param LoggerInterface $logger The logger.
*/
public function __construct(
string $module_url,
string $sdk_url,
string $version,
SessionHandler $session_handler,
SubscriptionHelper $subscription_helper,
Settings $settings,
Environment $environment,
SettingsStatus $settings_status,
LoggerInterface $logger
) {
$this->module_url = $module_url;
$this->sdk_url = $sdk_url;
$this->version = $version;
$this->session_handler = $session_handler;
$this->settings = $settings;
$this->environment = $environment;
$this->settings_status = $settings_status;
$this->logger = $logger;
$this->module_url = $module_url;
$this->sdk_url = $sdk_url;
$this->version = $version;
$this->session_handler = $session_handler;
$this->subscription_helper = $subscription_helper;
$this->settings = $settings;
$this->environment = $environment;
$this->settings_status = $settings_status;
$this->logger = $logger;
}
/**
@ -233,6 +244,21 @@ class Button implements ButtonInterface {
$button_enabled_payorder = true;
$button_enabled_minicart = $this->settings_status->is_smart_button_enabled_for_location( 'mini-cart' );
if (
$this->subscription_helper->plugin_is_active()
&& ! $this->subscription_helper->accept_manual_renewals()
) {
if ( is_product() && $this->subscription_helper->current_product_is_subscription() ) {
return false;
}
if ( $this->subscription_helper->order_pay_contains_subscription() ) {
return false;
}
if ( $this->subscription_helper->cart_contains_subscription() ) {
return false;
}
}
/**
* Param types removed to avoid third-party issues.
*