🔀 Merge branch 'trunk'

This commit is contained in:
Philipp Stracker 2024-05-29 16:15:18 +02:00
commit 85bd842c7a
No known key found for this signature in database
2 changed files with 11 additions and 4 deletions

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

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