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

Improve fallback to shipping address when no billing

Browse source
This commit is contained in:
Alex P 2023-11-29 11:59:32 +02:00
parent dc2c60a6f2
commit b0ef0649bb
No known key found for this signature in database
GPG key ID: 54487A734A204D71
1 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/ppcp-blocks/resources/js/Helper/Address.js
View file

@ -76,8 +76,8 @@ export const paypalShippingToWc = (shipping) => {
* @returns {Object} * @returns {Object}
*/ */
export const paypalPayerToWc = (payer) => { export const paypalPayerToWc = (payer) => {
const firstName = payer.name.given_name; const firstName = payer?.name?.given_name ?? '';
const lastName = payer.name.surname; const lastName = payer?.name?.surname ?? '';
const address = payer.address ? paypalAddressToWc(payer.address) : {}; const address = payer.address ? paypalAddressToWc(payer.address) : {};
return { return {
...address, ...address,
@ -100,11 +100,13 @@ export const paypalOrderToWcShippingAddress = (order) => {
const res = paypalShippingToWc(shipping); const res = paypalShippingToWc(shipping);
// use the name from billing if the same, to avoid possible mistakes when splitting full_name // use the name from billing if the same, to avoid possible mistakes when splitting full_name
if (order.payer) {
const billingAddress = paypalPayerToWc(order.payer); const billingAddress = paypalPayerToWc(order.payer);
if (`${res.first_name} ${res.last_name}` === `${billingAddress.first_name} ${billingAddress.last_name}`) { if (`${res.first_name} ${res.last_name}` === `${billingAddress.first_name} ${billingAddress.last_name}`) {
res.first_name = billingAddress.first_name; res.first_name = billingAddress.first_name;
res.last_name = billingAddress.last_name; res.last_name = billingAddress.last_name;
} }
}
return res; return res;
} }
@ -116,11 +118,14 @@ export const paypalOrderToWcShippingAddress = (order) => {
*/ */
export const paypalOrderToWcAddresses = (order) => { export const paypalOrderToWcAddresses = (order) => {
const shippingAddress = paypalOrderToWcShippingAddress(order); const shippingAddress = paypalOrderToWcShippingAddress(order);
let billingAddress = paypalPayerToWc(order.payer); let billingAddress = shippingAddress;
if (order.payer) {
billingAddress = paypalPayerToWc(order.payer);
// no billing address, such as if billing address retrieval is not allowed in the merchant account // no billing address, such as if billing address retrieval is not allowed in the merchant account
if (!billingAddress.address_line_1) { if (!billingAddress.address_line_1) {
billingAddress = {...shippingAddress, ...paypalPayerToWc(order.payer)}; billingAddress = {...shippingAddress, ...paypalPayerToWc(order.payer)};
} }
}
return {billingAddress, shippingAddress}; return {billingAddress, shippingAddress};
} }