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

Merge branch 'trunk' into PCP-2768-zero-sum-subscriptions-cause-cannot-be-zero-or-negative-when-using-vault-v-3

Browse source
This commit is contained in:
Emili Castells Guasch 2024-04-05 14:50:44 +02:00
commit 5917f69c4c
3 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
changelog.txt
View file

@ -4,6 +4,7 @@
* Fix - Payment tokens fixes and adjustments #2106 * Fix - Payment tokens fixes and adjustments #2106
* Fix - Pay upon Invoice: Add input validation to Experience Context fields #2092 * Fix - Pay upon Invoice: Add input validation to Experience Context fields #2092
* Fix - Disable markup in get_plugin_data() returns to fix an issue with wptexturize() #2094 * Fix - Disable markup in get_plugin_data() returns to fix an issue with wptexturize() #2094
* Fix - Problem changing the shipping option in block pages #2142
* Enhancement - Pay later messaging configurator improvements #2107 * Enhancement - Pay later messaging configurator improvements #2107
* Enhancement - Replace the middleware URL from connect.woocommerce.com to api.woocommerce.com/integrations #2130 * Enhancement - Replace the middleware URL from connect.woocommerce.com to api.woocommerce.com/integrations #2130
* Enhancement - Remove all Sofort references as it has been deprecated #2124 * Enhancement - Remove all Sofort references as it has been deprecated #2124

2
modules/ppcp-blocks/resources/js/checkout-block.js
View file

@ -299,6 +299,7 @@ const PayPalComponent = ({
try { try {
const shippingOptionId = data.selectedShippingOption?.id; const shippingOptionId = data.selectedShippingOption?.id;
if (shippingOptionId) { if (shippingOptionId) {
await wp.data.dispatch('wc/store/cart').selectShippingRate(shippingOptionId);
await shippingData.setSelectedRates(shippingOptionId); await shippingData.setSelectedRates(shippingOptionId);
} }
@ -358,6 +359,7 @@ const PayPalComponent = ({
try { try {
const shippingOptionId = data.selectedShippingOption?.id; const shippingOptionId = data.selectedShippingOption?.id;
if (shippingOptionId) { if (shippingOptionId) {
await wp.data.dispatch('wc/store/cart').selectShippingRate(shippingOptionId);
await shippingData.setSelectedRates(shippingOptionId); await shippingData.setSelectedRates(shippingOptionId);
} }
} catch (e) { } catch (e) {

1
readme.txt
View file

@ -183,6 +183,7 @@ If you encounter issues with the PayPal buttons not appearing after an update, p
* Fix - Payment tokens fixes and adjustments #2106 * Fix - Payment tokens fixes and adjustments #2106
* Fix - Pay upon Invoice: Add input validation to Experience Context fields #2092 * Fix - Pay upon Invoice: Add input validation to Experience Context fields #2092
* Fix - Disable markup in get_plugin_data() returns to fix an issue with wptexturize() #2094 * Fix - Disable markup in get_plugin_data() returns to fix an issue with wptexturize() #2094
* Fix - Problem changing the shipping option in block pages #2142
* Enhancement - Pay later messaging configurator improvements #2107 * Enhancement - Pay later messaging configurator improvements #2107
* Enhancement - Replace the middleware URL from connect.woocommerce.com to api.woocommerce.com/integrations #2130 * Enhancement - Replace the middleware URL from connect.woocommerce.com to api.woocommerce.com/integrations #2130
* Enhancement - Remove all Sofort references as it has been deprecated #2124 * Enhancement - Remove all Sofort references as it has been deprecated #2124