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

Check validation errors before submit in block

Browse source
This commit is contained in:
Alex P 2023-09-25 15:31:38 +03:00
parent 099b50728e
commit 47ad89bab9
No known key found for this signature in database
GPG key ID: 54487A734A204D71
1 changed files with 17 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -89,6 +89,19 @@ const PayPalComponent = ({
const handleApprove = async (data, actions) => { const handleApprove = async (data, actions) => {
try { try {
const order = await actions.order.get();
if (order) {
const addresses = paypalOrderToWcAddresses(order);
await wp.data.dispatch('wc/store/cart').updateCustomerData({
billing_address: addresses.billingAddress,
shipping_address: addresses.shippingAddress,
});
}
setPaypalOrder(order);
const res = await fetch(config.scriptData.ajax.approve_order.endpoint, { const res = await fetch(config.scriptData.ajax.approve_order.endpoint, {
method: 'POST', method: 'POST',
credentials: 'same-origin', credentials: 'same-origin',
@ -112,20 +125,12 @@ const PayPalComponent = ({
throw new Error(config.scriptData.labels.error.generic) throw new Error(config.scriptData.labels.error.generic)
} }
const order = await actions.order.get(); if (wp.data.select('wc/store/validation').hasValidationErrors()) {
location.href = getCheckoutRedirectUrl();
setPaypalOrder(order); return;
if (config.finalReviewEnabled) {
if (order) {
const addresses = paypalOrderToWcAddresses(order);
await wp.data.dispatch('wc/store/cart').updateCustomerData({
billing_address: addresses.billingAddress,
shipping_address: addresses.shippingAddress,
});
} }
if (config.finalReviewEnabled) {
location.href = getCheckoutRedirectUrl(); location.href = getCheckoutRedirectUrl();
} else { } else {
onSubmit(); onSubmit();
@ -141,19 +146,6 @@ 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) => { const handleClick = (data, actions) => {
if (isEditing) { if (isEditing) {
return actions.reject(); return actions.reject();