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 'PCP-632-smart-buttons-not-loading' into PCP-163-pay-later-message-bug

Browse source
This commit is contained in:
Narek Zakarian 2022-05-06 17:34:13 +04:00
commit 6ac84bc801
2 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/ppcp-button/resources/js/modules/Renderer/CreditCardRenderer.js
View file

@ -13,7 +13,6 @@ class CreditCardRenderer {
} }
render(wrapper, contextConfig) { render(wrapper, contextConfig) {
if ( if (
( (
this.defaultConfig.context !== 'checkout' this.defaultConfig.context !== 'checkout'
@ -42,6 +41,9 @@ class CreditCardRenderer {
} }
const gateWayBox = document.querySelector('.payment_box.payment_method_ppcp-credit-card-gateway'); const gateWayBox = document.querySelector('.payment_box.payment_method_ppcp-credit-card-gateway');
if(! gateWayBox) {
return
}
const oldDisplayStyle = gateWayBox.style.display; const oldDisplayStyle = gateWayBox.style.display;
gateWayBox.style.display = 'block'; gateWayBox.style.display = 'block';

32
modules/ppcp-button/src/Assets/SmartButton.php
View file

@ -445,28 +445,21 @@ class SmartButton implements SmartButtonInterface {
); );
} }
if ( $this->is_cart_price_total_zero() && ! $this->is_free_trial_cart() ) { add_action( $this->checkout_button_renderer_hook(), array( $this, 'button_renderer' ), 10 );
return false;
}
$not_enabled_on_cart = $this->settings->has( 'button_cart_enabled' ) && $not_enabled_on_cart = $this->settings->has( 'button_cart_enabled' ) &&
! $this->settings->get( 'button_cart_enabled' ); ! $this->settings->get( 'button_cart_enabled' );
if ( add_action(
is_cart() $this->proceed_to_checkout_button_renderer_hook(),
&& ! $not_enabled_on_cart function() use ( $not_enabled_on_cart ) {
&& ! $this->is_free_trial_cart() if ( ! is_cart() || $not_enabled_on_cart || $this->is_free_trial_cart() || $this->is_cart_price_total_zero() ) {
) { return;
add_action( }
$this->proceed_to_checkout_button_renderer_hook(),
array(
$this,
'button_renderer',
),
20
);
}
add_action( $this->checkout_button_renderer_hook(), array( $this, 'button_renderer' ), 10 ); $this->button_renderer();
},
20
);
return true; return true;
} }
@ -1221,10 +1214,11 @@ class SmartButton implements SmartButtonInterface {
* Check if cart product price total is 0. * Check if cart product price total is 0.
* *
* @return bool true if is 0, otherwise false. * @return bool true if is 0, otherwise false.
* @psalm-suppress RedundantConditionGivenDocblockType
*/ */
protected function is_cart_price_total_zero(): bool { protected function is_cart_price_total_zero(): bool {
// phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
return WC()->cart->get_cart_contents_total() == 0; return WC()->cart && WC()->cart->get_total( 'numeric' ) == 0;
} }
/** /**