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

Fix address merge

Browse source
This commit is contained in:
Alex P 2023-10-27 09:59:55 +03:00
parent 14f54e1df1
commit 7f072be611
No known key found for this signature in database
GPG key ID: 54487A734A204D71
4 changed files with 29 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,9 +1,8 @@
import {useEffect, useState} from '@wordpress/element';
import {registerExpressPaymentMethod, registerPaymentMethod} from '@woocommerce/blocks-registry';
import {paypalAddressToWc, paypalOrderToWcAddresses} from "./Helper/Address";
import {mergeWcAddress, paypalAddressToWc, paypalOrderToWcAddresses} from "./Helper/Address";
import {loadPaypalScript} from '../../../ppcp-button/resources/js/modules/Helper/ScriptLoading'
import buttonModuleWatcher from "../../../ppcp-button/resources/js/modules/ButtonModuleWatcher";
import merge from "deepmerge";
const config = wc.wcSettings.getSetting('ppcp-gateway_data');
@ -32,9 +31,7 @@ const PayPalComponent = ({
}
const paypalAddresses = paypalOrderToWcAddresses(config.scriptData.continuation.order);
const wcAddresses = wp.data.select('wc/store/cart').getCustomerData();
const addresses = merge(wcAddresses, paypalAddresses, {
customMerge: key => (a, b) => a ? a : b, // overwrite empty strings
});
const addresses = mergeWcAddress(wcAddresses, paypalAddresses);
wp.data.dispatch('wc/store/cart').setBillingAddress(addresses.billingAddress);
if (shippingData.needsShipping) {
wp.data.dispatch('wc/store/cart').setShippingAddress(addresses.shippingAddress);