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 'trunk' into PCP-2521-apple-pay-recurring-payments

Browse source 
# Conflicts:
#	modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php
This commit is contained in:
Pedro Silva 2024-01-18 11:34:15 +00:00
commit 300e8f377c
No known key found for this signature in database
GPG key ID: E2EE20C0669D24B3
5 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
changelog.txt
View file

@ -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

2
modules/ppcp-order-tracking/services.php
View file

@ -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 {

2
modules/ppcp-paylater-block/src/PayLaterBlockModule.php
View file

@ -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'
);
}

2
modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php
View file

@ -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(

2
readme.txt
View file

@ -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