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

Add final review for blocks

Browse source
This commit is contained in:
Alex P 2023-04-17 10:23:52 +03:00
parent b444c1ef55
commit 211c57b938
No known key found for this signature in database
GPG key ID: 54487A734A204D71
4 changed files with 35 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -92,9 +92,23 @@ const PayPalComponent = ({
throw new Error(config.scriptData.labels.error.generic)
}
setPaypalOrder(json.data);
const order = json.data;
onSubmit();
setPaypalOrder(order);
const shippingAddress = paypalOrderToWcShippingAddress(order);
let billingAddress = paypalPayerToWc(order.payer);
// no billing address, such as if billing address retrieval is not allowed in the merchant account
if (!billingAddress.address_line_1) {
billingAddress = {...shippingAddress, ...paypalPayerToWc(order.payer)};
}
await wp.data.dispatch('wc/store/cart').updateCustomerData({
billing_address: billingAddress,
shipping_address: shippingAddress,
});
location.href = config.scriptData.redirect;
} catch (err) {
console.error(err);
@ -126,24 +140,6 @@ const PayPalComponent = ({
},
};
}
const shippingAddress = paypalOrderToWcShippingAddress(paypalOrder);
let billingAddress = paypalPayerToWc(paypalOrder.payer);
// no billing address, such as if billing address retrieval is not allowed in the merchant account
if (!billingAddress.address_line_1) {
billingAddress = {...shippingAddress, ...paypalPayerToWc(paypalOrder.payer)};
}
return {
type: responseTypes.SUCCESS,
meta: {
paymentMethodData: {
'paypal_order_id': paypalOrder.id,
},
shippingAddress,
billingAddress,
},
};
});
return () => {
unsubscribeProcessing();