From 4d54d2d2554e198b7786579b131edc0cf49194c5 Mon Sep 17 00:00:00 2001 From: Emili Castells Guasch Date: Thu, 18 Jan 2024 10:39:33 +0100 Subject: [PATCH 1/5] Disable pay later block by default --- modules/ppcp-paylater-block/src/PayLaterBlockModule.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ppcp-paylater-block/src/PayLaterBlockModule.php b/modules/ppcp-paylater-block/src/PayLaterBlockModule.php index 38548feb8..9544c5686 100644 --- a/modules/ppcp-paylater-block/src/PayLaterBlockModule.php +++ b/modules/ppcp-paylater-block/src/PayLaterBlockModule.php @@ -28,7 +28,7 @@ class PayLaterBlockModule implements ModuleInterface { return apply_filters( // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores 'woocommerce.feature-flags.woocommerce_paypal_payments.paylater_block_enabled', - getenv( 'PCP_PAYLATER_BLOCK' ) !== '0' + getenv( 'PCP_PAYLATER_BLOCK' ) === '1' ); } From 8c8bee1c479f0b0195fced6934bef85842beb5cf Mon Sep 17 00:00:00 2001 From: Emili Castells Guasch Date: Thu, 18 Jan 2024 11:00:10 +0100 Subject: [PATCH 2/5] Add package tracking support for uk --- modules/ppcp-order-tracking/services.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ppcp-order-tracking/services.php b/modules/ppcp-order-tracking/services.php index 8b52fa2fe..493f31644 100644 --- a/modules/ppcp-order-tracking/services.php +++ b/modules/ppcp-order-tracking/services.php @@ -100,7 +100,7 @@ return array( */ return apply_filters( 'woocommerce_paypal_payments_supported_country_codes_for_second_version_of_tracking_api', - array( 'US', 'AU', 'CA', 'FR', 'DE', 'IT', 'ES' ) + array( 'US', 'AU', 'CA', 'FR', 'DE', 'IT', 'ES', 'GB' ) ); }, 'order-tracking.should-use-second-version-of-api' => static function ( ContainerInterface $container ): bool { From 9662e3508fd3bc4e87dc55f7ee787a6d535b90a6 Mon Sep 17 00:00:00 2001 From: Emili Castells Guasch Date: Thu, 18 Jan 2024 11:20:14 +0100 Subject: [PATCH 3/5] Update changelog --- changelog.txt | 2 +- readme.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index 54d11c182..72bbe5af4 100644 --- a/changelog.txt +++ b/changelog.txt @@ -5,7 +5,6 @@ * Fix - GooglePay and ApplePay buttons disappear from the minicart when adding a product to the cart on the shop page #1915 * Enhancement - Enable Vault v3 and Card Fields by default for US merchants #1967 * Enhancement - Vault v3 WC Subscriptions integration #1920 -* Enhancement - Add Pay Later Messaging block #1897 * Enhancement - Implement early WC validation for Hosted Card Fields #1925 * Enhancement - Rename button locations #1946 * Enhancement - Improve Apple Pay validation notice text #1938 @@ -14,6 +13,7 @@ * Enhancement - PHP 8.2 deprecations #1939 * Enhancement - Subscription support on Block Cart & Block Express Checkout #1956 * Enhancement - Venmo Vaulting integration #1958 +* Enhancement - Add package tracking support for UK #1970 = 2.4.3 - 2024-01-04 = * Fix - PayPal Subscription initiated without a WooCommerce order #1907 diff --git a/readme.txt b/readme.txt index 91b454067..b28b870d7 100644 --- a/readme.txt +++ b/readme.txt @@ -184,7 +184,6 @@ If you encounter issues with the PayPal buttons not appearing after an update, p * Fix - GooglePay and ApplePay buttons disappear from the minicart when adding a product to the cart on the shop page #1915 * Enhancement - Enable Vault v3 and Card Fields by default for US merchants #1967 * Enhancement - Vault v3 WC Subscriptions integration #1920 -* Enhancement - Add Pay Later Messaging block #1897 * Enhancement - Implement early WC validation for Hosted Card Fields #1925 * Enhancement - Rename button locations #1946 * Enhancement - Improve Apple Pay validation notice text #1938 @@ -193,6 +192,7 @@ If you encounter issues with the PayPal buttons not appearing after an update, p * Enhancement - PHP 8.2 deprecations #1939 * Enhancement - Subscription support on Block Cart & Block Express Checkout #1956 * Enhancement - Venmo Vaulting integration #1958 +* Enhancement - Add package tracking support for UK #1970 = 2.4.3 - 2024-01-04 = * Fix - PayPal Subscription initiated without a WooCommerce order #1907 From 544be89c0bdb7b74a0f39d1093e6c4d5c4917337 Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Thu, 18 Jan 2024 10:47:50 +0000 Subject: [PATCH 4/5] Fix warning undefined funding_source. --- .../ppcp-save-payment-methods/src/SavePaymentMethodsModule.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php b/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php index 1e4f70d9e..344d40cb8 100644 --- a/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php +++ b/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php @@ -106,8 +106,9 @@ class SavePaymentMethodsModule implements ModuleInterface { } if ( $payment_method === PayPalGateway::ID ) { + $funding_source = $request_data['funding_source'] ?? null; - if ( $request_data['funding_source'] === 'venmo' ) { + if ( $funding_source === 'venmo' ) { $data['payment_source'] = array( 'venmo' => array( 'attributes' => array( From 018ef05f26b486bed557c922a1a8a7098c79645a Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Thu, 18 Jan 2024 11:00:19 +0000 Subject: [PATCH 5/5] Fix warning undefined funding_source. --- .../ppcp-save-payment-methods/src/SavePaymentMethodsModule.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php b/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php index 344d40cb8..b86ccf9be 100644 --- a/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php +++ b/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php @@ -108,7 +108,7 @@ class SavePaymentMethodsModule implements ModuleInterface { if ( $payment_method === PayPalGateway::ID ) { $funding_source = $request_data['funding_source'] ?? null; - if ( $funding_source === 'venmo' ) { + if ( $funding_source && $funding_source === 'venmo' ) { $data['payment_source'] = array( 'venmo' => array( 'attributes' => array(