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 pull request #2396 from woocommerce/next-version

Browse source 
Merge next-version into trunk
This commit is contained in:
Emili Castells 2024-07-09 14:54:49 +02:00 • committed by GitHub
commit 8dea9b3273
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/ppcp-axo/resources/js/AxoManager.js
View file

@ -277,10 +277,13 @@ class AxoManager {
this.el.watermarkContainer.show(); this.el.watermarkContainer.show();
// Add class to customer details container.
this.$(this.el.axoCustomerDetails.selector).addClass('col-1');
} else { } else {
this.shippingView.deactivate(); this.shippingView.deactivate();
this.billingView.deactivate(); this.billingView.deactivate();
this.cardView.deactivate(); this.cardView.deactivate();
this.$(this.el.axoCustomerDetails.selector).removeClass('col-1');
} }
if (scenario.axoPaymentContainer) { if (scenario.axoPaymentContainer) {

41
modules/ppcp-axo/src/AxoModule.php
View file

@ -25,7 +25,7 @@ use WooCommerce\PayPalCommerce\WcGateway\Gateway\CreditCardGateway;
use WooCommerce\PayPalCommerce\WcGateway\Settings\Settings; use WooCommerce\PayPalCommerce\WcGateway\Settings\Settings;
use WooCommerce\PayPalCommerce\WcGateway\Helper\CartCheckoutDetector; use WooCommerce\PayPalCommerce\WcGateway\Helper\CartCheckoutDetector;
use WooCommerce\PayPalCommerce\WcGateway\Settings\SettingsListener; use WooCommerce\PayPalCommerce\WcGateway\Settings\SettingsListener;
use WooCommerce\PayPalCommerce\WcSubscriptions\Helper\SubscriptionHelper;
/** /**
* Class AxoModule * Class AxoModule
*/ */
@ -107,12 +107,9 @@ class AxoModule implements ModuleInterface {
return $methods; return $methods;
} }
$settings = $c->get( 'wcgateway.settings' );
assert( $settings instanceof Settings );
if ( apply_filters( if ( apply_filters(
'woocommerce_paypal_payments_axo_hide_credit_card_gateway', 'woocommerce_paypal_payments_axo_hide_credit_card_gateway',
$this->hide_credit_card_when_using_fastlane( $methods, $settings ) $this->hide_credit_card_when_using_fastlane( $methods, $c )
) ) { ) ) {
unset( $methods[ CreditCardGateway::ID ] ); unset( $methods[ CreditCardGateway::ID ] );
} }
@ -160,13 +157,10 @@ class AxoModule implements ModuleInterface {
'wp_enqueue_scripts', 'wp_enqueue_scripts',
static function () use ( $c, $manager, $module ) { static function () use ( $c, $manager, $module ) {
$settings = $c->get( 'wcgateway.settings' );
assert( $settings instanceof Settings );
$smart_button = $c->get( 'button.smart-button' ); $smart_button = $c->get( 'button.smart-button' );
assert( $smart_button instanceof SmartButtonInterface ); assert( $smart_button instanceof SmartButtonInterface );
if ( $module->should_render_fastlane( $settings ) && $smart_button->should_load_ppcp_script() ) { if ( $module->should_render_fastlane( $c ) && $smart_button->should_load_ppcp_script() ) {
$manager->enqueue(); $manager->enqueue();
} }
} }
@ -243,10 +237,8 @@ class AxoModule implements ModuleInterface {
add_action( add_action(
'template_redirect', 'template_redirect',
function () use ( $c ) { function () use ( $c ) {
$settings = $c->get( 'wcgateway.settings' );
assert( $settings instanceof Settings );
if ( $this->should_render_fastlane( $settings ) ) { if ( $this->should_render_fastlane( $c ) ) {
WC()->session->set( 'chosen_payment_method', AxoGateway::ID ); WC()->session->set( 'chosen_payment_method', AxoGateway::ID );
} }
} }
@ -319,12 +311,12 @@ class AxoModule implements ModuleInterface {
/** /**
* Condition to evaluate if Credit Card gateway should be hidden. * Condition to evaluate if Credit Card gateway should be hidden.
* *
* @param array $methods WC payment methods. * @param array $methods WC payment methods.
* @param Settings $settings The settings. * @param ContainerInterface $c The container.
* @return bool * @return bool
*/ */
private function hide_credit_card_when_using_fastlane( array $methods, Settings $settings ): bool { private function hide_credit_card_when_using_fastlane( array $methods, ContainerInterface $c ): bool {
return $this->should_render_fastlane( $settings ) && isset( $methods[ CreditCardGateway::ID ] ); return $this->should_render_fastlane( $c ) && isset( $methods[ CreditCardGateway::ID ] );
} }
/** /**
@ -332,18 +324,25 @@ class AxoModule implements ModuleInterface {
* *
* Fastlane should only render on the classic checkout, when Fastlane is enabled in the settings and also only for guest customers. * Fastlane should only render on the classic checkout, when Fastlane is enabled in the settings and also only for guest customers.
* *
* @param Settings $settings The settings. * @param ContainerInterface $c The container.
* @return bool * @return bool
*/ */
private function should_render_fastlane( Settings $settings ): bool { private function should_render_fastlane( ContainerInterface $c ): bool {
$settings = $c->get( 'wcgateway.settings' );
assert( $settings instanceof Settings );
$is_axo_enabled = $settings->has( 'axo_enabled' ) && $settings->get( 'axo_enabled' ) ?? false; $is_axo_enabled = $settings->has( 'axo_enabled' ) && $settings->get( 'axo_enabled' ) ?? false;
$is_dcc_enabled = $settings->has( 'dcc_enabled' ) && $settings->get( 'dcc_enabled' ) ?? false; $is_dcc_enabled = $settings->has( 'dcc_enabled' ) && $settings->get( 'dcc_enabled' ) ?? false;
$subscription_helper = $c->get( 'wc-subscriptions.helper' );
assert( $subscription_helper instanceof SubscriptionHelper );
return ! is_user_logged_in() return ! is_user_logged_in()
&& CartCheckoutDetector::has_classic_checkout() && CartCheckoutDetector::has_classic_checkout()
&& $is_axo_enabled && $is_axo_enabled
&& $is_dcc_enabled && $is_dcc_enabled
&& ! $this->is_excluded_endpoint(); && ! $this->is_excluded_endpoint()
&& ! $subscription_helper->cart_contains_subscription();
} }
/** /**
@ -353,10 +352,8 @@ class AxoModule implements ModuleInterface {
* @return void * @return void
*/ */
private function add_checkout_loader_markup( ContainerInterface $c ): void { private function add_checkout_loader_markup( ContainerInterface $c ): void {
$settings = $c->get( 'wcgateway.settings' );
assert( $settings instanceof Settings );
if ( $this->should_render_fastlane( $settings ) ) { if ( $this->should_render_fastlane( $c ) ) {
add_action( add_action(
'woocommerce_checkout_before_customer_details', 'woocommerce_checkout_before_customer_details',
function () { function () {