woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-09-01 07:02:48 +08:00
Code Issues Projects Packages Wiki Activity Actions

Check validation errors when submitting in block

Browse source
This commit is contained in:
Alex P 2023-07-21 10:49:50 +03:00
parent 0672ca4950
commit 08fb1d3350
No known key found for this signature in database
GPG key ID: 54487A734A204D71
1 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,7 +18,7 @@ const PayPalComponent = ({
shippingData,
isEditing,
}) => {
const {onPaymentSetup, onCheckoutAfterProcessingWithError} = eventRegistration;
const {onPaymentSetup, onCheckoutAfterProcessingWithError, onCheckoutValidation} = eventRegistration;
const {responseTypes} = emitResponse;
const [paypalOrder, setPaypalOrder] = useState(null);
@ -69,6 +69,14 @@ const PayPalComponent = ({
}
};
const getCheckoutRedirectUrl = () => {
const checkoutUrl = new URL(config.scriptData.redirect);
// sometimes some browsers may load some kind of cached version of the page,
// so adding a parameter to avoid that
checkoutUrl.searchParams.append('ppcp-continuation-redirect', (new Date()).getTime().toString());
return checkoutUrl.toString();
}
const handleApprove = async (data, actions) => {
try {
const res = await fetch(config.scriptData.ajax.approve_order.endpoint, {
@ -105,12 +113,8 @@ const PayPalComponent = ({
billing_address: addresses.billingAddress,
shipping_address: addresses.shippingAddress,
});
const checkoutUrl = new URL(config.scriptData.redirect);
// sometimes some browsers may load some kind of cached version of the page,
// so adding a parameter to avoid that
checkoutUrl.searchParams.append('ppcp-continuation-redirect', (new Date()).getTime().toString());
location.href = checkoutUrl.toString();
location.href = getCheckoutRedirectUrl();
} else {
onSubmit();
}
@ -125,6 +129,19 @@ const PayPalComponent = ({
}
};
useEffect(() => {
const unsubscribe = onCheckoutValidation(() => {
if (config.scriptData.continuation) {
return true;
}
if (wp.data.select('wc/store/validation').hasValidationErrors()) {
location.href = getCheckoutRedirectUrl();
return false;
}
});
return unsubscribe;
}, [onCheckoutValidation] );
const handleClick = (data, actions) => {
if (isEditing) {
return actions.reject();