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-3172-fastlane-send-js-logs-to-woo-commerce-logger

Browse source
This commit is contained in:
Emili Castells Guasch 2024-05-29 12:54:27 +02:00
commit bdefa0dc5e
5 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
changelog.txt
View file

@ -1,6 +1,6 @@
*** Changelog ***
= 2.7.1 - xxxx-xx-xx =
= 2.7.1 - 2024-05-28 =
* Fix - Ensure package tracking data is sent to original PayPal transaction #2180
* Fix - Set the 'Woo_PPCP' as a default value for data-partner-attribution-id #2188
* Fix - Allow PUI Gateway for refund processor #2192
@ -9,6 +9,7 @@
* Fix - Allow shipping callback and skipping confirmation page from any express button #2236
* Fix - Pay Later messaging configurator sometimes displays old settings after saving #2249
* Fix - Update the apple-developer-merchantid-domain-association validation strings for Apple Pay #2251
* Fix - Enable the Shipping Callback handlers #2266
* Enhancement - Use admin theme color #1602
= 2.7.0 - 2024-04-30 =

6
modules/ppcp-button/resources/js/modules/Renderer/Renderer.js
View file

@ -102,10 +102,10 @@ class Renderer {
},
};
// Check the condition and add the onShippingOptionsChange handler if needed
// Check the condition and add the handler if needed
if (this.shouldHandleShippingInPaypal(venmoButtonClicked)) {
options.onShippingOptionsChange = (data, actions) => null;
options.onShippingAddressChange = (data, actions) => null;
options.onShippingOptionsChange = (data, actions) => handleShippingOptionsChange(data, actions, this.defaultSettings);
options.onShippingAddressChange = (data, actions) => handleShippingAddressChange(data, actions, this.defaultSettings);
}
return options;

4
modules/ppcp-paylater-configurator/services.php
View file

@ -17,12 +17,14 @@ use WooCommerce\PayPalCommerce\Vendor\Psr\Container\ContainerInterface;
return array(
'paylater-configurator.url' => static function ( ContainerInterface $container ): string {
/**
* The return value must not contain a trailing slash.
*
* Cannot return false for this path.
*
* @psalm-suppress PossiblyFalseArgument
*/
return plugins_url(
'/modules/ppcp-paylater-configurator/',
'/modules/ppcp-paylater-configurator',
dirname( realpath( __FILE__ ), 3 ) . '/woocommerce-paypal-payments.php'
);
},

11
modules/ppcp-wc-gateway/src/Processor/OrderProcessor.php
View file

@ -220,9 +220,14 @@ class OrderProcessor {
);
throw new PayPalOrderMissingException(
__(
'Could not retrieve order. Maybe it was already completed or this browser is not supported. Please check your email or try again with a different browser.',
'woocommerce-paypal-payments'
sprintf(
// translators: %s: Order history URL on My Account section.
esc_attr__(
'There was an error processing your order. Please check for any charges in your payment method and review your <a href="%s">order history</a> before placing the order again.',
// phpcs:ignore WordPress.WP.I18n.TextDomainMismatch -- Intentionally "woocommerce" to reflect the original message.
'woocommerce'
),
esc_url( wc_get_account_endpoint_url( 'orders' ) )
)
);
}

3
readme.txt
View file

@ -179,7 +179,7 @@ If you encounter issues with the PayPal buttons not appearing after an update, p
== Changelog ==
= 2.7.1 - xxxx-xx-xx =
= 2.7.1 - 2024-05-28 =
* Fix - Ensure package tracking data is sent to original PayPal transaction #2180
* Fix - Set the 'Woo_PPCP' as a default value for data-partner-attribution-id #2188
* Fix - Allow PUI Gateway for refund processor #2192
@ -188,6 +188,7 @@ If you encounter issues with the PayPal buttons not appearing after an update, p
* Fix - Allow shipping callback and skipping confirmation page from any express button #2236
* Fix - Pay Later messaging configurator sometimes displays old settings after saving #2249
* Fix - Update the apple-developer-merchantid-domain-association validation strings for Apple Pay #2251
* Fix - Enable the Shipping Callback handlers #2266
* Enhancement - Use admin theme color #1602
= 2.7.0 - 2024-04-30 =