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

Merge remote-tracking branch 'origin/trunk' into PCP-915-create-pay-later-tab

Browse source 
# Conflicts:
#	modules/ppcp-button/services.php
This commit is contained in:
Narek Zakarian 2022-11-09 19:16:59 +04:00
commit e189325766
46 changed files with 1029 additions and 207 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -373,6 +373,7 @@ class SmartButton implements SmartButtonInterface {
if (
( is_product() || wc_post_content_has_shortcode( 'product_page' ) )
&& ! $not_enabled_on_product_page
&& ! is_checkout()
) {
add_action(
$this->single_product_renderer_hook(),
@ -413,6 +414,7 @@ class SmartButton implements SmartButtonInterface {
// TODO: it seems like there is no easy way to properly handle vaulted PayPal free trial,
// so disable the buttons for now everywhere except checkout for free trial.
&& ! $this->is_free_trial_product()
&& ! is_checkout()
) {
add_action(
$this->single_product_renderer_hook(),